@codingame/monaco-vscode-chat-service-override 32.0.2 → 33.0.5

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

@@ -620,7 +620,7 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
                 options: {
                     selection
                 },
-                label: ( localize(6339, "{0} (changes from chat)", basename(this._entry.modifiedURI)))
+                label: ( localize(6397, "{0} (changes from chat)", basename(this._entry.modifiedURI)))
             });
             if (diffEditor && diffEditor.input) {
                 diffEditor.getControl()?.setSelection(selection);

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

@@ -64,7 +64,7 @@ class NavigateAction extends ChatEditingEditorAction {
     constructor(next) {
         super({
             id: next ? "chatEditor.action.navigateNext" : "chatEditor.action.navigatePrevious",
-            title: next ? ( localize2(6340, "Go to Next Chat Edit")) : ( localize2(6341, "Go to Previous Chat Edit")),
+            title: next ? ( localize2(6398, "Go to Next Chat Edit")) : ( localize2(6399, "Go to Previous Chat Edit")),
             icon: next ? Codicon.arrowDown : Codicon.arrowUp,
             precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ctxHasEditorModification)),
             keybinding: {
@@ -128,9 +128,9 @@ class KeepOrUndoAction extends ChatEditingEditorAction {
     constructor(id, _keep) {
         super({
             id,
-            title: _keep ? ( localize2(6342, "Keep Chat Edits")) : ( localize2(6343, "Undo Chat Edits")),
-            shortTitle: _keep ? ( localize2(6344, "Keep")) : ( localize2(6345, "Undo")),
-            tooltip: _keep ? ( localize2(6346, "Keep Chat Edits in this File")) : ( localize2(6347, "Undo Chat Edits in this File")),
+            title: _keep ? ( localize2(6400, "Keep Chat Edits")) : ( localize2(6401, "Undo Chat Edits")),
+            shortTitle: _keep ? ( localize2(6402, "Keep")) : ( localize2(6403, "Undo")),
+            tooltip: _keep ? ( localize2(6404, "Keep Chat Edits in this File")) : ( localize2(6405, "Undo Chat Edits in this File")),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             icon: _keep ? Codicon.check : Codicon.discard,
             f1: true,
@@ -183,8 +183,8 @@ class AcceptRejectHunkAction extends ChatEditingEditorAction {
     constructor(_accept) {
         super({
             id: _accept ? acceptHunkId : undoHunkId,
-            title: _accept ? ( localize2(6348, "Keep this Change")) : ( localize2(6349, "Undo this Change")),
-            shortTitle: _accept ? ( localize2(6350, "Keep")) : ( localize2(6351, "Undo")),
+            title: _accept ? ( localize2(6406, "Keep this Change")) : ( localize2(6407, "Undo this Change")),
+            shortTitle: _accept ? ( localize2(6408, "Keep")) : ( localize2(6409, "Undo")),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             f1: true,
             keybinding: {
@@ -232,7 +232,7 @@ class ToggleDiffAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: "chatEditor.action.toggleDiff",
-            title: ( localize2(6352, "Toggle Diff Editor for Chat Edits")),
+            title: ( localize2(6410, "Toggle Diff Editor for Chat Edits")),
             category: CHAT_CATEGORY,
             toggled: {
                 condition: ( ContextKeyExpr.or(EditorContextKeys.inDiffEditor, ( ActiveEditorContext.isEqualTo(TEXT_DIFF_EDITOR_ID)))),
@@ -264,7 +264,7 @@ class ToggleAccessibleDiffViewAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: "chatEditor.action.showAccessibleDiffView",
-            title: ( localize2(6353, "Show Accessible Diff View for Chat Edits")),
+            title: ( localize2(6411, "Show Accessible Diff View for Chat Edits")),
             f1: true,
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             keybinding: {
@@ -282,7 +282,7 @@ class ReviewChangesAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: "chatEditor.action.reviewChanges",
-            title: ( localize2(6354, "Review")),
+            title: ( localize2(6412, "Review")),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             menu: [{
                 id: MenuId.ChatEditingEditorContent,
@@ -303,8 +303,8 @@ class AcceptAllEditsAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: AcceptAllEditsAction.ID,
-            title: ( localize2(6355, "Keep All Chat Edits")),
-            tooltip: ( localize2(6356, "Keep All Chat Edits in this Session")),
+            title: ( localize2(6413, "Keep All Chat Edits")),
+            tooltip: ( localize2(6414, "Keep All Chat Edits in this Session")),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             icon: Codicon.checkAll,
             f1: true,
@@ -323,7 +323,7 @@ class MultiDiffAcceptDiscardAction extends Action2 {
     constructor(accept) {
         super({
             id: accept ? "chatEditing.multidiff.acceptAllFiles" : "chatEditing.multidiff.discardAllFiles",
-            title: accept ? ( localize(6357, "Keep All Edits")) : ( localize(6358, "Undo All Edits")),
+            title: accept ? ( localize(6415, "Keep All Edits")) : ( localize(6416, "Undo All Edits")),
             icon: accept ? Codicon.check : Codicon.discard,
             menu: {
                 when: ( ContextKeyExpr.equals("resourceScheme", CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME)),
@@ -374,7 +374,7 @@ class ExplainMultiDiffAction extends Action2 {
     constructor() {
         super({
             id: "chatEditing.multidiff.explain",
-            title: ( localize(6359, "Explain")),
+            title: ( localize(6417, "Explain")),
             menu: {
                 when: ( ContextKeyExpr.and(( ContextKeyExpr.or(...( explainMultiDiffSchemes.map(scheme => ( ContextKeyExpr.equals("resourceScheme", scheme)))))), ( ContextKeyExpr.has(`config.${ChatConfiguration.ExplainChangesEnabled}`)))),
                 id: MenuId.MultiDiffEditorContent,
@@ -520,7 +520,7 @@ function registerChatEditorActions() {
     MenuRegistry.appendMenuItem(MenuId.ChatEditingEditorContent, {
         command: {
             id: navigationBearingFakeActionId,
-            title: ( localize(6360, "Navigation Status")),
+            title: ( localize(6418, "Navigation Status")),
             precondition: ( ContextKeyExpr.false())
         },
         group: "navigate",

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

@@ -202,9 +202,9 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
                                     } = that._navigationBearings.read(r);
                                     if (changeCount > 0) {
                                         const n = activeIdx === -1 ? "1" : `${activeIdx + 1}`;
-                                        this.label.innerText = ( localize(6368, "{0} of {1}", n, changeCount));
+                                        this.label.innerText = ( localize(6426, "{0} of {1}", n, changeCount));
                                     } else {
-                                        this.label.innerText = ( localize(6369, "—"));
+                                        this.label.innerText = ( localize(6427, "—"));
                                     }
                                     this.updateTooltip();
                                 }));
@@ -219,18 +219,18 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
                                 }
                                 let result;
                                 if (changeCount === 1 && entriesCount === 1) {
-                                    result = ( localize(6370, "1 change in 1 file"));
+                                    result = ( localize(6428, "1 change in 1 file"));
                                 } else if (changeCount === 1) {
-                                    result = ( localize(6371, "1 change in {0} files", entriesCount));
+                                    result = ( localize(6429, "1 change in {0} files", entriesCount));
                                 } else if (entriesCount === 1) {
-                                    result = ( localize(6372, "{0} changes in 1 file", changeCount));
+                                    result = ( localize(6430, "{0} changes in 1 file", changeCount));
                                 } else {
-                                    result = ( localize(6373, "{0} changes in {1} files", changeCount, entriesCount));
+                                    result = ( localize(6431, "{0} changes in {1} files", changeCount, entriesCount));
                                 }
                                 if (!that._isBusy.get()) {
                                     return result;
                                 }
-                                return localize(6374, "{0} - Working...", result);
+                                return localize(6432, "{0} - Working...", result);
                             }
                         })();
                     }

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

@@ -122,14 +122,14 @@ let ChatEditingExplanationModelManager = class ChatEditingExplanationModelManage
         try {
             const models = await this._languageModelsService.selectLanguageModels({
                 vendor: "copilot",
-                id: "copilot-fast"
+                id: "copilot-utility-small"
             });
             if (!models.length) {
                 for (const fileData of fileChanges) {
                     this._updateUriStatePartial(fileData.uri, {
                         progress: "error",
                         explanations: [],
-                        errorMessage: ( localize(6375, "No language model available"))
+                        errorMessage: ( localize(6433, "No language model available"))
                     });
                 }
                 return;
@@ -200,7 +200,7 @@ Example response format:
             for (const fileData of fileChanges) {
                 const explanations = [];
                 for (const data of fileData.changes) {
-                    const parsedExplanation = parsed[parsedIndex]?.explanation?.trim() || ( localize(6376, "Code was modified."));
+                    const parsedExplanation = parsed[parsedIndex]?.explanation?.trim() || ( localize(6434, "Code was modified."));
                     explanations.push({
                         uri: fileData.uri,
                         startLineNumber: data.startLineNumber,
@@ -218,7 +218,7 @@ Example response format:
             }
         } catch (e) {
             if (!cancellationToken.isCancellationRequested) {
-                const errorMessage = e instanceof Error ? e.message : ( localize(6377, "Failed to generate explanations"));
+                const errorMessage = e instanceof Error ? e.message : ( localize(6435, "Failed to generate explanations"));
                 for (const fileData of fileChanges) {
                     this._updateUriStatePartial(fileData.uri, {
                         progress: "error",

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

@@ -95,7 +95,7 @@ class ChatEditingExplanationWidget extends Disposable {
             return {
                 startLineNumber: change.modified.startLineNumber,
                 endLineNumber: change.modified.endLineNumberExclusive - 1,
-                explanation: ( localize(6378, "Generating explanation...")),
+                explanation: ( localize(6436, "Generating explanation...")),
                 read: false,
                 loading: true,
                 originalText,
@@ -116,7 +116,7 @@ class ChatEditingExplanationWidget extends Disposable {
         this._headerNode.appendChild(this._toggleButton);
         this._dismissButton = $("div.chat-explanation-dismiss");
         this._dismissButton.appendChild(renderIcon(Codicon.close));
-        this._dismissButton.title = ( localize(6379, "Dismiss"));
+        this._dismissButton.title = ( localize(6437, "Dismiss"));
         this._headerNode.appendChild(this._dismissButton);
         this._domNode.appendChild(this._headerNode);
         this._bodyNode = $("div.chat-explanation-body");
@@ -178,35 +178,35 @@ class ChatEditingExplanationWidget extends Disposable {
             this._readIndicator.appendChild(renderIcon(Codicon.circle));
             this._readIndicator.classList.add("read");
             this._readIndicator.classList.remove("partial", "unread");
-            this._readIndicator.title = ( localize(6380, "Mark as unread"));
+            this._readIndicator.title = ( localize(6438, "Mark as unread"));
         } else if (someRead) {
             this._readIndicator.appendChild(renderIcon(Codicon.circleFilled));
             this._readIndicator.classList.remove("read", "unread");
             this._readIndicator.classList.add("partial");
-            this._readIndicator.title = ( localize(6381, "Mark all as read"));
+            this._readIndicator.title = ( localize(6439, "Mark all as read"));
         } else {
             this._readIndicator.appendChild(renderIcon(Codicon.circleFilled));
             this._readIndicator.classList.remove("read", "partial");
             this._readIndicator.classList.add("unread");
-            this._readIndicator.title = ( localize(6382, "Mark as read"));
+            this._readIndicator.title = ( localize(6440, "Mark as read"));
         }
     }
     _updateTitle() {
         const count = this._explanations.length;
         if (count === 1) {
-            this._titleNode.textContent = ( localize(6383, "1 change"));
+            this._titleNode.textContent = ( localize(6441, "1 change"));
         } else {
-            this._titleNode.textContent = ( localize(6384, "{0} changes", count));
+            this._titleNode.textContent = ( localize(6442, "{0} changes", count));
         }
     }
     _updateToggleButton() {
         clearNode(this._toggleButton);
         if (this._isExpanded) {
             this._toggleButton.appendChild(renderIcon(Codicon.chevronUp));
-            this._toggleButton.title = ( localize(6385, "Collapse"));
+            this._toggleButton.title = ( localize(6443, "Collapse"));
         } else {
             this._toggleButton.appendChild(renderIcon(Codicon.chevronDown));
-            this._toggleButton.title = ( localize(6386, "Expand"));
+            this._toggleButton.title = ( localize(6444, "Expand"));
         }
     }
     _buildExplanationItems() {
@@ -217,9 +217,9 @@ class ChatEditingExplanationWidget extends Disposable {
             const item = $("div.chat-explanation-item");
             const lineInfo = $("span.chat-explanation-line-info");
             if (exp.startLineNumber === exp.endLineNumber) {
-                lineInfo.textContent = ( localize(6387, "Line {0}", exp.startLineNumber));
+                lineInfo.textContent = ( localize(6445, "Line {0}", exp.startLineNumber));
             } else {
-                lineInfo.textContent = ( localize(6388, "Lines {0}-{1}", exp.startLineNumber, exp.endLineNumber));
+                lineInfo.textContent = ( localize(6446, "Lines {0}-{1}", exp.startLineNumber, exp.endLineNumber));
             }
             item.appendChild(lineInfo);
             const text = $("span.chat-explanation-text");
@@ -238,7 +238,7 @@ class ChatEditingExplanationWidget extends Disposable {
             item.appendChild(itemReadIndicator);
             const replyButton = $("div.chat-explanation-reply-button");
             replyButton.appendChild(renderIcon(Codicon.arrowRight));
-            replyButton.title = ( localize(6389, "Follow up on this change"));
+            replyButton.title = ( localize(6447, "Follow up on this change"));
             item.appendChild(replyButton);
             this._eventStore.add(addDisposableListener(replyButton, "click", async e => {
                 e.stopPropagation();

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

@@ -142,7 +142,7 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
             if (inProgress) {
                 const res = this._lastModifyingResponseObs.read(r);
                 const req = res && res.session.getRequests().find(value => value.id === res.requestId);
-                resourceFilter.value = markerService.installResourceFilter(this.modifiedURI, req?.message.text || ( localize(6390, "Chat Edits")));
+                resourceFilter.value = markerService.installResourceFilter(this.modifiedURI, req?.message.text || ( localize(6448, "Chat Edits")));
             } else {
                 resourceFilter.clear();
             }
@@ -187,7 +187,7 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
     }
     _createUndoRedoElement(response) {
         const request = response.session.getRequests().find(req => req.id === response.requestId);
-        const label = request?.message.text ? ( localize(6391, "Chat Edit: '{0}'", request.message.text)) : ( localize(6392, "Chat Edit"));
+        const label = request?.message.text ? ( localize(6449, "Chat Edit: '{0}'", request.message.text)) : ( localize(6450, "Chat Edit"));
         return ( new SingleModelEditStackElement(label, "chat.edit", this.modifiedModel, null));
     }
     async acceptAgentEdits(resource, textEdits, isLastEdits, responseModel) {

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

@@ -42,7 +42,7 @@ class AutoAcceptControl {
         this.cancel = cancel;
     }
 }
-const pendingRewriteMinimap = registerColor("minimap.chatEditHighlight", ( transparent(editorBackground, 0.6)), ( localize(6393, "Color of pending edit regions in the minimap")));
+const pendingRewriteMinimap = registerColor("minimap.chatEditHighlight", ( transparent(editorBackground, 0.6)), ( localize(6451, "Color of pending edit regions in the minimap")));
 let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFileEntry extends Disposable {
     static {
         AbstractChatEditingModifiedFileEntry_1 = this;

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

@@ -485,7 +485,7 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
     }
     _createUndoRedoElement(response) {
         const request = response.session.getRequests().find(req => req.id === response.requestId);
-        const label = request?.message.text ? ( localize(6394, "Chat Edit: '{0}'", request.message.text)) : ( localize(6395, "Chat Edit"));
+        const label = request?.message.text ? ( localize(6452, "Chat Edit: '{0}'", request.message.text)) : ( localize(6453, "Chat Edit"));
         const transientOptions = this.transientOptions;
         const outputSizeLimit = this.configurationService.getValue(NotebookSetting.outputBackupSizeLimit) * 1024;
         let initial = createSnapshot(this.modifiedModel, transientOptions, outputSizeLimit);

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

@@ -126,7 +126,7 @@ let ChatEditingService = class ChatEditingService extends Disposable {
             }
             e.join(storageTask, {
                 id: "join.chatEditingSession",
-                label: ( localize(6396, "Saving chat edits history"))
+                label: ( localize(6454, "Saving chat edits history"))
             });
         }));
     }
@@ -358,7 +358,7 @@ class ChatDecorationsProvider extends Disposable {
     constructor(_sessions) {
         super();
         this._sessions = _sessions;
-        this.label = ( localize(6397, "Chat Editing"));
+        this.label = ( localize(6455, "Chat Editing"));
         this._currentEntries = derived(this, r => {
             const sessions = this._sessions.read(r);
             if (!sessions) {
@@ -402,7 +402,7 @@ class ChatDecorationsProvider extends Disposable {
             return {
                 weight: 1000,
                 letter: Codicon.diffModified,
-                tooltip: ( localize(6398, "Pending changes from chat")),
+                tooltip: ( localize(6456, "Pending changes from chat")),
                 bubble: true
             };
         }

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

@@ -410,7 +410,7 @@ let ChatEditingSession = ChatEditingSession_1 = class ChatEditingSession extends
         }
         const input = MultiDiffEditorInput.fromResourceMultiDiffEditorInput({
             multiDiffSource: getMultiDiffSourceUri(this, previousChanges),
-            label: ( localize(6399, "Suggested Edits"))
+            label: ( localize(6457, "Suggested Edits"))
         }, this._instantiationService);
         this._editorPane = await this._editorService.openEditor(input, {
             pinned: true,

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

@@ -630,7 +630,7 @@ let ChatEditingNotebookEditorWidgetIntegration = class ChatEditingNotebookEditor
             modified: {
                 resource: this._entry.modifiedURI
             },
-            label: ( localize(6400, "{0} (changes from chat)", basename(this._entry.modifiedURI)))
+            label: ( localize(6458, "{0} (changes from chat)", basename(this._entry.modifiedURI)))
         };
         await this._editorService.openEditor(diffInput);
     }

package/vscode/src/vs/workbench/contrib/chat/browser/chatImageCarouselService.js

@@ -136,7 +136,7 @@ function findImageInListByData(images, data) {
 }
 function buildCollectionArgs(sections, clickedGlobalIndex, sessionResource) {
     const collectionId = ( sessionResource.toString()) + "_carousel";
-    const defaultTitle = ( localize(6401, "Conversation Images"));
+    const defaultTitle = ( localize(6459, "Conversation Images"));
     return {
         collection: {
             id: collectionId,

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

@@ -2,16 +2,21 @@
 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 { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { registerAction2, Action2, MenuRegistry, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { registerAction2, Action2, MenuId, MenuRegistry } 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 { ExtensionIdentifier } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
 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 { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
+import { ProgressLocation } from '@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress';
+import { IProgressService } from '@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 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 { 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 { ChatEntitlementContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService';
 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 { ModelsManagementEditor } from './chatManagementEditor.js';
@@ -21,8 +26,11 @@ import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codi
 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';
+import { EnablementState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensionManagement/common/extensionManagement';
+import { IWorkbenchExtensionEnablementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service';
+import { IExtensionsWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions.service';
 
-const languageModelsOpenSettingsIcon = registerIcon("language-models-open-settings", Codicon.goToFile, ( localize(6402, "Icon for open language models settings commands.")));
+const languageModelsOpenSettingsIcon = registerIcon("language-models-open-settings", Codicon.goToFile, ( localize(6460, "Icon for open language models settings commands.")));
 const LANGUAGE_MODELS_ENTITLEMENT_PRECONDITION = ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
     ChatContextKeys.Entitlement.planFree,
     ChatContextKeys.Entitlement.planEdu,
@@ -31,10 +39,11 @@ const LANGUAGE_MODELS_ENTITLEMENT_PRECONDITION = ( ContextKeyExpr.and(ChatContex
     ChatContextKeys.Entitlement.planMax,
     ChatContextKeys.Entitlement.planBusiness,
     ChatContextKeys.Entitlement.planEnterprise,
-    ChatContextKeys.Entitlement.internal
+    ChatContextKeys.Entitlement.internal,
+    ChatEntitlementContextKeys.clientByokEnabled
 ))));
 ( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(
-    EditorPaneDescriptor.create(ModelsManagementEditor, ModelsManagementEditor.ID, ( localize(6403, "Models Management Editor"))),
+    EditorPaneDescriptor.create(ModelsManagementEditor, ModelsManagementEditor.ID, ( localize(6461, "Models Management Editor"))),
     [( new SyncDescriptor(ModelsManagementEditorInput))]
 );
 class ModelsManagementEditorInputSerializer {
@@ -49,6 +58,27 @@ class ModelsManagementEditorInputSerializer {
     }
 }
 ( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(ModelsManagementEditorInput.ID, ModelsManagementEditorInputSerializer);
+async function ensureChatExtensionEnabled(accessor) {
+    const chatExtensionId = accessor.get(IProductService).defaultChatAgent?.chatExtensionId;
+    if (!chatExtensionId) {
+        return;
+    }
+    const extensionsWorkbenchService = accessor.get(IExtensionsWorkbenchService);
+    const extensionEnablementService = accessor.get(IWorkbenchExtensionEnablementService);
+    const progressService = accessor.get(IProgressService);
+    const localExtensions = await extensionsWorkbenchService.queryLocal();
+    const chatExtension = localExtensions.find(e => ExtensionIdentifier.equals(e.identifier.id, chatExtensionId));
+    if (!chatExtension?.local || extensionEnablementService.isEnabled(chatExtension.local)) {
+        return;
+    }
+    await progressService.withProgress({
+        location: ProgressLocation.Window,
+        title: ( localize(6462, "Enabling AI features…"))
+    }, async () => {
+        await extensionsWorkbenchService.setEnablement([chatExtension], EnablementState.EnabledGlobally);
+        await extensionsWorkbenchService.updateRunningExtensions(( localize(6463, "Enabling AI features")));
+    });
+}
 let ChatManagementActionsContribution = class ChatManagementActionsContribution extends Disposable {
     static {
         this.ID = "workbench.contrib.chatManagementActions";
@@ -64,7 +94,7 @@ let ChatManagementActionsContribution = class ChatManagementActionsContribution
             constructor() {
                 super({
                     id: MANAGE_CHAT_COMMAND_ID,
-                    title: ( localize2(6404, "Manage Language Models")),
+                    title: ( localize2(6464, "Manage Language Models")),
                     category: CHAT_CATEGORY,
                     precondition: LANGUAGE_MODELS_ENTITLEMENT_PRECONDITION,
                     f1: true
@@ -72,6 +102,7 @@ let ChatManagementActionsContribution = class ChatManagementActionsContribution
             }
             async run(accessor) {
                 const editorService = accessor.get(IEditorService);
+                await ensureChatExtensionEnabled(accessor);
                 return editorService.openEditor(( new ModelsManagementEditorInput()), {
                     pinned: true
                 });
@@ -87,7 +118,7 @@ let ChatManagementActionsContribution = class ChatManagementActionsContribution
                         weight: KeybindingWeight.EditorContrib,
                         when: CONTEXT_MODELS_SEARCH_FOCUS
                     },
-                    title: ( localize2(6405, "Clear Models Search Results"))
+                    title: ( localize2(6465, "Clear Models Search Results"))
                 });
             }
             run(accessor) {
@@ -98,14 +129,27 @@ let ChatManagementActionsContribution = class ChatManagementActionsContribution
                 return null;
             }
         }));
+        const openLanguageModelsJsonWhen = ( ContextKeyExpr.and(CONTEXT_MODELS_EDITOR, LANGUAGE_MODELS_ENTITLEMENT_PRECONDITION));
         this._register(registerAction2(class extends Action2 {
             constructor() {
                 super({
                     id: "workbench.action.openLanguageModelsJson",
-                    title: ( localize2(6406, "Open Language Models (JSON)")),
+                    title: ( localize2(6466, "Open Language Models (JSON)")),
                     category: CHAT_CATEGORY,
                     precondition: LANGUAGE_MODELS_ENTITLEMENT_PRECONDITION,
-                    f1: true
+                    icon: languageModelsOpenSettingsIcon,
+                    f1: true,
+                    menu: [{
+                        id: MenuId.EditorTitle,
+                        when: openLanguageModelsJsonWhen,
+                        group: "navigation",
+                        order: 1
+                    }, {
+                        id: MenuId.ModalEditorEditorTitle,
+                        when: openLanguageModelsJsonWhen,
+                        group: "navigation",
+                        order: 1
+                    }]
                 });
             }
             async run(accessor) {
@@ -120,24 +164,13 @@ let ChatManagementActionsContribution = class ChatManagementActionsContribution
         MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
             command: {
                 id: MANAGE_CHAT_COMMAND_ID,
-                title: ( localize2(6404, "Manage Language Models")),
+                title: ( localize2(6464, "Manage Language Models")),
                 icon: languageModelsOpenSettingsIcon
             },
             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(6406, "Open Language Models (JSON)")),
-                icon: languageModelsOpenSettingsIcon
-            },
-            when: openLanguageModelsJsonWhen,
-            group: "navigation",
-            order: 1
-        });
     }
 };
 ChatManagementActionsContribution = ( __decorate([( __param(0, ILanguageModelsConfigurationService))], ChatManagementActionsContribution));

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

@@ -5,7 +5,7 @@ import { registerIcon } from '@codingame/monaco-vscode-api/vscode/vs/platform/th
 import { EditorInputCapabilities } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 import { EditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/editorInput';
 
-const ModelsManagementEditorIcon = registerIcon("models-management-editor-label-icon", Codicon.settings, ( localize(6407, "Icon of the Models Management editor label.")));
+const ModelsManagementEditorIcon = registerIcon("models-management-editor-label-icon", Codicon.settings, ( localize(6467, "Icon of the Models Management editor label.")));
 class ModelsManagementEditorInput extends EditorInput {
     static {
         this.ID = "workbench.input.modelsManagement";
@@ -24,7 +24,7 @@ class ModelsManagementEditorInput extends EditorInput {
         return ModelsManagementEditorInput.ID;
     }
     getName() {
-        return localize(6408, "Language Models");
+        return localize(6468, "Language Models");
     }
     getIcon() {
         return ModelsManagementEditorIcon;

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

@@ -27,6 +27,10 @@ export declare class ChatModelsWidget extends Disposable {
     private searchActionsContainer;
     private table;
     private tableContainer;
+    private tableViewport;
+    private tableInner;
+    private tableScrollable;
+    private tableMinWidth;
     private addButtonContainer;
     private addButton;
     private dropdownActions;