@codingame/monaco-vscode-chat-service-override 24.3.0 → 25.0.0

package/vscode/src/vs/workbench/contrib/chat/common/{chatServiceImpl.d.ts → chatService/chatServiceImpl.d.ts}

@@ -10,14 +10,14 @@ import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform
 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";
-import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service";
-import { IChatModel, IChatRequestModel, IChatRequestVariableData, IExportableChatData, ISerializableChatData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { IParsedChatRequest } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes";
-import { IChatCompleteResponse, IChatDetail, IChatModelReference, IChatProgress, IChatSendRequestData, IChatSendRequestOptions, IChatSessionContext, IChatSessionStartOptions, IChatTransferredSessionData, IChatUserActionEvent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
-import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
+import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service";
+import { IChatModel, IChatRequestModel, IChatRequestVariableData, IExportableChatData, ISerializableChatData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
+import { IParsedChatRequest } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatParserTypes";
+import { IChatCompleteResponse, IChatDetail, IChatModelReference, IChatProgress, IChatSendRequestData, IChatSendRequestOptions, IChatSessionContext, IChatSessionStartOptions, IChatUserActionEvent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
 import { IChatSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service";
-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 { IChatSlashCommandService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatSlashCommands.service";
+import { IChatTransferService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatTransferService.service";
 import { ChatAgentLocation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants";
 export declare class ChatService extends Disposable implements IChatService {
     private readonly storageService;
@@ -34,10 +34,9 @@ export declare class ChatService extends Disposable implements IChatService {
     _serviceBrand: undefined;
     private readonly _sessionModels;
     private readonly _pendingRequests;
-    private _persistedSessions;
     private _saveModelsEnabled;
-    private _transferredSessionData;
-    get transferredSessionData(): IChatTransferredSessionData | undefined;
+    private _transferredSessionResource;
+    get transferredSessionResource(): URI | undefined;
     private readonly _onDidSubmitRequest;
     readonly onDidSubmitRequest: Event<{
         readonly chatSessionResource: URI;
@@ -46,7 +45,7 @@ export declare class ChatService extends Disposable implements IChatService {
     readonly onDidPerformUserAction: Event<IChatUserActionEvent>;
     private readonly _onDidDisposeSession;
     readonly onDidDisposeSession: Event<{
-        readonly sessionResource: URI;
+        readonly sessionResource: URI[];
         reason: "cleared";
     }>;
     private readonly _sessionFollowupCancelTokens;
@@ -65,8 +64,9 @@ export declare class ChatService extends Disposable implements IChatService {
     get edits2Enabled(): boolean;
     private get isEmptyWindow();
     constructor(storageService: IStorageService, logService: ILogService, extensionService: IExtensionService, instantiationService: IInstantiationService, workspaceContextService: IWorkspaceContextService, chatSlashCommandService: IChatSlashCommandService, chatAgentService: IChatAgentService, configurationService: IConfigurationService, chatTransferService: IChatTransferService, chatSessionService: IChatSessionsService, mcpService: IMcpService);
-    get editingSessions(): import("@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService").IChatEditingSession[];
+    get editingSessions(): import("@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService").IChatEditingSession[];
     isEnabled(location: ChatAgentLocation): boolean;
+    private migrateData;
     private saveState;
     /**
      * Only persist local sessions from chat that are not imported.
@@ -75,14 +75,13 @@ export declare class ChatService extends Disposable implements IChatService {
     notifyUserAction(action: IChatUserActionEvent): void;
     setChatSessionTitle(sessionResource: URI, title: string): Promise<void>;
     private trace;
+    private info;
     private error;
     private deserializeChats;
-    private getTransferredSessionData;
     /**
      * todo@connor4312 This will be cleaned up with the globalization of edits.
      */
     private reviveSessionsWithEdits;
-    private initializePersistedSessionsFromFileStorage;
     /**
      * Returns an array of chat details for all persisted chat sessions that have at least one request.
      * Chat sessions that have already been loaded into the chat view are excluded from the result.
@@ -110,11 +109,7 @@ export declare class ChatService extends Disposable implements IChatService {
     getSession(sessionResource: URI): IChatModel | undefined;
     getActiveSessionReference(sessionResource: URI): IChatModelReference | undefined;
     getOrRestoreSession(sessionResource: URI): Promise<IChatModelReference | undefined>;
-    /**
-     * This is really just for migrating data from the edit session location to the panel.
-     */
-    isPersistedSessionEmpty(sessionResource: URI): boolean;
-    getPersistedSessionTitle(sessionResource: URI): string | undefined;
+    getSessionTitle(sessionResource: URI): string | undefined;
     loadSessionFromContent(data: IExportableChatData | ISerializableChatData): IChatModelReference | undefined;
     loadSessionForResource(chatSessionResource: URI, location: ChatAgentLocation, token: CancellationToken): Promise<IChatModelReference | undefined>;
     getChatSessionFromInternalUri(sessionResource: URI): IChatSessionContext | undefined;
@@ -123,6 +118,7 @@ export declare class ChatService extends Disposable implements IChatService {
     private parseChatRequest;
     private refreshFollowupsCancellationToken;
     private _sendRequestAsync;
+    private generateInitialChatTitleIfNeeded;
     private prepareContext;
     private getHistoryEntriesFromModel;
     removeRequest(sessionResource: URI, requestId: string): Promise<void>;
@@ -130,7 +126,7 @@ export declare class ChatService extends Disposable implements IChatService {
     addCompleteRequest(sessionResource: URI, message: IParsedChatRequest | string, variableData: IChatRequestVariableData | undefined, attempt: number | undefined, response: IChatCompleteResponse): Promise<void>;
     cancelCurrentRequestForSession(sessionResource: URI): void;
     hasSessions(): boolean;
-    transferChatSession(transferredSessionData: IChatTransferredSessionData, toWorkspace: URI): void;
+    transferChatSession(transferredSessionResource: URI, toWorkspace: URI): Promise<void>;
     getChatStorageFolder(): URI;
     logChatIndex(): void;
     setTitle(sessionResource: URI, title: string): void;

package/vscode/src/vs/workbench/contrib/chat/common/{chatServiceImpl.js → chatService/chatServiceImpl.js}

@@ -11,9 +11,9 @@ import { Disposable, DisposableResourceMap, DisposableStore, MutableDisposable }
 import { revive } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshalling';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
+import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 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 { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
 import { OffsetRange } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/ranges/offsetRange';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
@@ -21,35 +21,33 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 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 { StorageScope } 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 { 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 { InlineChatConfigKeys } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { IMcpService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service';
 import { awaitStatsForSession } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chat';
-import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { chatEditingSessionIsReady } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
-import { normalizeSerializableChatData, ChatModel, ChatRequestRemovalReason, updateRanges, toChatHistoryContent, ChatRequestModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel';
-import { ChatModelStore } from './chatModelStore.js';
-import { ChatRequestTextPart, ChatRequestAgentPart, ChatRequestAgentSubcommandPart, chatSubcommandLeader, chatAgentLeader, ChatRequestSlashCommandPart, getPromptText } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
-import { ChatRequestParser } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
-import { ResponseModelState, ChatMcpServersStarting } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService';
+import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service';
+import { chatEditingSessionIsReady } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService';
+import { normalizeSerializableChatData, ChatModel, ChatRequestRemovalReason, updateRanges, toChatHistoryContent, ChatRequestModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel';
+import { ChatModelStore } from '../model/chatModelStore.js';
+import { ChatRequestTextPart, ChatRequestAgentPart, ChatRequestAgentSubcommandPart, chatSubcommandLeader, chatAgentLeader, ChatRequestSlashCommandPart, getPromptText } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatParserTypes';
+import { ChatRequestParser } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatRequestParser';
+import { ResponseModelState, ChatMcpServersStarting } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
 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 { LocalChatSessionUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatUri';
+import { ChatSessionStore } from '../model/chatSessionStore.js';
+import { IChatSlashCommandService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatSlashCommands.service';
+import { IChatTransferService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatTransferService.service';
+import { LocalChatSessionUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
 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 { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
+import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 const serializedChatKey = 'interactive.sessions';
-const TransferredGlobalChatKey = 'chat.workspaceTransfer';
-const SESSION_TRANSFER_EXPIRATION_IN_MILLISECONDS = 1000 * 60;
 let CancellableRequest = class CancellableRequest {
     constructor(cancellationTokenSource, requestId, toolsService) {
         this.cancellationTokenSource = cancellationTokenSource;
@@ -70,8 +68,8 @@ CancellableRequest = ( __decorate([
     ( __param(2, ILanguageModelToolsService))
 ], CancellableRequest));
 let ChatService = class ChatService extends Disposable {
-    get transferredSessionData() {
-        return this._transferredSessionData;
+    get transferredSessionResource() {
+        return this._transferredSessionResource;
     }
     setSaveModelsEnabled(enabled) {
         this._saveModelsEnabled = enabled;
@@ -126,36 +124,17 @@ let ChatService = class ChatService extends Disposable {
             }
         }));
         this._register(this._sessionModels.onDidDisposeModel(model => {
-            this._onDidDisposeSession.fire({ sessionResource: model.sessionResource, reason: 'cleared' });
+            this._onDidDisposeSession.fire({ sessionResource: [model.sessionResource], reason: 'cleared' });
         }));
         this._chatServiceTelemetry = this.instantiationService.createInstance(ChatServiceTelemetry);
-        const sessionData = storageService.get(serializedChatKey, this.isEmptyWindow ? StorageScope.APPLICATION : StorageScope.WORKSPACE, '');
-        if (sessionData) {
-            this._persistedSessions = this.deserializeChats(sessionData);
-            const countsForLog = ( Object.keys(this._persistedSessions)).length;
-            if (countsForLog > 0) {
-                this.trace('constructor', `Restored ${countsForLog} persisted sessions`);
-            }
-        }
-        else {
-            this._persistedSessions = {};
-        }
-        const transferredData = this.getTransferredSessionData();
-        const transferredChat = transferredData?.chat;
-        if (transferredChat) {
-            this.trace('constructor', `Transferred session ${transferredChat.sessionId}`);
-            this._persistedSessions[transferredChat.sessionId] = transferredChat;
-            this._transferredSessionData = {
-                sessionId: transferredChat.sessionId,
-                location: transferredData.location,
-                inputState: transferredData.inputState
-            };
-        }
         this._chatSessionStore = this._register(this.instantiationService.createInstance(ChatSessionStore));
-        this._chatSessionStore.migrateDataIfNeeded(() => this._persistedSessions);
-        this.initializePersistedSessionsFromFileStorage().then(() => {
-            this.reviveSessionsWithEdits();
-        });
+        this._chatSessionStore.migrateDataIfNeeded(() => this.migrateData());
+        const transferredData = this._chatSessionStore.getTransferredSessionData();
+        if (transferredData) {
+            this.trace('constructor', `Transferred session ${transferredData}`);
+            this._transferredSessionResource = transferredData;
+        }
+        this.reviveSessionsWithEdits();
         this._register(storageService.onWillSaveState(() => this.saveState()));
         this.chatModels = derived(this, reader => [...( this._sessionModels.observable.read(reader).values())]);
         this.requestInProgressObs = derived(reader => {
@@ -169,6 +148,18 @@ let ChatService = class ChatService extends Disposable {
     isEnabled(location) {
         return this.chatAgentService.getContributedDefaultAgent(location) !== undefined;
     }
+    migrateData() {
+        const sessionData = this.storageService.get(serializedChatKey, this.isEmptyWindow ? StorageScope.APPLICATION : StorageScope.WORKSPACE, '');
+        if (sessionData) {
+            const persistedSessions = this.deserializeChats(sessionData);
+            const countsForLog = ( Object.keys(persistedSessions)).length;
+            if (countsForLog > 0) {
+                this.info('migrateData', `Restored ${countsForLog} persisted sessions`);
+            }
+            return persistedSessions;
+        }
+        return;
+    }
     saveState() {
         if (!this._saveModelsEnabled) {
             return;
@@ -215,6 +206,14 @@ let ChatService = class ChatService extends Disposable {
             this.logService.trace(`ChatService#${method}`);
         }
     }
+    info(method, message) {
+        if (message) {
+            this.logService.info(`ChatService#${method}: ${message}`);
+        }
+        else {
+            this.logService.info(`ChatService#${method}`);
+        }
+    }
     error(method, message) {
         this.logService.error(`ChatService#${method} ${message}`);
     }
@@ -248,21 +247,9 @@ let ChatService = class ChatService extends Disposable {
             return {};
         }
     }
-    getTransferredSessionData() {
-        const data = this.storageService.getObject(TransferredGlobalChatKey, StorageScope.PROFILE, []);
-        const workspaceUri = this.workspaceContextService.getWorkspace().folders[0]?.uri;
-        if (!workspaceUri) {
-            return;
-        }
-        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(TransferredGlobalChatKey, JSON.stringify(filtered), StorageScope.PROFILE, StorageTarget.MACHINE);
-        return transferred;
-    }
     async reviveSessionsWithEdits() {
-        await Promise.all(( ( Object.values(this._persistedSessions)).map(async (session) => {
+        const idx = await this._chatSessionStore.getIndex();
+        await Promise.all(( ( Object.values(idx)).map(async (session) => {
             if (!session.hasPendingEdits) {
                 return;
             }
@@ -274,28 +261,6 @@ let ChatService = class ChatService extends Disposable {
             }
         })));
     }
-    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,
-                    initialLocation: metadata.initialLocation,
-                    requests: [],
-                    responderUsername: '',
-                    responderAvatarIconUri: undefined,
-                    hasPendingEdits: metadata.hasPendingEdits,
-                };
-                this._persistedSessions[sessionId] = minimalSession;
-            }
-        }
-    }
     async getLocalSessionHistory() {
         const liveSessionItems = await this.getLiveSessionItems();
         const historySessionItems = await this.getHistorySessionItems();
@@ -305,7 +270,7 @@ let ChatService = class ChatService extends Disposable {
         return await Promise.all(( Array.from(( this._sessionModels.values()))
             .filter(session => this.shouldBeInHistory(session))
             .map(async (session) => {
-            const title = session.title || ( localize(5945, "New Chat"));
+            const title = session.title || ( localize(5944, "New Chat"));
             return {
                 sessionResource: session.sessionResource,
                 title,
@@ -352,6 +317,7 @@ let ChatService = class ChatService extends Disposable {
     }
     async removeHistoryEntry(sessionResource) {
         await this._chatSessionStore.deleteSession(this.toLocalSessionId(sessionResource));
+        this._onDidDisposeSession.fire({ sessionResource: [sessionResource], reason: 'cleared' });
     }
     async clearAllHistoryEntries() {
         await this._chatSessionStore.clearAllSessions();
@@ -417,8 +383,9 @@ let ChatService = class ChatService extends Disposable {
             throw ( new Error(`Cannot restore non-local session ${sessionResource}`));
         }
         let sessionData;
-        if (this.transferredSessionData?.sessionId === sessionId) {
-            sessionData = revive(this._persistedSessions[sessionId]);
+        if (isEqual(this.transferredSessionResource, sessionResource)) {
+            this._transferredSessionResource = undefined;
+            sessionData = revive(await this._chatSessionStore.readTransferredSession(sessionResource));
         }
         else {
             sessionData = revive(await this._chatSessionStore.readSession(sessionId));
@@ -433,45 +400,18 @@ let ChatService = class ChatService extends Disposable {
             sessionId,
             canUseTools: true,
         });
-        const isTransferred = this.transferredSessionData?.sessionId === sessionId;
-        if (isTransferred) {
-            this._transferredSessionData = undefined;
-        }
         return sessionRef;
     }
-    isPersistedSessionEmpty(sessionResource) {
-        const sessionId = LocalChatSessionUri.parseLocalSessionId(sessionResource);
-        if (!sessionId) {
-            throw ( new Error(`Cannot restore non-local session ${sessionResource}`));
-        }
-        const session = this._persistedSessions[sessionId];
-        if (session) {
-            return session.requests.length === 0;
-        }
-        return this._chatSessionStore.isSessionEmpty(sessionId);
-    }
-    getPersistedSessionTitle(sessionResource) {
+    getSessionTitle(sessionResource) {
         const sessionId = LocalChatSessionUri.parseLocalSessionId(sessionResource);
         if (!sessionId) {
             return undefined;
         }
-        const session = this._persistedSessions[sessionId];
-        if (session) {
-            const title = session.customTitle || ChatModel.getDefaultTitle(session.requests);
-            return 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;
+        return this._sessionModels.get(sessionResource)?.title ??
+            this._chatSessionStore.getMetadataForSessionSync(sessionResource)?.title;
     }
     loadSessionFromContent(data) {
-        const sessionId = 'sessionId' in data && data.sessionId ? data.sessionId : generateUuid();
+        const sessionId = data.sessionId ?? generateUuid();
         const sessionResource = LocalChatSessionUri.forSession(sessionId);
         return this._sessionModels.acquireOrCreate({
             initialData: data,
@@ -514,7 +454,7 @@ let ChatService = class ChatService extends Disposable {
         for (const message of providedSession.history) {
             if (message.type === 'request') {
                 if (lastRequest) {
-                    lastRequest.response?.completeResponseIfNeeded();
+                    lastRequest.response?.complete();
                 }
                 const requestText = message.prompt;
                 const parsedRequest = {
@@ -541,7 +481,7 @@ let ChatService = class ChatService extends Disposable {
             }
         }
         if (providedSession.isCompleteObs?.get()) {
-            lastRequest?.response?.completeResponseIfNeeded();
+            lastRequest?.response?.complete();
         }
         if (providedSession.progressObs && lastRequest && providedSession.interruptActiveResponseCallback) {
             const initialCancellationRequest = this.instantiationService.createInstance(CancellableRequest, ( new CancellationTokenSource()), undefined);
@@ -571,7 +511,7 @@ let ChatService = class ChatService extends Disposable {
                     lastProgressLength = progressArray.length;
                 }
                 if (isComplete) {
-                    lastRequest.response?.completeResponseIfNeeded();
+                    lastRequest.response?.complete();
                     cancellationListener.clear();
                 }
             }));
@@ -579,7 +519,7 @@ let ChatService = class ChatService extends Disposable {
         else {
             if (lastRequest && model.editingSession) {
                 await chatEditingSessionIsReady(model.editingSession);
-                lastRequest.response?.completeResponseIfNeeded();
+                lastRequest.response?.complete();
             }
         }
         return modelRef;
@@ -676,9 +616,9 @@ let ChatService = class ChatService extends Disposable {
     _sendRequestAsync(model, sessionResource, parsedRequest, attempt, enableCommandDetection, defaultAgent, location, options) {
         const followupsCancelToken = this.refreshFollowupsCancellationToken(sessionResource);
         let request;
-        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 agentPart = parsedRequest.parts.find((r) => r instanceof ChatRequestAgentPart);
+        const agentSlashCommandPart = parsedRequest.parts.find((r) => r instanceof ChatRequestAgentSubcommandPart);
+        const commandPart = parsedRequest.parts.find((r) => r instanceof ChatRequestSlashCommandPart);
         const requests = [...model.getRequests()];
         const requestTelemetry = this.instantiationService.createInstance(ChatRequestTelemetry, {
             agent: agentPart?.agent ?? defaultAgent,
@@ -742,7 +682,6 @@ let ChatService = class ChatService extends Disposable {
             try {
                 let rawResult;
                 let agentOrCommandFollowups = undefined;
-                let chatTitlePromise;
                 if (agentPart || (defaultAgent && !commandPart)) {
                     const prepareChatAgentRequest = (agent, command, enableCommandDetection, chatRequest, isParticipantDetected) => {
                         const initVariableData = { variables: [] };
@@ -817,6 +756,7 @@ let ChatService = class ChatService extends Disposable {
                     await this.extensionService.activateByEvent(`onChatParticipant:${agent.id}`);
                     const history = this.getHistoryEntriesFromModel(requests, location, agent.id);
                     const requestProps = prepareChatAgentRequest(agent, command, enableCommandDetection, request , !!detectedAgent);
+                    this.generateInitialChatTitleIfNeeded(model, requestProps, defaultAgent, token);
                     const pendingRequest = this._pendingRequests.get(sessionResource);
                     if (pendingRequest && !pendingRequest.requestId) {
                         pendingRequest.requestId = requestProps.requestId;
@@ -832,18 +772,6 @@ 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);
-                    if (model.getRequests().length === 1 && !model.customTitle) {
-                        const chatHistory = this.getHistoryEntriesFromModel(model.getRequests(), location, agent.id);
-                        chatTitlePromise = this.chatAgentService.getChatTitle(agent.id, chatHistory, CancellationToken.None).then((title) => {
-                            if (title === undefined) {
-                                const defaultAgentForTitle = this.chatAgentService.getDefaultAgent(location);
-                                if (defaultAgentForTitle) {
-                                    return this.chatAgentService.getChatTitle(defaultAgentForTitle.id, chatHistory, CancellationToken.None);
-                                }
-                            }
-                            return title;
-                        });
-                    }
                 }
                 else if (commandPart && this.chatSlashCommandService.hasCommand(commandPart.slashCommand.command)) {
                     if (commandPart.slashCommand.silent !== true) {
@@ -874,7 +802,7 @@ let ChatService = class ChatService extends Disposable {
                 else {
                     if (!rawResult) {
                         this.trace('sendRequest', `Provider returned no response for session ${model.sessionResource}`);
-                        rawResult = { errorDetails: { message: ( localize(5946, "Provider returned null response")) } };
+                        rawResult = { errorDetails: { message: ( localize(5945, "Provider returned null response")) } };
                     }
                     const result = rawResult.errorDetails?.responseIsFiltered ? 'filtered' :
                         rawResult.errorDetails && gotProgress ? 'errorWithOutput' :
@@ -899,11 +827,6 @@ let ChatService = class ChatService extends Disposable {
                             this._chatServiceTelemetry.retrievedFollowups(agentPart?.agent.id ?? '', commandForTelemetry, followups?.length ?? 0);
                         });
                     }
-                    chatTitlePromise?.then(title => {
-                        if (title) {
-                            model.setCustomTitle(title);
-                        }
-                    });
                 }
             }
             catch (err) {
@@ -938,6 +861,23 @@ let ChatService = class ChatService extends Disposable {
             responseCompletePromise: rawResponsePromise,
         };
     }
+    generateInitialChatTitleIfNeeded(model, request, defaultAgent, token) {
+        if (model.getRequests().length !== 1 || model.customTitle) {
+            return;
+        }
+        const singleEntryHistory = [{
+                request,
+                response: [],
+                result: {}
+            }];
+        const generate = async () => {
+            const title = await this.chatAgentService.getChatTitle(defaultAgent.id, singleEntryHistory, token);
+            if (title && !model.customTitle) {
+                model.setCustomTitle(title);
+            }
+        };
+        void generate();
+    }
     prepareContext(attachedContextVariables) {
         attachedContextVariables ??= [];
         attachedContextVariables.sort((a, b) => {
@@ -1044,22 +984,28 @@ let ChatService = class ChatService extends Disposable {
     hasSessions() {
         return this._chatSessionStore.hasSessions();
     }
-    transferChatSession(transferredSessionData, toWorkspace) {
-        const model = Iterable.find(( this._sessionModels.values()), model => model.sessionId === transferredSessionData.sessionId);
+    async transferChatSession(transferredSessionResource, toWorkspace) {
+        if (!LocalChatSessionUri.isLocalSession(transferredSessionResource)) {
+            throw ( new Error(
+                `Can only transfer local chat sessions. Invalid session: ${transferredSessionResource}`
+            ));
+        }
+        const model = this._sessionModels.get(transferredSessionResource);
         if (!model) {
             throw ( new Error(
-                `Failed to transfer session. Unknown session ID: ${transferredSessionData.sessionId}`
+                `Failed to transfer session. Unknown session: ${transferredSessionResource}`
             ));
         }
-        const existingRaw = this.storageService.getObject(TransferredGlobalChatKey, StorageScope.PROFILE, []);
-        existingRaw.push({
-            chat: model.toJSON(),
+        if (model.initialLocation !== ChatAgentLocation.Chat) {
+            throw ( new Error(
+                `Can only transfer chat sessions located in the Chat view. Session ${transferredSessionResource} has location=${model.initialLocation}`
+            ));
+        }
+        await this._chatSessionStore.storeTransferSession({
+            sessionResource: model.sessionResource,
             timestampInMilliseconds: Date.now(),
             toWorkspace: toWorkspace,
-            inputState: transferredSessionData.inputState,
-            location: transferredSessionData.location,
-        });
-        this.storageService.store(TransferredGlobalChatKey, JSON.stringify(existingRaw), StorageScope.PROFILE, StorageTarget.MACHINE);
+        }, model);
         this.chatTransferService.addWorkspaceToTransferred(toWorkspace);
         this.trace('transferChatSession', `Transferred session ${model.sessionResource} to workspace ${( toWorkspace.toString())}`);
     }

package/vscode/src/vs/workbench/contrib/chat/common/{chatServiceTelemetry.d.ts → chatService/chatServiceTelemetry.d.ts}

@@ -1,8 +1,8 @@
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
-import { IChatAgentData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents";
-import { ChatRequestModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes";
-import { IChatSendRequestOptions, IChatUserActionEvent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
+import { IChatAgentData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents";
+import { ChatRequestModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
+import { ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatParserTypes";
+import { IChatSendRequestOptions, IChatUserActionEvent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
 import { ChatAgentLocation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants";
 import { ILanguageModelsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service";
 export type ChatProviderInvokedEvent = {

package/vscode/src/vs/workbench/contrib/chat/common/{chatServiceTelemetry.js → chatService/chatServiceTelemetry.js}

@@ -3,8 +3,8 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { isLocation } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
-import { ChatAgentVoteDirection, ChatCopyKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService';
-import { isImageVariableEntry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariableEntries';
+import { ChatAgentVoteDirection, ChatCopyKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
+import { isImageVariableEntry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries';
 import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
 
 let ChatServiceTelemetry = class ChatServiceTelemetry {

package/vscode/src/vs/workbench/contrib/chat/common/{chatCodeMapperService.d.ts → editing/chatCodeMapperService.d.ts}

@@ -3,7 +3,7 @@ import { IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { TextEdit } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
 import { ICellEditOperation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
-import { ICodeMapperService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatCodeMapperService.service";
+import { ICodeMapperService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatCodeMapperService.service";
 export interface ICodeMapperResponse {
     textEdit: (resource: URI, textEdit: TextEdit[]) => void;
     notebookEdit: (resource: URI, edit: ICellEditOperation[]) => void;

package/vscode/src/vs/workbench/contrib/chat/common/{chatModelStore.d.ts → model/chatModelStore.d.ts}

@@ -1,8 +1,8 @@
 import { IDisposable, IReference, ReferenceCollection } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
-import { IChatEditingSession } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
-import { ChatModel, IExportableChatData, ISerializableChatData, ISerializableChatModelInputState } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IChatEditingSession } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService";
+import { ChatModel, IExportableChatData, ISerializableChatData, ISerializableChatModelInputState } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
 import { ChatAgentLocation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants";
 export interface IStartSessionProps {
     readonly initialData?: IExportableChatData | ISerializableChatData;

package/vscode/src/vs/workbench/contrib/chat/common/{chatProgressTypes → model/chatProgressTypes}/chatToolInvocation.d.ts

@@ -1,7 +1,7 @@
 import { IMarkdownString } from "@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent";
 import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
-import { IChatExtensionsContent, IChatTodoListContent, IChatToolInputInvocationData, IChatToolInvocation, IChatToolInvocationSerialized, type IChatTerminalToolInvocationData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
-import { IPreparedToolInvocation, IToolConfirmationMessages, IToolData, IToolProgressStep, IToolResult, ToolDataSource } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService";
+import { IChatExtensionsContent, IChatTodoListContent, IChatToolInputInvocationData, IChatToolInvocation, IChatToolInvocationSerialized, type IChatTerminalToolInvocationData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
+import { IPreparedToolInvocation, IToolConfirmationMessages, IToolData, IToolProgressStep, IToolResult, ToolDataSource } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService";
 export declare class ChatToolInvocation implements IChatToolInvocation {
     readonly toolCallId: string;
     readonly kind: "toolInvocation";