@codingame/monaco-vscode-chat-service-override 23.2.2 → 24.1.0

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/saveAsPromptFileActions.js

@@ -10,11 +10,11 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { ResourceContextKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
 import { ITextFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles.service';
 import { chatEditingWidgetFileStateContextKey, ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
-import { getCleanPromptName } from '@codingame/monaco-vscode-8d4ef243-d8c1-540d-9f11-38df46f54c9f-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
-import { PROMPT_LANGUAGE_ID, PromptsType, AGENT_LANGUAGE_ID, INSTRUCTIONS_LANGUAGE_ID } from '@codingame/monaco-vscode-8d4ef243-d8c1-540d-9f11-38df46f54c9f-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
-import { CHAT_CATEGORY } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { askForPromptFileName } from '@codingame/monaco-vscode-88141f48-1af9-57ef-a278-f4b2ff6128fa-common/vscode/vs/workbench/contrib/chat/browser/promptSyntax/pickers/askForPromptName';
-import { askForPromptSourceFolder } from '@codingame/monaco-vscode-88141f48-1af9-57ef-a278-f4b2ff6128fa-common/vscode/vs/workbench/contrib/chat/browser/promptSyntax/pickers/askForPromptSourceFolder';
+import { getCleanPromptName } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
+import { PROMPT_LANGUAGE_ID, PromptsType, AGENT_LANGUAGE_ID, INSTRUCTIONS_LANGUAGE_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { askForPromptFileName } from '@codingame/monaco-vscode-xterm-addons-common/vscode/vs/workbench/contrib/chat/browser/promptSyntax/pickers/askForPromptName';
+import { askForPromptSourceFolder } from '@codingame/monaco-vscode-xterm-addons-common/vscode/vs/workbench/contrib/chat/browser/promptSyntax/pickers/askForPromptSourceFolder';
 
 class BaseSaveAsPromptFileAction extends Action2 {
     constructor(opts, promptType) {
@@ -70,19 +70,19 @@ function createOptions(id, title, description, languageId) {
 const SAVE_AS_PROMPT_FILE_ACTION_ID = 'workbench.action.chat.save-as-prompt';
 class SaveAsPromptFileAction extends BaseSaveAsPromptFileAction {
     constructor() {
-        super(createOptions(SAVE_AS_PROMPT_FILE_ACTION_ID, ( localize2(5724, "Save As Prompt File")), ( localize2(5725, "Save as prompt file")), PROMPT_LANGUAGE_ID), PromptsType.prompt);
+        super(createOptions(SAVE_AS_PROMPT_FILE_ACTION_ID, ( localize2(5834, "Save As Prompt File")), ( localize2(5835, "Save as prompt file")), PROMPT_LANGUAGE_ID), PromptsType.prompt);
     }
 }
 const SAVE_AS_AGENT_FILE_ACTION_ID = 'workbench.action.chat.save-as-agent';
 class SaveAsAgentFileAction extends BaseSaveAsPromptFileAction {
     constructor() {
-        super(createOptions(SAVE_AS_AGENT_FILE_ACTION_ID, ( localize2(5726, "Save As Agent File")), ( localize2(5727, "Save as agent file")), AGENT_LANGUAGE_ID), PromptsType.agent);
+        super(createOptions(SAVE_AS_AGENT_FILE_ACTION_ID, ( localize2(5836, "Save As Agent File")), ( localize2(5837, "Save as agent file")), AGENT_LANGUAGE_ID), PromptsType.agent);
     }
 }
 const SAVE_AS_INSTRUCTIONS_FILE_ACTION_ID = 'workbench.action.chat.save-as-instructions';
 class SaveAsInstructionsFileAction extends BaseSaveAsPromptFileAction {
     constructor() {
-        super(createOptions(SAVE_AS_INSTRUCTIONS_FILE_ACTION_ID, ( localize2(5728, "Save As Instructions File")), ( localize2(5729, "Save as instructions file")), INSTRUCTIONS_LANGUAGE_ID), PromptsType.instructions);
+        super(createOptions(SAVE_AS_INSTRUCTIONS_FILE_ACTION_ID, ( localize2(5838, "Save As Instructions File")), ( localize2(5839, "Save as instructions file")), INSTRUCTIONS_LANGUAGE_ID), PromptsType.instructions);
     }
 }
 

package/vscode/src/vs/workbench/contrib/chat/browser/tools/toolSetsContribution.js

@@ -18,18 +18,18 @@ import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbe
 import { LifecyclePhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { ILifecycleService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
 import { IUserDataProfileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
-import { CHAT_CONFIG_MENU_ID, CHAT_CATEGORY } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_CONFIG_MENU_ID, CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { getAllCodicons, Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { isValidBasename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/extpath';
 import { ITextFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles.service';
-import { parse } from '@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/base/common/jsonc';
+import { parse } from '@codingame/monaco-vscode-api/vscode/vs/base/common/jsonc';
 import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/jsonschemas/common/jsonContributionRegistry';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
-import { ChatViewId } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { ChatViewId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
@@ -44,11 +44,11 @@ const toolSetsSchema = {
     allowComments: true,
     allowTrailingCommas: true,
     defaultSnippets: [{
-            label: ( localize(5730, "Empty tool set")),
+            label: ( localize(5840, "Empty tool set")),
             body: { '${1:toolSetName}': { 'tools': ['${2:someTool}', '${3:anotherTool}'], 'description': '${4:description}', 'icon': '${5:tools}' } }
         }],
     type: 'object',
-    description: ( localize(5731, 'User tool sets configuration')),
+    description: ( localize(5841, 'User tool sets configuration')),
     additionalProperties: {
         type: 'object',
         required: ['tools'],
@@ -56,7 +56,7 @@ const toolSetsSchema = {
         properties: {
             tools: {
                 description: ( localize(
-                    5732,
+                    5842,
                     "A list of tools or tool sets to include in this tool set. Cannot be empty and must reference tools the way they are referenced in prompts."
                 )),
                 type: 'array',
@@ -69,7 +69,7 @@ const toolSetsSchema = {
             },
             icon: {
                 description: ( localize(
-                    5733,
+                    5843,
                     'Icon to use for this tool set in the UI. Uses the "\\$(name)"-syntax, like "\\$(zap)"'
                 )),
                 type: 'string',
@@ -77,7 +77,7 @@ const toolSetsSchema = {
                 markdownEnumDescriptions: Array.from(getAllCodicons(), icon => `$(${icon.id})`),
             },
             description: {
-                description: ( localize(5734, "A short description of this tool set.")),
+                description: ( localize(5844, "A short description of this tool set.")),
                 type: 'string'
             },
         },
@@ -164,7 +164,7 @@ let UserToolSetsContributions = class UserToolSetsContributions extends Disposab
             });
             for (const item of data) {
                 toolEnumValues.push(item.name);
-                toolEnumDescriptions.push(( localize(5735, "{1} ({0})\n\n{2}", item.sourceLabel, item.name, item.description)));
+                toolEnumDescriptions.push(( localize(5845, "{1} ({0})\n\n{2}", item.sourceLabel, item.name, item.description)));
             }
             store.clear();
             reg.registerSchema(toolSetSchemaId, toolSetsSchema, store);
@@ -257,8 +257,8 @@ class ConfigureToolSets extends Action2 {
     constructor() {
         super({
             id: ConfigureToolSets.ID,
-            title: ( localize2(5736, 'Configure Tool Sets...')),
-            shortTitle: ( localize(5737, "Tool Sets")),
+            title: ( localize2(5846, 'Configure Tool Sets...')),
+            shortTitle: ( localize(5847, "Tool Sets")),
             category: CHAT_CATEGORY,
             f1: true,
             precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ChatContextKeys.Tools.toolsCount.greater(0))),
@@ -279,7 +279,7 @@ class ConfigureToolSets extends Action2 {
         const textFileService = accessor.get(ITextFileService);
         const picks = [];
         picks.push({
-            label: ( localize(5738, 'Create new tool sets file...')),
+            label: ( localize(5848, 'Create new tool sets file...')),
             alwaysShow: true,
             iconClass: ThemeIcon.asClassName(Codicon.plus)
         });
@@ -296,7 +296,7 @@ class ConfigureToolSets extends Action2 {
         }
         const pick = await quickInputService.pick(picks, {
             canPickMany: false,
-            placeHolder: ( localize(5739, 'Select a tool set to configure')),
+            placeHolder: ( localize(5849, 'Select a tool set to configure')),
         });
         if (!pick) {
             return;
@@ -304,13 +304,13 @@ class ConfigureToolSets extends Action2 {
         let resource;
         if (!pick.toolset) {
             const name = await quickInputService.input({
-                placeHolder: ( localize(5740, "Type tool sets file name")),
+                placeHolder: ( localize(5850, "Type tool sets file name")),
                 validateInput: async (input) => {
                     if (!input) {
-                        return localize(5741, "Invalid file name");
+                        return localize(5851, "Invalid file name");
                     }
                     if (!isValidBasename(input)) {
-                        return localize(5742, "'{0}' is not a valid file name", input);
+                        return localize(5852, "'{0}' is not a valid file name", input);
                     }
                     return undefined;
                 }

package/vscode/src/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewsWelcomeHandler.js

@@ -8,7 +8,7 @@ import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { checkProposedApiEnabled } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions';
 import { ExtensionsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
-import { ChatViewsWelcomeExtensions } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewsWelcome';
+import { ChatViewsWelcomeExtensions } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewsWelcome';
 
 const chatViewsWelcomeJsonSchema = {
     type: 'object',
@@ -17,29 +17,29 @@ const chatViewsWelcomeJsonSchema = {
     properties: {
         icon: {
             type: 'string',
-            description: ( localize(5748, 'The icon for the welcome message.')),
+            description: ( localize(5858, 'The icon for the welcome message.')),
         },
         title: {
             type: 'string',
-            description: ( localize(5749, 'The title of the welcome message.')),
+            description: ( localize(5859, 'The title of the welcome message.')),
         },
         content: {
             type: 'string',
             description: ( localize(
-                5750,
+                5860,
                 'The content of the welcome message. The first command link will be rendered as a button.'
             )),
         },
         when: {
             type: 'string',
-            description: ( localize(5751, 'Condition when the welcome message is shown.')),
+            description: ( localize(5861, 'Condition when the welcome message is shown.')),
         }
     }
 };
 const chatViewsWelcomeExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'chatViewsWelcome',
     jsonSchema: {
-        description: ( localize(5752, 'Contributes a welcome message to a chat view')),
+        description: ( localize(5862, 'Contributes a welcome message to a chat view')),
         type: 'array',
         items: chatViewsWelcomeJsonSchema,
     },

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

@@ -17,7 +17,7 @@ export interface ICodeMapperRequest {
     readonly codeBlocks: ICodeMapperCodeBlock[];
     readonly chatRequestId?: string;
     readonly chatRequestModel?: string;
-    readonly chatSessionId?: string;
+    readonly chatSessionResource?: URI;
     readonly location?: string;
 }
 export interface ICodeMapperResult {

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

@@ -0,0 +1,49 @@
+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 { ChatAgentLocation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants";
+export interface IStartSessionProps {
+    readonly initialData?: IExportableChatData | ISerializableChatData;
+    readonly location: ChatAgentLocation;
+    readonly sessionResource: URI;
+    readonly sessionId?: string;
+    readonly canUseTools: boolean;
+    readonly transferEditingSession?: IChatEditingSession;
+    readonly disableBackgroundKeepAlive?: boolean;
+    readonly inputState?: ISerializableChatModelInputState;
+}
+export interface ChatModelStoreDelegate {
+    createModel: (props: IStartSessionProps) => ChatModel;
+    willDisposeModel: (model: ChatModel) => Promise<void>;
+}
+export declare class ChatModelStore extends ReferenceCollection<ChatModel> implements IDisposable {
+    private readonly delegate;
+    private readonly logService;
+    private readonly _store;
+    private readonly _models;
+    private readonly _modelsToDispose;
+    private readonly _pendingDisposals;
+    private readonly _onDidDisposeModel;
+    readonly onDidDisposeModel: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<ChatModel>;
+    constructor(delegate: ChatModelStoreDelegate, logService: ILogService);
+    get observable(): import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").IObservable<Map<string, ChatModel>>;
+    values(): Iterable<ChatModel>;
+    /**
+     * Get a ChatModel directly without acquiring a reference.
+     */
+    get(uri: URI): ChatModel | undefined;
+    has(uri: URI): boolean;
+    acquireExisting(uri: URI): IReference<ChatModel> | undefined;
+    acquireOrCreate(props: IStartSessionProps): IReference<ChatModel>;
+    protected createReferencedObject(key: string, props?: IStartSessionProps): ChatModel;
+    protected destroyReferencedObject(key: string, object: ChatModel): void;
+    private doDestroyReferencedObject;
+    /**
+     * For test use only
+     */
+    waitForModelDisposals(): Promise<void>;
+    private toKey;
+    dispose(): void;
+}

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

@@ -0,0 +1,100 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { ReferenceCollection, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
+import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { ObservableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/map';
+
+let ChatModelStore = class ChatModelStore extends ReferenceCollection {
+    constructor(delegate, logService) {
+        super();
+        this.delegate = delegate;
+        this.logService = logService;
+        this._store = ( new DisposableStore());
+        this._models = ( new ObservableMap());
+        this._modelsToDispose = ( new Set());
+        this._pendingDisposals = ( new Set());
+        this._onDidDisposeModel = this._store.add(( new Emitter()));
+        this.onDidDisposeModel = this._onDidDisposeModel.event;
+    }
+    get observable() {
+        return this._models.observable;
+    }
+    values() {
+        return ( this._models.values());
+    }
+    get(uri) {
+        return this._models.get(this.toKey(uri));
+    }
+    has(uri) {
+        return ( this._models.has(this.toKey(uri)));
+    }
+    acquireExisting(uri) {
+        const key = this.toKey(uri);
+        if (!( this._models.has(key))) {
+            return undefined;
+        }
+        return this.acquire(key);
+    }
+    acquireOrCreate(props) {
+        return this.acquire(this.toKey(props.sessionResource), props);
+    }
+    createReferencedObject(key, props) {
+        this._modelsToDispose.delete(key);
+        const existingModel = this._models.get(key);
+        if (existingModel) {
+            return existingModel;
+        }
+        if (!props) {
+            throw ( new Error(`No start session props provided for chat session ${key}`));
+        }
+        this.logService.trace(`Creating chat session ${key}`);
+        const model = this.delegate.createModel(props);
+        if (( model.sessionResource.toString()) !== key) {
+            throw ( new Error(`Chat session key mismatch for ${key}`));
+        }
+        this._models.set(key, model);
+        return model;
+    }
+    destroyReferencedObject(key, object) {
+        this._modelsToDispose.add(key);
+        const promise = this.doDestroyReferencedObject(key, object);
+        this._pendingDisposals.add(promise);
+        promise.finally(() => {
+            this._pendingDisposals.delete(promise);
+        });
+    }
+    async doDestroyReferencedObject(key, object) {
+        try {
+            await this.delegate.willDisposeModel(object);
+        }
+        catch (error) {
+            this.logService.error(error);
+        }
+        finally {
+            if (( this._modelsToDispose.has(key))) {
+                this.logService.trace(`Disposing chat session ${key}`);
+                this._models.delete(key);
+                this._onDidDisposeModel.fire(object);
+                object.dispose();
+            }
+            this._modelsToDispose.delete(key);
+        }
+    }
+    async waitForModelDisposals() {
+        await Promise.all(this._pendingDisposals);
+    }
+    toKey(uri) {
+        return ( uri.toString());
+    }
+    dispose() {
+        this._store.dispose();
+        this._models.forEach(model => model.dispose());
+    }
+};
+ChatModelStore = ( __decorate([
+    ( __param(1, ILogService))
+], ChatModelStore));
+
+export { ChatModelStore };

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

@@ -14,6 +14,7 @@ export declare class ChatToolInvocation implements IChatToolInvocation {
     readonly source: ToolDataSource;
     readonly fromSubAgent: boolean | undefined;
     readonly parameters: unknown;
+    generatedTitle?: string;
     readonly toolSpecificData?: IChatTerminalToolInvocationData | IChatToolInputInvocationData | IChatExtensionsContent | IChatTodoListContent;
     private readonly _progress;
     private readonly _state;

package/vscode/src/vs/workbench/contrib/chat/common/chatProgressTypes/chatToolInvocation.js

@@ -14,7 +14,7 @@ class ChatToolInvocation {
         this.toolCallId = toolCallId;
         this.kind = 'toolInvocation';
         this._progress = observableValue(this, { progress: 0 });
-        const defaultMessage = ( localize(5825, "Using {0}", `"${toolData.displayName}"`));
+        const defaultMessage = ( localize(5944, "Using {0}", `"${toolData.displayName}"`));
         const invocationMessage = preparedInvocation?.invocationMessage ?? defaultMessage;
         this.invocationMessage = invocationMessage;
         this.pastTenseMessage = preparedInvocation?.pastTenseMessage;
@@ -103,6 +103,7 @@ class ChatToolInvocation {
             toolCallId: this.toolCallId,
             toolId: this.toolId,
             fromSubAgent: this.fromSubAgent,
+            generatedTitle: this.generatedTitle,
         };
     }
 }

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

@@ -6,10 +6,9 @@ import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { newWriteableStream } from '@codingame/monaco-vscode-api/vscode/vs/base/common/stream';
 import { FileSystemProviderCapabilities, FileType, createFileSystemProviderError, FileSystemProviderErrorCode } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
-import { ChatResponseResource } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { ChatResponseResource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel';
 import { IChatToolInvocation } 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 { LocalChatSessionUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatUri';
 import { isToolResultInputOutputDetails } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
 
 let ChatResponseResourceFileSystemProvider = class ChatResponseResourceFileSystemProvider extends Disposable {
@@ -68,8 +67,8 @@ let ChatResponseResourceFileSystemProvider = class ChatResponseResourceFileSyste
         if (!parsed) {
             throw createFileSystemProviderError(`File not found`, FileSystemProviderErrorCode.FileNotFound);
         }
-        const { sessionId, toolCallId, index } = parsed;
-        const session = this.chatService.getSession(LocalChatSessionUri.forSession(sessionId));
+        const { sessionResource, toolCallId, index } = parsed;
+        const session = this.chatService.getSession(sessionResource);
         if (!session) {
             throw createFileSystemProviderError(`File not found`, FileSystemProviderErrorCode.FileNotFound);
         }

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

@@ -11,10 +11,9 @@ import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs
 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 { IChatEditingSession } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
-import { ChatModel, IChatModel, IChatRequestModel, IChatRequestVariableData, IExportableChatData, ISerializableChatData } from "@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { IParsedChatRequest } from "@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes";
-import { IChatCompleteResponse, IChatDetail, IChatSendRequestData, IChatSendRequestOptions, IChatSessionContext, IChatTransferredSessionData, IChatUserActionEvent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
+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 { 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";
@@ -34,9 +33,9 @@ export declare class ChatService extends Disposable implements IChatService {
     private readonly mcpService;
     _serviceBrand: undefined;
     private readonly _sessionModels;
-    private readonly _contentProviderSessionModels;
     private readonly _pendingRequests;
     private _persistedSessions;
+    private _saveModelsEnabled;
     private _transferredSessionData;
     get transferredSessionData(): IChatTransferredSessionData | undefined;
     private readonly _onDidSubmitRequest;
@@ -54,44 +53,70 @@ export declare class ChatService extends Disposable implements IChatService {
     private readonly _chatServiceTelemetry;
     private readonly _chatSessionStore;
     readonly requestInProgressObs: IObservable<boolean>;
+    readonly chatModels: IObservable<Iterable<IChatModel>>;
+    /**
+     * For test use only
+     */
+    setSaveModelsEnabled(enabled: boolean): void;
+    /**
+     * For test use only
+     */
+    waitForModelDisposals(): Promise<void>;
     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(): IChatEditingSession[];
+    get editingSessions(): import("@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService").IChatEditingSession[];
     isEnabled(location: ChatAgentLocation): boolean;
     private saveState;
+    /**
+     * Only persist local sessions from chat that are not imported.
+     */
+    private shouldStoreSession;
     notifyUserAction(action: IChatUserActionEvent): void;
     setChatSessionTitle(sessionResource: URI, title: string): Promise<void>;
     private trace;
     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.
      * Imported chat sessions are also excluded from the result.
+     * TODO this is only used by the old "show chats" command which can be removed when the pre-agents view
+     * options are removed.
      */
     getLocalSessionHistory(): Promise<IChatDetail[]>;
-    shouldBeInHistory(entry: Partial<ChatModel>): boolean | "" | undefined;
+    /**
+     * Returns an array of chat details for all local live chat sessions.
+     */
+    getLiveSessionItems(): Promise<IChatDetail[]>;
+    /**
+     * Returns an array of chat details for all local chat sessions in history (not currently loaded).
+     */
+    getHistorySessionItems(): Promise<IChatDetail[]>;
+    getMetadataForSession(sessionResource: URI): Promise<IChatDetail | undefined>;
+    private shouldBeInHistory;
     removeHistoryEntry(sessionResource: URI): Promise<void>;
     clearAllHistoryEntries(): Promise<void>;
-    startSession(location: ChatAgentLocation, token: CancellationToken, isGlobalEditingSession?: boolean, options?: {
-        canUseTools?: boolean;
-    }): ChatModel;
+    startSession(location: ChatAgentLocation, options?: IChatSessionStartOptions): IChatModelReference;
     private _startSession;
     private initializeSession;
     activateDefaultAgent(location: ChatAgentLocation): Promise<void>;
     getSession(sessionResource: URI): IChatModel | undefined;
-    getSessionByLegacyId(sessionId: string): IChatModel | undefined;
-    getOrRestoreSession(sessionResource: URI): Promise<ChatModel | 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;
-    loadSessionFromContent(data: IExportableChatData | ISerializableChatData): IChatModel | undefined;
-    loadSessionForResource(chatSessionResource: URI, location: ChatAgentLocation, token: CancellationToken): Promise<IChatModel | undefined>;
+    loadSessionFromContent(data: IExportableChatData | ISerializableChatData): IChatModelReference | undefined;
+    loadSessionForResource(chatSessionResource: URI, location: ChatAgentLocation, token: CancellationToken): Promise<IChatModelReference | undefined>;
     getChatSessionFromInternalUri(sessionResource: URI): IChatSessionContext | undefined;
     resendRequest(request: IChatRequestModel, options?: IChatSendRequestOptions): Promise<void>;
     sendRequest(sessionResource: URI, request: string, options?: IChatSendRequestOptions): Promise<IChatSendRequestData | undefined>;
@@ -104,10 +129,11 @@ export declare class ChatService extends Disposable implements IChatService {
     adoptRequest(sessionResource: URI, request: IChatRequestModel): Promise<void>;
     addCompleteRequest(sessionResource: URI, message: IParsedChatRequest | string, variableData: IChatRequestVariableData | undefined, attempt: number | undefined, response: IChatCompleteResponse): Promise<void>;
     cancelCurrentRequestForSession(sessionResource: URI): void;
-    clearSession(sessionResource: URI): Promise<void>;
     hasSessions(): boolean;
     transferChatSession(transferredSessionData: IChatTransferredSessionData, toWorkspace: URI): void;
     getChatStorageFolder(): URI;
     logChatIndex(): void;
+    setTitle(sessionResource: URI, title: string): void;
+    appendProgress(request: IChatRequestModel, progress: IChatProgress): void;
     private toLocalSessionId;
 }