@codingame/monaco-vscode-api 15.0.3 → 16.0.0

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

@@ -3,21 +3,24 @@ import { CancellationToken } from "../../../base/common/cancellation.js";
 import { Disposable } from "../../../base/common/lifecycle.js";
 import { IExtensionDescription } from "../../../platform/extensions/common/extensions.js";
 import { ILogService } from "../../../platform/log/common/log.service.js";
-import { ChatAgentLocation, IChatAgentRequest, IChatAgentResult, IChatWelcomeMessageContent } from "../../contrib/chat/common/chatAgents.js";
+import { IChatAgentRequest, IChatAgentResult } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatAgents";
+import { IChatRelatedFile, IChatRequestDraft } from "../../contrib/chat/common/chatEditingService.js";
 import { IChatFollowup, IChatUserActionEvent, IChatVoteAction } from "../../contrib/chat/common/chatService.js";
+import { ChatAgentLocation } from "../../contrib/chat/common/constants.js";
 import { Dto } from "../../services/extensions/common/proxyIdentifier.js";
 import { ExtHostChatAgentsShape2, IChatAgentCompletionItem, IChatAgentHistoryEntryDto, IMainContext } from "./extHost.protocol.js";
 import { ExtHostCommands } from "./extHostCommands.js";
+import { ExtHostDiagnostics } from "./extHostDiagnostics.js";
 import { ExtHostDocuments } from "./extHostDocuments.js";
 import { ExtHostLanguageModels } from "./extHostLanguageModels.js";
-import { IChatRelatedFile, IChatRequestDraft } from "../../contrib/chat/common/chatEditingService.js";
-import { ExtHostDiagnostics } from "./extHostDiagnostics.js";
+import { ExtHostLanguageModelTools } from "./extHostLanguageModelTools.js";
 export declare class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsShape2 {
     private readonly _logService;
     private readonly _commands;
     private readonly _documents;
     private readonly _languageModels;
     private readonly _diagnostics;
+    private readonly _tools;
     private static _idPool;
     private readonly _agents;
     private readonly _proxy;
@@ -28,7 +31,9 @@ export declare class ExtHostChatAgents2 extends Disposable implements ExtHostCha
     private readonly _sessionDisposables;
     private readonly _completionDisposables;
     private readonly _inFlightRequests;
-    constructor(mainContext: IMainContext, _logService: ILogService, _commands: ExtHostCommands, _documents: ExtHostDocuments, _languageModels: ExtHostLanguageModels, _diagnostics: ExtHostDiagnostics);
+    private readonly _onDidDisposeChatSession;
+    readonly onDidDisposeChatSession: import("../../../base/common/event.js").Event<string>;
+    constructor(mainContext: IMainContext, _logService: ILogService, _commands: ExtHostCommands, _documents: ExtHostDocuments, _languageModels: ExtHostLanguageModels, _diagnostics: ExtHostDiagnostics, _tools: ExtHostLanguageModelTools);
     transferActiveChat(newWorkspace: vscode.Uri): void;
     createChatAgent(extension: IExtensionDescription, id: string, handler: vscode.ChatExtendedRequestHandler): vscode.ChatParticipant;
     createDynamicChatAgent(extension: IExtensionDescription, id: string, dynamicProps: vscode.DynamicChatParticipantProps, handler: vscode.ChatExtendedRequestHandler): vscode.ChatParticipant;
@@ -48,6 +53,7 @@ export declare class ExtHostChatAgents2 extends Disposable implements ExtHostCha
         history: IChatAgentHistoryEntryDto[];
     }, token: CancellationToken): Promise<IChatAgentResult | undefined>;
     private getDiagnosticsWhenEnabled;
+    private getToolsForRequest;
     private prepareHistoryTurns;
     $releaseSession(sessionId: string): void;
     $provideFollowups(requestDto: Dto<IChatAgentRequest>, handle: number, result: IChatAgentResult, context: {
@@ -56,7 +62,6 @@ export declare class ExtHostChatAgents2 extends Disposable implements ExtHostCha
     $acceptFeedback(handle: number, result: IChatAgentResult, voteAction: IChatVoteAction): void;
     $acceptAction(handle: number, result: IChatAgentResult, event: IChatUserActionEvent): void;
     $invokeCompletionProvider(handle: number, query: string, token: CancellationToken): Promise<IChatAgentCompletionItem[]>;
-    $provideWelcomeMessage(handle: number, token: CancellationToken): Promise<IChatWelcomeMessageContent | undefined>;
     $provideChatTitle(handle: number, context: IChatAgentHistoryEntryDto[], token: CancellationToken): Promise<string | undefined>;
     $provideSampleQuestions(handle: number, location: ChatAgentLocation, token: CancellationToken): Promise<IChatFollowup[] | undefined>;
 }

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

@@ -1,5 +1,5 @@
 
-import { coalesce } from '../../../base/common/arrays.js';
+import { isNonEmptyArray, coalesce } from '../../../base/common/arrays.js';
 import { raceCancellation } from '../../../base/common/async.js';
 import { CancellationTokenSource } from '../../../base/common/cancellation.js';
 import { toErrorMessage } from '../../../base/common/errorMessage.js';
@@ -8,18 +8,17 @@ import { Iterable } from '../../../base/common/iterator.js';
 import { toDisposable, Disposable, DisposableMap, DisposableStore } from '../../../base/common/lifecycle.js';
 import { revive } from '../../../base/common/marshalling.js';
 import { StopWatch } from '../../../base/common/stopwatch.js';
-import { ThemeIcon } from '../../../base/common/themables.js';
 import { assertType } from '../../../base/common/types.js';
 import { URI } from '../../../base/common/uri.js';
 import { generateUuid } from '../../../base/common/uuid.js';
 import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
-import { ChatAgentLocation } from '../../contrib/chat/common/chatAgents.js';
+import { isChatViewTitleActionContext } from '../../contrib/chat/common/chatActions.js';
 import { ChatAgentVoteDirection } from '../../contrib/chat/common/chatService.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, ChatResponseAnchorPart as ChatResponseAnchorPart$1, ChatResponsePart, ChatResponseConfirmationPart as ChatResponseConfirmationPart$1, ChatResponseNotebookEditPart as ChatResponseNotebookEditPart$1, ChatResponseTextEditPart as ChatResponseTextEditPart$1, ChatResponseCodeCitationPart as ChatResponseCodeCitationPart$1, ChatResponseCommandButtonPart as ChatResponseCommandButtonPart$1, ChatResponseFilesPart, ChatResponseCodeblockUriPart as ChatResponseCodeblockUriPart$1, ChatResponseMarkdownWithVulnerabilitiesPart as ChatResponseMarkdownWithVulnerabilitiesPart$1, ChatResponseMarkdownPart as ChatResponseMarkdownPart$1, ChatRequestDraft, ChatAgentRequest, ChatLocation, Selection, Range, ChatAgentResult, ChatPromptReference, ChatLanguageModelToolReference, ChatFollowup, ChatAgentUserActionEvent, ChatAgentCompletionItem, MarkdownString as MarkdownString$1 } from './extHostTypeConverters.js';
-import { MarkdownString, ChatResponseTextEditPart, ChatResponseNotebookEditPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseWarningPart as ChatResponseWarningPart$1, ChatResponseConfirmationPart, ChatResponseCodeCitationPart, ChatResponseMovePart, ChatResponseProgressPart2, ChatResponseReferencePart as ChatResponseReferencePart$1, ChatResponseAnchorPart, ChatResponseCommandButtonPart, ChatResponseFileTreePart, ChatResponseCodeblockUriPart, ChatResponseMarkdownPart, ChatRequestEditorData, ChatRequestNotebookData, LanguageModelError, ChatRequestTurn, ChatResponseTurn, ChatResultFeedbackKind, ThemeIcon as ThemeIcon$1 } from './extHostTypes.js';
-import { isChatViewTitleActionContext } from '../../contrib/chat/common/chatActions.js';
+import { MarkdownString, ChatResponseTextEditPart, ChatResponseNotebookEditPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseWarningPart as ChatResponseWarningPart$1, ChatResponseConfirmationPart, ChatResponseCodeCitationPart, ChatResponseMovePart, ChatResponseProgressPart2, ChatResponseReferencePart as ChatResponseReferencePart$1, ChatResponseAnchorPart, ChatResponseCommandButtonPart, ChatResponseFileTreePart, ChatResponseCodeblockUriPart, ChatResponseMarkdownPart, ChatRequestEditorData, ChatRequestNotebookData, LanguageModelError, ChatRequestTurn, ChatResponseTurn, ChatResultFeedbackKind, ThemeIcon } from './extHostTypes.js';
 
 class ChatAgentResponseStream {
     constructor(_extension, _request, _proxy, _commandsConverter, _sessionDisposables) {
@@ -99,10 +98,10 @@ class ChatAgentResponseStream {
                     _report(dto);
                     return this;
                 },
-                codeblockUri(value) {
+                codeblockUri(value, isEdit) {
                     throwIfDone(this.codeblockUri);
                     checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
-                    const part = new ChatResponseCodeblockUriPart(value);
+                    const part = new ChatResponseCodeblockUriPart(value, isEdit);
                     const dto = ChatResponseCodeblockUriPart$1.from(part);
                     _report(dto);
                     return this;
@@ -256,19 +255,22 @@ class ExtHostChatAgents2 extends Disposable {
     static { this._idPool = 0; }
     static { this._participantDetectionProviderIdPool = 0; }
     static { this._relatedFilesProviderIdPool = 0; }
-    constructor(mainContext, _logService, _commands, _documents, _languageModels, _diagnostics) {
+    constructor(mainContext, _logService, _commands, _documents, _languageModels, _diagnostics, _tools) {
         super();
         this._logService = _logService;
         this._commands = _commands;
         this._documents = _documents;
         this._languageModels = _languageModels;
         this._diagnostics = _diagnostics;
+        this._tools = _tools;
         this._agents = ( new Map());
         this._participantDetectionProviders = ( new Map());
         this._relatedFilesProviders = ( new Map());
         this._sessionDisposables = this._register(( new DisposableMap()));
         this._completionDisposables = this._register(( new DisposableMap()));
         this._inFlightRequests = ( new Set());
+        this._onDidDisposeChatSession = this._register(( new Emitter()));
+        this.onDidDisposeChatSession = this._onDidDisposeChatSession.event;
         this._proxy = ( mainContext.getProxy(MainContext.MainThreadChatAgents2));
         _commands.registerArgumentProcessor({
             processArgument: (arg) => {
@@ -329,7 +331,8 @@ class ExtHostChatAgents2 extends Disposable {
         }
         const { request, location, history } = await this._createRequest(requestDto, context, detector.extension);
         const model = await this.getModelForRequest(request, detector.extension);
-        const extRequest = ChatAgentRequest.to(request, location, model, isProposedApiEnabled(detector.extension, 'chatReadonlyPromptReference'), this.getDiagnosticsWhenEnabled(detector.extension));
+        const includeInteractionId = isProposedApiEnabled(detector.extension, 'chatParticipantPrivate');
+        const extRequest = ChatAgentRequest.to(includeInteractionId ? request : { ...request, requestId: '' }, location, model, this.getDiagnosticsWhenEnabled(detector.extension), this.getToolsForRequest(detector.extension, request));
         return detector.provider.provideParticipantDetection(extRequest, { history }, { participants: options.participants, location: ChatLocation.to(options.location) }, token);
     }
     async _createRequest(requestDto, context, extension) {
@@ -395,7 +398,8 @@ class ExtHostChatAgents2 extends Disposable {
                 sessionDisposables
             ));
             const model = await this.getModelForRequest(request, agent.extension);
-            const extRequest = ChatAgentRequest.to(request, location, model, isProposedApiEnabled(agent.extension, 'chatReadonlyPromptReference'), this.getDiagnosticsWhenEnabled(agent.extension));
+            const includeInteractionId = isProposedApiEnabled(agent.extension, 'chatParticipantPrivate');
+            const extRequest = ChatAgentRequest.to(includeInteractionId ? request : { ...request, requestId: '' }, location, model, this.getDiagnosticsWhenEnabled(agent.extension), this.getToolsForRequest(agent.extension, request));
             inFlightRequest = { requestId: requestDto.requestId, extRequest };
             this._inFlightRequests.add(inFlightRequest);
             const task = agent.invoke(extRequest, { history }, stream.apiObject, token);
@@ -444,6 +448,13 @@ class ExtHostChatAgents2 extends Disposable {
         }
         return this._diagnostics.getDiagnostics();
     }
+    getToolsForRequest(extension, request) {
+        if (!isNonEmptyArray(request.userSelectedTools)) {
+            return undefined;
+        }
+        const selector = ( new Set(request.userSelectedTools));
+        return this._tools.getTools(extension).filter(candidate => ( selector.has(candidate.name)));
+    }
     async prepareHistoryTurns(extension, agentId, context) {
         const res = [];
         for (const h of context.history) {
@@ -451,11 +462,10 @@ class ExtHostChatAgents2 extends Disposable {
             const result = agentId === h.request.agentId ?
                 ehResult :
                 { ...ehResult, metadata: undefined };
-            const hasReadonlyProposal = isProposedApiEnabled(extension, 'chatReadonlyPromptReference');
             const varsWithoutTools = ( h.request.variables.variables
                 .filter(v => !v.isTool)
                 .map(
-                v => ChatPromptReference.to(v, hasReadonlyProposal, this.getDiagnosticsWhenEnabled(extension))
+                v => ChatPromptReference.to(v, this.getDiagnosticsWhenEnabled(extension))
             ));
             const toolReferences = ( h.request.variables.variables
                 .filter(v => v.isTool)
@@ -469,6 +479,7 @@ class ExtHostChatAgents2 extends Disposable {
     }
     $releaseSession(sessionId) {
         this._sessionDisposables.deleteAndDispose(sessionId);
+        this._onDidDisposeChatSession.fire(sessionId);
     }
     async $provideFollowups(requestDto, handle, result, context, token) {
         const agent = this._agents.get(handle);
@@ -541,13 +552,6 @@ class ExtHostChatAgents2 extends Disposable {
             (i) => ChatAgentCompletionItem.from(i, this._commands.converter, disposables)
         ));
     }
-    async $provideWelcomeMessage(handle, token) {
-        const agent = this._agents.get(handle);
-        if (!agent) {
-            return;
-        }
-        return await agent.provideWelcomeMessage(token);
-    }
     async $provideChatTitle(handle, context, token) {
         const agent = this._agents.get(handle);
         if (!agent) {
@@ -615,21 +619,6 @@ class ExtHostChatAgent {
             .filter(f => !(f && 'commandId' in f))
             .filter(f => !(f && 'message' in f));
     }
-    async provideWelcomeMessage(token) {
-        if (!this._welcomeMessageProvider?.provideWelcomeMessage) {
-            return undefined;
-        }
-        const content = await this._welcomeMessageProvider.provideWelcomeMessage(token);
-        const icon = content?.icon;
-        if (!content || !ThemeIcon.isThemeIcon(icon)) {
-            return undefined;
-        }
-        return {
-            ...content,
-            icon,
-            message: MarkdownString$1.from(content.message),
-        };
-    }
     async provideTitle(context, token) {
         if (!this._titleProvider) {
             return;
@@ -666,14 +655,17 @@ class ExtHostChatAgent {
                     iconDark: !this._iconPath ? undefined :
                         'dark' in this._iconPath ? this._iconPath.dark :
                             undefined,
-                    themeIcon: this._iconPath instanceof ThemeIcon$1 ? this._iconPath : undefined,
+                    themeIcon: this._iconPath instanceof ThemeIcon ? this._iconPath : undefined,
                     hasFollowups: this._followupProvider !== undefined,
-                    isSecondary: this._isSecondary,
                     helpTextPrefix: (!this._helpTextPrefix || typeof this._helpTextPrefix === 'string') ? this._helpTextPrefix : MarkdownString$1.from(this._helpTextPrefix),
                     helpTextVariablesPrefix: (!this._helpTextVariablesPrefix || typeof this._helpTextVariablesPrefix === 'string') ? this._helpTextVariablesPrefix : MarkdownString$1.from(this._helpTextVariablesPrefix),
                     helpTextPostfix: (!this._helpTextPostfix || typeof this._helpTextPostfix === 'string') ? this._helpTextPostfix : MarkdownString$1.from(this._helpTextPostfix),
                     supportIssueReporting: this._supportIssueReporting,
                     requester: this._requester,
+                    welcomeMessageContent: this._welcomeMessageContent && {
+                        ...this._welcomeMessageContent,
+                        message: MarkdownString$1.from(this._welcomeMessageContent.message),
+                    }
                 });
                 updateScheduled = false;
             });
@@ -731,15 +723,6 @@ class ExtHostChatAgent {
                 that._helpTextPostfix = v;
                 updateMetadataSoon();
             },
-            get isSecondary() {
-                checkProposedApiEnabled(that.extension, 'defaultChatParticipant');
-                return that._isSecondary;
-            },
-            set isSecondary(v) {
-                checkProposedApiEnabled(that.extension, 'defaultChatParticipant');
-                that._isSecondary = v;
-                updateMetadataSoon();
-            },
             get supportIssueReporting() {
                 checkProposedApiEnabled(that.extension, 'chatParticipantPrivate');
                 return that._supportIssueReporting;
@@ -778,6 +761,15 @@ class ExtHostChatAgent {
                 checkProposedApiEnabled(that.extension, 'defaultChatParticipant');
                 return that._welcomeMessageProvider;
             },
+            set welcomeMessageContent(v) {
+                checkProposedApiEnabled(that.extension, 'defaultChatParticipant');
+                that._welcomeMessageContent = v;
+                updateMetadataSoon();
+            },
+            get welcomeMessageContent() {
+                checkProposedApiEnabled(that.extension, 'defaultChatParticipant');
+                return that._welcomeMessageContent;
+            },
             set titleProvider(v) {
                 checkProposedApiEnabled(that.extension, 'defaultChatParticipant');
                 that._titleProvider = v;

package/vscode/src/vs/workbench/api/common/extHostChatStatus.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 ExtHostChatStatus {
+    private readonly _proxy;
+    private readonly _items;
+    constructor(mainContext: extHostProtocol.IMainContext);
+    createChatStatusItem(extension: IExtensionDescription, id: string): vscode.ChatStatusItem;
+}

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

@@ -0,0 +1,77 @@
+
+import { MainContext } from './extHost.protocol.js';
+import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
+
+class ExtHostChatStatus {
+    constructor(mainContext) {
+        this._items = ( new Map());
+        this._proxy = ( mainContext.getProxy(MainContext.MainThreadChatStatus));
+    }
+    createChatStatusItem(extension, id) {
+        const internalId = asChatItemIdentifier(extension.identifier, id);
+        if (( this._items.has(internalId))) {
+            throw ( new Error(`Chat status item '${id}' already exists`));
+        }
+        const state = {
+            id: internalId,
+            title: '',
+            description: '',
+            detail: '',
+        };
+        let disposed = false;
+        let visible = false;
+        const syncState = () => {
+            if (disposed) {
+                throw ( new Error('Chat status item is disposed'));
+            }
+            if (!visible) {
+                return;
+            }
+            this._proxy.$setEntry(id, state);
+        };
+        const item = ( Object.freeze({
+            id: id,
+            get title() {
+                return state.title;
+            },
+            set title(value) {
+                state.title = value;
+                syncState();
+            },
+            get description() {
+                return state.description;
+            },
+            set description(value) {
+                state.description = value;
+                syncState();
+            },
+            get detail() {
+                return state.detail;
+            },
+            set detail(value) {
+                state.detail = value;
+                syncState();
+            },
+            show: () => {
+                visible = true;
+                syncState();
+            },
+            hide: () => {
+                visible = false;
+                this._proxy.$disposeEntry(id);
+            },
+            dispose: () => {
+                disposed = true;
+                this._proxy.$disposeEntry(id);
+                this._items.delete(internalId);
+            },
+        }));
+        this._items.set(internalId, item);
+        return item;
+    }
+}
+function asChatItemIdentifier(extension, id) {
+    return `${ExtensionIdentifier.toKey(extension)}.${id}`;
+}
+
+export { ExtHostChatStatus };

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

@@ -407,7 +407,7 @@ let ExtHostDebugServiceBase = class ExtHostDebugServiceBase extends Disposable {
             };
         }
         const variableResolver = await this._variableResolver.getResolver();
-        return variableResolver.resolveAnyAsync(ws, config);
+        return variableResolver.resolveAsync(ws, config);
     }
     createDebugAdapter(adapter, session) {
         if (adapter instanceof DebugAdapterInlineImplementation) {

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

@@ -107,7 +107,7 @@ class DiagnosticCollection {
                     marker.push({
                         severity: MarkerSeverity.Info,
                         message: ( localize(
-                            2497,
+                            2537,
                             "Not showing {0} further errors and warnings.",
                             diagnostics.length - this._maxDiagnosticsPerFile
                         )),

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

@@ -538,12 +538,12 @@ let AbstractExtHostExtensionService = AbstractExtHostExtensionService_1 = class
     async _doHandleExtensionTests() {
         const { extensionDevelopmentLocationURI, extensionTestsLocationURI } = this._initData.environment;
         if (!extensionDevelopmentLocationURI || !extensionTestsLocationURI) {
-            throw ( new Error(( localize(2498, "Cannot load test runner."))));
+            throw ( new Error(( localize(2538, "Cannot load test runner."))));
         }
         const testRunner = await this._loadCommonJSModule(null, extensionTestsLocationURI, ( new ExtensionActivationTimesBuilder(false)));
         if (!testRunner || typeof testRunner.run !== 'function') {
             throw ( new Error(( localize(
-                2499,
+                2539,
                 "Path {0} does not point to a valid extension test runner.",
                 (extensionTestsLocationURI.toString())
             ))));

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

@@ -148,16 +148,16 @@ class FileSystemWatcher {
     }
 }
 class LazyRevivedFileSystemEvents {
+    get created() { return this._created.value; }
+    get changed() { return this._changed.value; }
+    get deleted() { return this._deleted.value; }
     constructor(_events) {
         this._events = _events;
-        this.session = this._events.session;
         this._created = ( new Lazy(() => ( this._events.created.map(URI.revive))));
         this._changed = ( new Lazy(() => ( this._events.changed.map(URI.revive))));
         this._deleted = ( new Lazy(() => ( this._events.deleted.map(URI.revive))));
+        this.session = this._events.session;
     }
-    get created() { return this._created.value; }
-    get changed() { return this._changed.value; }
-    get deleted() { return this._deleted.value; }
 }
 class ExtHostFileSystemEventService {
     constructor(_mainContext, _logService, _extHostDocumentsAndEditors) {

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

@@ -541,7 +541,7 @@ class DocumentPasteEditProvider {
         return (edits.map((edit, i) => ({
             _cacheId: [cacheId, i],
             title: edit.title ?? ( localize(
-                2500,
+                2540,
                 "Paste using '{0}' extension",
                 this._extension.displayName || this._extension.name
             )),
@@ -1804,7 +1804,7 @@ class DocumentDropEditAdapter {
         return (editsArray.map((edit, i) => ({
             _cacheId: [cacheId, i],
             title: edit.title ?? ( localize(
-                2501,
+                2541,
                 "Drop using '{0}' extension",
                 this._extension.displayName || this._extension.name
             )),

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

@@ -5,18 +5,21 @@ import { IExtensionDescription } from "../../../platform/extensions/common/exten
 import { IPreparedToolInvocation, IToolInvocation, IToolResult } from "../../contrib/chat/common/languageModelToolsService.js";
 import { ExtHostLanguageModelToolsShape, IMainContext, IToolDataDto } from "./extHost.protocol.js";
 import { Dto } from "../../services/extensions/common/proxyIdentifier.js";
+import { ExtHostLanguageModels } from "./extHostLanguageModels.js";
 export declare class ExtHostLanguageModelTools implements ExtHostLanguageModelToolsShape {
+    private readonly _languageModels;
     private readonly _registeredTools;
     private readonly _proxy;
     private readonly _tokenCountFuncs;
     private readonly _allTools;
     private readonly _toolInputProcessors;
-    constructor(mainContext: IMainContext);
+    constructor(mainContext: IMainContext, _languageModels: ExtHostLanguageModels);
     $countTokensForInvocation(callId: string, input: string, token: CancellationToken): Promise<number>;
     invokeTool(extension: IExtensionDescription, toolId: string, options: vscode.LanguageModelToolInvocationOptions<any>, token?: CancellationToken): Promise<vscode.LanguageModelToolResult>;
     $onDidChangeTools(tools: IToolDataDto[]): void;
     getTools(extension: IExtensionDescription): vscode.LanguageModelToolInformation[];
     $invokeTool(dto: IToolInvocation, token: CancellationToken): Promise<Dto<IToolResult>>;
+    private getModel;
     $prepareToolInvocation(toolId: string, input: any, token: CancellationToken): Promise<IPreparedToolInvocation | undefined>;
     registerTool(extension: IExtensionDescription, id: string, tool: vscode.LanguageModelTool<any>): IDisposable;
 }

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

@@ -9,10 +9,12 @@ import { isToolInvocationContext } from '../../contrib/chat/common/languageModel
 import { isProposedApiEnabled, checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 import { MainContext } from './extHost.protocol.js';
 import { LanguageModelToolResult, LanguageModelToolDescription, MarkdownString } from './extHostTypeConverters.js';
+import { InternalFetchWebPageToolId } from '../../contrib/chat/common/tools/tools.js';
 import { EditToolData, EditToolInputProcessor, InternalEditToolId, ExtensionEditToolId } from '../../contrib/chat/common/tools/editFileTool.js';
 
 class ExtHostLanguageModelTools {
-    constructor(mainContext) {
+    constructor(mainContext, _languageModels) {
+        this._languageModels = _languageModels;
         this._registeredTools = ( new Map());
         this._tokenCountFuncs = ( new Map());
         this._allTools = ( new Map());
@@ -52,6 +54,7 @@ class ExtHostLanguageModelTools {
                 tokenBudget: options.tokenizationOptions?.tokenBudget,
                 context: options.toolInvocationToken,
                 chatRequestId: isProposedApiEnabled(extension, 'chatParticipantPrivate') ? options.chatRequestId : undefined,
+                chatInteractionId: isProposedApiEnabled(extension, 'chatParticipantPrivate') ? options.chatInteractionId : undefined,
             }, token);
             return LanguageModelToolResult.to(revive(result));
         }
@@ -69,10 +72,14 @@ class ExtHostLanguageModelTools {
         return ( Array.from(( this._allTools.values()))
             .map(tool => LanguageModelToolDescription.to(tool)))
             .filter(tool => {
-            if (tool.name === InternalEditToolId || tool.name === ExtensionEditToolId) {
-                return isProposedApiEnabled(extension, 'chatParticipantPrivate');
+            switch (tool.name) {
+                case InternalEditToolId:
+                case ExtensionEditToolId:
+                case InternalFetchWebPageToolId:
+                    return isProposedApiEnabled(extension, 'chatParticipantPrivate');
+                default:
+                    return true;
             }
-            return true;
         });
     }
     async $invokeTool(dto, token) {
@@ -83,10 +90,17 @@ class ExtHostLanguageModelTools {
         const options = {
             input: dto.parameters,
             toolInvocationToken: dto.context,
-            chatRequestId: dto.chatRequestId,
         };
-        if (isProposedApiEnabled(item.extension, 'chatParticipantPrivate') && dto.toolSpecificData?.kind === 'terminal') {
-            options.terminalCommand = dto.toolSpecificData.command;
+        if (isProposedApiEnabled(item.extension, 'chatParticipantPrivate')) {
+            options.chatRequestId = dto.chatRequestId;
+            options.chatInteractionId = dto.chatInteractionId;
+            options.chatSessionId = dto.context?.sessionId;
+            if (dto.toolSpecificData?.kind === 'terminal') {
+                options.terminalCommand = dto.toolSpecificData.command;
+            }
+        }
+        if (isProposedApiEnabled(item.extension, 'chatParticipantAdditions') && dto.modelId) {
+            options.model = await this.getModel(dto.modelId, item.extension);
         }
         if (dto.tokenBudget !== undefined) {
             options.tokenizationOptions = {
@@ -100,6 +114,19 @@ class ExtHostLanguageModelTools {
         }
         return LanguageModelToolResult.from(extensionResult, item.extension);
     }
+    async getModel(modelId, extension) {
+        let model;
+        if (modelId) {
+            model = await this._languageModels.getLanguageModelByIdentifier(extension, modelId);
+        }
+        if (!model) {
+            model = await this._languageModels.getDefaultLanguageModel(extension);
+            if (!model) {
+                throw ( new Error('Language model unavailable'));
+            }
+        }
+        return model;
+    }
     async $prepareToolInvocation(toolId, input, token) {
         const item = this._registeredTools.get(toolId);
         if (!item) {

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

@@ -10,6 +10,7 @@ import { IChatMessage, IChatResponseFragment, ILanguageModelChatMetadata } from
 import { ExtHostLanguageModelsShape } from "./extHost.protocol.js";
 import { IExtHostAuthentication } from "./extHostAuthentication.js";
 import { IExtHostRpcService } from "./extHostRpcService.js";
+import { SerializableObjectWithBuffers } from "../../services/extensions/common/proxyIdentifier.js";
 export interface IExtHostLanguageModels extends ExtHostLanguageModels {
 }
 export declare const IExtHostLanguageModels: import("../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IExtHostLanguageModels>;
@@ -30,7 +31,7 @@ export declare class ExtHostLanguageModels implements ExtHostLanguageModelsShape
     constructor(extHostRpc: IExtHostRpcService, _logService: ILogService, _extHostAuthentication: IExtHostAuthentication);
     dispose(): void;
     registerLanguageModel(extension: IExtensionDescription, identifier: string, provider: vscode.ChatResponseProvider, metadata: vscode.ChatResponseProviderMetadata): IDisposable;
-    $startChatRequest(handle: number, requestId: number, from: ExtensionIdentifier, messages: IChatMessage[], options: vscode.LanguageModelChatRequestOptions, token: CancellationToken): Promise<void>;
+    $startChatRequest(handle: number, requestId: number, from: ExtensionIdentifier, messages: SerializableObjectWithBuffers<IChatMessage[]>, options: vscode.LanguageModelChatRequestOptions, token: CancellationToken): Promise<void>;
     $provideTokenLength(handle: number, value: string, token: CancellationToken): Promise<number>;
     $acceptChatModelMetadata(data: {
         added?: {

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

@@ -17,8 +17,9 @@ import { checkProposedApiEnabled } from '../../services/extensions/common/extens
 import { MainContext } from './extHost.protocol.js';
 import { IExtHostAuthentication } from './extHostAuthentication.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
-import { LanguageModelChatMessage } from './extHostTypeConverters.js';
+import { LanguageModelChatMessage2 } from './extHostTypeConverters.js';
 import { LanguageModelTextPart, LanguageModelToolCallPart, LanguageModelError, LanguageModelChatMessageRole } from './extHostTypes.js';
+import { SerializableObjectWithBuffers } from '../../services/extensions/common/proxyIdentifier.js';
 
 var ExtHostLanguageModels_1;
 const IExtHostLanguageModels = ( createDecorator('IExtHostLanguageModels'));
@@ -178,10 +179,10 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
         let value;
         try {
             if (data.provider.provideLanguageModelResponse2) {
-                value = data.provider.provideLanguageModelResponse2(( messages.map(LanguageModelChatMessage.to)), options, ExtensionIdentifier.toKey(from), progress, token);
+                value = data.provider.provideLanguageModelResponse2(( messages.value.map(LanguageModelChatMessage2.to)), options, ExtensionIdentifier.toKey(from), progress, token);
             }
             else {
-                value = data.provider.provideLanguageModelResponse(( messages.map(LanguageModelChatMessage.to)), options, ExtensionIdentifier.toKey(from), progress, token);
+                value = data.provider.provideLanguageModelResponse(( messages.value.map(LanguageModelChatMessage2.to)), options, ExtensionIdentifier.toKey(from), progress, token);
             }
         }
         catch (err) {
@@ -294,7 +295,7 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
         const res = ( new LanguageModelResponse());
         this._pendingRequest.set(requestId, { languageModelId, res });
         try {
-            await this._proxy.$tryStartChatRequest(from, languageModelId, requestId, internalMessages, options, token);
+            await this._proxy.$tryStartChatRequest(from, languageModelId, requestId, ( new SerializableObjectWithBuffers(internalMessages)), options, token);
         }
         catch (error) {
             this._pendingRequest.delete(requestId);
@@ -308,7 +309,7 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
             if (message.role === LanguageModelChatMessageRole.System) {
                 checkProposedApiEnabled(extension, 'languageModelSystem');
             }
-            internalMessages.push(LanguageModelChatMessage.from(message));
+            internalMessages.push(LanguageModelChatMessage2.from(message));
         }
         return internalMessages;
     }
@@ -343,7 +344,7 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
         }
         try {
             const detail = justification
-                ? ( localize(2502, "Justification: {1}", to.displayName, justification))
+                ? ( localize(2542, "Justification: {1}", to.displayName, justification))
                 : undefined;
             await this._extHostAuthentication.getSession(from, providerId, [], { forceNewSession: { detail } });
             this.$updateModelAccesslist([{ from: from.identifier, to: to.identifier, enabled: true }]);
@@ -380,7 +381,7 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
         if (local) {
             return local.provider.provideTokenCount(value, token);
         }
-        return this._proxy.$countTokens(languageModelId, (typeof value === 'string' ? value : LanguageModelChatMessage.from(value)), token);
+        return this._proxy.$countTokens(languageModelId, (typeof value === 'string' ? value : LanguageModelChatMessage2.from(value)), token);
     }
     $updateModelAccesslist(data) {
         const updated = ( new Array());

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

@@ -8,7 +8,7 @@ import { IExtHostInitDataService } from './extHostInitDataService.js';
 let ExtHostLogService = class ExtHostLogService extends LogService {
     constructor(isWorker, loggerService, initData) {
         const id = initData.remote.isRemote ? 'remoteexthost' : isWorker ? 'workerexthost' : 'exthost';
-        const name = initData.remote.isRemote ? ( localize(2503, "Extension Host (Remote)")) : isWorker ? ( localize(2504, "Extension Host (Worker)")) : ( localize(2505, "Extension Host"));
+        const name = initData.remote.isRemote ? ( localize(2543, "Extension Host (Remote)")) : isWorker ? ( localize(2544, "Extension Host (Worker)")) : ( localize(2545, "Extension Host"));
         super(loggerService.createLogger(id, { name }));
     }
 };