@codingame/monaco-vscode-api 13.1.6 → 14.0.0

package/vscode/src/vs/platform/undoRedo/common/undoRedoService.js

@@ -66,14 +66,14 @@ class RemovedResources {
         const messages = [];
         if (externalRemoval.length > 0) {
             messages.push(( localize(
-                2215,
+                2255,
                 "The following files have been closed and modified on disk: {0}.",
                 externalRemoval.join(', ')
             )));
         }
         if (noParallelUniverses.length > 0) {
             messages.push(( localize(
-                2216,
+                2256,
                 "The following files have been modified in an incompatible way: {0}.",
                 noParallelUniverses.join(', ')
             )));
@@ -696,7 +696,7 @@ let UndoRedoService = class UndoRedoService {
     _checkWorkspaceUndo(strResource, element, editStackSnapshot, checkInvalidatedResources) {
         if (element.removedResources) {
             return this._tryToSplitAndUndo(strResource, element, element.removedResources, ( localize(
-                2217,
+                2257,
                 "Could not undo '{0}' across all files. {1}",
                 element.label,
                 element.removedResources.createMessage()
@@ -704,7 +704,7 @@ let UndoRedoService = class UndoRedoService {
         }
         if (checkInvalidatedResources && element.invalidatedResources) {
             return this._tryToSplitAndUndo(strResource, element, element.invalidatedResources, ( localize(
-                2217,
+                2257,
                 "Could not undo '{0}' across all files. {1}",
                 element.label,
                 element.invalidatedResources.createMessage()
@@ -718,7 +718,7 @@ let UndoRedoService = class UndoRedoService {
         }
         if (cannotUndoDueToResources.length > 0) {
             return this._tryToSplitAndUndo(strResource, element, null, ( localize(
-                2218,
+                2258,
                 "Could not undo '{0}' across all files because changes were made to {1}",
                 element.label,
                 cannotUndoDueToResources.join(', ')
@@ -732,7 +732,7 @@ let UndoRedoService = class UndoRedoService {
         }
         if (cannotLockDueToResources.length > 0) {
             return this._tryToSplitAndUndo(strResource, element, null, ( localize(
-                2219,
+                2259,
                 "Could not undo '{0}' across all files because there is already an undo or redo operation running on {1}",
                 element.label,
                 cannotLockDueToResources.join(', ')
@@ -740,7 +740,7 @@ let UndoRedoService = class UndoRedoService {
         }
         if (!editStackSnapshot.isValid()) {
             return this._tryToSplitAndUndo(strResource, element, null, ( localize(
-                2220,
+                2260,
                 "Could not undo '{0}' across all files because an undo or redo operation occurred in the meantime",
                 element.label
             )));
@@ -786,14 +786,14 @@ let UndoRedoService = class UndoRedoService {
             })(UndoChoice || (UndoChoice = {}));
             const { result } = await this._dialogService.prompt({
                 type: Severity$1.Info,
-                message: ( localize(2221, "Would you like to undo '{0}' across all files?", element.label)),
+                message: ( localize(2261, "Would you like to undo '{0}' across all files?", element.label)),
                 buttons: [
                     {
-                        label: ( localize(2222, "&&Undo in {0} Files", editStackSnapshot.editStacks.length)),
+                        label: ( localize(2262, "&&Undo in {0} Files", editStackSnapshot.editStacks.length)),
                         run: () => UndoChoice.All
                     },
                     {
-                        label: ( localize(2223, "Undo this &&File")),
+                        label: ( localize(2263, "Undo this &&File")),
                         run: () => UndoChoice.This
                     }
                 ],
@@ -838,7 +838,7 @@ let UndoRedoService = class UndoRedoService {
         }
         if (editStack.locked) {
             const message = ( localize(
-                2224,
+                2264,
                 "Could not undo '{0}' because there is already an undo or redo operation running.",
                 element.label
             ));
@@ -921,9 +921,9 @@ let UndoRedoService = class UndoRedoService {
     }
     async _confirmAndContinueUndo(strResource, sourceId, element) {
         const result = await this._dialogService.confirm({
-            message: ( localize(2225, "Would you like to undo '{0}'?", element.label)),
-            primaryButton: ( localize(2226, "&&Yes")),
-            cancelButton: ( localize(2227, "No"))
+            message: ( localize(2265, "Would you like to undo '{0}'?", element.label)),
+            primaryButton: ( localize(2266, "&&Yes")),
+            cancelButton: ( localize(2267, "No"))
         });
         if (!result.confirmed) {
             return;
@@ -979,7 +979,7 @@ let UndoRedoService = class UndoRedoService {
     _checkWorkspaceRedo(strResource, element, editStackSnapshot, checkInvalidatedResources) {
         if (element.removedResources) {
             return this._tryToSplitAndRedo(strResource, element, element.removedResources, ( localize(
-                2228,
+                2268,
                 "Could not redo '{0}' across all files. {1}",
                 element.label,
                 element.removedResources.createMessage()
@@ -987,7 +987,7 @@ let UndoRedoService = class UndoRedoService {
         }
         if (checkInvalidatedResources && element.invalidatedResources) {
             return this._tryToSplitAndRedo(strResource, element, element.invalidatedResources, ( localize(
-                2228,
+                2268,
                 "Could not redo '{0}' across all files. {1}",
                 element.label,
                 element.invalidatedResources.createMessage()
@@ -1001,7 +1001,7 @@ let UndoRedoService = class UndoRedoService {
         }
         if (cannotRedoDueToResources.length > 0) {
             return this._tryToSplitAndRedo(strResource, element, null, ( localize(
-                2229,
+                2269,
                 "Could not redo '{0}' across all files because changes were made to {1}",
                 element.label,
                 cannotRedoDueToResources.join(', ')
@@ -1015,7 +1015,7 @@ let UndoRedoService = class UndoRedoService {
         }
         if (cannotLockDueToResources.length > 0) {
             return this._tryToSplitAndRedo(strResource, element, null, ( localize(
-                2230,
+                2270,
                 "Could not redo '{0}' across all files because there is already an undo or redo operation running on {1}",
                 element.label,
                 cannotLockDueToResources.join(', ')
@@ -1023,7 +1023,7 @@ let UndoRedoService = class UndoRedoService {
         }
         if (!editStackSnapshot.isValid()) {
             return this._tryToSplitAndRedo(strResource, element, null, ( localize(
-                2231,
+                2271,
                 "Could not redo '{0}' across all files because an undo or redo operation occurred in the meantime",
                 element.label
             )));
@@ -1063,7 +1063,7 @@ let UndoRedoService = class UndoRedoService {
         }
         if (editStack.locked) {
             const message = ( localize(
-                2232,
+                2272,
                 "Could not redo '{0}' because there is already an undo or redo operation running.",
                 element.label
             ));

package/vscode/src/vs/platform/userDataProfile/common/userDataProfile.js

@@ -157,7 +157,7 @@ let UserDataProfilesService = class UserDataProfilesService extends Disposable {
         return this._profilesObject;
     }
     createDefaultProfile() {
-        const defaultProfile = toUserDataProfile('__default__profile__', ( localize(2243, "Default")), this.environmentService.userRoamingDataHome, this.profilesCacheHome);
+        const defaultProfile = toUserDataProfile('__default__profile__', ( localize(2283, "Default")), this.environmentService.userRoamingDataHome, this.profilesCacheHome);
         return { ...defaultProfile, extensionsResource: this.getDefaultProfileExtensionsLocation() ?? defaultProfile.extensionsResource, isDefault: true };
     }
     async createTransientProfile(workspaceIdentifier) {

package/vscode/src/vs/platform/userDataSync/common/userDataSync.d.ts

@@ -249,13 +249,10 @@ export interface IUserDataSynchroniser {
     readonly conflicts: IUserDataSyncResourceConflicts;
     readonly onDidChangeConflicts: Event<IUserDataSyncResourceConflicts>;
     readonly onDidChangeLocal: Event<void>;
-    sync(manifest: IUserDataResourceManifest | null, headers: IHeaders): Promise<void>;
-    stop(): Promise<void>;
-    preview(manifest: IUserDataResourceManifest | null, userDataSyncConfiguration: IUserDataSyncConfiguration, headers: IHeaders): Promise<IUserDataSyncResourcePreview | null>;
+    sync(manifest: IUserDataResourceManifest | null, preview: boolean, userDataSyncConfiguration: IUserDataSyncConfiguration, headers: IHeaders): Promise<IUserDataSyncResourcePreview | null>;
     accept(resource: URI, content?: string | null): Promise<IUserDataSyncResourcePreview | null>;
-    merge(resource: URI): Promise<IUserDataSyncResourcePreview | null>;
-    discard(resource: URI): Promise<IUserDataSyncResourcePreview | null>;
     apply(force: boolean, headers: IHeaders): Promise<IUserDataSyncResourcePreview | null>;
+    stop(): Promise<void>;
     hasPreviouslySynced(): Promise<boolean>;
     hasLocalData(): Promise<boolean>;
     resetLocal(): Promise<void>;
@@ -275,6 +272,11 @@ export interface IUserDataManualSyncTask {
     apply(): Promise<void>;
     stop(): Promise<void>;
 }
+export type SyncOptions = {
+    immediately?: boolean;
+    skipIfSyncedRecently?: boolean;
+    disableCache?: boolean;
+};
 export interface IConflictSetting {
     key: string;
     localValue: any | undefined;

package/vscode/src/vs/platform/userDataSync/common/userDataSync.js

@@ -51,12 +51,12 @@ function registerConfiguration() {
     configurationRegistry.registerConfiguration({
         id: 'settingsSync',
         order: 30,
-        title: ( localize(2253, "Settings Sync")),
+        title: ( localize(2293, "Settings Sync")),
         type: 'object',
         properties: {
             [CONFIG_SYNC_KEYBINDINGS_PER_PLATFORM]: {
                 type: 'boolean',
-                description: ( localize(2254, "Synchronize keybindings for each platform.")),
+                description: ( localize(2294, "Synchronize keybindings for each platform.")),
                 default: true,
                 scope: ConfigurationScope.APPLICATION,
                 tags: ['sync', 'usesOnlineServices']
@@ -64,13 +64,13 @@ function registerConfiguration() {
             'settingsSync.ignoredExtensions': {
                 'type': 'array',
                 markdownDescription: ( localize(
-                    2255,
+                    2295,
                     "List of extensions to be ignored while synchronizing. The identifier of an extension is always `${publisher}.${name}`. For example: `vscode.csharp`."
                 )),
                 items: [{
                         type: 'string',
                         pattern: EXTENSION_IDENTIFIER_PATTERN,
-                        errorMessage: ( localize(2256, "Expected format '${publisher}.${name}'. Example: 'vscode.csharp'."))
+                        errorMessage: ( localize(2296, "Expected format '${publisher}.${name}'. Example: 'vscode.csharp'."))
                     }],
                 'default': [],
                 'scope': ConfigurationScope.APPLICATION,
@@ -80,7 +80,7 @@ function registerConfiguration() {
             },
             'settingsSync.ignoredSettings': {
                 'type': 'array',
-                description: ( localize(2257, "Configure settings to be ignored while synchronizing.")),
+                description: ( localize(2297, "Configure settings to be ignored while synchronizing.")),
                 'default': [],
                 'scope': ConfigurationScope.APPLICATION,
                 $ref: ignoredSettingsSchemaId,

package/vscode/src/vs/platform/userDataSync/common/userDataSync.service.d.ts

@@ -1,11 +1,11 @@
 import { VSBufferReadableStream } from "../../../base/common/buffer.js";
 import { IStringDictionary } from "../../../base/common/collections.js";
 import { Event } from "../../../base/common/event.js";
-import { FormattingOptions } from "@codingame/monaco-vscode-56402b83-4a60-5b15-86f9-71fe99c32744-common/vscode/vs/base/common/jsonFormatter";
+import { FormattingOptions } from "@codingame/monaco-vscode-407531d3-fdae-5387-8c41-49ba0e9574b5-common/vscode/vs/base/common/jsonFormatter";
 import { URI } from "../../../base/common/uri.js";
 import { IHeaders } from "@codingame/monaco-vscode-039b5553-0838-562a-97c2-30d6e54a7b42-common/vscode/vs/base/parts/request/common/request";
 import { ILogService } from "../../log/common/log.service.js";
-import { IUserDataSyncStore, UserDataSyncStoreType, type IResourceRefHandle, type ISyncResourceHandle, type ISyncUserDataProfile, type IUserData, type IUserDataManifest, type IUserDataManualSyncTask, type IUserDataSyncResource, type IUserDataSyncResourceConflicts, type IUserDataSyncResourceError, type IUserDataSyncTask, type ServerResource, type SyncResource, type SyncStatus, type UserDataSyncError, type UserDataSyncErrorCode } from "./userDataSync.js";
+import { IUserDataSyncStore, UserDataSyncStoreType, type IResourceRefHandle, type ISyncResourceHandle, type ISyncUserDataProfile, type IUserData, type IUserDataManifest, type IUserDataManualSyncTask, type IUserDataSyncResource, type IUserDataSyncResourceConflicts, type IUserDataSyncResourceError, type IUserDataSyncTask, type ServerResource, type SyncOptions, type SyncResource, type SyncStatus, type UserDataSyncError, type UserDataSyncErrorCode } from "./userDataSync.js";
 import { IUserDataSyncMachine } from "@codingame/monaco-vscode-a2719803-af40-5ae9-a29f-8a2231c33056-common/vscode/vs/platform/userDataSync/common/userDataSyncMachines";
 export declare const IUserDataSyncStoreManagementService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<IUserDataSyncStoreManagementService>;
 export interface IUserDataSyncStoreManagementService {
@@ -108,7 +108,7 @@ export interface IUserDataAutoSyncService {
     readonly onError: Event<UserDataSyncError>;
     turnOn(): Promise<void>;
     turnOff(everywhere: boolean): Promise<void>;
-    triggerSync(sources: string[], hasToLimitSync: boolean, disableCache: boolean): Promise<void>;
+    triggerSync(sources: string[], options?: SyncOptions): Promise<void>;
 }
 export declare const IUserDataSyncUtilService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<IUserDataSyncUtilService>;
 export interface IUserDataSyncUtilService {

package/vscode/src/vs/platform/window/common/window.d.ts

@@ -36,13 +36,15 @@ export interface IOpenWindowOptions extends IBaseOpenWindowsOptions {
     readonly preferNewWindow?: boolean;
     readonly noRecentEntry?: boolean;
     readonly addMode?: boolean;
+    readonly removeMode?: boolean;
     readonly diffMode?: boolean;
     readonly mergeMode?: boolean;
     readonly gotoLineMode?: boolean;
     readonly waitMarkerFileURI?: URI;
 }
-export interface IAddFoldersRequest {
+export interface IAddRemoveFoldersRequest {
     readonly foldersToAdd: UriComponents[];
+    readonly foldersToRemove: UriComponents[];
 }
 interface IOpenedWindow {
     readonly id: number;
@@ -117,6 +119,8 @@ export declare enum CustomTitleBarVisibility {
     WINDOWED = "windowed",
     NEVER = "never"
 }
+export declare let titlebarStyleDefaultOverride: "custom" | undefined;
+export declare function overrideDefaultTitlebarStyle(style: "custom"): void;
 export declare function hasCustomTitlebar(configurationService: IConfigurationService, titleBarStyle?: TitlebarStyle): boolean;
 export declare function hasNativeTitlebar(configurationService: IConfigurationService, titleBarStyle?: TitlebarStyle): boolean;
 export declare function getTitleBarStyle(configurationService: IConfigurationService): TitlebarStyle;
@@ -204,6 +208,7 @@ export interface INativeWindowConfiguration extends IWindowConfiguration, Native
     autoDetectHighContrast?: boolean;
     autoDetectColorScheme?: boolean;
     isCustomZoomLevel?: boolean;
+    overrideDefaultTitlebarStyle?: "custom";
     perfMarks: PerformanceMark[];
     filesToWait?: IPathsToWaitFor;
     os: IOSConfiguration;

package/vscode/src/vs/platform/workspace/common/workspace.js

@@ -140,7 +140,7 @@ function toWorkspaceFolder(resource) {
 }
 const WORKSPACE_EXTENSION = 'code-workspace';
 const WORKSPACE_SUFFIX = `.${WORKSPACE_EXTENSION}`;
-const WORKSPACE_FILTER = [{ name: ( localize(2261, "Code Workspace")), extensions: [WORKSPACE_EXTENSION] }];
+const WORKSPACE_FILTER = [{ name: ( localize(2301, "Code Workspace")), extensions: [WORKSPACE_EXTENSION] }];
 const UNTITLED_WORKSPACE_NAME = 'workspace.json';
 function isUntitledWorkspace(path, environmentService) {
     return extUriBiasedIgnorePathCase.isEqualOrParent(path, environmentService.untitledWorkspacesHome);

package/vscode/src/vs/platform/workspaces/common/workspaces.service.d.ts

@@ -1,8 +1,8 @@
 import { Event } from "../../../base/common/event.js";
 import { URI } from "../../../base/common/uri.js";
-import { IWorkspaceBackupInfo, IFolderBackupInfo } from "@codingame/monaco-vscode-56402b83-4a60-5b15-86f9-71fe99c32744-common/vscode/vs/platform/backup/common/backup";
+import { IWorkspaceBackupInfo, IFolderBackupInfo } from "@codingame/monaco-vscode-2cbab29e-9393-5de6-b701-9a9555360b6b-common/vscode/vs/platform/backup/common/backup";
 import { IWorkspaceIdentifier } from "../../workspace/common/workspace.js";
-import { IEnterWorkspaceResult, IWorkspaceFolderCreationData, IRecent, IRecentlyOpened } from "@codingame/monaco-vscode-56402b83-4a60-5b15-86f9-71fe99c32744-common/vscode/vs/platform/workspaces/common/workspaces";
+import { IEnterWorkspaceResult, IWorkspaceFolderCreationData, IRecent, IRecentlyOpened } from "@codingame/monaco-vscode-2cbab29e-9393-5de6-b701-9a9555360b6b-common/vscode/vs/platform/workspaces/common/workspaces";
 export declare const IWorkspacesService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<IWorkspacesService>;
 export interface IWorkspacesService {
     readonly _serviceBrand: undefined;

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

@@ -5,6 +5,7 @@ import { Command } from "../../../editor/common/languages.js";
 import { IAccessibilityInformation } from "../../../platform/accessibility/common/accessibility.js";
 import { IMarkdownString } from "../../../base/common/htmlContent.js";
 import { Event } from "../../../base/common/event.js";
+import { IManagedHoverTooltipMarkdownString } from "../../../base/browser/ui/hover/hover.js";
 export declare const IExtensionStatusBarItemService: import("../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IExtensionStatusBarItemService>;
 export interface IExtensionStatusBarItemChangeEvent {
     readonly added?: ExtensionStatusBarEntry;
@@ -25,7 +26,7 @@ export declare enum StatusBarUpdateKind {
 export interface IExtensionStatusBarItemService {
     readonly _serviceBrand: undefined;
     onDidChange: Event<IExtensionStatusBarItemChangeEvent>;
-    setOrUpdateEntry(id: string, statusId: string, extensionId: string | undefined, name: string, text: string, tooltip: IMarkdownString | string | undefined, command: Command | undefined, color: string | ThemeColor | undefined, backgroundColor: ThemeColor | undefined, alignLeft: boolean, priority: number | undefined, accessibilityInformation: IAccessibilityInformation | undefined): StatusBarUpdateKind;
+    setOrUpdateEntry(id: string, statusId: string, extensionId: string | undefined, name: string, text: string, tooltip: IMarkdownString | string | undefined | IManagedHoverTooltipMarkdownString, command: Command | undefined, color: string | ThemeColor | undefined, backgroundColor: ThemeColor | undefined, alignLeft: boolean, priority: number | undefined, accessibilityInformation: IAccessibilityInformation | undefined): StatusBarUpdateKind;
     unsetEntry(id: string): void;
     getEntries(): Iterable<ExtensionStatusBarEntry>;
 }
@@ -37,7 +38,7 @@ export declare class ExtensionStatusBarItemService implements IExtensionStatusBa
     readonly onDidChange: Event<IExtensionStatusBarItemChangeEvent>;
     constructor(_statusbarService: IStatusbarService);
     dispose(): void;
-    setOrUpdateEntry(entryId: string, id: string, extensionId: string | undefined, name: string, text: string, tooltip: IMarkdownString | string | undefined, command: Command | undefined, color: string | ThemeColor | undefined, backgroundColor: ThemeColor | undefined, alignLeft: boolean, priority: number | undefined, accessibilityInformation: IAccessibilityInformation | undefined): StatusBarUpdateKind;
+    setOrUpdateEntry(entryId: string, id: string, extensionId: string | undefined, name: string, text: string, tooltip: IMarkdownString | string | undefined | IManagedHoverTooltipMarkdownString, command: Command | undefined, color: string | ThemeColor | undefined, backgroundColor: ThemeColor | undefined, alignLeft: boolean, priority: number | undefined, accessibilityInformation: IAccessibilityInformation | undefined): StatusBarUpdateKind;
     unsetEntry(entryId: string): void;
     getEntries(): Iterable<[
         string,

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

@@ -4,6 +4,7 @@ import { toDisposable } from '../../../base/common/lifecycle.js';
 import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
 import { StatusbarAlignment } from '../../services/statusbar/browser/statusbar.js';
 import { IStatusbarService } from '../../services/statusbar/browser/statusbar.service.js';
+import { isMarkdownString } from '../../../base/common/htmlContent.js';
 import { getCodiconAriaLabel } from '../../../base/common/iconLabels.js';
 import { hash } from '../../../base/common/hash.js';
 import { Emitter } from '../../../base/common/event.js';
@@ -37,7 +38,7 @@ let ExtensionStatusBarItemService = class ExtensionStatusBarItemService {
         }
         else {
             ariaLabel = getCodiconAriaLabel(text);
-            if (tooltip) {
+            if (typeof tooltip === 'string' || isMarkdownString(tooltip)) {
                 const tooltipString = typeof tooltip === 'string' ? tooltip : tooltip.value;
                 ariaLabel += `, ${tooltipString}`;
             }
@@ -50,7 +51,7 @@ let ExtensionStatusBarItemService = class ExtensionStatusBarItemService {
                 color = undefined;
                 backgroundColor = undefined;
         }
-        const entry = { name, text, tooltip, command, color, backgroundColor, ariaLabel, role, kind };
+        const entry = { name, text, tooltip, command, color, backgroundColor, ariaLabel, role, kind, extensionId };
         if (typeof priority === 'undefined') {
             priority = 0;
         }

package/vscode/src/vs/workbench/api/common/extHost.api.impl.js

@@ -10,7 +10,7 @@ import { TextEditorCursorStyle } from '../../../editor/common/config/editorOptio
 import { targetsNotebooks, score } from '../../../editor/common/languageSelector.js';
 import { IndentAction } from '../../../editor/common/languages/languageConfiguration.js';
 import { OverviewRulerLane } from '../../../editor/common/model.js';
-import { ExtensionIdentifierSet } from '../../../platform/extensions/common/extensions.js';
+import { ExtensionError, ExtensionIdentifierSet } from '../../../platform/extensions/common/extensions.js';
 import { FilePermission, FileType } from '../../../platform/files/common/files.js';
 import { LogLevel } from '../../../platform/log/common/log.js';
 import { ILoggerService, ILogService } from '../../../platform/log/common/log.service.js';
@@ -88,7 +88,7 @@ import { ExtHostTimeline } from './extHostTimeline.js';
 import { ExtHostTreeViews } from './extHostTreeViews.js';
 import { IExtHostTunnelService } from './extHostTunnelService.js';
 import { LanguageSelector } from './extHostTypeConverters.js';
-import { ExtensionKind, ProgressLocation, InlineEditTriggerKind, InlineEdit, NewSymbolNameTriggerKind, NewSymbolNameTag, NewSymbolName, LanguageModelPromptTsxPart, LanguageModelChatToolMode, LanguageModelToolResult, LanguageModelError, LanguageModelToolCallPart, LanguageModelTextPart, LanguageModelToolResultPart, LanguageModelChatMessage, LanguageModelChatMessageRole, ChatReferenceBinaryData, ChatRequestNotebookData, ChatRequestEditorData, ChatLocation, ChatResponseTurn, ChatRequestTurn, ChatResponseReferencePartStatusKind, ChatResponseMovePart, ChatResponseConfirmationPart, ChatResponseDetectedParticipantPart, ChatResponseCommandButtonPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseTextEditPart, ChatResponseWarningPart, ChatResponseCodeblockUriPart, ChatResponseCodeCitationPart, ChatResponseReferencePart, ChatResponseProgressPart2, ChatResponseProgressPart, ChatResponseAnchorPart, ChatResponseFileTreePart, ChatResponseMarkdownPart, KeywordRecognitionStatus, PartialAcceptTriggerKind, TextToSpeechStatus, SpeechToTextStatus, RelatedInformationType, DebugThread, DebugStackFrame, InteractiveEditorResponseFeedbackKind, ChatEditingSessionActionOutcome, ChatCopyKind, InteractiveSessionVoteDirection, TextMultiDiffTabInput, ChatEditorTabInput, InteractiveWindowInput, TerminalEditorTabInput, WebviewEditorTabInput, NotebookDiffEditorTabInput, NotebookEditorTabInput, CustomEditorTabInput, TextMergeTabInput, TextDiffTabInput, TextTabInput, InputBoxValidationSeverity, QuickPickItemKind, LanguageStatusSeverity, WorkspaceTrustState, DeclarationCoverage, BranchCoverage, StatementCoverage, FileCoverage, TestCoverageCount, DataTransferItem, DataTransfer, TestRunProfileKind, TestTag, TestMessageStackFrame, TestMessage, TestRunRequest, TestResultState, LinkedEditingRanges, PortAttributes, NotebookVariablesRequestKind, NotebookKernelSourceAction, NotebookEdit, NotebookControllerAffinity2, NotebookControllerAffinity, NotebookCellStatusBarItem, CellErrorStackFrame, NotebookCellOutputItem, NotebookCellOutput, NotebookEditorRevealType, NotebookCellStatusBarAlignment, NotebookRendererScript, NotebookData, NotebookCellData, NotebookCellExecutionState, NotebookCellKind, NotebookRange, TimelineItem, ExtensionRuntime, SourceControlInputBoxValidationType, ManagedResolvedAuthority, ResolvedAuthority, RemoteAuthorityResolverError, InlayHintKind, InlayHintLabelPart, InlayHint, DocumentPasteEdit, DocumentDropOrPasteEditKind, DocumentDropEdit, DocumentPasteTriggerKind, WorkspaceEdit, ViewColumn, TypeHierarchyItem, TreeItemCollapsibleState, TreeItemCheckboxState, TreeItem, ThemeIcon, ThemeColor, TextDocumentChangeReason, SyntaxTokenType, TextEditorSelectionChangeKind, TextEditorRevealType, TextEditorLineNumbersStyle, TextEditorChangeKind, SnippetTextEdit, TextEdit, TextDocumentSaveReason, TerminalCompletionList, TerminalCompletionItemKind, TerminalCompletionItem, TerminalShellExecutionCommandLineConfidence, TerminalExitReason, TerminalProfile, TerminalLocation, TerminalQuickFixOpener, TerminalQuickFixCommand, TerminalLink, TaskScope, TaskRevealKind, TaskPanelKind, TaskGroup, Task, SymbolTag, SymbolKind, SymbolInformation, StatusBarAlignment, StandardTokenType, SourceBreakpoint, SnippetString, SignatureInformation, SignatureHelpTriggerKind, SignatureHelp, ShellQuoting, ShellExecution, SemanticTokensLegend, SemanticTokensEdits, SemanticTokensEdit, SemanticTokensBuilder, SemanticTokens, SelectionRange, Selection, RelativePattern, Range, QuickInputButtons, QuickInputButtonLocation, ProcessExecution, Position, PortAutoForwardAction, ParameterInformation, MarkdownString, Location, HoverVerbosityAction, VerboseHover, Hover, InlineSuggestionList, InlineSuggestion, FunctionBreakpoint, FoldingRangeKind, FoldingRange, FileSystemError, FileDecoration, FileChangeType, ExternalUriOpenerPriority, ExtensionMode, InlineCompletionTriggerKind, InlineValueEvaluatableExpression, InlineValueVariableLookup, InlineValueText, EvaluatableExpression, EnvironmentVariableMutatorType, EndOfLine, DocumentSymbol, DocumentLink, MultiDocumentHighlight, DocumentHighlightKind, DocumentHighlight, Disposable, DiagnosticTag, DiagnosticSeverity, DiagnosticRelatedInformation, Diagnostic, DecorationRangeBehavior, DebugVisualization, DebugConsoleMode, DebugAdapterServer, DebugAdapterNamedPipeServer, DebugAdapterInlineImplementation, DebugAdapterExecutable, CustomExecution, ConfigurationTarget, CompletionTriggerKind, CompletionList, CompletionItemTag, CompletionItemKind, CompletionItem, CommentThreadFocus, CommentThreadApplicability, CommentThreadState, CommentThreadCollapsibleState, CommentState, CommentMode, ColorThemeKind, ColorPresentation, ColorInformation, Color, CodeLens, CodeActionTriggerKind, CodeActionKind, CodeAction, CallHierarchyOutgoingCall, CallHierarchyItem, CallHierarchyIncomingCall, ChatCompletionItem, ChatVariableLevel, ChatResultFeedbackKind, TerminalOutputAnchor, Breakpoint } from './extHostTypes.js';
+import { ExtensionKind, ProgressLocation, InlineEditTriggerKind, InlineEdit, NewSymbolNameTriggerKind, NewSymbolNameTag, NewSymbolName, LanguageModelPromptTsxPart, LanguageModelChatToolMode, LanguageModelToolResult, LanguageModelError, LanguageModelToolCallPart, LanguageModelTextPart, LanguageModelToolResultPart, LanguageModelChatMessage, LanguageModelChatMessageRole, ChatReferenceBinaryData, ChatRequestNotebookData, ChatRequestEditorData, ChatLocation, ChatResponseTurn, ChatRequestTurn, ChatResponseReferencePartStatusKind, ChatResponseMovePart, ChatResponseConfirmationPart, ChatResponseDetectedParticipantPart, ChatResponseCommandButtonPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseTextEditPart, ChatResponseWarningPart, ChatResponseCodeblockUriPart, ChatResponseCodeCitationPart, ChatResponseReferencePart, ChatResponseProgressPart2, ChatResponseProgressPart, ChatResponseAnchorPart, ChatResponseFileTreePart, ChatResponseMarkdownPart, KeywordRecognitionStatus, PartialAcceptTriggerKind, TextToSpeechStatus, SpeechToTextStatus, RelatedInformationType, DebugThread, DebugStackFrame, InteractiveEditorResponseFeedbackKind, ChatEditingSessionActionOutcome, ChatCopyKind, InteractiveSessionVoteDirection, TextMultiDiffTabInput, ChatEditorTabInput, InteractiveWindowInput, TerminalEditorTabInput, WebviewEditorTabInput, NotebookDiffEditorTabInput, NotebookEditorTabInput, CustomEditorTabInput, TextMergeTabInput, TextDiffTabInput, TextTabInput, InputBoxValidationSeverity, QuickPickItemKind, LanguageStatusSeverity, WorkspaceTrustState, DeclarationCoverage, BranchCoverage, StatementCoverage, FileCoverage, TestCoverageCount, DataTransferItem, DataTransfer, TestRunProfileKind, TestTag, TestMessageStackFrame, TestMessage, TestRunRequest, TestResultState, LinkedEditingRanges, PortAttributes, NotebookVariablesRequestKind, NotebookKernelSourceAction, NotebookEdit, NotebookControllerAffinity2, NotebookControllerAffinity, NotebookCellStatusBarItem, CellErrorStackFrame, NotebookCellOutputItem, NotebookCellOutput, NotebookEditorRevealType, NotebookCellStatusBarAlignment, NotebookRendererScript, NotebookData, NotebookCellData, NotebookCellExecutionState, NotebookCellKind, NotebookRange, TimelineItem, ExtensionRuntime, SourceControlInputBoxValidationType, ManagedResolvedAuthority, ResolvedAuthority, RemoteAuthorityResolverError, InlayHintKind, InlayHintLabelPart, InlayHint, DocumentPasteEdit, DocumentDropOrPasteEditKind, DocumentDropEdit, DocumentPasteTriggerKind, WorkspaceEdit, ViewColumn, TypeHierarchyItem, TreeItemCollapsibleState, TreeItemCheckboxState, TreeItem, ThemeIcon, ThemeColor, TextDocumentChangeReason, SyntaxTokenType, TextEditorSelectionChangeKind, TextEditorRevealType, TextEditorLineNumbersStyle, TextEditorChangeKind, SnippetTextEdit, TextEdit, TextDocumentSaveReason, TerminalShellType, TerminalCompletionList, TerminalCompletionItemKind, TerminalCompletionItem, TerminalShellExecutionCommandLineConfidence, TerminalExitReason, TerminalProfile, TerminalLocation, TerminalQuickFixOpener, TerminalQuickFixCommand, TerminalLink, TaskScope, TaskRevealKind, TaskPanelKind, TaskGroup, Task, SymbolTag, SymbolKind, SymbolInformation, StatusBarAlignment, StandardTokenType, SourceBreakpoint, SnippetString, SignatureInformation, SignatureHelpTriggerKind, SignatureHelp, ShellQuoting, ShellExecution, SemanticTokensLegend, SemanticTokensEdits, SemanticTokensEdit, SemanticTokensBuilder, SemanticTokens, SelectionRange, Selection, RelativePattern, Range, QuickInputButtons, QuickInputButtonLocation, ProcessExecution, Position, PortAutoForwardAction, ParameterInformation, MarkdownString, Location, HoverVerbosityAction, VerboseHover, Hover, InlineSuggestionList, InlineSuggestion, FunctionBreakpoint, FoldingRangeKind, FoldingRange, FileSystemError, FileDecoration, FileChangeType, ExternalUriOpenerPriority, ExtensionMode, InlineCompletionTriggerKind, InlineValueEvaluatableExpression, InlineValueVariableLookup, InlineValueText, EvaluatableExpression, EnvironmentVariableMutatorType, EndOfLine, DocumentSymbol, DocumentLink, MultiDocumentHighlight, DocumentHighlightKind, DocumentHighlight, Disposable, DiagnosticTag, DiagnosticSeverity, DiagnosticRelatedInformation, Diagnostic, DecorationRangeBehavior, DebugVisualization, DebugConsoleMode, DebugAdapterServer, DebugAdapterNamedPipeServer, DebugAdapterInlineImplementation, DebugAdapterExecutable, CustomExecution, ConfigurationTarget, CompletionTriggerKind, CompletionList, CompletionItemTag, CompletionItemKind, CompletionItem, CommentThreadFocus, CommentThreadApplicability, CommentThreadState, CommentThreadCollapsibleState, CommentState, CommentMode, ColorThemeKind, ColorPresentation, ColorInformation, Color, CodeLens, CodeActionTriggerKind, CodeActionKind, CodeAction, CallHierarchyOutgoingCall, CallHierarchyItem, CallHierarchyIncomingCall, ChatCompletionItem, ChatVariableLevel, ChatResultFeedbackKind, TerminalOutputAnchor, Breakpoint } from './extHostTypes.js';
 import { ExtHostUriOpeners } from './extHostUriOpener.js';
 import { IURITransformerService } from './extHostUriTransformerService.js';
 import { ExtHostUrls } from './extHostUrls.js';
@@ -254,11 +254,7 @@ function createApiFactoryAndRegisterActors(accessor) {
                         listener.call(thisArgs, e);
                     }
                     catch (err) {
-                        onUnexpectedExternalError(( new Error(
-                            `[ExtensionListenerError] Extension '${extension.identifier.value}' FAILED to handle event: ${( err.toString())}`,
-                            { cause: err }
-                        )));
-                        extHostTelemetry.onExtensionError(extension.identifier, err);
+                        onUnexpectedExternalError(( new ExtensionError(extension.identifier, err, 'FAILED to handle event')));
                     }
                 });
                 disposables?.push(handle);
@@ -544,7 +540,6 @@ function createApiFactoryAndRegisterActors(accessor) {
                 return extHostLanguageFeatures.registerCodeActionProvider(extension, checkSelector(selector), provider, metadata);
             },
             registerDocumentPasteEditProvider(selector, provider, metadata) {
-                checkProposedApiEnabled(extension, 'documentPaste');
                 return extHostLanguageFeatures.registerDocumentPasteEditProvider(extension, checkSelector(selector), provider, metadata);
             },
             registerCodeLensProvider(selector, provider) {
@@ -668,7 +663,7 @@ function createApiFactoryAndRegisterActors(accessor) {
                 return extHostLanguages.createLanguageStatusItem(extension, id, selector);
             },
             registerDocumentDropEditProvider(selector, provider, metadata) {
-                return extHostLanguageFeatures.registerDocumentOnDropEditProvider(extension, selector, provider, isProposedApiEnabled(extension, 'documentPaste') ? metadata : undefined);
+                return extHostLanguageFeatures.registerDocumentOnDropEditProvider(extension, selector, provider, metadata);
             }
         };
         const window = {
@@ -776,7 +771,7 @@ function createApiFactoryAndRegisterActors(accessor) {
                 return extHostQuickOpen.showInput(options, token);
             },
             showOpenDialog(options) {
-                return extHostDialogs.showOpenDialog(extension, options);
+                return extHostDialogs.showOpenDialog(options);
             },
             showSaveDialog(options) {
                 return extHostDialogs.showSaveDialog(options);
@@ -1393,9 +1388,9 @@ function createApiFactoryAndRegisterActors(accessor) {
                 checkProposedApiEnabled(extension, 'chatVariableResolver');
                 return extHostChatVariables.registerVariableResolver(extension, id, name, userDescription, modelDescription, isSlow, resolver, fullName, icon?.id);
             },
-            registerMappedEditsProvider(selector, provider) {
+            registerMappedEditsProvider(_selector, _provider) {
                 checkProposedApiEnabled(extension, 'mappedEditsProvider');
-                return extHostLanguageFeatures.registerMappedEditsProvider(extension, selector, provider);
+                return { dispose() { } };
             },
             registerMappedEditsProvider2(provider) {
                 checkProposedApiEnabled(extension, 'mappedEditsProvider');
@@ -1453,10 +1448,10 @@ function createApiFactoryAndRegisterActors(accessor) {
                 return extHostLanguageModelTools.registerTool(extension, name, tool);
             },
             invokeTool(name, parameters, token) {
-                return extHostLanguageModelTools.invokeTool(name, parameters, token);
+                return extHostLanguageModelTools.invokeTool(extension, name, parameters, token);
             },
             get tools() {
-                return extHostLanguageModelTools.tools;
+                return extHostLanguageModelTools.getTools(extension);
             },
             fileIsIgnored(uri, token) {
                 return extHostLanguageModels.fileIsIgnored(extension, uri, token);
@@ -1614,6 +1609,7 @@ function createApiFactoryAndRegisterActors(accessor) {
             TerminalCompletionItem: TerminalCompletionItem,
             TerminalCompletionItemKind: TerminalCompletionItemKind,
             TerminalCompletionList: TerminalCompletionList,
+            TerminalShellType: TerminalShellType,
             TextDocumentSaveReason: TextDocumentSaveReason,
             TextEdit: TextEdit,
             SnippetTextEdit: SnippetTextEdit,

package/vscode/src/vs/workbench/api/common/extHost.protocol.d.ts

@@ -28,7 +28,7 @@ import { ConfigurationScope } from "../../../platform/configuration/common/confi
 import { IExtensionIdWithVersion } from "@codingame/monaco-vscode-a2719803-af40-5ae9-a29f-8a2231c33056-common/vscode/vs/platform/extensionManagement/common/extensionStorage";
 import { ExtensionIdentifier, IExtensionDescription } from "../../../platform/extensions/common/extensions.js";
 import * as files from "../../../platform/files/common/files.js";
-import { ResourceLabelFormatter } from "@codingame/monaco-vscode-82e231ca-6ed7-5920-b2b8-1874ccc0be07-common/vscode/vs/platform/label/common/label";
+import { ResourceLabelFormatter } from "@codingame/monaco-vscode-2cbab29e-9393-5de6-b701-9a9555360b6b-common/vscode/vs/platform/label/common/label";
 import { ILoggerOptions, ILoggerResource, LogLevel } from "../../../platform/log/common/log.js";
 import { IMarkerData } from "../../../platform/markers/common/markers.js";
 import { IProgressOptions, IProgressStep } from "../../../platform/progress/common/progress.js";
@@ -38,7 +38,7 @@ import { AuthInfo, Credentials } from "../../../platform/request/common/request.
 import { ClassifiedEvent, IGDPRProperty, OmitMetadata, StrictPropertyCheck } from "../../../platform/telemetry/common/gdprTypings.js";
 import { TelemetryLevel } from "../../../platform/telemetry/common/telemetry.js";
 import { ISerializableEnvironmentDescriptionMap, ISerializableEnvironmentVariableCollection } from "@codingame/monaco-vscode-terminal-service-override/vscode/vs/platform/terminal/common/environmentVariable";
-import { ICreateContributedTerminalProfileOptions, IProcessProperty, IProcessReadyWindowsPty, IShellLaunchConfigDto, ITerminalEnvironment, ITerminalLaunchError, ITerminalProfile, TerminalExitReason, TerminalLocation } from "../../../platform/terminal/common/terminal.js";
+import { ICreateContributedTerminalProfileOptions, IProcessProperty, IProcessReadyWindowsPty, IShellLaunchConfigDto, ITerminalEnvironment, ITerminalLaunchError, ITerminalProfile, TerminalExitReason, TerminalLocation, TerminalShellType } from "../../../platform/terminal/common/terminal.js";
 import { ProvidedPortAttributes, TunnelCreationOptions, TunnelOptions, TunnelPrivacyId, TunnelProviderFeatures } from "../../../platform/tunnel/common/tunnel.js";
 import { EditSessionIdentityMatch } from "../../../platform/workspace/common/editSessions.js";
 import { WorkspaceTrustRequestOptions } from "../../../platform/workspace/common/workspaceTrust.js";
@@ -48,7 +48,7 @@ import { CallHierarchyItem } from "@codingame/monaco-vscode-7f39b6f1-3542-5430-8
 import { ChatAgentLocation, IChatAgentMetadata, IChatAgentRequest, IChatAgentResult, IChatWelcomeMessageContent } from "../../contrib/chat/common/chatAgents.js";
 import { ICodeMapperRequest, ICodeMapperResult } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/common/chatCodeMapperService";
 import { IChatRelatedFile, IChatRelatedFileProviderMetadata as IChatRelatedFilesProviderMetadata, IChatRequestDraft } from "../../contrib/chat/common/chatEditingService.js";
-import { IChatProgressHistoryResponseContent } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IChatProgressHistoryResponseContent } from "../../contrib/chat/common/chatModel.js";
 import { IChatContentInlineReference, IChatFollowup, IChatProgress, IChatResponseErrorDetails, IChatTask, IChatTaskDto, IChatUserActionEvent, IChatVoteAction } from "../../contrib/chat/common/chatService.js";
 import { IChatRequestVariableValue, IChatVariableData, IChatVariableResolverProgress } from "../../contrib/chat/common/chatVariables.js";
 import { IChatMessage, IChatResponseFragment, ILanguageModelChatMetadata, ILanguageModelChatSelector, ILanguageModelsChangeEvent } from "../../contrib/chat/common/languageModels.js";
@@ -56,8 +56,8 @@ import { IPreparedToolInvocation, IToolData, IToolInvocation, IToolResult } from
 import { DebugConfigurationProviderTriggerKind, IAdapterDescriptor, IConfig, IDebugSessionReplMode, IDebugTestRunReference, IDebugVisualization, IDebugVisualizationContext, IDebugVisualizationTreeItem, MainThreadDebugVisualization } from "../../contrib/debug/common/debug.js";
 import * as notebookCommon from "../../contrib/notebook/common/notebookCommon.js";
 import { CellExecutionUpdateType } from "../../contrib/notebook/common/notebookExecutionService.js";
-import { ICellExecutionComplete, ICellExecutionStateUpdate } from "@codingame/monaco-vscode-972e8507-3a64-566d-8bc0-b78993998562-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService";
-import { ICellRange } from "@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/common/notebookRange";
+import { ICellExecutionComplete, ICellExecutionStateUpdate } from "@codingame/monaco-vscode-af5ccfda-af82-504b-b365-92b4e654e5c5-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService";
+import { ICellRange } from "../../contrib/notebook/common/notebookRange.js";
 import { InputValidationType } from "@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common/vscode/vs/workbench/contrib/scm/common/scm";
 import { IWorkspaceSymbol, NotebookPriorityInfo } from "@codingame/monaco-vscode-42931eb9-e564-530c-bafc-fa23ab43a070-common/vscode/vs/workbench/contrib/search/common/search";
 import { IRawClosedNotebookFileMatch } from "../../contrib/search/common/searchNotebookHelpers.js";
@@ -434,7 +434,7 @@ export interface MainThreadLanguageFeaturesShape extends IDisposable {
     $registerDocumentRangeSemanticTokensProvider(handle: number, selector: IDocumentFilterDto[], legend: languages.SemanticTokensLegend): void;
     $registerCompletionsProvider(handle: number, selector: IDocumentFilterDto[], triggerCharacters: string[], supportsResolveDetails: boolean, extensionId: ExtensionIdentifier): void;
     $registerInlineCompletionsSupport(handle: number, selector: IDocumentFilterDto[], supportsHandleDidShowCompletionItem: boolean, extensionId: string, yieldsToExtensionIds: string[]): void;
-    $registerInlineEditProvider(handle: number, selector: IDocumentFilterDto[], extensionId: ExtensionIdentifier): 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;
     $emitInlayHintsEvent(eventHandle: number): void;
@@ -449,7 +449,6 @@ export interface MainThreadLanguageFeaturesShape extends IDisposable {
     $resolvePasteFileData(handle: number, requestId: number, dataId: string): Promise<VSBuffer>;
     $resolveDocumentOnDropFileData(handle: number, requestId: number, dataId: string): Promise<VSBuffer>;
     $setLanguageConfiguration(handle: number, languageId: string, configuration: ILanguageConfigurationDto): void;
-    $registerMappedEditsProvider(handle: number, selector: IDocumentFilterDto[], displayName: string): void;
 }
 export interface MainThreadLanguagesShape extends IDisposable {
     $changeLanguage(resource: UriComponents, languageId: string): Promise<void>;
@@ -624,7 +623,7 @@ export interface MainThreadQuickOpenShape extends IDisposable {
     $dispose(id: number): Promise<void>;
 }
 export interface MainThreadStatusBarShape extends IDisposable {
-    $setEntry(id: string, statusId: string, extensionId: string | undefined, statusName: string, text: string, tooltip: IMarkdownString | string | undefined, command: ICommandDto | undefined, color: string | ThemeColor | undefined, backgroundColor: string | ThemeColor | undefined, alignLeft: boolean, priority: number | undefined, accessibilityInformation: IAccessibilityInformation | undefined): void;
+    $setEntry(id: string, statusId: string, extensionId: string | undefined, statusName: string, text: string, tooltip: IMarkdownString | string | undefined, hasTooltipProvider: boolean, command: ICommandDto | undefined, color: string | ThemeColor | undefined, backgroundColor: string | ThemeColor | undefined, alignLeft: boolean, priority: number | undefined, accessibilityInformation: IAccessibilityInformation | undefined): void;
     $disposeEntry(id: string): void;
 }
 export type StatusBarItemDto = {
@@ -639,6 +638,7 @@ export type StatusBarItemDto = {
 };
 export interface ExtHostStatusBarShape {
     $acceptStaticEntries(added?: StatusBarItemDto[]): void;
+    $provideTooltip(entryId: string, cancellation: CancellationToken): Promise<string | IMarkdownString | undefined>;
 }
 export interface MainThreadStorageShape extends IDisposable {
     $initializeExtensionStorage(shared: boolean, extensionId: string): Promise<string | undefined>;
@@ -1134,7 +1134,7 @@ export interface ICodeMapperTextEdit {
 }
 export type ICodeMapperProgressDto = Dto<ICodeMapperTextEdit>;
 export interface MainThreadCodeMapperShape extends IDisposable {
-    $registerCodeMapperProvider(handle: number): void;
+    $registerCodeMapperProvider(handle: number, displayName: string): void;
     $unregisterCodeMapperProvider(handle: number): void;
     $handleProgress(requestId: string, data: ICodeMapperProgressDto): Promise<void>;
 }
@@ -1159,6 +1159,7 @@ export interface ExtHostChatAgentsShape2 {
     $invokeAgent(handle: number, request: Dto<IChatAgentRequest>, context: {
         history: IChatAgentHistoryEntryDto[];
     }, token: CancellationToken): Promise<IChatAgentResult | undefined>;
+    $setRequestPaused(handle: number, requestId: string, isPaused: boolean): void;
     $provideFollowups(request: Dto<IChatAgentRequest>, handle: number, result: IChatAgentResult, context: {
         history: IChatAgentHistoryEntryDto[];
     }, token: CancellationToken): Promise<IChatFollowup[]>;
@@ -1423,9 +1424,15 @@ export interface SCMHistoryItemRefsChangeEventDto {
 export interface SCMHistoryItemDto {
     readonly id: string;
     readonly parentIds: string[];
+    readonly subject: string;
     readonly message: string;
     readonly displayId?: string;
     readonly author?: string;
+    readonly authorIcon?: UriComponents | {
+        light: UriComponents;
+        dark: UriComponents;
+    } | ThemeIcon;
+    readonly authorEmail?: string;
     readonly timestamp?: number;
     readonly statistics?: {
         readonly files: number;
@@ -1438,7 +1445,6 @@ export interface SCMHistoryItemChangeDto {
     readonly uri: UriComponents;
     readonly originalUri: UriComponents | undefined;
     readonly modifiedUri: UriComponents | undefined;
-    readonly renameUri: UriComponents | undefined;
 }
 export interface MainThreadSCMShape extends IDisposable {
     $registerSourceControl(handle: number, id: string, label: string, rootUri: UriComponents | undefined, inputBoxDocumentUri: UriComponents): Promise<void>;
@@ -2110,7 +2116,6 @@ export interface ExtHostLanguageFeaturesShape {
     $releaseTypeHierarchy(handle: number, sessionId: string): void;
     $provideDocumentOnDropEdits(handle: number, requestId: number, resource: UriComponents, position: IPosition, dataTransferDto: DataTransferDTO, token: CancellationToken): Promise<IDocumentDropEditDto[] | undefined>;
     $releaseDocumentOnDropEdits(handle: number, cacheId: number): void;
-    $provideMappedEdits(handle: number, document: UriComponents, codeBlocks: string[], context: IMappedEditsContextDto, token: CancellationToken): Promise<IWorkspaceEditDto | null>;
     $provideInlineEdit(handle: number, document: UriComponents, context: languages.IInlineEditContext, token: CancellationToken): Promise<IdentifiableInlineEdit | undefined>;
     $freeInlineEdit(handle: number, pid: number): void;
 }
@@ -2184,6 +2189,7 @@ export interface ExtHostTerminalServiceShape {
     $acceptTerminalMaximumDimensions(id: number, cols: number, rows: number): void;
     $acceptTerminalInteraction(id: number): void;
     $acceptTerminalSelection(id: number, selection: string | undefined): void;
+    $acceptTerminalShellType(id: number, shellType: TerminalShellType | undefined): void;
     $startExtensionTerminal(id: number, initialDimensions: ITerminalDimensionsDto | undefined): Promise<ITerminalLaunchError | undefined>;
     $acceptProcessAckDataEvent(id: number, charCount: number): void;
     $acceptProcessInput(id: number, data: string): void;
@@ -2208,6 +2214,7 @@ export interface ExtHostTerminalShellIntegrationShape {
     $shellExecutionStart(instanceId: number, commandLineValue: string, commandLineConfidence: TerminalShellExecutionCommandLineConfidence, isTrusted: boolean, cwd: UriComponents | undefined): void;
     $shellExecutionEnd(instanceId: number, commandLineValue: string, commandLineConfidence: TerminalShellExecutionCommandLineConfidence, isTrusted: boolean, exitCode: number | undefined): void;
     $shellExecutionData(instanceId: number, data: string): void;
+    $shellEnvChange(instanceId: number, shellEnvKeys: string[], shellEnvValues: string[]): void;
     $cwdChange(instanceId: number, cwd: UriComponents | undefined): void;
     $closeTerminal(instanceId: number): void;
 }