@codingame/monaco-vscode-chat-service-override 13.1.6 → 14.0.0

package/vscode/src/vs/workbench/contrib/chat/common/chatProgressTypes/chatToolInvocation.js

@@ -17,8 +17,10 @@ class ChatToolInvocation {
     get isConfirmed() {
         return this._isConfirmed;
     }
-    constructor(invocationMessage, _confirmationMessages) {
+    constructor(invocationMessage, pastTenseMessage, tooltip, _confirmationMessages) {
         this.invocationMessage = invocationMessage;
+        this.pastTenseMessage = pastTenseMessage;
+        this.tooltip = tooltip;
         this._confirmationMessages = _confirmationMessages;
         this.kind = 'toolInvocation';
         this._isComplete = false;
@@ -31,9 +33,6 @@ class ChatToolInvocation {
         this._confirmDeferred.p.then(confirmed => {
             this._isConfirmed = confirmed;
             this._confirmationMessages = undefined;
-            if (!confirmed) {
-                this._isCompleteDeferred.complete();
-            }
         });
         this._isCompleteDeferred.p.then(() => {
             this._isComplete = true;
@@ -46,6 +45,8 @@ class ChatToolInvocation {
         return {
             kind: 'toolInvocationSerialized',
             invocationMessage: this.invocationMessage,
+            pastTenseMessage: this.pastTenseMessage,
+            tooltip: this.tooltip,
             isConfirmed: this._isConfirmed ?? false,
             isComplete: this._isComplete,
         };

package/vscode/src/vs/workbench/contrib/chat/common/chatServiceImpl.d.ts

@@ -8,11 +8,12 @@ import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
+import { IWorkbenchAssignmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/assignment/common/assignmentService.service";
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
 import { ChatAgentLocation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents";
 import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service";
-import { ChatModel, IChatModel, IChatRequestModel, IChatRequestVariableData, IExportableChatData, ISerializableChatData } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { IParsedChatRequest } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes";
+import { ChatModel, IChatModel, IChatRequestModel, IChatRequestVariableData, IExportableChatData, ISerializableChatData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IParsedChatRequest } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes";
 import { IChatCompleteResponse, IChatDetail, IChatSendRequestData, IChatSendRequestOptions, IChatTransferredSessionData, IChatUserActionEvent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
 import { IChatSlashCommandService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSlashCommands.service";
@@ -28,6 +29,7 @@ export declare class ChatService extends Disposable implements IChatService {
     private readonly chatVariablesService;
     private readonly chatAgentService;
     private readonly configurationService;
+    private readonly experimentService;
     _serviceBrand: undefined;
     private readonly _sessionModels;
     private readonly _pendingRequests;
@@ -44,7 +46,7 @@ export declare class ChatService extends Disposable implements IChatService {
     }>;
     private readonly _sessionFollowupCancelTokens;
     private readonly _chatServiceTelemetry;
-    constructor(storageService: IStorageService, logService: ILogService, extensionService: IExtensionService, instantiationService: IInstantiationService, telemetryService: ITelemetryService, workspaceContextService: IWorkspaceContextService, chatSlashCommandService: IChatSlashCommandService, chatVariablesService: IChatVariablesService, chatAgentService: IChatAgentService, configurationService: IConfigurationService);
+    constructor(storageService: IStorageService, logService: ILogService, extensionService: IExtensionService, instantiationService: IInstantiationService, telemetryService: ITelemetryService, workspaceContextService: IWorkspaceContextService, chatSlashCommandService: IChatSlashCommandService, chatVariablesService: IChatVariablesService, chatAgentService: IChatAgentService, configurationService: IConfigurationService, experimentService: IWorkbenchAssignmentService);
     isEnabled(location: ChatAgentLocation): boolean;
     private saveState;
     private syncEmptyWindowChats;
@@ -68,6 +70,7 @@ export declare class ChatService extends Disposable implements IChatService {
     private parseChatRequest;
     private refreshFollowupsCancellationToken;
     private _sendRequestAsync;
+    private checkAgentAllowed;
     private attachmentKindsForTelemetry;
     private getHistoryEntriesFromModel;
     removeRequest(sessionId: string, requestId: string): Promise<void>;

package/vscode/src/vs/workbench/contrib/chat/common/chatServiceImpl.js

@@ -21,38 +21,47 @@ import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
+import { IWorkbenchAssignmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/assignment/common/assignmentService.service';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { normalizeSerializableChatData, ChatModel, ChatRequestRemovalReason, updateRanges, toChatHistoryContent, ChatRequestModel } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatModel';
-import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, chatSubcommandLeader, chatAgentLeader, ChatRequestSlashCommandPart, getPromptText } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { normalizeSerializableChatData, ChatModel, ChatRequestRemovalReason, updateRanges, toChatHistoryContent, ChatRequestModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, chatSubcommandLeader, chatAgentLeader, ChatRequestSlashCommandPart, getPromptText } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import { ChatRequestParser } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
 import { ChatServiceTelemetry } from './chatServiceTelemetry.js';
 import { IChatSlashCommandService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSlashCommands.service';
 import { IChatVariablesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariables.service';
 import { ChatMessageRole } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels';
+import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
 
 const serializedChatKey = 'interactive.sessions';
 const globalChatKey = 'chat.workspaceTransfer';
 const SESSION_TRANSFER_EXPIRATION_IN_MILLISECONDS = 1000 * 60;
 const maxPersistedSessions = 25;
-class CancellableRequest {
-    constructor(cancellationTokenSource, requestId) {
+let CancellableRequest = class CancellableRequest {
+    constructor(cancellationTokenSource, requestId, toolsService) {
         this.cancellationTokenSource = cancellationTokenSource;
         this.requestId = requestId;
+        this.toolsService = toolsService;
     }
     dispose() {
         this.cancellationTokenSource.dispose();
     }
     cancel() {
+        if (this.requestId) {
+            this.toolsService.cancelToolCallsForRequest(this.requestId);
+        }
         this.cancellationTokenSource.cancel();
     }
-}
+};
+CancellableRequest = ( __decorate([
+    ( __param(2, ILanguageModelToolsService))
+], CancellableRequest));
 let ChatService = class ChatService extends Disposable {
     get transferredSessionData() {
         return this._transferredSessionData;
     }
-    constructor(storageService, logService, extensionService, instantiationService, telemetryService, workspaceContextService, chatSlashCommandService, chatVariablesService, chatAgentService, configurationService) {
+    constructor(storageService, logService, extensionService, instantiationService, telemetryService, workspaceContextService, chatSlashCommandService, chatVariablesService, chatAgentService, configurationService, experimentService) {
         super();
         this.storageService = storageService;
         this.logService = logService;
@@ -64,6 +73,7 @@ let ChatService = class ChatService extends Disposable {
         this.chatVariablesService = chatVariablesService;
         this.chatAgentService = chatAgentService;
         this.configurationService = configurationService;
+        this.experimentService = experimentService;
         this._sessionModels = this._register(( new DisposableMap()));
         this._pendingRequests = this._register(( new DisposableMap()));
         this._deletedChatIds = ( new Set());
@@ -246,7 +256,7 @@ let ChatService = class ChatService extends Disposable {
         const liveSessionItems = ( Array.from(( this._sessionModels.values()))
             .filter(session => !session.isImported && session.initialLocation !== ChatAgentLocation.EditingSession)
             .map(session => {
-            const title = session.title || ( localize(4635, "New Chat"));
+            const title = session.title || ( localize(4757, "New Chat"));
             return {
                 sessionId: session.sessionId,
                 title,
@@ -345,12 +355,16 @@ let ChatService = class ChatService extends Disposable {
             locationData: request.locationData,
             attachedContext: request.attachedContext,
             workingSet: request.workingSet,
+            hasInstructionAttachments: options?.hasInstructionAttachments ?? false,
         };
         await this._sendRequestAsync(model, model.sessionId, request.message, attempt, enableCommandDetection, defaultAgent, location, resendOptions).responseCompletePromise;
     }
     async sendRequest(sessionId, request, options) {
         this.trace('sendRequest', `sessionId: ${sessionId}, message: ${request.substring(0, 20)}${request.length > 20 ? '[...]' : ''}}`);
-        if (!request.trim() && !options?.slashCommand && !options?.agentId) {
+        if (!request.trim() && options?.hasInstructionAttachments) {
+            request = 'Follow these instructions.';
+        }
+        if (!request.trim() && !options?.slashCommand && !options?.agentId && !options?.hasInstructionAttachments) {
             this.trace('sendRequest', 'Rejected empty message');
             return;
         }
@@ -363,6 +377,13 @@ let ChatService = class ChatService extends Disposable {
             this.trace('sendRequest', `Session ${sessionId} already has a pending request`);
             return;
         }
+        const requests = model.getRequests();
+        for (let i = requests.length - 1; i >= 0; i -= 1) {
+            const request = requests[i];
+            if (request.shouldBeRemovedOnSend) {
+                this.removeRequest(sessionId, request.id);
+            }
+        }
         const location = options?.location ?? model.initialLocation;
         const attempt = options?.attempt ?? 0;
         const defaultAgent = this.chatAgentService.getDefaultAgent(location);
@@ -508,6 +529,7 @@ let ChatService = class ChatService extends Disposable {
                     const agent = (detectedAgent ?? agentPart?.agent ?? defaultAgent);
                     const command = detectedCommand ?? agentSlashCommandPart?.command;
                     await this.extensionService.activateByEvent(`onChatParticipant:${agent.id}`);
+                    await this.checkAgentAllowed(agent);
                     const history = this.getHistoryEntriesFromModel(requests, model.sessionId, location, agent.id);
                     const requestProps = await prepareChatAgentRequest(agent, command, enableCommandDetection, request , !!detectedAgent);
                     const pendingRequest = this._pendingRequests.get(sessionId);
@@ -547,7 +569,7 @@ let ChatService = class ChatService extends Disposable {
                 else {
                     if (!rawResult) {
                         this.trace('sendRequest', `Provider returned no response for session ${model.sessionId}`);
-                        rawResult = { errorDetails: { message: ( localize(4636, "Provider returned null response")) } };
+                        rawResult = { errorDetails: { message: ( localize(4758, "Provider returned null response")) } };
                     }
                     const result = rawResult.errorDetails?.responseIsFiltered ? 'filtered' :
                         rawResult.errorDetails && gotProgress ? 'errorWithOutput' :
@@ -618,7 +640,7 @@ let ChatService = class ChatService extends Disposable {
             }
         };
         const rawResponsePromise = sendRequestInternal();
-        this._pendingRequests.set(model.sessionId, ( new CancellableRequest(source)));
+        this._pendingRequests.set(model.sessionId, this.instantiationService.createInstance(CancellableRequest, source, undefined));
         rawResponsePromise.finally(() => {
             this._pendingRequests.deleteAndDispose(model.sessionId);
         });
@@ -627,6 +649,14 @@ let ChatService = class ChatService extends Disposable {
             responseCompletePromise: rawResponsePromise,
         };
     }
+    async checkAgentAllowed(agent) {
+        if (agent.isToolsAgent) {
+            const enabled = await this.experimentService.getTreatment('chatAgentEnabled');
+            if (enabled === false) {
+                throw ( new Error('Agent is currently disabled'));
+            }
+        }
+    }
     attachmentKindsForTelemetry(variableData) {
         return ( variableData.variables.map(v => {
             if (v.kind === 'implicit') {
@@ -807,7 +837,8 @@ ChatService = ( __decorate([
     ( __param(6, IChatSlashCommandService)),
     ( __param(7, IChatVariablesService)),
     ( __param(8, IChatAgentService)),
-    ( __param(9, IConfigurationService))
+    ( __param(9, IConfigurationService)),
+    ( __param(10, IWorkbenchAssignmentService))
 ], ChatService));
 function getCodeBlocks(text) {
     const lines = text.split('\n');

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/contentProviders/textModelContentsProvider.d.ts

@@ -0,0 +1,13 @@
+import { VSBuffer } from "@codingame/monaco-vscode-api/vscode/vs/base/common/buffer";
+import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
+import { PromptContentsProviderBase } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/contentProviders/promptContentsProviderBase";
+import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
+import { ReadableStream } from "@codingame/monaco-vscode-api/vscode/vs/base/common/stream";
+import { IModelContentChangedEvent } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/textModelEvents";
+export declare class TextModelContentsProvider extends PromptContentsProviderBase<IModelContentChangedEvent> {
+    private readonly model;
+    readonly uri: import("@codingame/monaco-vscode-api/vscode/vs/base/common/uri").URI;
+    constructor(model: ITextModel);
+    protected getContentsStream(_event: IModelContentChangedEvent | "full", cancellationToken?: CancellationToken): Promise<ReadableStream<VSBuffer>>;
+    toString(): string;
+}

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/contentProviders/textModelContentsProvider.js

@@ -0,0 +1,49 @@
+
+import { VSBuffer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
+import { CancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
+import { PromptContentsProviderBase } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/contentProviders/promptContentsProviderBase';
+import { newWriteableStream } from '@codingame/monaco-vscode-api/vscode/vs/base/common/stream';
+
+class TextModelContentsProvider extends PromptContentsProviderBase {
+    constructor(model) {
+        super();
+        this.model = model;
+        this.uri = this.model.uri;
+        this._register(this.model.onWillDispose(this.dispose.bind(this)));
+        this._register(this.model.onDidChangeContent(this.onChangeEmitter.fire));
+    }
+    async getContentsStream(_event, cancellationToken) {
+        const stream = newWriteableStream(null);
+        const linesCount = this.model.getLineCount();
+        let i = 1;
+        const interval = setInterval(() => {
+            if (i >= linesCount) {
+                clearInterval(interval);
+                stream.end();
+                stream.destroy();
+            }
+            if (this.model.isDisposed() || cancellationToken?.isCancellationRequested) {
+                clearInterval(interval);
+                stream.error(( new CancellationError()));
+                stream.destroy();
+                return;
+            }
+            try {
+                stream.write(VSBuffer.fromString(this.model.getLineContent(i)));
+                if (i !== linesCount) {
+                    stream.write(VSBuffer.fromString(this.model.getEOL()));
+                }
+            }
+            catch (error) {
+                console.log(this.uri, i, error);
+            }
+            i++;
+        }, 1);
+        return stream;
+    }
+    toString() {
+        return `text-model-prompt-contents-provider:${this.uri.path}`;
+    }
+}
+
+export { TextModelContentsProvider };

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptLinkProvider.d.ts

@@ -0,0 +1,14 @@
+import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
+import { ILinksList, LinkProvider } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
+import { ILanguageFeaturesService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/languageFeatures";
+import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+export declare class PromptLinkProvider extends Disposable implements LinkProvider {
+    private readonly initService;
+    private readonly languageService;
+    private readonly parserProvider;
+    constructor(initService: IInstantiationService, languageService: ILanguageFeaturesService);
+    private createParser;
+    provideLinks(model: ITextModel, token: CancellationToken): Promise<ILinksList>;
+}

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptLinkProvider.js

@@ -0,0 +1,69 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { assert } from '@codingame/monaco-vscode-api/vscode/vs/base/common/assert';
+import { assertDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { NonPromptSnippetFile } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/promptFileReferenceErrors';
+import { ObjectCache } from '../../../../../../base/common/objectCache.js';
+import { CancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
+import { TextModelPromptParser } from '../parsers/textModelPromptParser.js';
+import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
+import { LifecyclePhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle';
+import { PROMPT_SNIPPET_FILE_EXTENSION } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/contentProviders/promptContentsProviderBase';
+import { ILanguageFeaturesService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/languageFeatures';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
+
+const languageSelector = {
+    pattern: `**/*${PROMPT_SNIPPET_FILE_EXTENSION}`,
+};
+let PromptLinkProvider = class PromptLinkProvider extends Disposable {
+    constructor(initService, languageService) {
+        super();
+        this.initService = initService;
+        this.languageService = languageService;
+        this.languageService.linkProvider.register(languageSelector, this);
+        this.parserProvider = this._register(( new ObjectCache(this.createParser.bind(this))));
+    }
+    createParser(model) {
+        const parser = this.initService.createInstance(TextModelPromptParser, model, []);
+        parser.assertNotDisposed('Created prompt parser must not be disposed.');
+        return parser;
+    }
+    async provideLinks(model, token) {
+        assert(!token.isCancellationRequested, ( new CancellationError()));
+        const parser = this.parserProvider.get(model);
+        assert(!parser.disposed, 'Prompt parser must not be disposed.');
+        const { references } = await parser
+            .start()
+            .settled();
+        assert(!token.isCancellationRequested, ( new CancellationError()));
+        const links = ( references
+            .filter((reference) => {
+            const { errorCondition, linkRange } = reference;
+            if (!errorCondition && linkRange) {
+                return true;
+            }
+            return errorCondition instanceof NonPromptSnippetFile;
+        })
+            .map((reference) => {
+            const { linkRange } = reference;
+            assertDefined(linkRange, 'Link range must be defined.');
+            return {
+                range: linkRange,
+                url: reference.uri,
+            };
+        }));
+        return {
+            links,
+        };
+    }
+};
+PromptLinkProvider = ( __decorate([
+    ( __param(0, IInstantiationService)),
+    ( __param(1, ILanguageFeaturesService))
+], PromptLinkProvider));
+( Registry.as(Extensions.Workbench))
+    .registerWorkbenchContribution(PromptLinkProvider, LifecyclePhase.Eventually);
+
+export { PromptLinkProvider };

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/textModelPromptParser.d.ts

@@ -0,0 +1,10 @@
+import { BasePromptParser } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser";
+import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
+import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { TextModelContentsProvider } from "../contentProviders/textModelContentsProvider.js";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+export declare class TextModelPromptParser extends BasePromptParser<TextModelContentsProvider> {
+    constructor(model: ITextModel, seenReferences: string[] | undefined, initService: IInstantiationService, configService: IConfigurationService, logService: ILogService);
+    toString(): string;
+}

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/textModelPromptParser.js

@@ -0,0 +1,24 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { BasePromptParser } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser';
+import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { TextModelContentsProvider } from '../contentProviders/textModelContentsProvider.js';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+
+let TextModelPromptParser = class TextModelPromptParser extends BasePromptParser {
+    constructor(model, seenReferences = [], initService, configService, logService) {
+        const contentsProvider = initService.createInstance(TextModelContentsProvider, model);
+        super(contentsProvider, seenReferences, initService, configService, logService);
+    }
+    toString() {
+        return `text-model-prompt:${this.uri.path}`;
+    }
+};
+TextModelPromptParser = ( __decorate([
+    ( __param(2, IInstantiationService)),
+    ( __param(3, IConfigurationService)),
+    ( __param(4, ILogService))
+], TextModelPromptParser));
+
+export { TextModelPromptParser };

package/vscode/src/vs/workbench/contrib/chat/common/tools/languageModelToolsContribution.js

@@ -1,13 +1,18 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
+import { DisposableMap, Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { joinPath } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
+import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/descriptors';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
-import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
+import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
+import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensionManagement/common/extensionFeatures';
+import { isProposedApiEnabled } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions';
 import { ExtensionsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
+import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
 import { toolsParametersSchemaSchemaId } from './languageModelToolsParametersSchema.js';
 
 const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
@@ -19,7 +24,7 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
     },
     jsonSchema: {
         description: ( localize(
-            4646,
+            4773,
             'Contributes a tool that can be invoked by a language model in a chat session, or from a standalone command. Registered tools can be used by all extensions.'
         )),
         type: 'array',
@@ -45,15 +50,15 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
             properties: {
                 name: {
                     description: ( localize(
-                        4647,
+                        4774,
                         "A unique name for this tool. This name must be a globally unique identifier, and is also used as a name when presenting this tool to a language model."
                     )),
                     type: 'string',
-                    pattern: '^[\\w-]+$'
+                    pattern: '^(?!copilot_|vscode_)[\\w-]+$'
                 },
                 toolReferenceName: {
                     markdownDescription: ( localize(
-                        4648,
+                        4775,
                         "If {0} is enabled for this tool, the user may use '#' with this name to invoke the tool in a query. Otherwise, the name is not required. Name must not contain whitespace.",
                         '`canBeReferencedInPrompt`'
                     )),
@@ -62,32 +67,32 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
                 },
                 displayName: {
                     description: ( localize(
-                        4649,
+                        4776,
                         "A human-readable name for this tool that may be used to describe it in the UI."
                     )),
                     type: 'string'
                 },
                 userDescription: {
-                    description: ( localize(4650, "A description of this tool that may be shown to the user.")),
+                    description: ( localize(4777, "A description of this tool that may be shown to the user.")),
                     type: 'string'
                 },
                 modelDescription: {
                     description: ( localize(
-                        4651,
+                        4778,
                         "A description of this tool that may be used by a language model to select it."
                     )),
                     type: 'string'
                 },
                 inputSchema: {
                     description: ( localize(
-                        4652,
+                        4779,
                         "A JSON schema for the input this tool accepts. The input must be an object at the top level. A particular language model may not support all JSON schema features. See the documentation for the language model family you are using for more information."
                     )),
                     $ref: toolsParametersSchemaSchemaId
                 },
                 canBeReferencedInPrompt: {
                     markdownDescription: ( localize(
-                        4653,
+                        4780,
                         "If true, this tool shows up as an attachment that the user can add manually to their request. Chat participants will receive the tool in {0}.",
                         '`ChatRequest#toolReferences`'
                     )),
@@ -95,7 +100,7 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
                 },
                 icon: {
                     markdownDescription: ( localize(
-                        4654,
+                        4781,
                         "An icon that represents this tool. Either a file path, an object with file paths for dark and light themes, or a theme icon reference, like `$(zap)`"
                     )),
                     anyOf: [{
@@ -105,11 +110,11 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
                             type: 'object',
                             properties: {
                                 light: {
-                                    description: ( localize(4655, 'Icon path when a light theme is used')),
+                                    description: ( localize(4782, 'Icon path when a light theme is used')),
                                     type: 'string'
                                 },
                                 dark: {
-                                    description: ( localize(4656, 'Icon path when a dark theme is used')),
+                                    description: ( localize(4783, 'Icon path when a dark theme is used')),
                                     type: 'string'
                                 }
                             }
@@ -117,19 +122,20 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
                 },
                 when: {
                     markdownDescription: ( localize(
-                        4657,
+                        4784,
                         "Condition which must be true for this tool to be enabled. Note that a tool may still be invoked by another extension even when its `when` condition is false."
                     )),
                     type: 'string'
                 },
                 tags: {
                     description: ( localize(
-                        4658,
+                        4785,
                         "A set of tags that roughly describe the tool's capabilities. A tool user may use these to filter the set of tools to just ones that are relevant for the task at hand, or they may want to pick a tag that can be used to identify just the tools contributed by this extension."
                     )),
                     type: 'array',
                     items: {
-                        type: 'string'
+                        type: 'string',
+                        pattern: '^(?!copilot_|vscode_)'
                     }
                 }
             }
@@ -158,6 +164,14 @@ let LanguageModelToolsExtensionPointHandler = class LanguageModelToolsExtensionP
                         logService.error(`Extension '${extension.description.identifier.value}' CANNOT register tool with 'canBeReferencedInPrompt' set without a 'toolReferenceName': ${JSON.stringify(rawTool)}`);
                         continue;
                     }
+                    if ((rawTool.name.startsWith('copilot_') || rawTool.name.startsWith('vscode_')) && !isProposedApiEnabled(extension.description, 'chatParticipantPrivate')) {
+                        logService.error(`Extension '${extension.description.identifier.value}' CANNOT register tool with name starting with "vscode_" or "copilot_"`);
+                        continue;
+                    }
+                    if (rawTool.tags?.some(tag => tag.startsWith('copilot_') || tag.startsWith('vscode_')) && !isProposedApiEnabled(extension.description, 'chatParticipantPrivate')) {
+                        logService.error(`Extension '${extension.description.identifier.value}' CANNOT register tool with tags starting with "vscode_" or "copilot_"`);
+                        continue;
+                    }
                     const rawIcon = rawTool.icon;
                     let icon;
                     if (typeof rawIcon === 'string') {
@@ -196,5 +210,47 @@ LanguageModelToolsExtensionPointHandler = ( __decorate([
     ( __param(0, ILanguageModelToolsService)),
     ( __param(1, ILogService))
 ], LanguageModelToolsExtensionPointHandler));
+class LanguageModelToolDataRenderer extends Disposable {
+    constructor() {
+        super(...arguments);
+        this.type = 'table';
+    }
+    shouldRender(manifest) {
+        return !!manifest.contributes?.languageModelTools;
+    }
+    render(manifest) {
+        const contribs = manifest.contributes?.languageModelTools ?? [];
+        if (!contribs.length) {
+            return { data: { headers: [], rows: [] }, dispose: () => { } };
+        }
+        const headers = [
+            ( localize(4786, "Name")),
+            ( localize(4787, "Display Name")),
+            ( localize(4788, "Description")),
+        ];
+        const rows = ( contribs.map(t => {
+            return [
+                ( new MarkdownString(`\`${t.name}\``)),
+                t.displayName,
+                t.userDescription ?? t.modelDescription,
+            ];
+        }));
+        return {
+            data: {
+                headers,
+                rows
+            },
+            dispose: () => { }
+        };
+    }
+}
+( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
+    id: 'languageModelTools',
+    label: ( localize(4789, "Language Model Tools")),
+    access: {
+        canToggle: false
+    },
+    renderer: ( new SyncDescriptor(LanguageModelToolDataRenderer)),
+});
 
 export { LanguageModelToolsExtensionPointHandler };

package/vscode/src/vs/workbench/contrib/chat/common/tools/tools.d.ts

@@ -0,0 +1,11 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
+import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service";
+export declare class BuiltinToolsContribution extends Disposable implements IWorkbenchContribution {
+    static readonly ID = "chat.builtinTools";
+    constructor(toolsService: ILanguageModelToolsService, instantiationService: IInstantiationService);
+}
+export interface IToolInputProcessor {
+    processInput(input: any): any;
+}