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

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/overlayToolbarDecorator.js

@@ -14,7 +14,12 @@ import { CellEditState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/
 import { CellKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 
 let OverlayToolbarDecorator = class OverlayToolbarDecorator extends Disposable {
-    constructor(notebookEditor, notebookModel, instantiationService, accessibilitySignalService) {
+    constructor(
+        notebookEditor,
+        notebookModel,
+        instantiationService,
+        accessibilitySignalService
+    ) {
         super();
         this.notebookEditor = notebookEditor;
         this.notebookModel = notebookModel;
@@ -41,13 +46,13 @@ let OverlayToolbarDecorator = class OverlayToolbarDecorator extends Disposable {
             if (!cellViewModel || cellViewModel.cellKind !== CellKind.Markup) {
                 continue;
             }
-            const toolbarContainer = createElement('div');
+            const toolbarContainer = createElement("div");
             let overlayId = undefined;
-            editor.changeCellOverlays((accessor) => {
-                toolbarContainer.style.right = '44px';
+            editor.changeCellOverlays(accessor => {
+                toolbarContainer.style.right = "44px";
                 overlayId = accessor.addOverlay({
                     cell: cellViewModel,
-                    domNode: toolbarContainer,
+                    domNode: toolbarContainer
                 });
             });
             const removeOverlay = () => {
@@ -57,35 +62,40 @@ let OverlayToolbarDecorator = class OverlayToolbarDecorator extends Disposable {
                     }
                 });
             };
-            this.overlayDisposables.add({ dispose: removeOverlay });
-            const toolbar = createElement('div');
+            this.overlayDisposables.add({
+                dispose: removeOverlay
+            });
+            const toolbar = createElement("div");
             toolbarContainer.appendChild(toolbar);
-            toolbar.className = 'chat-diff-change-content-widget';
-            toolbar.classList.add('hover');
-            toolbar.style.position = 'relative';
-            toolbar.style.top = '18px';
-            toolbar.style.zIndex = '10';
-            toolbar.style.display = cellViewModel.getEditState() === CellEditState.Editing ? 'none' : 'block';
-            this.overlayDisposables.add(cellViewModel.onDidChangeState((e) => {
+            toolbar.className = "chat-diff-change-content-widget";
+            toolbar.classList.add("hover");
+            toolbar.style.position = "relative";
+            toolbar.style.top = "18px";
+            toolbar.style.zIndex = "10";
+            toolbar.style.display = cellViewModel.getEditState() === CellEditState.Editing ? "none" : "block";
+            this.overlayDisposables.add(cellViewModel.onDidChangeState(e => {
                 if (e.editStateChanged) {
                     if (cellViewModel.getEditState() === CellEditState.Editing) {
-                        toolbar.style.display = 'none';
-                    }
-                    else {
-                        toolbar.style.display = 'block';
+                        toolbar.style.display = "none";
+                    } else {
+                        toolbar.style.display = "block";
                     }
                 }
             }));
             const scopedInstaService = this._register(this.instantiationService.createChild(( new ServiceCollection([IContextKeyService, this.notebookEditor.scopedContextKeyService]))));
             const toolbarWidget = scopedInstaService.createInstance(MenuWorkbenchToolBar, toolbar, MenuId.ChatEditingEditorHunk, {
-                telemetrySource: 'chatEditingNotebookHunk',
+                telemetrySource: "chatEditingNotebookHunk",
                 hiddenItemStrategy: HiddenItemStrategy.NoHide,
-                toolbarOptions: { primaryGroup: () => true },
+                toolbarOptions: {
+                    primaryGroup: () => true
+                },
                 menuOptions: {
                     renderShortTitle: true,
                     arg: {
                         async accept() {
-                            accessibilitySignalService.playSignal(AccessibilitySignal.editsKept, { allowManyInParallel: true });
+                            accessibilitySignalService.playSignal(AccessibilitySignal.editsKept, {
+                                allowManyInParallel: true
+                            });
                             removeOverlay();
                             toolbarWidget.dispose();
                             for (const singleChange of change.diff.get().changes) {
@@ -94,7 +104,9 @@ let OverlayToolbarDecorator = class OverlayToolbarDecorator extends Disposable {
                             return true;
                         },
                         async reject() {
-                            accessibilitySignalService.playSignal(AccessibilitySignal.editsUndone, { allowManyInParallel: true });
+                            accessibilitySignalService.playSignal(AccessibilitySignal.editsUndone, {
+                                allowManyInParallel: true
+                            });
                             removeOverlay();
                             toolbarWidget.dispose();
                             for (const singleChange of change.diff.get().changes) {
@@ -102,15 +114,20 @@ let OverlayToolbarDecorator = class OverlayToolbarDecorator extends Disposable {
                             }
                             return true;
                         }
-                    },
+                    }
                 },
                 actionViewItemProvider: (action, options) => {
                     if (!action.class) {
                         return new (class extends ActionViewItem {
                             constructor() {
-                                super(undefined, action, { ...options, keybindingNotRenderedWithLabel: true , icon: false, label: true });
+                                super(undefined, action, {
+                                    ...options,
+                                    keybindingNotRenderedWithLabel: true ,
+                                    icon: false,
+                                    label: true
+                                });
                             }
-                        });
+                        })();
                     }
                     return undefined;
                 }
@@ -119,7 +136,7 @@ let OverlayToolbarDecorator = class OverlayToolbarDecorator extends Disposable {
         }
     }
     getCellViewModel(change) {
-        if (change.type === 'delete' || change.modifiedCellIndex === undefined) {
+        if (change.type === "delete" || change.modifiedCellIndex === undefined) {
             return undefined;
         }
         const cell = this.notebookModel.cells[change.modifiedCellIndex];
@@ -133,9 +150,6 @@ let OverlayToolbarDecorator = class OverlayToolbarDecorator extends Disposable {
         }
     }
 };
-OverlayToolbarDecorator = ( __decorate([
-    ( __param(2, IInstantiationService)),
-    ( __param(3, IAccessibilitySignalService))
-], OverlayToolbarDecorator));
+OverlayToolbarDecorator = ( __decorate([( __param(2, IInstantiationService)), ( __param(3, IAccessibilitySignalService))], OverlayToolbarDecorator));
 
 export { OverlayToolbarDecorator };

package/vscode/src/vs/workbench/contrib/chat/browser/chatManagement/chatManagement.contribution.js

@@ -1,8 +1,9 @@
 
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { registerAction2, Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { registerAction2, Action2, MenuRegistry, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/descriptors';
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
@@ -11,24 +12,41 @@ import { EditorPaneDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/wor
 import { EditorExtensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
+import { ResourceContextKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { MANAGE_CHAT_COMMAND_ID, CONTEXT_MODELS_SEARCH_FOCUS, CONTEXT_MODELS_EDITOR } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { ChatManagementEditor, ModelsManagementEditor } from './chatManagementEditor.js';
 import { ChatManagementEditorInput, ModelsManagementEditorInput } from './chatManagementEditorInput.js';
+import { ILanguageModelsConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelsConfiguration.service';
+import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { registerIcon } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/iconRegistry';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
 
-( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(ChatManagementEditor, ChatManagementEditor.ID, ( localize(5177, "Chat Management Editor"))), [
-    ( new SyncDescriptor(ChatManagementEditorInput))
-]);
-( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(ModelsManagementEditor, ModelsManagementEditor.ID, ( localize(5178, "Models Management Editor"))), [
-    ( new SyncDescriptor(ModelsManagementEditorInput))
-]);
+const languageModelsOpenSettingsIcon = registerIcon("language-models-open-settings", Codicon.goToFile, ( localize(5348, "Icon for open language models settings commands.")));
+const LANGUAGE_MODELS_ENTITLEMENT_PRECONDITION = ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
+    ChatContextKeys.Entitlement.planFree,
+    ChatContextKeys.Entitlement.planPro,
+    ChatContextKeys.Entitlement.planProPlus,
+    ChatContextKeys.Entitlement.planBusiness,
+    ChatContextKeys.Entitlement.planEnterprise,
+    ChatContextKeys.Entitlement.internal
+))));
+( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(
+    EditorPaneDescriptor.create(ChatManagementEditor, ChatManagementEditor.ID, ( localize(5349, "Chat Management Editor"))),
+    [( new SyncDescriptor(ChatManagementEditorInput))]
+);
+( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(
+    EditorPaneDescriptor.create(ModelsManagementEditor, ModelsManagementEditor.ID, ( localize(5350, "Models Management Editor"))),
+    [( new SyncDescriptor(ModelsManagementEditorInput))]
+);
 class ChatManagementEditorInputSerializer {
     canSerialize(editorInput) {
         return true;
     }
     serialize(input) {
-        return '';
+        return "";
     }
     deserialize(instantiationService) {
         return instantiationService.createInstance(ChatManagementEditorInput);
@@ -39,7 +57,7 @@ class ModelsManagementEditorInputSerializer {
         return true;
     }
     serialize(input) {
-        return '';
+        return "";
     }
     deserialize(instantiationService) {
         return instantiationService.createInstance(ModelsManagementEditorInput);
@@ -47,44 +65,100 @@ class ModelsManagementEditorInputSerializer {
 }
 ( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(ChatManagementEditorInput.ID, ChatManagementEditorInputSerializer);
 ( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(ModelsManagementEditorInput.ID, ModelsManagementEditorInputSerializer);
-registerAction2(class extends Action2 {
-    constructor() {
-        super({
-            id: MANAGE_CHAT_COMMAND_ID,
-            title: ( localize2(5179, "Manage Language Models")),
-            category: CHAT_CATEGORY,
-            precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
-                ChatContextKeys.Entitlement.planFree,
-                ChatContextKeys.Entitlement.planPro,
-                ChatContextKeys.Entitlement.planProPlus,
-                ChatContextKeys.Entitlement.internal
-            )))),
-            f1: true,
-        });
+let ChatManagementActionsContribution = class ChatManagementActionsContribution extends Disposable {
+    static {
+        this.ID = "workbench.contrib.chatManagementActions";
+    }
+    constructor(languageModelsConfigurationService) {
+        super();
+        this.languageModelsConfigurationService = languageModelsConfigurationService;
+        this.registerChatManagementActions();
+        this.registerLanguageModelsEditorTitleActions();
     }
-    async run(accessor, args) {
-        const editorGroupsService = accessor.get(IEditorGroupsService);
-        return editorGroupsService.activeGroup.openEditor(( new ModelsManagementEditorInput()), { pinned: true });
+    registerChatManagementActions() {
+        this._register(registerAction2(class extends Action2 {
+            constructor() {
+                super({
+                    id: MANAGE_CHAT_COMMAND_ID,
+                    title: ( localize2(5351, "Manage Language Models")),
+                    category: CHAT_CATEGORY,
+                    precondition: LANGUAGE_MODELS_ENTITLEMENT_PRECONDITION,
+                    f1: true
+                });
+            }
+            async run(accessor, args) {
+                const editorGroupsService = accessor.get(IEditorGroupsService);
+                return editorGroupsService.activeGroup.openEditor(( new ModelsManagementEditorInput()), {
+                    pinned: true
+                });
+            }
+        }));
+        this._register(registerAction2(class extends Action2 {
+            constructor() {
+                super({
+                    id: "chat.models.action.clearSearchResults",
+                    precondition: CONTEXT_MODELS_EDITOR,
+                    keybinding: {
+                        primary: KeyCode.Escape,
+                        weight: KeybindingWeight.EditorContrib,
+                        when: CONTEXT_MODELS_SEARCH_FOCUS
+                    },
+                    title: ( localize2(5352, "Clear Models Search Results"))
+                });
+            }
+            run(accessor) {
+                const activeEditorPane = accessor.get(IEditorService).activeEditorPane;
+                if (activeEditorPane instanceof ModelsManagementEditor) {
+                    activeEditorPane.clearSearch();
+                }
+                return null;
+            }
+        }));
+        this._register(registerAction2(class extends Action2 {
+            constructor() {
+                super({
+                    id: "workbench.action.openLanguageModelsJson",
+                    title: ( localize2(5353, "Open Language Models (JSON)")),
+                    category: CHAT_CATEGORY,
+                    precondition: LANGUAGE_MODELS_ENTITLEMENT_PRECONDITION,
+                    f1: true
+                });
+            }
+            async run(accessor) {
+                const languageModelsConfigurationService = accessor.get(ILanguageModelsConfigurationService);
+                await languageModelsConfigurationService.configureLanguageModels();
+            }
+        }));
     }
-});
-registerAction2(class extends Action2 {
-    constructor() {
-        super({
-            id: 'chat.models.action.clearSearchResults',
-            precondition: CONTEXT_MODELS_EDITOR,
-            keybinding: {
-                primary: KeyCode.Escape,
-                weight: KeybindingWeight.EditorContrib,
-                when: CONTEXT_MODELS_SEARCH_FOCUS
+    registerLanguageModelsEditorTitleActions() {
+        const modelsConfigurationFile = this.languageModelsConfigurationService.configurationFile;
+        const openModelsManagementEditorWhen = ( ContextKeyExpr.and(( CONTEXT_MODELS_EDITOR.toNegated()), ( ResourceContextKey.Resource.isEqualTo(( modelsConfigurationFile.toString()))), ContextKeyExpr.not("isInDiffEditor"), LANGUAGE_MODELS_ENTITLEMENT_PRECONDITION));
+        MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
+            command: {
+                id: MANAGE_CHAT_COMMAND_ID,
+                title: ( localize2(5351, "Manage Language Models")),
+                icon: languageModelsOpenSettingsIcon
             },
-            title: ( localize2(5180, "Clear Models Search Results"))
+            when: openModelsManagementEditorWhen,
+            group: "navigation",
+            order: 1
+        });
+        const openLanguageModelsJsonWhen = ( ContextKeyExpr.and(CONTEXT_MODELS_EDITOR, LANGUAGE_MODELS_ENTITLEMENT_PRECONDITION));
+        MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
+            command: {
+                id: "workbench.action.openLanguageModelsJson",
+                title: ( localize2(5353, "Open Language Models (JSON)")),
+                icon: languageModelsOpenSettingsIcon
+            },
+            when: openLanguageModelsJsonWhen,
+            group: "navigation",
+            order: 1
         });
     }
-    run(accessor) {
-        const activeEditorPane = accessor.get(IEditorService).activeEditorPane;
-        if (activeEditorPane instanceof ModelsManagementEditor) {
-            activeEditorPane.clearSearch();
-        }
-        return null;
-    }
-});
+};
+ChatManagementActionsContribution = ( __decorate([( __param(0, ILanguageModelsConfigurationService))], ChatManagementActionsContribution));
+registerWorkbenchContribution2(
+    ChatManagementActionsContribution.ID,
+    ChatManagementActionsContribution,
+    WorkbenchPhase.AfterRestored
+);

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

@@ -27,6 +27,7 @@ export declare class ModelsManagementEditor extends EditorPane {
     focus(): void;
     clearInput(): void;
     clearSearch(): void;
+    search(query: string): void;
 }
 export declare const chatManagementSashBorder: string;
 export declare class ChatManagementEditor extends EditorPane {