@codingame/monaco-vscode-api 16.1.1 → 17.1.0

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

@@ -1,5 +1,4 @@
 import type * as vscode from "vscode";
-import { VSBuffer } from "../../../base/common/buffer.js";
 import { SerializedError } from "../../../base/common/errors.js";
 import { IRelativePattern } from "../../../base/common/glob.js";
 import { MarkdownStringTrustedOptions } from "../../../base/common/htmlContent.js";
@@ -632,6 +631,11 @@ export declare enum PartialAcceptTriggerKind {
     Line = 2,
     Suggest = 3
 }
+export declare enum InlineCompletionEndOfLifeReasonKind {
+    Accepted = 0,
+    Rejected = 1,
+    Ignored = 2
+}
 export declare enum ViewColumn {
     Active = -1,
     Beside = -2,
@@ -1658,6 +1662,11 @@ export declare enum ChatEditingSessionActionOutcome {
     Rejected = 2,
     Saved = 3
 }
+export declare enum ChatRequestEditedFileEventKind {
+    Keep = 1,
+    Undo = 2,
+    UserModification = 3
+}
 export declare enum InteractiveEditorResponseFeedbackKind {
     Unhelpful = 0,
     Helpful = 1,
@@ -1758,6 +1767,10 @@ export declare class ChatResponseMovePart {
     readonly range: vscode.Range;
     constructor(uri: vscode.Uri, range: vscode.Range);
 }
+export declare class ChatResponseExtensionsPart {
+    readonly extensions: string[];
+    constructor(extensions: string[]);
+}
 export declare class ChatResponseTextEditPart implements vscode.ChatResponseTextEditPart {
     uri: vscode.Uri;
     edits: vscode.TextEdit[];
@@ -1770,13 +1783,14 @@ export declare class ChatResponseNotebookEditPart implements vscode.ChatResponse
     isDone?: boolean;
     constructor(uri: vscode.Uri, editsOrDone: vscode.NotebookEdit | vscode.NotebookEdit[] | true);
 }
-export declare class ChatRequestTurn implements vscode.ChatRequestTurn {
+export declare class ChatRequestTurn implements vscode.ChatRequestTurn2 {
     readonly prompt: string;
     readonly command: string | undefined;
     readonly references: vscode.ChatPromptReference[];
     readonly participant: string;
     readonly toolReferences: vscode.ChatLanguageModelToolReference[];
-    constructor(prompt: string, command: string | undefined, references: vscode.ChatPromptReference[], participant: string, toolReferences: vscode.ChatLanguageModelToolReference[]);
+    readonly editedFileEvents?: vscode.ChatRequestEditedFileEvent[] | undefined;
+    constructor(prompt: string, command: string | undefined, references: vscode.ChatPromptReference[], participant: string, toolReferences: vscode.ChatLanguageModelToolReference[], editedFileEvents?: vscode.ChatRequestEditedFileEvent[] | undefined);
 }
 export declare class ChatResponseTurn implements vscode.ChatResponseTurn {
     readonly response: ReadonlyArray<ChatResponseMarkdownPart | ChatResponseFileTreePart | ChatResponseAnchorPart | ChatResponseCommandButtonPart>;
@@ -1789,8 +1803,7 @@ export declare enum ChatLocation {
     Panel = 1,
     Terminal = 2,
     Notebook = 3,
-    Editor = 4,
-    EditingSession = 5
+    Editor = 4
 }
 export declare enum ChatResponseReferencePartStatusKind {
     Complete = 1,
@@ -1834,6 +1847,12 @@ export declare class LanguageModelToolResultPart implements vscode.LanguageModel
     isError: boolean;
     constructor(callId: string, content: (LanguageModelTextPart | LanguageModelPromptTsxPart | unknown)[], isError?: boolean);
 }
+export declare class LanguageModelToolResultPart2 implements vscode.LanguageModelToolResultPart2 {
+    callId: string;
+    content: (LanguageModelTextPart | LanguageModelPromptTsxPart | LanguageModelDataPart | unknown)[];
+    isError: boolean;
+    constructor(callId: string, content: (LanguageModelTextPart | LanguageModelPromptTsxPart | LanguageModelDataPart | unknown)[], isError?: boolean);
+}
 export declare class PreparedTerminalToolInvocation {
     readonly command: string;
     readonly language: string;
@@ -1852,22 +1871,20 @@ export declare class LanguageModelChatMessage implements vscode.LanguageModelCha
     private _content;
     set content(value: string | (LanguageModelTextPart | LanguageModelToolResultPart | LanguageModelToolCallPart)[]);
     get content(): (LanguageModelTextPart | LanguageModelToolResultPart | LanguageModelToolCallPart)[];
-    set content2(value: (string | LanguageModelToolResultPart | LanguageModelToolCallPart)[] | undefined);
-    get content2(): (string | LanguageModelToolResultPart | LanguageModelToolCallPart)[] | undefined;
     name: string | undefined;
     constructor(role: vscode.LanguageModelChatMessageRole, content: string | (LanguageModelTextPart | LanguageModelToolResultPart | LanguageModelToolCallPart)[], name?: string);
 }
 export declare class LanguageModelChatMessage2 implements vscode.LanguageModelChatMessage2 {
-    static User(content: string | (LanguageModelTextPart | LanguageModelToolResultPart | LanguageModelToolCallPart | LanguageModelDataPart)[], name?: string): LanguageModelChatMessage2;
-    static Assistant(content: string | (LanguageModelTextPart | LanguageModelToolResultPart | LanguageModelToolCallPart | LanguageModelDataPart)[], name?: string): LanguageModelChatMessage2;
+    static User(content: string | (LanguageModelTextPart | LanguageModelToolResultPart2 | LanguageModelToolCallPart | LanguageModelDataPart | LanguageModelExtraDataPart)[], name?: string): LanguageModelChatMessage2;
+    static Assistant(content: string | (LanguageModelTextPart | LanguageModelToolResultPart2 | LanguageModelToolCallPart | LanguageModelDataPart | LanguageModelExtraDataPart)[], name?: string): LanguageModelChatMessage2;
     role: vscode.LanguageModelChatMessageRole;
     private _content;
-    set content(value: string | (LanguageModelTextPart | LanguageModelToolResultPart | LanguageModelToolCallPart | LanguageModelDataPart)[]);
-    get content(): (LanguageModelTextPart | LanguageModelToolResultPart | LanguageModelToolCallPart | LanguageModelDataPart)[];
-    set content2(value: (string | LanguageModelToolResultPart | LanguageModelToolCallPart | LanguageModelDataPart)[] | undefined);
-    get content2(): (string | LanguageModelToolResultPart | LanguageModelToolCallPart | LanguageModelDataPart)[] | undefined;
+    set content(value: string | (LanguageModelTextPart | LanguageModelToolResultPart2 | LanguageModelToolCallPart | LanguageModelDataPart | LanguageModelExtraDataPart)[]);
+    get content(): (LanguageModelTextPart | LanguageModelToolResultPart2 | LanguageModelToolCallPart | LanguageModelDataPart | LanguageModelExtraDataPart)[];
+    set content2(value: (string | LanguageModelToolResultPart2 | LanguageModelToolCallPart | LanguageModelDataPart)[] | undefined);
+    get content2(): (string | LanguageModelToolResultPart2 | LanguageModelToolCallPart | LanguageModelDataPart | LanguageModelExtraDataPart)[] | undefined;
     name: string | undefined;
-    constructor(role: vscode.LanguageModelChatMessageRole, content: string | (LanguageModelTextPart | LanguageModelToolResultPart | LanguageModelToolCallPart | LanguageModelDataPart)[], name?: string);
+    constructor(role: vscode.LanguageModelChatMessageRole, content: string | (LanguageModelTextPart | LanguageModelToolResultPart2 | LanguageModelToolCallPart | LanguageModelDataPart | LanguageModelExtraDataPart)[], name?: string);
 }
 export declare class LanguageModelToolCallPart implements vscode.LanguageModelToolCallPart {
     callId: string;
@@ -1884,11 +1901,16 @@ export declare class LanguageModelTextPart implements vscode.LanguageModelTextPa
     };
 }
 export declare class LanguageModelDataPart implements vscode.LanguageModelDataPart {
-    value: vscode.ChatImagePart;
-    constructor(value: vscode.ChatImagePart);
+    mimeType: string;
+    data: Uint8Array<ArrayBufferLike>;
+    constructor(data: Uint8Array<ArrayBufferLike>, mimeType: string);
+    static image(data: Uint8Array<ArrayBufferLike>, mimeType: ChatImageMimeType): vscode.LanguageModelDataPart;
+    static json(value: object): vscode.LanguageModelDataPart;
+    static text(value: string): vscode.LanguageModelDataPart;
     toJSON(): {
         $mid: MarshalledId;
-        value: vscode.ChatImagePart;
+        mimeType: string;
+        data: Uint8Array<ArrayBufferLike>;
     };
 }
 export declare enum ChatImageMimeType {
@@ -1898,9 +1920,15 @@ export declare enum ChatImageMimeType {
     WEBP = "image/webp",
     BMP = "image/bmp"
 }
-export interface ChatImagePart {
-    mimeType: ChatImageMimeType;
-    data: VSBuffer;
+export declare class LanguageModelExtraDataPart implements vscode.LanguageModelExtraDataPart {
+    kind: string;
+    data: any;
+    constructor(kind: string, data: any);
+    toJSON(): {
+        $mid: MarshalledId;
+        kind: string;
+        data: any;
+    };
 }
 export declare class LanguageModelPromptTsxPart {
     value: unknown;
@@ -1941,6 +1969,14 @@ export declare class LanguageModelToolResult {
         content: (LanguageModelTextPart | LanguageModelPromptTsxPart)[];
     };
 }
+export declare class LanguageModelToolResult2 {
+    content: (LanguageModelTextPart | LanguageModelPromptTsxPart | LanguageModelDataPart)[];
+    constructor(content: (LanguageModelTextPart | LanguageModelPromptTsxPart | LanguageModelDataPart)[]);
+    toJSON(): {
+        $mid: MarshalledId;
+        content: (LanguageModelTextPart | LanguageModelPromptTsxPart | LanguageModelDataPart)[];
+    };
+}
 export declare class ExtendedLanguageModelToolResult extends LanguageModelToolResult {
 }
 export declare enum LanguageModelChatToolMode {
@@ -1953,6 +1989,11 @@ export declare enum RelatedInformationType {
     SearchInformation = 3,
     SettingInformation = 4
 }
+export declare enum SettingsSearchResultKind {
+    EMBEDDED = 1,
+    LLM_RANKED = 2,
+    CANCELED = 3
+}
 export declare enum SpeechToTextStatus {
     Started = 1,
     Recognizing = 2,
@@ -1983,16 +2024,15 @@ export declare class McpStdioServerDefinition implements vscode.McpStdioServerDe
     command: string;
     args: string[];
     env: Record<string, string | number | null>;
+    version?: string | undefined;
     cwd?: URI;
-    constructor(label: string, command: string, args: string[], env: Record<string, string | number | null>);
+    constructor(label: string, command: string, args: string[], env?: Record<string, string | number | null>, version?: string | undefined);
 }
-export declare class McpSSEServerDefinition implements vscode.McpSSEServerDefinition {
+export declare class McpHttpServerDefinition implements vscode.McpHttpServerDefinition {
     label: string;
     uri: URI;
-    headers: [
-        string,
-        string
-    ][];
-    constructor(label: string, uri: URI);
+    headers: Record<string, string>;
+    version?: string | undefined;
+    constructor(label: string, uri: URI, headers?: Record<string, string>, version?: string | undefined);
 }
 export {};

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

@@ -1,6 +1,7 @@
 
 import { __decorate } from '../../../../../../external/tslib/tslib.es6.js';
 import { coalesceInPlace, equals, asArray } from '../../../base/common/arrays.js';
+import { VSBuffer } from '../../../base/common/buffer.js';
 import { illegalArgument } from '../../../base/common/errors.js';
 import { MarkdownString as MarkdownString$1 } from '../../../base/common/htmlContent.js';
 import { ResourceMap } from '../../../base/common/map.js';
@@ -1423,6 +1424,12 @@ var PartialAcceptTriggerKind;
     PartialAcceptTriggerKind[PartialAcceptTriggerKind["Line"] = 2] = "Line";
     PartialAcceptTriggerKind[PartialAcceptTriggerKind["Suggest"] = 3] = "Suggest";
 })(PartialAcceptTriggerKind || (PartialAcceptTriggerKind = {}));
+var InlineCompletionEndOfLifeReasonKind;
+(function (InlineCompletionEndOfLifeReasonKind) {
+    InlineCompletionEndOfLifeReasonKind[InlineCompletionEndOfLifeReasonKind["Accepted"] = 0] = "Accepted";
+    InlineCompletionEndOfLifeReasonKind[InlineCompletionEndOfLifeReasonKind["Rejected"] = 1] = "Rejected";
+    InlineCompletionEndOfLifeReasonKind[InlineCompletionEndOfLifeReasonKind["Ignored"] = 2] = "Ignored";
+})(InlineCompletionEndOfLifeReasonKind || (InlineCompletionEndOfLifeReasonKind = {}));
 var ViewColumn;
 (function (ViewColumn) {
     ViewColumn[ViewColumn["Active"] = -1] = "Active";
@@ -3514,6 +3521,12 @@ var ChatEditingSessionActionOutcome;
     ChatEditingSessionActionOutcome[ChatEditingSessionActionOutcome["Rejected"] = 2] = "Rejected";
     ChatEditingSessionActionOutcome[ChatEditingSessionActionOutcome["Saved"] = 3] = "Saved";
 })(ChatEditingSessionActionOutcome || (ChatEditingSessionActionOutcome = {}));
+var ChatRequestEditedFileEventKind;
+(function (ChatRequestEditedFileEventKind) {
+    ChatRequestEditedFileEventKind[ChatRequestEditedFileEventKind["Keep"] = 1] = "Keep";
+    ChatRequestEditedFileEventKind[ChatRequestEditedFileEventKind["Undo"] = 2] = "Undo";
+    ChatRequestEditedFileEventKind[ChatRequestEditedFileEventKind["UserModification"] = 3] = "UserModification";
+})(ChatRequestEditedFileEventKind || (ChatRequestEditedFileEventKind = {}));
 var InteractiveEditorResponseFeedbackKind;
 (function (InteractiveEditorResponseFeedbackKind) {
     InteractiveEditorResponseFeedbackKind[InteractiveEditorResponseFeedbackKind["Unhelpful"] = 0] = "Unhelpful";
@@ -3621,6 +3634,11 @@ class ChatResponseMovePart {
         this.range = range;
     }
 }
+class ChatResponseExtensionsPart {
+    constructor(extensions) {
+        this.extensions = extensions;
+    }
+}
 class ChatResponseTextEditPart {
     constructor(uri, editsOrDone) {
         this.uri = uri;
@@ -3646,12 +3664,13 @@ class ChatResponseNotebookEditPart {
     }
 }
 class ChatRequestTurn {
-    constructor(prompt, command, references, participant, toolReferences) {
+    constructor(prompt, command, references, participant, toolReferences, editedFileEvents) {
         this.prompt = prompt;
         this.command = command;
         this.references = references;
         this.participant = participant;
         this.toolReferences = toolReferences;
+        this.editedFileEvents = editedFileEvents;
     }
 }
 class ChatResponseTurn {
@@ -3668,7 +3687,6 @@ var ChatLocation;
     ChatLocation[ChatLocation["Terminal"] = 2] = "Terminal";
     ChatLocation[ChatLocation["Notebook"] = 3] = "Notebook";
     ChatLocation[ChatLocation["Editor"] = 4] = "Editor";
-    ChatLocation[ChatLocation["EditingSession"] = 5] = "EditingSession";
 })(ChatLocation || (ChatLocation = {}));
 var ChatResponseReferencePartStatusKind;
 (function (ChatResponseReferencePartStatusKind) {
@@ -3713,6 +3731,13 @@ class LanguageModelToolResultPart {
         this.isError = isError ?? false;
     }
 }
+class LanguageModelToolResultPart2 {
+    constructor(callId, content, isError) {
+        this.callId = callId;
+        this.content = content;
+        this.isError = isError ?? false;
+    }
+}
 class PreparedTerminalToolInvocation {
     constructor(command, language, confirmationMessages) {
         this.command = command;
@@ -3744,24 +3769,6 @@ class LanguageModelChatMessage {
     get content() {
         return this._content;
     }
-    set content2(value) {
-        if (value) {
-            this.content = ( value.map(part => {
-                if (typeof part === 'string') {
-                    return ( new LanguageModelTextPart(part));
-                }
-                return part;
-            }));
-        }
-    }
-    get content2() {
-        return ( this.content.map(part => {
-            if (part instanceof LanguageModelTextPart) {
-                return part.value;
-            }
-            return part;
-        }));
-    }
     constructor(role, content, name) {
         this._content = [];
         this.role = role;
@@ -3831,13 +3838,25 @@ class LanguageModelTextPart {
     }
 }
 class LanguageModelDataPart {
-    constructor(value) {
-        this.value = value;
+    constructor(data, mimeType) {
+        this.mimeType = mimeType;
+        this.data = data;
+    }
+    static image(data, mimeType) {
+        return ( new LanguageModelDataPart(data, mimeType));
+    }
+    static json(value) {
+        const rawStr = JSON.stringify(value, undefined, '\t');
+        return ( new LanguageModelDataPart(VSBuffer.fromString(rawStr).buffer, 'json'));
+    }
+    static text(value) {
+        return ( new LanguageModelDataPart(VSBuffer.fromString(value).buffer, 'text/plain'));
     }
     toJSON() {
         return {
             $mid: MarshalledId.LanguageModelDataPart,
-            value: this.value,
+            mimeType: this.mimeType,
+            data: this.data,
         };
     }
 }
@@ -3849,6 +3868,19 @@ var ChatImageMimeType;
     ChatImageMimeType["WEBP"] = "image/webp";
     ChatImageMimeType["BMP"] = "image/bmp";
 })(ChatImageMimeType || (ChatImageMimeType = {}));
+class LanguageModelExtraDataPart {
+    constructor(kind, data) {
+        this.kind = kind;
+        this.data = data;
+    }
+    toJSON() {
+        return {
+            $mid: MarshalledId.LanguageModelExtraDataPart,
+            kind: this.kind,
+            data: this.data,
+        };
+    }
+}
 class LanguageModelPromptTsxPart {
     constructor(value) {
         this.value = value;
@@ -3894,6 +3926,17 @@ class LanguageModelToolResult {
         };
     }
 }
+class LanguageModelToolResult2 {
+    constructor(content) {
+        this.content = content;
+    }
+    toJSON() {
+        return {
+            $mid: MarshalledId.LanguageModelToolResult,
+            content: this.content,
+        };
+    }
+}
 class ExtendedLanguageModelToolResult extends LanguageModelToolResult {
 }
 var LanguageModelChatToolMode;
@@ -3908,6 +3951,12 @@ var RelatedInformationType;
     RelatedInformationType[RelatedInformationType["SearchInformation"] = 3] = "SearchInformation";
     RelatedInformationType[RelatedInformationType["SettingInformation"] = 4] = "SettingInformation";
 })(RelatedInformationType || (RelatedInformationType = {}));
+var SettingsSearchResultKind;
+(function (SettingsSearchResultKind) {
+    SettingsSearchResultKind[SettingsSearchResultKind["EMBEDDED"] = 1] = "EMBEDDED";
+    SettingsSearchResultKind[SettingsSearchResultKind["LLM_RANKED"] = 2] = "LLM_RANKED";
+    SettingsSearchResultKind[SettingsSearchResultKind["CANCELED"] = 3] = "CANCELED";
+})(SettingsSearchResultKind || (SettingsSearchResultKind = {}));
 var SpeechToTextStatus;
 (function (SpeechToTextStatus) {
     SpeechToTextStatus[SpeechToTextStatus["Started"] = 1] = "Started";
@@ -3939,19 +3988,21 @@ var InlineEditTriggerKind;
     InlineEditTriggerKind[InlineEditTriggerKind["Automatic"] = 1] = "Automatic";
 })(InlineEditTriggerKind || (InlineEditTriggerKind = {}));
 class McpStdioServerDefinition {
-    constructor(label, command, args, env) {
+    constructor(label, command, args, env = {}, version) {
         this.label = label;
         this.command = command;
         this.args = args;
         this.env = env;
+        this.version = version;
     }
 }
-class McpSSEServerDefinition {
-    constructor(label, uri) {
+class McpHttpServerDefinition {
+    constructor(label, uri, headers = {}, version) {
         this.label = label;
         this.uri = uri;
-        this.headers = [];
+        this.headers = headers;
+        this.version = version;
     }
 }
 
-export { BranchCoverage, Breakpoint, CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, CellErrorStackFrame, ChatCompletionItem, ChatCopyKind, ChatEditingSessionActionOutcome, ChatEditorTabInput, ChatErrorLevel, ChatImageMimeType, ChatLocation, ChatReferenceBinaryData, ChatReferenceDiagnostic, ChatRequestEditorData, ChatRequestNotebookData, ChatRequestTurn, ChatResponseAnchorPart, ChatResponseCodeCitationPart, ChatResponseCodeblockUriPart, ChatResponseCommandButtonPart, ChatResponseConfirmationPart, ChatResponseFileTreePart, ChatResponseMarkdownPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseMovePart, ChatResponseNotebookEditPart, ChatResponseProgressPart, ChatResponseProgressPart2, ChatResponseReferencePart, ChatResponseReferencePartStatusKind, ChatResponseTextEditPart, ChatResponseTurn, ChatResponseWarningPart, ChatResultFeedbackKind, ChatVariableLevel, CodeAction, CodeActionKind, CodeActionTriggerKind, CodeLens, Color, ColorFormat, ColorInformation, ColorPresentation, ColorTheme, ColorThemeKind, CommentMode, CommentState, CommentThreadApplicability, CommentThreadCollapsibleState, CommentThreadFocus, CommentThreadState, CompletionItem, CompletionItemKind, CompletionItemTag, CompletionList, CompletionTriggerKind, ConfigurationTarget, CustomEditorTabInput, CustomExecution, DataBreakpoint, DataTransfer, DataTransferFile, DataTransferItem, DebugAdapterExecutable, DebugAdapterInlineImplementation, DebugAdapterNamedPipeServer, DebugAdapterServer, DebugConsoleMode, DebugStackFrame, DebugThread, DebugVisualization, DeclarationCoverage, DecorationRangeBehavior, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, Disposable, DocumentDropEdit, DocumentDropOrPasteEditKind, DocumentHighlight, DocumentHighlightKind, DocumentLink, DocumentPasteEdit, DocumentPasteTriggerKind, DocumentSymbol, EndOfLine, EnvironmentVariableMutatorType, EvaluatableExpression, ExtendedLanguageModelToolResult, ExtensionKind, ExtensionMode, ExtensionRuntime, ExternalUriOpenerPriority, FileChangeType, FileCoverage, FileDecoration, FileEditType, FileSystemError, FoldingRange, FoldingRangeKind, FunctionBreakpoint, Hover, HoverVerbosityAction, InlayHint, InlayHintKind, InlayHintLabelPart, InlineCompletionTriggerKind, InlineEdit, InlineEditTriggerKind, InlineSuggestion, InlineSuggestionList, InlineValueContext, InlineValueEvaluatableExpression, InlineValueText, InlineValueVariableLookup, InputBoxValidationSeverity, InteractiveEditorResponseFeedbackKind, InteractiveSessionVoteDirection, InteractiveWindowInput, InternalDataTransferItem, InternalFileDataTransferItem, KeywordRecognitionStatus, LanguageModelChatMessage, LanguageModelChatMessage2, LanguageModelChatMessageRole, LanguageModelChatToolMode, LanguageModelDataPart, LanguageModelError, LanguageModelPromptTsxPart, LanguageModelTextPart, LanguageModelToolCallPart, LanguageModelToolResult, LanguageModelToolResultPart, LanguageStatusSeverity, LinkedEditingRanges, Location, ManagedResolvedAuthority, MarkdownString, McpSSEServerDefinition, McpStdioServerDefinition, MultiDocumentHighlight, NewSymbolName, NewSymbolNameTag, NewSymbolNameTriggerKind, NotebookCellData, NotebookCellExecutionState, NotebookCellKind, NotebookCellOutput, NotebookCellOutputItem, NotebookCellStatusBarAlignment, NotebookCellStatusBarItem, NotebookControllerAffinity, NotebookControllerAffinity2, NotebookData, NotebookDiffEditorTabInput, NotebookEdit, NotebookEditorRevealType, NotebookEditorTabInput, NotebookKernelSourceAction, NotebookRange, NotebookRendererScript, NotebookVariablesRequestKind, ParameterInformation, PartialAcceptTriggerKind, PortAttributes, PortAutoForwardAction, Position, PreparedTerminalToolInvocation, ProcessExecution, ProgressLocation, QuickInputButtonLocation, QuickInputButtons, QuickPickItemKind, Range, RelatedInformationType, RelativePattern, RemoteAuthorityResolverError, ResolvedAuthority, Selection, SelectionRange, SemanticTokens, SemanticTokensBuilder, SemanticTokensEdit, SemanticTokensEdits, SemanticTokensLegend, ShellExecution, ShellQuoting, SignatureHelp, SignatureHelpTriggerKind, SignatureInformation, SnippetString, SnippetTextEdit, SourceBreakpoint, SourceControlInputBoxValidationType, SpeechToTextStatus, StandardTokenType, StatementCoverage, StatusBarAlignment, SymbolInformation, SymbolKind, SymbolTag, SyntaxTokenType, Task, TaskEventKind, TaskGroup, TaskPanelKind, TaskRevealKind, TaskScope, TerminalCompletionItem, TerminalCompletionItemKind, TerminalCompletionList, TerminalEditorTabInput, TerminalExitReason, TerminalLink, TerminalLocation, TerminalOutputAnchor, TerminalProfile, TerminalQuickFixCommand, TerminalQuickFixOpener, TerminalQuickFixType, TerminalShellExecutionCommandLineConfidence, TerminalShellType, TestCoverageCount, TestMessage, TestMessageStackFrame, TestResultState, TestRunProfileBase, TestRunProfileKind, TestRunRequest, TestTag, TextDiffTabInput, TextDocumentChangeReason, TextDocumentSaveReason, TextEdit, TextEditorChangeKind, TextEditorLineNumbersStyle, TextEditorRevealType, TextEditorSelectionChangeKind, TextMergeTabInput, TextMultiDiffTabInput, TextTabInput, TextToSpeechStatus, ThemeColor, ThemeIcon, TimelineItem, TreeItem, TreeItemCheckboxState, TreeItemCollapsibleState, TypeHierarchyItem, VerboseHover, ViewBadge, ViewColumn, WebviewEditorTabInput, WorkspaceEdit, WorkspaceTrustState, asStatusBarItemIdentifier, getDebugDescriptionOfRange, getDebugDescriptionOfSelection, setBreakpointId, validateTestCoverageCount };
+export { BranchCoverage, Breakpoint, CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, CellErrorStackFrame, ChatCompletionItem, ChatCopyKind, ChatEditingSessionActionOutcome, ChatEditorTabInput, ChatErrorLevel, ChatImageMimeType, ChatLocation, ChatReferenceBinaryData, ChatReferenceDiagnostic, ChatRequestEditedFileEventKind, ChatRequestEditorData, ChatRequestNotebookData, ChatRequestTurn, ChatResponseAnchorPart, ChatResponseCodeCitationPart, ChatResponseCodeblockUriPart, ChatResponseCommandButtonPart, ChatResponseConfirmationPart, ChatResponseExtensionsPart, ChatResponseFileTreePart, ChatResponseMarkdownPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseMovePart, ChatResponseNotebookEditPart, ChatResponseProgressPart, ChatResponseProgressPart2, ChatResponseReferencePart, ChatResponseReferencePartStatusKind, ChatResponseTextEditPart, ChatResponseTurn, ChatResponseWarningPart, ChatResultFeedbackKind, ChatVariableLevel, CodeAction, CodeActionKind, CodeActionTriggerKind, CodeLens, Color, ColorFormat, ColorInformation, ColorPresentation, ColorTheme, ColorThemeKind, CommentMode, CommentState, CommentThreadApplicability, CommentThreadCollapsibleState, CommentThreadFocus, CommentThreadState, CompletionItem, CompletionItemKind, CompletionItemTag, CompletionList, CompletionTriggerKind, ConfigurationTarget, CustomEditorTabInput, CustomExecution, DataBreakpoint, DataTransfer, DataTransferFile, DataTransferItem, DebugAdapterExecutable, DebugAdapterInlineImplementation, DebugAdapterNamedPipeServer, DebugAdapterServer, DebugConsoleMode, DebugStackFrame, DebugThread, DebugVisualization, DeclarationCoverage, DecorationRangeBehavior, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, Disposable, DocumentDropEdit, DocumentDropOrPasteEditKind, DocumentHighlight, DocumentHighlightKind, DocumentLink, DocumentPasteEdit, DocumentPasteTriggerKind, DocumentSymbol, EndOfLine, EnvironmentVariableMutatorType, EvaluatableExpression, ExtendedLanguageModelToolResult, ExtensionKind, ExtensionMode, ExtensionRuntime, ExternalUriOpenerPriority, FileChangeType, FileCoverage, FileDecoration, FileEditType, FileSystemError, FoldingRange, FoldingRangeKind, FunctionBreakpoint, Hover, HoverVerbosityAction, InlayHint, InlayHintKind, InlayHintLabelPart, InlineCompletionEndOfLifeReasonKind, InlineCompletionTriggerKind, InlineEdit, InlineEditTriggerKind, InlineSuggestion, InlineSuggestionList, InlineValueContext, InlineValueEvaluatableExpression, InlineValueText, InlineValueVariableLookup, InputBoxValidationSeverity, InteractiveEditorResponseFeedbackKind, InteractiveSessionVoteDirection, InteractiveWindowInput, InternalDataTransferItem, InternalFileDataTransferItem, KeywordRecognitionStatus, LanguageModelChatMessage, LanguageModelChatMessage2, LanguageModelChatMessageRole, LanguageModelChatToolMode, LanguageModelDataPart, LanguageModelError, LanguageModelExtraDataPart, LanguageModelPromptTsxPart, LanguageModelTextPart, LanguageModelToolCallPart, LanguageModelToolResult, LanguageModelToolResult2, LanguageModelToolResultPart, LanguageModelToolResultPart2, LanguageStatusSeverity, LinkedEditingRanges, Location, ManagedResolvedAuthority, MarkdownString, McpHttpServerDefinition, McpStdioServerDefinition, MultiDocumentHighlight, NewSymbolName, NewSymbolNameTag, NewSymbolNameTriggerKind, NotebookCellData, NotebookCellExecutionState, NotebookCellKind, NotebookCellOutput, NotebookCellOutputItem, NotebookCellStatusBarAlignment, NotebookCellStatusBarItem, NotebookControllerAffinity, NotebookControllerAffinity2, NotebookData, NotebookDiffEditorTabInput, NotebookEdit, NotebookEditorRevealType, NotebookEditorTabInput, NotebookKernelSourceAction, NotebookRange, NotebookRendererScript, NotebookVariablesRequestKind, ParameterInformation, PartialAcceptTriggerKind, PortAttributes, PortAutoForwardAction, Position, PreparedTerminalToolInvocation, ProcessExecution, ProgressLocation, QuickInputButtonLocation, QuickInputButtons, QuickPickItemKind, Range, RelatedInformationType, RelativePattern, RemoteAuthorityResolverError, ResolvedAuthority, Selection, SelectionRange, SemanticTokens, SemanticTokensBuilder, SemanticTokensEdit, SemanticTokensEdits, SemanticTokensLegend, SettingsSearchResultKind, ShellExecution, ShellQuoting, SignatureHelp, SignatureHelpTriggerKind, SignatureInformation, SnippetString, SnippetTextEdit, SourceBreakpoint, SourceControlInputBoxValidationType, SpeechToTextStatus, StandardTokenType, StatementCoverage, StatusBarAlignment, SymbolInformation, SymbolKind, SymbolTag, SyntaxTokenType, Task, TaskEventKind, TaskGroup, TaskPanelKind, TaskRevealKind, TaskScope, TerminalCompletionItem, TerminalCompletionItemKind, TerminalCompletionList, TerminalEditorTabInput, TerminalExitReason, TerminalLink, TerminalLocation, TerminalOutputAnchor, TerminalProfile, TerminalQuickFixCommand, TerminalQuickFixOpener, TerminalQuickFixType, TerminalShellExecutionCommandLineConfidence, TerminalShellType, TestCoverageCount, TestMessage, TestMessageStackFrame, TestResultState, TestRunProfileBase, TestRunProfileKind, TestRunRequest, TestTag, TextDiffTabInput, TextDocumentChangeReason, TextDocumentSaveReason, TextEdit, TextEditorChangeKind, TextEditorLineNumbersStyle, TextEditorRevealType, TextEditorSelectionChangeKind, TextMergeTabInput, TextMultiDiffTabInput, TextTabInput, TextToSpeechStatus, ThemeColor, ThemeIcon, TimelineItem, TreeItem, TreeItemCheckboxState, TreeItemCollapsibleState, TypeHierarchyItem, VerboseHover, ViewBadge, ViewColumn, WebviewEditorTabInput, WorkspaceEdit, WorkspaceTrustState, asStatusBarItemIdentifier, getDebugDescriptionOfRange, getDebugDescriptionOfSelection, setBreakpointId, validateTestCoverageCount };

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

@@ -3,7 +3,7 @@ import { URI } from "../../../base/common/uri.js";
 import { IExtensionDescription } from "../../../platform/extensions/common/extensions.js";
 import { ExtHostWebview, ExtHostWebviews } from "./extHostWebview.js";
 import { IExtHostWorkspace } from "./extHostWorkspace.js";
-import { EditorGroupColumn } from "@codingame/monaco-vscode-38f25ab8-ea30-5ba9-8a08-ae3308c297c0-common/vscode/vs/workbench/services/editor/common/editorGroupColumn";
+import { EditorGroupColumn } from "@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common/vscode/vs/workbench/services/editor/common/editorGroupColumn";
 import type * as vscode from "vscode";
 import * as extHostProtocol from "./extHost.protocol.js";
 type IconPath = URI | {

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

@@ -96,12 +96,15 @@ export declare class ExtHostWorkspace implements ExtHostWorkspaceShape, IExtHost
     registerCanonicalUriProvider(scheme: string, provider: vscode.CanonicalUriProvider): import("../../../base/common/lifecycle.js").IDisposable;
     provideCanonicalUri(uri: URI, options: vscode.CanonicalUriRequestOptions, cancellationToken: CancellationToken): Promise<URI | undefined>;
     $provideCanonicalUri(uri: UriComponents, targetScheme: string, cancellationToken: CancellationToken): Promise<UriComponents | undefined>;
-    decode(content: Uint8Array, uri: UriComponents | undefined, options?: {
-        encoding: string;
+    decode(content: Uint8Array, args?: {
+        uri?: vscode.Uri;
+        encoding?: string;
     }): Promise<string>;
-    encode(content: string, uri: UriComponents | undefined, options?: {
-        encoding: string;
+    encode(content: string, args?: {
+        uri?: vscode.Uri;
+        encoding?: string;
     }): Promise<Uint8Array>;
+    private toEncodeDecodeParameters;
 }
 export declare const IExtHostWorkspace: import("../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IExtHostWorkspace>;
 export interface IExtHostWorkspace extends ExtHostWorkspace, ExtHostWorkspaceShape, IExtHostWorkspaceProvider {

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

@@ -10,7 +10,7 @@ import { Schemas } from '../../../base/common/network.js';
 import { Counter } from '../../../base/common/numbers.js';
 import { ExtUri, dirname, basename, basenameOrAuthority, relativePath } from '../../../base/common/resources.js';
 import { compare } from '../../../base/common/strings.js';
-import { URI } from '../../../base/common/uri.js';
+import { URI, isUriComponents } from '../../../base/common/uri.js';
 import { localize } from '../../../nls.js';
 import { FileSystemProviderCapabilities } from '../../../platform/files/common/files.js';
 import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
@@ -27,7 +27,10 @@ import { resultIsMatch } from '../../services/search/common/search.js';
 import { MainContext } from './extHost.protocol.js';
 import { revive } from '../../../base/common/marshalling.js';
 import { ExcludeSettingOptions, TextSearchMatch2, TextSearchContext2 } from '../../services/search/common/searchExtTypes.js';
-import { VSBuffer } from '../../../base/common/buffer.js';
+import { bufferToStream, VSBuffer, readableToBuffer } from '../../../base/common/buffer.js';
+import { toDecodeStream, UTF8, toEncodeReadable } from '../../services/textfile/common/encoding.js';
+import { consumeStream } from '../../../base/common/stream.js';
+import { stringToSnapshot } from '../../services/textfile/common/textfiles.js';
 import Severity$1 from '../../../base/common/severity.js';
 
 function isFolderEqual(folderA, folderB, extHostFileSystemInfo) {
@@ -246,7 +249,7 @@ let ExtHostWorkspace = class ExtHostWorkspace {
                 this._unconfirmedWorkspace = undefined;
                 const options = { source: { identifier: extension.identifier, label: extension.displayName || extension.name } };
                 this._messageService.$showMessage(Severity$1.Error, ( localize(
-                    2555,
+                    2573,
                     "Extension '{0}' failed to update workspace folders: {1}",
                     extName,
                     (error.toString())
@@ -708,12 +711,34 @@ let ExtHostWorkspace = class ExtHostWorkspace {
     async $provideCanonicalUri(uri, targetScheme, cancellationToken) {
         return this.provideCanonicalUri(URI.revive(uri), { targetScheme }, cancellationToken);
     }
-    decode(content, uri, options) {
-        return this._proxy.$decode(VSBuffer.wrap(content), uri, options);
-    }
-    async encode(content, uri, options) {
-        const buff = await this._proxy.$encode(content, uri, options);
-        return buff.buffer;
+    async decode(content, args) {
+        const [uri, opts] = this.toEncodeDecodeParameters(args);
+        const options = await this._proxy.$resolveDecoding(uri, opts);
+        const stream = (await toDecodeStream(bufferToStream(VSBuffer.wrap(content)), {
+            ...options,
+            acceptTextOnly: true,
+            overwriteEncoding: detectedEncoding => {
+                if (detectedEncoding === null || detectedEncoding === options.preferredEncoding) {
+                    return Promise.resolve(options.preferredEncoding);
+                }
+                return this._proxy.$validateDetectedEncoding(uri, detectedEncoding, opts);
+            },
+        })).stream;
+        return consumeStream(stream, chunks => chunks.join(''));
+    }
+    async encode(content, args) {
+        const [uri, options] = this.toEncodeDecodeParameters(args);
+        const { encoding, addBOM } = await this._proxy.$resolveEncoding(uri, options);
+        if (encoding === UTF8 && !addBOM) {
+            return VSBuffer.fromString(content).buffer;
+        }
+        const res = await toEncodeReadable(stringToSnapshot(content), encoding, { addBOM });
+        return readableToBuffer(res).buffer;
+    }
+    toEncodeDecodeParameters(opts) {
+        const uri = isUriComponents(opts?.uri) ? opts.uri : undefined;
+        const encoding = typeof opts?.encoding === 'string' ? opts.encoding : undefined;
+        return [uri, encoding ? { encoding } : undefined];
     }
 };
 ExtHostWorkspace = ( __decorate([

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

@@ -16,7 +16,7 @@ const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'jsonValidation',
     defaultExtensionKind: ['workspace', 'web'],
     jsonSchema: {
-        description: ( localize(2556, 'Contributes json schema configuration.')),
+        description: ( localize(2574, 'Contributes json schema configuration.')),
         type: 'array',
         defaultSnippets: [{ body: [{ fileMatch: '${1:file.json}', url: '${2:url}' }] }],
         items: {
@@ -26,7 +26,7 @@ const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
                 fileMatch: {
                     type: ['string', 'array'],
                     description: ( localize(
-                        2557,
+                        2575,
                         'The file pattern (or an array of patterns) to match, for example "package.json" or "*.launch". Exclusion patterns start with \'!\''
                     )),
                     items: {
@@ -35,7 +35,7 @@ const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
                 },
                 url: {
                     description: ( localize(
-                        2558,
+                        2576,
                         'A schema URL (\'http:\', \'https:\') or relative path to the extension folder (\'./\').'
                     )),
                     type: 'string'
@@ -52,20 +52,20 @@ class JSONValidationExtensionPoint {
                 const collector = extension.collector;
                 const extensionLocation = extension.description.extensionLocation;
                 if (!extensionValue || !Array.isArray(extensionValue)) {
-                    collector.error(( localize(2559, "'configuration.jsonValidation' must be a array")));
+                    collector.error(( localize(2577, "'configuration.jsonValidation' must be a array")));
                     return;
                 }
                 extensionValue.forEach(extension => {
                     if (!isString(extension.fileMatch) && !(Array.isArray(extension.fileMatch) && extension.fileMatch.every(isString))) {
                         collector.error(( localize(
-                            2560,
+                            2578,
                             "'configuration.jsonValidation.fileMatch' must be defined as a string or an array of strings."
                         )));
                         return;
                     }
                     const uri = extension.url;
                     if (!isString(uri)) {
-                        collector.error(( localize(2561, "'configuration.jsonValidation.url' must be a URL or relative path")));
+                        collector.error(( localize(2579, "'configuration.jsonValidation.url' must be a URL or relative path")));
                         return;
                     }
                     if (uri.startsWith('./')) {
@@ -73,7 +73,7 @@ class JSONValidationExtensionPoint {
                             const colorThemeLocation = joinPath(extensionLocation, uri);
                             if (!isEqualOrParent(colorThemeLocation, extensionLocation)) {
                                 collector.warn(( localize(
-                                    2562,
+                                    2580,
                                     "Expected `contributes.{0}.url` ({1}) to be included inside extension's folder ({2}). This might make the extension non-portable.",
                                     configurationExtPoint.name,
                                     (colorThemeLocation.toString()),
@@ -83,7 +83,7 @@ class JSONValidationExtensionPoint {
                         }
                         catch (e) {
                             collector.error(( localize(
-                                2563,
+                                2581,
                                 "'configuration.jsonValidation.url' is an invalid relative URL: {0}",
                                 e.message
                             )));
@@ -91,7 +91,7 @@ class JSONValidationExtensionPoint {
                     }
                     else if (!/^[^:/?#]+:\/\//.test(uri)) {
                         collector.error(( localize(
-                            2564,
+                            2582,
                             "'configuration.jsonValidation.url' must be an absolute URL or start with './'  to reference schemas located in the extension."
                         )));
                         return;
@@ -115,8 +115,8 @@ class JSONValidationDataRenderer extends Disposable {
             return { data: { headers: [], rows: [] }, dispose: () => { } };
         }
         const headers = [
-            ( localize(2565, "File Match")),
-            ( localize(2566, "Schema")),
+            ( localize(2583, "File Match")),
+            ( localize(2584, "Schema")),
         ];
         const rows = ( contrib.map(v => {
             return [
@@ -135,7 +135,7 @@ class JSONValidationDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: 'jsonValidation',
-    label: ( localize(2567, "JSON Validation")),
+    label: ( localize(2585, "JSON Validation")),
     access: {
         canToggle: false
     },

package/vscode/src/vs/workbench/api/worker/extHostExtensionService.d.ts

@@ -11,6 +11,7 @@ export declare class ExtHostExtensionService extends AbstractExtHostExtensionSer
     protected _beforeAlmostReadyToRunExtensions(): Promise<void>;
     protected _getEntryPoint(extensionDescription: IExtensionDescription): string | undefined;
     protected _loadCommonJSModule<T extends object | undefined>(extension: IExtensionDescription | null, module: URI, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise<T>;
+    protected _loadESMModule<T>(extension: IExtensionDescription | null, module: URI, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise<T>;
     $setRemoteEnvironment(_env: {
         [key: string]: string | null;
     }): Promise<void>;

package/vscode/src/vs/workbench/api/worker/extHostExtensionService.js

@@ -101,6 +101,9 @@ class ExtHostExtensionService extends AbstractExtHostExtensionService {
             activationTimesBuilder.codeLoadingStop();
         }
     }
+    _loadESMModule(extension, module, activationTimesBuilder) {
+        throw ( new Error('ESM modules are not supported in the web worker extension host'));
+    }
     async $setRemoteEnvironment(_env) {
         return;
     }