@codingame/monaco-vscode-api 22.1.8 → 23.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(
-                2382,
+                2393,
                 "The following files have been closed and modified on disk: {0}.",
                 externalRemoval.join(', ')
             )));
         }
         if (noParallelUniverses.length > 0) {
             messages.push(( localize(
-                2383,
+                2394,
                 "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(
-                2384,
+                2395,
                 "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(
-                2384,
+                2395,
                 "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(
-                2385,
+                2396,
                 "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(
-                2386,
+                2397,
                 "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(
-                2387,
+                2398,
                 "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(2388, "Would you like to undo '{0}' across all files?", element.label)),
+                message: ( localize(2399, "Would you like to undo '{0}' across all files?", element.label)),
                 buttons: [
                     {
-                        label: ( localize(2389, "&&Undo in {0} Files", editStackSnapshot.editStacks.length)),
+                        label: ( localize(2400, "&&Undo in {0} Files", editStackSnapshot.editStacks.length)),
                         run: () => UndoChoice.All
                     },
                     {
-                        label: ( localize(2390, "Undo this &&File")),
+                        label: ( localize(2401, "Undo this &&File")),
                         run: () => UndoChoice.This
                     }
                 ],
@@ -838,7 +838,7 @@ let UndoRedoService = class UndoRedoService {
         }
         if (editStack.locked) {
             const message = ( localize(
-                2391,
+                2402,
                 "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(2392, "Would you like to undo '{0}'?", element.label)),
-            primaryButton: ( localize(2393, "&&Yes")),
-            cancelButton: ( localize(2394, "No"))
+            message: ( localize(2403, "Would you like to undo '{0}'?", element.label)),
+            primaryButton: ( localize(2404, "&&Yes")),
+            cancelButton: ( localize(2405, "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(
-                2395,
+                2406,
                 "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(
-                2395,
+                2406,
                 "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(
-                2396,
+                2407,
                 "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(
-                2397,
+                2408,
                 "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(
-                2398,
+                2409,
                 "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(
-                2399,
+                2410,
                 "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

@@ -165,7 +165,7 @@ let UserDataProfilesService = class UserDataProfilesService extends Disposable {
         return this._profilesObject;
     }
     createDefaultProfile() {
-        const defaultProfile = toUserDataProfile('__default__profile__', ( localize(2410, "Default")), this.environmentService.userRoamingDataHome, this.profilesCacheHome);
+        const defaultProfile = toUserDataProfile('__default__profile__', ( localize(2421, "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.js

@@ -51,12 +51,12 @@ function registerConfiguration() {
     configurationRegistry.registerConfiguration({
         id: 'settingsSync',
         order: 30,
-        title: ( localize(2420, "Settings Sync")),
+        title: ( localize(2431, "Settings Sync")),
         type: 'object',
         properties: {
             [CONFIG_SYNC_KEYBINDINGS_PER_PLATFORM]: {
                 type: 'boolean',
-                description: ( localize(2421, "Synchronize keybindings for each platform.")),
+                description: ( localize(2432, "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(
-                    2422,
+                    2433,
                     "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(2423, "Expected format '${publisher}.${name}'. Example: 'vscode.csharp'."))
+                        errorMessage: ( localize(2434, "Expected format '${publisher}.${name}'. Example: 'vscode.csharp'."))
                     }],
                 'default': [],
                 'scope': ConfigurationScope.APPLICATION,
@@ -80,7 +80,7 @@ function registerConfiguration() {
             },
             'settingsSync.ignoredSettings': {
                 'type': 'array',
-                description: ( localize(2424, "Configure settings to be ignored while synchronizing.")),
+                description: ( localize(2435, "Configure settings to be ignored while synchronizing.")),
                 'default': [],
                 'scope': ConfigurationScope.APPLICATION,
                 $ref: ignoredSettingsSchemaId,

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

@@ -2,6 +2,23 @@ import { VSBuffer } from "../../../base/common/buffer.js";
 import { CancellationToken } from "../../../base/common/cancellation.js";
 import { URI } from "../../../base/common/uri.js";
 import { IWebContentExtractorService, type ISharedWebContentExtractorService } from "./webContentExtractor.service.js";
+export interface IWebContentExtractorOptions {
+    /**
+     * Whether to allow cross-authority redirects on the web content.
+     * 'false' by default.
+     */
+    followRedirects?: boolean;
+}
+export type WebContentExtractResult = {
+    status: "ok";
+    result: string;
+} | {
+    status: "error";
+    error: string;
+} | {
+    status: "redirect";
+    toURI: URI;
+};
 /**
  * A service that extracts web content from a given URI.
  * This is a placeholder implementation that does not perform any actual extraction.
@@ -9,7 +26,7 @@ import { IWebContentExtractorService, type ISharedWebContentExtractorService } f
  */
 export declare class NullWebContentExtractorService implements IWebContentExtractorService {
     _serviceBrand: undefined;
-    extract(_uri: URI[]): Promise<string[]>;
+    extract(_uri: URI[]): Promise<WebContentExtractResult[]>;
 }
 export declare class NullSharedWebContentExtractorService implements ISharedWebContentExtractorService {
     _serviceBrand: undefined;

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

@@ -1,10 +1,11 @@
 import { VSBuffer } from "../../../base/common/buffer.js";
 import { CancellationToken } from "../../../base/common/cancellation.js";
 import { URI } from "../../../base/common/uri.js";
+import { IWebContentExtractorOptions, WebContentExtractResult } from "./webContentExtractor.js";
 export declare const IWebContentExtractorService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<IWebContentExtractorService>;
 export interface IWebContentExtractorService {
     _serviceBrand: undefined;
-    extract(uri: URI[]): Promise<string[]>;
+    extract(uri: URI[], options?: IWebContentExtractorOptions): Promise<WebContentExtractResult[]>;
 }
 export declare const ISharedWebContentExtractorService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<ISharedWebContentExtractorService>;
 export interface ISharedWebContentExtractorService {

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

@@ -209,7 +209,7 @@ export interface INativeOpenFileRequest extends IOpenFileRequest {
 export interface INativeRunActionInWindowRequest {
     readonly id: string;
     readonly from: "menu" | "touchbar" | "mouse";
-    readonly args?: any[];
+    readonly args?: unknown[];
 }
 export interface INativeRunKeybindingInWindowRequest {
     readonly userSettingsLabel: string;

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

@@ -138,7 +138,7 @@ function toWorkspaceFolder(resource) {
 }
 const WORKSPACE_EXTENSION = 'code-workspace';
 const WORKSPACE_SUFFIX = `.${WORKSPACE_EXTENSION}`;
-const WORKSPACE_FILTER = [{ name: ( localize(2428, "Code Workspace")), extensions: [WORKSPACE_EXTENSION] }];
+const WORKSPACE_FILTER = [{ name: ( localize(2439, "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/workspace/common/workspaceTrust.service.d.ts

@@ -10,8 +10,8 @@ export interface IWorkspaceTrustEnablementService {
 export declare const IWorkspaceTrustManagementService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<IWorkspaceTrustManagementService>;
 export interface IWorkspaceTrustManagementService {
     readonly _serviceBrand: undefined;
-    onDidChangeTrust: Event<boolean>;
-    onDidChangeTrustedFolders: Event<void>;
+    readonly onDidChangeTrust: Event<boolean>;
+    readonly onDidChangeTrustedFolders: Event<void>;
     readonly workspaceResolved: Promise<void>;
     readonly workspaceTrustInitialized: Promise<void>;
     acceptsOutOfWorkspaceFiles: boolean;

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

@@ -25,7 +25,7 @@ export declare enum StatusBarUpdateKind {
 }
 export interface IExtensionStatusBarItemService {
     readonly _serviceBrand: undefined;
-    onDidChange: Event<IExtensionStatusBarItemChangeEvent>;
+    readonly onDidChange: Event<IExtensionStatusBarItemChangeEvent>;
     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>;

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

@@ -23,11 +23,14 @@ import { checkProposedApiEnabled, isProposedApiEnabled } from '../../services/ex
 import { TextSearchCompleteMessageType, AISearchKeyword, TextSearchMatch2, TextSearchContext2, ExcludeSettingOptions } from '../../services/search/common/searchExtTypes.js';
 import { ExtHostContext, MainContext, CandidatePortSource } from './extHost.protocol.js';
 import { ExtHostRelatedInformation } from './extHostAiRelatedInformation.js';
+import { ExtHostAiSettingsSearch } from './extHostAiSettingsSearch.js';
 import { ExtHostApiCommands } from './extHostApiCommands.js';
 import { IExtHostApiDeprecationService } from './extHostApiDeprecationService.js';
 import { IExtHostAuthentication } from './extHostAuthentication.js';
 import { ExtHostBulkEdits } from './extHostBulkEdits.js';
 import { ExtHostChatAgents2 } from './extHostChatAgents2.js';
+import { ExtHostChatOutputRenderer } from './extHostChatOutputRenderer.js';
+import { ExtHostChatSessions } from './extHostChatSessions.js';
 import { ExtHostChatStatus } from './extHostChatStatus.js';
 import { ExtHostClipboard } from './extHostClipboard.js';
 import { ExtHostEditorInsets } from './extHostCodeInsets.js';
@@ -95,7 +98,7 @@ import { ExtHostTimeline } from './extHostTimeline.js';
 import { ExtHostTreeViews } from './extHostTreeViews.js';
 import { IExtHostTunnelService } from './extHostTunnelService.js';
 import { LanguageSelector } from './extHostTypeConverters.js';
-import { ExtensionKind, ProgressLocation, SettingsSearchResultKind, McpStdioServerDefinition, McpHttpServerDefinition, ChatErrorLevel, NewSymbolNameTriggerKind, NewSymbolNameTag, NewSymbolName, LanguageModelPromptTsxPart, LanguageModelChatToolMode, ExtendedLanguageModelToolResult, LanguageModelToolMCPSource, LanguageModelToolExtensionSource, LanguageModelDataPart, LanguageModelToolResult2, LanguageModelToolResult, LanguageModelError, LanguageModelThinkingPart, LanguageModelToolCallPart, LanguageModelPartAudience, LanguageModelTextPart, LanguageModelToolResultPart2, LanguageModelToolResultPart, LanguageModelChatMessage2, LanguageModelChatMessage, LanguageModelChatMessageRole, ChatRequestEditedFileEventKind, ChatReferenceBinaryData, ChatRequestNotebookData, ChatRequestEditorData, ChatSessionStatus, ChatLocation, ChatToolInvocationPart, ChatResponseTurn2, ChatResponseTurn, ChatRequestTurn, ChatResponseClearToPreviousToolInvocationReason, ChatResponseReferencePartStatusKind, ChatResponseMultiDiffPart, ChatPrepareToolInvocationPart, ChatResponsePullRequestPart, ChatResponseExtensionsPart, ChatResponseMovePart, ChatResponseConfirmationPart, ChatResponseCommandButtonPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseNotebookEditPart, ChatResponseTextEditPart, ChatResponseWarningPart, ChatResponseCodeblockUriPart, ChatResponseCodeCitationPart, ChatResponseReferencePart, ChatResponseThinkingProgressPart, ChatResponseProgressPart2, ChatResponseProgressPart, ChatResponseAnchorPart, ChatResponseFileTreePart, ChatResponseMarkdownPart, ChatImageMimeType, KeywordRecognitionStatus, InlineCompletionDisplayLocationKind, InlineCompletionEndOfLifeReasonKind, 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, NotebookControllerAffinity2, NotebookControllerAffinity, NotebookCellStatusBarItem, CellErrorStackFrame, NotebookEditorRevealType, NotebookCellStatusBarAlignment, NotebookRendererScript, NotebookCellExecutionState, TimelineItem, ExtensionRuntime, SourceControlInputBoxValidationType, ManagedResolvedAuthority, ResolvedAuthority, RemoteAuthorityResolverError, InlayHintKind, InlayHintLabelPart, InlayHint, DocumentPasteEdit, DocumentDropOrPasteEditKind, DocumentDropEdit, DocumentPasteTriggerKind, ViewColumn, TypeHierarchyItem, TreeItemCollapsibleState, TreeItemCheckboxState, TreeItem, ThemeIcon, ThemeColor, TextDocumentChangeReason, SyntaxTokenType, TextEditorSelectionChangeKind, TextEditorRevealType, TextEditorLineNumbersStyle, TextEditorChangeKind, TextDocumentSaveReason, TerminalShellType, TerminalCompletionList, TerminalCompletionItemKind, TerminalCompletionItem, TerminalShellExecutionCommandLineConfidence, TerminalExitReason, TerminalProfile, TerminalLocation, TerminalQuickFixOpener, TerminalQuickFixCommand, TerminalLink, TaskScope, TaskRevealKind, TaskPanelKind, TaskGroup, TaskEventKind, Task, StatusBarAlignment, StandardTokenType, SourceBreakpoint, SignatureInformation, SignatureHelpTriggerKind, SignatureHelp, ShellQuoting, ShellExecution, SemanticTokensLegend, SemanticTokensEdits, SemanticTokensEdit, SemanticTokensBuilder, SemanticTokens, SelectionRange, RelativePattern, QuickInputButtons, QuickInputButtonLocation, ProcessExecution, PortAutoForwardAction, ParameterInformation, HoverVerbosityAction, VerboseHover, Hover, InlineSuggestionList, InlineSuggestion, FunctionBreakpoint, FoldingRangeKind, FoldingRange, FileSystemError, FileDecoration, FileChangeType, ExternalUriOpenerPriority, ExtensionMode, InlineCompletionsDisposeReasonKind, InlineCompletionTriggerKind, InlineValueEvaluatableExpression, InlineValueVariableLookup, InlineValueText, EvaluatableExpression, EnvironmentVariableMutatorType, DocumentSymbol, DocumentLink, MultiDocumentHighlight, DocumentHighlightKind, DocumentHighlight, Disposable, 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, CodeAction, CallHierarchyOutgoingCall, CallHierarchyItem, CallHierarchyIncomingCall, ChatReferenceDiagnostic, ChatCompletionItem, ChatVariableLevel, ChatResultFeedbackKind, TerminalOutputAnchor, Breakpoint } from './extHostTypes.js';
+import { ExtensionKind, ProgressLocation, SettingsSearchResultKind, McpToolAvailability, McpStdioServerDefinition, McpHttpServerDefinition, ChatErrorLevel, NewSymbolNameTriggerKind, NewSymbolNameTag, NewSymbolName, LanguageModelPromptTsxPart, LanguageModelChatToolMode, ExtendedLanguageModelToolResult, LanguageModelToolMCPSource, LanguageModelToolExtensionSource, LanguageModelDataPart, LanguageModelToolResult2, LanguageModelToolResult, LanguageModelError, LanguageModelThinkingPart, LanguageModelToolCallPart, LanguageModelPartAudience, LanguageModelTextPart, LanguageModelToolResultPart, LanguageModelChatMessage2, LanguageModelChatMessage, LanguageModelChatMessageRole, ChatRequestEditedFileEventKind, ChatReferenceBinaryData, ChatRequestNotebookData, ChatRequestEditorData, ChatSessionStatus, ChatLocation, ChatToolInvocationPart, ChatResponseTurn2, ChatResponseTurn, ChatRequestTurn, ChatResponseClearToPreviousToolInvocationReason, ChatResponseReferencePartStatusKind, ChatResponseMultiDiffPart, ChatPrepareToolInvocationPart, ChatResponsePullRequestPart, ChatResponseExternalEditPart, ChatResponseExtensionsPart, ChatResponseMovePart, ChatResponseConfirmationPart, ChatResponseCommandButtonPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseNotebookEditPart, ChatResponseTextEditPart, ChatResponseWarningPart, ChatResponseCodeblockUriPart, ChatResponseCodeCitationPart, ChatResponseReferencePart, ChatResponseThinkingProgressPart, ChatResponseProgressPart2, ChatResponseProgressPart, ChatResponseAnchorPart, ChatResponseFileTreePart, ChatResponseMarkdownPart, ChatImageMimeType, KeywordRecognitionStatus, InlineCompletionDisplayLocationKind, InlineCompletionEndOfLifeReasonKind, 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, NotebookControllerAffinity2, NotebookControllerAffinity, NotebookCellStatusBarItem, CellErrorStackFrame, NotebookEditorRevealType, NotebookCellStatusBarAlignment, NotebookRendererScript, NotebookCellExecutionState, TimelineItem, ExtensionRuntime, SourceControlInputBoxValidationType, ManagedResolvedAuthority, ResolvedAuthority, RemoteAuthorityResolverError, InlayHintKind, InlayHintLabelPart, InlayHint, DocumentPasteEdit, DocumentDropOrPasteEditKind, DocumentDropEdit, DocumentPasteTriggerKind, ViewColumn, TypeHierarchyItem, TreeItemCollapsibleState, TreeItemCheckboxState, TreeItem, ThemeIcon, ThemeColor, TextDocumentChangeReason, SyntaxTokenType, TextEditorSelectionChangeKind, TextEditorRevealType, TextEditorLineNumbersStyle, TextEditorChangeKind, TextDocumentSaveReason, TerminalShellType, TerminalCompletionList, TerminalCompletionItemKind, TerminalCompletionItem, TerminalShellExecutionCommandLineConfidence, TerminalExitReason, TerminalProfile, TerminalLocation, TerminalQuickFixOpener, TerminalQuickFixCommand, TerminalLink, TaskScope, TaskRevealKind, TaskPanelKind, TaskGroup, TaskEventKind, Task, StatusBarAlignment, StandardTokenType, SourceBreakpoint, SignatureInformation, SignatureHelpTriggerKind, SignatureHelp, ShellQuoting, ShellExecution, SemanticTokensLegend, SemanticTokensEdits, SemanticTokensEdit, SemanticTokensBuilder, SemanticTokens, SelectionRange, RelativePattern, QuickInputButtons, QuickInputButtonLocation, ProcessExecution, PortAutoForwardAction, ParameterInformation, HoverVerbosityAction, VerboseHover, Hover, InlineSuggestionList, InlineSuggestion, FunctionBreakpoint, FoldingRangeKind, FoldingRange, FileSystemError, FileDecoration, FileChangeType, ExternalUriOpenerPriority, ExtensionMode, InlineCompletionsDisposeReasonKind, InlineCompletionTriggerKind, InlineValueEvaluatableExpression, InlineValueVariableLookup, InlineValueText, EvaluatableExpression, EnvironmentVariableMutatorType, DocumentSymbol, DocumentLink, MultiDocumentHighlight, DocumentHighlightKind, DocumentHighlight, Disposable, 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, CodeAction, CallHierarchyOutgoingCall, CallHierarchyItem, CallHierarchyIncomingCall, ChatReferenceDiagnostic, ChatCompletionItem, ChatVariableLevel, ChatResultFeedbackKind, TerminalOutputAnchor, Breakpoint } from './extHostTypes.js';
 import { ExtHostUriOpeners } from './extHostUriOpener.js';
 import { IURITransformerService } from './extHostUriTransformerService.js';
 import { IExtHostUrlsService } from './extHostUrls.js';
@@ -104,9 +107,7 @@ import { ExtHostWebviewPanels } from './extHostWebviewPanels.js';
 import { ExtHostWebviewViews } from './extHostWebviewView.js';
 import { IExtHostWindow } from './extHostWindow.js';
 import { IExtHostWorkspace } from './extHostWorkspace.js';
-import { ExtHostAiSettingsSearch } from './extHostAiSettingsSearch.js';
-import { ExtHostChatSessions } from './extHostChatSessions.js';
-import { ExtHostChatOutputRenderer } from './extHostChatOutputRenderer.js';
+import { ExtHostChatContext } from './extHostChatContext.js';
 import { NotebookEdit, NotebookCellOutputItem, NotebookCellOutput, NotebookData, NotebookCellData, NotebookCellKind, NotebookRange } from './extHostTypes/notebooks.js';
 import { WorkspaceEdit } from './extHostTypes/workspaceEdit.js';
 import { SnippetTextEdit } from './extHostTypes/snippetTextEdit.js';
@@ -260,6 +261,7 @@ function createApiFactoryAndRegisterActors(accessor) {
         extHostDiagnostics,
         extHostLanguageModelTools
     )));
+    const extHostChatContext = rpcProtocol.set(ExtHostContext.ExtHostChatContext, ( new ExtHostChatContext(rpcProtocol)));
     const extHostAiRelatedInformation = rpcProtocol.set(ExtHostContext.ExtHostAiRelatedInformation, ( new ExtHostRelatedInformation(rpcProtocol)));
     const extHostAiEmbeddingVector = rpcProtocol.set(ExtHostContext.ExtHostAiEmbeddingVector, ( new ExtHostAiEmbeddingVector(rpcProtocol)));
     const extHostAiSettingsSearch = rpcProtocol.set(ExtHostContext.ExtHostAiSettingsSearch, ( new ExtHostAiSettingsSearch(rpcProtocol)));
@@ -390,7 +392,7 @@ function createApiFactoryAndRegisterActors(accessor) {
             get machineId() { return initData.telemetryInfo.machineId; },
             get devDeviceId() {
                 checkProposedApiEnabled(extension, 'devDeviceId');
-                return initData.telemetryInfo.devDeviceId;
+                return initData.telemetryInfo.devDeviceId ?? initData.telemetryInfo.machineId;
             },
             get sessionId() { return initData.telemetryInfo.sessionId; },
             get language() { return initData.environment.appLanguage; },
@@ -874,9 +876,9 @@ function createApiFactoryAndRegisterActors(accessor) {
             registerTerminalProfileProvider(id, provider) {
                 return extHostTerminalService.registerProfileProvider(extension, id, provider);
             },
-            registerTerminalCompletionProvider(id, provider, ...triggerCharacters) {
+            registerTerminalCompletionProvider(provider, ...triggerCharacters) {
                 checkProposedApiEnabled(extension, 'terminalCompletionProvider');
-                return extHostTerminalService.registerTerminalCompletionProvider(extension, id, provider, ...triggerCharacters);
+                return extHostTerminalService.registerTerminalCompletionProvider(extension, provider, ...triggerCharacters);
             },
             registerTerminalQuickFixProvider(id, provider) {
                 checkProposedApiEnabled(extension, 'terminalQuickFixProvider');
@@ -963,10 +965,6 @@ function createApiFactoryAndRegisterActors(accessor) {
                 checkProposedApiEnabled(extension, 'chatStatusItem');
                 return extHostChatStatus.createChatStatusItem(extension, id);
             },
-            showChatSession: (chatSessionType, sessionId, options) => {
-                checkProposedApiEnabled(extension, 'chatSessionsProvider');
-                return extHostChatSessions.showChatSession(extension, chatSessionType, sessionId, options);
-            },
         };
         const workspace = {
             get rootPath() {
@@ -1265,7 +1263,7 @@ function createApiFactoryAndRegisterActors(accessor) {
             },
             encode(content, options) {
                 return extHostWorkspace.encode(content, options);
-            }
+            },
         };
         const scm = {
             get inputBox() {
@@ -1488,14 +1486,18 @@ function createApiFactoryAndRegisterActors(accessor) {
                 checkProposedApiEnabled(extension, 'chatSessionsProvider');
                 return extHostChatSessions.registerChatSessionItemProvider(extension, chatSessionType, provider);
             },
-            registerChatSessionContentProvider(chatSessionType, provider, chatParticipant, capabilities) {
+            registerChatSessionContentProvider(scheme, provider, chatParticipant, capabilities) {
                 checkProposedApiEnabled(extension, 'chatSessionsProvider');
-                return extHostChatSessions.registerChatSessionContentProvider(extension, chatSessionType, chatParticipant, provider, capabilities);
+                return extHostChatSessions.registerChatSessionContentProvider(extension, scheme, chatParticipant, provider, capabilities);
             },
             registerChatOutputRenderer: (viewType, renderer) => {
                 checkProposedApiEnabled(extension, 'chatOutputRenderer');
                 return extHostChatOutputRenderer.registerChatOutputRenderer(extension, viewType, renderer);
             },
+            registerChatContextProvider(selector, id, provider) {
+                checkProposedApiEnabled(extension, 'chatContextProvider');
+                return extHostChatContext.registerChatContextProvider(checkSelector(selector), `${extension.id}-${id}`, provider);
+            },
         };
         const lm = {
             selectChatModels: (selector) => {
@@ -1507,6 +1509,22 @@ function createApiFactoryAndRegisterActors(accessor) {
             registerLanguageModelChatProvider: (vendor, provider) => {
                 return extHostLanguageModels.registerLanguageModelChatProvider(extension, vendor, provider);
             },
+            get isModelProxyAvailable() {
+                checkProposedApiEnabled(extension, 'languageModelProxy');
+                return extHostLanguageModels.isModelProxyAvailable;
+            },
+            onDidChangeModelProxyAvailability: (listener, thisArgs, disposables) => {
+                checkProposedApiEnabled(extension, 'languageModelProxy');
+                return extHostLanguageModels.onDidChangeModelProxyAvailability(listener, thisArgs, disposables);
+            },
+            getModelProxy: () => {
+                checkProposedApiEnabled(extension, 'languageModelProxy');
+                return extHostLanguageModels.getModelProxy(extension);
+            },
+            registerLanguageModelProxyProvider: (provider) => {
+                checkProposedApiEnabled(extension, 'chatParticipantPrivate');
+                return extHostLanguageModels.registerLanguageModelProxyProvider(extension, provider);
+            },
             get embeddingModels() {
                 checkProposedApiEnabled(extension, 'embeddings');
                 return extHostEmbeddings.embeddingsModels;
@@ -1820,6 +1838,7 @@ function createApiFactoryAndRegisterActors(accessor) {
             ChatResponseConfirmationPart: ChatResponseConfirmationPart,
             ChatResponseMovePart: ChatResponseMovePart,
             ChatResponseExtensionsPart: ChatResponseExtensionsPart,
+            ChatResponseExternalEditPart: ChatResponseExternalEditPart,
             ChatResponsePullRequestPart: ChatResponsePullRequestPart,
             ChatPrepareToolInvocationPart: ChatPrepareToolInvocationPart,
             ChatResponseMultiDiffPart: ChatResponseMultiDiffPart,
@@ -1840,7 +1859,7 @@ function createApiFactoryAndRegisterActors(accessor) {
             LanguageModelChatMessage: LanguageModelChatMessage,
             LanguageModelChatMessage2: LanguageModelChatMessage2,
             LanguageModelToolResultPart: LanguageModelToolResultPart,
-            LanguageModelToolResultPart2: LanguageModelToolResultPart2,
+            LanguageModelToolResultPart2: LanguageModelToolResultPart,
             LanguageModelTextPart: LanguageModelTextPart,
             LanguageModelTextPart2: LanguageModelTextPart,
             LanguageModelPartAudience: LanguageModelPartAudience,
@@ -1867,7 +1886,10 @@ function createApiFactoryAndRegisterActors(accessor) {
             TextSearchCompleteMessageTypeNew: TextSearchCompleteMessageType,
             ChatErrorLevel: ChatErrorLevel,
             McpHttpServerDefinition: McpHttpServerDefinition,
+            McpHttpServerDefinition2: McpHttpServerDefinition,
             McpStdioServerDefinition: McpStdioServerDefinition,
+            McpStdioServerDefinition2: McpStdioServerDefinition,
+            McpToolAvailability: McpToolAvailability,
             SettingsSearchResultKind: SettingsSearchResultKind
         };
     };