@codingame/monaco-vscode-chat-service-override 11.1.2 → 12.0.0

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

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 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';
@@ -10,25 +11,26 @@ 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 { isLocation } from 'vscode/vscode/vs/editor/common/languages';
 import { localize } from 'vscode/vscode/vs/nls';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
-import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 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';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
-import { IWorkbenchAssignmentService } from 'vscode/vscode/vs/workbench/services/assignment/common/assignmentService.service';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { normalizeSerializableChatData, ChatModel, updateRanges, toChatHistoryContent, ChatRequestModel } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatModel';
-import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, chatSubcommandLeader, chatAgentLeader, ChatRequestSlashCommandPart, getPromptText } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
-import { ChatRequestParser } from '@codingame/monaco-vscode-chat-extensions-notebook-common/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
+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 { 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 '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';
 
 const serializedChatKey = 'interactive.sessions';
 const globalChatKey = 'chat.workspaceTransfer';
@@ -50,7 +52,7 @@ let ChatService = class ChatService extends Disposable {
     get transferredSessionData() {
         return this._transferredSessionData;
     }
-    constructor(storageService, logService, extensionService, instantiationService, telemetryService, workspaceContextService, chatSlashCommandService, chatVariablesService, chatAgentService, workbenchAssignmentService, contextKeyService, configurationService) {
+    constructor(storageService, logService, extensionService, instantiationService, telemetryService, workspaceContextService, chatSlashCommandService, chatVariablesService, chatAgentService, configurationService) {
         super();
         this.storageService = storageService;
         this.logService = logService;
@@ -62,20 +64,20 @@ let ChatService = class ChatService extends Disposable {
         this.chatVariablesService = chatVariablesService;
         this.chatAgentService = chatAgentService;
         this.configurationService = configurationService;
-        this._sessionModels = this._register(( (new DisposableMap())));
-        this._pendingRequests = this._register(( (new DisposableMap())));
-        this._deletedChatIds = ( (new Set()));
-        this._onDidPerformUserAction = this._register(( (new Emitter())));
+        this._sessionModels = this._register(( new DisposableMap()));
+        this._pendingRequests = this._register(( new DisposableMap()));
+        this._deletedChatIds = ( new Set());
+        this._onDidPerformUserAction = this._register(( new Emitter()));
         this.onDidPerformUserAction = this._onDidPerformUserAction.event;
-        this._onDidDisposeSession = this._register(( (new Emitter())));
+        this._onDidDisposeSession = this._register(( new Emitter()));
         this.onDidDisposeSession = this._onDidDisposeSession.event;
-        this._sessionFollowupCancelTokens = this._register(( (new DisposableMap())));
+        this._sessionFollowupCancelTokens = this._register(( new DisposableMap()));
         this._chatServiceTelemetry = this.instantiationService.createInstance(ChatServiceTelemetry);
         const isEmptyWindow = !workspaceContextService.getWorkspace().folders.length;
-        const sessionData = storageService.get(serializedChatKey, isEmptyWindow ? -1  : 1 , '');
+        const sessionData = storageService.get(serializedChatKey, isEmptyWindow ? StorageScope.APPLICATION : StorageScope.WORKSPACE, '');
         if (sessionData) {
             this._persistedSessions = this.deserializeChats(sessionData);
-            const countsForLog = ( (Object.keys(this._persistedSessions))).length;
+            const countsForLog = ( Object.keys(this._persistedSessions)).length;
             if (countsForLog > 0) {
                 this.trace('constructor', `Restored ${countsForLog} persisted sessions`);
             }
@@ -96,8 +98,8 @@ let ChatService = class ChatService extends Disposable {
         return this.chatAgentService.getContributedDefaultAgent(location) !== undefined;
     }
     saveState() {
-        const liveChats = Array.from(( (this._sessionModels.values())))
-            .filter(session => session.initialLocation === ChatAgentLocation.Panel)
+        const liveChats = Array.from(( this._sessionModels.values()))
+            .filter(session => session.initialLocation === ChatAgentLocation.Panel || session.initialLocation === ChatAgentLocation.EditingSession)
             .filter(session => session.getRequests().length > 0);
         const isEmptyWindow = !this.workspaceContextService.getWorkspace().folders.length;
         if (isEmptyWindow) {
@@ -105,8 +107,8 @@ let ChatService = class ChatService extends Disposable {
         }
         else {
             let allSessions = liveChats;
-            allSessions = allSessions.concat(( (Object.values(this._persistedSessions)))
-                .filter(session => !( (this._sessionModels.has(session.sessionId))))
+            allSessions = allSessions.concat(( Object.values(this._persistedSessions))
+                .filter(session => !( this._sessionModels.has(session.sessionId)))
                 .filter(session => session.requests.length));
             allSessions.sort((a, b) => (b.creationDate ?? 0) - (a.creationDate ?? 0));
             allSessions = allSessions.slice(0, maxPersistedSessions);
@@ -117,17 +119,17 @@ let ChatService = class ChatService extends Disposable {
             if (allSessions.length) {
                 this.trace('onWillSaveState', `Persisting ${serialized.length} chars`);
             }
-            this.storageService.store(serializedChatKey, serialized, 1 , 1 );
+            this.storageService.store(serializedChatKey, serialized, StorageScope.WORKSPACE, StorageTarget.MACHINE);
         }
         this._deletedChatIds.clear();
     }
     syncEmptyWindowChats(thisWindowChats) {
-        const sessionData = this.storageService.get(serializedChatKey, -1 , '');
+        const sessionData = this.storageService.get(serializedChatKey, StorageScope.APPLICATION, '');
         const originalPersistedSessions = this._persistedSessions;
         let persistedSessions;
         if (sessionData) {
             persistedSessions = this.deserializeChats(sessionData);
-            const countsForLog = ( (Object.keys(persistedSessions))).length;
+            const countsForLog = ( Object.keys(persistedSessions)).length;
             if (countsForLog > 0) {
                 this.trace('constructor', `Restored ${countsForLog} persisted sessions`);
             }
@@ -136,7 +138,7 @@ let ChatService = class ChatService extends Disposable {
             persistedSessions = {};
         }
         this._deletedChatIds.forEach(id => delete persistedSessions[id]);
-        ( (Object.values(originalPersistedSessions))).forEach(session => {
+        ( Object.values(originalPersistedSessions)).forEach(session => {
             const persistedSession = persistedSessions[session.sessionId];
             if (persistedSession && session.requests.length > persistedSession.requests.length) {
                 persistedSessions[session.sessionId] = session;
@@ -151,11 +153,11 @@ let ChatService = class ChatService extends Disposable {
         for (const chat of thisWindowChats) {
             allSessions[chat.sessionId] = chat;
         }
-        let sessionsList = ( (Object.values(allSessions)));
+        let sessionsList = ( Object.values(allSessions));
         sessionsList.sort((a, b) => (b.creationDate ?? 0) - (a.creationDate ?? 0));
         sessionsList = sessionsList.slice(0, maxPersistedSessions);
         const data = JSON.stringify(sessionsList);
-        this.storageService.store(serializedChatKey, data, -1 , 1 );
+        this.storageService.store(serializedChatKey, data, StorageScope.APPLICATION, StorageTarget.MACHINE);
     }
     notifyUserAction(action) {
         this._chatServiceTelemetry.notifyUserAction(action);
@@ -187,22 +189,20 @@ let ChatService = class ChatService extends Disposable {
         try {
             const arrayOfSessions = revive(JSON.parse(sessionData));
             if (!Array.isArray(arrayOfSessions)) {
-                throw ( (new Error('Expected array')));
+                throw ( new Error('Expected array'));
             }
             const sessions = arrayOfSessions.reduce((acc, session) => {
                 for (const request of session.requests) {
                     if (Array.isArray(request.response)) {
-                        request.response = ( (request.response.map((response) => {
+                        request.response = ( request.response.map((response) => {
                             if (typeof response === 'string') {
-                                return (
-                                     (new MarkdownString(response))
-                                );
+                                return ( new MarkdownString(response));
                             }
                             return response;
-                        })));
+                        }));
                     }
                     else if (typeof request.response === 'string') {
-                        request.response = [( (new MarkdownString(request.response)))];
+                        request.response = [( new MarkdownString(request.response))];
                     }
                 }
                 acc[session.sessionId] = normalizeSerializableChatData(session);
@@ -216,23 +216,23 @@ let ChatService = class ChatService extends Disposable {
         }
     }
     getTransferredSessionData() {
-        const data = this.storageService.getObject(globalChatKey, 0 , []);
+        const data = this.storageService.getObject(globalChatKey, StorageScope.PROFILE, []);
         const workspaceUri = this.workspaceContextService.getWorkspace().folders[0]?.uri;
         if (!workspaceUri) {
             return;
         }
-        const thisWorkspace = ( (workspaceUri.toString()));
+        const thisWorkspace = ( workspaceUri.toString());
         const currentTime = Date.now();
-        const transferred = data.find(item => ( (URI.revive(item.toWorkspace).toString())) === thisWorkspace && (currentTime - item.timestampInMilliseconds < SESSION_TRANSFER_EXPIRATION_IN_MILLISECONDS));
-        const filtered = data.filter(item => ( (URI.revive(item.toWorkspace).toString())) !== thisWorkspace && (currentTime - item.timestampInMilliseconds < SESSION_TRANSFER_EXPIRATION_IN_MILLISECONDS));
-        this.storageService.store(globalChatKey, JSON.stringify(filtered), 0 , 1 );
+        const transferred = data.find(item => ( URI.revive(item.toWorkspace).toString()) === thisWorkspace && (currentTime - item.timestampInMilliseconds < SESSION_TRANSFER_EXPIRATION_IN_MILLISECONDS));
+        const filtered = data.filter(item => ( URI.revive(item.toWorkspace).toString()) !== thisWorkspace && (currentTime - item.timestampInMilliseconds < SESSION_TRANSFER_EXPIRATION_IN_MILLISECONDS));
+        this.storageService.store(globalChatKey, JSON.stringify(filtered), StorageScope.PROFILE, StorageTarget.MACHINE);
         return transferred;
     }
     getHistory() {
-        const persistedSessions = ( (Object.values(this._persistedSessions)))
+        const persistedSessions = ( Object.values(this._persistedSessions))
             .filter(session => session.requests.length > 0)
-            .filter(session => !( (this._sessionModels.has(session.sessionId))));
-        const persistedSessionItems = ( (persistedSessions
+            .filter(session => !( this._sessionModels.has(session.sessionId)));
+        const persistedSessionItems = ( persistedSessions
             .filter(session => !session.isImported && session.initialLocation !== ChatAgentLocation.EditingSession)
             .map(session => {
             const title = session.customTitle ?? ChatModel.getDefaultTitle(session.requests);
@@ -242,18 +242,18 @@ let ChatService = class ChatService extends Disposable {
                 lastMessageDate: session.lastMessageDate,
                 isActive: false,
             };
-        })));
-        const liveSessionItems = ( (Array.from(( (this._sessionModels.values())))
+        }));
+        const liveSessionItems = ( Array.from(( this._sessionModels.values()))
             .filter(session => !session.isImported && session.initialLocation !== ChatAgentLocation.EditingSession)
             .map(session => {
-            const title = session.title || ( localize(3180, "New Chat"));
+            const title = session.title || ( localize(4617, "New Chat"));
             return {
                 sessionId: session.sessionId,
                 title,
                 lastMessageDate: session.lastMessageDate,
                 isActive: true,
             };
-        })));
+        }));
         return [...liveSessionItems, ...persistedSessionItems];
     }
     removeHistoryEntry(sessionId) {
@@ -264,7 +264,7 @@ let ChatService = class ChatService extends Disposable {
         }
     }
     clearAllHistoryEntries() {
-        ( (Object.values(this._persistedSessions))).forEach(session => this._deletedChatIds.add(session.sessionId));
+        ( Object.values(this._persistedSessions)).forEach(session => this._deletedChatIds.add(session.sessionId));
         this._persistedSessions = {};
         this.saveState();
     }
@@ -285,12 +285,12 @@ let ChatService = class ChatService extends Disposable {
             await this.extensionService.whenInstalledExtensionsRegistered();
             const defaultAgentData = this.chatAgentService.getContributedDefaultAgent(model.initialLocation) ?? this.chatAgentService.getContributedDefaultAgent(ChatAgentLocation.Panel);
             if (!defaultAgentData) {
-                throw ( (new ErrorNoTelemetry('No default agent contributed')));
+                throw ( new ErrorNoTelemetry('No default agent contributed'));
             }
             await this.extensionService.activateByEvent(`onChatParticipant:${defaultAgentData.id}`);
             const defaultAgent = this.chatAgentService.getActivatedAgents().find(agent => agent.id === defaultAgentData.id);
             if (!defaultAgent) {
-                throw ( (new ErrorNoTelemetry('No default agent registered')));
+                throw ( new ErrorNoTelemetry('No default agent registered'));
             }
             const welcomeMessage = (await defaultAgent.provideWelcomeMessage?.(token)) ?? undefined;
             const sampleQuestions = (await defaultAgent.provideSampleQuestions?.(model.initialLocation, token)) ?? undefined;
@@ -327,7 +327,7 @@ let ChatService = class ChatService extends Disposable {
     async resendRequest(request, options) {
         const model = this._sessionModels.get(request.session.sessionId);
         if (!model && model !== request.session) {
-            throw ( (new Error(`Unknown session: ${request.session.sessionId}`)));
+            throw ( new Error(`Unknown session: ${request.session.sessionId}`));
         }
         await model.waitForInitialization();
         const cts = this._pendingRequests.get(request.session.sessionId);
@@ -339,7 +339,7 @@ let ChatService = class ChatService extends Disposable {
         const attempt = options?.attempt ?? 0;
         const enableCommandDetection = !options?.noCommandDetection;
         const defaultAgent = this.chatAgentService.getDefaultAgent(location);
-        model.removeRequest(request.id, 1 );
+        model.removeRequest(request.id, ChatRequestRemovalReason.Resend);
         const resendOptions = {
             ...options,
             locationData: request.locationData,
@@ -356,10 +356,10 @@ let ChatService = class ChatService extends Disposable {
         }
         const model = this._sessionModels.get(sessionId);
         if (!model) {
-            throw ( (new Error(`Unknown session: ${sessionId}`)));
+            throw ( new Error(`Unknown session: ${sessionId}`));
         }
         await model.waitForInitialization();
-        if (( (this._pendingRequests.has(sessionId)))) {
+        if (( this._pendingRequests.has(sessionId))) {
             this.trace('sendRequest', `Session ${sessionId} already has a pending request`);
             return;
         }
@@ -380,7 +380,7 @@ let ChatService = class ChatService extends Disposable {
         if (options?.agentId) {
             const agent = this.chatAgentService.getAgent(options.agentId);
             if (!agent) {
-                throw ( (new Error(`Unknown agent: ${options.agentId}`)));
+                throw ( new Error(`Unknown agent: ${options.agentId}`));
             }
             parserContext = { selectedAgent: agent };
             const commandPart = options.slashCommand ? ` ${chatSubcommandLeader}${options.slashCommand}` : '';
@@ -391,7 +391,7 @@ let ChatService = class ChatService extends Disposable {
     }
     refreshFollowupsCancellationToken(sessionId) {
         this._sessionFollowupCancelTokens.get(sessionId)?.cancel();
-        const newTokenSource = ( (new CancellationTokenSource()));
+        const newTokenSource = ( new CancellationTokenSource());
         this._sessionFollowupCancelTokens.set(sessionId, newTokenSource);
         return newTokenSource.token;
     }
@@ -401,10 +401,10 @@ let ChatService = class ChatService extends Disposable {
         const agentPart = 'kind' in parsedRequest ? undefined : parsedRequest.parts.find((r) => r instanceof ChatRequestAgentPart);
         const agentSlashCommandPart = 'kind' in parsedRequest ? undefined : parsedRequest.parts.find((r) => r instanceof ChatRequestAgentSubcommandPart);
         const commandPart = 'kind' in parsedRequest ? undefined : parsedRequest.parts.find((r) => r instanceof ChatRequestSlashCommandPart);
-        const requests = [...model.getRequests(false)];
+        const requests = [...model.getRequests()];
         let gotProgress = false;
         const requestType = commandPart ? 'slashCommand' : 'string';
-        const responseCreated = ( (new DeferredPromise()));
+        const responseCreated = ( new DeferredPromise());
         let responseCreatedComplete = false;
         function completeResponseCreated() {
             if (!responseCreatedComplete && request?.response) {
@@ -412,7 +412,7 @@ let ChatService = class ChatService extends Disposable {
                 responseCreatedComplete = true;
             }
         }
-        const source = ( (new CancellationTokenSource()));
+        const source = ( new CancellationTokenSource());
         const token = source.token;
         const sendRequestInternal = async () => {
             const progressCallback = (progress) => {
@@ -431,7 +431,7 @@ let ChatService = class ChatService extends Disposable {
             };
             let detectedAgent;
             let detectedCommand;
-            const stopWatch = ( (new StopWatch(false)));
+            const stopWatch = ( new StopWatch(false));
             const listener = token.onCancellationRequested(() => {
                 this.trace('sendRequest', `Request for session ${model.sessionId} was cancelled`);
                 this.telemetryService.publicLog2('interactiveSessionProviderInvoked', {
@@ -439,15 +439,16 @@ let ChatService = class ChatService extends Disposable {
                     totalTime: stopWatch.elapsed(),
                     result: 'cancelled',
                     requestType,
-                    agent: agentPart?.agent.id ?? '',
-                    agentExtensionId: agentPart?.agent.extensionId.value ?? '',
+                    agent: detectedAgent?.id ?? agentPart?.agent.id ?? '',
+                    agentExtensionId: detectedAgent?.extensionId.value ?? agentPart?.agent.extensionId.value ?? '',
                     slashCommand: agentSlashCommandPart ? agentSlashCommandPart.command.name : commandPart?.slashCommand.command,
                     chatSessionId: model.sessionId,
                     location,
                     citations: request?.response?.codeCitations.length ?? 0,
                     numCodeBlocks: getCodeBlocks(request.response?.response.toString() ?? '').length,
                     isParticipantDetected: !!detectedAgent,
-                    enableCommandDetection
+                    enableCommandDetection,
+                    attachmentKinds: this.attachmentKindsForTelemetry(request.variableData)
                 });
                 model.cancelRequest(request);
             });
@@ -494,7 +495,7 @@ let ChatService = class ChatService extends Disposable {
                             userSelectedModelId: options?.userSelectedModelId
                         };
                     };
-                    if (this.configurationService.getValue('chat.experimental.detectParticipant.enabled') !== false && this.chatAgentService.hasChatParticipantDetectionProviders() && !agentPart && !commandPart && enableCommandDetection) {
+                    if (this.configurationService.getValue('chat.detectParticipant.enabled') !== false && this.chatAgentService.hasChatParticipantDetectionProviders() && !agentPart && !commandPart && enableCommandDetection) {
                         const defaultAgentHistory = this.getHistoryEntriesFromModel(requests, model.sessionId, location, defaultAgent.id);
                         const chatAgentRequest = await prepareChatAgentRequest(defaultAgent, agentSlashCommandPart?.command, enableCommandDetection, undefined, false);
                         const result = await this.chatAgentService.detectAgentOrCommand(chatAgentRequest, defaultAgentHistory, { location }, token);
@@ -517,28 +518,28 @@ let ChatService = class ChatService extends Disposable {
                     const agentResult = await this.chatAgentService.invokeAgent(agent.id, requestProps, progressCallback, history, token);
                     rawResult = agentResult;
                     agentOrCommandFollowups = this.chatAgentService.getFollowups(agent.id, requestProps, agentResult, history, followupsCancelToken);
-                    chatTitlePromise = model.getRequests(false).length === 1 && !model.customTitle ? this.chatAgentService.getChatTitle(defaultAgent.id, this.getHistoryEntriesFromModel(model.getRequests(false), model.sessionId, location, agent.id), CancellationToken.None) : undefined;
+                    chatTitlePromise = model.getRequests().length === 1 && !model.customTitle ? this.chatAgentService.getChatTitle(defaultAgent.id, this.getHistoryEntriesFromModel(model.getRequests(), model.sessionId, location, agent.id), CancellationToken.None) : undefined;
                 }
                 else if (commandPart && this.chatSlashCommandService.hasCommand(commandPart.slashCommand.command)) {
                     request = model.addRequest(parsedRequest, { variables: [] }, attempt);
                     completeResponseCreated();
                     const history = [];
-                    for (const request of model.getRequests(false)) {
+                    for (const request of model.getRequests()) {
                         if (!request.response) {
                             continue;
                         }
-                        history.push({ role: 1 , content: [{ type: 'text', value: request.message.text }] });
-                        history.push({ role: 2 , content: [{ type: 'text', value: ( (request.response.response.toString())) }] });
+                        history.push({ role: ChatMessageRole.User, content: [{ type: 'text', value: request.message.text }] });
+                        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 => {
+                    const commandResult = await this.chatSlashCommandService.executeCommand(commandPart.slashCommand.command, message.substring(commandPart.slashCommand.command.length + 1).trimStart(), ( new Progress(p => {
                         progressCallback(p);
-                    }))), history, location, token);
+                    })), history, location, token);
                     agentOrCommandFollowups = Promise.resolve(commandResult?.followUp);
                     rawResult = {};
                 }
                 else {
-                    throw ( (new Error(`Cannot handle request`)));
+                    throw ( new Error(`Cannot handle request`));
                 }
                 if (token.isCancellationRequested) {
                     return;
@@ -546,7 +547,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(3181, "Provider returned null response")) } };
+                        rawResult = { errorDetails: { message: ( localize(4618, "Provider returned null response")) } };
                     }
                     const result = rawResult.errorDetails?.responseIsFiltered ? 'filtered' :
                         rawResult.errorDetails && gotProgress ? 'errorWithOutput' :
@@ -558,15 +559,16 @@ let ChatService = class ChatService extends Disposable {
                         totalTime: rawResult.timings?.totalElapsed,
                         result,
                         requestType,
-                        agent: agentPart?.agent.id ?? '',
-                        agentExtensionId: agentPart?.agent.extensionId.value ?? '',
+                        agent: detectedAgent?.id ?? agentPart?.agent.id ?? '',
+                        agentExtensionId: detectedAgent?.extensionId.value ?? agentPart?.agent.extensionId.value ?? '',
                         slashCommand: commandForTelemetry,
                         chatSessionId: model.sessionId,
                         enableCommandDetection,
                         isParticipantDetected: !!detectedAgent,
                         location,
                         citations: request.response?.codeCitations.length ?? 0,
-                        numCodeBlocks: getCodeBlocks(request.response?.response.toString() ?? '').length
+                        numCodeBlocks: getCodeBlocks(request.response?.response.toString() ?? '').length,
+                        attachmentKinds: this.attachmentKindsForTelemetry(request.variableData)
                     });
                     model.setResponse(request, rawResult);
                     completeResponseCreated();
@@ -592,15 +594,16 @@ let ChatService = class ChatService extends Disposable {
                     totalTime: undefined,
                     result,
                     requestType,
-                    agent: agentPart?.agent.id ?? '',
-                    agentExtensionId: agentPart?.agent.extensionId.value ?? '',
+                    agent: detectedAgent?.id ?? agentPart?.agent.id ?? '',
+                    agentExtensionId: detectedAgent?.extensionId.value ?? agentPart?.agent.extensionId.value ?? '',
                     slashCommand: agentSlashCommandPart ? agentSlashCommandPart.command.name : commandPart?.slashCommand.command,
                     chatSessionId: model.sessionId,
                     location,
                     citations: 0,
                     numCodeBlocks: 0,
                     enableCommandDetection,
-                    isParticipantDetected: !!detectedAgent
+                    isParticipantDetected: !!detectedAgent,
+                    attachmentKinds: this.attachmentKindsForTelemetry(request.variableData)
                 });
                 this.logService.error(`Error while handling chat request: ${toErrorMessage(err, true)}`);
                 if (request) {
@@ -615,7 +618,7 @@ let ChatService = class ChatService extends Disposable {
             }
         };
         const rawResponsePromise = sendRequestInternal();
-        this._pendingRequests.set(model.sessionId, ( (new CancellableRequest(source))));
+        this._pendingRequests.set(model.sessionId, ( new CancellableRequest(source)));
         rawResponsePromise.finally(() => {
             this._pendingRequests.deleteAndDispose(model.sessionId);
         });
@@ -624,6 +627,53 @@ let ChatService = class ChatService extends Disposable {
             responseCompletePromise: rawResponsePromise,
         };
     }
+    attachmentKindsForTelemetry(variableData) {
+        return ( variableData.variables.map(v => {
+            if (v.kind === 'implicit') {
+                return 'implicit';
+            }
+            else if (v.range) {
+                if (v.isTool) {
+                    return 'toolInPrompt';
+                }
+                else if (v.isDynamic) {
+                    return 'fileInPrompt';
+                }
+                else {
+                    return 'variableInPrompt';
+                }
+            }
+            else if (v.kind === 'command') {
+                return 'command';
+            }
+            else if (v.kind === 'symbol') {
+                return 'symbol';
+            }
+            else if (v.isImage) {
+                return 'image';
+            }
+            else if (v.isDirectory) {
+                return 'directory';
+            }
+            else if (v.isTool) {
+                return 'tool';
+            }
+            else if (v.isDynamic) {
+                if (URI.isUri(v.value)) {
+                    return 'file';
+                }
+                else if (isLocation(v.value)) {
+                    return 'location';
+                }
+                else {
+                    return 'otherAttachment';
+                }
+            }
+            else {
+                return 'variableAttachment';
+            }
+        }));
+    }
     getHistoryEntriesFromModel(requests, sessionId, location, forAgentId) {
         const history = [];
         for (const request of requests) {
@@ -651,7 +701,7 @@ let ChatService = class ChatService extends Disposable {
     async removeRequest(sessionId, requestId) {
         const model = this._sessionModels.get(sessionId);
         if (!model) {
-            throw ( (new Error(`Unknown session: ${sessionId}`)));
+            throw ( new Error(`Unknown session: ${sessionId}`));
         }
         await model.waitForInitialization();
         const pendingRequest = this._pendingRequests.get(sessionId);
@@ -663,11 +713,11 @@ let ChatService = class ChatService extends Disposable {
     }
     async adoptRequest(sessionId, request) {
         if (!(request instanceof ChatRequestModel)) {
-            throw ( (new TypeError('Can only adopt requests of type ChatRequestModel')));
+            throw ( new TypeError('Can only adopt requests of type ChatRequestModel'));
         }
         const target = this._sessionModels.get(sessionId);
         if (!target) {
-            throw ( (new Error(`Unknown session: ${sessionId}`)));
+            throw ( new Error(`Unknown session: ${sessionId}`));
         }
         await target.waitForInitialization();
         const oldOwner = request.session;
@@ -684,7 +734,7 @@ let ChatService = class ChatService extends Disposable {
         this.trace('addCompleteRequest', `message: ${message}`);
         const model = this._sessionModels.get(sessionId);
         if (!model) {
-            throw ( (new Error(`Unknown session: ${sessionId}`)));
+            throw ( new Error(`Unknown session: ${sessionId}`));
         }
         await model.waitForInitialization();
         const parsedRequest = typeof message === 'string' ?
@@ -692,7 +742,7 @@ let ChatService = class ChatService extends Disposable {
             message;
         const request = model.addRequest(parsedRequest, variableData || { variables: [] }, attempt ?? 0, undefined, undefined, undefined, undefined, undefined, undefined, true);
         if (typeof response.message === 'string') {
-            model.acceptResponseProgress(request, { content: ( (new MarkdownString(response.message))), kind: 'markdownContent' });
+            model.acceptResponseProgress(request, { content: ( new MarkdownString(response.message)), kind: 'markdownContent' });
         }
         else {
             for (const part of response.message) {
@@ -714,7 +764,7 @@ let ChatService = class ChatService extends Disposable {
         this.trace('clearSession', `sessionId: ${sessionId}`);
         const model = this._sessionModels.get(sessionId);
         if (!model) {
-            throw ( (new Error(`Unknown session: ${sessionId}`)));
+            throw ( new Error(`Unknown session: ${sessionId}`));
         }
         if (model.initialLocation === ChatAgentLocation.Panel) {
             const sessionData = JSON.parse(JSON.stringify(model));
@@ -727,40 +777,38 @@ let ChatService = class ChatService extends Disposable {
         this._onDidDisposeSession.fire({ sessionId, reason: 'cleared' });
     }
     hasSessions() {
-        return !!( (Object.values(this._persistedSessions)));
+        return ( Object.values(this._persistedSessions)).length > 0;
     }
     transferChatSession(transferredSessionData, toWorkspace) {
-        const model = Iterable.find(( (this._sessionModels.values())), model => model.sessionId === transferredSessionData.sessionId);
+        const model = Iterable.find(( this._sessionModels.values()), model => model.sessionId === transferredSessionData.sessionId);
         if (!model) {
-            throw ( (new Error(
+            throw ( new Error(
                 `Failed to transfer session. Unknown session ID: ${transferredSessionData.sessionId}`
-            )));
+            ));
         }
-        const existingRaw = this.storageService.getObject(globalChatKey, 0 , []);
+        const existingRaw = this.storageService.getObject(globalChatKey, StorageScope.PROFILE, []);
         existingRaw.push({
             chat: model.toJSON(),
             timestampInMilliseconds: Date.now(),
             toWorkspace: toWorkspace,
             inputValue: transferredSessionData.inputValue,
         });
-        this.storageService.store(globalChatKey, JSON.stringify(existingRaw), 0 , 1 );
-        this.trace('transferChatSession', `Transferred session ${model.sessionId} to workspace ${( (toWorkspace.toString()))}`);
+        this.storageService.store(globalChatKey, JSON.stringify(existingRaw), StorageScope.PROFILE, StorageTarget.MACHINE);
+        this.trace('transferChatSession', `Transferred session ${model.sessionId} to workspace ${( toWorkspace.toString())}`);
     }
 };
-ChatService = ( (__decorate([
-    ( (__param(0, IStorageService))),
-    ( (__param(1, ILogService))),
-    ( (__param(2, IExtensionService))),
-    ( (__param(3, IInstantiationService))),
-    ( (__param(4, ITelemetryService))),
-    ( (__param(5, IWorkspaceContextService))),
-    ( (__param(6, IChatSlashCommandService))),
-    ( (__param(7, IChatVariablesService))),
-    ( (__param(8, IChatAgentService))),
-    ( (__param(9, IWorkbenchAssignmentService))),
-    ( (__param(10, IContextKeyService))),
-    ( (__param(11, IConfigurationService)))
-], ChatService)));
+ChatService = ( __decorate([
+    ( __param(0, IStorageService)),
+    ( __param(1, ILogService)),
+    ( __param(2, IExtensionService)),
+    ( __param(3, IInstantiationService)),
+    ( __param(4, ITelemetryService)),
+    ( __param(5, IWorkspaceContextService)),
+    ( __param(6, IChatSlashCommandService)),
+    ( __param(7, IChatVariablesService)),
+    ( __param(8, IChatAgentService)),
+    ( __param(9, IConfigurationService))
+], ChatService));
 function getCodeBlocks(text) {
     const lines = text.split('\n');
     const codeBlockLanguages = [];
@@ -768,7 +816,7 @@ function getCodeBlocks(text) {
     for (let i = 0; i < lines.length; i++) {
         const line = lines[i];
         if (codeBlockState) {
-            if (( (new RegExp(`^\\s*${codeBlockState.delimiter}\\s*$`))).test(line)) {
+            if (( new RegExp(`^\\s*${codeBlockState.delimiter}\\s*$`)).test(line)) {
                 codeBlockLanguages.push(codeBlockState.languageId);
                 codeBlockState = undefined;
             }

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

@@ -0,0 +1,8 @@
+import { ITelemetryService } from "vscode/vscode/vs/platform/telemetry/common/telemetry.service";
+import { IChatUserActionEvent } from "vscode/vscode/vs/workbench/contrib/chat/common/chatService";
+export declare class ChatServiceTelemetry {
+    private readonly telemetryService;
+    constructor(telemetryService: ITelemetryService);
+    notifyUserAction(action: IChatUserActionEvent): void;
+    retrievedFollowups(agentId: string, command: string | undefined, numFollowups: number): void;
+}

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

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 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';