@codingame/monaco-vscode-chat-service-override 21.6.0 → 22.0.0

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

@@ -2,7 +2,6 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { DeferredPromise } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { CancellationToken, CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
-import { memoize } from '@codingame/monaco-vscode-api/vscode/vs/base/common/decorators';
 import { toErrorMessage } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errorMessage';
 import { ErrorNoTelemetry } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
@@ -12,6 +11,7 @@ import { Disposable, DisposableMap, DisposableStore, MutableDisposable } from '@
 import { revive } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshalling';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { StopWatch } from '@codingame/monaco-vscode-api/vscode/vs/base/common/stopwatch';
+import { isDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 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 { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
@@ -27,7 +27,7 @@ import { IMcpService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/co
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
 import { normalizeSerializableChatData, ChatModel, ChatRequestRemovalReason, updateRanges, toChatHistoryContent, ChatRequestModel } from '@codingame/monaco-vscode-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 { ChatRequestParser } from '@codingame/monaco-vscode-5084de40-f866-5cb5-9d9b-33a10f6f235d-common/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
 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';
@@ -42,9 +42,8 @@ import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/obse
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 const serializedChatKey = 'interactive.sessions';
-const globalChatKey = 'chat.workspaceTransfer';
+const TransferredGlobalChatKey = 'chat.workspaceTransfer';
 const SESSION_TRANSFER_EXPIRATION_IN_MILLISECONDS = 1000 * 60;
-const maxPersistedSessions = 25;
 let CancellableRequest = class CancellableRequest {
     constructor(cancellationTokenSource, requestId, toolsService) {
         this.cancellationTokenSource = cancellationTokenSource;
@@ -68,9 +67,6 @@ let ChatService = class ChatService extends Disposable {
     get transferredSessionData() {
         return this._transferredSessionData;
     }
-    get useFileStorage() {
-        return this.configurationService.getValue(ChatConfiguration.UseFileStorage);
-    }
     get edits2Enabled() {
         return this.configurationService.getValue(ChatConfiguration.Edits2Enabled);
     }
@@ -93,8 +89,8 @@ let ChatService = class ChatService extends Disposable {
         this.mcpService = mcpService;
         this._sessionModels = ( new ObservableMap());
         this._contentProviderSessionModels = ( new Map());
+        this._modelToExternalSession = ( new Map());
         this._pendingRequests = this._register(( new DisposableMap()));
-        this._deletedChatIds = ( new Set());
         this._onDidSubmitRequest = this._register(( new Emitter()));
         this.onDidSubmitRequest = this._onDidSubmitRequest.event;
         this._onDidPerformUserAction = this._register(( new Emitter()));
@@ -102,6 +98,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._mcpServersInteractionMessageShown = ( new WeakSet());
         this._chatServiceTelemetry = this.instantiationService.createInstance(ChatServiceTelemetry);
         const sessionData = storageService.get(serializedChatKey, this.isEmptyWindow ? StorageScope.APPLICATION : StorageScope.WORKSPACE, '');
         if (sessionData) {
@@ -127,83 +124,24 @@ 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._chatSessionStore.migrateDataIfNeeded(() => this._persistedSessions);
+        this.initializePersistedSessionsFromFileStorage();
         this._register(storageService.onWillSaveState(() => this.saveState()));
         this.requestInProgressObs = derived(reader => {
             const models = ( this._sessionModels.observable.read(reader).values());
             return ( Array.from(models).some(model => model.requestInProgressObs.read(reader)));
         });
     }
+    get editingSessions() {
+        return ( [...( this._sessionModels.values())].map(v => v.editingSession)).filter(isDefined);
+    }
     isEnabled(location) {
         return this.chatAgentService.getContributedDefaultAgent(location) !== undefined;
     }
     saveState() {
         const liveChats = Array.from(( this._sessionModels.values()))
-            .filter(session => !session.inputType && (session.initialLocation === ChatAgentLocation.Panel || session.initialLocation === ChatAgentLocation.Editor));
-        if (this.useFileStorage) {
-            this._chatSessionStore.storeSessions(liveChats);
-        }
-        else {
-            if (this.isEmptyWindow) {
-                this.syncEmptyWindowChats(liveChats);
-            }
-            else {
-                let allSessions = liveChats;
-                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);
-                if (allSessions.length) {
-                    this.trace('onWillSaveState', `Persisting ${allSessions.length} sessions`);
-                }
-                const serialized = JSON.stringify(allSessions);
-                if (allSessions.length) {
-                    this.trace('onWillSaveState', `Persisting ${serialized.length} chars`);
-                }
-                this.storageService.store(serializedChatKey, serialized, StorageScope.WORKSPACE, StorageTarget.MACHINE);
-            }
-        }
-        this._deletedChatIds.clear();
-    }
-    syncEmptyWindowChats(thisWindowChats) {
-        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;
-            if (countsForLog > 0) {
-                this.trace('constructor', `Restored ${countsForLog} persisted sessions`);
-            }
-        }
-        else {
-            persistedSessions = {};
-        }
-        this._deletedChatIds.forEach(id => delete persistedSessions[id]);
-        ( Object.values(originalPersistedSessions)).forEach(session => {
-            const persistedSession = persistedSessions[session.sessionId];
-            if (persistedSession && session.requests.length > persistedSession.requests.length) {
-                persistedSessions[session.sessionId] = session;
-            }
-            else if (!persistedSession && session.isNew) {
-                session.isNew = false;
-                persistedSessions[session.sessionId] = session;
-            }
-        });
-        this._persistedSessions = persistedSessions;
-        const allSessions = { ...this._persistedSessions };
-        for (const chat of thisWindowChats) {
-            allSessions[chat.sessionId] = chat;
-        }
-        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, StorageScope.APPLICATION, StorageTarget.MACHINE);
+            .filter(session => !session.inputType && (session.initialLocation === ChatAgentLocation.Chat || session.initialLocation === ChatAgentLocation.EditorInline));
+        this._chatSessionStore.storeSessions(liveChats);
     }
     notifyUserAction(action) {
         this._chatServiceTelemetry.notifyUserAction(action);
@@ -220,32 +158,8 @@ let ChatService = class ChatService extends Disposable {
         if (model) {
             model.setCustomTitle(title);
         }
-        if (this.useFileStorage) {
-            await this._chatSessionStore.setSessionTitle(sessionId, title);
-            await this.saveState();
-        }
-        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();
-        }
+        await this._chatSessionStore.setSessionTitle(sessionId, title);
+        this.saveState();
     }
     trace(method, message) {
         if (message) {
@@ -289,7 +203,7 @@ let ChatService = class ChatService extends Disposable {
         }
     }
     getTransferredSessionData() {
-        const data = this.storageService.getObject(globalChatKey, StorageScope.PROFILE, []);
+        const data = this.storageService.getObject(TransferredGlobalChatKey, StorageScope.PROFILE, []);
         const workspaceUri = this.workspaceContextService.getWorkspace().folders[0]?.uri;
         if (!workspaceUri) {
             return;
@@ -298,7 +212,7 @@ let ChatService = class ChatService extends Disposable {
         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), StorageScope.PROFILE, StorageTarget.MACHINE);
+        this.storageService.store(TransferredGlobalChatKey, JSON.stringify(filtered), StorageScope.PROFILE, StorageTarget.MACHINE);
         return transferred;
     }
     async initializePersistedSessionsFromFileStorage() {
@@ -326,45 +240,10 @@ let ChatService = class ChatService extends Disposable {
         }
     }
     async getHistory() {
-        if (this.useFileStorage) {
-            const liveSessionItems = ( Array.from(( this._sessionModels.values()))
-                .filter(session => !session.isImported && !session.inputType)
-                .map(session => {
-                const title = session.title || ( localize(5544, "New Chat"));
-                return {
-                    sessionId: session.sessionId,
-                    title,
-                    lastMessageDate: session.lastMessageDate,
-                    isActive: true,
-                };
-            }));
-            const index = await this._chatSessionStore.getIndex();
-            const entries = ( ( Object.values(index))
-                .filter(entry => !( this._sessionModels.has(entry.sessionId)) && !entry.isImported && !entry.isEmpty)
-                .map((entry) => ({
-                ...entry,
-                isActive: ( this._sessionModels.has(entry.sessionId)),
-            })));
-            return [...liveSessionItems, ...entries];
-        }
-        const persistedSessions = ( Object.values(this._persistedSessions))
-            .filter(session => session.requests.length > 0)
-            .filter(session => !( this._sessionModels.has(session.sessionId)));
-        const persistedSessionItems = ( persistedSessions
-            .filter(session => !session.isImported)
-            .map(session => {
-            const title = session.customTitle ?? ChatModel.getDefaultTitle(session.requests);
-            return {
-                sessionId: session.sessionId,
-                title,
-                lastMessageDate: session.lastMessageDate,
-                isActive: false,
-            };
-        }));
         const liveSessionItems = ( Array.from(( this._sessionModels.values()))
-            .filter(session => !session.isImported)
+            .filter(session => !session.isImported && !session.inputType)
             .map(session => {
-            const title = session.title || ( localize(5544, "New Chat"));
+            const title = session.title || ( localize(5599, "New Chat"));
             return {
                 sessionId: session.sessionId,
                 title,
@@ -372,27 +251,20 @@ let ChatService = class ChatService extends Disposable {
                 isActive: true,
             };
         }));
-        return [...liveSessionItems, ...persistedSessionItems];
+        const index = await this._chatSessionStore.getIndex();
+        const entries = ( ( Object.values(index))
+            .filter(entry => !( this._sessionModels.has(entry.sessionId)) && !entry.isImported && !entry.isEmpty)
+            .map((entry) => ({
+            ...entry,
+            isActive: ( this._sessionModels.has(entry.sessionId)),
+        })));
+        return [...liveSessionItems, ...entries];
     }
     async removeHistoryEntry(sessionId) {
-        if (this.useFileStorage) {
-            await this._chatSessionStore.deleteSession(sessionId);
-            return;
-        }
-        if (this._persistedSessions[sessionId]) {
-            this._deletedChatIds.add(sessionId);
-            delete this._persistedSessions[sessionId];
-            this.saveState();
-        }
+        await this._chatSessionStore.deleteSession(sessionId);
     }
     async clearAllHistoryEntries() {
-        if (this.useFileStorage) {
-            await this._chatSessionStore.clearAllSessions();
-            return;
-        }
-        ( Object.values(this._persistedSessions)).forEach(session => this._deletedChatIds.add(session.sessionId));
-        this._persistedSessions = {};
-        this.saveState();
+        await this._chatSessionStore.clearAllSessions();
     }
     startSession(location, token, isGlobalEditingSession = true, inputType) {
         this.trace('startSession');
@@ -400,7 +272,7 @@ let ChatService = class ChatService extends Disposable {
     }
     _startSession(someSessionHistory, location, isGlobalEditingSession, token, inputType) {
         const model = this.instantiationService.createInstance(ChatModel, someSessionHistory, { initialLocation: location, inputType });
-        if (location === ChatAgentLocation.Panel) {
+        if (location === ChatAgentLocation.Chat) {
             model.startEditingSession(isGlobalEditingSession);
         }
         this._sessionModels.set(model.sessionId, model);
@@ -413,7 +285,7 @@ let ChatService = class ChatService extends Disposable {
     }
     async activateDefaultAgent(location) {
         await this.extensionService.whenInstalledExtensionsRegistered();
-        const defaultAgentData = this.chatAgentService.getContributedDefaultAgent(location) ?? this.chatAgentService.getContributedDefaultAgent(ChatAgentLocation.Panel);
+        const defaultAgentData = this.chatAgentService.getContributedDefaultAgent(location) ?? this.chatAgentService.getContributedDefaultAgent(ChatAgentLocation.Chat);
         if (!defaultAgentData) {
             throw ( new ErrorNoTelemetry('No default agent contributed'));
         }
@@ -439,7 +311,7 @@ let ChatService = class ChatService extends Disposable {
             return model;
         }
         let sessionData;
-        if (!this.useFileStorage || this.transferredSessionData?.sessionId === sessionId) {
+        if (this.transferredSessionData?.sessionId === sessionId) {
             sessionData = revive(this._persistedSessions[sessionId]);
         }
         else {
@@ -448,7 +320,7 @@ let ChatService = class ChatService extends Disposable {
         if (!sessionData) {
             return undefined;
         }
-        const session = this._startSession(sessionData, sessionData.initialLocation ?? ChatAgentLocation.Panel, true, CancellationToken.None);
+        const session = this._startSession(sessionData, sessionData.initialLocation ?? ChatAgentLocation.Chat, true, CancellationToken.None);
         const isTransferred = this.transferredSessionData?.sessionId === sessionId;
         if (isTransferred) {
             this._transferredSessionData = undefined;
@@ -468,20 +340,18 @@ let ChatService = class ChatService extends Disposable {
             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;
-                }
+        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);
+        return this._startSession(data, data.initialLocation ?? ChatAgentLocation.Chat, true, CancellationToken.None);
     }
     async loadSessionForResource(resource, location, token) {
         const parsed = ChatSessionUri.parse(resource);
@@ -498,6 +368,7 @@ let ChatService = class ChatService extends Disposable {
         const chatSessionType = parsed.chatSessionType;
         const content = await this.chatSessionService.provideChatSessionContent(chatSessionType, parsed.sessionId, CancellationToken.None);
         const model = this._startSession(undefined, location, true, CancellationToken.None, chatSessionType);
+        this._modelToExternalSession.set(model.sessionId, { chatSessionType, chatSessionId: parsed.sessionId });
         if (!( this._contentProviderSessionModels.has(chatSessionType))) {
             this._contentProviderSessionModels.set(chatSessionType, ( new Map()));
         }
@@ -505,6 +376,7 @@ let ChatService = class ChatService extends Disposable {
         this._contentProviderSessionModels.get(chatSessionType).set(parsed.sessionId, { model, disposables });
         disposables.add(model.onDidDispose(() => {
             this._contentProviderSessionModels?.get(chatSessionType)?.delete(parsed.sessionId);
+            this._modelToExternalSession.delete(model.sessionId);
             content.dispose();
         }));
         let lastRequest;
@@ -579,6 +451,16 @@ let ChatService = class ChatService extends Disposable {
         }
         return model;
     }
+    getChatSessionFromInternalId(modelSessionId) {
+        const data = this._modelToExternalSession.get(modelSessionId);
+        if (!data) {
+            return;
+        }
+        return {
+            ...data,
+            isUntitled: data.chatSessionId.startsWith('untitled-'),
+        };
+    }
     async resendRequest(request, options) {
         const model = this._sessionModels.get(request.session.sessionId);
         if (!model && model !== request.session) {
@@ -774,7 +656,7 @@ let ChatService = class ChatService extends Disposable {
                             rejectedConfirmationData: options?.rejectedConfirmationData,
                             userSelectedModelId: options?.userSelectedModelId,
                             userSelectedTools: options?.userSelectedTools?.get(),
-                            modeInstructions: options?.modeInfo?.instructions,
+                            modeInstructions: options?.modeInfo?.modeInstructions,
                             editedFileEvents: request.editedFileEvents
                         };
                     };
@@ -798,7 +680,7 @@ let ChatService = class ChatService extends Disposable {
                     }
                     const agent = (detectedAgent ?? agentPart?.agent ?? defaultAgent);
                     const command = detectedCommand ?? agentSlashCommandPart?.command;
-                    await Promise.all([
+                    const [, autostartResult] = await Promise.all([
                         this.extensionService.activateByEvent(`onChatParticipant:${agent.id}`),
                         this.mcpService.autostart(token),
                     ]);
@@ -809,6 +691,18 @@ let ChatService = class ChatService extends Disposable {
                         pendingRequest.requestId = requestProps.requestId;
                     }
                     completeResponseCreated();
+                    if (!( this._mcpServersInteractionMessageShown.has(model)) && autostartResult.serversRequiringInteraction.length > 0) {
+                        this._mcpServersInteractionMessageShown.add(model);
+                        progressCallback([{
+                                kind: 'mcpServersInteractionRequired',
+                                servers: autostartResult.serversRequiringInteraction,
+                                startCommand: {
+                                    id: 'mcp.startServersWithInteraction',
+                                    title: ( localize(5600, 'Start MCP Servers')),
+                                    arguments: []
+                                }
+                            }]);
+                    }
                     const agentResult = await this.chatAgentService.invokeAgent(agent.id, requestProps, progressCallback, history, token);
                     rawResult = agentResult;
                     agentOrCommandFollowups = this.chatAgentService.getFollowups(agent.id, requestProps, agentResult, history, followupsCancelToken);
@@ -843,7 +737,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(5545, "Provider returned null response")) } };
+                        rawResult = { errorDetails: { message: ( localize(5601, "Provider returned null response")) } };
                     }
                     const result = rawResult.errorDetails?.responseIsFiltered ? 'filtered' :
                         rawResult.errorDetails && gotProgress ? 'errorWithOutput' :
@@ -941,7 +835,7 @@ let ChatService = class ChatService extends Disposable {
                 message: promptTextResult.message,
                 command: request.response.slashCommand?.name,
                 variables: updateRanges(request.variableData, promptTextResult.diff),
-                location: ChatAgentLocation.Panel,
+                location: ChatAgentLocation.Chat,
                 editedFileEvents: request.editedFileEvents,
             };
             history.push({ request: historyRequest, response: toChatHistoryContent(request.response.response.value), result: request.response.result ?? {} });
@@ -1014,24 +908,12 @@ let ChatService = class ChatService extends Disposable {
             throw ( new Error(`Unknown session: ${sessionId}`));
         }
         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 && !model.customTitle) {
-                    await this._chatSessionStore.deleteSession(sessionId);
-                }
-                else {
-                    await this._chatSessionStore.storeSessions([model]);
-                }
+        if (!model.inputType && (model.initialLocation === ChatAgentLocation.Chat || model.initialLocation === ChatAgentLocation.EditorInline)) {
+            if (model.getRequests().length === 0 && !model.customTitle) {
+                await this._chatSessionStore.deleteSession(sessionId);
             }
             else {
-                if (model.getRequests().length === 0 && !model.customTitle) {
-                    delete this._persistedSessions[sessionId];
-                }
-                else {
-                    const sessionData = JSON.parse(JSON.stringify(model));
-                    sessionData.isNew = true;
-                    this._persistedSessions[sessionId] = sessionData;
-                }
+                await this._chatSessionStore.storeSessions([model]);
             }
         }
         this._sessionModels.delete(sessionId);
@@ -1041,12 +923,7 @@ let ChatService = class ChatService extends Disposable {
         this._onDidDisposeSession.fire({ sessionId, reason: 'cleared' });
     }
     hasSessions() {
-        if (this.useFileStorage) {
-            return this._chatSessionStore.hasSessions();
-        }
-        else {
-            return ( Object.values(this._persistedSessions)).length > 0;
-        }
+        return this._chatSessionStore.hasSessions();
     }
     transferChatSession(transferredSessionData, toWorkspace) {
         const model = Iterable.find(( this._sessionModels.values()), model => model.sessionId === transferredSessionData.sessionId);
@@ -1055,7 +932,7 @@ let ChatService = class ChatService extends Disposable {
                 `Failed to transfer session. Unknown session ID: ${transferredSessionData.sessionId}`
             ));
         }
-        const existingRaw = this.storageService.getObject(globalChatKey, StorageScope.PROFILE, []);
+        const existingRaw = this.storageService.getObject(TransferredGlobalChatKey, StorageScope.PROFILE, []);
         existingRaw.push({
             chat: model.toJSON(),
             timestampInMilliseconds: Date.now(),
@@ -1064,7 +941,7 @@ let ChatService = class ChatService extends Disposable {
             location: transferredSessionData.location,
             mode: transferredSessionData.mode,
         });
-        this.storageService.store(globalChatKey, JSON.stringify(existingRaw), StorageScope.PROFILE, StorageTarget.MACHINE);
+        this.storageService.store(TransferredGlobalChatKey, JSON.stringify(existingRaw), StorageScope.PROFILE, StorageTarget.MACHINE);
         this.chatTransferService.addWorkspaceToTransferred(toWorkspace);
         this.trace('transferChatSession', `Transferred session ${model.sessionId} to workspace ${( toWorkspace.toString())}`);
     }
@@ -1075,9 +952,6 @@ let ChatService = class ChatService extends Disposable {
         this._chatSessionStore.logIndex();
     }
 };
-ChatService.__decorator = ( __decorate([
-    memoize
-], ChatService.prototype, "useFileStorage", null));
 ChatService = ( __decorate([
     ( __param(0, IStorageService)),
     ( __param(1, ILogService)),

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

@@ -51,7 +51,7 @@ let ChatSessionStore = class ChatSessionStore extends Disposable {
             }
             e.join(this.storeTask, {
                 id: 'join.chatSessionStore',
-                label: ( localize(5546, "Saving chat history"))
+                label: ( localize(5602, "Saving chat history"))
             });
         }));
     }

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

@@ -3,7 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 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 { Memento } from '@codingame/monaco-vscode-23b6fb38-5e58-5886-b34b-27abc4f5df02-common/vscode/vs/workbench/common/memento';
+import { Memento } from '@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common/vscode/vs/workbench/common/memento';
 
 let ChatTodoListStorage = class ChatTodoListStorage {
     constructor(storageService) {

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

@@ -0,0 +1,9 @@
+import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
+import { IPromptsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service";
+export declare class ChatPromptFilesExtensionPointHandler implements IWorkbenchContribution {
+    private readonly promptsService;
+    static readonly ID = "workbench.contrib.chatPromptFilesExtensionPointHandler";
+    private readonly registrations;
+    constructor(promptsService: IPromptsService);
+    private handle;
+}