@codingame/monaco-vscode-chat-service-override 15.0.3 → 16.0.1

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt/askToSelectPrompt.js

@@ -0,0 +1,79 @@
+
+import { DOCS_OPTION } from './constants.js';
+import { attachPrompts } from './utils/attachPrompts.js';
+import { handleButtonClick } from './utils/handleButtonClick.js';
+import { assert } from '@codingame/monaco-vscode-api/vscode/vs/base/common/assert';
+import { createPromptPickItem } from './utils/createPromptPickItem.js';
+import { createPlaceholderText } from './utils/createPlaceholderText.js';
+import { extUri } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+
+const askToSelectPrompt = async (options) => {
+    const { promptFiles, resource, quickInputService, labelService } = options;
+    const fileOptions = ( promptFiles.map((promptFile) => {
+        return createPromptPickItem(promptFile, labelService);
+    }));
+    fileOptions.push(DOCS_OPTION);
+    let activeItem;
+    if (resource) {
+        activeItem = fileOptions.find((file) => {
+            return extUri.isEqual(file.value, resource);
+        });
+        if (!activeItem) {
+            activeItem = createPromptPickItem({
+                uri: resource,
+                type: 'local',
+            }, labelService);
+            fileOptions.push(activeItem);
+        }
+        fileOptions.sort((file1, file2) => {
+            if (extUri.isEqual(file1.value, resource)) {
+                return -1;
+            }
+            if (extUri.isEqual(file2.value, resource)) {
+                return 1;
+            }
+            return 0;
+        });
+    }
+    if (!activeItem) {
+        activeItem = fileOptions[0];
+    }
+    const quickPick = quickInputService.createQuickPick();
+    quickPick.activeItems = activeItem ? [activeItem] : [];
+    quickPick.placeholder = createPlaceholderText(options);
+    quickPick.canAcceptInBackground = true;
+    quickPick.matchOnDescription = true;
+    quickPick.items = fileOptions;
+    const { openerService } = options;
+    return await ( new Promise(resolve => {
+        const disposables = ( new DisposableStore());
+        let lastActiveWidget = options.widget;
+        disposables.add({
+            dispose() {
+                quickPick.dispose();
+                resolve();
+                lastActiveWidget?.focusInput();
+            },
+        });
+        disposables.add(quickPick.onDidAccept(async (event) => {
+            const { selectedItems } = quickPick;
+            assert(selectedItems.length === 1, `Only one item can be accepted, got '${selectedItems.length}'.`);
+            const selectedOption = selectedItems[0];
+            const docsSelected = (selectedOption === DOCS_OPTION);
+            if (docsSelected) {
+                await openerService.open(selectedOption.value);
+                return;
+            }
+            lastActiveWidget = await attachPrompts(selectedItems, options, quickPick.keyMods);
+            if (!event.inBackground) {
+                disposables.dispose();
+            }
+        }));
+        disposables.add(quickPick.onDidTriggerItemButton(handleButtonClick.bind(null, { quickPick, ...options })));
+        disposables.add(quickPick.onDidHide(disposables.dispose.bind(disposables)));
+        quickPick.show();
+    }));
+};
+
+export { askToSelectPrompt };

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt/constants.d.ts

@@ -0,0 +1,7 @@
+import { WithUriValue } from "@codingame/monaco-vscode-api/vscode/vs/base/common/types";
+import { IQuickInputButton, IQuickPickItem } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput";
+export declare const SUPER_KEY_NAME: string;
+export declare const ALT_KEY_NAME: string;
+export declare const DOCS_OPTION: WithUriValue<IQuickPickItem>;
+export declare const EDIT_BUTTON: IQuickInputButton;
+export declare const DELETE_BUTTON: IQuickInputButton;

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt/constants.js

@@ -0,0 +1,27 @@
+
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
+import { DOCUMENTATION_URL } from '../../../../../common/promptSyntax/constants.js';
+import { isWindows, isLinux } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
+
+const SUPER_KEY_NAME = (isWindows || isLinux) ? 'Ctrl' : '⌘';
+const ALT_KEY_NAME = (isWindows || isLinux) ? 'Alt' : '⌥';
+const DOCS_OPTION = ( Object.freeze({
+    type: 'item',
+    label: ( localize(4357, 'Learn how to create reusable prompts')),
+    description: DOCUMENTATION_URL,
+    tooltip: DOCUMENTATION_URL,
+    value: ( URI.parse(DOCUMENTATION_URL)),
+}));
+const EDIT_BUTTON = ( Object.freeze({
+    tooltip: ( localize(4358, "edit ({0}-key + enter)", SUPER_KEY_NAME)),
+    iconClass: ThemeIcon.asClassName(Codicon.edit),
+}));
+const DELETE_BUTTON = ( Object.freeze({
+    tooltip: ( localize(4359, "delete")),
+    iconClass: ThemeIcon.asClassName(Codicon.trash),
+}));
+
+export { ALT_KEY_NAME, DELETE_BUTTON, DOCS_OPTION, EDIT_BUTTON, SUPER_KEY_NAME };

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt/utils/attachPrompts.d.ts

@@ -0,0 +1,5 @@
+import { ISelectPromptOptions } from "../askToSelectPrompt.js";
+import { IChatWidget } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chat";
+import { WithUriValue } from "@codingame/monaco-vscode-api/vscode/vs/base/common/types";
+import { IKeyMods, IQuickPickItem } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput";
+export declare const attachPrompts: (files: readonly WithUriValue<IQuickPickItem>[], options: ISelectPromptOptions, keyMods: IKeyMods) => Promise<IChatWidget>;

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt/utils/attachPrompts.js

@@ -0,0 +1,53 @@
+
+import { showChatView, showEditsView } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { assertDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
+import { ACTION_ID_NEW_CHAT, ACTION_ID_NEW_EDIT_SESSION } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/actions/chatClearActions';
+
+const attachPrompts = async (files, options, keyMods) => {
+    const widget = await getChatWidgetObject(options, keyMods);
+    for (const file of files) {
+        widget
+            .attachmentModel
+            .promptInstructions
+            .add(file.value);
+    }
+    return widget;
+};
+const getChatWidgetObject = async (options, keyMods) => {
+    const { widget } = options;
+    const { alt, ctrlCmd } = keyMods;
+    if (ctrlCmd) {
+        return await openNewChat(options, alt);
+    }
+    if (!widget) {
+        return await showExistingChat(options, alt);
+    }
+    return widget;
+};
+const openNewChat = async (options, edits) => {
+    const { commandService, chatService, viewsService } = options;
+    if (chatService.unifiedViewEnabled === true) {
+        await commandService.executeCommand(ACTION_ID_NEW_CHAT);
+        const widget = await showChatView(viewsService);
+        assertDefined(widget, 'Chat widget must be defined.');
+        return widget;
+    }
+    (edits === true)
+        ? await commandService.executeCommand(ACTION_ID_NEW_EDIT_SESSION)
+        : await commandService.executeCommand(ACTION_ID_NEW_CHAT);
+    const widget = (edits === true)
+        ? await showEditsView(viewsService)
+        : await showChatView(viewsService);
+    assertDefined(widget, 'Chat widget must be defined.');
+    return widget;
+};
+const showExistingChat = async (options, edits) => {
+    const { chatService, viewsService } = options;
+    const widget = (edits && (chatService.unifiedViewEnabled === false))
+        ? await showEditsView(viewsService)
+        : await showChatView(viewsService);
+    assertDefined(widget, 'Revealed chat widget must be defined.');
+    return widget;
+};
+
+export { attachPrompts };

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt/utils/createPlaceholderText.d.ts

@@ -0,0 +1,2 @@
+import { ISelectPromptOptions } from "../askToSelectPrompt.js";
+export declare const createPlaceholderText: (options: ISelectPromptOptions) => string;

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt/utils/createPlaceholderText.js

@@ -0,0 +1,19 @@
+
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { SUPER_KEY_NAME, ALT_KEY_NAME } from '../constants.js';
+
+const createPlaceholderText = (options) => {
+    const { widget, chatService } = options;
+    let text = ( localize(4360, 'Select a prompt to use'));
+    if (widget === undefined) {
+        const superModifierNote = ( localize(4361, '{0}-key to use in new chat', SUPER_KEY_NAME));
+        const altOptionModifierNote = ( localize(4362, ' or {0}-key to use in Copilot Edits', ALT_KEY_NAME));
+        const openInEditsNote = (chatService.unifiedViewEnabled === true)
+            ? ''
+            : altOptionModifierNote;
+        text += ( localize(4363, ' (hold {0}{1})', superModifierNote, openInEditsNote));
+    }
+    return text;
+};
+
+export { createPlaceholderText };

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt/utils/createPromptPickItem.d.ts

@@ -0,0 +1,5 @@
+import { WithUriValue } from "@codingame/monaco-vscode-api/vscode/vs/base/common/types";
+import { IPromptPath } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/types";
+import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
+import { IQuickPickItem } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput";
+export declare const createPromptPickItem: (promptFile: IPromptPath, labelService: ILabelService) => WithUriValue<IQuickPickItem>;

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt/utils/createPromptPickItem.js

@@ -0,0 +1,27 @@
+
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { EDIT_BUTTON, DELETE_BUTTON } from '../constants.js';
+import { dirname } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { getCleanPromptName } from '@codingame/monaco-vscode-a1eb43d5-da63-5f76-8ad4-acf0d6c3b749-common/vscode/vs/platform/prompts/common/constants';
+
+const createPromptPickItem = (promptFile, labelService) => {
+    const { uri, type } = promptFile;
+    const fileWithoutExtension = getCleanPromptName(uri);
+    const description = (type === 'user')
+        ? ( localize(4364, 'User prompt'))
+        : labelService.getUriLabel(dirname(uri), { relative: true });
+    const tooltip = (type === 'user')
+        ? description
+        : uri.fsPath;
+    return {
+        id: ( uri.toString()),
+        type: 'item',
+        label: fileWithoutExtension,
+        description,
+        tooltip,
+        value: uri,
+        buttons: [EDIT_BUTTON, DELETE_BUTTON],
+    };
+};
+
+export { createPromptPickItem };

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt/utils/handleButtonClick.d.ts

@@ -0,0 +1,13 @@
+import { WithUriValue } from "@codingame/monaco-vscode-api/vscode/vs/base/common/types";
+import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
+import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
+import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
+import { IQuickPick, IQuickPickItem, IQuickPickItemButtonEvent } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput";
+interface IHandleButtonClickOptions {
+    quickPick: IQuickPick<WithUriValue<IQuickPickItem>>;
+    fileService: IFileService;
+    openerService: IOpenerService;
+    dialogService: IDialogService;
+}
+export declare function handleButtonClick(options: IHandleButtonClickOptions, context: IQuickPickItemButtonEvent<WithUriValue<IQuickPickItem>>): Promise<boolean | undefined>;
+export {};

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt/utils/handleButtonClick.js

@@ -0,0 +1,49 @@
+
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { EDIT_BUTTON, DELETE_BUTTON } from '../constants.js';
+import { assert } from '@codingame/monaco-vscode-api/vscode/vs/base/common/assert';
+import { getCleanPromptName } from '@codingame/monaco-vscode-a1eb43d5-da63-5f76-8ad4-acf0d6c3b749-common/vscode/vs/platform/prompts/common/constants';
+
+async function handleButtonClick(options, context) {
+    const { quickPick, openerService, fileService, dialogService } = options;
+    const { item, button } = context;
+    const { value } = item;
+    if (button === EDIT_BUTTON) {
+        return await openerService.open(value);
+    }
+    if (button === DELETE_BUTTON) {
+        assert((quickPick.activeItems.length < 2), `Expected maximum one active item, got '${quickPick.activeItems.length}'.`);
+        const activeItem = quickPick.activeItems[0];
+        const info = await fileService.stat(value);
+        assert(info.isDirectory === false, `'${value.fsPath}' points to a folder.`);
+        const previousIgnoreFocusOut = quickPick.ignoreFocusOut;
+        quickPick.ignoreFocusOut = true;
+        const filename = getCleanPromptName(value);
+        const { confirmed } = await dialogService.confirm({
+            message: ( localize(4365, "Are you sure you want to delete '{0}'?", filename)),
+        });
+        quickPick.ignoreFocusOut = previousIgnoreFocusOut;
+        if (!confirmed) {
+            return;
+        }
+        await fileService.del(value);
+        let removedIndex = -1;
+        quickPick.items = quickPick.items.filter((option, index) => {
+            if (option === item) {
+                removedIndex = index;
+                return false;
+            }
+            return true;
+        });
+        if (activeItem && (activeItem === item)) {
+            assert(removedIndex >= 0, 'Removed item index must be a valid index.');
+            const newActiveItemIndex = Math.max(removedIndex - 1, 0);
+            const newActiveItem = quickPick.items[newActiveItemIndex];
+            quickPick.activeItems = newActiveItem ? [newActiveItem] : [];
+        }
+        return;
+    }
+    throw ( new Error(`Unknown button '${JSON.stringify(button)}'.`));
+}
+
+export { handleButtonClick };

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

@@ -22,11 +22,11 @@ import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 import { accessibleViewInCodeBlock } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { reviewEdits } from '@codingame/monaco-vscode-29bc1406-2925-5b8f-b25e-d04a7772d896-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 { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents';
 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-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-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-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/codeBlockPart';
 import { CHAT_CATEGORY } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
@@ -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(4316, "Apply to {0}", label);
+                        return localize(4372, "Apply to {0}", label);
                     }
                     return super.getTooltip();
                 }
@@ -104,7 +104,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyCodeBlock',
-                title: ( localize2(4317, "Copy")),
+                title: ( localize2(4373, "Copy")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.copy,
@@ -189,7 +189,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: APPLY_IN_EDITOR_ID,
-                title: ( localize2(4318, "Apply in Editor")),
+                title: ( localize2(4374, "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(4319, "Insert At Cursor")),
+                title: ( localize2(4375, "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(4320, "Insert into New File")),
+                title: ( localize2(4376, "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(4321, "Insert into Terminal")),
+                title: ( localize2(4377, "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(4322, "Next Code Block")),
+                title: ( localize2(4378, "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(4323, "Previous Code Block")),
+                title: ( localize2(4379, "Previous Code Block")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageUp,
                     mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageUp, },
@@ -472,7 +472,7 @@ function registerChatCodeCompareBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.applyCompareEdits',
-                title: ( localize2(4324, "Apply Edits")),
+                title: ( localize2(4380, "Apply Edits")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.gitPullRequestGoToChanges,
@@ -514,7 +514,7 @@ function registerChatCodeCompareBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.discardCompareEdits',
-                title: ( localize2(4325, "Discard Edits")),
+                title: ( localize2(4381, "Discard Edits")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.trash,

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

@@ -1,9 +1,14 @@
 import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions";
 import { Action2, IAction2Options } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions";
 export declare function registerChatContextActions(): void;
+export declare class AttachSearchResultAction extends Action2 {
+    static readonly Name = "searchResults";
+    static readonly ID = "workbench.action.chat.insertSearchResults";
+    constructor();
+    run(accessor: ServicesAccessor, ...args: any[]): Promise<void>;
+}
 export declare class AttachContextAction extends Action2 {
     static readonly ID = "workbench.action.chat.attachContext";
-    protected static _cdt: import("@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey").ContextKeyExpression | undefined;
     constructor(desc?: Readonly<IAction2Options>);
     private _getFileContextId;
     private _attachContext;