@codingame/monaco-vscode-chat-service-override 15.0.2 → 16.0.0

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatCurrentLine.js

@@ -24,7 +24,6 @@ import '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vsc
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { InlineCompletionsController } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController';
-import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
 import { IMarkerDecorationsService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/markerDecorations.service';
 import { IContextMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service';
@@ -36,20 +35,21 @@ import { createStyleSheet2 } from '@codingame/monaco-vscode-api/vscode/vs/base/b
 import { stringValue } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/cssValue';
 import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base';
 import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
 import { derivedWithStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/derived';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
 
 var InlineChatHintsController_1;
-const CTX_INLINE_CHAT_SHOWING_HINT = ( new RawContextKey('inlineChatShowingHint', false, ( localize(7034, "Whether inline chat shows a contextual hint"))));
+const CTX_INLINE_CHAT_SHOWING_HINT = ( new RawContextKey('inlineChatShowingHint', false, ( localize(7180, "Whether inline chat shows a contextual hint"))));
 const _inlineChatActionId = 'inlineChat.startWithCurrentLine';
 class InlineChatExpandLineAction extends EditorAction2 {
     constructor() {
         super({
             id: _inlineChatActionId,
             category: AbstractInline1ChatAction.category,
-            title: ( localize2(7035, "Start in Editor with Current Line")),
+            title: ( localize2(7181, "Start in Editor with Current Line")),
             f1: true,
             precondition: ( ContextKeyExpr.and(( CTX_INLINE_CHAT_VISIBLE.negate()), CTX_INLINE_CHAT_HAS_AGENT, EditorContextKeys.writable)),
             keybinding: [{
@@ -92,7 +92,7 @@ class ShowInlineChatHintAction extends EditorAction2 {
         super({
             id: 'inlineChat.showHint',
             category: AbstractInline1ChatAction.category,
-            title: ( localize2(7036, "Show Inline Chat Hint")),
+            title: ( localize2(7182, "Show Inline Chat Hint")),
             f1: false,
             precondition: ( ContextKeyExpr.and(( CTX_INLINE_CHAT_VISIBLE.negate()), CTX_INLINE_CHAT_HAS_AGENT, EditorContextKeys.writable)),
         });
@@ -187,7 +187,7 @@ let InlineChatHintsController = class InlineChatHintsController extends Disposab
         const showDataObs = derivedWithStore((r, store) => {
             const ghostState = ghostCtrl?.model.read(r)?.state.read(r);
             const textFocus = editorObs.isTextFocused.read(r);
-            const position = editorObs.cursorPosition.read(r);
+            let position = editorObs.cursorPosition.read(r);
             const model = editorObs.model.read(r);
             const kb = keyObs.read(r);
             if (ghostState !== undefined || !kb || !position || !model || !textFocus) {
@@ -199,6 +199,7 @@ let InlineChatHintsController = class InlineChatHintsController extends Disposab
             const emitter = store.add(( new Emitter()));
             store.add(model.onDidChangeContent(() => emitter.fire()));
             observableFromEvent(emitter.event, () => model.getVersionId()).read(r);
+            position = model.validatePosition(position);
             const visible = this._visibilityObs.read(r);
             const isEol = model.getLineMaxColumn(position.lineNumber) === position.column;
             const isWhitespace = model.getLineLastNonWhitespaceColumn(position.lineNumber) === 0 && model.getValueLength() > 0 && position.column > 1;
@@ -222,15 +223,15 @@ let InlineChatHintsController = class InlineChatHintsController extends Disposab
                 this._ctxShowingHint.reset();
                 return;
             }
-            const agentName = chatAgentService.getDefaultAgent(ChatAgentLocation.Editor)?.name ?? ( localize(7037, "Chat"));
+            const agentName = chatAgentService.getDefaultAgent(ChatAgentLocation.Editor)?.name ?? ( localize(7183, "Chat"));
             const { position, isEol, isWhitespace, kb, model } = showData;
             const inlineClassName = ['a' , 'inline-chat-hint', 'inline-chat-hint-text'];
             let content;
             if (isWhitespace) {
-                content = '\u00a0' + ( localize(7038, "{0} to edit with {1}", kb, agentName));
+                content = '\u00a0' + ( localize(7184, "{0} to edit with {1}", kb, agentName));
             }
             else if (isEol) {
-                content = '\u00a0' + ( localize(7039, "{0} to continue with {1}", kb, agentName));
+                content = '\u00a0' + ( localize(7185, "{0} to continue with {1}", kb, agentName));
             }
             else {
                 content = '\u200a' + kb + '\u200a';
@@ -259,7 +260,7 @@ let InlineChatHintsController = class InlineChatHintsController extends Disposab
             getActions: () => [
                 toAction({
                     id: 'inlineChat.disableHint',
-                    label: ( localize(7040, "Disable Inline Chat Hint")),
+                    label: ( localize(7186, "Disable Inline Chat Hint")),
                     run: async () => {
                         await this._configurationService.updateValue(setting, false);
                     }
@@ -287,7 +288,7 @@ class HideInlineChatHintAction extends EditorAction2 {
     constructor() {
         super({
             id: 'inlineChat.hideHint',
-            title: ( localize2(7041, "Hide Inline Chat Hint")),
+            title: ( localize2(7187, "Hide Inline Chat Hint")),
             precondition: CTX_INLINE_CHAT_SHOWING_HINT,
             keybinding: {
                 weight: KeybindingWeight.EditorContrib - 10,

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatNotebook.js

@@ -10,7 +10,7 @@ import { INotebookEditorService } from '@codingame/monaco-vscode-api/vscode/vs/w
 import { CellUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { NotebookTextDiffEditor } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor';
-import { NotebookMultiTextDiffEditor } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditor';
+import { NotebookMultiTextDiffEditor } from '@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditor';
 
 let InlineChatNotebookContribution = class InlineChatNotebookContribution {
     constructor(sessionService, editorService, notebookEditorService) {

package/vscode/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookModifiedCellDecorator.d.ts

@@ -0,0 +1,10 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { CellDiffInfo } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel";
+import { INotebookEditor } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+export declare class NotebookModifiedCellDecorator extends Disposable {
+    private readonly notebookEditor;
+    private readonly decorators;
+    constructor(notebookEditor: INotebookEditor);
+    apply(diffInfo: CellDiffInfo[]): void;
+    clear(): void;
+}

package/vscode/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookModifiedCellDecorator.js

@@ -0,0 +1,47 @@
+
+import { Disposable, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { NotebookOverviewRulerLane } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { overviewRulerModifiedForeground } from '@codingame/monaco-vscode-ae8a8ca1-f243-508b-9c37-c88ebbd295fa-common/vscode/vs/workbench/contrib/scm/common/quickDiff';
+
+class NotebookModifiedCellDecorator extends Disposable {
+    constructor(notebookEditor) {
+        super();
+        this.notebookEditor = notebookEditor;
+        this.decorators = this._register(( new DisposableStore()));
+    }
+    apply(diffInfo) {
+        const model = this.notebookEditor.textModel;
+        if (!model) {
+            return;
+        }
+        const modifiedCells = [];
+        for (const diff of diffInfo) {
+            if (diff.type === 'modified') {
+                const cell = model.cells[diff.modifiedCellIndex];
+                modifiedCells.push(cell);
+            }
+        }
+        const ids = this.notebookEditor.deltaCellDecorations([], ( modifiedCells.map(cell => ({
+            handle: cell.handle,
+            options: {
+                overviewRuler: {
+                    color: overviewRulerModifiedForeground,
+                    modelRanges: [],
+                    includeOutput: true,
+                    position: NotebookOverviewRulerLane.Full
+                }
+            }
+        }))));
+        this.clear();
+        this.decorators.add(toDisposable(() => {
+            if (!this.notebookEditor.isDisposed) {
+                this.notebookEditor.deltaCellDecorations(ids, []);
+            }
+        }));
+    }
+    clear() {
+        this.decorators.clear();
+    }
+}
+
+export { NotebookModifiedCellDecorator };

package/vscode/src/vs/workbench/services/workspaces/common/workspaceUtils.d.ts

@@ -0,0 +1,5 @@
+import { IWorkspace } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace";
+import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
+import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
+export declare function isChatTransferredWorkspace(workspace: IWorkspace, storageService: IStorageService): boolean;
+export declare function areWorkspaceFoldersEmpty(workspace: IWorkspace, fileService: IFileService): Promise<boolean>;

package/vscode/src/vs/workbench/services/workspaces/common/workspaceUtils.js

@@ -0,0 +1,26 @@
+
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { StorageScope } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
+
+function isChatTransferredWorkspace(workspace, storageService) {
+    const workspaceUri = workspace.folders[0]?.uri;
+    if (!workspaceUri) {
+        return false;
+    }
+    const chatWorkspaceTransfer = storageService.getObject('chat.workspaceTransfer', StorageScope.PROFILE, []);
+    const toWorkspace = ( chatWorkspaceTransfer.map((item) => {
+        return { toWorkspace: ( URI.from(item.toWorkspace)) };
+    }));
+    return ( toWorkspace.some(item => ( item.toWorkspace.toString()) === ( workspaceUri.toString())));
+}
+async function areWorkspaceFoldersEmpty(workspace, fileService) {
+    for (const folder of workspace.folders) {
+        const folderStat = await fileService.resolve(folder.uri);
+        if (folderStat.children && folderStat.children.length > 0) {
+            return false;
+        }
+    }
+    return true;
+}
+
+export { areWorkspaceFoldersEmpty, isChatTransferredWorkspace };

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

@@ -1,142 +0,0 @@
-
-import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
-import { assert } from '@codingame/monaco-vscode-api/vscode/vs/base/common/assert';
-import { showEditsView, showChatView } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chat';
-import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { extUri, dirname } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
-import { DOCUMENTATION_URL } from '../../../../common/promptSyntax/constants.js';
-import { isWindows, isLinux } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
-import { assertDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
-import { getCleanPromptName } from '@codingame/monaco-vscode-52bb4d5b-ba1a-57fd-9bee-b28824214eac-common/vscode/vs/platform/prompts/common/constants';
-
-const DOCS_OPTION = {
-    type: 'item',
-    label: ( localize(4300, 'Learn how to create reusable prompts')),
-    description: DOCUMENTATION_URL,
-    tooltip: DOCUMENTATION_URL,
-    value: ( URI.parse(DOCUMENTATION_URL)),
-};
-const askToSelectPrompt = async (options) => {
-    const { promptFiles, resource, quickInputService, labelService } = options;
-    const fileOptions = ( promptFiles.map((promptFile) => {
-        return createPickItem(promptFile, labelService);
-    }));
-    fileOptions.push(DOCS_OPTION);
-    let activeItem;
-    if (resource) {
-        activeItem = fileOptions.find((file) => {
-            return extUri.isEqual(file.value, resource);
-        });
-        if (!activeItem) {
-            activeItem = createPickItem({
-                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 { openerService } = options;
-    const quickPick = quickInputService.createQuickPick();
-    quickPick.activeItems = activeItem ? [activeItem] : [];
-    quickPick.placeholder = createPlaceholderText(options);
-    quickPick.canAcceptInBackground = true;
-    quickPick.matchOnDescription = true;
-    quickPick.items = fileOptions;
-    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;
-            const { alt, ctrlCmd } = quickPick.keyMods;
-            assert(selectedItems.length === 1, `Only one item can be accepted, got '${selectedItems.length}'.`);
-            const docsSelected = (selectedItems[0] === DOCS_OPTION);
-            if (ctrlCmd || docsSelected) {
-                return await openFiles(selectedItems, openerService);
-            }
-            lastActiveWidget = await attachFiles(selectedItems, options, alt);
-            if (!event.inBackground) {
-                disposables.dispose();
-            }
-        }));
-        disposables.add(quickPick.onDidHide(disposables.dispose.bind(disposables)));
-        quickPick.show();
-    }));
-};
-const createPickItem = (promptFile, labelService) => {
-    const { uri, type } = promptFile;
-    const fileWithoutExtension = getCleanPromptName(uri);
-    const description = (type === 'user')
-        ? ( localize(4301, 'User prompt'))
-        : labelService.getUriLabel(dirname(uri), { relative: true });
-    const tooltip = (type === 'user')
-        ? description
-        : uri.fsPath;
-    return {
-        type: 'item',
-        label: fileWithoutExtension,
-        description,
-        tooltip,
-        value: uri,
-        id: ( uri.toString()),
-    };
-};
-const createPlaceholderText = (options) => {
-    const { widget } = options;
-    let text = ( localize(4302, 'Select a prompt to use'));
-    if (!widget) {
-        const altOptionkey = (isWindows || isLinux) ? 'Alt' : 'Option';
-        const altOptionModifierNote = ( localize(4303, '{0}-key to use in Edits', altOptionkey));
-        const cmdCtrlkey = (isWindows || isLinux) ? 'Ctrl' : 'Cmd';
-        const superModifierNote = ( localize(4304, '{0}-key to open in editor', cmdCtrlkey));
-        text += ( localize(4305, ' (hold {0} or {1})', altOptionModifierNote, superModifierNote));
-    }
-    return text;
-};
-const openFiles = async (files, openerService) => {
-    for (const file of files) {
-        await openerService.open(file.value);
-    }
-};
-const attachFiles = async (files, options, altOption) => {
-    const widget = await getChatWidgetObject(options, altOption);
-    for (const file of files) {
-        widget
-            .attachmentModel
-            .promptInstructions
-            .add(file.value);
-    }
-    return widget;
-};
-const getChatWidgetObject = async (options, altOption) => {
-    const { widget, viewsService } = options;
-    if (!widget) {
-        const widget = (altOption)
-            ? await showEditsView(viewsService)
-            : await showChatView(viewsService);
-        assertDefined(widget, 'Revealed chat widget must be defined.');
-        return widget;
-    }
-    return widget;
-};
-
-export { askToSelectPrompt };

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

@@ -1,52 +0,0 @@
-import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
-import { IReadonlyVSDataTransfer } from "@codingame/monaco-vscode-api/vscode/vs/base/common/dataTransfer";
-import { HierarchicalKind } from "@codingame/monaco-vscode-api/vscode/vs/base/common/hierarchicalKind";
-import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { IRange } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range";
-import { DocumentPasteContext, DocumentPasteEditProvider, DocumentPasteEditsSession } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
-import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
-import { ILanguageFeaturesService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/languageFeatures.service";
-import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
-import { IEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service";
-import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
-import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
-import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
-import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
-export declare class PasteImageProvider implements DocumentPasteEditProvider {
-    private readonly chatWidgetService;
-    private readonly extensionService;
-    private readonly fileService;
-    private readonly environmentService;
-    private readonly logService;
-    private readonly imagesFolder;
-    readonly kind: HierarchicalKind;
-    readonly providedPasteEditKinds: HierarchicalKind[];
-    readonly copyMimeTypes: never[];
-    readonly pasteMimeTypes: string[];
-    constructor(chatWidgetService: IChatWidgetService, extensionService: IExtensionService, fileService: IFileService, environmentService: IEnvironmentService, logService: ILogService);
-    provideDocumentPasteEdits(model: ITextModel, ranges: readonly IRange[], dataTransfer: IReadonlyVSDataTransfer, context: DocumentPasteContext, token: CancellationToken): Promise<DocumentPasteEditsSession | undefined>;
-    private createFileForMedia;
-    private cleanupOldImages;
-    private getTimestampFromFilename;
-}
-export declare function imageToHash(data: Uint8Array): Promise<string>;
-export declare function isImage(array: Uint8Array): boolean;
-export declare class CopyTextProvider implements DocumentPasteEditProvider {
-    readonly providedPasteEditKinds: never[];
-    readonly copyMimeTypes: string[];
-    readonly pasteMimeTypes: never[];
-    prepareDocumentPaste(model: ITextModel, ranges: readonly IRange[], dataTransfer: IReadonlyVSDataTransfer, token: CancellationToken): Promise<undefined | IReadonlyVSDataTransfer>;
-}
-export declare class PasteTextProvider implements DocumentPasteEditProvider {
-    private readonly chatWidgetService;
-    private readonly modelService;
-    readonly kind: HierarchicalKind;
-    readonly providedPasteEditKinds: HierarchicalKind[];
-    readonly copyMimeTypes: never[];
-    readonly pasteMimeTypes: string[];
-    constructor(chatWidgetService: IChatWidgetService, modelService: IModelService);
-    provideDocumentPasteEdits(model: ITextModel, ranges: readonly IRange[], dataTransfer: IReadonlyVSDataTransfer, context: DocumentPasteContext, token: CancellationToken): Promise<DocumentPasteEditsSession | undefined>;
-}
-export declare class ChatPasteProvidersFeature extends Disposable {
-    constructor(languageFeaturesService: ILanguageFeaturesService, chatWidgetService: IChatWidgetService, extensionService: IExtensionService, fileService: IFileService, modelService: IModelService, environmentService: IEnvironmentService, logService: ILogService);
-}