@codingame/monaco-vscode-chat-service-override 23.2.2 → 24.1.0

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

@@ -4,24 +4,23 @@ 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 { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
-import { ProductQualityContext } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkeys';
 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';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
-import { EditorPaneDescriptor } from '@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common/vscode/vs/workbench/browser/editor';
+import { EditorPaneDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/editor';
 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 { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/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-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+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';
 
-( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(ChatManagementEditor, ChatManagementEditor.ID, ( localize(5277, "Chat Management Editor"))), [
+( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(ChatManagementEditor, ChatManagementEditor.ID, ( localize(5342, "Chat Management Editor"))), [
     ( new SyncDescriptor(ChatManagementEditorInput))
 ]);
-( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(ModelsManagementEditor, ModelsManagementEditor.ID, ( localize(5278, "Models Management Editor"))), [
+( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(ModelsManagementEditor, ModelsManagementEditor.ID, ( localize(5343, "Models Management Editor"))), [
     ( new SyncDescriptor(ModelsManagementEditorInput))
 ]);
 class ChatManagementEditorInputSerializer {
@@ -52,9 +51,9 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: MANAGE_CHAT_COMMAND_ID,
-            title: ( localize2(5279, "Manage Language Models")),
+            title: ( localize2(5344, "Manage Language Models")),
             category: CHAT_CATEGORY,
-            precondition: ( ContextKeyExpr.and(( ProductQualityContext.notEqualsTo('stable')), ChatContextKeys.enabled, ( ContextKeyExpr.or(
+            precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
                 ChatContextKeys.Entitlement.planFree,
                 ChatContextKeys.Entitlement.planPro,
                 ChatContextKeys.Entitlement.planProPlus,
@@ -65,7 +64,7 @@ registerAction2(class extends Action2 {
     }
     async run(accessor, args) {
         const editorGroupsService = accessor.get(IEditorGroupsService);
-        return editorGroupsService.activeGroup.openEditor(( new ModelsManagementEditorInput()));
+        return editorGroupsService.activeGroup.openEditor(( new ModelsManagementEditorInput()), { pinned: true });
     }
 });
 registerAction2(class extends Action2 {
@@ -78,7 +77,7 @@ registerAction2(class extends Action2 {
                 weight: KeybindingWeight.EditorContrib,
                 when: CONTEXT_MODELS_SEARCH_FOCUS
             },
-            title: ( localize2(5280, "Clear Models Search Results"))
+            title: ( localize2(5345, "Clear Models Search Results"))
         });
     }
     run(accessor) {

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

@@ -3,7 +3,7 @@ import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service";
 import { IEditorOptions } from "@codingame/monaco-vscode-api/vscode/vs/platform/editor/common/editor";
-import { EditorPane } from "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common/vscode/vs/workbench/browser/parts/editor/editorPane";
+import { EditorPane } from "@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/editor/editorPane";
 import { IEditorOpenContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
 import { IEditorGroup } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService";
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";

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

@@ -7,7 +7,7 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
-import { EditorPane } from '@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common/vscode/vs/workbench/browser/parts/editor/editorPane';
+import { EditorPane } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/editor/editorPane';
 import { CHAT_MANAGEMENT_SECTION_USAGE, CHAT_MANAGEMENT_SECTION_MODELS } from './chatManagementEditorInput.js';
 import { ChatModelsWidget } from './chatModelsWidget.js';
 import { Button } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/button/button';
@@ -61,6 +61,7 @@ let ModelsManagementEditor = class ModelsManagementEditor extends EditorPane {
         if (this.dimension) {
             this.layout(this.dimension);
         }
+        this.modelsWidget?.render();
     }
     layout(dimension) {
         this.dimension = dimension;
@@ -87,7 +88,7 @@ ModelsManagementEditor = ModelsManagementEditor_1 = ( __decorate([
     ( __param(4, IInstantiationService)),
     ( __param(5, IContextKeyService))
 ], ModelsManagementEditor));
-const chatManagementSashBorder = registerColor('chatManagement.sashBorder', PANEL_BORDER, ( localize(5281, "The color of the Chat Management editor splitview sash border.")));
+const chatManagementSashBorder = registerColor('chatManagement.sashBorder', PANEL_BORDER, ( localize(5346, "The color of the Chat Management editor splitview sash border.")));
 function isNewUser(chatEntitlementService) {
     return !chatEntitlementService.sentiment.installed ||
         chatEntitlementService.entitlement === ChatEntitlement.Available;
@@ -152,8 +153,8 @@ let ChatManagementEditor = class ChatManagementEditor extends EditorPane {
     }
     renderSidebar(parent) {
         this.sections = [
-            { id: CHAT_MANAGEMENT_SECTION_USAGE, label: ( localize(5282, 'Usage')) },
-            { id: CHAT_MANAGEMENT_SECTION_MODELS, label: ( localize(5283, 'Models')) }
+            { id: CHAT_MANAGEMENT_SECTION_USAGE, label: ( localize(5347, 'Usage')) },
+            { id: CHAT_MANAGEMENT_SECTION_MODELS, label: ( localize(5348, 'Models')) }
         ];
         const delegate = ( new SectionItemDelegate());
         const renderer = ( new SectionItemRenderer());
@@ -166,7 +167,7 @@ let ChatManagementEditor = class ChatManagementEditor extends EditorPane {
                     return element.label;
                 },
                 getWidgetAriaLabel() {
-                    return localize(5284, "Sections");
+                    return localize(5349, "Sections");
                 }
             },
             openOnSingleClick: true,
@@ -190,7 +191,7 @@ let ChatManagementEditor = class ChatManagementEditor extends EditorPane {
         const headerTitleContainer = append(this.headerContainer, $('.header-title-container'));
         const headerTitleWrapper = append(headerTitleContainer, $('.header-title-wrapper'));
         const tile = append(headerTitleWrapper, $('.ai-management-editor-title'));
-        tile.textContent = ( localize(5285, 'Copilot'));
+        tile.textContent = ( localize(5350, 'Copilot'));
         this.planBadge = append(headerTitleWrapper, $('.plan-badge'));
         const titleButtonContainer = append(headerTitleContainer, $('.header-upgrade-button-container'));
         this.actionButton = this._register(( new Button(titleButtonContainer, { ...defaultButtonStyles })));
@@ -245,7 +246,7 @@ let ChatManagementEditor = class ChatManagementEditor extends EditorPane {
             }
             else {
                 this.planBadge.style.display = '';
-                this.planBadge.textContent = ( localize(5286, 'Free'));
+                this.planBadge.textContent = ( localize(5351, 'Free'));
             }
         }
         else {
@@ -260,31 +261,31 @@ let ChatManagementEditor = class ChatManagementEditor extends EditorPane {
             let commandId;
             if (shouldUpgrade && !isFreePlan && !anonymousUser) {
                 if (this.chatEntitlementService.entitlement === ChatEntitlement.Pro) {
-                    buttonLabel = ( localize(5287, 'Upgrade to Copilot Pro+'));
+                    buttonLabel = ( localize(5352, 'Upgrade to Copilot Pro+'));
                 }
                 else {
-                    buttonLabel = ( localize(5288, 'Upgrade to Copilot Pro'));
+                    buttonLabel = ( localize(5353, 'Upgrade to Copilot Pro'));
                 }
                 commandId = 'workbench.action.chat.upgradePlan';
             }
             else if (shouldUpgrade && (isFreePlan || anonymousUser)) {
-                buttonLabel = ( localize(5289, 'Upgrade to Copilot Pro'));
+                buttonLabel = ( localize(5354, 'Upgrade to Copilot Pro'));
                 commandId = 'workbench.action.chat.upgradePlan';
             }
             else if (newUser) {
-                buttonLabel = ( localize(5290, "Use AI Features"));
+                buttonLabel = ( localize(5355, "Use AI Features"));
                 commandId = newUser && anonymousUser ? 'workbench.action.chat.triggerSetupAnonymousWithoutDialog' : 'workbench.action.chat.triggerSetup';
             }
             else if (anonymousUser) {
-                buttonLabel = ( localize(5291, "Enable more AI Features"));
+                buttonLabel = ( localize(5356, "Enable more AI Features"));
                 commandId = 'workbench.action.chat.triggerSetup';
             }
             else if (disabled) {
-                buttonLabel = ( localize(5292, "Enable AI Features"));
+                buttonLabel = ( localize(5357, "Enable AI Features"));
                 commandId = 'workbench.action.chat.triggerSetup';
             }
             else {
-                buttonLabel = ( localize(5293, "Sign in to use AI Features"));
+                buttonLabel = ( localize(5358, "Sign in to use AI Features"));
                 commandId = 'workbench.action.chat.triggerSetup';
             }
             this.actionButton.label = buttonLabel;
@@ -300,15 +301,15 @@ let ChatManagementEditor = class ChatManagementEditor extends EditorPane {
         const entitlement = this.chatEntitlementService.entitlement;
         switch (entitlement) {
             case ChatEntitlement.Pro:
-                return localize(5294, 'Copilot Pro');
+                return localize(5359, 'Copilot Pro');
             case ChatEntitlement.ProPlus:
-                return localize(5295, 'Copilot Pro+');
+                return localize(5360, 'Copilot Pro+');
             case ChatEntitlement.Business:
-                return localize(5296, 'Copilot Business');
+                return localize(5361, 'Copilot Business');
             case ChatEntitlement.Enterprise:
-                return localize(5297, 'Copilot Enterprise');
+                return localize(5362, 'Copilot Enterprise');
             default:
-                return localize(5298, 'Copilot Free');
+                return localize(5363, 'Copilot Free');
         }
     }
     shouldShowUpgradeButton() {

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

@@ -4,8 +4,8 @@ import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { registerIcon } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/iconRegistry';
 import { EditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/editorInput';
 
-const ChatManagementEditorIcon = registerIcon('ai-management-editor-label-icon', Codicon.copilot, ( localize(5299, 'Icon of the AI Management editor label.')));
-const ModelsManagementEditorIcon = registerIcon('models-management-editor-label-icon', Codicon.settings, ( localize(5300, 'Icon of the Models Management editor label.')));
+const ChatManagementEditorIcon = registerIcon('ai-management-editor-label-icon', Codicon.copilot, ( localize(5364, 'Icon of the AI Management editor label.')));
+const ModelsManagementEditorIcon = registerIcon('models-management-editor-label-icon', Codicon.settings, ( localize(5365, 'Icon of the Models Management editor label.')));
 const CHAT_MANAGEMENT_SECTION_USAGE = 'usage';
 const CHAT_MANAGEMENT_SECTION_MODELS = 'models';
 class ChatManagementEditorInput extends EditorInput {
@@ -21,7 +21,7 @@ class ChatManagementEditorInput extends EditorInput {
         return ChatManagementEditorInput.ID;
     }
     getName() {
-        return localize(5301, "Manage Copilot");
+        return localize(5366, "Manage Copilot");
     }
     getIcon() {
         return ChatManagementEditorIcon;
@@ -43,7 +43,7 @@ class ModelsManagementEditorInput extends EditorInput {
         return ModelsManagementEditorInput.ID;
     }
     getName() {
-        return localize(5302, "Language Models");
+        return localize(5367, "Language Models");
     }
     getIcon() {
         return ModelsManagementEditorIcon;

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

@@ -1,10 +1,11 @@
 import { IMatch } from "@codingame/monaco-vscode-api/vscode/vs/base/common/filters";
-import { EditorModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/editorModel";
 import { ILanguageModelChatMetadata, IUserFriendlyLanguageModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels";
 import { ILanguageModelsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service";
 import { IChatEntitlementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service";
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 export declare const MODEL_ENTRY_TEMPLATE_ID = "model.entry.template";
 export declare const VENDOR_ENTRY_TEMPLATE_ID = "vendor.entry.template";
+export declare const GROUP_ENTRY_TEMPLATE_ID = "group.entry.template";
 export declare const SEARCH_SUGGESTIONS: {
     FILTER_TYPES: string[];
     CAPABILITIES: string[];
@@ -28,6 +29,7 @@ export interface IModelItemEntry {
     templateId: string;
     providerMatches?: IMatch[];
     modelNameMatches?: IMatch[];
+    modelIdMatches?: IMatch[];
     capabilityMatches?: string[];
 }
 export interface IVendorItemEntry {
@@ -37,25 +39,55 @@ export interface IVendorItemEntry {
     templateId: string;
     collapsed: boolean;
 }
-export declare function isVendorEntry(entry: IModelItemEntry | IVendorItemEntry): entry is IVendorItemEntry;
-export declare class ChatModelsViewModel extends EditorModel {
+export interface IGroupItemEntry {
+    type: "group";
+    id: string;
+    group: string;
+    label: string;
+    templateId: string;
+    collapsed: boolean;
+}
+export declare function isVendorEntry(entry: IViewModelEntry): entry is IVendorItemEntry;
+export declare function isGroupEntry(entry: IViewModelEntry): entry is IGroupItemEntry;
+export type IViewModelEntry = IModelItemEntry | IVendorItemEntry | IGroupItemEntry;
+export interface IViewModelChangeEvent {
+    at: number;
+    removed: number;
+    added: IViewModelEntry[];
+}
+export declare enum ChatModelGroup {
+    Vendor = "vendor",
+    Visibility = "visibility"
+}
+export declare class ChatModelsViewModel extends Disposable {
     private readonly languageModelsService;
     private readonly chatEntitlementService;
-    private readonly _onDidChangeModelEntries;
-    readonly onDidChangeModelEntries: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
+    private readonly _onDidChange;
+    readonly onDidChange: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<IViewModelChangeEvent>;
+    private readonly _onDidChangeGrouping;
+    readonly onDidChangeGrouping: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<ChatModelGroup>;
     private modelEntries;
-    private readonly collapsedVendors;
+    private readonly collapsedGroups;
+    private searchValue;
+    private modelsSorted;
+    private _groupBy;
+    get groupBy(): ChatModelGroup;
+    set groupBy(groupBy: ChatModelGroup);
     constructor(languageModelsService: ILanguageModelsService, chatEntitlementService: IChatEntitlementService);
-    fetch(searchValue: string): (IModelItemEntry | IVendorItemEntry)[];
-    private filterByProviders;
-    private filterByVisible;
-    private filterByCapabilities;
+    private readonly _viewModelEntries;
+    get viewModelEntries(): readonly IViewModelEntry[];
+    private splice;
+    selectedEntry: IViewModelEntry | undefined;
+    shouldRefilter(): boolean;
+    filter(searchValue: string): readonly IViewModelEntry[];
+    private filterModels;
     private getMatchingCapabilities;
-    private filterByText;
+    private sortModels;
     getVendors(): IUserFriendlyLanguageModel[];
-    resolve(): Promise<void>;
+    refresh(): Promise<void>;
+    toggleVisibility(model: IModelItemEntry): void;
     private static getId;
-    toggleVendorCollapsed(vendorId: string): void;
-    getConfiguredVendors(): IVendorItemEntry[];
-    private toEntries;
+    toggleCollapsed(viewModelEntry: IViewModelEntry): void;
+    collapseAll(): void;
+    getConfiguredVendors(): IVendorEntry[];
 }