@codingame/monaco-vscode-extensions-service-override 14.0.5 → 15.0.0

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

@@ -47,8 +47,9 @@ let MainThreadFileSystem = MainThreadFileSystem_1 = class MainThreadFileSystem {
         }
         fileProvider.$onFileSystemChange(changes);
     }
-    $stat(uri) {
-        return this._fileService.stat(URI.revive(uri)).then(stat => {
+    async $stat(uri) {
+        try {
+            const stat = await this._fileService.stat(URI.revive(uri));
             return {
                 ctime: stat.ctime,
                 mtime: stat.mtime,
@@ -56,17 +57,24 @@ let MainThreadFileSystem = MainThreadFileSystem_1 = class MainThreadFileSystem {
                 permissions: stat.readonly ? FilePermission.Readonly : undefined,
                 type: MainThreadFileSystem_1._asFileType(stat)
             };
-        }).catch(MainThreadFileSystem_1._handleError);
+        }
+        catch (err) {
+            return MainThreadFileSystem_1._handleError(err);
+        }
     }
-    $readdir(uri) {
-        return this._fileService.resolve(URI.revive(uri), { resolveMetadata: false }).then(stat => {
+    async $readdir(uri) {
+        try {
+            const stat = await this._fileService.resolve(URI.revive(uri), { resolveMetadata: false });
             if (!stat.isDirectory) {
                 const err = ( new Error(stat.name));
                 err.name = FileSystemProviderErrorCode.FileNotADirectory;
                 throw err;
             }
             return !stat.children ? [] : ( stat.children.map(child => [child.name, MainThreadFileSystem_1._asFileType(child)]));
-        }).catch(MainThreadFileSystem_1._handleError);
+        }
+        catch (err) {
+            return MainThreadFileSystem_1._handleError(err);
+        }
     }
     static _asFileType(stat) {
         let res = 0;
@@ -81,27 +89,54 @@ let MainThreadFileSystem = MainThreadFileSystem_1 = class MainThreadFileSystem {
         }
         return res;
     }
-    $readFile(uri) {
-        return this._fileService.readFile(URI.revive(uri)).then(file => file.value).catch(MainThreadFileSystem_1._handleError);
+    async $readFile(uri) {
+        try {
+            const file = await this._fileService.readFile(URI.revive(uri));
+            return file.value;
+        }
+        catch (err) {
+            return MainThreadFileSystem_1._handleError(err);
+        }
     }
-    $writeFile(uri, content) {
-        return this._fileService.writeFile(URI.revive(uri), content)
-            .then(() => undefined).catch(MainThreadFileSystem_1._handleError);
+    async $writeFile(uri, content) {
+        try {
+            await this._fileService.writeFile(URI.revive(uri), content);
+        }
+        catch (err) {
+            return MainThreadFileSystem_1._handleError(err);
+        }
     }
-    $rename(source, target, opts) {
-        return this._fileService.move(URI.revive(source), URI.revive(target), opts.overwrite)
-            .then(() => undefined).catch(MainThreadFileSystem_1._handleError);
+    async $rename(source, target, opts) {
+        try {
+            await this._fileService.move(URI.revive(source), URI.revive(target), opts.overwrite);
+        }
+        catch (err) {
+            return MainThreadFileSystem_1._handleError(err);
+        }
     }
-    $copy(source, target, opts) {
-        return this._fileService.copy(URI.revive(source), URI.revive(target), opts.overwrite)
-            .then(() => undefined).catch(MainThreadFileSystem_1._handleError);
+    async $copy(source, target, opts) {
+        try {
+            await this._fileService.copy(URI.revive(source), URI.revive(target), opts.overwrite);
+        }
+        catch (err) {
+            return MainThreadFileSystem_1._handleError(err);
+        }
     }
-    $mkdir(uri) {
-        return this._fileService.createFolder(URI.revive(uri))
-            .then(() => undefined).catch(MainThreadFileSystem_1._handleError);
+    async $mkdir(uri) {
+        try {
+            await this._fileService.createFolder(URI.revive(uri));
+        }
+        catch (err) {
+            return MainThreadFileSystem_1._handleError(err);
+        }
     }
-    $delete(uri, opts) {
-        return this._fileService.del(URI.revive(uri), opts).catch(MainThreadFileSystem_1._handleError);
+    async $delete(uri, opts) {
+        try {
+            return await this._fileService.del(URI.revive(uri), opts);
+        }
+        catch (err) {
+            return MainThreadFileSystem_1._handleError(err);
+        }
     }
     static _handleError(err) {
         if (err instanceof FileOperationError) {
@@ -164,13 +199,17 @@ class RemoteFileSystemProvider {
     static _createFileChange(dto) {
         return { resource: URI.revive(dto.resource), type: dto.type };
     }
-    stat(resource) {
-        return this._proxy.$stat(this._handle, resource).then(undefined, err => {
+    async stat(resource) {
+        try {
+            return await this._proxy.$stat(this._handle, resource);
+        }
+        catch (err) {
             throw err;
-        });
+        }
     }
-    readFile(resource) {
-        return this._proxy.$readFile(this._handle, resource).then(buffer => buffer.buffer);
+    async readFile(resource) {
+        const buffer = await this._proxy.$readFile(this._handle, resource);
+        return buffer.buffer;
     }
     writeFile(resource, content, opts) {
         return this._proxy.$writeFile(this._handle, resource, VSBuffer.wrap(content), opts);
@@ -196,11 +235,10 @@ class RemoteFileSystemProvider {
     close(fd) {
         return this._proxy.$close(this._handle, fd);
     }
-    read(fd, pos, data, offset, length) {
-        return this._proxy.$read(this._handle, fd, pos, length).then(readData => {
-            data.set(readData.buffer, offset);
-            return readData.byteLength;
-        });
+    async read(fd, pos, data, offset, length) {
+        const readData = await this._proxy.$read(this._handle, fd, pos, length);
+        data.set(readData.buffer, offset);
+        return readData.byteLength;
     }
     write(fd, pos, data, offset, length) {
         return this._proxy.$write(this._handle, fd, pos, VSBuffer.wrap(data).slice(offset, offset + length));

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

@@ -3,7 +3,7 @@ import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/fi
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
 import { MainThreadFileSystemEventServiceShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 import { IWorkingCopyFileService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService.service";
-import { IBulkEditService } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/bulkEditService";
+import { IBulkEditService } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/bulkEditService.service";
 import { IProgressService } from "@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service";
 import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";

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

@@ -7,7 +7,7 @@ import { extHostNamedCustomer } from '../../services/extensions/common/extHostCu
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IWorkingCopyFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService.service';
-import { IBulkEditService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/bulkEditService';
+import { IBulkEditService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/bulkEditService.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 { raceCancellation } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
@@ -75,28 +75,28 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                     if (data.extensionNames.length === 1) {
                         if (operation === FileOperation.CREATE) {
                             message = ( localize(
-                                2328,
+                                2336,
                                 "Extension '{0}' wants to make refactoring changes with this file creation",
                                 data.extensionNames[0]
                             ));
                         }
                         else if (operation === FileOperation.COPY) {
                             message = ( localize(
-                                2329,
+                                2337,
                                 "Extension '{0}' wants to make refactoring changes with this file copy",
                                 data.extensionNames[0]
                             ));
                         }
                         else if (operation === FileOperation.MOVE) {
                             message = ( localize(
-                                2330,
+                                2338,
                                 "Extension '{0}' wants to make refactoring changes with this file move",
                                 data.extensionNames[0]
                             ));
                         }
                         else  {
                             message = ( localize(
-                                2331,
+                                2339,
                                 "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(
-                                2332,
+                                2340,
                                 "{0} extensions want to make refactoring changes with this file creation",
                                 data.extensionNames.length
                             ));
                         }
                         else if (operation === FileOperation.COPY) {
                             message = ( localize(
-                                2333,
+                                2341,
                                 "{0} extensions want to make refactoring changes with this file copy",
                                 data.extensionNames.length
                             ));
                         }
                         else if (operation === FileOperation.MOVE) {
                             message = ( localize(
-                                2334,
+                                2342,
                                 "{0} extensions want to make refactoring changes with this file move",
                                 data.extensionNames.length
                             ));
                         }
                         else  {
                             message = ( localize(
-                                2335,
+                                2343,
                                 "{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(2336, "Show &&Preview")),
-                            cancelButton: ( localize(2337, "Skip Changes"))
+                            primaryButton: ( localize(2344, "Show &&Preview")),
+                            cancelButton: ( localize(2345, "Skip Changes"))
                         });
                         showPreview = true;
                         if (!confirmed) {
@@ -156,19 +156,19 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                             message,
                             buttons: [
                                 {
-                                    label: ( localize(2338, "&&OK")),
+                                    label: ( localize(2346, "&&OK")),
                                     run: () => Choice.OK
                                 },
                                 {
-                                    label: ( localize(2336, "Show &&Preview")),
+                                    label: ( localize(2344, "Show &&Preview")),
                                     run: () => Choice.Preview
                                 }
                             ],
                             cancelButton: {
-                                label: ( localize(2337, "Skip Changes")),
+                                label: ( localize(2345, "Skip Changes")),
                                 run: () => Choice.Cancel
                             },
-                            checkbox: { label: ( localize(2339, "Do not ask me again")) }
+                            checkbox: { label: ( localize(2347, "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(2340, "Running 'File Create' participants...");
+                        return localize(2348, "Running 'File Create' participants...");
                     case FileOperation.MOVE:
-                        return localize(2341, "Running 'File Rename' participants...");
+                        return localize(2349, "Running 'File Rename' participants...");
                     case FileOperation.COPY:
-                        return localize(2342, "Running 'File Copy' participants...");
+                        return localize(2350, "Running 'File Copy' participants...");
                     case FileOperation.DELETE:
-                        return localize(2343, "Running 'File Delete' participants...");
+                        return localize(2351, "Running 'File Delete' participants...");
                     case FileOperation.WRITE:
-                        return localize(2344, "Running 'File Write' participants...");
+                        return localize(2352, "Running 'File Write' participants...");
                 }
             }
         });
@@ -215,10 +215,10 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
             catch (error) {
             }
         }
-        if (correlate) {
+        if (correlate && !opts.recursive) {
             this._logService.trace(`MainThreadFileSystemEventService#$watch(): request to start watching correlated (extension: ${extensionId}, path: ${( uri.toString(true))}, recursive: ${opts.recursive}, session: ${session}, excludes: ${JSON.stringify(opts.excludes)}, includes: ${JSON.stringify(opts.includes)})`);
             const watcherDisposables = ( new DisposableStore());
-            const subscription = watcherDisposables.add(this._fileService.createWatcher(uri, opts));
+            const subscription = watcherDisposables.add(this._fileService.createWatcher(uri, { ...opts, recursive: false }));
             watcherDisposables.add(subscription.onDidChange(event => {
                 this._proxy.$onFileEvent({
                     session,
@@ -264,7 +264,7 @@ registerAction2(class ResetMemento extends Action2 {
         super({
             id: 'files.participants.resetChoice',
             title: {
-                value: ( localize(2345, "Reset choice for 'File operation needs preview'")),
+                value: ( localize(2353, "Reset choice for 'File operation needs preview'")),
                 original: `Reset choice for 'File operation needs preview'`
             },
             f1: true

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

@@ -1,5 +1,5 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { ResourceLabelFormatter } from "@codingame/monaco-vscode-2cbab29e-9393-5de6-b701-9a9555360b6b-common/vscode/vs/platform/label/common/label";
+import { ResourceLabelFormatter } from "@codingame/monaco-vscode-7559b0be-bfa5-5fe6-b731-1973fe9fffa1-common/vscode/vs/platform/label/common/label";
 import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
 import { MainThreadLabelServiceShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";

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

@@ -4,10 +4,10 @@ import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event"
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { Range as EditorRange } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range";
 import * as languages from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
-import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language";
-import { ILanguageConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/languageConfigurationRegistry";
+import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service";
+import { ILanguageConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/languageConfigurationRegistry.service";
 import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
-import { ILanguageFeaturesService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/languageFeatures";
+import { ILanguageFeaturesService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/languageFeatures.service";
 import { ExtensionIdentifier } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions";
 import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
@@ -58,7 +58,7 @@ export declare class MainThreadLanguageFeatures extends Disposable implements Ma
     $registerDocumentRangeSemanticTokensProvider(handle: number, selector: IDocumentFilterDto[], legend: languages.SemanticTokensLegend): void;
     private static _inflateSuggestDto;
     $registerCompletionsProvider(handle: number, selector: IDocumentFilterDto[], triggerCharacters: string[], supportsResolveDetails: boolean, extensionId: ExtensionIdentifier): void;
-    $registerInlineCompletionsSupport(handle: number, selector: IDocumentFilterDto[], supportsHandleEvents: boolean, extensionId: string, yieldsToExtensionIds: string[]): void;
+    $registerInlineCompletionsSupport(handle: number, selector: IDocumentFilterDto[], supportsHandleEvents: boolean, extensionId: string, yieldsToExtensionIds: string[], displayName: string | undefined, debounceDelayMs: number | undefined): void;
     $registerInlineEditProvider(handle: number, selector: IDocumentFilterDto[], extensionId: ExtensionIdentifier, displayName: string): void;
     $registerSignatureHelpProvider(handle: number, selector: IDocumentFilterDto[], metadata: ISignatureHelpProviderMetadataDto): void;
     $registerInlayHintsProvider(handle: number, selector: IDocumentFilterDto[], supportsResolve: boolean, eventHandle: number | undefined, displayName: string | undefined): void;

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

@@ -10,9 +10,9 @@ import { revive } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marsh
 import { mixin } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objects';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { CompletionItemKind } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
-import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language';
-import { ILanguageConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/languageConfigurationRegistry';
-import { ILanguageFeaturesService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/languageFeatures';
+import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service';
+import { ILanguageConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/languageConfigurationRegistry.service';
+import { ILanguageFeaturesService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/languageFeatures.service';
 import { decodeSemanticTokensDto } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/semanticTokensDto';
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { reviveWorkspaceEditDto } from './mainThreadBulkEdits.js';
@@ -496,7 +496,7 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
         }
         this._registrations.set(handle, this._languageFeaturesService.completionProvider.register(selector, provider));
     }
-    $registerInlineCompletionsSupport(handle, selector, supportsHandleEvents, extensionId, yieldsToExtensionIds) {
+    $registerInlineCompletionsSupport(handle, selector, supportsHandleEvents, extensionId, yieldsToExtensionIds, displayName, debounceDelayMs) {
         const provider = {
             provideInlineCompletions: async (model, position, context, token) => {
                 return this._proxy.$provideInlineCompletions(handle, model.uri, position, context, token);
@@ -517,11 +517,18 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
             freeInlineCompletions: (completions) => {
                 this._proxy.$freeInlineCompletionsList(handle, completions.pid);
             },
+            handleRejection: async (completions, item) => {
+                if (supportsHandleEvents) {
+                    await this._proxy.$handleInlineCompletionRejection(handle, completions.pid, item.idx);
+                }
+            },
             groupId: extensionId,
             yieldsToGroupIds: yieldsToExtensionIds,
+            debounceDelayMs,
+            displayName,
             toString() {
                 return `InlineCompletionsProvider(${extensionId})`;
-            }
+            },
         };
         this._registrations.set(handle, this._languageFeaturesService.inlineCompletionsProvider.register(selector, provider));
     }
@@ -846,7 +853,7 @@ let MainThreadPasteEditProvider = class MainThreadPasteEditProvider {
         this.providedPasteEditKinds = metadata.providedPasteEditKinds?.map(kind => ( new HierarchicalKind(kind))) ?? [];
         if (metadata.supportsCopy) {
             this.prepareDocumentPaste = async (model, selections, dataTransfer, token) => {
-                const dataTransferDto = await DataTransfer.from(dataTransfer);
+                const dataTransferDto = await DataTransfer.fromList(dataTransfer);
                 if (token.isCancellationRequested) {
                     return undefined;
                 }
@@ -856,7 +863,7 @@ let MainThreadPasteEditProvider = class MainThreadPasteEditProvider {
                 }
                 const dataTransferOut = ( new VSDataTransfer());
                 for (const [type, item] of newDataTransfer.items) {
-                    dataTransferOut.replace(type, createStringDataTransferItem(item.asString));
+                    dataTransferOut.replace(type, createStringDataTransferItem(item.asString, item.id));
                 }
                 return dataTransferOut;
             };
@@ -865,7 +872,7 @@ let MainThreadPasteEditProvider = class MainThreadPasteEditProvider {
             this.provideDocumentPasteEdits = async (model, selections, dataTransfer, context, token) => {
                 const request = this.dataTransfers.add(dataTransfer);
                 try {
-                    const dataTransferDto = await DataTransfer.from(dataTransfer);
+                    const dataTransferDto = await DataTransfer.fromList(dataTransfer);
                     if (token.isCancellationRequested) {
                         return;
                     }
@@ -898,6 +905,9 @@ let MainThreadPasteEditProvider = class MainThreadPasteEditProvider {
         if (metadata.supportsResolve) {
             this.resolveDocumentPasteEdit = async (edit, token) => {
                 const resolved = await this._proxy.$resolvePasteEdit(this._handle, edit._cacheId, token);
+                if (typeof resolved.insertText !== 'undefined') {
+                    edit.insertText = resolved.insertText;
+                }
                 if (resolved.additionalEdit) {
                     edit.additionalEdit = reviveWorkspaceEditDto(resolved.additionalEdit, this._uriIdentService);
                 }
@@ -933,7 +943,7 @@ let MainThreadDocumentOnDropEditProvider = class MainThreadDocumentOnDropEditPro
     async provideDocumentDropEdits(model, position, dataTransfer, token) {
         const request = this.dataTransfers.add(dataTransfer);
         try {
-            const dataTransferDto = await DataTransfer.from(dataTransfer);
+            const dataTransferDto = await DataTransfer.fromList(dataTransfer);
             if (token.isCancellationRequested) {
                 return;
             }

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

@@ -3,6 +3,7 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { IToolData, IToolInvocation, IToolResult } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService";
 import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+import { Dto } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/proxyIdentifier";
 import { MainThreadLanguageModelToolsShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 export declare class MainThreadLanguageModelTools extends Disposable implements MainThreadLanguageModelToolsShape {
     private readonly _languageModelToolsService;
@@ -11,7 +12,7 @@ export declare class MainThreadLanguageModelTools extends Disposable implements
     private readonly _countTokenCallbacks;
     constructor(extHostContext: IExtHostContext, _languageModelToolsService: ILanguageModelToolsService);
     $getTools(): Promise<IToolData[]>;
-    $invokeTool(dto: IToolInvocation, token?: CancellationToken): Promise<IToolResult>;
+    $invokeTool(dto: IToolInvocation, token?: CancellationToken): Promise<Dto<IToolResult>>;
     $countTokensForInvocation(callId: string, input: string, token: CancellationToken): Promise<number>;
     $registerTool(id: string): void;
     $unregisterTool(name: string): void;

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

@@ -2,6 +2,7 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Disposable, DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { revive } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshalling';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
@@ -19,7 +20,10 @@ let MainThreadLanguageModelTools = class MainThreadLanguageModelTools extends Di
         return Array.from(this._languageModelToolsService.getTools());
     }
     async $invokeTool(dto, token) {
-        return await this._languageModelToolsService.invokeTool(dto, (input, token) => this._proxy.$countTokensForInvocation(dto.callId, input, token), token ?? CancellationToken.None);
+        const result = await this._languageModelToolsService.invokeTool(dto, (input, token) => this._proxy.$countTokensForInvocation(dto.callId, input, token), token ?? CancellationToken.None);
+        return {
+            content: result.content,
+        };
     }
     $countTokensForInvocation(callId, input, token) {
         const fn = this._countTokenCallbacks.get(callId);
@@ -33,7 +37,8 @@ let MainThreadLanguageModelTools = class MainThreadLanguageModelTools extends Di
             invoke: async (dto, countTokens, token) => {
                 try {
                     this._countTokenCallbacks.set(dto.callId, countTokens);
-                    return await this._proxy.$invokeTool(dto, token);
+                    const resultDto = await this._proxy.$invokeTool(dto, token);
+                    return revive(resultDto);
                 }
                 finally {
                     this._countTokenCallbacks.delete(dto.callId);

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

@@ -106,7 +106,14 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
     }
     async $tryStartChatRequest(extension, providerId, requestId, messages, options, token) {
         this._logService.trace('[CHAT] request STARTED', extension.value, requestId);
-        const response = await this._chatProviderService.sendChatRequest(providerId, extension, messages, options, token);
+        let response;
+        try {
+            response = await this._chatProviderService.sendChatRequest(providerId, extension, messages, options, token);
+        }
+        catch (err) {
+            this._logService.error('[CHAT] request FAILED', extension.value, requestId, err);
+            throw err;
+        }
         const streaming = (async () => {
             try {
                 for await (const part of response.stream) {
@@ -136,7 +143,7 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
         if (this._authenticationService.getProviderIds().includes(authProviderId)) {
             return Disposable.None;
         }
-        const accountLabel = auth.accountLabel ?? ( localize(2346, 'Language Models'));
+        const accountLabel = auth.accountLabel ?? ( localize(2354, '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/mainThreadLanguages.d.ts

@@ -1,12 +1,12 @@
 import { UriComponents } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language";
-import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model";
+import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service";
+import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
 import { MainThreadLanguagesShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
 import { IPosition } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/position";
 import { IRange } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range";
 import { StandardTokenType } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/encodedTokenAttributes";
-import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService";
+import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
 import { ILanguageStatus } from "@codingame/monaco-vscode-languages-service-override/vscode/vs/workbench/services/languageStatus/common/languageStatusService";
 import { ILanguageStatusService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/languageStatus/common/languageStatusService.service";
 export declare class MainThreadLanguages implements MainThreadLanguagesShape {

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

@@ -1,12 +1,12 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
-import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language';
-import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model';
+import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service';
+import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
-import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService';
+import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
 import { ILanguageStatusService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/languageStatus/common/languageStatusService.service';
 import { DisposableStore, DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 

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

@@ -51,13 +51,13 @@ let MainThreadMessageService = class MainThreadMessageService {
                 };
             }
             if (!source) {
-                source = ( localize(2347, "Extension"));
+                source = ( localize(2355, "Extension"));
             }
             const secondaryActions = [];
             if (options.source) {
                 secondaryActions.push(toAction({
                     id: options.source.identifier.value,
-                    label: ( localize(2348, "Manage Extension")),
+                    label: ( localize(2356, "Manage Extension")),
                     run: () => {
                         return this._commandService.executeCommand('_extensions.manage', options.source.identifier.value);
                     }
@@ -92,13 +92,13 @@ let MainThreadMessageService = class MainThreadMessageService {
         if (!cancelButton) {
             if (buttons.length > 0) {
                 cancelButton = {
-                    label: ( localize(2349, "Cancel")),
+                    label: ( localize(2357, "Cancel")),
                     run: () => undefined
                 };
             }
             else {
                 cancelButton = {
-                    label: ( localize(2350, "&&OK")),
+                    label: ( localize(2358, "&&OK")),
                     run: () => undefined
                 };
             }

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

@@ -11,7 +11,7 @@ import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { NotebookDto } from './mainThreadNotebookDto.js';
 import { INotebookCellStatusBarService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCellStatusBarService.service';
-import { SimpleNotebookProviderInfo } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService';
+import { SimpleNotebookProviderInfo } from '@codingame/monaco-vscode-9b5a5e82-d649-5455-b4bf-ef90d6afd294-common/vscode/vs/workbench/contrib/notebook/common/notebookService';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { SerializableObjectWithBuffers } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/proxyIdentifier';

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

@@ -8,8 +8,8 @@ import { MainThreadNotebookDocuments } from './mainThreadNotebookDocuments.js';
 import { NotebookDto } from './mainThreadNotebookDto.js';
 import { MainThreadNotebookEditors } from './mainThreadNotebookEditors.js';
 import { extHostCustomer } from '../../services/extensions/common/extHostCustomers.js';
-import { editorGroupToColumn } from '@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
-import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { editorGroupToColumn } from '@codingame/monaco-vscode-38f25ab8-ea30-5ba9-8a08-ae3308c297c0-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
+import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { INotebookEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';

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

@@ -1,6 +1,6 @@
 import * as extHostProtocol from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 import * as notebookCommon from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
-import { ICellExecuteUpdate, ICellExecutionComplete } from "@codingame/monaco-vscode-af5ccfda-af82-504b-b365-92b4e654e5c5-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService";
+import { ICellExecuteUpdate, ICellExecutionComplete } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService";
 export declare namespace NotebookDto {
     function toNotebookOutputItemDto(item: notebookCommon.IOutputItemDto): extHostProtocol.NotebookOutputItemDto;
     function toNotebookOutputDto(output: notebookCommon.IOutputDto): extHostProtocol.NotebookOutputDto;