@codingame/monaco-vscode-chat-service-override 19.1.4 → 20.0.0

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

@@ -8,12 +8,12 @@ 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-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewsWelcome';
+import { ChatViewsWelcomeExtensions } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewsWelcome';
 
 const chatViewsWelcomeExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'chatViewsWelcome',
     jsonSchema: {
-        description: ( localize(5224, 'Contributes a welcome message to a chat view')),
+        description: ( localize(5333, 'Contributes a welcome message to a chat view')),
         type: 'array',
         items: {
             additionalProperties: false,
@@ -21,22 +21,22 @@ const chatViewsWelcomeExtensionPoint = ExtensionsRegistry.registerExtensionPoint
             properties: {
                 icon: {
                     type: 'string',
-                    description: ( localize(5225, 'The icon for the welcome message.')),
+                    description: ( localize(5334, 'The icon for the welcome message.')),
                 },
                 title: {
                     type: 'string',
-                    description: ( localize(5226, 'The title of the welcome message.')),
+                    description: ( localize(5335, 'The title of the welcome message.')),
                 },
                 content: {
                     type: 'string',
                     description: ( localize(
-                        5227,
+                        5336,
                         'The content of the welcome message. The first command link will be rendered as a button.'
                     )),
                 },
                 when: {
                     type: 'string',
-                    description: ( localize(5228, 'Condition when the welcome message is shown.')),
+                    description: ( localize(5337, 'Condition when the welcome message is shown.')),
                 }
             }
         },

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

@@ -1,6 +1,6 @@
 import { DeferredPromise } from "@codingame/monaco-vscode-api/vscode/vs/base/common/async";
 import { IMarkdownString } from "@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent";
-import { IChatExtensionsContent, IChatTerminalToolInvocationData, IChatToolInputInvocationData, IChatToolInvocation, IChatToolInvocationSerialized } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
+import { IChatExtensionsContent, IChatToolInputInvocationData, IChatTodoListContent, IChatToolInvocation, IChatToolInvocationSerialized, type IChatTerminalToolInvocationData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
 import { IPreparedToolInvocation, IToolConfirmationMessages, IToolData, IToolProgressStep, IToolResult } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService";
 export declare class ChatToolInvocation implements IChatToolInvocation {
     readonly toolCallId: string;
@@ -21,7 +21,7 @@ export declare class ChatToolInvocation implements IChatToolInvocation {
     private _confirmationMessages;
     readonly presentation: IPreparedToolInvocation["presentation"];
     readonly toolId: string;
-    readonly toolSpecificData?: IChatTerminalToolInvocationData | IChatToolInputInvocationData | IChatExtensionsContent;
+    readonly toolSpecificData?: IChatTerminalToolInvocationData | IChatToolInputInvocationData | IChatExtensionsContent | IChatTodoListContent;
     readonly progress: import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").ISettableObservable<{
         message?: string | IMarkdownString;
         progress: number;

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

@@ -1,7 +1,9 @@
 
 import { DeferredPromise } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import { encodeBase64 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { isToolResultOutputDetails } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 
 class ChatToolInvocation {
@@ -27,7 +29,7 @@ class ChatToolInvocation {
         this._isCompleteDeferred = ( new DeferredPromise());
         this._confirmDeferred = ( new DeferredPromise());
         this.progress = observableValue(this, { progress: 0 });
-        const defaultMessage = ( localize(5297, "Using {0}", `"${toolData.displayName}"`));
+        const defaultMessage = ( localize(5412, "Using {0}", `"${toolData.displayName}"`));
         const invocationMessage = preparedInvocation?.invocationMessage ?? defaultMessage;
         this.invocationMessage = invocationMessage;
         this.pastTenseMessage = preparedInvocation?.pastTenseMessage;
@@ -74,7 +76,9 @@ class ChatToolInvocation {
             originMessage: this.originMessage,
             isConfirmed: this._isConfirmed,
             isComplete: this._isComplete,
-            resultDetails: this._resultDetails,
+            resultDetails: isToolResultOutputDetails(this._resultDetails)
+                ? { output: { type: 'data', mimeType: this._resultDetails.output.mimeType, base64Data: encodeBase64(this._resultDetails.output.value) } }
+                : this._resultDetails,
             toolSpecificData: this.toolSpecificData,
             toolCallId: this.toolCallId,
             toolId: this.toolId,

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

@@ -6,7 +6,7 @@ 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-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { ChatResponseResource } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { isToolResultInputOutputDetails } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
 
@@ -31,17 +31,17 @@ let ChatResponseResourceFileSystemProvider = class ChatResponseResourceFileSyste
     }
     readFileStream(resource) {
         const stream = newWriteableStream(data => VSBuffer.concat(( data.map(data => VSBuffer.wrap(data)))).buffer);
-        stream.end(this.lookupURI(resource));
+        Promise.resolve(this.lookupURI(resource)).then(v => stream.end(v));
         return stream;
     }
-    stat(resource) {
-        const r = this.lookupURI(resource);
-        return Promise.resolve({
+    async stat(resource) {
+        const r = await this.lookupURI(resource);
+        return {
             type: FileType.File,
             ctime: 0,
             mtime: 0,
             size: r.length,
-        });
+        };
     }
     delete() {
         throw createFileSystemProviderError('fs is readonly', FileSystemProviderErrorCode.NoPermissions);
@@ -82,6 +82,9 @@ let ChatResponseResourceFileSystemProvider = class ChatResponseResourceFileSyste
         if (!part) {
             throw createFileSystemProviderError(`Tool does not have part`, FileSystemProviderErrorCode.FileNotFound);
         }
+        if (part.type === 'ref') {
+            return this._fileService.readFile(part.uri).then(r => r.value.buffer);
+        }
         return part.isText ? ( new TextEncoder()).encode(part.value) : decodeBase64(part.value).buffer;
     }
 };

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

@@ -1,6 +1,7 @@
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
@@ -8,13 +9,14 @@ import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
-import { IWorkbenchAssignmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/assignment/common/assignmentService.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 { ChatModel, IChatModel, IChatRequestModel, IChatRequestVariableData, IExportableChatData, ISerializableChatData } from "@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { IParsedChatRequest } from "@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes";
+import { ChatModel, IChatModel, IChatRequestModel, IChatRequestVariableData, IExportableChatData, ISerializableChatData } from "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IParsedChatRequest } from "@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes";
 import { IChatCompleteResponse, IChatDetail, IChatSendRequestData, IChatSendRequestOptions, 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";
 import { IChatTransferService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatTransferService.service";
 import { ChatAgentLocation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants";
@@ -29,11 +31,13 @@ export declare class ChatService extends Disposable implements IChatService {
     private readonly chatSlashCommandService;
     private readonly chatAgentService;
     private readonly configurationService;
-    private readonly experimentService;
     private readonly chatTransferService;
     private readonly languageModelsService;
+    private readonly chatSessionService;
+    private readonly mcpService;
     _serviceBrand: undefined;
     private readonly _sessionModels;
+    private readonly _contentProviderSessionModels;
     private readonly _pendingRequests;
     private _persistedSessions;
     private _deletedChatIds;
@@ -53,10 +57,11 @@ export declare class ChatService extends Disposable implements IChatService {
     private readonly _sessionFollowupCancelTokens;
     private readonly _chatServiceTelemetry;
     private readonly _chatSessionStore;
+    readonly requestInProgressObs: IObservable<boolean>;
     private get useFileStorage();
     get edits2Enabled(): boolean;
     private get isEmptyWindow();
-    constructor(storageService: IStorageService, logService: ILogService, extensionService: IExtensionService, instantiationService: IInstantiationService, telemetryService: ITelemetryService, workspaceContextService: IWorkspaceContextService, chatSlashCommandService: IChatSlashCommandService, chatAgentService: IChatAgentService, configurationService: IConfigurationService, experimentService: IWorkbenchAssignmentService, chatTransferService: IChatTransferService, languageModelsService: ILanguageModelsService);
+    constructor(storageService: IStorageService, logService: ILogService, extensionService: IExtensionService, instantiationService: IInstantiationService, telemetryService: ITelemetryService, workspaceContextService: IWorkspaceContextService, chatSlashCommandService: IChatSlashCommandService, chatAgentService: IChatAgentService, configurationService: IConfigurationService, chatTransferService: IChatTransferService, languageModelsService: ILanguageModelsService, chatSessionService: IChatSessionsService, mcpService: IMcpService);
     isEnabled(location: ChatAgentLocation): boolean;
     private saveState;
     private syncEmptyWindowChats;
@@ -77,6 +82,7 @@ export declare class ChatService extends Disposable implements IChatService {
     getOrRestoreSession(sessionId: string): Promise<ChatModel | undefined>;
     isPersistedSessionEmpty(sessionId: string): boolean;
     loadSessionFromContent(data: IExportableChatData | ISerializableChatData): IChatModel | undefined;
+    loadSessionForResource(resource: URI, location: ChatAgentLocation, token: CancellationToken): Promise<IChatModel | undefined>;
     resendRequest(request: IChatRequestModel, options?: IChatSendRequestOptions): Promise<void>;
     sendRequest(sessionId: string, request: string, options?: IChatSendRequestOptions): Promise<IChatSendRequestData | undefined>;
     private parseChatRequest;
@@ -84,7 +90,6 @@ export declare class ChatService extends Disposable implements IChatService {
     private _sendRequestAsync;
     private resolveModelId;
     private prepareContext;
-    private checkAgentAllowed;
     private attachmentKindsForTelemetry;
     private getHistoryEntriesFromModel;
     removeRequest(sessionId: string, requestId: string): Promise<void>;

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

@@ -8,10 +8,12 @@ import { ErrorNoTelemetry } from '@codingame/monaco-vscode-api/vscode/vs/base/co
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
-import { Disposable, DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable, DisposableMap, DisposableStore, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 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 { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { OffsetRange } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/ranges/offsetRange';
 import { isLocation } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
@@ -22,21 +24,26 @@ import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
-import { IWorkbenchAssignmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/assignment/common/assignmentService.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 { normalizeSerializableChatData, ChatModel, ChatRequestRemovalReason, updateRanges, toChatHistoryContent, ChatRequestModel } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/common/chatModel';
-import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, chatSubcommandLeader, chatAgentLeader, ChatRequestSlashCommandPart, getPromptText } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
-import { ChatRequestParser } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
+import { normalizeSerializableChatData, ChatModel, ChatRequestRemovalReason, updateRanges, toChatHistoryContent, ChatRequestModel } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { ChatRequestTextPart, ChatRequestAgentPart, ChatRequestAgentSubcommandPart, chatSubcommandLeader, chatAgentLeader, ChatRequestSlashCommandPart, getPromptText } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { ChatRequestParser } from '@codingame/monaco-vscode-0af61f78-dfc5-57ba-8d32-66268c8de38d-common/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
 import { ChatServiceTelemetry } from './chatServiceTelemetry.js';
+import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
 import { ChatSessionStore } from './chatSessionStore.js';
 import { IChatSlashCommandService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSlashCommands.service';
 import { IChatTransferService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatTransferService.service';
+import { ChatSessionUri } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatUri';
 import { isImageVariableEntry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariableEntries';
 import { ChatConfiguration, ChatAgentLocation, ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { ChatMessageRole } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels';
 import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
+import { ObservableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/map';
+import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 const serializedChatKey = 'interactive.sessions';
 const globalChatKey = 'chat.workspaceTransfer';
@@ -75,7 +82,7 @@ let ChatService = class ChatService extends Disposable {
         const workspace = this.workspaceContextService.getWorkspace();
         return !workspace.configuration && workspace.folders.length === 0;
     }
-    constructor(storageService, logService, extensionService, instantiationService, telemetryService, workspaceContextService, chatSlashCommandService, chatAgentService, configurationService, experimentService, chatTransferService, languageModelsService) {
+    constructor(storageService, logService, extensionService, instantiationService, telemetryService, workspaceContextService, chatSlashCommandService, chatAgentService, configurationService, chatTransferService, languageModelsService, chatSessionService, mcpService) {
         super();
         this.storageService = storageService;
         this.logService = logService;
@@ -86,10 +93,12 @@ let ChatService = class ChatService extends Disposable {
         this.chatSlashCommandService = chatSlashCommandService;
         this.chatAgentService = chatAgentService;
         this.configurationService = configurationService;
-        this.experimentService = experimentService;
         this.chatTransferService = chatTransferService;
         this.languageModelsService = languageModelsService;
-        this._sessionModels = this._register(( new DisposableMap()));
+        this.chatSessionService = chatSessionService;
+        this.mcpService = mcpService;
+        this._sessionModels = ( new ObservableMap());
+        this._contentProviderSessionModels = ( new Map());
         this._pendingRequests = this._register(( new DisposableMap()));
         this._deletedChatIds = ( new Set());
         this._onDidSubmitRequest = this._register(( new Emitter()));
@@ -128,6 +137,10 @@ let ChatService = class ChatService extends Disposable {
             this._chatSessionStore.migrateDataIfNeeded(() => this._persistedSessions);
         }
         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)));
+        });
     }
     isEnabled(location) {
         return this.chatAgentService.getContributedDefaultAgent(location) !== undefined;
@@ -281,7 +294,7 @@ let ChatService = class ChatService extends Disposable {
             const liveSessionItems = ( Array.from(( this._sessionModels.values()))
                 .filter(session => !session.isImported)
                 .map(session => {
-                const title = session.title || ( localize(5298, "New Chat"));
+                const title = session.title || ( localize(5413, "New Chat"));
                 return {
                     sessionId: session.sessionId,
                     title,
@@ -315,7 +328,7 @@ let ChatService = class ChatService extends Disposable {
         const liveSessionItems = ( Array.from(( this._sessionModels.values()))
             .filter(session => !session.isImported)
             .map(session => {
-            const title = session.title || ( localize(5298, "New Chat"));
+            const title = session.title || ( localize(5413, "New Chat"));
             return {
                 sessionId: session.sessionId,
                 title,
@@ -416,6 +429,89 @@ let ChatService = class ChatService extends Disposable {
     loadSessionFromContent(data) {
         return this._startSession(data, data.initialLocation ?? ChatAgentLocation.Panel, true, CancellationToken.None);
     }
+    async loadSessionForResource(resource, location, token) {
+        const parsed = ChatSessionUri.parse(resource);
+        if (!parsed) {
+            throw ( new Error('Invalid chat session URI'));
+        }
+        const existing = this._contentProviderSessionModels.get(parsed.chatSessionType)?.get(parsed.sessionId);
+        if (existing) {
+            return existing.model;
+        }
+        const chatSessionType = parsed.chatSessionType;
+        const content = await this.chatSessionService.provideChatSessionContent(chatSessionType, parsed.sessionId, CancellationToken.None);
+        const model = this._startSession(undefined, location, true, CancellationToken.None);
+        if (!( this._contentProviderSessionModels.has(chatSessionType))) {
+            this._contentProviderSessionModels.set(chatSessionType, ( new Map()));
+        }
+        const disposables = ( new DisposableStore());
+        this._contentProviderSessionModels.get(chatSessionType).set(parsed.sessionId, { model, disposables });
+        disposables.add(model.onDidDispose(() => {
+            this._contentProviderSessionModels?.get(chatSessionType)?.delete(parsed.sessionId);
+            content.dispose();
+        }));
+        let lastRequest;
+        for (const message of content.history) {
+            if (message.type === 'request') {
+                const requestText = message.prompt;
+                const parsedRequest = {
+                    text: requestText,
+                    parts: [( new ChatRequestTextPart(( new OffsetRange(0, requestText.length)), { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: requestText.length + 1 }, requestText))]
+                };
+                lastRequest = model.addRequest(parsedRequest, { variables: [] },
+                0,
+                undefined,
+                undefined,
+                undefined,
+                undefined,
+                undefined,
+                true
+                );
+            }
+            else {
+                if (lastRequest) {
+                    for (const part of message.parts) {
+                        model.acceptResponseProgress(lastRequest, part);
+                    }
+                }
+            }
+        }
+        if (content.progressEvent && lastRequest) {
+            const initialCancellationRequest = this.instantiationService.createInstance(CancellableRequest, ( new CancellationTokenSource()), undefined);
+            this._pendingRequests.set(model.sessionId, initialCancellationRequest);
+            const cancellationListener = ( new MutableDisposable());
+            const createCancellationListener = (token) => {
+                return token.onCancellationRequested(() => {
+                    content.interruptActiveResponseCallback?.().then(userConfirmedInterruption => {
+                        if (!userConfirmedInterruption) {
+                            const newCancellationRequest = this.instantiationService.createInstance(CancellableRequest, ( new CancellationTokenSource()), undefined);
+                            this._pendingRequests.set(model.sessionId, newCancellationRequest);
+                            cancellationListener.value = createCancellationListener(newCancellationRequest.cancellationTokenSource.token);
+                        }
+                    });
+                });
+            };
+            cancellationListener.value = createCancellationListener(initialCancellationRequest.cancellationTokenSource.token);
+            disposables.add(cancellationListener);
+            disposables.add(content.progressEvent(e => {
+                for (const progress of e) {
+                    if (progress.kind === 'progressMessage' && progress.content.value === 'Session completed') {
+                        model?.completeResponse(lastRequest);
+                        cancellationListener.clear();
+                    }
+                    else {
+                        model?.acceptResponseProgress(lastRequest, progress);
+                    }
+                }
+            }));
+        }
+        else {
+            if (lastRequest) {
+                model.completeResponse(lastRequest);
+            }
+        }
+        return model;
+    }
     async resendRequest(request, options) {
         const model = this._sessionModels.get(request.session.sessionId);
         if (!model && model !== request.session) {
@@ -513,7 +609,8 @@ let ChatService = class ChatService extends Disposable {
                 responseCreatedComplete = true;
             }
         }
-        const source = ( new CancellationTokenSource());
+        const store = ( new DisposableStore());
+        const source = store.add(( new CancellationTokenSource()));
         const token = source.token;
         const sendRequestInternal = async () => {
             const progressCallback = (progress) => {
@@ -537,8 +634,11 @@ let ChatService = class ChatService extends Disposable {
             let detectedAgent;
             let detectedCommand;
             const stopWatch = ( new StopWatch(false));
-            const listener = token.onCancellationRequested(() => {
+            store.add(token.onCancellationRequested(() => {
                 this.trace('sendRequest', `Request for session ${model.sessionId} was cancelled`);
+                if (!request) {
+                    return;
+                }
                 this.telemetryService.publicLog2('interactiveSessionProviderInvoked', {
                     timeToFirstProgress: undefined,
                     totalTime: stopWatch.elapsed(),
@@ -557,7 +657,7 @@ let ChatService = class ChatService extends Disposable {
                     model: this.resolveModelId(options?.userSelectedModelId),
                 });
                 model.cancelRequest(request);
-            });
+            }));
             try {
                 let rawResult;
                 let agentOrCommandFollowups = undefined;
@@ -579,6 +679,17 @@ let ChatService = class ChatService extends Disposable {
                             variableData = updateRanges(variableData, promptTextResult.diff);
                             message = promptTextResult.message;
                         }
+                        let isInitialTools = true;
+                        store.add(autorun(reader => {
+                            const tools = options?.userSelectedTools?.read(reader);
+                            if (isInitialTools) {
+                                isInitialTools = false;
+                                return;
+                            }
+                            if (tools) {
+                                this.chatAgentService.setRequestTools(agent.id, request.id, { userSelectedTools: tools });
+                            }
+                        }));
                         return {
                             sessionId,
                             requestId: request.id,
@@ -594,7 +705,7 @@ let ChatService = class ChatService extends Disposable {
                             acceptedConfirmationData: options?.acceptedConfirmationData,
                             rejectedConfirmationData: options?.rejectedConfirmationData,
                             userSelectedModelId: options?.userSelectedModelId,
-                            userSelectedTools: options?.userSelectedTools,
+                            userSelectedTools: options?.userSelectedTools?.get(),
                             modeInstructions: options?.modeInstructions,
                             editedFileEvents: request.editedFileEvents
                         };
@@ -611,8 +722,10 @@ let ChatService = class ChatService extends Disposable {
                     }
                     const agent = (detectedAgent ?? agentPart?.agent ?? defaultAgent);
                     const command = detectedCommand ?? agentSlashCommandPart?.command;
-                    await this.extensionService.activateByEvent(`onChatParticipant:${agent.id}`);
-                    await this.checkAgentAllowed(agent);
+                    await Promise.all([
+                        this.extensionService.activateByEvent(`onChatParticipant:${agent.id}`),
+                        this.mcpService.autostart(token),
+                    ]);
                     const history = this.getHistoryEntriesFromModel(requests, model.sessionId, location, agent.id);
                     const requestProps = prepareChatAgentRequest(agent, command, enableCommandDetection, request , !!detectedAgent);
                     const pendingRequest = this._pendingRequests.get(sessionId);
@@ -654,7 +767,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(5299, "Provider returned null response")) } };
+                        rawResult = { errorDetails: { message: ( localize(5414, "Provider returned null response")) } };
                     }
                     const result = rawResult.errorDetails?.responseIsFiltered ? 'filtered' :
                         rawResult.errorDetails && gotProgress ? 'errorWithOutput' :
@@ -723,7 +836,7 @@ let ChatService = class ChatService extends Disposable {
                 }
             }
             finally {
-                listener.dispose();
+                store.dispose();
             }
         };
         const rawResponsePromise = sendRequestInternal();
@@ -756,14 +869,6 @@ let ChatService = class ChatService extends Disposable {
         });
         return attachedContextVariables;
     }
-    async checkAgentAllowed(agent) {
-        if (agent.modes.includes(ChatModeKind.Agent)) {
-            const enabled = await this.experimentService.getTreatment('chatAgentEnabled');
-            if (enabled === false) {
-                throw ( new Error('Agent is currently disabled'));
-            }
-        }
-    }
     attachmentKindsForTelemetry(variableData) {
         return ( variableData.variables.map(v => {
             if (v.kind === 'implicit') {
@@ -921,7 +1026,8 @@ let ChatService = class ChatService extends Disposable {
                 }
             }
         }
-        this._sessionModels.deleteAndDispose(sessionId);
+        this._sessionModels.delete(sessionId);
+        model.dispose();
         this._pendingRequests.get(sessionId)?.cancel();
         this._pendingRequests.deleteAndDispose(sessionId);
         this._onDidDisposeSession.fire({ sessionId, reason: 'cleared' });
@@ -974,9 +1080,10 @@ ChatService = ( __decorate([
     ( __param(6, IChatSlashCommandService)),
     ( __param(7, IChatAgentService)),
     ( __param(8, IConfigurationService)),
-    ( __param(9, IWorkbenchAssignmentService)),
-    ( __param(10, IChatTransferService)),
-    ( __param(11, ILanguageModelsService))
+    ( __param(9, IChatTransferService)),
+    ( __param(10, ILanguageModelsService)),
+    ( __param(11, IChatSessionsService)),
+    ( __param(12, IMcpService))
 ], ChatService));
 function getCodeBlocks(text) {
     const lines = text.split('\n');

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

@@ -52,6 +52,14 @@ let ChatServiceTelemetry = class ChatServiceTelemetry {
                 command: action.command,
             });
         }
+        else if (action.action.kind === 'chatEditingHunkAction') {
+            this.telemetryService.publicLog2('chatEditHunk', {
+                agentId: action.agentId ?? '',
+                outcome: action.action.outcome,
+                lineCount: action.action.lineCount,
+                hasRemainingEdits: action.action.hasRemainingEdits,
+            });
+        }
     }
     retrievedFollowups(agentId, command, numFollowups) {
         this.telemetryService.publicLog2('chatFollowupsRetrieved', {

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

@@ -8,7 +8,7 @@ import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platfo
 import { IUserDataProfilesService } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataProfile/common/userDataProfile.service";
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
 import { ILifecycleService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service";
-import { ChatModel, ISerializableChatData, ISerializableChatsData } from "@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { ChatModel, ISerializableChatData, ISerializableChatsData } from "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel";
 import { ChatAgentLocation, ChatModeKind } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants";
 export declare class ChatSessionStore extends Disposable {
     private readonly fileService;

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

@@ -18,7 +18,7 @@ import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platfo
 import { IUserDataProfilesService } from '@codingame/monaco-vscode-api/vscode/vs/platform/userDataProfile/common/userDataProfile.service';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { ILifecycleService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
-import { normalizeSerializableChatData, ChatModel } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { normalizeSerializableChatData, ChatModel } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel';
 
 const maxPersistedSessions = 25;
 const ChatIndexStorageKey = 'chat.ChatSessionStore.index';
@@ -51,7 +51,7 @@ let ChatSessionStore = class ChatSessionStore extends Disposable {
             }
             e.join(this.storeTask, {
                 id: 'join.chatSessionStore',
-                label: ( localize(5300, "Saving chat history"))
+                label: ( localize(5415, "Saving chat history"))
             });
         }));
     }
@@ -324,7 +324,7 @@ function isChatSessionIndex(data) {
 }
 function getSessionMetadata(session) {
     const title = session instanceof ChatModel ?
-        (session.title || ( localize(5301, "New Chat"))) :
+        (session.title || ( localize(5416, "New Chat"))) :
         session.customTitle ?? ChatModel.getDefaultTitle(session.requests);
     return {
         sessionId: session.sessionId,

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

@@ -0,0 +1,27 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
+import { IChatTodoListService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatTodoListService.service";
+export interface IChatTodo {
+    id: number;
+    title: string;
+    description?: string;
+    status: "not-started" | "in-progress" | "completed";
+}
+export interface IChatTodoListStorage {
+    getTodoList(sessionId: string): IChatTodo[];
+    setTodoList(sessionId: string, todoList: IChatTodo[]): void;
+}
+export declare class ChatTodoListStorage implements IChatTodoListStorage {
+    private memento;
+    constructor(storageService: IStorageService);
+    private getSessionData;
+    private setSessionData;
+    getTodoList(sessionId: string): IChatTodo[];
+    setTodoList(sessionId: string, todoList: IChatTodo[]): void;
+}
+export declare class ChatTodoListService extends Disposable implements IChatTodoListService {
+    readonly _serviceBrand: undefined;
+    private todoListStorage;
+    constructor(storageService: IStorageService);
+    getChatTodoListStorage(): IChatTodoListStorage;
+}