@codingame/monaco-vscode-chat-service-override 7.1.0 → 7.1.1

package/vscode/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.js

@@ -4,7 +4,7 @@ import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { getWordAtText } from 'vscode/vscode/vs/editor/common/core/wordHelper';
 import { CompletionItemKind } from 'vscode/vscode/vs/editor/common/languages';
 import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { Action2, registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
@@ -13,7 +13,7 @@ import { SubmitAction } from 'vscode/vscode/vs/workbench/contrib/chat/browser/ac
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatInputPart } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatInputPart';
 import { SelectAndInsertFileAction } from 'vscode/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
-import { ChatAgentLocation, getFullyQualifiedId } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
+import { getFullyQualifiedId, ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { IChatAgentService, IChatAgentNameService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
 import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestTextPart, chatSubcommandLeader, chatAgentLeader, chatVariableLeader, ChatRequestVariablePart } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import { IChatSlashCommandService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatSlashCommands.service';
@@ -21,7 +21,6 @@ import { IChatVariablesService } from 'vscode/vscode/vs/workbench/contrib/chat/c
 import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 
 var BuiltinDynamicCompletions_1, VariableCompletions_1;
-const _moduleId = "vs/workbench/contrib/chat/browser/contrib/chatInputCompletions";
 let SlashCommandCompletions = class SlashCommandCompletions extends Disposable {
     constructor(languageFeaturesService, chatWidgetService, chatSlashCommandService) {
         super();
@@ -33,7 +32,7 @@ let SlashCommandCompletions = class SlashCommandCompletions extends Disposable {
             triggerCharacters: ['/'],
             provideCompletionItems: async (model, position, _context, _token) => {
                 const widget = this.chatWidgetService.getWidgetByInputUri(model.uri);
-                if (!widget || !widget.viewModel || (widget.location !== ChatAgentLocation.Panel && widget.location !== ChatAgentLocation.Notebook) ) {
+                if (!widget || !widget.viewModel) {
                     return null;
                 }
                 const range = computeCompletionRanges(model, position, /\/\w*/g);
@@ -45,7 +44,7 @@ let SlashCommandCompletions = class SlashCommandCompletions extends Disposable {
                 if (usedAgent) {
                     return;
                 }
-                const slashCommands = this.chatSlashCommandService.getCommands();
+                const slashCommands = this.chatSlashCommandService.getCommands(widget.location);
                 if (!slashCommands) {
                     return null;
                 }
@@ -85,7 +84,7 @@ let AgentCompletions = class AgentCompletions extends Disposable {
             triggerCharacters: ['@'],
             provideCompletionItems: async (model, position, _context, _token) => {
                 const widget = this.chatWidgetService.getWidgetByInputUri(model.uri);
-                if (!widget || !widget.viewModel || (widget.location !== ChatAgentLocation.Panel && widget.location !== ChatAgentLocation.Notebook) ) {
+                if (!widget || !widget.viewModel) {
                     return null;
                 }
                 const parsedRequest = widget.parsedInput.parts;
@@ -122,7 +121,7 @@ let AgentCompletions = class AgentCompletions extends Disposable {
             triggerCharacters: ['/'],
             provideCompletionItems: async (model, position, _context, token) => {
                 const widget = this.chatWidgetService.getWidgetByInputUri(model.uri);
-                if (!widget || !widget.viewModel || widget.location !== ChatAgentLocation.Panel ) {
+                if (!widget || !widget.viewModel) {
                     return;
                 }
                 const range = computeCompletionRanges(model, position, /\/\w*/g);
@@ -164,7 +163,7 @@ let AgentCompletions = class AgentCompletions extends Disposable {
             provideCompletionItems: async (model, position, _context, token) => {
                 const widget = this.chatWidgetService.getWidgetByInputUri(model.uri);
                 const viewModel = widget?.viewModel;
-                if (!widget || !viewModel || widget.location !== ChatAgentLocation.Panel ) {
+                if (!widget || !viewModel) {
                     return;
                 }
                 const range = computeCompletionRanges(model, position, /\/\w*/g);
@@ -199,7 +198,7 @@ let AgentCompletions = class AgentCompletions extends Disposable {
                     suggestions: justAgents.concat(agents.flatMap(agent => ( (agent.slashCommands.map((c, i) => {
                         const { label: agentLabel, isDupe } = this.getAgentCompletionDetails(agent);
                         const withSlash = `${chatSubcommandLeader}${c.name}`;
-                        return {
+                        const item = {
                             label: { label: withSlash, description: agentLabel, detail: isDupe ? ` (${agent.publisherDisplayName})` : undefined },
                             filterText: getFilterText(agent, c.name),
                             commitCharacters: [' '],
@@ -210,6 +209,12 @@ let AgentCompletions = class AgentCompletions extends Disposable {
                             sortText: `${chatSubcommandLeader}${agent.name}${c.name}`,
                             command: { id: AssignSelectedAgentAction.ID, title: AssignSelectedAgentAction.ID, arguments: [{ agent, widget }] },
                         };
+                        if (agent.isDefault) {
+                            item.label = withSlash;
+                            item.insertText = `${withSlash} `;
+                            item.detail = c.description;
+                        }
+                        return item;
                     })))))
                 };
             }
@@ -258,7 +263,7 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
             triggerCharacters: [chatVariableLeader],
             provideCompletionItems: async (model, position, _context, _token) => {
                 const widget = this.chatWidgetService.getWidgetByInputUri(model.uri);
-                if (!widget || !widget.supportsFileReferences || widget.location !== ChatAgentLocation.Panel ) {
+                if (!widget || !widget.supportsFileReferences) {
                     return null;
                 }
                 const range = computeCompletionRanges(model, position, BuiltinDynamicCompletions_1.VariableNameDef);
@@ -276,7 +281,7 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
                         {
                             label: `${chatVariableLeader}file`,
                             insertText: `${chatVariableLeader}file:`,
-                            detail: ( localizeWithPath(_moduleId, 0, "Pick a file")),
+                            detail: ( localize(7287, "Pick a file")),
                             range,
                             kind: CompletionItemKind.Text,
                             command: { id: SelectAndInsertFileAction.ID, title: SelectAndInsertFileAction.ID, arguments: [{ widget, range: afterRange }] },
@@ -349,7 +354,7 @@ let VariableCompletions = class VariableCompletions extends Disposable {
                 const usedAgent = widget.parsedInput.parts.find(p => p instanceof ChatRequestAgentPart);
                 const slowSupported = usedAgent ? usedAgent.agent.metadata.supportsSlowVariables : true;
                 const usedVariables = widget.parsedInput.parts.filter((p) => p instanceof ChatRequestVariablePart);
-                const variableItems = ( (Array.from(this.chatVariablesService.getVariables())
+                const variableItems = ( (Array.from(this.chatVariablesService.getVariables(widget.location))
                     .filter(v => !( (usedVariables.some(usedVar => usedVar.variableName === v.name))))
                     .filter(v => !v.isSlow || slowSupported)
                     .map((v) => {

package/vscode/src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorContrib.js

@@ -18,7 +18,6 @@ import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
 import { ChatWidget } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatWidget';
 import { dynamicVariableDecorationType } from 'vscode/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
-import { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
 import { chatSlashCommandForeground, chatSlashCommandBackground } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatColors';
 import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, ChatRequestTextPart, ChatRequestVariablePart, chatAgentLeader, chatSubcommandLeader } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
@@ -154,8 +153,8 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
                     }];
             }
         }
-        const onlyAgentCommandAndWhitespace = agentPart && agentSubcommandPart && parsedRequest.every(p => p instanceof ChatRequestTextPart && !p.text.trim().length || p instanceof ChatRequestAgentPart || p instanceof ChatRequestAgentSubcommandPart);
-        if (onlyAgentCommandAndWhitespace) {
+        const onlyAgentAndAgentCommandAndWhitespace = agentPart && agentSubcommandPart && parsedRequest.every(p => p instanceof ChatRequestTextPart && !p.text.trim().length || p instanceof ChatRequestAgentPart || p instanceof ChatRequestAgentSubcommandPart);
+        if (onlyAgentAndAgentCommandAndWhitespace) {
             const isFollowupSlashCommand = ( this.previouslyUsedAgents.has(agentAndCommandToKey(agentPart.agent, agentSubcommandPart.command.name)));
             const shouldRenderFollowupPlaceholder = isFollowupSlashCommand && agentSubcommandPart.command.followupPlaceholder;
             if (agentSubcommandPart?.command.description && exactlyOneSpaceAfterPart(agentSubcommandPart)) {
@@ -170,13 +169,27 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
                     }];
             }
         }
+        const onlyAgentCommandAndWhitespace = agentSubcommandPart && parsedRequest.every(p => p instanceof ChatRequestTextPart && !p.text.trim().length || p instanceof ChatRequestAgentSubcommandPart);
+        if (onlyAgentCommandAndWhitespace) {
+            if (agentSubcommandPart?.command.description && exactlyOneSpaceAfterPart(agentSubcommandPart)) {
+                placeholderDecoration = [{
+                        range: getRangeForPlaceholder(agentSubcommandPart),
+                        renderOptions: {
+                            after: {
+                                contentText: agentSubcommandPart.command.description,
+                                color: this.getPlaceholderColor(),
+                            }
+                        }
+                    }];
+            }
+        }
         this.widget.inputEditor.setDecorationsByType(decorationDescription, placeholderDecorationType, placeholderDecoration ?? []);
         const textDecorations = [];
         if (agentPart) {
             textDecorations.push({ range: agentPart.editorRange });
-            if (agentSubcommandPart) {
-                textDecorations.push({ range: agentSubcommandPart.editorRange, hoverMessage: ( new MarkdownString(agentSubcommandPart.command.description)) });
-            }
+        }
+        if (agentSubcommandPart) {
+            textDecorations.push({ range: agentSubcommandPart.editorRange, hoverMessage: ( new MarkdownString(agentSubcommandPart.command.description)) });
         }
         if (slashCommandPart) {
             textDecorations.push({ range: slashCommandPart.editorRange });
@@ -200,11 +213,19 @@ class InputEditorSlashCommandMode extends Disposable {
         super();
         this.widget = widget;
         this.id = 'InputEditorSlashCommandMode';
+        this._register(this.widget.onDidChangeAgent(e => {
+            if (e.slashCommand && e.slashCommand.isSticky || !e.slashCommand && e.agent.metadata.isSticky) {
+                this.repopulateAgentCommand(e.agent, e.slashCommand);
+            }
+        }));
         this._register(this.widget.onDidSubmitAgent(e => {
             this.repopulateAgentCommand(e.agent, e.slashCommand);
         }));
     }
     async repopulateAgentCommand(agent, slashCommand) {
+        if (this.widget.inputEditor.getValue().trim()) {
+            return;
+        }
         let value;
         if (slashCommand && slashCommand.isSticky) {
             value = `${chatAgentLeader}${agent.name} ${chatSubcommandLeader}${slashCommand.name} `;
@@ -236,7 +257,7 @@ let ChatTokenDeleter = class ChatTokenDeleter extends Disposable {
             }
             const change = e.changes[0];
             if (!change.text && this.widget.viewModel) {
-                const previousParsedValue = parser.parseChatRequest(this.widget.viewModel.sessionId, previousInputValue, ChatAgentLocation.Panel, { selectedAgent: previousSelectedAgent });
+                const previousParsedValue = parser.parseChatRequest(this.widget.viewModel.sessionId, previousInputValue, widget.location, { selectedAgent: previousSelectedAgent });
                 const deletableTokens = previousParsedValue.parts.filter(p => p instanceof ChatRequestAgentPart || p instanceof ChatRequestAgentSubcommandPart || p instanceof ChatRequestSlashCommandPart || p instanceof ChatRequestVariablePart);
                 deletableTokens.forEach(token => {
                     const deletedRangeOfToken = Range.intersectRanges(token.editorRange, change.range);

package/vscode/src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorHover.js

@@ -8,9 +8,8 @@ import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/brow
 import { ChatAgentHover, getChatAgentHoverOptions } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatAgentHover';
 import { ChatEditorHoverWrapper } from './editorHoverWrapper.js';
 import { extractAgentAndCommand } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 
-const _moduleId = "vs/workbench/contrib/chat/browser/contrib/chatInputEditorHover";
 let ChatAgentHoverParticipant = class ChatAgentHoverParticipant {
     constructor(editor, instantiationService, chatWidgetService, commandService) {
         this.editor = editor;
@@ -62,7 +61,7 @@ let ChatAgentHoverParticipant = class ChatAgentHoverParticipant {
         );
     }
     getAccessibleContent(hoverPart) {
-        return ( localizeWithPath(_moduleId, 0, 'There is a chat agent hover part here.'));
+        return ( localize(7288, 'There is a chat agent hover part here.'));
     }
 };
 ChatAgentHoverParticipant = ( (__decorate([

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

@@ -1,5 +1,4 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { coalesce } from 'vscode/vscode/vs/base/common/arrays';
 import { DeferredPromise } from 'vscode/vscode/vs/base/common/async';
 import { CancellationToken, CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
 import { toErrorMessage } from 'vscode/vscode/vs/base/common/errorMessage';
@@ -11,8 +10,7 @@ import { Disposable, DisposableMap } from 'vscode/vscode/vs/base/common/lifecycl
 import { revive } from 'vscode/vscode/vs/base/common/marshalling';
 import { StopWatch } from 'vscode/vscode/vs/base/common/stopwatch';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
+import { localize } from 'vscode/vscode/vs/nls';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { Progress } from 'vscode/vscode/vs/platform/progress/common/progress';
@@ -25,13 +23,12 @@ import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/commo
 import { ChatModel, ChatWelcomeMessageModel, ChatRequestRemovalReason, getHistoryEntriesFromModel, updateRanges, ChatRequestModel } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatModel';
 import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, chatSubcommandLeader, chatAgentLeader, ChatRequestSlashCommandPart, getPromptText } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import { ChatRequestParser } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
-import { ChatAgentVoteDirection, ChatCopyKind } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService';
+import { ChatServiceTelemetry } from './chatServiceTelemetry.js';
 import { IChatSlashCommandService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatSlashCommands.service';
 import { IChatVariablesService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatVariables.service';
 import { ChatMessageRole } from 'vscode/vscode/vs/workbench/contrib/chat/common/languageModels';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 
-const _moduleId = "vs/workbench/contrib/chat/common/chatServiceImpl";
 const serializedChatKey = 'interactive.sessions';
 const globalChatKey = 'chat.workspaceTransfer';
 const SESSION_TRANSFER_EXPIRATION_IN_MILLISECONDS = 1000 * 60;
@@ -58,6 +55,7 @@ let ChatService = class ChatService extends Disposable {
         this._onDidDisposeSession = this._register(( (new Emitter())));
         this.onDidDisposeSession = this._onDidDisposeSession.event;
         this._sessionFollowupCancelTokens = this._register(( (new DisposableMap())));
+        this._chatServiceTelemetry = this.instantiationService.createInstance(ChatServiceTelemetry);
         const sessionData = storageService.get(serializedChatKey, StorageScope.WORKSPACE, '');
         if (sessionData) {
             this._persistedSessions = this.deserializeChats(sessionData);
@@ -100,37 +98,7 @@ let ChatService = class ChatService extends Disposable {
         this.storageService.store(serializedChatKey, serialized, StorageScope.WORKSPACE, StorageTarget.MACHINE);
     }
     notifyUserAction(action) {
-        if (action.action.kind === 'vote') {
-            this.telemetryService.publicLog2('interactiveSessionVote', {
-                direction: action.action.direction === ChatAgentVoteDirection.Up ? 'up' : 'down',
-                agentId: action.agentId ?? ''
-            });
-        }
-        else if (action.action.kind === 'copy') {
-            this.telemetryService.publicLog2('interactiveSessionCopy', {
-                copyKind: action.action.copyKind === ChatCopyKind.Action ? 'action' : 'toolbar',
-                agentId: action.agentId ?? ''
-            });
-        }
-        else if (action.action.kind === 'insert') {
-            this.telemetryService.publicLog2('interactiveSessionInsert', {
-                newFile: !!action.action.newFile,
-                agentId: action.agentId ?? ''
-            });
-        }
-        else if (action.action.kind === 'command') {
-            const command = CommandsRegistry.getCommand(action.action.commandButton.command.id);
-            const commandId = command ? action.action.commandButton.command.id : 'INVALID';
-            this.telemetryService.publicLog2('interactiveSessionCommand', {
-                commandId,
-                agentId: action.agentId ?? ''
-            });
-        }
-        else if (action.action.kind === 'runInTerminal') {
-            this.telemetryService.publicLog2('interactiveSessionRunInTerminal', {
-                languageId: action.action.languageId ?? ''
-            });
-        }
+        this._chatServiceTelemetry.notifyUserAction(action);
         this._onDidPerformUserAction.fire(action);
     }
     trace(method, message) {
@@ -379,9 +347,11 @@ let ChatService = class ChatService extends Disposable {
                     result: 'cancelled',
                     requestType,
                     agent: agentPart?.agent.id ?? '',
+                    agentExtensionId: agentPart?.agent.extensionId.value ?? '',
                     slashCommand: agentSlashCommandPart ? agentSlashCommandPart.command.name : commandPart?.slashCommand.command,
                     chatSessionId: model.sessionId,
                     location,
+                    citations: request?.response?.codeCitations.length ?? 0
                 });
                 model.cancelRequest(request);
             });
@@ -396,22 +366,9 @@ let ChatService = class ChatService extends Disposable {
                     request = model.addRequest(parsedRequest, initVariableData, attempt, agent, agentSlashCommandPart?.command);
                     completeResponseCreated();
                     const variableData = await this.chatVariablesService.resolveVariables(parsedRequest, options?.attachedContext, model, progressCallback, token);
-                    request.variableData = variableData;
+                    model.updateRequest(request, variableData);
                     const promptTextResult = getPromptText(request.message);
                     const updatedVariableData = updateRanges(variableData, promptTextResult.diff);
-                    const implicitVariablesEnabled = (location === ChatAgentLocation.Editor || location === ChatAgentLocation.Notebook);
-                    if (implicitVariablesEnabled) {
-                        const implicitVariables = agent.defaultImplicitVariables;
-                        if (implicitVariables) {
-                            const resolvedImplicitVariables = await Promise.all(( (implicitVariables.map(async (v) => {
-                                const id = this.chatVariablesService.getVariable(v)?.id ?? '';
-                                const value = await this.chatVariablesService.resolveVariable(v, parsedRequest.text, model, progressCallback, token);
-                                return value ? { id, name: v, value } :
-                                    undefined;
-                            }))));
-                            updatedVariableData.variables.push(...coalesce(resolvedImplicitVariables));
-                        }
-                    }
                     const requestProps = {
                         sessionId,
                         requestId: request.id,
@@ -422,6 +379,7 @@ let ChatService = class ChatService extends Disposable {
                         enableCommandDetection,
                         attempt,
                         location,
+                        locationData: options?.locationData,
                         acceptedConfirmationData: options?.acceptedConfirmationData,
                         rejectedConfirmationData: options?.rejectedConfirmationData,
                     };
@@ -438,12 +396,12 @@ let ChatService = class ChatService extends Disposable {
                             continue;
                         }
                         history.push({ role: ChatMessageRole.User, content: { type: 'text', value: request.message.text } });
-                        history.push({ role: ChatMessageRole.Assistant, content: { type: 'text', value: request.response.response.asString() } });
+                        history.push({ role: ChatMessageRole.Assistant, content: { type: 'text', value: ( (request.response.response.toString())) } });
                     }
                     const message = parsedRequest.text;
                     const commandResult = await this.chatSlashCommandService.executeCommand(commandPart.slashCommand.command, message.substring(commandPart.slashCommand.command.length + 1).trimStart(), ( (new Progress(p => {
                         progressCallback(p);
-                    }))), history, token);
+                    }))), history, location, token);
                     agentOrCommandFollowups = Promise.resolve(commandResult?.followUp);
                     rawResult = {};
                 }
@@ -456,7 +414,7 @@ let ChatService = class ChatService extends Disposable {
                 else {
                     if (!rawResult) {
                         this.trace('sendRequest', `Provider returned no response for session ${model.sessionId}`);
-                        rawResult = { errorDetails: { message: ( localizeWithPath(_moduleId, 0, "Provider returned null response")) } };
+                        rawResult = { errorDetails: { message: ( localize(3097, "Provider returned null response")) } };
                     }
                     const result = rawResult.errorDetails?.responseIsFiltered ? 'filtered' :
                         rawResult.errorDetails && gotProgress ? 'errorWithOutput' :
@@ -468,9 +426,11 @@ let ChatService = class ChatService extends Disposable {
                         result,
                         requestType,
                         agent: agentPart?.agent.id ?? '',
+                        agentExtensionId: agentPart?.agent.extensionId.value ?? '',
                         slashCommand: agentSlashCommandPart ? agentSlashCommandPart.command.name : commandPart?.slashCommand.command,
                         chatSessionId: model.sessionId,
-                        location
+                        location,
+                        citations: request.response?.codeCitations.length ?? 0
                     });
                     model.setResponse(request, rawResult);
                     completeResponseCreated();
@@ -491,9 +451,11 @@ let ChatService = class ChatService extends Disposable {
                     result,
                     requestType,
                     agent: agentPart?.agent.id ?? '',
+                    agentExtensionId: agentPart?.agent.extensionId.value ?? '',
                     slashCommand: agentSlashCommandPart ? agentSlashCommandPart.command.name : commandPart?.slashCommand.command,
                     chatSessionId: model.sessionId,
-                    location
+                    location,
+                    citations: 0
                 });
                 this.logService.error(`Error while handling chat request: ${toErrorMessage(err, true)}`);
                 if (request) {

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

@@ -0,0 +1,54 @@
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
+import { ChatAgentVoteDirection, ChatCopyKind } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService';
+
+let ChatServiceTelemetry = class ChatServiceTelemetry {
+    constructor(telemetryService) {
+        this.telemetryService = telemetryService;
+    }
+    notifyUserAction(action) {
+        if (action.action.kind === 'vote') {
+            this.telemetryService.publicLog2('interactiveSessionVote', {
+                direction: action.action.direction === ChatAgentVoteDirection.Up ? 'up' : 'down',
+                agentId: action.agentId ?? '',
+                command: action.command,
+            });
+        }
+        else if (action.action.kind === 'copy') {
+            this.telemetryService.publicLog2('interactiveSessionCopy', {
+                copyKind: action.action.copyKind === ChatCopyKind.Action ? 'action' : 'toolbar',
+                agentId: action.agentId ?? '',
+                command: action.command,
+            });
+        }
+        else if (action.action.kind === 'insert') {
+            this.telemetryService.publicLog2('interactiveSessionInsert', {
+                newFile: !!action.action.newFile,
+                agentId: action.agentId ?? '',
+                command: action.command,
+            });
+        }
+        else if (action.action.kind === 'command') {
+            const command = CommandsRegistry.getCommand(action.action.commandButton.command.id);
+            const commandId = command ? action.action.commandButton.command.id : 'INVALID';
+            this.telemetryService.publicLog2('interactiveSessionCommand', {
+                commandId,
+                agentId: action.agentId ?? '',
+                command: action.command,
+            });
+        }
+        else if (action.action.kind === 'runInTerminal') {
+            this.telemetryService.publicLog2('interactiveSessionRunInTerminal', {
+                languageId: action.action.languageId ?? '',
+                agentId: action.agentId ?? '',
+                command: action.command,
+            });
+        }
+    }
+};
+ChatServiceTelemetry = ( __decorate([
+    ( __param(0, ITelemetryService))
+], ChatServiceTelemetry));
+
+export { ChatServiceTelemetry };

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

@@ -27,13 +27,13 @@ let ChatSlashCommandService = class ChatSlashCommandService extends Disposable {
             }
         });
     }
-    getCommands() {
-        return Array.from(( this._commands.values()), v => v.data);
+    getCommands(location) {
+        return Array.from(( this._commands.values()), v => v.data).filter(c => c.locations.includes(location));
     }
     hasCommand(id) {
         return ( this._commands.has(id));
     }
-    async executeCommand(id, prompt, progress, history, token) {
+    async executeCommand(id, prompt, progress, history, location, token) {
         const data = this._commands.get(id);
         if (!data) {
             throw ( new Error('No command with id ${id} NOT registered'));
@@ -44,7 +44,7 @@ let ChatSlashCommandService = class ChatSlashCommandService extends Disposable {
         if (!data.command) {
             throw ( new Error(`No command with id ${id} NOT resolved`));
         }
-        return await data.command(prompt, progress, history, token);
+        return await data.command(prompt, progress, history, location, token);
     }
 };
 ChatSlashCommandService = ( __decorate([

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

@@ -7,10 +7,9 @@ import { ExtensionIdentifier } from 'vscode/vscode/vs/platform/extensions/common
 import { Extensions } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionFeatures';
 import { IExtensionFeaturesManagementService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionFeatures.service';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 
 var LanguageModelStatsService_1;
-const _moduleId = "vs/workbench/contrib/chat/common/languageModelStats";
 let LanguageModelStatsService = class LanguageModelStatsService extends Disposable {
     static { LanguageModelStatsService_1 = this; }
     static { this.MODEL_STATS_STORAGE_KEY_PREFIX = 'languageModelStats.'; }
@@ -122,8 +121,8 @@ LanguageModelStatsService = LanguageModelStatsService_1 = ( (__decorate([
 ], LanguageModelStatsService)));
 ( (Registry.as(Extensions.ExtensionFeaturesRegistry))).registerExtensionFeature({
     id: 'languageModels',
-    label: ( localizeWithPath(_moduleId, 0, "Language Models")),
-    description: ( localizeWithPath(_moduleId, 1, "Language models usage statistics of this extension.")),
+    label: ( localize(3106, "Language Models")),
+    description: ( localize(3107, "Language models usage statistics of this extension.")),
     access: {
         canToggle: false
     },

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

@@ -1,7 +1,7 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
-import { toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
+import { toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 
 let LanguageModelToolsService = class LanguageModelToolsService {

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

@@ -1,11 +1,12 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { joinPath } from 'vscode/vscode/vs/base/common/resources';
+import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
+import { localize } from 'vscode/vscode/vs/nls';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { ILanguageModelToolsService } from 'vscode/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
 import { ExtensionsRegistry } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
 
-const _moduleId = "vs/workbench/contrib/chat/common/tools/languageModelToolsContribution";
 const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'languageModelTools',
     activationEventsGenerator: (contributions, result) => {
@@ -14,11 +15,7 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
         }
     },
     jsonSchema: {
-        description: ( localizeWithPath(
-            _moduleId,
-            0,
-            'Contributes a tool that can be invoked by a language model.'
-        )),
+        description: ( localize(7302, 'Contributes a tool that can be invoked by a language model.')),
         type: 'array',
         items: {
             additionalProperties: false,
@@ -27,33 +24,53 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
             required: ['name', 'description'],
             properties: {
                 name: {
-                    description: ( localizeWithPath(
-                        _moduleId,
-                        1,
-                        "A name for this tool which must be unique across all tools."
-                    )),
+                    description: ( localize(7303, "A name for this tool which must be unique across all tools.")),
                     type: 'string'
                 },
                 description: {
-                    description: ( localizeWithPath(
-                        _moduleId,
-                        2,
-                        "A description of this tool that may be passed to a language model."
-                    )),
+                    description: ( localize(7304, "A description of this tool that may be passed to a language model.")),
                     type: 'string'
                 },
                 displayName: {
-                    description: ( localizeWithPath(
-                        _moduleId,
-                        3,
+                    description: ( localize(
+                        7305,
                         "A human-readable name for this tool that may be used to describe it in the UI."
                     )),
                     type: 'string'
                 },
                 parametersSchema: {
-                    description: ( localizeWithPath(_moduleId, 4, "A JSON schema for the parameters this tool accepts.")),
+                    description: ( localize(7306, "A JSON schema for the parameters this tool accepts.")),
                     type: 'object',
                     $ref: 'http://json-schema.org/draft-07/schema#'
+                },
+                canBeInvokedManually: {
+                    description: ( localize(
+                        7307,
+                        "Whether this tool can be invoked manually by the user through the chat UX."
+                    )),
+                    type: 'boolean'
+                },
+                icon: {
+                    description: ( localize(
+                        7308,
+                        "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: [{
+                            type: 'string'
+                        },
+                        {
+                            type: 'object',
+                            properties: {
+                                light: {
+                                    description: ( localize(7309, 'Icon path when a light theme is used')),
+                                    type: 'string'
+                                },
+                                dark: {
+                                    description: ( localize(7310, 'Icon path when a dark theme is used')),
+                                    type: 'string'
+                                }
+                            }
+                        }]
                 }
             }
         }
@@ -68,13 +85,31 @@ let LanguageModelToolsExtensionPointHandler = class LanguageModelToolsExtensionP
         this._registrationDisposables = ( (new DisposableMap()));
         languageModelToolsExtensionPoint.setHandler((extensions, delta) => {
             for (const extension of delta.added) {
-                for (const tool of extension.value) {
-                    if (!tool.name || !tool.description) {
-                        logService.warn(`Invalid tool contribution from ${extension.description.identifier.value}: ${JSON.stringify(tool)}`);
+                for (const rawTool of extension.value) {
+                    if (!rawTool.name || !rawTool.description) {
+                        logService.warn(`Invalid tool contribution from ${extension.description.identifier.value}: ${JSON.stringify(rawTool)}`);
                         continue;
                     }
+                    const rawIcon = rawTool.icon;
+                    let icon;
+                    if (typeof rawIcon === 'string') {
+                        icon = ThemeIcon.fromString(rawIcon) ?? {
+                            dark: joinPath(extension.description.extensionLocation, rawIcon),
+                            light: joinPath(extension.description.extensionLocation, rawIcon)
+                        };
+                    }
+                    else if (rawIcon) {
+                        icon = {
+                            dark: joinPath(extension.description.extensionLocation, rawIcon.dark),
+                            light: joinPath(extension.description.extensionLocation, rawIcon.light)
+                        };
+                    }
+                    const tool = {
+                        ...rawTool,
+                        icon
+                    };
                     const disposable = languageModelToolsService.registerToolData(tool);
-                    this._registrationDisposables.set(toToolKey(extension.description.identifier, tool.name), disposable);
+                    this._registrationDisposables.set(toToolKey(extension.description.identifier, rawTool.name), disposable);
                 }
             }
             for (const extension of delta.removed) {