@codingame/monaco-vscode-api 31.0.0 → 32.0.0

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

@@ -1,5 +1,6 @@
 
 import { CancellationTokenSource } from '../../../base/common/cancellation.js';
+import { AsyncIterableObject, raceCancellationError } from '../../../base/common/async.js';
 import { onUnexpectedExternalError, ReadonlyError, CancellationError } from '../../../base/common/errors.js';
 import { Event, Emitter } from '../../../base/common/event.js';
 import { combinedDisposable } from '../../../base/common/lifecycle.js';
@@ -33,6 +34,7 @@ import { ExtHostChatAgents2 } from './extHostChatAgents2.js';
 import { ExtHostChatOutputRenderer } from './extHostChatOutputRenderer.js';
 import { ExtHostChatSessions } from './extHostChatSessions.js';
 import { ExtHostChatStatus } from './extHostChatStatus.js';
+import { ExtHostChatInputNotification } from './extHostChatInputNotification.js';
 import { ExtHostClipboard } from './extHostClipboard.js';
 import { ExtHostEditorInsets } from './extHostCodeInsets.js';
 import { ExtHostCodeMapper } from './extHostCodeMapper.js';
@@ -99,8 +101,8 @@ import { ExtHostTheming } from './extHostTheming.js';
 import { ExtHostTimeline } from './extHostTimeline.js';
 import { ExtHostTreeViews } from './extHostTreeViews.js';
 import { IExtHostTunnelService } from './extHostTunnelService.js';
-import { LanguageSelector } from './extHostTypeConverters.js';
-import { ExtensionKind, ProgressLocation, ChatDebugSubagentStatus, ChatTodoStatus, SettingsSearchResultKind, McpToolInvocationContentData, 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, ChatDebugEventHookContent, ChatDebugEventModelTurnContent, ChatDebugEventToolCallContent, ChatDebugEventMessageContent, ChatDebugMessageContentType, ChatDebugEventTextContent, ChatDebugMessageSection, ChatDebugAgentResponseEvent, ChatDebugUserMessageEvent, ChatDebugSubagentInvocationEvent, ChatDebugGenericEvent, ChatDebugModelTurnEvent, ChatDebugToolCallEvent, ChatDebugHookResult, ChatDebugToolCallResult, ChatDebugLogLevel, ChatSessionCustomizationType, ChatSessionStatus, ChatLocation, ChatToolInvocationPart, ChatSubagentToolInvocationData, ChatResponseTurn2, ChatResponseTurn, ChatRequestTurn, ChatResponseClearToPreviousToolInvocationReason, ChatResponseReferencePartStatusKind, ChatResponseMultiDiffPart, ChatResponsePullRequestPart, ChatResponseExternalEditPart, ChatResponseExtensionsPart, ChatResponseMovePart, ChatResponseQuestionCarouselPart, ChatQuestionType, ChatQuestion, ChatResponseConfirmationPart, ChatResponseCommandButtonPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseWorkspaceEditPart, ChatResponseNotebookEditPart, ChatResponseTextEditPart, ChatResponseWarningPart, ChatResponseCodeblockUriPart, ChatResponseCodeCitationPart, ChatResponseReferencePart, ChatResponseHookPart, ChatResponseThinkingProgressPart, ChatResponseProgressPart2, ChatResponseProgressPart, ChatResponseAnchorPart, ChatResponseFileTreePart, ChatResponseMarkdownPart, ChatImageMimeType, KeywordRecognitionStatus, InlineCompletionDisplayLocationKind, InlineCompletionEndOfLifeReasonKind, PartialAcceptTriggerKind, TextToSpeechStatus, SpeechToTextStatus, RelatedInformationType, DebugThread, DebugStackFrame, InteractiveEditorResponseFeedbackKind, ChatEditingSessionActionOutcome, ChatSessionChangedFile, 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, TaskRunOn, 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 { LanguageSelector, Range } from './extHostTypeConverters.js';
+import { ExtensionKind, ProgressLocation, ChatDebugSubagentStatus, ChatTodoStatus, SettingsSearchResultKind, McpToolInvocationContentData, McpToolAvailability, McpStdioServerDefinition, McpHttpServerDefinition, ChatInputNotificationSeverity, 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, ChatDebugEventHookContent, ChatDebugEventModelTurnContent, ChatDebugEventToolCallContent, ChatDebugEventMessageContent, ChatDebugMessageContentType, ChatDebugEventTextContent, ChatDebugMessageSection, ChatDebugAgentResponseEvent, ChatDebugUserMessageEvent, ChatDebugSubagentInvocationEvent, ChatDebugGenericEvent, ChatDebugModelTurnEvent, ChatDebugToolCallEvent, ChatDebugHookResult, ChatDebugToolCallResult, ChatDebugLogLevel, ChatSessionCustomizationType, ChatSessionStatus, ChatLocation, ChatToolInvocationPart, ChatSubagentToolInvocationData, ChatResponseTurn2, ChatResponseTurn, ChatRequestTurn, ChatResponseClearToPreviousToolInvocationReason, ChatResponseReferencePartStatusKind, ChatResponseMultiDiffPart, ChatResponsePullRequestPart, ChatResponseExternalEditPart, ChatResponseExtensionsPart, ChatResponseMovePart, ChatResponseQuestionCarouselPart, ChatQuestionType, ChatQuestion, ChatResponseConfirmationPart, ChatResponseCommandButtonPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseWorkspaceEditPart, ChatResponseNotebookEditPart, ChatResponseTextEditPart, ChatResponseInfoPart, ChatResponseWarningPart, ChatResponseCodeblockUriPart, ChatResponseCodeCitationPart, ChatResponseReferencePart, ChatResponseHookPart, ChatResponseThinkingProgressPart, ChatResponseProgressPart2, ChatResponseProgressPart, ChatResponseAnchorPart, ChatResponseFileTreePart, ChatResponseMarkdownPart, ChatImageMimeType, KeywordRecognitionStatus, InlineCompletionDisplayLocationKind, InlineCompletionEndOfLifeReasonKind, PartialAcceptTriggerKind, TextToSpeechStatus, SpeechToTextStatus, RelatedInformationType, DebugThread, DebugStackFrame, InteractiveEditorResponseFeedbackKind, ChatEditingSessionActionOutcome, ChatSessionChangedFile, 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, TaskRunOn, 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';
@@ -121,7 +123,7 @@ import { TextEdit, EndOfLine } from './extHostTypes/textEdit.js';
 import { SymbolTag, SymbolKind, SymbolInformation } from './extHostTypes/symbolInformation.js';
 import { SnippetString } from './extHostTypes/snippetString.js';
 import { Selection } from './extHostTypes/selection.js';
-import { Range } from './extHostTypes/range.js';
+import { Range as Range$1 } from './extHostTypes/range.js';
 import { Position } from './extHostTypes/position.js';
 import { MarkdownString } from './extHostTypes/markdownString.js';
 import { Location } from './extHostTypes/location.js';
@@ -310,6 +312,7 @@ function createApiFactoryAndRegisterActors(accessor) {
     const extHostMessageService = ( new ExtHostMessageService(rpcProtocol, extHostLogService));
     const extHostDialogs = ( new ExtHostDialogs(rpcProtocol));
     const extHostChatStatus = ( new ExtHostChatStatus(rpcProtocol));
+    const extHostChatInputNotification = ( new ExtHostChatInputNotification(rpcProtocol));
     ExtHostApiCommands.register(extHostCommands);
     return function(extension, extensionInfo, configProvider) {
         function _asExtensionEvent(actual) {
@@ -1218,6 +1221,54 @@ function createApiFactoryAndRegisterActors(accessor) {
                 checkProposedApiEnabled(extension, "textSearchProvider2");
                 return extHostWorkspace.findTextInFiles2(query, options, extension.identifier, token);
             },
+            getTextDiff(originalDocument, modifiedDocument, options, token) {
+                checkProposedApiEnabled(extension, "documentDiff");
+                const proxy = ( rpcProtocol.getProxy(MainContext.MainThreadDocumentDiff));
+                if (token?.isCancellationRequested) {
+                    const error = new CancellationError();
+                    return {
+                        changes: AsyncIterableObject.EMPTY,
+                        complete: Promise.reject(error)
+                    };
+                }
+                const resultPromise = proxy.$computeDocumentDiff(
+                    originalDocument.uri,
+                    modifiedDocument.uri,
+                    options?.ignoreTrimWhitespace ?? false,
+                    options?.maxComputationTimeMs ?? 5000,
+                    options?.computeMoves ?? false
+                );
+                const diffPromise = token ? raceCancellationError(resultPromise, token) : resultPromise;
+                const mappedPromise = diffPromise.then(result => {
+                    if (!result) {
+                        throw ( new Error("Could not compute diff. Make sure both documents are available."));
+                    }
+                    return result;
+                });
+                const mapChange = c => ({
+                    originalRange: Range.to(c.originalRange),
+                    modifiedRange: Range.to(c.modifiedRange),
+                    innerChanges: c.innerChanges?.map(ic => ({
+                        originalRange: Range.to(ic.originalRange),
+                        modifiedRange: Range.to(ic.modifiedRange)
+                    }))
+                });
+                return {
+                    changes: new AsyncIterableObject(async emitter => {
+                        const result = await mappedPromise;
+                        emitter.emitMany(( result.changes.map(mapChange)));
+                    }),
+                    complete: mappedPromise.then(result => ({
+                        identical: result.identical,
+                        mayBeIncomplete: result.quitEarly,
+                        moves: ( result.moves.map(m => ({
+                            originalRange: Range.to(m.originalRange),
+                            modifiedRange: Range.to(m.modifiedRange),
+                            changes: ( m.changes.map(mapChange))
+                        })))
+                    }))
+                };
+            },
             save: uri => {
                 return extHostWorkspace.save(uri);
             },
@@ -1845,6 +1896,10 @@ function createApiFactoryAndRegisterActors(accessor) {
             registerChatSessionCustomizationProvider(chatSessionType, metadata, provider) {
                 checkProposedApiEnabled(extension, "chatSessionCustomizationProvider");
                 return extHostChatAgents2.registerChatSessionCustomizationProvider(extension, chatSessionType, metadata, provider);
+            },
+            createInputNotification(id) {
+                checkProposedApiEnabled(extension, "chatInputNotification");
+                return extHostChatInputNotification.createInputNotification(extension, id);
             }
         };
         const lm = {
@@ -2049,7 +2104,7 @@ function createApiFactoryAndRegisterActors(accessor) {
             ProgressLocation: ProgressLocation,
             QuickInputButtonLocation: QuickInputButtonLocation,
             QuickInputButtons: QuickInputButtons,
-            Range: Range,
+            Range: Range$1,
             RelativePattern: RelativePattern,
             Selection: Selection,
             SelectionRange: SelectionRange,
@@ -2199,6 +2254,7 @@ function createApiFactoryAndRegisterActors(accessor) {
             ChatResponseCodeCitationPart: ChatResponseCodeCitationPart,
             ChatResponseCodeblockUriPart: ChatResponseCodeblockUriPart,
             ChatResponseWarningPart: ChatResponseWarningPart,
+            ChatResponseInfoPart: ChatResponseInfoPart,
             ChatResponseTextEditPart: ChatResponseTextEditPart,
             ChatResponseNotebookEditPart: ChatResponseNotebookEditPart,
             ChatResponseWorkspaceEditPart: ChatResponseWorkspaceEditPart,
@@ -2274,6 +2330,7 @@ function createApiFactoryAndRegisterActors(accessor) {
             AISearchKeyword: AISearchKeyword,
             TextSearchCompleteMessageTypeNew: TextSearchCompleteMessageType,
             ChatErrorLevel: ChatErrorLevel,
+            ChatInputNotificationSeverity: ChatInputNotificationSeverity,
             McpHttpServerDefinition: McpHttpServerDefinition,
             McpHttpServerDefinition2: McpHttpServerDefinition,
             McpStdioServerDefinition: McpStdioServerDefinition,

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

@@ -910,8 +910,24 @@ export interface IWebviewPanelOptions {
     readonly enableFindWidget?: boolean;
     readonly retainContextWhenHidden?: boolean;
 }
-export interface CustomTextEditorCapabilities {
+export interface CustomEditorProviderCapabilities {
     readonly supportsMove?: boolean;
+    readonly supportsInlineDiff?: boolean;
+    readonly supportsSideBySideDiff?: boolean;
+}
+export interface CustomEditorDiffInitData {
+    readonly title: string;
+    readonly contentOptions: IWebviewContentOptions;
+    readonly options: IWebviewPanelOptions;
+    readonly active: boolean;
+}
+export interface CustomEditorSideBySideDiffWebviewHandles {
+    readonly original: WebviewHandle;
+    readonly modified: WebviewHandle;
+}
+export interface CustomEditorSideBySideDiffInitData {
+    readonly original: CustomEditorDiffInitData;
+    readonly modified: CustomEditorDiffInitData;
 }
 export declare enum WebviewMessageArrayBufferViewType {
     Int8Array = 1,
@@ -965,8 +981,8 @@ export interface MainThreadWebviewPanelsShape extends IDisposable {
     $unregisterSerializer(viewType: string): void;
 }
 export interface MainThreadCustomEditorsShape extends IDisposable {
-    $registerTextEditorProvider(extension: WebviewExtensionDescription, viewType: string, options: IWebviewPanelOptions, capabilities: CustomTextEditorCapabilities, serializeBuffersForPostMessage: boolean): void;
-    $registerCustomEditorProvider(extension: WebviewExtensionDescription, viewType: string, options: IWebviewPanelOptions, supportsMultipleEditorsPerDocument: boolean, serializeBuffersForPostMessage: boolean): void;
+    $registerTextEditorProvider(extension: WebviewExtensionDescription, viewType: string, options: IWebviewPanelOptions, capabilities: CustomEditorProviderCapabilities, serializeBuffersForPostMessage: boolean): void;
+    $registerCustomEditorProvider(extension: WebviewExtensionDescription, viewType: string, options: IWebviewPanelOptions, capabilities: CustomEditorProviderCapabilities, supportsMultipleEditorsPerDocument: boolean, serializeBuffersForPostMessage: boolean): void;
     $unregisterEditorProvider(viewType: string): void;
     $onDidEdit(resource: UriComponents, viewType: string, editId: number, label: string | undefined): void;
     $onContentChange(resource: UriComponents, viewType: string): void;
@@ -1011,6 +1027,8 @@ export interface ExtHostCustomEditorsShape {
         options: IWebviewPanelOptions;
         active: boolean;
     }, position: EditorGroupColumn, cancellation: CancellationToken): Promise<void>;
+    $resolveCustomEditorInlineDiff(originalResource: UriComponents, modifiedResource: UriComponents, newWebviewHandle: WebviewHandle, viewType: string, initData: CustomEditorDiffInitData, position: EditorGroupColumn, cancellation: CancellationToken): Promise<void>;
+    $resolveCustomEditorSideBySideDiff(originalResource: UriComponents, modifiedResource: UriComponents, webviewHandles: CustomEditorSideBySideDiffWebviewHandles, viewType: string, initData: CustomEditorSideBySideDiffInitData, position: EditorGroupColumn, cancellation: CancellationToken): Promise<void>;
     $createCustomDocument(resource: UriComponents, viewType: string, backupId: string | undefined, untitledDocumentData: VSBuffer | undefined, cancellation: CancellationToken): Promise<{
         editable: boolean;
     }>;
@@ -1269,7 +1287,9 @@ export interface IChatDebugModelTurnEventDto extends IChatDebugEventCommonDto {
     readonly requestName?: string;
     readonly inputTokens?: number;
     readonly outputTokens?: number;
+    readonly cachedTokens?: number;
     readonly totalTokens?: number;
+    readonly copilotUsageNanoAiu?: number;
     readonly durationInMillis?: number;
 }
 export interface IChatDebugGenericEventDto extends IChatDebugEventCommonDto {
@@ -1328,12 +1348,14 @@ export interface IChatDebugEventModelTurnContentDto {
     readonly status?: string;
     readonly durationInMillis?: number;
     readonly timeToFirstTokenInMillis?: number;
+    readonly requestId?: string;
     readonly maxInputTokens?: number;
     readonly maxOutputTokens?: number;
     readonly inputTokens?: number;
     readonly outputTokens?: number;
     readonly cachedTokens?: number;
     readonly totalTokens?: number;
+    readonly requestOptions?: string;
     readonly errorMessage?: string;
     readonly sections?: readonly IChatDebugMessageSectionDto[];
 }
@@ -1515,12 +1537,14 @@ export interface ICustomAgentDto extends IChatResourceDto {
     readonly model?: readonly string[];
     readonly userInvocable: boolean;
     readonly disableModelInvocation: boolean;
+    readonly enabled: boolean;
 }
 export interface IInstructionDto extends IChatResourceDto {
     readonly pattern?: string;
 }
 export interface ISkillDto extends IChatResourceDto {
     readonly userInvocable: boolean;
+    readonly disableModelInvocation: boolean;
 }
 export interface ISlashCommandDto extends IChatResourceDto {
     readonly argumentHint?: string;
@@ -1529,6 +1553,9 @@ export interface ISlashCommandDto extends IChatResourceDto {
 export interface IHookDto {
     readonly uri: UriComponents;
     readonly sessionTypes?: readonly string[];
+    readonly source: IChatResourceSourceDto;
+    readonly extensionId?: string;
+    readonly pluginUri?: UriComponents;
 }
 export interface IPluginDto {
     readonly uri: UriComponents;
@@ -1545,7 +1572,10 @@ export interface IChatSessionCustomizationItemDto {
     readonly description?: string;
     readonly groupKey?: string;
     readonly badge?: string;
+    readonly extensionId?: string;
+    readonly pluginUri?: UriComponents;
     readonly badgeTooltip?: string;
+    readonly userInvocable?: boolean;
 }
 export interface IChatParticipantMetadata {
     participant: string;
@@ -1897,6 +1927,28 @@ export interface MainThreadQuickDiffShape extends IDisposable {
     $registerQuickDiffProvider(handle: number, selector: IDocumentFilterDto[], id: string, label: string, rootUri: UriComponents | undefined): Promise<void>;
     $unregisterQuickDiffProvider(handle: number): Promise<void>;
 }
+export interface IDocumentDiffLineChangeDto {
+    originalRange: IRange;
+    modifiedRange: IRange;
+    innerChanges: {
+        originalRange: IRange;
+        modifiedRange: IRange;
+    }[] | undefined;
+}
+export interface IDocumentDiffMoveDto {
+    originalRange: IRange;
+    modifiedRange: IRange;
+    changes: IDocumentDiffLineChangeDto[];
+}
+export interface IDocumentDiffResultDto {
+    identical: boolean;
+    quitEarly: boolean;
+    changes: IDocumentDiffLineChangeDto[];
+    moves: IDocumentDiffMoveDto[];
+}
+export interface MainThreadDocumentDiffShape extends IDisposable {
+    $computeDocumentDiff(originalUri: UriComponents, modifiedUri: UriComponents, ignoreTrimWhitespace: boolean, maxComputationTimeMs: number, computeMoves: boolean): Promise<IDocumentDiffResultDto | null>;
+}
 export type DebugSessionUUID = string;
 export interface IDebugConfiguration {
     type: string;
@@ -2130,7 +2182,7 @@ export interface ExtHostTreeViewsShape {
      * for [x,y] returns
      * [[1,z]], where the inner array is [original index, ...children]
      */
-    $getChildren(treeViewId: string, treeItemHandles?: string[]): Promise<(number | ITreeItem)[][] | undefined>;
+    $getChildren(treeViewId: string, treeItemHandles?: string[]): Promise<(readonly (number | ITreeItem)[])[] | undefined>;
     $handleDrop(destinationViewId: string, requestId: number, treeDataTransfer: DataTransferDTO, targetHandle: string | undefined, token: CancellationToken, operationUuid?: string, sourceViewId?: string, sourceTreeItemHandles?: string[]): Promise<void>;
     $handleDrag(sourceViewId: string, sourceTreeItemHandles: string[], operationUuid: string, token: CancellationToken): Promise<DataTransferDTO | undefined>;
     $setExpanded(treeViewId: string, treeItemHandle: string, expanded: boolean): void;
@@ -3357,6 +3409,7 @@ export type ChatStatusItemDto = {
     title: string | {
         label: string;
         link: string;
+        helpText?: string;
     };
     description: string;
     detail: string | undefined;
@@ -3365,6 +3418,29 @@ export interface MainThreadChatStatusShape {
     $setEntry(id: string, entry: ChatStatusItemDto): void;
     $disposeEntry(id: string): void;
 }
+export declare enum ChatInputNotificationSeverityDto {
+    Info = 0,
+    Warning = 1,
+    Error = 2
+}
+export type ChatInputNotificationActionDto = {
+    label: string;
+    commandId: string;
+    commandArgs?: unknown[];
+};
+export type ChatInputNotificationDto = {
+    id: string;
+    severity: ChatInputNotificationSeverityDto;
+    message: string;
+    description: string | undefined;
+    actions: ChatInputNotificationActionDto[];
+    dismissible: boolean;
+    autoDismissOnMessage: boolean;
+};
+export interface MainThreadChatInputNotificationShape {
+    $setNotification(notification: ChatInputNotificationDto): void;
+    $disposeNotification(id: string): void;
+}
 export type IChatSessionHistoryItemDto = {
     id?: string;
     type: "request";
@@ -3378,6 +3454,7 @@ export type IChatSessionHistoryItemDto = {
     type: "response";
     parts: IChatProgressDto[];
     participant: string;
+    details?: string;
 };
 export type IChatSessionRequestHistoryItemDto = Extract<IChatSessionHistoryItemDto, {
     type: "request";
@@ -3415,7 +3492,8 @@ export interface IChatSessionItemsChange {
     readonly removed: readonly UriComponents[];
 }
 export interface MainThreadChatSessionsShape extends IDisposable {
-    $registerChatSessionItemController(controllerHandle: number, chatSessionType: string): void;
+    $registerChatSessionItemController(controllerHandle: number, chatSessionType: string, supportsResolve: boolean): void;
+    $updateChatSessionItemControllerCapabilities(controllerHandle: number, supportsResolve: boolean): void;
     $unregisterChatSessionItemController(controllerHandle: number): void;
     $updateChatSessionItems(controllerHandle: number, change: IChatSessionItemsChange): Promise<void>;
     $addOrUpdateChatSessionItem(controllerHandle: number, item: Dto<IChatSessionItem>): Promise<void>;
@@ -3443,6 +3521,7 @@ export interface ExtHostChatSessionsShape {
     $provideChatSessionProviderOptions(providerHandle: number, token: CancellationToken): Promise<IChatSessionProviderOptions | undefined>;
     $provideHandleOptionsChange(providerHandle: number, sessionResource: UriComponents, updates: Record<string, string | IChatSessionProviderOptionItem | undefined>, token: CancellationToken): Promise<void>;
     $forkChatSession(providerHandle: number, sessionResource: UriComponents, request: IChatSessionRequestHistoryItemDto | undefined, token: CancellationToken): Promise<Dto<IChatSessionItem>>;
+    $resolveChatSessionItem(providerHandle: number, sessionResource: UriComponents, token: CancellationToken): Promise<Dto<IChatSessionItem> | undefined>;
     $provideChatSessionInputState(controllerHandle: number, sessionResource: UriComponents | undefined, token: CancellationToken): Promise<IChatSessionProviderOptionGroup[] | undefined>;
 }
 export interface GitRefQueryDto {
@@ -3548,6 +3627,7 @@ export declare const MainContext: {
     MainThreadOutputService: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<MainThreadOutputServiceShape>;
     MainThreadProgress: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<MainThreadProgressShape>;
     MainThreadQuickDiff: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<MainThreadQuickDiffShape>;
+    MainThreadDocumentDiff: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<MainThreadDocumentDiffShape>;
     MainThreadQuickOpen: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<MainThreadQuickOpenShape>;
     MainThreadStatusBar: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<MainThreadStatusBarShape>;
     MainThreadSecretState: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<MainThreadSecretStateShape>;
@@ -3591,6 +3671,7 @@ export declare const MainContext: {
     MainThreadAiRelatedInformation: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<MainThreadAiRelatedInformationShape>;
     MainThreadAiEmbeddingVector: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<MainThreadAiEmbeddingVectorShape>;
     MainThreadChatStatus: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<MainThreadChatStatusShape>;
+    MainThreadChatInputNotification: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<MainThreadChatInputNotificationShape>;
     MainThreadAiSettingsSearch: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<MainThreadAiSettingsSearchShape>;
     MainThreadDataChannels: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<MainThreadDataChannelsShape>;
     MainThreadChatSessions: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<MainThreadChatSessionsShape>;

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

@@ -114,6 +114,14 @@ var IAuthServerMetadataSource;
     IAuthServerMetadataSource["WellKnown"] = "wellKnown";
     IAuthServerMetadataSource["Default"] = "default";
 })(IAuthServerMetadataSource || (IAuthServerMetadataSource = {}));
+var ChatInputNotificationSeverityDto;
+(function(ChatInputNotificationSeverityDto) {
+    ChatInputNotificationSeverityDto[ChatInputNotificationSeverityDto["Info"] = 0] = "Info";
+    ChatInputNotificationSeverityDto[ChatInputNotificationSeverityDto["Warning"] = 1] = "Warning";
+    ChatInputNotificationSeverityDto[ChatInputNotificationSeverityDto["Error"] = 2] = "Error";
+})(
+    ChatInputNotificationSeverityDto || (ChatInputNotificationSeverityDto = {})
+);
 var GitRefTypeDto;
 (function(GitRefTypeDto) {
     GitRefTypeDto[GitRefTypeDto["Head"] = 0] = "Head";
@@ -153,6 +161,7 @@ const MainContext = {
     MainThreadOutputService: ( createProxyIdentifier("MainThreadOutputService")),
     MainThreadProgress: ( createProxyIdentifier("MainThreadProgress")),
     MainThreadQuickDiff: ( createProxyIdentifier("MainThreadQuickDiff")),
+    MainThreadDocumentDiff: ( createProxyIdentifier("MainThreadDocumentDiff")),
     MainThreadQuickOpen: ( createProxyIdentifier("MainThreadQuickOpen")),
     MainThreadStatusBar: ( createProxyIdentifier("MainThreadStatusBar")),
     MainThreadSecretState: ( createProxyIdentifier("MainThreadSecretState")),
@@ -196,6 +205,7 @@ const MainContext = {
     MainThreadAiRelatedInformation: ( createProxyIdentifier("MainThreadAiRelatedInformation")),
     MainThreadAiEmbeddingVector: ( createProxyIdentifier("MainThreadAiEmbeddingVector")),
     MainThreadChatStatus: ( createProxyIdentifier("MainThreadChatStatus")),
+    MainThreadChatInputNotification: ( createProxyIdentifier("MainThreadChatInputNotification")),
     MainThreadAiSettingsSearch: ( createProxyIdentifier("MainThreadAiSettingsSearch")),
     MainThreadDataChannels: ( createProxyIdentifier("MainThreadDataChannels")),
     MainThreadChatSessions: ( createProxyIdentifier("MainThreadChatSessions")),
@@ -285,4 +295,4 @@ const ExtHostContext = {
     ExtHostBrowsers: ( createProxyIdentifier("ExtHostBrowsers"))
 };
 
-export { CandidatePortSource, CellOutputKind, ExtHostContext, ExtHostTestingResource, GitRefTypeDto, IAuthResourceMetadataSource, IAuthServerMetadataSource, ISuggestDataDtoField, ISuggestResultDtoField, MainContext, NotebookEditorRevealType, TabInputKind, TabModelOperationKind, TextEditorRevealType, WebviewEditorCapabilities, WebviewMessageArrayBufferViewType };
+export { CandidatePortSource, CellOutputKind, ChatInputNotificationSeverityDto, ExtHostContext, ExtHostTestingResource, GitRefTypeDto, IAuthResourceMetadataSource, IAuthServerMetadataSource, ISuggestDataDtoField, ISuggestResultDtoField, MainContext, NotebookEditorRevealType, TabInputKind, TabModelOperationKind, TextEditorRevealType, WebviewEditorCapabilities, WebviewMessageArrayBufferViewType };

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

@@ -372,7 +372,7 @@ let DynamicAuthProvider = class DynamicAuthProvider {
         this._createFlows = [];
         if (_serverMetadata.authorization_endpoint) {
             this._createFlows.push({
-                label: ( localize(2736, "URL Handler")),
+                label: ( localize(2779, "URL Handler")),
                 handler: (scopes, progress, token) => this._createWithUrlHandler(scopes, progress, token)
             });
         }
@@ -451,7 +451,7 @@ let DynamicAuthProvider = class DynamicAuthProvider {
                     id: this.id
                 }, {
                     location: ProgressLocation.Notification,
-                    title: ( localize(2737, "Authenticating to '{0}'", this.label)),
+                    title: ( localize(2780, "Authenticating to '{0}'", this.label)),
                     cancellable: true
                 }, (progress, token) => handler(scopes, progress, token));
                 if (token) {
@@ -463,12 +463,12 @@ let DynamicAuthProvider = class DynamicAuthProvider {
                     break;
                 }
                 const message = isCancellationError(err) ? ( localize(
-                    2738,
+                    2781,
                     "Having trouble authenticating to '{0}'? Would you like to try a different way? ({1})",
                     this.label,
                     nextMode
                 )) : ( localize(
-                    2739,
+                    2782,
                     "You have not yet finished authenticating to '{0}'. Would you like to try a different way? ({1})",
                     this.label,
                     nextMode
@@ -567,7 +567,7 @@ let DynamicAuthProvider = class DynamicAuthProvider {
             throw ( new CancellationError());
         }
         progress.report({
-            message: ( localize(2740, "Complete the authentication in the browser window that has opened."))
+            message: ( localize(2783, "Complete the authentication in the browser window that has opened."))
         });
         let code;
         try {

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

@@ -19,8 +19,8 @@ import { LocalChatSessionUri } from '../../contrib/chat/common/model/chatUri.js'
 import { ChatAgentLocation } from '../../contrib/chat/common/constants.js';
 import { checkProposedApiEnabled, isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 import { MainContext } from './extHost.protocol.js';
-import { ChatResponseWarningPart, ChatResponseReferencePart, ChatTaskResult, ChatTask, ChatResponseProgressPart, ChatResponseThinkingProgressPart as ChatResponseThinkingProgressPart$1, ChatResponseAnchorPart as ChatResponseAnchorPart$1, ChatResponsePart, ChatResponseQuestionCarouselPart as ChatResponseQuestionCarouselPart$1, ChatResponseConfirmationPart as ChatResponseConfirmationPart$1, ChatResponseWorkspaceEditPart as ChatResponseWorkspaceEditPart$1, ChatResponseNotebookEditPart as ChatResponseNotebookEditPart$1, ChatResponseTextEditPart as ChatResponseTextEditPart$1, ChatResponseCodeCitationPart as ChatResponseCodeCitationPart$1, ChatResponseHookPart as ChatResponseHookPart$1, ChatResponseCommandButtonPart as ChatResponseCommandButtonPart$1, ChatResponseFilesPart, ChatResponseCodeblockUriPart as ChatResponseCodeblockUriPart$1, ChatResponseMarkdownWithVulnerabilitiesPart as ChatResponseMarkdownWithVulnerabilitiesPart$1, ChatResponseMarkdownPart as ChatResponseMarkdownPart$1, ChatSessionCustomizationType, ChatAgentRequest, ChatLocation, Selection, Range, ChatAgentResult, ChatLanguageModelToolReference, ChatPromptReference, ChatRequestModeInstructions, ChatFollowup, ChatAgentUserActionEvent, ChatAgentCompletionItem, MarkdownString as MarkdownString$1 } from './extHostTypeConverters.js';
-import { ChatResponseTextEditPart, ChatResponseNotebookEditPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseWarningPart as ChatResponseWarningPart$1, ChatResponseConfirmationPart, ChatResponseQuestionCarouselPart, ChatResponseCodeCitationPart, ChatResponseMovePart, ChatResponseExtensionsPart, ChatResponseExternalEditPart, ChatResponseThinkingProgressPart, ChatResponsePullRequestPart, ChatResponseProgressPart2, ChatResponseReferencePart as ChatResponseReferencePart$1, ChatResponseAnchorPart, ChatResponseWorkspaceEditPart, ChatResponseHookPart, ChatResponseCommandButtonPart, ChatResponseFileTreePart, ChatResponseCodeblockUriPart, ChatResponseMarkdownPart, ChatRequestEditorData, ChatRequestNotebookData, LanguageModelError, ChatRequestTurn, ChatResponseTurn, ChatResultFeedbackKind, ThemeIcon } from './extHostTypes.js';
+import { ChatResponseWarningPart, ChatResponseReferencePart, ChatTaskResult, ChatTask, ChatResponseProgressPart, ChatResponseThinkingProgressPart as ChatResponseThinkingProgressPart$1, ChatResponseAnchorPart as ChatResponseAnchorPart$1, ChatResponsePart, ChatResponseQuestionCarouselPart as ChatResponseQuestionCarouselPart$1, ChatResponseConfirmationPart as ChatResponseConfirmationPart$1, ChatResponseWorkspaceEditPart as ChatResponseWorkspaceEditPart$1, ChatResponseNotebookEditPart as ChatResponseNotebookEditPart$1, ChatResponseTextEditPart as ChatResponseTextEditPart$1, ChatResponseCodeCitationPart as ChatResponseCodeCitationPart$1, ChatResponseInfoPart as ChatResponseInfoPart$1, ChatResponseHookPart as ChatResponseHookPart$1, ChatResponseCommandButtonPart as ChatResponseCommandButtonPart$1, ChatResponseFilesPart, ChatResponseCodeblockUriPart as ChatResponseCodeblockUriPart$1, ChatResponseMarkdownWithVulnerabilitiesPart as ChatResponseMarkdownWithVulnerabilitiesPart$1, ChatResponseMarkdownPart as ChatResponseMarkdownPart$1, ChatSessionCustomizationType, ChatAgentRequest, ChatLocation, Selection, Range, ChatAgentResult, ChatLanguageModelToolReference, ChatPromptReference, ChatRequestModeInstructions, ChatFollowup, ChatAgentUserActionEvent, ChatAgentCompletionItem, MarkdownString as MarkdownString$1 } from './extHostTypeConverters.js';
+import { ChatResponseTextEditPart, ChatResponseNotebookEditPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseWarningPart as ChatResponseWarningPart$1, ChatResponseConfirmationPart, ChatResponseQuestionCarouselPart, ChatResponseCodeCitationPart, ChatResponseMovePart, ChatResponseExtensionsPart, ChatResponseExternalEditPart, ChatResponseThinkingProgressPart, ChatResponsePullRequestPart, ChatResponseProgressPart2, ChatResponseReferencePart as ChatResponseReferencePart$1, ChatResponseAnchorPart, ChatResponseWorkspaceEditPart, ChatResponseInfoPart, ChatResponseHookPart, ChatResponseCommandButtonPart, ChatResponseFileTreePart, ChatResponseCodeblockUriPart, ChatResponseMarkdownPart, ChatRequestEditorData, ChatRequestNotebookData, LanguageModelError, ChatRequestTurn, ChatResponseTurn, ChatResultFeedbackKind, ThemeIcon } from './extHostTypes.js';
 import { PromptsType } from '../../contrib/chat/common/promptSyntax/promptTypes.js';
 import { MarkdownString } from './extHostTypes/markdownString.js';
 
@@ -194,6 +194,14 @@ class ChatAgentResponseStream {
                     _report(dto);
                     return this;
                 },
+                info(value) {
+                    throwIfDone(this.progress);
+                    checkProposedApiEnabled(that._extension, "chatParticipantAdditions");
+                    const part = new ChatResponseInfoPart(value);
+                    const dto = ChatResponseInfoPart$1.from(part);
+                    _report(dto);
+                    return this;
+                },
                 reference(value, iconPath) {
                     return this.reference2(value, iconPath);
                 },
@@ -353,6 +361,9 @@ class ChatAgentResponseStream {
                         if (part.resolve) {
                             checkProposedApiEnabled(that._extension, "chatParticipantAdditions");
                             dto.resolveId = generateUuid();
+                        }
+                        _report(dto);
+                        if (part.resolve) {
                             const cts = ( new CancellationTokenSource());
                             part.resolve(cts.token).then(() => {
                                 const resolvedDto = ChatResponseAnchorPart$1.from(part);
@@ -360,7 +371,6 @@ class ChatAgentResponseStream {
                             }).then(() => cts.dispose(), () => cts.dispose());
                             that._sessionDisposables.add(toDisposable(() => cts.dispose(true)));
                         }
-                        _report(dto);
                     } else if (part instanceof ChatResponseExternalEditPart) {
                         const p = this.externalEdit(part.uris, part.callback);
                         p.then(value => part.didGetApplied(value));
@@ -418,7 +428,8 @@ class ExtHostChatAgents2 extends Disposable {
             tools: dto.tools,
             model: dto.model,
             userInvocable: dto.userInvocable,
-            disableModelInvocation: dto.disableModelInvocation
+            disableModelInvocation: dto.disableModelInvocation,
+            enabled: dto.enabled
         }));
     }
     toInstruction(dto) {
@@ -442,7 +453,8 @@ class ExtHostChatAgents2 extends Disposable {
             extensionId: dto.extensionId,
             pluginUri: dto.pluginUri ? URI.revive(dto.pluginUri) : undefined,
             sessionTypes: dto.sessionTypes,
-            userInvocable: dto.userInvocable
+            userInvocable: dto.userInvocable,
+            disableModelInvocation: dto.disableModelInvocation
         }));
     }
     toSlashCommand(dto) {
@@ -461,7 +473,10 @@ class ExtHostChatAgents2 extends Disposable {
     toHook(dto) {
         return ( Object.freeze({
             uri: URI.revive(dto.uri),
-            sessionTypes: dto.sessionTypes
+            sessionTypes: dto.sessionTypes,
+            source: dto.source,
+            extensionId: dto.extensionId,
+            pluginUri: dto.pluginUri ? URI.revive(dto.pluginUri) : undefined
         }));
     }
     toPlugin(dto) {
@@ -717,7 +732,10 @@ class ExtHostChatAgents2 extends Disposable {
                 description: item.description,
                 groupKey: item.groupKey,
                 badge: item.badge,
-                badgeTooltip: item.badgeTooltip
+                badgeTooltip: item.badgeTooltip,
+                extensionId: item.extensionId,
+                pluginUri: item.pluginUri,
+                userInvocable: item.userInvocable
             })));
         } catch (err) {
             return undefined;
@@ -909,7 +927,7 @@ class ExtHostChatAgents2 extends Disposable {
                         responseIsIncomplete: true
                     };
                 }
-                if (errorDetails?.responseIsRedacted || errorDetails?.isQuotaExceeded || errorDetails?.isRateLimited || errorDetails?.confirmationButtons || errorDetails?.code) {
+                if (errorDetails?.responseIsRedacted || errorDetails?.isQuotaExceeded || errorDetails?.isRateLimited || errorDetails?.isExpectedError || errorDetails?.confirmationButtons || errorDetails?.code) {
                     checkProposedApiEnabled(agent.extension, "chatParticipantPrivate");
                 }
                 return {
@@ -927,6 +945,7 @@ class ExtHostChatAgents2 extends Disposable {
             }
             const isQuotaExceeded = e instanceof Error && e.name === "ChatQuotaExceeded";
             const isRateLimited = e instanceof Error && e.name === "ChatRateLimited";
+            const isExpectedError = e instanceof Error && e.name === "ChatExpectedError";
             const {
                 callstack: errorCallstack
             } = packErrorForTelemetry(e);
@@ -936,7 +955,8 @@ class ExtHostChatAgents2 extends Disposable {
                     message: toErrorMessage(e),
                     responseIsIncomplete: true,
                     isQuotaExceeded,
-                    isRateLimited
+                    isRateLimited,
+                    isExpectedError
                 },
                 errorCallstack,
                 errorName

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

@@ -115,7 +115,9 @@ let ExtHostChatDebug = class ExtHostChatDebug extends Disposable {
                     requestName: e.requestName,
                     inputTokens: e.inputTokens,
                     outputTokens: e.outputTokens,
+                    cachedTokens: e.cachedTokens,
                     totalTokens: e.totalTokens,
+                    copilotUsageNanoAiu: e.copilotUsageNanoAiu,
                     durationInMillis: e.durationInMillis
                 };
             }
@@ -263,12 +265,14 @@ let ExtHostChatDebug = class ExtHostChatDebug extends Disposable {
                     status: mt.status,
                     durationInMillis: mt.durationInMillis,
                     timeToFirstTokenInMillis: mt.timeToFirstTokenInMillis,
+                    requestId: mt.requestId,
                     maxInputTokens: mt.maxInputTokens,
                     maxOutputTokens: mt.maxOutputTokens,
                     inputTokens: mt.inputTokens,
                     outputTokens: mt.outputTokens,
                     cachedTokens: mt.cachedTokens,
                     totalTokens: mt.totalTokens,
+                    requestOptions: mt.requestOptions,
                     errorMessage: mt.errorMessage,
                     sections: mt.sections?.map(s => ({
                         name: s.name,
@@ -319,9 +323,12 @@ let ExtHostChatDebug = class ExtHostChatDebug extends Disposable {
                 evt.sessionResource = sessionResource;
                 evt.parentEventId = dto.parentEventId;
                 evt.model = dto.model;
+                evt.requestName = dto.requestName;
                 evt.inputTokens = dto.inputTokens;
                 evt.outputTokens = dto.outputTokens;
+                evt.cachedTokens = dto.cachedTokens;
                 evt.totalTokens = dto.totalTokens;
+                evt.copilotUsageNanoAiu = dto.copilotUsageNanoAiu;
                 evt.durationInMillis = dto.durationInMillis;
                 return evt;
             }

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

@@ -0,0 +1,9 @@
+import type * as vscode from "vscode";
+import * as extHostProtocol from "./extHost.protocol.js";
+import { IExtensionDescription } from "../../../platform/extensions/common/extensions.js";
+export declare class ExtHostChatInputNotification {
+    private readonly _proxy;
+    private readonly _items;
+    constructor(mainContext: extHostProtocol.IMainContext);
+    createInputNotification(extension: IExtensionDescription, id: string): vscode.ChatInputNotification;
+}