@codingame/monaco-vscode-chat-service-override 20.4.1 → 21.0.0

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

@@ -14,7 +14,6 @@ import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/in
 import { StopWatch } from '@codingame/monaco-vscode-api/vscode/vs/base/common/stopwatch';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { OffsetRange } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/ranges/offsetRange';
-import { isLocation } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 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';
@@ -22,7 +21,6 @@ import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log
 import { Progress } from '@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress';
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 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 { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { IMcpService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service';
@@ -30,16 +28,14 @@ import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbe
 import { normalizeSerializableChatData, ChatModel, ChatRequestRemovalReason, updateRanges, toChatHistoryContent, ChatRequestModel } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel';
 import { ChatRequestTextPart, ChatRequestAgentPart, ChatRequestAgentSubcommandPart, chatSubcommandLeader, chatAgentLeader, ChatRequestSlashCommandPart, getPromptText } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import { ChatRequestParser } from '@codingame/monaco-vscode-0af61f78-dfc5-57ba-8d32-66268c8de38d-common/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
-import { ChatServiceTelemetry } from './chatServiceTelemetry.js';
+import { ChatServiceTelemetry, ChatRequestTelemetry } from './chatServiceTelemetry.js';
 import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
 import { ChatSessionStore } from './chatSessionStore.js';
 import { IChatSlashCommandService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSlashCommands.service';
 import { IChatTransferService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatTransferService.service';
 import { ChatSessionUri } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatUri';
-import { isImageVariableEntry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariableEntries';
 import { ChatConfiguration, ChatAgentLocation, ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { ChatMessageRole } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels';
-import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
 import { ObservableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/map';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
@@ -82,19 +78,17 @@ let ChatService = class ChatService extends Disposable {
         const workspace = this.workspaceContextService.getWorkspace();
         return !workspace.configuration && workspace.folders.length === 0;
     }
-    constructor(storageService, logService, extensionService, instantiationService, telemetryService, workspaceContextService, chatSlashCommandService, chatAgentService, configurationService, chatTransferService, languageModelsService, chatSessionService, mcpService) {
+    constructor(storageService, logService, extensionService, instantiationService, workspaceContextService, chatSlashCommandService, chatAgentService, configurationService, chatTransferService, chatSessionService, mcpService) {
         super();
         this.storageService = storageService;
         this.logService = logService;
         this.extensionService = extensionService;
         this.instantiationService = instantiationService;
-        this.telemetryService = telemetryService;
         this.workspaceContextService = workspaceContextService;
         this.chatSlashCommandService = chatSlashCommandService;
         this.chatAgentService = chatAgentService;
         this.configurationService = configurationService;
         this.chatTransferService = chatTransferService;
-        this.languageModelsService = languageModelsService;
         this.chatSessionService = chatSessionService;
         this.mcpService = mcpService;
         this._sessionModels = ( new ObservableMap());
@@ -135,6 +129,7 @@ let ChatService = class ChatService extends Disposable {
         this._chatSessionStore = this._register(this.instantiationService.createInstance(ChatSessionStore));
         if (this.useFileStorage) {
             this._chatSessionStore.migrateDataIfNeeded(() => this._persistedSessions);
+            this.initializePersistedSessionsFromFileStorage();
         }
         this._register(storageService.onWillSaveState(() => this.saveState()));
         this.requestInProgressObs = derived(reader => {
@@ -147,7 +142,7 @@ let ChatService = class ChatService extends Disposable {
     }
     saveState() {
         const liveChats = Array.from(( this._sessionModels.values()))
-            .filter(session => session.initialLocation === ChatAgentLocation.Panel);
+            .filter(session => !session.inputType && (session.initialLocation === ChatAgentLocation.Panel || session.initialLocation === ChatAgentLocation.Editor));
         if (this.useFileStorage) {
             this._chatSessionStore.storeSessions(liveChats);
         }
@@ -224,15 +219,32 @@ let ChatService = class ChatService extends Disposable {
         const model = this._sessionModels.get(sessionId);
         if (model) {
             model.setCustomTitle(title);
-            return;
         }
         if (this.useFileStorage) {
             await this._chatSessionStore.setSessionTitle(sessionId, title);
-            return;
+            await this.saveState();
         }
-        const session = this._persistedSessions[sessionId];
-        if (session) {
-            session.customTitle = title;
+        else {
+            if (this._persistedSessions[sessionId]) {
+                this._persistedSessions[sessionId].customTitle = title;
+            }
+            else {
+                this._persistedSessions[sessionId] = {
+                    version: 3,
+                    sessionId: sessionId,
+                    customTitle: title,
+                    creationDate: Date.now(),
+                    lastMessageDate: Date.now(),
+                    isImported: false,
+                    initialLocation: undefined,
+                    requests: [],
+                    requesterUsername: '',
+                    responderUsername: '',
+                    requesterAvatarIconUri: undefined,
+                    responderAvatarIconUri: undefined,
+                };
+            }
+            await this.saveState();
         }
     }
     trace(method, message) {
@@ -289,12 +301,36 @@ let ChatService = class ChatService extends Disposable {
         this.storageService.store(globalChatKey, JSON.stringify(filtered), StorageScope.PROFILE, StorageTarget.MACHINE);
         return transferred;
     }
+    async initializePersistedSessionsFromFileStorage() {
+        const index = await this._chatSessionStore.getIndex();
+        const sessionIds = ( Object.keys(index));
+        for (const sessionId of sessionIds) {
+            const metadata = index[sessionId];
+            if (metadata && !this._persistedSessions[sessionId]) {
+                const minimalSession = {
+                    version: 3,
+                    sessionId: sessionId,
+                    customTitle: metadata.title,
+                    creationDate: Date.now(),
+                    lastMessageDate: metadata.lastMessageDate,
+                    isImported: metadata.isImported || false,
+                    initialLocation: metadata.initialLocation,
+                    requests: [],
+                    requesterUsername: '',
+                    responderUsername: '',
+                    requesterAvatarIconUri: undefined,
+                    responderAvatarIconUri: undefined,
+                };
+                this._persistedSessions[sessionId] = minimalSession;
+            }
+        }
+    }
     async getHistory() {
         if (this.useFileStorage) {
             const liveSessionItems = ( Array.from(( this._sessionModels.values()))
-                .filter(session => !session.isImported)
+                .filter(session => !session.isImported && !session.inputType)
                 .map(session => {
-                const title = session.title || ( localize(5416, "New Chat"));
+                const title = session.title || ( localize(5544, "New Chat"));
                 return {
                     sessionId: session.sessionId,
                     title,
@@ -328,7 +364,7 @@ let ChatService = class ChatService extends Disposable {
         const liveSessionItems = ( Array.from(( this._sessionModels.values()))
             .filter(session => !session.isImported)
             .map(session => {
-            const title = session.title || ( localize(5416, "New Chat"));
+            const title = session.title || ( localize(5544, "New Chat"));
             return {
                 sessionId: session.sessionId,
                 title,
@@ -358,12 +394,12 @@ let ChatService = class ChatService extends Disposable {
         this._persistedSessions = {};
         this.saveState();
     }
-    startSession(location, token, isGlobalEditingSession = true) {
+    startSession(location, token, isGlobalEditingSession = true, inputType) {
         this.trace('startSession');
-        return this._startSession(undefined, location, isGlobalEditingSession, token);
+        return this._startSession(undefined, location, isGlobalEditingSession, token, inputType);
     }
-    _startSession(someSessionHistory, location, isGlobalEditingSession, token) {
-        const model = this.instantiationService.createInstance(ChatModel, someSessionHistory, location);
+    _startSession(someSessionHistory, location, isGlobalEditingSession, token, inputType) {
+        const model = this.instantiationService.createInstance(ChatModel, someSessionHistory, { initialLocation: location, inputType });
         if (location === ChatAgentLocation.Panel) {
             model.startEditingSession(isGlobalEditingSession);
         }
@@ -426,6 +462,24 @@ let ChatService = class ChatService extends Disposable {
         }
         return this._chatSessionStore.isSessionEmpty(sessionId);
     }
+    getPersistedSessionTitle(sessionId) {
+        const session = this._persistedSessions[sessionId];
+        if (session) {
+            const title = session.customTitle || ChatModel.getDefaultTitle(session.requests);
+            return title;
+        }
+        if (this.useFileStorage) {
+            const internalGetIndex = this._chatSessionStore.internalGetIndex;
+            if (typeof internalGetIndex === 'function') {
+                const indexData = internalGetIndex.call(this._chatSessionStore);
+                const metadata = indexData.entries[sessionId];
+                if (metadata && metadata.title) {
+                    return metadata.title;
+                }
+            }
+        }
+        return undefined;
+    }
     loadSessionFromContent(data) {
         return this._startSession(data, data.initialLocation ?? ChatAgentLocation.Panel, true, CancellationToken.None);
     }
@@ -438,9 +492,12 @@ let ChatService = class ChatService extends Disposable {
         if (existing) {
             return existing.model;
         }
+        if (parsed.chatSessionType === 'local') {
+            return this.getOrRestoreSession(parsed.sessionId);
+        }
         const chatSessionType = parsed.chatSessionType;
         const content = await this.chatSessionService.provideChatSessionContent(chatSessionType, parsed.sessionId, CancellationToken.None);
-        const model = this._startSession(undefined, location, true, CancellationToken.None);
+        const model = this._startSession(undefined, location, true, CancellationToken.None, chatSessionType);
         if (!( this._contentProviderSessionModels.has(chatSessionType))) {
             this._contentProviderSessionModels.set(chatSessionType, ( new Map()));
         }
@@ -453,15 +510,20 @@ let ChatService = class ChatService extends Disposable {
         let lastRequest;
         for (const message of content.history) {
             if (message.type === 'request') {
+                if (lastRequest) {
+                    model.completeResponse(lastRequest);
+                }
                 const requestText = message.prompt;
                 const parsedRequest = {
                     text: requestText,
                     parts: [( new ChatRequestTextPart(( new OffsetRange(0, requestText.length)), { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: requestText.length + 1 }, requestText))]
                 };
+                const agent = message.participant
+                    ? this.chatAgentService.getAgent(message.participant)
+                    : this.chatAgentService.getAgent(chatSessionType);
                 lastRequest = model.addRequest(parsedRequest, { variables: [] },
                 0,
-                undefined,
-                undefined,
+                undefined, agent, undefined,
                 undefined,
                 undefined,
                 undefined,
@@ -476,7 +538,7 @@ let ChatService = class ChatService extends Disposable {
                 }
             }
         }
-        if (content.progressEvent && lastRequest) {
+        if (content.progressObs && lastRequest && content.interruptActiveResponseCallback) {
             const initialCancellationRequest = this.instantiationService.createInstance(CancellableRequest, ( new CancellationTokenSource()), undefined);
             this._pendingRequests.set(model.sessionId, initialCancellationRequest);
             const cancellationListener = ( new MutableDisposable());
@@ -493,15 +555,20 @@ let ChatService = class ChatService extends Disposable {
             };
             cancellationListener.value = createCancellationListener(initialCancellationRequest.cancellationTokenSource.token);
             disposables.add(cancellationListener);
-            disposables.add(content.progressEvent(e => {
-                for (const progress of e) {
-                    if (progress.kind === 'progressMessage' && progress.content.value === 'Session completed') {
-                        model?.completeResponse(lastRequest);
-                        cancellationListener.clear();
-                    }
-                    else {
+            let lastProgressLength = 0;
+            disposables.add(autorun(reader => {
+                const progressArray = content.progressObs?.read(reader) ?? [];
+                const isComplete = content.isCompleteObs?.read(reader) ?? false;
+                if (progressArray.length > lastProgressLength) {
+                    const newProgress = progressArray.slice(lastProgressLength);
+                    for (const progress of newProgress) {
                         model?.acceptResponseProgress(lastRequest, progress);
                     }
+                    lastProgressLength = progressArray.length;
+                }
+                if (isComplete) {
+                    model?.completeResponse(lastRequest);
+                    cancellationListener.clear();
                 }
             }));
         }
@@ -525,7 +592,7 @@ let ChatService = class ChatService extends Disposable {
         const location = options?.location ?? model.initialLocation;
         const attempt = options?.attempt ?? 0;
         const enableCommandDetection = !options?.noCommandDetection;
-        const defaultAgent = this.chatAgentService.getDefaultAgent(location, options?.mode);
+        const defaultAgent = this.chatAgentService.getDefaultAgent(location, options?.modeInfo?.kind);
         model.removeRequest(request.id, ChatRequestRemovalReason.Resend);
         const resendOptions = {
             ...options,
@@ -536,7 +603,7 @@ let ChatService = class ChatService extends Disposable {
     }
     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?.slashCommand && !options?.agentId && !options?.agentIdSilent) {
             this.trace('sendRequest', 'Rejected empty message');
             return;
         }
@@ -562,12 +629,13 @@ let ChatService = class ChatService extends Disposable {
         }
         const location = options?.location ?? model.initialLocation;
         const attempt = options?.attempt ?? 0;
-        const defaultAgent = this.chatAgentService.getDefaultAgent(location, options?.mode);
+        const defaultAgent = this.chatAgentService.getDefaultAgent(location, options?.modeInfo?.kind);
         const parsedRequest = this.parseChatRequest(sessionId, request, location, options);
-        const agent = parsedRequest.parts.find((r) => r instanceof ChatRequestAgentPart)?.agent ?? defaultAgent;
+        const silentAgent = options?.agentIdSilent ? this.chatAgentService.getAgent(options.agentIdSilent) : undefined;
+        const agent = silentAgent ?? parsedRequest.parts.find((r) => r instanceof ChatRequestAgentPart)?.agent ?? defaultAgent;
         const agentSlashCommandPart = parsedRequest.parts.find((r) => r instanceof ChatRequestAgentSubcommandPart);
         return {
-            ...this._sendRequestAsync(model, sessionId, parsedRequest, attempt, !options?.noCommandDetection, defaultAgent, location, options),
+            ...this._sendRequestAsync(model, sessionId, parsedRequest, attempt, !options?.noCommandDetection, silentAgent ?? defaultAgent, location, options),
             agent,
             slashCommand: agentSlashCommandPart?.command,
         };
@@ -579,7 +647,7 @@ let ChatService = class ChatService extends Disposable {
             if (!agent) {
                 throw ( new Error(`Unknown agent: ${options.agentId}`));
             }
-            parserContext = { selectedAgent: agent, mode: options.mode };
+            parserContext = { selectedAgent: agent, mode: options.modeInfo?.kind };
             const commandPart = options.slashCommand ? ` ${chatSubcommandLeader}${options.slashCommand}` : '';
             request = `${chatAgentLeader}${agent.name}${commandPart} ${request}`;
         }
@@ -599,6 +667,15 @@ let ChatService = class ChatService extends Disposable {
         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()];
+        const requestTelemetry = this.instantiationService.createInstance(ChatRequestTelemetry, {
+            agentPart,
+            agentSlashCommandPart,
+            commandPart,
+            sessionId: model.sessionId,
+            location: model.initialLocation,
+            options,
+            enableCommandDetection
+        });
         let gotProgress = false;
         const requestType = commandPart ? 'slashCommand' : 'string';
         const responseCreated = ( new DeferredPromise());
@@ -639,22 +716,13 @@ let ChatService = class ChatService extends Disposable {
                 if (!request) {
                     return;
                 }
-                this.telemetryService.publicLog2('interactiveSessionProviderInvoked', {
+                requestTelemetry.complete({
                     timeToFirstProgress: undefined,
-                    totalTime: stopWatch.elapsed(),
                     result: 'cancelled',
+                    totalTime: stopWatch.elapsed(),
                     requestType,
-                    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,
-                    attachmentKinds: this.attachmentKindsForTelemetry(request.variableData),
-                    model: this.resolveModelId(options?.userSelectedModelId),
+                    detectedAgent,
+                    request,
                 });
                 model.cancelRequest(request);
             }));
@@ -665,7 +733,7 @@ let ChatService = class ChatService extends Disposable {
                 if (agentPart || (defaultAgent && !commandPart)) {
                     const prepareChatAgentRequest = (agent, command, enableCommandDetection, chatRequest, isParticipantDetected) => {
                         const initVariableData = { variables: [] };
-                        request = chatRequest ?? model.addRequest(parsedRequest, initVariableData, attempt, agent, command, options?.confirmation, options?.locationData, options?.attachedContext, undefined, options?.userSelectedModelId);
+                        request = chatRequest ?? model.addRequest(parsedRequest, initVariableData, attempt, options?.modeInfo, agent, command, options?.confirmation, options?.locationData, options?.attachedContext, undefined, options?.userSelectedModelId);
                         let variableData;
                         let message;
                         if (chatRequest) {
@@ -687,7 +755,7 @@ let ChatService = class ChatService extends Disposable {
                                 return;
                             }
                             if (tools) {
-                                this.chatAgentService.setRequestTools(agent.id, request.id, { userSelectedTools: tools });
+                                this.chatAgentService.setRequestTools(agent.id, request.id, tools);
                             }
                         }));
                         return {
@@ -706,11 +774,19 @@ let ChatService = class ChatService extends Disposable {
                             rejectedConfirmationData: options?.rejectedConfirmationData,
                             userSelectedModelId: options?.userSelectedModelId,
                             userSelectedTools: options?.userSelectedTools?.get(),
-                            modeInstructions: options?.modeInstructions,
+                            modeInstructions: options?.modeInfo?.instructions,
                             editedFileEvents: request.editedFileEvents
                         };
                     };
-                    if (this.configurationService.getValue('chat.detectParticipant.enabled') !== false && this.chatAgentService.hasChatParticipantDetectionProviders() && !agentPart && !commandPart && !agentSlashCommandPart && enableCommandDetection && options?.mode !== ChatModeKind.Agent && options?.mode !== ChatModeKind.Edit) {
+                    if (this.configurationService.getValue('chat.detectParticipant.enabled') !== false &&
+                        this.chatAgentService.hasChatParticipantDetectionProviders() &&
+                        !agentPart &&
+                        !commandPart &&
+                        !agentSlashCommandPart &&
+                        enableCommandDetection &&
+                        options?.modeInfo?.kind !== ChatModeKind.Agent &&
+                        options?.modeInfo?.kind !== ChatModeKind.Edit &&
+                        !options?.agentIdSilent) {
                         const defaultAgentHistory = this.getHistoryEntriesFromModel(requests, model.sessionId, location, defaultAgent.id);
                         const chatAgentRequest = prepareChatAgentRequest(defaultAgent, undefined, enableCommandDetection, undefined, false);
                         const result = await this.chatAgentService.detectAgentOrCommand(chatAgentRequest, defaultAgentHistory, { location }, token);
@@ -740,7 +816,7 @@ let ChatService = class ChatService extends Disposable {
                 }
                 else if (commandPart && this.chatSlashCommandService.hasCommand(commandPart.slashCommand.command)) {
                     if (commandPart.slashCommand.silent !== true) {
-                        request = model.addRequest(parsedRequest, { variables: [] }, attempt);
+                        request = model.addRequest(parsedRequest, { variables: [] }, attempt, options?.modeInfo);
                         completeResponseCreated();
                     }
                     const history = [];
@@ -767,29 +843,19 @@ let ChatService = class ChatService extends Disposable {
                 else {
                     if (!rawResult) {
                         this.trace('sendRequest', `Provider returned no response for session ${model.sessionId}`);
-                        rawResult = { errorDetails: { message: ( localize(5417, "Provider returned null response")) } };
+                        rawResult = { errorDetails: { message: ( localize(5545, "Provider returned null response")) } };
                     }
                     const result = rawResult.errorDetails?.responseIsFiltered ? 'filtered' :
                         rawResult.errorDetails && gotProgress ? 'errorWithOutput' :
                             rawResult.errorDetails ? 'error' :
                                 'success';
-                    const commandForTelemetry = agentSlashCommandPart ? agentSlashCommandPart.command.name : commandPart?.slashCommand.command;
-                    this.telemetryService.publicLog2('interactiveSessionProviderInvoked', {
+                    requestTelemetry.complete({
                         timeToFirstProgress: rawResult.timings?.firstProgress,
                         totalTime: rawResult.timings?.totalElapsed,
                         result,
                         requestType,
-                        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,
-                        attachmentKinds: this.attachmentKindsForTelemetry(request.variableData),
-                        model: this.resolveModelId(options?.userSelectedModelId),
+                        detectedAgent,
+                        request,
                     });
                     model.setResponse(request, rawResult);
                     completeResponseCreated();
@@ -798,6 +864,7 @@ let ChatService = class ChatService extends Disposable {
                     if (agentOrCommandFollowups) {
                         agentOrCommandFollowups.then(followups => {
                             model.setFollowups(request, followups);
+                            const commandForTelemetry = agentSlashCommandPart ? agentSlashCommandPart.command.name : commandPart?.slashCommand.command;
                             this._chatServiceTelemetry.retrievedFollowups(agentPart?.agent.id ?? '', commandForTelemetry, followups?.length ?? 0);
                         });
                     }
@@ -810,23 +877,13 @@ let ChatService = class ChatService extends Disposable {
             }
             catch (err) {
                 this.logService.error(`Error while handling chat request: ${toErrorMessage(err, true)}`);
-                const result = 'error';
-                this.telemetryService.publicLog2('interactiveSessionProviderInvoked', {
+                requestTelemetry.complete({
                     timeToFirstProgress: undefined,
                     totalTime: undefined,
-                    result,
+                    result: 'error',
                     requestType,
-                    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,
-                    attachmentKinds: request ? this.attachmentKindsForTelemetry(request.variableData) : [],
-                    model: this.resolveModelId(options?.userSelectedModelId)
+                    detectedAgent,
+                    request,
                 });
                 if (request) {
                     const rawResult = { errorDetails: { message: err.message } };
@@ -850,9 +907,6 @@ let ChatService = class ChatService extends Disposable {
             responseCompletePromise: rawResponsePromise,
         };
     }
-    resolveModelId(userSelectedModelId) {
-        return userSelectedModelId && this.languageModelsService.lookupLanguageModel(userSelectedModelId)?.id;
-    }
     prepareContext(attachedContextVariables) {
         attachedContextVariables ??= [];
         attachedContextVariables.sort((a, b) => {
@@ -869,53 +923,6 @@ let ChatService = class ChatService extends Disposable {
         });
         return attachedContextVariables;
     }
-    attachmentKindsForTelemetry(variableData) {
-        return ( variableData.variables.map(v => {
-            if (v.kind === 'implicit') {
-                return 'implicit';
-            }
-            else if (v.range) {
-                if (v.kind === 'tool') {
-                    return 'toolInPrompt';
-                }
-                else if (v.kind === 'toolset') {
-                    return 'toolsetInPrompt';
-                }
-                else {
-                    return 'fileInPrompt';
-                }
-            }
-            else if (v.kind === 'command') {
-                return 'command';
-            }
-            else if (v.kind === 'symbol') {
-                return 'symbol';
-            }
-            else if (isImageVariableEntry(v)) {
-                return 'image';
-            }
-            else if (v.kind === 'directory') {
-                return 'directory';
-            }
-            else if (v.kind === 'tool') {
-                return 'tool';
-            }
-            else if (v.kind === 'toolset') {
-                return 'toolset';
-            }
-            else {
-                if (URI.isUri(v.value)) {
-                    return 'file';
-                }
-                else if (isLocation(v.value)) {
-                    return 'location';
-                }
-                else {
-                    return 'otherAttachment';
-                }
-            }
-        }));
-    }
     getHistoryEntriesFromModel(requests, sessionId, location, forAgentId) {
         const history = [];
         const agent = this.chatAgentService.getAgent(forAgentId);
@@ -980,7 +987,7 @@ let ChatService = class ChatService extends Disposable {
         const parsedRequest = typeof message === 'string' ?
             this.instantiationService.createInstance(ChatRequestParser).parseChatRequest(sessionId, message) :
             message;
-        const request = model.addRequest(parsedRequest, variableData || { variables: [] }, attempt ?? 0, undefined, undefined, undefined, undefined, undefined, true);
+        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' });
         }
@@ -1006,9 +1013,10 @@ let ChatService = class ChatService extends Disposable {
         if (!model) {
             throw ( new Error(`Unknown session: ${sessionId}`));
         }
-        if (model.initialLocation === ChatAgentLocation.Panel) {
+        this.trace(`Model input type: ${model.inputType}`);
+        if (!model.inputType && (model.initialLocation === ChatAgentLocation.Panel || model.initialLocation === ChatAgentLocation.Editor)) {
             if (this.useFileStorage) {
-                if (model.getRequests().length === 0) {
+                if (model.getRequests().length === 0 && !model.customTitle) {
                     await this._chatSessionStore.deleteSession(sessionId);
                 }
                 else {
@@ -1016,7 +1024,7 @@ let ChatService = class ChatService extends Disposable {
                 }
             }
             else {
-                if (model.getRequests().length === 0) {
+                if (model.getRequests().length === 0 && !model.customTitle) {
                     delete this._persistedSessions[sessionId];
                 }
                 else {
@@ -1075,36 +1083,13 @@ ChatService = ( __decorate([
     ( __param(1, ILogService)),
     ( __param(2, IExtensionService)),
     ( __param(3, IInstantiationService)),
-    ( __param(4, ITelemetryService)),
-    ( __param(5, IWorkspaceContextService)),
-    ( __param(6, IChatSlashCommandService)),
-    ( __param(7, IChatAgentService)),
-    ( __param(8, IConfigurationService)),
-    ( __param(9, IChatTransferService)),
-    ( __param(10, ILanguageModelsService)),
-    ( __param(11, IChatSessionsService)),
-    ( __param(12, IMcpService))
+    ( __param(4, IWorkspaceContextService)),
+    ( __param(5, IChatSlashCommandService)),
+    ( __param(6, IChatAgentService)),
+    ( __param(7, IConfigurationService)),
+    ( __param(8, IChatTransferService)),
+    ( __param(9, IChatSessionsService)),
+    ( __param(10, IMcpService))
 ], ChatService));
-function getCodeBlocks(text) {
-    const lines = text.split('\n');
-    const codeBlockLanguages = [];
-    let codeBlockState;
-    for (let i = 0; i < lines.length; i++) {
-        const line = lines[i];
-        if (codeBlockState) {
-            if (( new RegExp(`^\\s*${codeBlockState.delimiter}\\s*$`)).test(line)) {
-                codeBlockLanguages.push(codeBlockState.languageId);
-                codeBlockState = undefined;
-            }
-        }
-        else {
-            const match = line.match(/^(\s*)(`{3,}|~{3,})(\w*)/);
-            if (match) {
-                codeBlockState = { delimiter: match[2], languageId: match[3] };
-            }
-        }
-    }
-    return codeBlockLanguages;
-}
 
 export { ChatService };