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

package/vscode/src/vs/workbench/api/browser/mainThreadComments.js

@@ -1,7 +1,7 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { DisposableStore, DisposableMap, Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { DisposableStore, DisposableMap, Disposable, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { CommentThreadCollapsibleState } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
@@ -14,7 +14,7 @@ import { COMMENTS_VIEW_ID, COMMENTS_VIEW_STORAGE_ID, COMMENTS_VIEW_TITLE } from
 import { Extensions, ViewContainerLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
 import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service';
 import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/descriptors';
-import { ViewPaneContainer } from '@codingame/monaco-vscode-12c5f9eb-72d3-57ca-babd-5bef7aa9de3b-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPaneContainer } from '@codingame/monaco-vscode-b1110435-a331-5549-ab1e-aa3d763c3a1f-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 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 { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
@@ -423,7 +423,7 @@ class MainThreadCommentController {
         };
     }
 }
-const commentsViewIcon = registerIcon('comments-view-icon', Codicon.commentDiscussion, ( localize(2335, 'View icon of the comments view.')));
+const commentsViewIcon = registerIcon('comments-view-icon', Codicon.commentDiscussion, ( localize(2374, 'View icon of the comments view.')));
 let MainThreadComments = class MainThreadComments extends Disposable {
     constructor(extHostContext, _commentService, _viewsService, _viewDescriptorService, _uriIdentityService, _editorService) {
         super();
@@ -435,7 +435,9 @@ let MainThreadComments = class MainThreadComments extends Disposable {
         this._handlers = ( new Map());
         this._commentControllers = ( new Map());
         this._activeEditingCommentThreadDisposables = this._register(( new DisposableStore()));
-        this._openViewListener = null;
+        this._openViewListener = this._register(( new MutableDisposable()));
+        this._onChangeContainerListener = this._register(( new MutableDisposable()));
+        this._onChangeContainerLocationListener = this._register(( new MutableDisposable()));
         this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostComments));
         this._commentService.unregisterCommentController();
         this._register(this._commentService.onDidChangeActiveEditingCommentThread(async (thread) => {
@@ -455,11 +457,12 @@ let MainThreadComments = class MainThreadComments extends Disposable {
         const provider = ( new MainThreadCommentController(this._proxy, this._commentService, handle, providerId, id, label, {}));
         this._commentService.registerCommentController(providerId, provider);
         this._commentControllers.set(handle, provider);
-        const commentsPanelAlreadyConstructed = !!this._viewDescriptorService.getViewDescriptorById(COMMENTS_VIEW_ID);
-        if (!commentsPanelAlreadyConstructed) {
-            this.registerView(commentsPanelAlreadyConstructed);
-        }
-        this.registerViewListeners(commentsPanelAlreadyConstructed);
+        this._register(this._commentService.onResourceHasCommentingRanges(e => {
+            this.registerView();
+        }));
+        this._register(this._commentService.onDidUpdateCommentThreads(e => {
+            this.registerView();
+        }));
         this._commentService.setWorkspaceComments(String(handle), []);
     }
     $unregisterCommentController(handle) {
@@ -531,8 +534,9 @@ let MainThreadComments = class MainThreadComments extends Disposable {
         }
         thread.collapsibleState = CommentThreadCollapsibleState.Collapsed;
     }
-    registerView(commentsViewAlreadyRegistered) {
-        if (!commentsViewAlreadyRegistered) {
+    registerView() {
+        const commentsPanelAlreadyConstructed = !!this._viewDescriptorService.getViewDescriptorById(COMMENTS_VIEW_ID);
+        if (!commentsPanelAlreadyConstructed) {
             const VIEW_CONTAINER = ( Registry.as(Extensions.ViewContainersRegistry)).registerViewContainer({
                 id: COMMENTS_VIEW_ID,
                 title: COMMENTS_VIEW_TITLE,
@@ -557,6 +561,7 @@ let MainThreadComments = class MainThreadComments extends Disposable {
                     }
                 }], VIEW_CONTAINER);
         }
+        this.registerViewListeners(commentsPanelAlreadyConstructed);
     }
     setComments() {
         [...( this._commentControllers.keys())].forEach(handle => {
@@ -568,13 +573,12 @@ let MainThreadComments = class MainThreadComments extends Disposable {
         });
     }
     registerViewOpenedListener() {
-        if (!this._openViewListener) {
-            this._openViewListener = this._viewsService.onDidChangeViewVisibility(e => {
+        if (!this._openViewListener.value) {
+            this._openViewListener.value = this._viewsService.onDidChangeViewVisibility(e => {
                 if (e.id === COMMENTS_VIEW_ID && e.visible) {
                     this.setComments();
                     if (this._openViewListener) {
                         this._openViewListener.dispose();
-                        this._openViewListener = null;
                     }
                 }
             });
@@ -584,19 +588,23 @@ let MainThreadComments = class MainThreadComments extends Disposable {
         if (!commentsPanelAlreadyConstructed) {
             this.registerViewOpenedListener();
         }
-        this._register(this._viewDescriptorService.onDidChangeContainer(e => {
-            if (e.views.find(view => view.id === COMMENTS_VIEW_ID)) {
-                this.setComments();
-                this.registerViewOpenedListener();
-            }
-        }));
-        this._register(this._viewDescriptorService.onDidChangeContainerLocation(e => {
-            const commentsContainer = this._viewDescriptorService.getViewContainerByViewId(COMMENTS_VIEW_ID);
-            if (e.viewContainer.id === commentsContainer?.id) {
-                this.setComments();
-                this.registerViewOpenedListener();
-            }
-        }));
+        if (!this._onChangeContainerListener.value) {
+            this._onChangeContainerListener.value = this._viewDescriptorService.onDidChangeContainer(e => {
+                if (e.views.find(view => view.id === COMMENTS_VIEW_ID)) {
+                    this.setComments();
+                    this.registerViewOpenedListener();
+                }
+            });
+        }
+        if (!this._onChangeContainerLocationListener.value) {
+            this._onChangeContainerLocationListener.value = this._viewDescriptorService.onDidChangeContainerLocation(e => {
+                const commentsContainer = this._viewDescriptorService.getViewContainerByViewId(COMMENTS_VIEW_ID);
+                if (e.viewContainer.id === commentsContainer?.id) {
+                    this.setComments();
+                    this.registerViewOpenedListener();
+                }
+            });
+        }
     }
     getHandler(handle) {
         if (!( this._handlers.has(handle))) {

package/vscode/src/vs/workbench/api/browser/mainThreadCustomEditors.js

@@ -126,7 +126,8 @@ let MainThreadCustomEditors = class MainThreadCustomEditors extends Disposable {
                     modelRef.dispose();
                     return;
                 }
-                webviewInput.webview.onDidDispose(() => {
+                const disposeSub = webviewInput.webview.onDidDispose(() => {
+                    disposeSub.dispose();
                     if (modelRef.object.isDirty()) {
                         const sub = modelRef.object.onDidChangeDirty(() => {
                             if (!modelRef.object.isDirty()) {
@@ -301,7 +302,7 @@ let MainThreadCustomEditorModel = MainThreadCustomEditorModel_1 = class MainThre
             this._register(workingCopyService.registerWorkingCopy(this));
             this._register(extensionService.onWillStop(e => {
                 e.veto(true, ( localize(
-                    2336,
+                    2375,
                     "An extension provided editor for '{0}' is still open that would close otherwise.",
                     this.name
                 )));
@@ -369,7 +370,7 @@ let MainThreadCustomEditorModel = MainThreadCustomEditorModel_1 = class MainThre
         this._undoService.pushElement({
             type: UndoRedoElementType.Resource,
             resource: this._editorResource,
-            label: label ?? ( localize(2337, "Edit")),
+            label: label ?? ( localize(2376, "Edit")),
             code: 'undoredo.customEditorEdit',
             undo: () => this.undo(),
             redo: () => this.redo(),

package/vscode/src/vs/workbench/api/browser/mainThreadEditSessionIdentityParticipant.js

@@ -14,7 +14,7 @@ class ExtHostEditSessionIdentityCreateParticipant {
     }
     async participate(workspaceFolder, token) {
         const p = ( new Promise((resolve, reject) => {
-            setTimeout(() => reject(( new Error(( localize(2338, "Aborted onWillCreateEditSessionIdentity-event after 10000ms"))))), this.timeout);
+            setTimeout(() => reject(( new Error(( localize(2377, "Aborted onWillCreateEditSessionIdentity-event after 10000ms"))))), this.timeout);
             this._proxy.$onWillCreateEditSessionIdentity(workspaceFolder.uri, token, this.timeout).then(resolve, reject);
         }));
         return raceCancellationError(p, token);

package/vscode/src/vs/workbench/api/browser/mainThreadEditorTabs.js

@@ -16,7 +16,7 @@ import { ChatEditorInput } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-955
 import { CustomEditorInput } from '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/customEditor/browser/customEditorInput';
 import { InteractiveEditorInput } from '@codingame/monaco-vscode-eba0b9b3-174c-5dae-9867-a37810ca1808-common/vscode/vs/workbench/contrib/interactive/browser/interactiveEditorInput';
 import { MergeEditorInput } from '@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
-import { MultiDiffEditorInput } from '@codingame/monaco-vscode-168b98e5-dc20-5807-b1f9-798f1f92b37f-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
+import { MultiDiffEditorInput } from '@codingame/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
 import { NotebookEditorInput } from '@codingame/monaco-vscode-9b5a5e82-d649-5455-b4bf-ef90d6afd294-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
 import { TerminalEditorInput } from '@codingame/monaco-vscode-42931eb9-e564-530c-bafc-fa23ab43a070-common/vscode/vs/workbench/contrib/terminal/browser/terminalEditorInput';
 import { WebviewInput } from '@codingame/monaco-vscode-9b5a5e82-d649-5455-b4bf-ef90d6afd294-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';

package/vscode/src/vs/workbench/api/browser/mainThreadExtensionService.js

@@ -89,13 +89,13 @@ let MainThreadExtensionService = class MainThreadExtensionService {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    2339,
+                    2378,
                     "Cannot activate the '{0}' extension because it depends on the '{1}' extension, which is not loaded. Would you like to reload the window to load the extension?",
                     extName,
                     missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
                 )),
                 actions: {
-                    primary: [( new Action('reload', ( localize(2340, "Reload Window")), '', true, () => this._hostService.reload()))]
+                    primary: [( new Action('reload', ( localize(2379, "Reload Window")), '', true, () => this._hostService.reload()))]
                 }
             });
         }
@@ -105,7 +105,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2341,
+                        2380,
                         "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is not supported in the current workspace",
                         extName,
                         missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
@@ -116,13 +116,13 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2342,
+                        2381,
                         "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is not supported in Restricted Mode",
                         extName,
                         missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
                     )),
                     actions: {
-                        primary: [( new Action('manageWorkspaceTrust', ( localize(2343, "Manage Workspace Trust")), '', true, () => this._commandService.executeCommand('workbench.trust.manage')))]
+                        primary: [( new Action('manageWorkspaceTrust', ( localize(2382, "Manage Workspace Trust")), '', true, () => this._commandService.executeCommand('workbench.trust.manage')))]
                     }
                 });
             }
@@ -130,13 +130,13 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2344,
+                        2383,
                         "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is disabled. Would you like to enable the extension and reload the window?",
                         extName,
                         missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
                     )),
                     actions: {
-                        primary: [( new Action('enable', ( localize(2345, "Enable and Reload")), '', true, () => this._extensionEnablementService.setEnablement([missingInstalledDependency], enablementState === EnablementState.DisabledGlobally ? EnablementState.EnabledGlobally : EnablementState.EnabledWorkspace)
+                        primary: [( new Action('enable', ( localize(2384, "Enable and Reload")), '', true, () => this._extensionEnablementService.setEnablement([missingInstalledDependency], enablementState === EnablementState.DisabledGlobally ? EnablementState.EnabledGlobally : EnablementState.EnabledWorkspace)
                                 .then(() => this._hostService.reload(), e => this._notificationService.error(e))))]
                     }
                 });
@@ -145,7 +145,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2346,
+                        2385,
                         "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is disabled.",
                         extName,
                         missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
@@ -166,21 +166,21 @@ let MainThreadExtensionService = class MainThreadExtensionService {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    2347,
+                    2386,
                     "Cannot activate the '{0}' extension because it depends on the '{1}' extension from '{2}', which is not installed. Would you like to install the extension and reload the window?",
                     extName,
                     dependencyExtension.displayName,
                     dependencyExtension.publisherDisplayName
                 )),
                 actions: {
-                    primary: [( new Action('install', ( localize(2348, "Install and Reload")), '', true, () => this._extensionsWorkbenchService.install(dependencyExtension)
+                    primary: [( new Action('install', ( localize(2387, "Install and Reload")), '', true, () => this._extensionsWorkbenchService.install(dependencyExtension)
                             .then(() => this._hostService.reload(), e => this._notificationService.error(e))))]
                 }
             });
         }
         else {
             this._notificationService.error(( localize(
-                2349,
+                2388,
                 "Cannot activate the '{0}' extension because it depends on an unknown '{1}' extension.",
                 extName,
                 missingDependency

package/vscode/src/vs/workbench/api/browser/mainThreadFileSystemEventService.js

@@ -75,28 +75,28 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                     if (data.extensionNames.length === 1) {
                         if (operation === FileOperation.CREATE) {
                             message = ( localize(
-                                2350,
+                                2389,
                                 "Extension '{0}' wants to make refactoring changes with this file creation",
                                 data.extensionNames[0]
                             ));
                         }
                         else if (operation === FileOperation.COPY) {
                             message = ( localize(
-                                2351,
+                                2390,
                                 "Extension '{0}' wants to make refactoring changes with this file copy",
                                 data.extensionNames[0]
                             ));
                         }
                         else if (operation === FileOperation.MOVE) {
                             message = ( localize(
-                                2352,
+                                2391,
                                 "Extension '{0}' wants to make refactoring changes with this file move",
                                 data.extensionNames[0]
                             ));
                         }
                         else  {
                             message = ( localize(
-                                2353,
+                                2392,
                                 "Extension '{0}' wants to make refactoring changes with this file deletion",
                                 data.extensionNames[0]
                             ));
@@ -105,28 +105,28 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                     else {
                         if (operation === FileOperation.CREATE) {
                             message = ( localize(
-                                2354,
+                                2393,
                                 "{0} extensions want to make refactoring changes with this file creation",
                                 data.extensionNames.length
                             ));
                         }
                         else if (operation === FileOperation.COPY) {
                             message = ( localize(
-                                2355,
+                                2394,
                                 "{0} extensions want to make refactoring changes with this file copy",
                                 data.extensionNames.length
                             ));
                         }
                         else if (operation === FileOperation.MOVE) {
                             message = ( localize(
-                                2356,
+                                2395,
                                 "{0} extensions want to make refactoring changes with this file move",
                                 data.extensionNames.length
                             ));
                         }
                         else  {
                             message = ( localize(
-                                2357,
+                                2396,
                                 "{0} extensions want to make refactoring changes with this file deletion",
                                 data.extensionNames.length
                             ));
@@ -136,8 +136,8 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                         const { confirmed } = await dialogService.confirm({
                             type: Severity.Info,
                             message,
-                            primaryButton: ( localize(2358, "Show &&Preview")),
-                            cancelButton: ( localize(2359, "Skip Changes"))
+                            primaryButton: ( localize(2397, "Show &&Preview")),
+                            cancelButton: ( localize(2398, "Skip Changes"))
                         });
                         showPreview = true;
                         if (!confirmed) {
@@ -156,19 +156,19 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                             message,
                             buttons: [
                                 {
-                                    label: ( localize(2360, "&&OK")),
+                                    label: ( localize(2399, "&&OK")),
                                     run: () => Choice.OK
                                 },
                                 {
-                                    label: ( localize(2358, "Show &&Preview")),
+                                    label: ( localize(2397, "Show &&Preview")),
                                     run: () => Choice.Preview
                                 }
                             ],
                             cancelButton: {
-                                label: ( localize(2359, "Skip Changes")),
+                                label: ( localize(2398, "Skip Changes")),
                                 run: () => Choice.Cancel
                             },
-                            checkbox: { label: ( localize(2361, "Do not ask me again")) }
+                            checkbox: { label: ( localize(2400, "Do not ask me again")) }
                         });
                         if (result === Choice.Cancel) {
                             return;
@@ -185,15 +185,15 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
             _progressLabel(operation) {
                 switch (operation) {
                     case FileOperation.CREATE:
-                        return localize(2362, "Running 'File Create' participants...");
+                        return localize(2401, "Running 'File Create' participants...");
                     case FileOperation.MOVE:
-                        return localize(2363, "Running 'File Rename' participants...");
+                        return localize(2402, "Running 'File Rename' participants...");
                     case FileOperation.COPY:
-                        return localize(2364, "Running 'File Copy' participants...");
+                        return localize(2403, "Running 'File Copy' participants...");
                     case FileOperation.DELETE:
-                        return localize(2365, "Running 'File Delete' participants...");
+                        return localize(2404, "Running 'File Delete' participants...");
                     case FileOperation.WRITE:
-                        return localize(2366, "Running 'File Write' participants...");
+                        return localize(2405, "Running 'File Write' participants...");
                 }
             }
         });
@@ -264,7 +264,7 @@ registerAction2(class ResetMemento extends Action2 {
         super({
             id: 'files.participants.resetChoice',
             title: {
-                value: ( localize(2367, "Reset choice for 'File operation needs preview'")),
+                value: ( localize(2406, "Reset choice for 'File operation needs preview'")),
                 original: `Reset choice for 'File operation needs preview'`
             },
             f1: true

package/vscode/src/vs/workbench/api/browser/mainThreadLanguageModels.d.ts

@@ -11,6 +11,7 @@ import { IAuthenticationAccessService } from "@codingame/monaco-vscode-api/vscod
 import { IAuthenticationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication.service";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
+import { SerializableObjectWithBuffers } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/proxyIdentifier";
 import { MainThreadLanguageModelsShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 export declare class MainThreadLanguageModels implements MainThreadLanguageModelsShape {
     private readonly _chatProviderService;
@@ -33,7 +34,7 @@ export declare class MainThreadLanguageModels implements MainThreadLanguageModel
     $unregisterProvider(handle: number): void;
     $selectChatModels(selector: ILanguageModelChatSelector): Promise<string[]>;
     $whenLanguageModelChatRequestMade(identifier: string, extensionId: ExtensionIdentifier, participant?: string | undefined, tokenCount?: number | undefined): void;
-    $tryStartChatRequest(extension: ExtensionIdentifier, providerId: string, requestId: number, messages: IChatMessage[], options: {}, token: CancellationToken): Promise<any>;
+    $tryStartChatRequest(extension: ExtensionIdentifier, providerId: string, requestId: number, messages: SerializableObjectWithBuffers<IChatMessage[]>, options: {}, token: CancellationToken): Promise<any>;
     $countTokens(provider: string, value: string | IChatMessage, token: CancellationToken): Promise<number>;
     private _registerAuthenticationProvider;
     $fileIsIgnored(uri: UriComponents, token: CancellationToken): Promise<boolean>;

package/vscode/src/vs/workbench/api/browser/mainThreadLanguageModels.js

@@ -1,12 +1,14 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { DeferredPromise, AsyncIterableSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import { VSBuffer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
 import { transformErrorFromSerialization, transformErrorForSerialization } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { DisposableStore, DisposableMap, Disposable, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { resizeImage } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/imageUtils';
 import { ILanguageModelIgnoredFilesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/ignoredFiles.service';
 import { ILanguageModelStatsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelStats.service';
 import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
@@ -15,6 +17,7 @@ import { INTERNAL_AUTH_PROVIDER_PREFIX } from '@codingame/monaco-vscode-api/vsco
 import { IAuthenticationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication.service';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
+import { SerializableObjectWithBuffers } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/proxyIdentifier';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { LanguageModelError } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHostTypes';
 
@@ -52,7 +55,12 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
                 const stream = ( new AsyncIterableSource());
                 try {
                     this._pendingProgress.set(requestId, { defer, stream });
-                    await this._proxy.$startChatRequest(handle, requestId, from, messages, options, token);
+                    await Promise.all(( messages.flatMap(msg => msg.content)
+                        .filter(part => part.type === 'image_url')
+                        .map(async (part) => {
+                        part.value.data = VSBuffer.wrap(await resizeImage(part.value.data.buffer));
+                    })));
+                    await this._proxy.$startChatRequest(handle, requestId, from, ( new SerializableObjectWithBuffers(messages)), options, token);
                 }
                 catch (err) {
                     this._pendingProgress.delete(requestId);
@@ -108,7 +116,7 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
         this._logService.trace('[CHAT] request STARTED', extension.value, requestId);
         let response;
         try {
-            response = await this._chatProviderService.sendChatRequest(providerId, extension, messages, options, token);
+            response = await this._chatProviderService.sendChatRequest(providerId, extension, messages.value, options, token);
         }
         catch (err) {
             this._logService.error('[CHAT] request FAILED', extension.value, requestId, err);
@@ -143,7 +151,7 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
         if (this._authenticationService.getProviderIds().includes(authProviderId)) {
             return Disposable.None;
         }
-        const accountLabel = auth.accountLabel ?? ( localize(2368, 'Language Models'));
+        const accountLabel = auth.accountLabel ?? ( localize(2407, 'Language Models'));
         const disposables = ( new DisposableStore());
         this._authenticationService.registerAuthenticationProvider(authProviderId, ( new LanguageModelAccessAuthProvider(authProviderId, auth.providerLabel, accountLabel)));
         disposables.add(toDisposable(() => {

package/vscode/src/vs/workbench/api/browser/mainThreadManagedSockets.js

@@ -2,7 +2,7 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { SocketCloseEventType } from '@codingame/monaco-vscode-bd6ad8b7-9db3-51a8-9895-0046508c029d-common/vscode/vs/base/parts/ipc/common/ipc.net';
+import { SocketCloseEventType } from '@codingame/monaco-vscode-4a3ac544-9a61-534c-88df-756262793ef7-common/vscode/vs/base/parts/ipc/common/ipc.net';
 import { ManagedSocket, connectManagedSocket } from '../../../platform/remote/common/managedSocket.js';
 import { RemoteConnectionType } from '@codingame/monaco-vscode-api/vscode/vs/platform/remote/common/remoteAuthorityResolver';
 import { IRemoteSocketFactoryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/remote/common/remoteSocketFactoryService.service';

package/vscode/src/vs/workbench/api/browser/mainThreadMcp.d.ts

@@ -0,0 +1,22 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { LogLevel } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log";
+import { IMcpRegistry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service";
+import { McpCollectionDefinition, McpConnectionState, McpServerDefinition } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes";
+import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+import { MainThreadMcpShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
+export declare class MainThreadMcp extends Disposable implements MainThreadMcpShape {
+    private readonly _extHostContext;
+    private readonly _mcpRegistry;
+    private _serverIdCounter;
+    private readonly _servers;
+    private readonly _collectionDefinitions;
+    private readonly _mcpEnabled;
+    constructor(_extHostContext: IExtHostContext, _mcpRegistry: IMcpRegistry, configurationService: IConfigurationService);
+    $upsertMcpCollection(collection: McpCollectionDefinition.FromExtHost, serversDto: McpServerDefinition.Serialized[]): void;
+    $deleteMcpCollection(collectionId: string): void;
+    $onDidChangeState(id: number, update: McpConnectionState): void;
+    $onDidPublishLog(id: number, level: LogLevel, log: string): void;
+    $onDidReceiveMessage(id: number, message: string): void;
+    dispose(): void;
+}