@codingame/monaco-vscode-extensions-service-override 10.1.3 → 11.0.0

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

@@ -1,15 +1,15 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
-import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
+import { DisposableStore, DisposableMap, Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { CommentThreadCollapsibleState } from 'vscode/vscode/vs/editor/common/languages';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { ICommentService } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentService.service';
-import { CommentsPanel } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentsView';
+import { CommentsPanel } from '@codingame/monaco-vscode-comments-extensions-common/vscode/vs/workbench/contrib/comments/browser/commentsView';
 import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
-import { COMMENTS_VIEW_ID, COMMENTS_VIEW_TITLE, COMMENTS_VIEW_STORAGE_ID } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentsTreeViewer';
+import { COMMENTS_VIEW_ID, COMMENTS_VIEW_TITLE, COMMENTS_VIEW_STORAGE_ID } from '@codingame/monaco-vscode-comments-extensions-common/vscode/vs/workbench/contrib/comments/browser/commentsTreeViewer';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/views';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
@@ -19,7 +19,7 @@ import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistr
 import { localize } from 'vscode/vscode/vs/nls';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
-import { revealCommentThread } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentsController';
+import { revealCommentThread } from '@codingame/monaco-vscode-comments-extensions-common/vscode/vs/workbench/contrib/comments/browser/commentsController';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 
@@ -71,6 +71,9 @@ class MainThreadCommentThread {
         return this._collapsibleState;
     }
     set collapsibleState(newState) {
+        if (this.initialCollapsibleState === undefined) {
+            this.initialCollapsibleState = newState;
+        }
         if (newState !== this._collapsibleState) {
             this._collapsibleState = newState;
             this._onDidChangeCollapsibleState.fire(this._collapsibleState);
@@ -81,9 +84,6 @@ class MainThreadCommentThread {
     }
     set initialCollapsibleState(initialCollapsibleState) {
         this._initialCollapsibleState = initialCollapsibleState;
-        if (this.collapsibleState === undefined) {
-            this.collapsibleState = this.initialCollapsibleState;
-        }
         this._onDidChangeInitialCollapsibleState.fire(initialCollapsibleState);
     }
     get isDisposed() {
@@ -155,7 +155,7 @@ class MainThreadCommentThread {
             this.comments = changes.comments;
         }
         if (modified('collapseState')) {
-            this.initialCollapsibleState = changes.collapseState;
+            this.collapsibleState = changes.collapseState;
         }
         if (modified('canReply')) {
             this.canReply = changes.canReply;
@@ -189,6 +189,15 @@ class MainThreadCommentThread {
         };
     }
 }
+class CommentThreadWithDisposable {
+    constructor(thread) {
+        this.thread = thread;
+        this.disposableStore = ( (new DisposableStore()));
+    }
+    dispose() {
+        this.disposableStore.dispose();
+    }
+}
 class MainThreadCommentController {
     get handle() {
         return this._handle;
@@ -228,7 +237,7 @@ class MainThreadCommentController {
         this._id = _id;
         this._label = _label;
         this._features = _features;
-        this._threads = ( (new Map()));
+        this._threads = ( (new DisposableMap()));
     }
     get activeComment() {
         return this._activeComment;
@@ -253,7 +262,11 @@ class MainThreadCommentController {
             isTemplate,
             editorId
         )));
-        this._threads.set(commentThreadHandle, thread);
+        const threadWithDisposable = ( (new CommentThreadWithDisposable(thread)));
+        this._threads.set(commentThreadHandle, threadWithDisposable);
+        threadWithDisposable.disposableStore.add(thread.onDidChangeCollapsibleState(() => {
+            this.proxy.$updateCommentThread(this.handle, thread.commentThreadHandle, { collapseState: thread.collapsibleState });
+        }));
         if (thread.isDocumentCommentThread()) {
             this._commentService.updateComments(this._uniqueId, {
                 added: [thread],
@@ -294,7 +307,7 @@ class MainThreadCommentController {
     }
     deleteCommentThread(commentThreadHandle) {
         const thread = this.getKnownThread(commentThreadHandle);
-        this._threads.delete(commentThreadHandle);
+        this._threads.deleteAndDispose(commentThreadHandle);
         thread.dispose();
         if (thread.isDocumentCommentThread()) {
             this._commentService.updateComments(this._uniqueId, {
@@ -314,11 +327,11 @@ class MainThreadCommentController {
         }
     }
     deleteCommentThreadMain(commentThreadId) {
-        this._threads.forEach(thread => {
+        for (const { thread } of ( (this._threads.values()))) {
             if (thread.threadId === commentThreadId) {
                 this._proxy.$deleteCommentThread(this._handle, thread.commentThreadHandle);
             }
-        });
+        }
     }
     updateInput(input) {
         const thread = this.activeEditingCommentThread;
@@ -336,7 +349,7 @@ class MainThreadCommentController {
         if (!thread) {
             throw ( (new Error('unknown thread')));
         }
-        return thread;
+        return thread.thread;
     }
     async getDocumentComments(resource, token) {
         if (resource.scheme === Schemas.vscodeNotebookCell) {
@@ -354,9 +367,9 @@ class MainThreadCommentController {
         const ret = [];
         for (const thread of [...( (this._threads.keys()))]) {
             const commentThread = this._threads.get(thread);
-            if (commentThread.resource === ( (resource.toString()))) {
-                if (commentThread.isDocumentCommentThread()) {
-                    ret.push(commentThread);
+            if (commentThread.thread.resource === ( (resource.toString()))) {
+                if (commentThread.thread.isDocumentCommentThread()) {
+                    ret.push(commentThread.thread);
                 }
             }
         }
@@ -383,9 +396,9 @@ class MainThreadCommentController {
         const ret = [];
         for (const thread of [...( (this._threads.keys()))]) {
             const commentThread = this._threads.get(thread);
-            if (commentThread.resource === ( (resource.toString()))) {
-                if (!commentThread.isDocumentCommentThread()) {
-                    ret.push(commentThread);
+            if (commentThread.thread.resource === ( (resource.toString()))) {
+                if (!commentThread.thread.isDocumentCommentThread()) {
+                    ret.push(commentThread.thread);
                 }
             }
         }
@@ -401,7 +414,7 @@ class MainThreadCommentController {
     getAllComments() {
         const ret = [];
         for (const thread of [...( (this._threads.keys()))]) {
-            ret.push(this._threads.get(thread));
+            ret.push(this._threads.get(thread).thread);
         }
         return ret;
     }
@@ -418,7 +431,7 @@ class MainThreadCommentController {
         };
     }
 }
-const commentsViewIcon = registerIcon('comments-view-icon', Codicon.commentDiscussion, ( localize(4854, 'View icon of the comments view.')));
+const commentsViewIcon = registerIcon('comments-view-icon', Codicon.commentDiscussion, ( localize(4979, 'View icon of the comments view.')));
 let MainThreadComments = class MainThreadComments extends Disposable {
     constructor(extHostContext, _commentService, _viewsService, _viewDescriptorService, _uriIdentityService, _editorService) {
         super();

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

@@ -288,7 +288,7 @@ let MainThreadCustomEditorModel = MainThreadCustomEditorModel_1 = class MainThre
         if (_editable) {
             this._register(workingCopyService.registerWorkingCopy(this));
             this._register(extensionService.onWillStop(e => {
-                e.veto(true, ( localize(9956, "A custom editor for '{0}' is open.", this.name)));
+                e.veto(true, ( localize(10047, "A custom editor for '{0}' is open.", this.name)));
             }));
         }
         if (startDirty) {
@@ -355,7 +355,7 @@ let MainThreadCustomEditorModel = MainThreadCustomEditorModel_1 = class MainThre
         this._undoService.pushElement({
             type: 0 ,
             resource: this._editorResource,
-            label: label ?? ( localize(9957, "Edit")),
+            label: label ?? ( localize(10048, "Edit")),
             code: 'undoredo.customEditorEdit',
             undo: () => this.undo(),
             redo: () => this.redo(),

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

@@ -13,7 +13,7 @@ class ExtHostEditSessionIdentityCreateParticipant {
     }
     async participate(workspaceFolder, token) {
         const p = ( (new Promise((resolve, reject) => {
-            setTimeout(() => reject(( (new Error(( localize(4846, "Aborted onWillCreateEditSessionIdentity-event after 10000ms")))))), this.timeout);
+            setTimeout(() => reject(( (new Error(( localize(4971, "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/mainThreadEditor.js

@@ -42,7 +42,7 @@ class MainThreadTextEditorProperties {
         let lineNumbers;
         if (codeEditor) {
             const options = codeEditor.getOptions();
-            const lineNumbersOpts = options.get(70 );
+            const lineNumbersOpts = options.get(69 );
             cursorStyle = options.get(28 );
             lineNumbers = lineNumbersOpts.renderType;
         }

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

@@ -11,13 +11,13 @@ import { DiffEditorInput } from 'vscode/vscode/vs/workbench/common/editor/diffEd
 import { isGroupEditorMoveEvent } from 'vscode/vscode/vs/workbench/common/editor/editorGroupModel';
 import { SideBySideEditorInput } from 'vscode/vscode/vs/workbench/common/editor/sideBySideEditorInput';
 import { AbstractTextResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor/textResourceEditorInput';
-import { ChatEditorInput } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { ChatEditorInput } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
 import { CustomEditorInput } from 'vscode/vscode/vs/workbench/contrib/customEditor/browser/customEditorInput';
 import { InteractiveEditorInput } from 'vscode/vscode/vs/workbench/contrib/interactive/browser/interactiveEditorInput';
 import { MergeEditorInput } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
 import { MultiDiffEditorInput } from 'vscode/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
 import { NotebookEditorInput } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
-import { TerminalEditorInput } from 'vscode/vscode/vs/workbench/contrib/terminal/browser/terminalEditorInput';
+import { TerminalEditorInput } from '@codingame/monaco-vscode-chat-extensions-notebook-terminal-common/vscode/vs/workbench/contrib/terminal/browser/terminalEditorInput';
 import { WebviewInput } from 'vscode/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
 import { editorGroupToColumn, columnToEditorGroup } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupColumn';
 import { preferredSideBySideGroupDirection } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';

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

@@ -88,13 +88,13 @@ let MainThreadExtensionService = class MainThreadExtensionService {
             this._notificationService.notify({
                 severity: Severity$1.Error,
                 message: ( localize(
-                    4811,
+                    4936,
                     "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(4812, "Reload Window")), '', true, () => this._hostService.reload())))]
+                    primary: [( (new Action('reload', ( localize(4937, "Reload Window")), '', true, () => this._hostService.reload())))]
                 }
             });
         }
@@ -104,7 +104,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity$1.Error,
                     message: ( localize(
-                        4813,
+                        4938,
                         "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
@@ -115,13 +115,13 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity$1.Error,
                     message: ( localize(
-                        4814,
+                        4939,
                         "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(4815, "Manage Workspace Trust")), '', true, () => this._commandService.executeCommand('workbench.trust.manage'))))]
+                        primary: [( (new Action('manageWorkspaceTrust', ( localize(4940, "Manage Workspace Trust")), '', true, () => this._commandService.executeCommand('workbench.trust.manage'))))]
                     }
                 });
             }
@@ -129,13 +129,13 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity$1.Error,
                     message: ( localize(
-                        4816,
+                        4941,
                         "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(4817, "Enable and Reload")), '', true, () => this._extensionEnablementService.setEnablement([missingInstalledDependency], enablementState === 7  ? 9  : 10 )
+                        primary: [( (new Action('enable', ( localize(4942, "Enable and Reload")), '', true, () => this._extensionEnablementService.setEnablement([missingInstalledDependency], enablementState === 7  ? 9  : 10 )
                                 .then(() => this._hostService.reload(), e => this._notificationService.error(e)))))]
                     }
                 });
@@ -144,7 +144,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity$1.Error,
                     message: ( localize(
-                        4818,
+                        4943,
                         "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is disabled.",
                         extName,
                         missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
@@ -165,21 +165,21 @@ let MainThreadExtensionService = class MainThreadExtensionService {
             this._notificationService.notify({
                 severity: Severity$1.Error,
                 message: ( localize(
-                    4819,
+                    4944,
                     "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(4820, "Install and Reload")), '', true, () => this._extensionsWorkbenchService.install(dependencyExtension)
+                    primary: [( (new Action('install', ( localize(4945, "Install and Reload")), '', true, () => this._extensionsWorkbenchService.install(dependencyExtension)
                             .then(() => this._hostService.reload(), e => this._notificationService.error(e)))))]
                 }
             });
         }
         else {
             this._notificationService.error(( localize(
-                4821,
+                4946,
                 "Cannot activate the '{0}' extension because it depends on an unknown '{1}' extension.",
                 extName,
                 missingDependency

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

@@ -71,28 +71,28 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                     if (data.extensionNames.length === 1) {
                         if (operation === 0 ) {
                             message = ( localize(
-                                4822,
+                                4947,
                                 "Extension '{0}' wants to make refactoring changes with this file creation",
                                 data.extensionNames[0]
                             ));
                         }
                         else if (operation === 3 ) {
                             message = ( localize(
-                                4823,
+                                4948,
                                 "Extension '{0}' wants to make refactoring changes with this file copy",
                                 data.extensionNames[0]
                             ));
                         }
                         else if (operation === 2 ) {
                             message = ( localize(
-                                4824,
+                                4949,
                                 "Extension '{0}' wants to make refactoring changes with this file move",
                                 data.extensionNames[0]
                             ));
                         }
                         else  {
                             message = ( localize(
-                                4825,
+                                4950,
                                 "Extension '{0}' wants to make refactoring changes with this file deletion",
                                 data.extensionNames[0]
                             ));
@@ -101,28 +101,28 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                     else {
                         if (operation === 0 ) {
                             message = ( localize(
-                                4826,
+                                4951,
                                 "{0} extensions want to make refactoring changes with this file creation",
                                 data.extensionNames.length
                             ));
                         }
                         else if (operation === 3 ) {
                             message = ( localize(
-                                4827,
+                                4952,
                                 "{0} extensions want to make refactoring changes with this file copy",
                                 data.extensionNames.length
                             ));
                         }
                         else if (operation === 2 ) {
                             message = ( localize(
-                                4828,
+                                4953,
                                 "{0} extensions want to make refactoring changes with this file move",
                                 data.extensionNames.length
                             ));
                         }
                         else  {
                             message = ( localize(
-                                4829,
+                                4954,
                                 "{0} extensions want to make refactoring changes with this file deletion",
                                 data.extensionNames.length
                             ));
@@ -132,8 +132,8 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                         const { confirmed } = await dialogService.confirm({
                             type: Severity$1.Info,
                             message,
-                            primaryButton: ( localize(4830, "Show &&Preview")),
-                            cancelButton: ( localize(4831, "Skip Changes"))
+                            primaryButton: ( localize(4955, "Show &&Preview")),
+                            cancelButton: ( localize(4956, "Skip Changes"))
                         });
                         showPreview = true;
                         if (!confirmed) {
@@ -152,19 +152,19 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                             message,
                             buttons: [
                                 {
-                                    label: ( localize(4832, "&&OK")),
+                                    label: ( localize(4957, "&&OK")),
                                     run: () => Choice.OK
                                 },
                                 {
-                                    label: ( localize(4830, "Show &&Preview")),
+                                    label: ( localize(4955, "Show &&Preview")),
                                     run: () => Choice.Preview
                                 }
                             ],
                             cancelButton: {
-                                label: ( localize(4831, "Skip Changes")),
+                                label: ( localize(4956, "Skip Changes")),
                                 run: () => Choice.Cancel
                             },
-                            checkbox: { label: ( localize(4833, "Do not ask me again")) }
+                            checkbox: { label: ( localize(4958, "Do not ask me again")) }
                         });
                         if (result === Choice.Cancel) {
                             return;
@@ -181,15 +181,15 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
             _progressLabel(operation) {
                 switch (operation) {
                     case 0 :
-                        return ( localize(4834, "Running 'File Create' participants..."));
+                        return ( localize(4959, "Running 'File Create' participants..."));
                     case 2 :
-                        return ( localize(4835, "Running 'File Rename' participants..."));
+                        return ( localize(4960, "Running 'File Rename' participants..."));
                     case 3 :
-                        return ( localize(4836, "Running 'File Copy' participants..."));
+                        return ( localize(4961, "Running 'File Copy' participants..."));
                     case 1 :
-                        return ( localize(4837, "Running 'File Delete' participants..."));
+                        return ( localize(4962, "Running 'File Delete' participants..."));
                     case 4 :
-                        return ( localize(4838, "Running 'File Write' participants..."));
+                        return ( localize(4963, "Running 'File Write' participants..."));
                 }
             }
         });
@@ -260,7 +260,7 @@ registerAction2(class ResetMemento extends Action2 {
         super({
             id: 'files.participants.resetChoice',
             title: {
-                value: ( localize(4839, "Reset choice for 'File operation needs preview'")),
+                value: ( localize(4964, "Reset choice for 'File operation needs preview'")),
                 original: `Reset choice for 'File operation needs preview'`
             },
             f1: true

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

@@ -430,6 +430,15 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
         const commandId = data["o" ];
         const commandIdent = data["n" ];
         const commitChars = data["k" ];
+        let command;
+        if (commandId) {
+            command = {
+                $ident: commandIdent,
+                id: commandId,
+                title: '',
+                arguments: commandIdent ? [commandIdent] : data["p" ],
+            };
+        }
         return {
             label,
             extensionId,
@@ -445,12 +454,7 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
             insertTextRules: data["i" ],
             commitCharacters: commitChars ? Array.from(commitChars) : undefined,
             additionalTextEdits: data["l" ],
-            command: commandId ? {
-                $ident: commandIdent,
-                id: commandId,
-                title: '',
-                arguments: commandIdent ? [commandIdent] : data["p" ],
-            } : undefined,
+            command,
             _id: data.x,
         };
     }

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

@@ -1,4 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { Disposable, DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
 import { ILanguageModelToolsService } from 'vscode/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
@@ -17,7 +18,7 @@ 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);
+        return await this._languageModelToolsService.invokeTool(dto, (input, token) => this._proxy.$countTokensForInvocation(dto.callId, input, token), token ?? CancellationToken.None);
     }
     $countTokensForInvocation(callId, input, token) {
         const fn = this._countTokenCallbacks.get(callId);
@@ -37,8 +38,7 @@ let MainThreadLanguageModelTools = class MainThreadLanguageModelTools extends Di
                     this._countTokenCallbacks.delete(dto.callId);
                 }
             },
-            provideToolConfirmationMessages: (participantName, parameters, token) => this._proxy.$provideToolConfirmationMessages(id, participantName, parameters, token),
-            provideToolInvocationMessage: (parameters, token) => this._proxy.$provideToolInvocationMessage(id, parameters, token),
+            prepareToolInvocation: (parameters, token) => this._proxy.$prepareToolInvocation(id, parameters, token),
         });
         this._tools.set(id, disposable);
     }

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

@@ -3,9 +3,10 @@ import { DeferredPromise, AsyncIterableSource } from 'vscode/vscode/vs/base/comm
 import { transformErrorFromSerialization, transformErrorForSerialization } from 'vscode/vscode/vs/base/common/errors';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { DisposableStore, DisposableMap, Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { localize } from 'vscode/vscode/vs/nls';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
-import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
+import { ILanguageModelIgnoredFilesService } from 'vscode/vscode/vs/workbench/contrib/chat/common/ignoredFiles.service';
 import { ILanguageModelStatsService } from 'vscode/vscode/vs/workbench/contrib/chat/common/languageModelStats.service';
 import { ILanguageModelsService } from 'vscode/vscode/vs/workbench/contrib/chat/common/languageModels.service';
 import { IAuthenticationAccessService } from 'vscode/vscode/vs/workbench/services/authentication/browser/authenticationAccessService.service';
@@ -13,18 +14,21 @@ import { INTERNAL_AUTH_PROVIDER_PREFIX } from 'vscode/vscode/vs/workbench/servic
 import { IAuthenticationService } from 'vscode/vscode/vs/workbench/services/authentication/common/authentication.service';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
+import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 
 let MainThreadLanguageModels = class MainThreadLanguageModels {
-    constructor(extHostContext, _chatProviderService, _languageModelStatsService, _logService, _authenticationService, _authenticationAccessService, _extensionService) {
+    constructor(extHostContext, _chatProviderService, _languageModelStatsService, _logService, _authenticationService, _authenticationAccessService, _extensionService, _ignoredFilesService) {
         this._chatProviderService = _chatProviderService;
         this._languageModelStatsService = _languageModelStatsService;
         this._logService = _logService;
         this._authenticationService = _authenticationService;
         this._authenticationAccessService = _authenticationAccessService;
         this._extensionService = _extensionService;
+        this._ignoredFilesService = _ignoredFilesService;
         this._store = ( (new DisposableStore()));
         this._providerRegistrations = ( (new DisposableMap()));
         this._pendingProgress = ( (new Map()));
+        this._ignoredFileProviderRegistrations = ( (new DisposableMap()));
         this._proxy = ( (extHostContext.getProxy(ExtHostContext.ExtHostChatProvider)));
         this._proxy.$acceptChatModelMetadata({ added: ( (_chatProviderService.getLanguageModelIds().map(
             id => ({ identifier: id, metadata: _chatProviderService.lookupLanguageModel(id) })
@@ -33,6 +37,7 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
     }
     dispose() {
         this._providerRegistrations.dispose();
+        this._ignoredFileProviderRegistrations.dispose();
         this._store.dispose();
     }
     $registerLanguageModelProvider(handle, identifier, metadata) {
@@ -129,7 +134,7 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
         if (this._authenticationService.getProviderIds().includes(authProviderId)) {
             return Disposable.None;
         }
-        const accountLabel = auth.accountLabel ?? ( localize(4809, 'Language Models'));
+        const accountLabel = auth.accountLabel ?? ( localize(4934, 'Language Models'));
         const disposables = ( (new DisposableStore()));
         this._authenticationService.registerAuthenticationProvider(authProviderId, ( (new LanguageModelAccessAuthProvider(authProviderId, auth.providerLabel, accountLabel))));
         disposables.add(toDisposable(() => {
@@ -152,6 +157,17 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
         }));
         return disposables;
     }
+    $fileIsIgnored(uri, token) {
+        return this._ignoredFilesService.fileIsIgnored(URI.revive(uri), token);
+    }
+    $registerFileIgnoreProvider(handle) {
+        this._ignoredFileProviderRegistrations.set(handle, this._ignoredFilesService.registerIgnoredFileProvider({
+            isFileIgnored: async (uri, token) => this._proxy.$isFileIgnored(handle, uri, token)
+        }));
+    }
+    $unregisterFileIgnoreProvider(handle) {
+        this._ignoredFileProviderRegistrations.deleteAndDispose(handle);
+    }
 };
 MainThreadLanguageModels = __decorate([
     extHostNamedCustomer(MainContext.MainThreadLanguageModels),
@@ -160,7 +176,8 @@ MainThreadLanguageModels = __decorate([
     ( (__param(3, ILogService))),
     ( (__param(4, IAuthenticationService))),
     ( (__param(5, IAuthenticationAccessService))),
-    ( (__param(6, IExtensionService)))
+    ( (__param(6, IExtensionService))),
+    ( (__param(7, ILanguageModelIgnoredFilesService)))
 ], MainThreadLanguageModels);
 class LanguageModelAccessAuthProvider {
     constructor(id, label, _accountLabel) {

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

@@ -51,13 +51,13 @@ let MainThreadMessageService = class MainThreadMessageService {
                     };
                 }
                 if (!source) {
-                    source = ( localize(4840, "Extension"));
+                    source = ( localize(4965, "Extension"));
                 }
                 const secondaryActions = [];
                 if (options.source) {
                     secondaryActions.push(toAction({
                         id: options.source.identifier.value,
-                        label: ( localize(4841, "Manage Extension")),
+                        label: ( localize(4966, "Manage Extension")),
                         run: () => {
                             return this._commandService.executeCommand('_extensions.manage', options.source.identifier.value);
                         }
@@ -93,13 +93,13 @@ let MainThreadMessageService = class MainThreadMessageService {
         if (!cancelButton) {
             if (buttons.length > 0) {
                 cancelButton = {
-                    label: ( localize(4842, "Cancel")),
+                    label: ( localize(4967, "Cancel")),
                     run: () => undefined
                 };
             }
             else {
                 cancelButton = {
-                    label: ( localize(4843, "&&OK")),
+                    label: ( localize(4968, "&&OK")),
                     run: () => undefined
                 };
             }

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

@@ -17,7 +17,7 @@ class ExtHostNotebookDocumentSaveParticipant {
         }
         let _warningTimeout;
         const p = ( (new Promise((resolve, reject) => {
-            _warningTimeout = setTimeout(() => reject(( (new Error(( localize(4855, "Aborted onWillSaveNotebookDocument-event after 1750ms")))))), 1750);
+            _warningTimeout = setTimeout(() => reject(( (new Error(( localize(4980, "Aborted onWillSaveNotebookDocument-event after 1750ms")))))), 1750);
             this._proxy.$participateInSave(workingCopy.resource, context.reason, token).then(_ => {
                 clearTimeout(_warningTimeout);
                 return undefined;

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

@@ -30,7 +30,7 @@ let MainThreadProgress = class MainThreadProgress {
             const notificationOptions = {
                 ...options,
                 location: 15 ,
-                secondaryActions: [( (new ManageExtensionAction(extensionId, ( localize(4844, "Manage Extension")), this._commandService)))]
+                secondaryActions: [( (new ManageExtensionAction(extensionId, ( localize(4969, "Manage Extension")), this._commandService)))]
             };
             options = notificationOptions;
         }