@codingame/monaco-vscode-api 20.5.0 → 21.0.0

package/vscode/src/vs/workbench/api/common/extHostNotebook.js

@@ -8,12 +8,13 @@ import { MarshalledId } from '../../../base/common/marshallingIds.js';
 import { isFalsyOrWhitespace } from '../../../base/common/strings.js';
 import { assertReturnsDefined } from '../../../base/common/types.js';
 import { URI } from '../../../base/common/uri.js';
+import { CancellationError } from '../../../base/common/errors.js';
 import { FileOperationError, FileOperationResult, etag, FilePermission, FileType, ETAG_DISABLED } from '../../../platform/files/common/files.js';
 import { Cache } from './cache.js';
 import { MainContext } from './extHost.protocol.js';
 import { ApiCommandArgument, ApiCommand, ApiCommandResult } from './extHostCommands.js';
 import { NotebookExclusiveDocumentPattern, NotebookData, ViewColumn, NotebookRange, NotebookStatusBarItem, NotebookDocumentContentOptions } from './extHostTypeConverters.js';
-import { Disposable, NotebookCellData } from './extHostTypes.js';
+import { Disposable } from './extHostTypes.js';
 import { SerializableObjectWithBuffers } from '../../services/extensions/common/proxyIdentifier.js';
 import { ExtHostNotebookDocument, ExtHostCell } from './extHostNotebookDocument.js';
 import { ExtHostNotebookEditor } from './extHostNotebookEditor.js';
@@ -23,6 +24,7 @@ import { QueryType } from '../../services/search/common/search.js';
 import { CellSearchModel } from '../../contrib/search/common/cellSearchModel.js';
 import { genericCellMatchesToTextSearchMatches } from '../../contrib/search/common/searchNotebookHelpers.js';
 import { RegisteredEditorPriority, globMatchesResource } from '../../services/editor/common/editorResolverService.js';
+import { NotebookCellData } from './extHostTypes/notebooks.js';
 
 class ExtHostNotebookController {
     static { this._notebookStatusBarItemProviderHandlePool = 0; }
@@ -249,58 +251,66 @@ class ExtHostNotebookController {
         const uri = URI.revive(uriComponents);
         const serializer = this._notebookSerializer.get(handle);
         this.trace(`enter saveNotebook(versionId: ${versionId}, ${( uri.toString())})`);
-        if (!serializer) {
-            throw ( new Error('NO serializer found'));
-        }
-        const document = this._documents.get(uri);
-        if (!document) {
-            throw ( new Error('Document NOT found'));
-        }
-        if (document.versionId !== versionId) {
-            throw ( new Error(
-                'Document version mismatch, expected: ' + versionId + ', actual: ' + document.versionId
-            ));
-        }
-        if (!this._extHostFileSystem.value.isWritableFileSystem(uri.scheme)) {
-            throw new FileOperationError(( localize(2631, "Unable to modify read-only file '{0}'", this._resourceForError(uri))), FileOperationResult.FILE_PERMISSION_DENIED);
-        }
-        const data = {
-            metadata: filter(document.apiNotebook.metadata, key => !(serializer.options?.transientDocumentMetadata ?? {})[key]),
-            cells: [],
-        };
-        for (const cell of document.apiNotebook.getCells()) {
-            const cellData = new NotebookCellData(cell.kind, cell.document.getText(), cell.document.languageId, cell.mime, !(serializer.options?.transientOutputs) ? [...cell.outputs] : [], cell.metadata, cell.executionSummary);
-            cellData.metadata = filter(cell.metadata, key => !(serializer.options?.transientCellMetadata ?? {})[key]);
-            data.cells.push(cellData);
-        }
-        await this._validateWriteFile(uri, options);
-        if (token.isCancellationRequested) {
-            throw ( new Error('canceled'));
+        try {
+            if (!serializer) {
+                throw ( new NotebookSaveError('NO serializer found'));
+            }
+            const document = this._documents.get(uri);
+            if (!document) {
+                throw ( new NotebookSaveError('Document NOT found'));
+            }
+            if (document.versionId !== versionId) {
+                throw ( new NotebookSaveError(
+                    'Document version mismatch, expected: ' + versionId + ', actual: ' + document.versionId
+                ));
+            }
+            if (!this._extHostFileSystem.value.isWritableFileSystem(uri.scheme)) {
+                throw new FileOperationError(( localize(2636, "Unable to modify read-only file '{0}'", this._resourceForError(uri))), FileOperationResult.FILE_PERMISSION_DENIED);
+            }
+            const data = {
+                metadata: filter(document.apiNotebook.metadata, key => !(serializer.options?.transientDocumentMetadata ?? {})[key]),
+                cells: [],
+            };
+            for (const cell of document.apiNotebook.getCells()) {
+                const cellData = new NotebookCellData(cell.kind, cell.document.getText(), cell.document.languageId, cell.mime, !(serializer.options?.transientOutputs) ? [...cell.outputs] : [], cell.metadata, cell.executionSummary);
+                cellData.metadata = filter(cell.metadata, key => !(serializer.options?.transientCellMetadata ?? {})[key]);
+                data.cells.push(cellData);
+            }
+            await this._validateWriteFile(uri, options);
+            if (token.isCancellationRequested) {
+                throw ( new CancellationError());
+            }
+            const bytes = await serializer.serializer.serializeNotebook(data, token);
+            if (token.isCancellationRequested) {
+                throw ( new CancellationError());
+            }
+            this.trace(`serialized versionId: ${versionId} ${( uri.toString())}`);
+            await this._extHostFileSystem.value.writeFile(uri, bytes);
+            this.trace(`Finished write versionId: ${versionId} ${( uri.toString())}`);
+            const providerExtUri = this._extHostFileSystem.getFileSystemProviderExtUri(uri.scheme);
+            const stat = await this._extHostFileSystem.value.stat(uri);
+            const fileStats = {
+                name: providerExtUri.basename(uri),
+                isFile: (stat.type & FileType.File) !== 0,
+                isDirectory: (stat.type & FileType.Directory) !== 0,
+                isSymbolicLink: (stat.type & FileType.SymbolicLink) !== 0,
+                mtime: stat.mtime,
+                ctime: stat.ctime,
+                size: stat.size,
+                readonly: Boolean((stat.permissions ?? 0) & FilePermission.Readonly) || !this._extHostFileSystem.value.isWritableFileSystem(uri.scheme),
+                locked: Boolean((stat.permissions ?? 0) & FilePermission.Locked),
+                etag: etag({ mtime: stat.mtime, size: stat.size }),
+                children: undefined
+            };
+            this.trace(`exit saveNotebook(versionId: ${versionId}, ${( uri.toString())})`);
+            return fileStats;
         }
-        const bytes = await serializer.serializer.serializeNotebook(data, token);
-        if (token.isCancellationRequested) {
-            throw ( new Error('canceled'));
+        catch (error) {
+            if (error instanceof FileOperationError) {
+                return { ...error, message: error.message };
+            }
+            throw error;
         }
-        this.trace(`serialized versionId: ${versionId} ${( uri.toString())}`);
-        await this._extHostFileSystem.value.writeFile(uri, bytes);
-        this.trace(`Finished write versionId: ${versionId} ${( uri.toString())}`);
-        const providerExtUri = this._extHostFileSystem.getFileSystemProviderExtUri(uri.scheme);
-        const stat = await this._extHostFileSystem.value.stat(uri);
-        const fileStats = {
-            name: providerExtUri.basename(uri),
-            isFile: (stat.type & FileType.File) !== 0,
-            isDirectory: (stat.type & FileType.Directory) !== 0,
-            isSymbolicLink: (stat.type & FileType.SymbolicLink) !== 0,
-            mtime: stat.mtime,
-            ctime: stat.ctime,
-            size: stat.size,
-            readonly: Boolean((stat.permissions ?? 0) & FilePermission.Readonly) || !this._extHostFileSystem.value.isWritableFileSystem(uri.scheme),
-            locked: Boolean((stat.permissions ?? 0) & FilePermission.Locked),
-            etag: etag({ mtime: stat.mtime, size: stat.size }),
-            children: undefined
-        };
-        this.trace(`exit saveNotebook(versionId: ${versionId}, ${( uri.toString())})`);
-        return fileStats;
     }
     async $searchInNotebooks(handle, textQuery, viewTypeFileTargets, otherViewTypeFileTargets, token) {
         const serializer = this._notebookSerializer.get(handle)?.serializer;
@@ -434,7 +444,7 @@ class ExtHostNotebookController {
         if (typeof options?.mtime === 'number' && typeof options.etag === 'string' && options.etag !== ETAG_DISABLED &&
             typeof stat.mtime === 'number' && typeof stat.size === 'number' &&
             options.mtime < stat.mtime && options.etag !== etag({ mtime: options.mtime , size: stat.size })) {
-            throw new FileOperationError(( localize(2632, "File Modified Since")), FileOperationResult.FILE_MODIFIED_SINCE, options);
+            throw new FileOperationError(( localize(2637, "File Modified Since")), FileOperationResult.FILE_MODIFIED_SINCE, options);
         }
         return;
     }
@@ -568,5 +578,11 @@ class ExtHostNotebookController {
         this._logService.trace(`[Extension Host Notebook] ${msg}`);
     }
 }
+class NotebookSaveError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = 'NotebookSaveError';
+    }
+}
 
-export { ExtHostNotebookController };
+export { ExtHostNotebookController, NotebookSaveError };

package/vscode/src/vs/workbench/api/common/extHostNotebookDocument.js

@@ -2,8 +2,10 @@
 import { Schemas } from '../../../base/common/network.js';
 import { URI } from '../../../base/common/uri.js';
 import { NotebookCellOutput, NotebookCellExecutionSummary, NotebookCellKind, NotebookCellOutputItem } from './extHostTypeConverters.js';
-import { NotebookRange } from './extHostTypes.js';
-import { isTextStreamMime, compressOutputItemStreams, NotebookCellsChangeType } from '../../contrib/notebook/common/notebookCommon.js';
+import './extHostTypes.js';
+import { compressOutputItemStreams, NotebookCellsChangeType } from '../../contrib/notebook/common/notebookCommon.js';
+import { isTextStreamMime } from '../../../base/common/mime.js';
+import { NotebookRange } from './extHostTypes/notebooks.js';
 
 class RawContentChangeEvent {
     constructor(start, deletedCount, deletedItems, items) {

package/vscode/src/vs/workbench/api/common/extHostNotebookDocumentSaveParticipant.js

@@ -2,8 +2,9 @@
 import { AsyncEmitter } from '../../../base/common/event.js';
 import { URI } from '../../../base/common/uri.js';
 import { TextDocumentSaveReason, WorkspaceEdit as WorkspaceEdit$1 } from './extHostTypeConverters.js';
-import { WorkspaceEdit } from './extHostTypes.js';
+import './extHostTypes.js';
 import { SerializableObjectWithBuffers } from '../../services/extensions/common/proxyIdentifier.js';
+import { WorkspaceEdit } from './extHostTypes/workspaceEdit.js';
 
 class ExtHostNotebookDocumentSaveParticipant {
     constructor(_logService, _notebooksAndEditors, _mainThreadBulkEdits, _thresholds = { timeout: 1500, errors: 3 }) {

package/vscode/src/vs/workbench/api/common/extHostNotebookEditor.js

@@ -1,7 +1,8 @@
 
 import { illegalArgument } from '../../../base/common/errors.js';
 import { NotebookRange } from './extHostTypeConverters.js';
-import { NotebookEditorRevealType, NotebookRange as NotebookRange$1 } from './extHostTypes.js';
+import { NotebookEditorRevealType } from './extHostTypes.js';
+import { NotebookRange as NotebookRange$1 } from './extHostTypes/notebooks.js';
 
 class ExtHostNotebookEditor {
     static { this.apiEditorsToExtHost = ( new WeakMap()); }

package/vscode/src/vs/workbench/api/common/extHostNotebookKernels.js

@@ -12,12 +12,13 @@ import { ILogService } from '../../../platform/log/common/log.service.js';
 import { MainContext } from './extHost.protocol.js';
 import { ApiCommand, ApiCommandArgument, ApiCommandResult } from './extHostCommands.js';
 import { NotebookRendererScript, NotebookKernelSourceAction, NotebookCellOutput as NotebookCellOutput$1, NotebookCellOutputItem } from './extHostTypeConverters.js';
-import { NotebookControllerAffinity2, NotebookVariablesRequestKind, NotebookCellOutput } from './extHostTypes.js';
+import { NotebookControllerAffinity2, NotebookVariablesRequestKind } from './extHostTypes.js';
 import { asWebviewUri } from '../../contrib/webview/common/webview.js';
 import { CellExecutionUpdateType } from '../../contrib/notebook/common/notebookExecutionService.js';
 import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 import { SerializableObjectWithBuffers } from '../../services/extensions/common/proxyIdentifier.js';
 import { variablePageSize } from '../../contrib/notebook/common/notebookKernelService.js';
+import { NotebookCellOutput } from './extHostTypes/notebooks.js';
 
 let ExtHostNotebookKernels = class ExtHostNotebookKernels {
     constructor(mainContext, _initData, _extHostNotebook, _commands, _logService) {

package/vscode/src/vs/workbench/api/common/extHostSCM.js

@@ -552,22 +552,24 @@ class ExtHostSourceControl {
         if (structuralEquals(this._actionButton, actionButton)) {
             return;
         }
+        const oldActionButtonDisposables = this._actionButtonDisposables;
+        this._actionButtonDisposables = ( new DisposableStore());
         this._actionButton = actionButton;
-        this._actionButtonDisposables.value = ( new DisposableStore());
         const actionButtonDto = actionButton !== undefined ?
             {
                 command: {
-                    ...this._commands.converter.toInternal(actionButton.command, this._actionButtonDisposables.value),
+                    ...this._commands.converter.toInternal(actionButton.command, this._actionButtonDisposables),
                     shortTitle: actionButton.command.shortTitle
                 },
                 secondaryCommands: actionButton.secondaryCommands?.map(commandGroup => {
                     return ( commandGroup.map(
-                        command => this._commands.converter.toInternal(command, this._actionButtonDisposables.value)
+                        command => this._commands.converter.toInternal(command, this._actionButtonDisposables)
                     ));
                 }),
                 enabled: actionButton.enabled
-            } : undefined;
-        this.#proxy.$updateSourceControl(this.handle, { actionButton: actionButtonDto ?? null });
+            } : null;
+        this.#proxy.$updateSourceControl(this.handle, { actionButton: actionButtonDto })
+            .finally(() => oldActionButtonDisposables.dispose());
     }
     get statusBarCommands() {
         return this._statusBarCommands;
@@ -576,12 +578,12 @@ class ExtHostSourceControl {
         if (this._statusBarCommands && statusBarCommands && commandListEquals(this._statusBarCommands, statusBarCommands)) {
             return;
         }
-        this._statusBarDisposables.value = ( new DisposableStore());
+        const oldStatusBarDisposables = this._statusBarDisposables;
+        this._statusBarDisposables = ( new DisposableStore());
         this._statusBarCommands = statusBarCommands;
-        const internal = ( (statusBarCommands || []).map(
-            c => this._commands.converter.toInternal(c, this._statusBarDisposables.value)
-        ));
-        this.#proxy.$updateSourceControl(this.handle, { statusBarCommands: internal });
+        const internal = ( (statusBarCommands || []).map(c => this._commands.converter.toInternal(c, this._statusBarDisposables)));
+        this.#proxy.$updateSourceControl(this.handle, { statusBarCommands: internal })
+            .finally(() => oldStatusBarDisposables.dispose());
     }
     get selected() {
         return this._selected;
@@ -603,8 +605,8 @@ class ExtHostSourceControl {
         this._commitTemplate = undefined;
         this._acceptInputDisposables = ( new MutableDisposable());
         this._acceptInputCommand = undefined;
-        this._actionButtonDisposables = ( new MutableDisposable());
-        this._statusBarDisposables = ( new MutableDisposable());
+        this._actionButtonDisposables = ( new DisposableStore());
+        this._statusBarDisposables = ( new DisposableStore());
         this._statusBarCommands = undefined;
         this._selected = false;
         this._onDidChangeSelection = ( new Emitter());

package/vscode/src/vs/workbench/api/common/extHostStatusBar.js

@@ -188,7 +188,7 @@ class ExtHostStatusBarEntry {
             }
             else {
                 name = ( localize(
-                    2633,
+                    2638,
                     "{0} (Extension)",
                     this._extension.displayName || this._extension.name
                 ));
@@ -221,7 +221,7 @@ class StatusBarMessage {
     constructor(statusBar) {
         this._messages = [];
         this._item = statusBar.createStatusBarEntry(undefined, 'status.extensionMessage', StatusBarAlignment.Left, Number.MIN_VALUE);
-        this._item.name = ( localize(2634, "Extension Status"));
+        this._item.name = ( localize(2639, "Extension Status"));
     }
     dispose() {
         this._messages.length = 0;

package/vscode/src/vs/workbench/api/common/extHostTelemetry.js

@@ -28,7 +28,7 @@ let ExtHostTelemetry = class ExtHostTelemetry extends Disposable {
         const id = initData.remote.isRemote ? 'remoteExtHostTelemetry' : isWorker ? 'workerExtHostTelemetry' : 'extHostTelemetry';
         this._outputLogger = this._register(loggerService.createLogger(id, {
             name: ( localize(
-                2635,
+                2640,
                 "Extension Telemetry{0}",
                 this._inLoggingOnlyMode ? ' (Not Sent)' : ''
             )),

package/vscode/src/vs/workbench/api/common/extHostTerminalService.d.ts

@@ -78,7 +78,7 @@ export declare class ExtHostTerminal extends Disposable {
     constructor(_proxy: MainThreadTerminalServiceShape, _id: ExtHostTerminalIdentifier, _creationOptions: vscode.TerminalOptions | vscode.ExtensionTerminalOptions, _name?: string | undefined);
     dispose(): void;
     create(options: vscode.TerminalOptions, internalOptions?: ITerminalInternalOptions): Promise<void>;
-    createExtensionTerminal(location?: TerminalLocation | vscode.TerminalEditorLocationOptions | vscode.TerminalSplitLocationOptions, internalOptions?: ITerminalInternalOptions, parentTerminal?: ExtHostTerminalIdentifier, iconPath?: TerminalIcon, color?: ThemeColor): Promise<number>;
+    createExtensionTerminal(location?: TerminalLocation | vscode.TerminalEditorLocationOptions | vscode.TerminalSplitLocationOptions, internalOptions?: ITerminalInternalOptions, parentTerminal?: ExtHostTerminalIdentifier, iconPath?: TerminalIcon, color?: ThemeColor, shellIntegrationNonce?: string): Promise<number>;
     private _serializeParentTerminal;
     private _checkDisposed;
     set name(name: string);

package/vscode/src/vs/workbench/api/common/extHostTerminalService.js

@@ -113,9 +113,10 @@ class ExtHostTerminal extends Disposable {
             useShellEnvironment: internalOptions?.useShellEnvironment ?? undefined,
             location: internalOptions?.location || this._serializeParentTerminal(options.location, internalOptions?.resolvedExtHostIdentifier),
             isTransient: options.isTransient ?? undefined,
+            shellIntegrationNonce: options.shellIntegrationNonce ?? undefined,
         });
     }
-    async createExtensionTerminal(location, internalOptions, parentTerminal, iconPath, color) {
+    async createExtensionTerminal(location, internalOptions, parentTerminal, iconPath, color, shellIntegrationNonce) {
         if (typeof this._id !== 'string') {
             throw ( new Error('Terminal has already been created'));
         }
@@ -125,7 +126,8 @@ class ExtHostTerminal extends Disposable {
             icon: iconPath,
             color: ThemeColor.isThemeColor(color) ? color.id : undefined,
             location: internalOptions?.location || this._serializeParentTerminal(location, parentTerminal),
-            isTransient: true
+            isTransient: true,
+            shellIntegrationNonce: shellIntegrationNonce ?? undefined,
         });
         if (typeof this._id === 'string') {
             throw ( new Error('Terminal creation failed'));
@@ -363,7 +365,7 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
     createExtensionTerminal(options, internalOptions) {
         const terminal = ( new ExtHostTerminal(this._proxy, generateUuid(), options, options.name));
         const p = ( new ExtHostPseudoterminal(options.pty));
-        terminal.createExtensionTerminal(options.location, internalOptions, this._serializeParentTerminal(options, internalOptions).resolvedExtHostIdentifier, asTerminalIcon(options.iconPath), asTerminalColor(options.color)).then(id => {
+        terminal.createExtensionTerminal(options.location, internalOptions, this._serializeParentTerminal(options, internalOptions).resolvedExtHostIdentifier, asTerminalIcon(options.iconPath), asTerminalColor(options.color), options.shellIntegrationNonce).then(id => {
             const disposable = this._setupExtHostProcessListeners(id, p);
             this._terminalProcessDisposables[id] = disposable;
         });
@@ -485,7 +487,7 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
     async $startExtensionTerminal(id, initialDimensions) {
         const terminal = this.getTerminalById(id);
         if (!terminal) {
-            return { message: ( localize(2636, "Could not find the terminal with id {0} on the extension host", id)) };
+            return { message: ( localize(2641, "Could not find the terminal with id {0} on the extension host", id)) };
         }
         if (!terminal.isOpen) {
             await ( new Promise(r => {

package/vscode/src/vs/workbench/api/common/extHostTextEditor.js

@@ -3,7 +3,11 @@ import { ok } from '../../../base/common/assert.js';
 import { illegalArgument, ReadonlyError } from '../../../base/common/errors.js';
 import { IdGenerator } from '../../../base/common/idGenerator.js';
 import { DecorationRenderOptions, TextEditorLineNumbersStyle, ViewColumn, Range as Range$1, isDecorationOptionsArr, fromRangeOrRangeWithMessage, Position as Position$1, Selection as Selection$1, EndOfLine as EndOfLine$1 } from './extHostTypeConverters.js';
-import { Position, Range, EndOfLine, TextEditorRevealType, Selection } from './extHostTypes.js';
+import { TextEditorRevealType } from './extHostTypes.js';
+import { Position } from './extHostTypes/position.js';
+import { Range } from './extHostTypes/range.js';
+import { Selection } from './extHostTypes/selection.js';
+import { EndOfLine } from './extHostTypes/textEdit.js';
 
 class TextEditorDecorationType {
     static { this._Keys = ( new IdGenerator('TextEditorDecorationType')); }

package/vscode/src/vs/workbench/api/common/extHostTimeline.js

@@ -3,11 +3,12 @@ import { URI } from '../../../base/common/uri.js';
 import '../../../platform/instantiation/common/instantiation.js';
 import { MainContext } from './extHost.protocol.js';
 import { DisposableStore, toDisposable } from '../../../base/common/lifecycle.js';
-import { ThemeIcon, MarkdownString } from './extHostTypes.js';
+import { ThemeIcon } from './extHostTypes.js';
 import { MarkdownString as MarkdownString$1 } from './extHostTypeConverters.js';
 import { MarshalledId } from '../../../base/common/marshallingIds.js';
 import { isString } from '../../../base/common/types.js';
 import { isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
+import { MarkdownString } from './extHostTypes/markdownString.js';
 
 class ExtHostTimeline {
     constructor(mainContext, commands) {

package/vscode/src/vs/workbench/api/common/extHostTreeViews.js

@@ -6,7 +6,7 @@ import { Emitter, Event } from '../../../base/common/event.js';
 import { Disposable, DisposableStore, dispose } from '../../../base/common/lifecycle.js';
 import { NoTreeViewError } from '../../common/views.js';
 import { asPromise } from '../../../base/common/async.js';
-import { ViewBadge, DataTransfer as DataTransfer$1, TreeItemCheckboxState, MarkdownString as MarkdownString$1, TreeItem, TreeItemCollapsibleState, ThemeIcon } from './extHostTypes.js';
+import { ViewBadge, DataTransfer as DataTransfer$1, TreeItemCheckboxState, TreeItem, TreeItemCollapsibleState, ThemeIcon } from './extHostTypes.js';
 import { isString, isUndefinedOrNull } from '../../../base/common/types.js';
 import { equals, coalesce } from '../../../base/common/arrays.js';
 import { DataTransfer, MarkdownString, ViewBadge as ViewBadge$1 } from './extHostTypeConverters.js';
@@ -14,6 +14,7 @@ import { isMarkdownString } from '../../../base/common/htmlContent.js';
 import { CancellationTokenSource } from '../../../base/common/cancellation.js';
 import { TreeViewsDnDService } from '../../../editor/common/services/treeViewsDnd.js';
 import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
+import { MarkdownString as MarkdownString$1 } from './extHostTypes/markdownString.js';
 
 function toTreeItemLabel(label, extension) {
     if (isString(label)) {
@@ -677,7 +678,7 @@ class ExtHostTreeView extends Disposable {
     _createAndRegisterTreeNode(element, extTreeItem, parentNode) {
         const node = this._createTreeNode(element, extTreeItem, parentNode);
         if (extTreeItem.id && ( this._elements.has(node.item.handle))) {
-            throw ( new Error(( localize(2637, 'Element with id {0} is already registered', extTreeItem.id))));
+            throw ( new Error(( localize(2642, 'Element with id {0} is already registered', extTreeItem.id))));
         }
         this._addNodeToCache(element, node);
         this._addNodeToParentCache(node, parentNode);

package/vscode/src/vs/workbench/api/common/extHostTunnelService.js

@@ -148,12 +148,12 @@ let ExtHostTunnelService = class ExtHostTunnelService extends Disposable {
                     privacyOptions = [
                         {
                             id: 'private',
-                            label: ( localize(2638, "Private")),
+                            label: ( localize(2643, "Private")),
                             themeIcon: 'lock'
                         },
                         {
                             id: 'public',
-                            label: ( localize(2639, "Public")),
+                            label: ( localize(2644, "Public")),
                             themeIcon: 'eye'
                         }
                     ];

package/vscode/src/vs/workbench/api/common/extHostTypeConverters.d.ts

@@ -15,30 +15,30 @@ import * as languages from "../../../editor/common/languages.js";
 import { EndOfLineSequence, TrackedRangeStickiness } from "../../../editor/common/model.js";
 import { ITextEditorOptions } from "../../../platform/editor/common/editor.js";
 import { IExtensionDescription, IRelaxedExtensionDescription } from "../../../platform/extensions/common/extensions.js";
+import { ILogService } from "../../../platform/log/common/log.service.js";
 import { IMarkerData, IRelatedInformation, MarkerSeverity, MarkerTag } from "../../../platform/markers/common/markers.js";
 import { ProgressLocation as MainProgressLocation } from "../../../platform/progress/common/progress.js";
 import { SaveReason } from "../../common/editor.js";
 import { IViewBadge } from "../../common/views.js";
 import { IChatAgentRequest, IChatAgentResult } from "@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatAgents";
 import { IChatRequestDraft } from "../../contrib/chat/common/chatEditingService.js";
+import { IChatAgentMarkdownContentWithVulnerability, IChatCodeCitation, IChatCommandButton, IChatConfirmation, IChatContentInlineReference, IChatContentReference, IChatExtensionsContent, IChatFollowup, IChatMarkdownContent, IChatMoveMessage, IChatMultiDiffData, IChatPrepareToolInvocationPart, IChatProgressMessage, IChatPullRequestContent, IChatResponseCodeblockUriPart, IChatTaskDto, IChatTaskResult, IChatTextEdit, IChatThinkingPart, IChatToolInvocationSerialized, IChatTreeData, IChatUserActionEvent, IChatWarningMessage } from "../../contrib/chat/common/chatService.js";
 import { IChatRequestVariableEntry } from "../../contrib/chat/common/chatVariableEntries.js";
-import { IChatAgentMarkdownContentWithVulnerability, IChatCodeCitation, IChatCommandButton, IChatConfirmation, IChatContentInlineReference, IChatContentReference, IChatExtensionsContent, IChatFollowup, IChatMarkdownContent, IChatMoveMessage, IChatMultiDiffData, IChatPrepareToolInvocationPart, IChatProgressMessage, IChatPullRequestContent, IChatResponseCodeblockUriPart, IChatTaskDto, IChatTaskResult, IChatTextEdit, IChatTreeData, IChatUserActionEvent, IChatWarningMessage } from "../../contrib/chat/common/chatService.js";
+import { ChatAgentLocation } from "../../contrib/chat/common/constants.js";
 import { IToolResult, ToolDataSource } from "../../contrib/chat/common/languageModelToolsService.js";
 import * as chatProvider from "../../contrib/chat/common/languageModels.js";
 import { IDebugVisualizationTreeItem } from "../../contrib/debug/common/debug.js";
+import { McpServerLaunch } from "../../contrib/mcp/common/mcpTypes.js";
 import * as notebooks from "../../contrib/notebook/common/notebookCommon.js";
 import { ICellRange } from "@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/common/notebookRange";
-import * as search from "@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/contrib/search/common/search";
+import * as search from "@codingame/monaco-vscode-4dda7789-5a25-5e8b-b2de-c2f11b1b96e5-common/vscode/vs/workbench/contrib/search/common/search";
 import { CoverageDetails, IFileCoverage, ISerializedTestResults, ITestErrorMessage, ITestItem, ITestRunProfileReference, ITestTag, TestRunProfileBitset } from "../../contrib/testing/common/testTypes.js";
-import { EditorGroupColumn } from "@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common/vscode/vs/workbench/services/editor/common/editorGroupColumn";
+import { AiSettingsSearchResult } from "../../services/aiSettingsSearch/common/aiSettingsSearch.js";
+import { EditorGroupColumn } from "@codingame/monaco-vscode-5e2c24a1-3217-55e8-bc90-521eaf7df5a6-common/vscode/vs/workbench/services/editor/common/editorGroupColumn";
 import { Dto, SerializableObjectWithBuffers } from "../../services/extensions/common/proxyIdentifier.js";
 import * as extHostProtocol from "./extHost.protocol.js";
 import { CommandsConverter } from "./extHostCommands.js";
 import * as types from "./extHostTypes.js";
-import { ChatAgentLocation } from "../../contrib/chat/common/constants.js";
-import { AiSettingsSearchResult } from "../../services/aiSettingsSearch/common/aiSettingsSearch.js";
-import { McpServerLaunch } from "../../contrib/mcp/common/mcpTypes.js";
-import { ILogService } from "../../../platform/log/common/log.service.js";
 export declare namespace Command {
     interface ICommandsConverter {
         fromInternal(command: extHostProtocol.ICommandDto): vscode.Command | undefined;
@@ -486,6 +486,10 @@ export declare namespace ChatResponseProgressPart {
     function from(part: vscode.ChatResponseProgressPart): Dto<IChatProgressMessage>;
     function to(part: Dto<IChatProgressMessage>): vscode.ChatResponseProgressPart;
 }
+export declare namespace ChatResponseThinkingProgressPart {
+    function from(part: vscode.ChatResponseThinkingProgressPart): Dto<IChatThinkingPart>;
+    function to(part: Dto<IChatThinkingPart>): vscode.ChatResponseThinkingProgressPart;
+}
 export declare namespace ChatResponseWarningPart {
     function from(part: vscode.ChatResponseWarningPart): Dto<IChatWarningMessage>;
     function to(part: Dto<IChatWarningMessage>): vscode.ChatResponseWarningPart;
@@ -505,7 +509,7 @@ export declare namespace ChatPrepareToolInvocationPart {
     function to(part: IChatPrepareToolInvocationPart): vscode.ChatPrepareToolInvocationPart;
 }
 export declare namespace ChatToolInvocationPart {
-    function from(part: vscode.ChatToolInvocationPart): any;
+    function from(part: vscode.ChatToolInvocationPart): IChatToolInvocationSerialized;
     function to(part: any): vscode.ChatToolInvocationPart;
 }
 export declare namespace ChatTask {
@@ -593,6 +597,10 @@ export declare namespace PartialAcceptTriggerKind {
 export declare namespace InlineCompletionEndOfLifeReason {
     function to<T>(reason: languages.InlineCompletionEndOfLifeReason<T>, convertFn: (item: T) => vscode.InlineCompletionItem | undefined): vscode.InlineCompletionEndOfLifeReason;
 }
+export declare namespace InlineCompletionDisplayLocationKind {
+    function from(value: vscode.InlineCompletionDisplayLocationKind): types.InlineCompletionDisplayLocationKind;
+    function to(kind: languages.InlineCompletionDisplayLocationKind): types.InlineCompletionDisplayLocationKind;
+}
 export declare namespace DebugTreeItem {
     function from(item: vscode.DebugTreeItem, id: number): IDebugVisualizationTreeItem;
 }