@codingame/monaco-vscode-api 16.1.1 → 17.1.0

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

@@ -670,7 +670,7 @@ class ExtHostTreeView extends Disposable {
     createAndRegisterTreeNode(element, extTreeItem, parentNode) {
         const node = this.createTreeNode(element, extTreeItem, parentNode);
         if (extTreeItem.id && ( this.elements.has(node.item.handle))) {
-            throw ( new Error(( localize(2552, 'Element with id {0} is already registered', extTreeItem.id))));
+            throw ( new Error(( localize(2570, 'Element with id {0} is already registered', extTreeItem.id))));
         }
         this.addNodeToCache(element, node);
         this.addNodeToParentCache(node, parentNode);

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

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

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

@@ -14,28 +14,30 @@ import * as languageSelector from "../../../editor/common/languageSelector.js";
 import * as languages from "../../../editor/common/languages.js";
 import { EndOfLineSequence, TrackedRangeStickiness } from "../../../editor/common/model.js";
 import { ITextEditorOptions } from "../../../platform/editor/common/editor.js";
-import { IExtensionDescription } from "../../../platform/extensions/common/extensions.js";
+import { IExtensionDescription, IRelaxedExtensionDescription } from "../../../platform/extensions/common/extensions.js";
 import { IMarkerData, IRelatedInformation, MarkerSeverity, MarkerTag } from "../../../platform/markers/common/markers.js";
 import { ProgressLocation as MainProgressLocation } from "../../../platform/progress/common/progress.js";
 import { SaveReason } from "../../common/editor.js";
 import { IViewBadge } from "../../common/views.js";
-import { IChatAgentRequest, IChatAgentResult } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatAgents";
+import { IChatAgentRequest, IChatAgentResult } from "../../contrib/chat/common/chatAgents.js";
 import { IChatRequestDraft } from "../../contrib/chat/common/chatEditingService.js";
-import { IChatRequestVariableEntry } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { IChatAgentMarkdownContentWithVulnerability, IChatCodeCitation, IChatCommandButton, IChatConfirmation, IChatContentInlineReference, IChatContentReference, IChatFollowup, IChatMarkdownContent, IChatMoveMessage, IChatProgressMessage, IChatResponseCodeblockUriPart, IChatTaskDto, IChatTaskResult, IChatTextEdit, IChatTreeData, IChatUserActionEvent, IChatWarningMessage } from "../../contrib/chat/common/chatService.js";
+import { IChatRequestVariableEntry } from "../../contrib/chat/common/chatModel.js";
+import { IChatAgentMarkdownContentWithVulnerability, IChatCodeCitation, IChatCommandButton, IChatConfirmation, IChatContentInlineReference, IChatContentReference, IChatExtensionsContent, IChatFollowup, IChatMarkdownContent, IChatMoveMessage, IChatProgressMessage, IChatResponseCodeblockUriPart, IChatTaskDto, IChatTaskResult, IChatTextEdit, IChatTreeData, IChatUserActionEvent, IChatWarningMessage } from "../../contrib/chat/common/chatService.js";
 import { IToolData, IToolResult } from "../../contrib/chat/common/languageModelToolsService.js";
 import * as chatProvider from "../../contrib/chat/common/languageModels.js";
 import { IDebugVisualizationTreeItem } from "../../contrib/debug/common/debug.js";
 import * as notebooks from "../../contrib/notebook/common/notebookCommon.js";
-import { ICellRange } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/common/notebookRange";
+import { ICellRange } from "@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/common/notebookRange";
 import * as search from "@codingame/monaco-vscode-42931eb9-e564-530c-bafc-fa23ab43a070-common/vscode/vs/workbench/contrib/search/common/search";
 import { CoverageDetails, IFileCoverage, ISerializedTestResults, ITestErrorMessage, ITestItem, ITestRunProfileReference, ITestTag, TestRunProfileBitset } from "../../contrib/testing/common/testTypes.js";
-import { EditorGroupColumn } from "@codingame/monaco-vscode-38f25ab8-ea30-5ba9-8a08-ae3308c297c0-common/vscode/vs/workbench/services/editor/common/editorGroupColumn";
-import { Dto } from "../../services/extensions/common/proxyIdentifier.js";
+import { EditorGroupColumn } from "@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common/vscode/vs/workbench/services/editor/common/editorGroupColumn";
+import { Dto, SerializableObjectWithBuffers } from "../../services/extensions/common/proxyIdentifier.js";
 import * as extHostProtocol from "./extHost.protocol.js";
 import { CommandsConverter } from "./extHostCommands.js";
 import * as types from "./extHostTypes.js";
 import { ChatAgentLocation } from "../../contrib/chat/common/constants.js";
+import { AiSettingsSearchResult } from "../../services/aiSettingsSearch/common/aiSettingsSearch.js";
+import { McpServerLaunch } from "../../contrib/mcp/common/mcpTypes.js";
 export declare namespace Command {
     interface ICommandsConverter {
         fromInternal(command: extHostProtocol.ICommandDto): vscode.Command | undefined;
@@ -477,6 +479,9 @@ export declare namespace ChatResponseWarningPart {
     function from(part: vscode.ChatResponseWarningPart): Dto<IChatWarningMessage>;
     function to(part: Dto<IChatWarningMessage>): vscode.ChatResponseWarningPart;
 }
+export declare namespace ChatResponseExtensionsPart {
+    function from(part: vscode.ChatResponseExtensionsPart): Dto<IChatExtensionsContent>;
+}
 export declare namespace ChatResponseMovePart {
     function from(part: vscode.ChatResponseMovePart): Dto<IChatMoveMessage>;
     function to(part: Dto<IChatMoveMessage>): vscode.ChatResponseMovePart;
@@ -509,7 +514,7 @@ export declare namespace ChatResponseCodeCitationPart {
     function from(part: vscode.ChatResponseCodeCitationPart): Dto<IChatCodeCitation>;
 }
 export declare namespace ChatResponsePart {
-    function from(part: vscode.ChatResponsePart | vscode.ChatResponseTextEditPart | vscode.ChatResponseMarkdownWithVulnerabilitiesPart | vscode.ChatResponseWarningPart | vscode.ChatResponseConfirmationPart | vscode.ChatResponseReferencePart2 | vscode.ChatResponseMovePart, commandsConverter: CommandsConverter, commandDisposables: DisposableStore): extHostProtocol.IChatProgressDto;
+    function from(part: vscode.ChatResponsePart | vscode.ChatResponseTextEditPart | vscode.ChatResponseMarkdownWithVulnerabilitiesPart | vscode.ChatResponseWarningPart | vscode.ChatResponseConfirmationPart | vscode.ChatResponseReferencePart2 | vscode.ChatResponseMovePart | vscode.ChatResponseNotebookEditPart | vscode.ChatResponseExtensionsPart, commandsConverter: CommandsConverter, commandDisposables: DisposableStore): extHostProtocol.IChatProgressDto;
     function to(part: extHostProtocol.IChatProgressDto, commandsConverter: CommandsConverter): vscode.ChatResponsePart | undefined;
     function toContent(part: extHostProtocol.IChatContentProgressDto, commandsConverter: CommandsConverter): vscode.ChatResponseMarkdownPart | vscode.ChatResponseFileTreePart | vscode.ChatResponseAnchorPart | vscode.ChatResponseCommandButtonPart | undefined;
 }
@@ -517,7 +522,7 @@ export declare namespace ChatAgentRequest {
     function to(request: IChatAgentRequest, location2: vscode.ChatRequestEditorData | vscode.ChatRequestNotebookData | undefined, model: vscode.LanguageModelChat, diagnostics: readonly [
         vscode.Uri,
         readonly vscode.Diagnostic[]
-    ][], tools: vscode.LanguageModelToolInformation[] | undefined): vscode.ChatRequest;
+    ][], toolSelection: vscode.ChatRequestToolSelection | undefined, tools: Map<string, boolean>, extension: IRelaxedExtensionDescription): vscode.ChatRequest;
 }
 export declare namespace ChatRequestDraft {
     function to(request: IChatRequestDraft): vscode.ChatRequestDraft;
@@ -563,6 +568,9 @@ export declare namespace PartialAcceptInfo {
 export declare namespace PartialAcceptTriggerKind {
     function to(kind: languages.PartialAcceptTriggerKind): types.PartialAcceptTriggerKind;
 }
+export declare namespace InlineCompletionEndOfLifeReason {
+    function to<T>(reason: languages.InlineCompletionEndOfLifeReason<T>, convertFn: (item: T) => vscode.InlineCompletionItem | undefined): vscode.InlineCompletionEndOfLifeReason;
+}
 export declare namespace DebugTreeItem {
     function from(item: vscode.DebugTreeItem, id: number): IDebugVisualizationTreeItem;
 }
@@ -573,6 +581,16 @@ export declare namespace LanguageModelToolResult {
     function to(result: IToolResult): vscode.LanguageModelToolResult;
     function from(result: vscode.ExtendedLanguageModelToolResult, extension: IExtensionDescription): Dto<IToolResult>;
 }
+export declare namespace LanguageModelToolResult2 {
+    function to(result: IToolResult): vscode.LanguageModelToolResult2;
+    function from(result: vscode.ExtendedLanguageModelToolResult, extension: IExtensionDescription): Dto<IToolResult> | SerializableObjectWithBuffers<Dto<IToolResult>>;
+}
 export declare namespace IconPath {
     function fromThemeIcon(iconPath: vscode.ThemeIcon): languages.IconPath;
 }
+export declare namespace AiSettingsSearch {
+    function fromSettingsSearchResult(result: vscode.SettingsSearchResult): AiSettingsSearchResult;
+}
+export declare namespace McpServerDefinition {
+    function from(item: vscode.McpServerDefinition): McpServerLaunch.Serialized;
+}

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

@@ -20,21 +20,25 @@ import { generateUuid } from '../../../base/common/uuid.js';
 import { RenderLineNumbersType } from '../../../editor/common/config/editorOptions.js';
 import { Range as Range$2 } from '../../../editor/common/core/range.js';
 import { StandardTokenType } from '../../../editor/common/encodedTokenAttributes.js';
-import { SymbolKind as SymbolKind$1, SymbolTag as SymbolTag$2, CompletionTriggerKind as CompletionTriggerKind$2, CompletionItemTag as CompletionItemTag$2, CompletionItemKind as CompletionItemKind$2, CompletionItemInsertTextRule, Command, FoldingRangeKind as FoldingRangeKind$2, CodeActionTriggerType, PartialAcceptTriggerKind as PartialAcceptTriggerKind$2 } from '../../../editor/common/languages.js';
+import { SymbolKind as SymbolKind$1, SymbolTag as SymbolTag$2, CompletionTriggerKind as CompletionTriggerKind$2, CompletionItemTag as CompletionItemTag$2, CompletionItemKind as CompletionItemKind$2, CompletionItemInsertTextRule, Command, FoldingRangeKind as FoldingRangeKind$2, CodeActionTriggerType, PartialAcceptTriggerKind as PartialAcceptTriggerKind$2, InlineCompletionEndOfLifeReasonKind } from '../../../editor/common/languages.js';
 import { TrackedRangeStickiness, EndOfLineSequence } from '../../../editor/common/model.js';
 import { MarkerTag, MarkerSeverity } from '../../../platform/markers/common/markers.js';
 import { ProgressLocation as ProgressLocation$2 } from '../../../platform/progress/common/progress.js';
 import { SaveReason, DEFAULT_EDITOR_ASSOCIATION } from '../../common/editor.js';
+import { isImageVariableEntry } from '../../contrib/chat/common/chatModel.js';
 import { ChatMessageRole } from '../../contrib/chat/common/languageModels.js';
 import { DebugTreeItemCollapsibleState } from '../../contrib/debug/common/debug.js';
 import { CellEditType, NotebookCellExecutionState as NotebookCellExecutionState$1, CellKind, CellStatusbarAlignment } from '../../contrib/notebook/common/notebookCommon.js';
 import { TestId } from '../../contrib/testing/common/testId.js';
 import { TestMessageType, namespaceTestTag, denamespaceTestTag, TestRunProfileBitset, DetailType } from '../../contrib/testing/common/testTypes.js';
 import { SIDE_GROUP, ACTIVE_GROUP } from '../../services/editor/common/editorService.js';
-import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
+import { isProposedApiEnabled, checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
+import { SerializableObjectWithBuffers } from '../../services/extensions/common/proxyIdentifier.js';
 import { getPrivateApiFor } from './extHostTestingPrivateApi.js';
-import { Position as Position$1, Selection as Selection$1, Range as Range$1, Location as Location$1, StandardTokenType as StandardTokenType$1, DiagnosticTag as DiagnosticTag$1, Diagnostic as Diagnostic$1, DiagnosticRelatedInformation as DiagnosticRelatedInformation$1, DiagnosticSeverity as DiagnosticSeverity$1, ViewColumn as ViewColumn$1, MarkdownString as MarkdownString$1, DecorationRangeBehavior as DecorationRangeBehavior$1, TextEdit as TextEdit$1, WorkspaceEdit as WorkspaceEdit$1, FileEditType, SnippetTextEdit, SnippetString, SymbolKind as SymbolKind$2, SymbolTag as SymbolTag$1, SymbolInformation, DocumentSymbol as DocumentSymbol$1, CallHierarchyItem as CallHierarchyItem$1, CallHierarchyIncomingCall as CallHierarchyIncomingCall$1, CallHierarchyOutgoingCall as CallHierarchyOutgoingCall$1, VerboseHover, EvaluatableExpression as EvaluatableExpression$1, InlineValueText, InlineValueVariableLookup, InlineValueEvaluatableExpression, InlineValueContext as InlineValueContext$1, DocumentHighlight as DocumentHighlight$1, MultiDocumentHighlight as MultiDocumentHighlight$1, CompletionTriggerKind as CompletionTriggerKind$1, CompletionItemTag as CompletionItemTag$1, CompletionItemKind as CompletionItemKind$1, CompletionItem as CompletionItem$1, InlayHint as InlayHint$1, InlayHintLabelPart as InlayHintLabelPart$1, DocumentLink as DocumentLink$1, ColorPresentation as ColorPresentation$1, Color as Color$1, SelectionRange as SelectionRange$1, TextDocumentSaveReason as TextDocumentSaveReason$1, TextEditorLineNumbersStyle as TextEditorLineNumbersStyle$1, EndOfLine as EndOfLine$1, ProgressLocation as ProgressLocation$1, FoldingRangeKind as FoldingRangeKind$1, RelativePattern, NotebookRange as NotebookRange$1, NotebookCellExecutionState as NotebookCellExecutionState$2, NotebookCellKind as NotebookCellKind$1, NotebookCellData as NotebookCellData$1, NotebookData as NotebookData$1, NotebookCellOutputItem as NotebookCellOutputItem$1, NotebookCellOutput as NotebookCellOutput$1, NotebookCellStatusBarAlignment, NotebookRendererScript as NotebookRendererScript$1, TestMessage as TestMessage$1, TestRunProfileKind as TestRunProfileKind$1, TestTag as TestTag$1, StatementCoverage, BranchCoverage, DeclarationCoverage, validateTestCoverageCount, FileCoverage, CodeActionTriggerKind as CodeActionTriggerKind$1, TypeHierarchyItem as TypeHierarchyItem$1, InternalFileDataTransferItem, DataTransferFile, InternalDataTransferItem, DataTransfer as DataTransfer$1, LanguageModelChatMessageRole as LanguageModelChatMessageRole$1, LanguageModelTextPart, LanguageModelPromptTsxPart, LanguageModelToolResultPart, LanguageModelToolCallPart, LanguageModelChatMessage as LanguageModelChatMessage$1, LanguageModelDataPart, LanguageModelChatMessage2 as LanguageModelChatMessage2$1, ChatResponseMarkdownPart as ChatResponseMarkdownPart$1, ChatResponseCodeblockUriPart as ChatResponseCodeblockUriPart$1, ChatResponseMarkdownWithVulnerabilitiesPart as ChatResponseMarkdownWithVulnerabilitiesPart$1, ChatResponseFileTreePart, ChatResponseAnchorPart as ChatResponseAnchorPart$1, ChatResponseProgressPart as ChatResponseProgressPart$1, ChatResponseWarningPart as ChatResponseWarningPart$1, ChatResponseMovePart as ChatResponseMovePart$1, ChatResponseCommandButtonPart as ChatResponseCommandButtonPart$1, ChatResponseTextEditPart as ChatResponseTextEditPart$1, ChatResponseReferencePart as ChatResponseReferencePart$1, ChatResponseNotebookEditPart as ChatResponseNotebookEditPart$1, ChatResponseConfirmationPart as ChatResponseConfirmationPart$1, ChatResponseCodeCitationPart as ChatResponseCodeCitationPart$1, ChatLocation as ChatLocation$1, ChatReferenceBinaryData, ChatReferenceDiagnostic, LanguageModelToolResult as LanguageModelToolResult$1, ChatEditingSessionActionOutcome, PartialAcceptTriggerKind as PartialAcceptTriggerKind$1 } from './extHostTypes.js';
+import { Position as Position$1, Selection as Selection$1, Range as Range$1, Location as Location$1, StandardTokenType as StandardTokenType$1, DiagnosticTag as DiagnosticTag$1, Diagnostic as Diagnostic$1, DiagnosticRelatedInformation as DiagnosticRelatedInformation$1, DiagnosticSeverity as DiagnosticSeverity$1, ViewColumn as ViewColumn$1, MarkdownString as MarkdownString$1, DecorationRangeBehavior as DecorationRangeBehavior$1, TextEdit as TextEdit$1, WorkspaceEdit as WorkspaceEdit$1, FileEditType, SnippetTextEdit, SnippetString, SymbolKind as SymbolKind$2, SymbolTag as SymbolTag$1, SymbolInformation, DocumentSymbol as DocumentSymbol$1, CallHierarchyItem as CallHierarchyItem$1, CallHierarchyIncomingCall as CallHierarchyIncomingCall$1, CallHierarchyOutgoingCall as CallHierarchyOutgoingCall$1, VerboseHover, EvaluatableExpression as EvaluatableExpression$1, InlineValueText, InlineValueVariableLookup, InlineValueEvaluatableExpression, InlineValueContext as InlineValueContext$1, DocumentHighlight as DocumentHighlight$1, MultiDocumentHighlight as MultiDocumentHighlight$1, CompletionTriggerKind as CompletionTriggerKind$1, CompletionItemTag as CompletionItemTag$1, CompletionItemKind as CompletionItemKind$1, CompletionItem as CompletionItem$1, InlayHint as InlayHint$1, InlayHintLabelPart as InlayHintLabelPart$1, DocumentLink as DocumentLink$1, ColorPresentation as ColorPresentation$1, Color as Color$1, SelectionRange as SelectionRange$1, TextDocumentSaveReason as TextDocumentSaveReason$1, TextEditorLineNumbersStyle as TextEditorLineNumbersStyle$1, EndOfLine as EndOfLine$1, ProgressLocation as ProgressLocation$1, FoldingRangeKind as FoldingRangeKind$1, RelativePattern, NotebookRange as NotebookRange$1, NotebookCellExecutionState as NotebookCellExecutionState$2, NotebookCellKind as NotebookCellKind$1, NotebookCellData as NotebookCellData$1, NotebookData as NotebookData$1, NotebookCellOutputItem as NotebookCellOutputItem$1, NotebookCellOutput as NotebookCellOutput$1, NotebookCellStatusBarAlignment, NotebookRendererScript as NotebookRendererScript$1, TestMessage as TestMessage$1, TestRunProfileKind as TestRunProfileKind$1, TestTag as TestTag$1, StatementCoverage, BranchCoverage, DeclarationCoverage, validateTestCoverageCount, FileCoverage, CodeActionTriggerKind as CodeActionTriggerKind$1, TypeHierarchyItem as TypeHierarchyItem$1, InternalFileDataTransferItem, DataTransferFile, InternalDataTransferItem, DataTransfer as DataTransfer$1, LanguageModelChatMessageRole as LanguageModelChatMessageRole$1, LanguageModelTextPart, LanguageModelPromptTsxPart, LanguageModelToolResultPart, LanguageModelToolCallPart, LanguageModelChatMessage as LanguageModelChatMessage$1, LanguageModelDataPart, LanguageModelToolResultPart2, LanguageModelExtraDataPart, LanguageModelChatMessage2 as LanguageModelChatMessage2$1, ChatResponseMarkdownPart as ChatResponseMarkdownPart$1, ChatResponseCodeblockUriPart as ChatResponseCodeblockUriPart$1, ChatResponseMarkdownWithVulnerabilitiesPart as ChatResponseMarkdownWithVulnerabilitiesPart$1, ChatResponseFileTreePart, ChatResponseAnchorPart as ChatResponseAnchorPart$1, ChatResponseProgressPart as ChatResponseProgressPart$1, ChatResponseWarningPart as ChatResponseWarningPart$1, ChatResponseMovePart as ChatResponseMovePart$1, ChatResponseCommandButtonPart as ChatResponseCommandButtonPart$1, ChatResponseTextEditPart as ChatResponseTextEditPart$1, ChatResponseReferencePart as ChatResponseReferencePart$1, ChatResponseNotebookEditPart as ChatResponseNotebookEditPart$1, ChatResponseConfirmationPart as ChatResponseConfirmationPart$1, ChatResponseCodeCitationPart as ChatResponseCodeCitationPart$1, ChatResponseExtensionsPart as ChatResponseExtensionsPart$1, ChatLocation as ChatLocation$1, ChatReferenceBinaryData, ChatReferenceDiagnostic, LanguageModelToolResult as LanguageModelToolResult$1, ChatEditingSessionActionOutcome, PartialAcceptTriggerKind as PartialAcceptTriggerKind$1, InlineCompletionEndOfLifeReasonKind as InlineCompletionEndOfLifeReasonKind$1, LanguageModelToolResult2 as LanguageModelToolResult2$1, ChatImageMimeType } from './extHostTypes.js';
 import { ChatAgentLocation } from '../../contrib/chat/common/constants.js';
+import { AiSettingsSearchResultKind } from '../../services/aiSettingsSearch/common/aiSettingsSearch.js';
+import { McpServerLaunch, McpServerTransportType } from '../../contrib/mcp/common/mcpTypes.js';
 
 var Selection;
 (function (Selection) {
@@ -2167,7 +2171,7 @@ var LanguageModelChatMessage;
                 }));
                 return new LanguageModelToolResultPart(c.toolCallId, content, c.isError);
             }
-            else if (c.type === 'image_url') {
+            else if (c.type === 'image_url' || c.type === 'extra_data') {
                 return undefined;
             }
             else {
@@ -2255,18 +2259,20 @@ var LanguageModelChatMessage2;
                     if (part.type === 'text') {
                         return new LanguageModelTextPart(part.value);
                     }
+                    else if (part.type === 'data') {
+                        return new LanguageModelDataPart(part.value.data.buffer, part.value.mimeType);
+                    }
                     else {
                         return new LanguageModelPromptTsxPart(part.value);
                     }
                 }));
-                return new LanguageModelToolResultPart(c.toolCallId, content, c.isError);
+                return new LanguageModelToolResultPart2(c.toolCallId, content, c.isError);
             }
             else if (c.type === 'image_url') {
-                const value = {
-                    mimeType: c.value.mimeType,
-                    data: c.value.data.buffer,
-                };
-                return new LanguageModelDataPart(value);
+                return new LanguageModelDataPart(c.value.data.buffer, c.value.mimeType);
+            }
+            else if (c.type === 'extra_data') {
+                return new LanguageModelExtraDataPart(c.kind, c.data);
             }
             else {
                 return new LanguageModelToolCallPart(c.toolCallId, c.name, c.parameters);
@@ -2285,7 +2291,7 @@ var LanguageModelChatMessage2;
             messageContent = [new LanguageModelTextPart(messageContent)];
         }
         const content = ( messageContent.map((c) => {
-            if (c instanceof LanguageModelToolResultPart) {
+            if ((c instanceof LanguageModelToolResultPart2) || (c instanceof LanguageModelToolResultPart)) {
                 return {
                     type: 'tool_result',
                     toolCallId: c.callId,
@@ -2302,6 +2308,15 @@ var LanguageModelChatMessage2;
                                 value: part.value,
                             };
                         }
+                        else if (part instanceof LanguageModelDataPart) {
+                            return {
+                                type: 'data',
+                                value: {
+                                    mimeType: part.mimeType,
+                                    data: VSBuffer.wrap(part.data)
+                                }
+                            };
+                        }
                         else {
                             return undefined;
                         }
@@ -2311,8 +2326,8 @@ var LanguageModelChatMessage2;
             }
             else if (c instanceof LanguageModelDataPart) {
                 const value = {
-                    mimeType: c.value.mimeType,
-                    data: VSBuffer.wrap(c.value.data),
+                    mimeType: c.mimeType,
+                    data: VSBuffer.wrap(c.data),
                 };
                 return {
                     type: 'image_url',
@@ -2333,9 +2348,16 @@ var LanguageModelChatMessage2;
                     value: c.value
                 };
             }
+            else if (c instanceof LanguageModelExtraDataPart) {
+                return {
+                    type: 'extra_data',
+                    kind: c.kind,
+                    data: c.data
+                };
+            }
             else {
                 if (typeof c !== 'string') {
-                    throw ( new Error('Unexpected chat message content type'));
+                    throw ( new Error('Unexpected chat message content type llm 2'));
                 }
                 return {
                     type: 'text',
@@ -2502,6 +2524,16 @@ var ChatResponseWarningPart;
     }
     ChatResponseWarningPart.to = to;
 })(ChatResponseWarningPart || (ChatResponseWarningPart = {}));
+var ChatResponseExtensionsPart;
+(function (ChatResponseExtensionsPart) {
+    function from(part) {
+        return {
+            kind: 'extensions',
+            extensions: part.extensions
+        };
+    }
+    ChatResponseExtensionsPart.from = from;
+})(ChatResponseExtensionsPart || (ChatResponseExtensionsPart = {}));
 var ChatResponseMovePart;
 (function (ChatResponseMovePart) {
     function from(part) {
@@ -2709,6 +2741,9 @@ var ChatResponsePart;
         else if (part instanceof ChatResponseMovePart$1) {
             return ChatResponseMovePart.from(part);
         }
+        else if (part instanceof ChatResponseExtensionsPart$1) {
+            return ChatResponseExtensionsPart.from(part);
+        }
         return {
             kind: 'markdownContent',
             content: MarkdownString.from('')
@@ -2742,10 +2777,11 @@ var ChatResponsePart;
 })(ChatResponsePart || (ChatResponsePart = {}));
 var ChatAgentRequest;
 (function (ChatAgentRequest) {
-    function to(request, location2, model, diagnostics, tools) {
-        const toolReferences = request.variables.variables.filter(v => v.isTool);
-        const variableReferences = request.variables.variables.filter(v => !v.isTool);
-        const requestWithoutId = {
+    function to(request, location2, model, diagnostics, toolSelection, tools, extension) {
+        const toolReferences = request.variables.variables.filter(v => v.kind === 'tool');
+        const variableReferences = request.variables.variables.filter(v => v.kind !== 'tool');
+        const requestWithAllProps = {
+            id: request.requestId,
             prompt: request.message,
             command: request.command,
             attempt: request.attempt ?? 0,
@@ -2758,16 +2794,26 @@ var ChatAgentRequest;
             rejectedConfirmationData: request.rejectedConfirmationData,
             location2,
             toolInvocationToken: ( Object.freeze({ sessionId: request.sessionId })),
+            toolSelection,
             tools,
-            model
+            model,
+            editedFileEvents: request.editedFileEvents,
         };
-        if (request.requestId) {
-            return {
-                ...requestWithoutId,
-                id: request.requestId
-            };
+        if (!isProposedApiEnabled(extension, 'chatParticipantPrivate')) {
+            delete requestWithAllProps.id;
+            delete requestWithAllProps.attempt;
+            delete requestWithAllProps.enableCommandDetection;
+            delete requestWithAllProps.isParticipantDetected;
+            delete requestWithAllProps.location;
+            delete requestWithAllProps.location2;
+            delete requestWithAllProps.editedFileEvents;
         }
-        return requestWithoutId;
+        if (!isProposedApiEnabled(extension, 'chatParticipantAdditions')) {
+            delete requestWithAllProps.acceptedConfirmationData;
+            delete requestWithAllProps.rejectedConfirmationData;
+            delete requestWithAllProps.tools;
+        }
+        return requestWithAllProps;
     }
     ChatAgentRequest.to = to;
 })(ChatAgentRequest || (ChatAgentRequest = {}));
@@ -2789,7 +2835,6 @@ var ChatLocation;
             case ChatAgentLocation.Terminal: return ChatLocation$1.Terminal;
             case ChatAgentLocation.Panel: return ChatLocation$1.Panel;
             case ChatAgentLocation.Editor: return ChatLocation$1.Editor;
-            case ChatAgentLocation.EditingSession: return ChatLocation$1.EditingSession;
         }
     }
     ChatLocation.to = to;
@@ -2799,7 +2844,6 @@ var ChatLocation;
             case ChatLocation$1.Terminal: return ChatAgentLocation.Terminal;
             case ChatLocation$1.Panel: return ChatAgentLocation.Panel;
             case ChatLocation$1.Editor: return ChatAgentLocation.Editor;
-            case ChatLocation$1.EditingSession: return ChatAgentLocation.EditingSession;
         }
     }
     ChatLocation.from = from;
@@ -2817,7 +2861,7 @@ var ChatPromptReference;
         else if (value && typeof value === 'object' && 'uri' in value && 'range' in value && isUriComponents(value.uri)) {
             value = Location.to(revive(value));
         }
-        else if (variable.isImage) {
+        else if (isImageVariableEntry(variable)) {
             const ref = variable.references?.[0]?.reference;
             value = new ChatReferenceBinaryData(variable.mimeType ?? 'image/png', () => Promise.resolve(( new Uint8Array(( Object.values(variable.value))))), ref && URI.isUri(ref) ? ref : undefined);
         }
@@ -3031,6 +3075,28 @@ var PartialAcceptTriggerKind;
     }
     PartialAcceptTriggerKind.to = to;
 })(PartialAcceptTriggerKind || (PartialAcceptTriggerKind = {}));
+var InlineCompletionEndOfLifeReason;
+(function (InlineCompletionEndOfLifeReason) {
+    function to(reason, convertFn) {
+        if (reason.kind === InlineCompletionEndOfLifeReasonKind.Ignored) {
+            const supersededBy = reason.supersededBy ? convertFn(reason.supersededBy) : undefined;
+            return {
+                kind: InlineCompletionEndOfLifeReasonKind$1.Ignored,
+                supersededBy: supersededBy,
+                userTypingDisagreed: reason.userTypingDisagreed,
+            };
+        }
+        else if (reason.kind === InlineCompletionEndOfLifeReasonKind.Accepted) {
+            return {
+                kind: InlineCompletionEndOfLifeReasonKind$1.Accepted,
+            };
+        }
+        return {
+            kind: InlineCompletionEndOfLifeReasonKind$1.Rejected,
+        };
+    }
+    InlineCompletionEndOfLifeReason.to = to;
+})(InlineCompletionEndOfLifeReason || (InlineCompletionEndOfLifeReason = {}));
 var DebugTreeItem;
 (function (DebugTreeItem) {
     function from(item, id) {
@@ -3098,6 +3164,66 @@ var LanguageModelToolResult;
     }
     LanguageModelToolResult.from = from;
 })(LanguageModelToolResult || (LanguageModelToolResult = {}));
+var LanguageModelToolResult2;
+(function (LanguageModelToolResult2) {
+    function to(result) {
+        return new LanguageModelToolResult2$1(( result.content.map(item => {
+            if (item.kind === 'text') {
+                return new LanguageModelTextPart(item.value);
+            }
+            else if (item.kind === 'data') {
+                const mimeType = ( Object.values(ChatImageMimeType)).includes(item.value.mimeType) ? item.value.mimeType : undefined;
+                if (!mimeType) {
+                    throw ( new Error('Invalid MIME type'));
+                }
+                return new LanguageModelDataPart(item.value.data.buffer, mimeType);
+            }
+            else {
+                return new LanguageModelPromptTsxPart(item.value);
+            }
+        })));
+    }
+    LanguageModelToolResult2.to = to;
+    function from(result, extension) {
+        if (result.toolResultMessage) {
+            checkProposedApiEnabled(extension, 'chatParticipantPrivate');
+        }
+        let hasBuffers = false;
+        const dto = {
+            content: ( result.content.map(item => {
+                if (item instanceof LanguageModelTextPart) {
+                    return {
+                        kind: 'text',
+                        value: item.value
+                    };
+                }
+                else if (item instanceof LanguageModelPromptTsxPart) {
+                    return {
+                        kind: 'promptTsx',
+                        value: item.value,
+                    };
+                }
+                else if (item instanceof LanguageModelDataPart) {
+                    hasBuffers = true;
+                    return {
+                        kind: 'data',
+                        value: {
+                            mimeType: item.mimeType,
+                            data: VSBuffer.wrap(item.data)
+                        }
+                    };
+                }
+                else {
+                    throw ( new Error('Unknown LanguageModelToolResult part type'));
+                }
+            })),
+            toolResultMessage: MarkdownString.fromStrict(result.toolResultMessage),
+            toolResultDetails: result.toolResultDetails?.map(detail => URI.isUri(detail) ? detail : Location.from(detail)),
+        };
+        return hasBuffers ? ( new SerializableObjectWithBuffers(dto)) : dto;
+    }
+    LanguageModelToolResult2.from = from;
+})(LanguageModelToolResult2 || (LanguageModelToolResult2 = {}));
 var IconPath;
 (function (IconPath) {
     function fromThemeIcon(iconPath) {
@@ -3105,5 +3231,51 @@ var IconPath;
     }
     IconPath.fromThemeIcon = fromThemeIcon;
 })(IconPath || (IconPath = {}));
+var AiSettingsSearch;
+(function (AiSettingsSearch) {
+    function fromSettingsSearchResult(result) {
+        return {
+            query: result.query,
+            kind: fromSettingsSearchResultKind(result.kind),
+            settings: result.settings
+        };
+    }
+    AiSettingsSearch.fromSettingsSearchResult = fromSettingsSearchResult;
+    function fromSettingsSearchResultKind(kind) {
+        switch (kind) {
+            case AiSettingsSearchResultKind.EMBEDDED:
+                return AiSettingsSearchResultKind.EMBEDDED;
+            case AiSettingsSearchResultKind.LLM_RANKED:
+                return AiSettingsSearchResultKind.LLM_RANKED;
+            case AiSettingsSearchResultKind.CANCELED:
+                return AiSettingsSearchResultKind.CANCELED;
+            default:
+                throw ( new Error('Unknown AiSettingsSearchResultKind'));
+        }
+    }
+})(AiSettingsSearch || (AiSettingsSearch = {}));
+var McpServerDefinition;
+(function (McpServerDefinition) {
+    function isHttpConfig(candidate) {
+        return !!candidate.uri;
+    }
+    function from(item) {
+        return McpServerLaunch.toSerialized(isHttpConfig(item)
+            ? {
+                type: McpServerTransportType.HTTP,
+                uri: item.uri,
+                headers: Object.entries(item.headers),
+            }
+            : {
+                type: McpServerTransportType.Stdio,
+                cwd: item.cwd,
+                args: item.args,
+                command: item.command,
+                env: item.env,
+                envFile: undefined,
+            });
+    }
+    McpServerDefinition.from = from;
+})(McpServerDefinition || (McpServerDefinition = {}));
 
-export { CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, ChatAgentCompletionItem, ChatAgentRequest, ChatAgentResult, ChatAgentUserActionEvent, ChatFollowup, ChatLanguageModelToolReference, ChatLocation, ChatPromptReference, ChatRequestDraft, ChatResponseAnchorPart, ChatResponseCodeCitationPart, ChatResponseCodeblockUriPart, ChatResponseCommandButtonPart, ChatResponseConfirmationPart, ChatResponseFilesPart, ChatResponseMarkdownPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseMovePart, ChatResponseNotebookEditPart, ChatResponsePart, ChatResponseProgressPart, ChatResponseReferencePart, ChatResponseTextEditPart, ChatResponseWarningPart, ChatTask, ChatTaskResult, CodeActionTriggerKind, Color, ColorPresentation, CompletionContext, CompletionItem, CompletionItemKind, CompletionItemTag, CompletionTriggerKind, DataTransfer, DataTransferItem, DebugTreeItem, DecorationRangeBehavior, DecorationRenderOptions, DefinitionLink, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, DocumentHighlight, DocumentLink, DocumentSelector, DocumentSymbol, EndOfLine, EvaluatableExpression, FoldingRange, FoldingRangeKind, GlobPattern, Hover, IconPath, InlayHint, InlayHintKind, InlayHintLabelPart, InlineValue, InlineValueContext, LanguageModelChatMessage, LanguageModelChatMessage2, LanguageModelChatMessageRole, LanguageModelToolDescription, LanguageModelToolResult, LanguageSelector, Location, MarkdownString, MultiDocumentHighlight, NotebookCellData, NotebookCellExecutionState, NotebookCellExecutionSummary, NotebookCellKind, NotebookCellOutput, NotebookCellOutputItem, NotebookData, NotebookDocumentContentOptions, NotebookEdit, NotebookExclusiveDocumentPattern, NotebookKernelSourceAction, NotebookRange, NotebookRendererScript, NotebookStatusBarItem, ParameterInformation, PartialAcceptInfo, PartialAcceptTriggerKind, Position, ProgressLocation, Range, Selection, SelectionRange, SignatureHelp, SignatureInformation, SymbolKind, SymbolTag, TerminalCompletionItemDto, TerminalCompletionList, TerminalQuickFix, TerminalResourceRequestConfig, TestCoverage, TestItem, TestMessage, TestResults, TestRunProfile, TestRunProfileKind, TestTag, TextDocumentSaveReason, TextEdit, TextEditorLineNumbersStyle, TextEditorOpenOptions, ThemableDecorationAttachmentRenderOptions, ThemableDecorationRenderOptions, TokenType, TypeHierarchyItem, ViewBadge, ViewColumn, WorkspaceEdit, WorkspaceSymbol, fromRangeOrRangeWithMessage, isDecorationOptionsArr, location, pathOrURIToURI };
+export { AiSettingsSearch, CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, ChatAgentCompletionItem, ChatAgentRequest, ChatAgentResult, ChatAgentUserActionEvent, ChatFollowup, ChatLanguageModelToolReference, ChatLocation, ChatPromptReference, ChatRequestDraft, ChatResponseAnchorPart, ChatResponseCodeCitationPart, ChatResponseCodeblockUriPart, ChatResponseCommandButtonPart, ChatResponseConfirmationPart, ChatResponseExtensionsPart, ChatResponseFilesPart, ChatResponseMarkdownPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseMovePart, ChatResponseNotebookEditPart, ChatResponsePart, ChatResponseProgressPart, ChatResponseReferencePart, ChatResponseTextEditPart, ChatResponseWarningPart, ChatTask, ChatTaskResult, CodeActionTriggerKind, Color, ColorPresentation, CompletionContext, CompletionItem, CompletionItemKind, CompletionItemTag, CompletionTriggerKind, DataTransfer, DataTransferItem, DebugTreeItem, DecorationRangeBehavior, DecorationRenderOptions, DefinitionLink, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, DocumentHighlight, DocumentLink, DocumentSelector, DocumentSymbol, EndOfLine, EvaluatableExpression, FoldingRange, FoldingRangeKind, GlobPattern, Hover, IconPath, InlayHint, InlayHintKind, InlayHintLabelPart, InlineCompletionEndOfLifeReason, InlineValue, InlineValueContext, LanguageModelChatMessage, LanguageModelChatMessage2, LanguageModelChatMessageRole, LanguageModelToolDescription, LanguageModelToolResult, LanguageModelToolResult2, LanguageSelector, Location, MarkdownString, McpServerDefinition, MultiDocumentHighlight, NotebookCellData, NotebookCellExecutionState, NotebookCellExecutionSummary, NotebookCellKind, NotebookCellOutput, NotebookCellOutputItem, NotebookData, NotebookDocumentContentOptions, NotebookEdit, NotebookExclusiveDocumentPattern, NotebookKernelSourceAction, NotebookRange, NotebookRendererScript, NotebookStatusBarItem, ParameterInformation, PartialAcceptInfo, PartialAcceptTriggerKind, Position, ProgressLocation, Range, Selection, SelectionRange, SignatureHelp, SignatureInformation, SymbolKind, SymbolTag, TerminalCompletionItemDto, TerminalCompletionList, TerminalQuickFix, TerminalResourceRequestConfig, TestCoverage, TestItem, TestMessage, TestResults, TestRunProfile, TestRunProfileKind, TestTag, TextDocumentSaveReason, TextEdit, TextEditorLineNumbersStyle, TextEditorOpenOptions, ThemableDecorationAttachmentRenderOptions, ThemableDecorationRenderOptions, TokenType, TypeHierarchyItem, ViewBadge, ViewColumn, WorkspaceEdit, WorkspaceSymbol, fromRangeOrRangeWithMessage, isDecorationOptionsArr, location, pathOrURIToURI };