@codingame/monaco-vscode-chat-service-override 34.1.3 → 35.0.1

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(6516, "Generating explanation...")),
+                explanation: ( localize(7007, "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(6517, "Dismiss"));
+        this._dismissButton.title = ( localize(7008, "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(6518, "Mark as unread"));
+            this._readIndicator.title = ( localize(7009, "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(6519, "Mark all as read"));
+            this._readIndicator.title = ( localize(7010, "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(6520, "Mark as read"));
+            this._readIndicator.title = ( localize(7011, "Mark as read"));
         }
     }
     _updateTitle() {
         const count = this._explanations.length;
         if (count === 1) {
-            this._titleNode.textContent = ( localize(6521, "1 change"));
+            this._titleNode.textContent = ( localize(7012, "1 change"));
         } else {
-            this._titleNode.textContent = ( localize(6522, "{0} changes", count));
+            this._titleNode.textContent = ( localize(7013, "{0} changes", count));
         }
     }
     _updateToggleButton() {
         clearNode(this._toggleButton);
         if (this._isExpanded) {
             this._toggleButton.appendChild(renderIcon(Codicon.chevronUp));
-            this._toggleButton.title = ( localize(6523, "Collapse"));
+            this._toggleButton.title = ( localize(7014, "Collapse"));
         } else {
             this._toggleButton.appendChild(renderIcon(Codicon.chevronDown));
-            this._toggleButton.title = ( localize(6524, "Expand"));
+            this._toggleButton.title = ( localize(7015, "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(6525, "Line {0}", exp.startLineNumber));
+                lineInfo.textContent = ( localize(7016, "Line {0}", exp.startLineNumber));
             } else {
-                lineInfo.textContent = ( localize(6526, "Lines {0}-{1}", exp.startLineNumber, exp.endLineNumber));
+                lineInfo.textContent = ( localize(7017, "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(6527, "Follow up on this change"));
+            replyButton.title = ( localize(7018, "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

@@ -30,7 +30,7 @@ import { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/w
 import { ChatEditingCodeEditorIntegration } from './chatEditingCodeEditorIntegration.js';
 import { AbstractChatEditingModifiedFileEntry } from './chatEditingModifiedFileEntry.js';
 import { ChatEditingTextModelChangeService } from './chatEditingTextModelChangeService.js';
-import { ChatEditingTextModelContentProvider, ChatEditingSnapshotTextModelContentProvider } from './chatEditingTextModelContentProviders.js';
+import { ChatEditingTextModelContentProvider, ChatEditingSnapshotTextModelContentProvider } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingTextModelContentProviders';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 import { transaction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/transaction';
 
@@ -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(6528, "Chat Edits")));
+                resourceFilter.value = markerService.installResourceFilter(this.modifiedURI, req?.message.text || ( localize(7019, "Chat Edits")));
             } else {
                 resourceFilter.clear();
             }
@@ -158,7 +158,14 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
         return {
             resource: this.modifiedURI,
             languageId: this.modifiedModel.getLanguageId(),
-            snapshotUri: ChatEditingSnapshotTextModelContentProvider.getSnapshotFileURI(chatSessionResource, requestId, undoStop, this.modifiedURI.path),
+            snapshotUri: ChatEditingSnapshotTextModelContentProvider.getSnapshotFileURI(
+                chatSessionResource,
+                requestId,
+                undoStop,
+                this.modifiedURI.path,
+                this.modifiedURI.scheme,
+                this.modifiedURI.authority
+            ),
             original: this.originalModel.getValue(),
             current: this.modifiedModel.getValue(),
             state: this.state.get(),
@@ -187,7 +194,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(6529, "Chat Edit: '{0}'", request.message.text)) : ( localize(6530, "Chat Edit"));
+        const label = request?.message.text ? ( localize(7020, "Chat Edit: '{0}'", request.message.text)) : ( localize(7021, "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(6531, "Color of pending edit regions in the minimap")));
+const pendingRewriteMinimap = registerColor("minimap.chatEditHighlight", ( transparent(editorBackground, 0.6)), ( localize(7022, "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(6532, "Chat Edit: '{0}'", request.message.text)) : ( localize(6533, "Chat Edit"));
+        const label = request?.message.text ? ( localize(7023, "Chat Edit: '{0}'", request.message.text)) : ( localize(7024, "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

@@ -40,7 +40,7 @@ import { getChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workb
 import { ChatEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widgetHosts/editor/chatEditorInput';
 import { AbstractChatEditingModifiedFileEntry } from './chatEditingModifiedFileEntry.js';
 import { ChatEditingSession } from './chatEditingSession.js';
-import { ChatEditingTextModelContentProvider, ChatEditingSnapshotTextModelContentProvider } from './chatEditingTextModelContentProviders.js';
+import { ChatEditingTextModelContentProvider, ChatEditingSnapshotTextModelContentProvider } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingTextModelContentProviders';
 import { observableValueOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValueOpts';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
 import { runOnChange } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/runOnChange';
@@ -126,7 +126,7 @@ let ChatEditingService = class ChatEditingService extends Disposable {
             }
             e.join(storageTask, {
                 id: "join.chatEditingSession",
-                label: ( localize(6534, "Saving chat edits history"))
+                label: ( localize(7025, "Saving chat edits history"))
             });
         }));
     }
@@ -358,7 +358,7 @@ class ChatDecorationsProvider extends Disposable {
     constructor(_sessions) {
         super();
         this._sessions = _sessions;
-        this.label = ( localize(6535, "Chat Editing"));
+        this.label = ( localize(7026, "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(6536, "Pending changes from chat")),
+                tooltip: ( localize(7027, "Pending changes from chat")),
                 bubble: true
             };
         }

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

@@ -43,7 +43,7 @@ import { ChatEditingModifiedNotebookEntry } from './chatEditingModifiedNotebookE
 import { getKeyForChatSessionResource, FileOperationType } from './chatEditingOperations.js';
 import { IChatEditingExplanationModelManager } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingExplanationModelManager.service';
 import { ChatEditingSessionStorage } from './chatEditingSessionStorage.js';
-import { ChatEditingTextModelContentProvider } from './chatEditingTextModelContentProviders.js';
+import { ChatEditingTextModelContentProvider } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingTextModelContentProviders';
 import { getChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
 import { AgentSessionProviders } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
@@ -410,7 +410,7 @@ let ChatEditingSession = ChatEditingSession_1 = class ChatEditingSession extends
         }
         const input = MultiDiffEditorInput.fromResourceMultiDiffEditorInput({
             multiDiffSource: getMultiDiffSourceUri(this, previousChanges),
-            label: ( localize(6537, "Suggested Edits"))
+            label: ( localize(7028, "Suggested Edits"))
         }, this._instantiationService);
         this._editorPane = await this._editorService.openEditor(input, {
             pinned: true,
@@ -881,7 +881,7 @@ let ChatEditingSession = ChatEditingSession_1 = class ChatEditingSession extends
                 return responseModel.request?.modelId;
             }
             get modeId() {
-                return responseModel.request?.modeInfo?.modeId;
+                return responseModel.request?.modeInfo?.telemetryModeId;
             }
             get command() {
                 return responseModel.slashCommand?.name;

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

@@ -265,7 +265,7 @@ let ChatEditingTextModelChangeService = class ChatEditingTextModelChangeService
             requestId: request?.id,
             sessionId,
             languageId,
-            mode: request?.modeInfo?.modeId,
+            mode: request?.modeInfo?.telemetryModeId,
             extensionId,
             codeBlockSuggestionId: request?.modeInfo?.applyCodeBlockSuggestionId
         });

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(6538, "{0} (changes from chat)", basename(this._entry.modifiedURI)))
+            label: ( localize(7029, "{0} (changes from chat)", basename(this._entry.modifiedURI)))
         };
         await this._editorService.openEditor(diffInput);
     }

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

@@ -1,6 +1,7 @@
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
+import type { IChatRequestVariableEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries";
 import { IChatRequestViewModel, IChatResponseViewModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel";
 import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
 import { IChatImageCarouselService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatImageCarouselService.service";
@@ -34,12 +35,15 @@ export interface ICarouselSingleImageArgs {
  * Each request/response pair with images becomes one section containing
  * user attachment images, tool invocation images, and inline reference images.
  */
-export declare function collectCarouselSections(items: (IChatRequestViewModel | IChatResponseViewModel)[], readFile: (uri: URI) => Promise<Uint8Array>): Promise<ICarouselSection[]>;
+export declare function collectCarouselSections(items: (IChatRequestViewModel | IChatResponseViewModel)[], readFile: (uri: URI) => Promise<Uint8Array>, currentInput?: {
+    readonly text: string;
+    readonly attachments: readonly IChatRequestVariableEntry[];
+}): Promise<ICarouselSection[]>;
 /**
  * Finds the global index of the clicked image across all carousel sections.
  * Tries URI string match, then parsed URI equality, then data buffer equality.
  */
-export declare function findClickedImageIndex(sections: ICarouselSection[], resource: URI, data?: Uint8Array): number;
+export declare function findClickedImageIndex(sections: ICarouselSection[], resource: URI, data?: Uint8Array, preferredSectionIndex?: number): number;
 /**
  * Builds the collection arguments for the carousel command.
  */
@@ -54,6 +58,8 @@ export declare class ChatImageCarouselService implements IChatImageCarouselServi
     private readonly fileService;
     readonly _serviceBrand: undefined;
     constructor(chatWidgetService: IChatWidgetService, commandService: ICommandService, fileService: IFileService);
-    openCarouselAtResource(resource: URI, data?: Uint8Array): Promise<void>;
+    openCarouselAtResource(resource: URI, data?: Uint8Array, options?: {
+        readonly preferCurrentInput?: boolean;
+    }): Promise<void>;
     private openSingleImage;
 }

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

@@ -1,5 +1,7 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { renderAsPlaintext } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/markdownRenderer';
+import { stripIcons } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iconLabels';
 import { getMediaMime } from '@codingame/monaco-vscode-api/vscode/vs/base/common/mime';
 import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
@@ -7,11 +9,11 @@ import { VSBuffer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buf
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
-import { extractImagesFromChatResponse, extractImagesFromChatRequest } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/common/chatImageExtraction';
+import { extractImagesFromChatResponse, extractImagesFromChatRequest, extractImagesFromChatVariables } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/common/chatImageExtraction';
 import { isRequestVM, isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 
-async function collectCarouselSections(items, readFile) {
+async function collectCarouselSections(items, readFile, currentInput) {
     const sections = [];
     const requestMap = ( new Map());
     for (const item of items) {
@@ -47,7 +49,7 @@ async function collectCarouselSections(items, readFile) {
                     name,
                     mimeType,
                     data: data.buffer,
-                    caption
+                    caption: toCaptionText(caption)
                 })))
             });
         }
@@ -75,13 +77,44 @@ async function collectCarouselSections(items, readFile) {
                     name,
                     mimeType,
                     data: data.buffer,
-                    caption
+                    caption: toCaptionText(caption)
+                })))
+            });
+        }
+    }
+    if (currentInput) {
+        const inputImages = deduplicateConsecutiveImages(extractImagesFromChatVariables(currentInput.attachments));
+        if (inputImages.length > 0) {
+            sections.push({
+                title: currentInput.text.trim() || ( localize(7030, "Current Input")),
+                images: ( inputImages.map((
+                    {
+                        uri,
+                        name,
+                        mimeType,
+                        data,
+                        caption
+                    }
+                ) => ({
+                    id: ( uri.toString()),
+                    name,
+                    mimeType,
+                    data: data.buffer,
+                    caption: toCaptionText(caption)
                 })))
             });
         }
     }
     return sections;
 }
+function toCaptionText(caption) {
+    if (caption === undefined) {
+        return undefined;
+    }
+    return typeof caption === "string" ? caption : stripIcons(renderAsPlaintext(caption, {
+        useLinkFormatter: true
+    }));
+}
 function deduplicateConsecutiveImages(images) {
     return images.filter((img, index) => {
         if (index === 0) {
@@ -90,7 +123,15 @@ function deduplicateConsecutiveImages(images) {
         return !isEqual(images[index - 1].uri, img.uri);
     });
 }
-function findClickedImageIndex(sections, resource, data) {
+function findClickedImageIndex(sections, resource, data, preferredSectionIndex) {
+    if (preferredSectionIndex !== undefined && preferredSectionIndex >= 0 && preferredSectionIndex < sections.length) {
+        const preferredSection = sections[preferredSectionIndex];
+        const uriIndex = findImageInListByUri(preferredSection.images, resource);
+        const localIndex = uriIndex >= 0 ? uriIndex : (data ? findImageInListByData(preferredSection.images, data) : -1);
+        if (localIndex >= 0) {
+            return sections.slice(0, preferredSectionIndex).reduce((total, section) => total + section.images.length, 0) + localIndex;
+        }
+    }
     let globalOffset = 0;
     for (const section of sections) {
         const localIndex = findImageInListByUri(section.images, resource);
@@ -136,7 +177,7 @@ function findImageInListByData(images, data) {
 }
 function buildCollectionArgs(sections, clickedGlobalIndex, sessionResource) {
     const collectionId = ( sessionResource.toString()) + "_carousel";
-    const defaultTitle = ( localize(6539, "Conversation Images"));
+    const defaultTitle = ( localize(7031, "Conversation Images"));
     return {
         collection: {
             id: collectionId,
@@ -166,7 +207,7 @@ let ChatImageCarouselService = class ChatImageCarouselService {
         this.commandService = commandService;
         this.fileService = fileService;
     }
-    async openCarouselAtResource(resource, data) {
+    async openCarouselAtResource(resource, data, options) {
         const widget = this.chatWidgetService.lastFocusedWidget;
         if (!widget?.viewModel) {
             await this.openSingleImage(resource, data);
@@ -175,7 +216,13 @@ let ChatImageCarouselService = class ChatImageCarouselService {
         const items = widget.viewModel.getItems().filter(item => isRequestVM(item) || isResponseVM(item));
         const readFile = async uri => (await this.fileService.readFile(uri)).value.buffer;
         const sections = await collectCarouselSections(items, readFile);
-        const clickedGlobalIndex = findClickedImageIndex(sections, resource, data);
+        const currentInputSections = await collectCarouselSections([], readFile, {
+            text: widget.getInput(),
+            attachments: widget.attachmentModel.attachments
+        });
+        const preferredSectionIndex = options?.preferCurrentInput && currentInputSections.length > 0 ? sections.length : undefined;
+        sections.push(...currentInputSections);
+        const clickedGlobalIndex = findClickedImageIndex(sections, resource, data, preferredSectionIndex);
         if (clickedGlobalIndex === -1 || sections.length === 0) {
             await this.openSingleImage(resource, data);
             return;

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

@@ -30,7 +30,7 @@ import { EnablementState } from '@codingame/monaco-vscode-api/vscode/vs/workbenc
 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(6540, "Icon for open language models settings commands.")));
+const languageModelsOpenSettingsIcon = registerIcon("language-models-open-settings", Codicon.goToFile, ( localize(7032, "Icon for open language models settings commands.")));
 const LANGUAGE_MODELS_ENTITLEMENT_PRECONDITION = ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
     ChatContextKeys.Entitlement.planFree,
     ChatContextKeys.Entitlement.planEdu,
@@ -43,7 +43,7 @@ const LANGUAGE_MODELS_ENTITLEMENT_PRECONDITION = ( ContextKeyExpr.and(ChatContex
     ChatEntitlementContextKeys.clientByokEnabled
 ))));
 ( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(
-    EditorPaneDescriptor.create(ModelsManagementEditor, ModelsManagementEditor.ID, ( localize(6541, "Models Management Editor"))),
+    EditorPaneDescriptor.create(ModelsManagementEditor, ModelsManagementEditor.ID, ( localize(7033, "Models Management Editor"))),
     [( new SyncDescriptor(ModelsManagementEditorInput))]
 );
 class ModelsManagementEditorInputSerializer {
@@ -73,10 +73,10 @@ async function ensureChatExtensionEnabled(accessor) {
     }
     await progressService.withProgress({
         location: ProgressLocation.Window,
-        title: ( localize(6542, "Enabling AI features…"))
+        title: ( localize(7034, "Enabling AI features…"))
     }, async () => {
         await extensionsWorkbenchService.setEnablement([chatExtension], EnablementState.EnabledGlobally);
-        await extensionsWorkbenchService.updateRunningExtensions(( localize(6543, "Enabling AI features")));
+        await extensionsWorkbenchService.updateRunningExtensions(( localize(7035, "Enabling AI features")));
     });
 }
 let ChatManagementActionsContribution = class ChatManagementActionsContribution extends Disposable {
@@ -94,7 +94,7 @@ let ChatManagementActionsContribution = class ChatManagementActionsContribution
             constructor() {
                 super({
                     id: MANAGE_CHAT_COMMAND_ID,
-                    title: ( localize2(6544, "Manage Language Models")),
+                    title: ( localize2(7036, "Manage Language Models")),
                     category: CHAT_CATEGORY,
                     precondition: LANGUAGE_MODELS_ENTITLEMENT_PRECONDITION,
                     f1: true
@@ -118,7 +118,7 @@ let ChatManagementActionsContribution = class ChatManagementActionsContribution
                         weight: KeybindingWeight.EditorContrib,
                         when: CONTEXT_MODELS_SEARCH_FOCUS
                     },
-                    title: ( localize2(6545, "Clear Models Search Results"))
+                    title: ( localize2(7037, "Clear Models Search Results"))
                 });
             }
             run(accessor) {
@@ -134,7 +134,7 @@ let ChatManagementActionsContribution = class ChatManagementActionsContribution
             constructor() {
                 super({
                     id: "workbench.action.openLanguageModelsJson",
-                    title: ( localize2(6546, "Open Language Models (JSON)")),
+                    title: ( localize2(7038, "Open Language Models (JSON)")),
                     category: CHAT_CATEGORY,
                     precondition: LANGUAGE_MODELS_ENTITLEMENT_PRECONDITION,
                     icon: languageModelsOpenSettingsIcon,
@@ -164,7 +164,7 @@ let ChatManagementActionsContribution = class ChatManagementActionsContribution
         MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
             command: {
                 id: MANAGE_CHAT_COMMAND_ID,
-                title: ( localize2(6544, "Manage Language Models")),
+                title: ( localize2(7036, "Manage Language Models")),
                 icon: languageModelsOpenSettingsIcon
             },
             when: openModelsManagementEditorWhen,

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(6547, "Icon of the Models Management editor label.")));
+const ModelsManagementEditorIcon = registerIcon("models-management-editor-label-icon", Codicon.settings, ( localize(7039, "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(6548, "Language Models");
+        return localize(7040, "Language Models");
     }
     getIcon() {
         return ModelsManagementEditorIcon;

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

@@ -1,16 +1,29 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { ILanguageModelProviderDescriptor } 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 { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { MarkdownString } from "@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent";
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
 import { IContextMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service";
+import { IAction } from "@codingame/monaco-vscode-api/vscode/vs/base/common/actions";
 import { ILanguageModel } from "./chatModelsViewModel.js";
 import { IChatEntitlementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service";
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
 import { IEditorProgressService } from "@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service";
+import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
+import { IExtensionsWorkbenchService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions.service";
 import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
+import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";
 export declare function getModelHoverContent(model: ILanguageModel): MarkdownString;
+/**
+ * Pure helper for building the dropdown actions shown by the **Add Models** button.
+ *
+ * Exposed for unit testing. When `supportsAddingModels` is false, no actions are returned
+ * regardless of the other inputs so that the existing entitlement/managed-by-organization
+ * restriction is preserved.
+ */
+export declare function buildAddModelsDropdownActions(configurableVendors: ILanguageModelProviderDescriptor[], supportsAddingModels: boolean, runVendorAction: (vendor: ILanguageModelProviderDescriptor) => void | Promise<void>): IAction[];
 export declare class ChatModelsWidget extends Disposable {
     private readonly languageModelsService;
     private readonly instantiationService;
@@ -19,8 +32,11 @@ export declare class ChatModelsWidget extends Disposable {
     private readonly chatEntitlementService;
     private readonly editorProgressService;
     private readonly commandService;
+    private readonly editorGroupsService;
     private readonly contextKeyService;
     private readonly dialogService;
+    private readonly extensionsWorkbenchService;
+    private readonly environmentService;
     private static NUM_INSTANCES;
     readonly element: HTMLElement;
     private readonly _onDidChangeItemCount;
@@ -40,10 +56,11 @@ export declare class ChatModelsWidget extends Disposable {
     private delayedFiltering;
     private readonly searchFocusContextKey;
     private readonly tableDisposables;
-    constructor(languageModelsService: ILanguageModelsService, instantiationService: IInstantiationService, extensionService: IExtensionService, contextMenuService: IContextMenuService, chatEntitlementService: IChatEntitlementService, editorProgressService: IEditorProgressService, commandService: ICommandService, contextKeyService: IContextKeyService, dialogService: IDialogService);
+    constructor(languageModelsService: ILanguageModelsService, instantiationService: IInstantiationService, extensionService: IExtensionService, contextMenuService: IContextMenuService, chatEntitlementService: IChatEntitlementService, editorProgressService: IEditorProgressService, commandService: ICommandService, editorGroupsService: IEditorGroupsService, contextKeyService: IContextKeyService, dialogService: IDialogService, extensionsWorkbenchService: IExtensionsWorkbenchService, environmentService: IWorkbenchEnvironmentService);
     private create;
     private createTable;
     private updateAddModelsButton;
+    private openLanguageModelProviderExtensionsSearch;
     private filterModels;
     private addModelsForVendor;
     layout(height: number, width: number): void;