@codingame/monaco-vscode-chat-service-override 27.0.0 → 28.0.0

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

@@ -15,6 +15,11 @@ class ChatDebugServiceImpl extends Disposable {
         this._size = 0;
         this._onDidAddEvent = this._register(( new Emitter()));
         this.onDidAddEvent = this._onDidAddEvent.event;
+        this._onDidClearProviderEvents = this._register(( new Emitter()));
+        this.onDidClearProviderEvents = this._onDidClearProviderEvents.event;
+        this._onDidAttachDebugData = this._register(( new Emitter()));
+        this.onDidAttachDebugData = this._onDidAttachDebugData.event;
+        this._debugDataAttachedSessions = ( new ResourceMap());
         this._providers = ( new Set());
         this._invocationCts = ( new ResourceMap());
         this._providerEvents = ( new WeakSet());
@@ -86,6 +91,7 @@ class ChatDebugServiceImpl extends Disposable {
         this._buffer.fill(undefined);
         this._head = 0;
         this._size = 0;
+        this._debugDataAttachedSessions.clear();
     }
     registerProvider(provider) {
         this._providers.add(provider);
@@ -98,6 +104,9 @@ class ChatDebugServiceImpl extends Disposable {
             this._providers.delete(provider);
         });
     }
+    hasInvokedProviders(sessionResource) {
+        return ( this._invocationCts.has(sessionResource));
+    }
     async invokeProviders(sessionResource) {
         if (!LocalChatSessionUri.isLocalSession(sessionResource)) {
             return;
@@ -139,6 +148,7 @@ class ChatDebugServiceImpl extends Disposable {
             cts.dispose();
             this._invocationCts.delete(sessionResource);
         }
+        this._debugDataAttachedSessions.delete(sessionResource);
     }
     _clearProviderEvents(sessionResource) {
         const key = ( sessionResource.toString());
@@ -159,6 +169,16 @@ class ChatDebugServiceImpl extends Disposable {
             this._buffer[(this._head + i) % ChatDebugServiceImpl.MAX_EVENTS] = undefined;
         }
         this._size = write;
+        this._onDidClearProviderEvents.fire(sessionResource);
+    }
+    markDebugDataAttached(sessionResource) {
+        if (!( this._debugDataAttachedSessions.has(sessionResource))) {
+            this._debugDataAttachedSessions.set(sessionResource, true);
+            this._onDidAttachDebugData.fire(sessionResource);
+        }
+    }
+    hasAttachedDebugData(sessionResource) {
+        return ( this._debugDataAttachedSessions.has(sessionResource));
     }
     async resolveEvent(eventId) {
         for (const provider of this._providers) {

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

@@ -80,7 +80,6 @@ export declare class ChatService extends Disposable implements IChatService {
      * For test use only
      */
     waitForModelDisposals(): Promise<void>;
-    get edits2Enabled(): boolean;
     private get isEmptyWindow();
     constructor(storageService: IStorageService, logService: ILogService, telemetryService: ITelemetryService, extensionService: IExtensionService, instantiationService: IInstantiationService, workspaceContextService: IWorkspaceContextService, chatSlashCommandService: IChatSlashCommandService, chatAgentService: IChatAgentService, configurationService: IConfigurationService, chatTransferService: IChatTransferService, chatSessionService: IChatSessionsService, mcpService: IMcpService, promptsService: IPromptsService, chatEntitlementService: IChatEntitlementService, languageModelsService: ILanguageModelsService, chatDebugService: IChatDebugService);
     get editingSessions(): import("@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService").IChatEditingSession[];
@@ -144,6 +143,7 @@ export declare class ChatService extends Disposable implements IChatService {
     /**
      * Process the next pending request from the model's queue, if any.
      * Called after a request completes to continue processing queued requests.
+     * Multiple consecutive steering requests are combined into a single request.
      */
     private processNextPendingRequest;
     private generateInitialChatTitleIfNeeded;

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

@@ -45,12 +45,13 @@ 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 { 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/tools/languageModelToolsService.service';
 import { ChatSessionOperationLog } from '../model/chatSessionOperationLog.js';
 import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service';
+import { mergeHooks } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookSchema';
 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';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
@@ -99,9 +100,6 @@ let ChatService = class ChatService extends Disposable {
     waitForModelDisposals() {
         return this._sessionModels.waitForModelDisposals();
     }
-    get edits2Enabled() {
-        return this.configurationService.getValue(ChatConfiguration.Edits2Enabled);
-    }
     get isEmptyWindow() {
         const workspace = this.workspaceContextService.getWorkspace();
         return !workspace.configuration && workspace.folders.length === 0;
@@ -333,7 +331,7 @@ let ChatService = class ChatService extends Disposable {
     }
     async getLiveSessionItems() {
         return await Promise.all(( Array.from(( this._sessionModels.values())).filter(session => this.shouldBeInHistory(session)).map(async session => {
-            const title = session.title || ( localize(6868, "New Chat"));
+            const title = session.title || ( localize(6984, "New Chat"));
             return {
                 sessionResource: session.sessionResource,
                 title,
@@ -498,7 +496,7 @@ let ChatService = class ChatService extends Disposable {
         }
     }
     async loadRemoteSession(sessionResource, location, token) {
-        await this.chatSessionService.canResolveChatSession(sessionResource);
+        await this.chatSessionService.canResolveChatSession(sessionResource.scheme);
         {
             const existingRef = this.acquireExistingSession(sessionResource);
             if (existingRef) {
@@ -872,6 +870,18 @@ let ChatService = class ChatService extends Disposable {
             } catch (error) {
                 this.logService.warn("[ChatService] Failed to collect hooks:", error);
             }
+            const agentName = options?.modeInfo?.modeInstructions?.name;
+            if (agentName) {
+                try {
+                    const agents = await this.promptsService.getCustomAgents(token, model.sessionResource);
+                    const customAgent = agents.find(a => a.name === agentName);
+                    if (customAgent?.hooks) {
+                        collectedHooks = mergeHooks(collectedHooks, customAgent.hooks);
+                    }
+                } catch (error) {
+                    this.logService.warn("[ChatService] Failed to collect agent hooks:", error);
+                }
+            }
             const stopWatch = ( new StopWatch(false));
             store.add(token.onCancellationRequested(() => {
                 this.trace(
@@ -949,6 +959,7 @@ let ChatService = class ChatService extends Disposable {
                             userSelectedModelId: options?.userSelectedModelId,
                             userSelectedTools: options?.userSelectedTools?.get(),
                             modeInstructions: options?.modeInfo?.modeInstructions,
+                            permissionLevel: options?.modeInfo?.permissionLevel,
                             editedFileEvents: request.editedFileEvents,
                             hooks: collectedHooks,
                             hasHooksEnabled: !!collectedHooks && ( ( Object.values(collectedHooks)).some(arr => arr.length > 0))
@@ -1063,7 +1074,8 @@ let ChatService = class ChatService extends Disposable {
                         history,
                         location,
                         model.sessionResource,
-                        token
+                        token,
+                        options
                     );
                     agentOrCommandFollowups = Promise.resolve(commandResult?.followUp);
                     rawResult = {};
@@ -1073,6 +1085,7 @@ let ChatService = class ChatService extends Disposable {
                 if ((token.isCancellationRequested && !rawResult)) {
                     return;
                 } else if (!request) {
+                    shouldProcessPending = !token.isCancellationRequested;
                     return;
                 } else {
                     if (!rawResult) {
@@ -1082,7 +1095,7 @@ let ChatService = class ChatService extends Disposable {
                         );
                         rawResult = {
                             errorDetails: {
-                                message: ( localize(6869, "Provider returned null response"))
+                                message: ( localize(6985, "Provider returned null response"))
                             }
                         };
                     }
@@ -1177,31 +1190,64 @@ let ChatService = class ChatService extends Disposable {
         }
     }
     processNextPendingRequest(model) {
-        const pendingRequest = model.dequeuePendingRequest();
-        if (!pendingRequest) {
+        const steeringRequests = model.dequeueAllSteeringRequests();
+        const nextQueued = steeringRequests.length === 0 ? model.dequeuePendingRequest() : undefined;
+        const allRequests = steeringRequests.length > 0 ? steeringRequests : (nextQueued ? [nextQueued] : []);
+        if (allRequests.length === 0) {
             return;
         }
         this.trace(
             "processNextPendingRequest",
-            `Processing queued request for session ${model.sessionResource}`
+            `Processing ${allRequests.length} queued request(s) for session ${model.sessionResource}`
         );
-        const deferred = this._queuedRequestDeferreds.get(pendingRequest.request.id);
-        this._queuedRequestDeferreds.delete(pendingRequest.request.id);
+        const deferreds = [];
+        for (const req of allRequests) {
+            const deferred = this._queuedRequestDeferreds.get(req.request.id);
+            this._queuedRequestDeferreds.delete(req.request.id);
+            if (deferred) {
+                deferreds.push(deferred);
+            }
+        }
+        const firstRequest = allRequests[0];
         const sendOptions = {
-            ...pendingRequest.sendOptions,
-            attachedContext: pendingRequest.request.variableData.variables.slice()
+            ...firstRequest.sendOptions,
+            attachedContext: allRequests.flatMap(req => req.request.variableData.variables.slice())
         };
         const location = sendOptions.location ?? sendOptions.locationData?.type ?? model.initialLocation;
         const defaultAgent = this.chatAgentService.getDefaultAgent(location, sendOptions.modeInfo?.kind);
         if (!defaultAgent) {
             this.logService.warn("processNextPendingRequest", `No default agent for location ${location}`);
-            deferred?.complete({
-                kind: "rejected",
-                reason: "No default agent available"
-            });
+            for (const deferred of deferreds) {
+                deferred.complete({
+                    kind: "rejected",
+                    reason: "No default agent available"
+                });
+            }
+            return;
+        }
+        let parsedRequest;
+        try {
+            if (allRequests.length > 1) {
+                const combinedText = ( allRequests.map(req => req.request.message.text)).join("\n\n");
+                parsedRequest = this.parseChatRequest(model.sessionResource, combinedText, location, {
+                    ...sendOptions,
+                    agentId: undefined,
+                    slashCommand: undefined
+                });
+            } else {
+                parsedRequest = firstRequest.request.message;
+            }
+        } catch (err) {
+            this.logService.error("processNextPendingRequest: failed to parse combined chat request", err);
+            const reason = toErrorMessage(err);
+            for (const deferred of deferreds) {
+                deferred.complete({
+                    kind: "rejected",
+                    reason
+                });
+            }
             return;
         }
-        const parsedRequest = pendingRequest.request.message;
         const silentAgent = sendOptions.agentIdSilent ? this.chatAgentService.getAgent(sendOptions.agentIdSilent) : undefined;
         const agent = silentAgent ?? parsedRequest.parts.find(r => r instanceof ChatRequestAgentPart)?.agent ?? defaultAgent;
         const agentSlashCommandPart = parsedRequest.parts.find(r => r instanceof ChatRequestAgentSubcommandPart);
@@ -1209,20 +1255,23 @@ let ChatService = class ChatService extends Disposable {
             model,
             model.sessionResource,
             parsedRequest,
-            pendingRequest.request.attempt,
+            firstRequest.request.attempt,
             !sendOptions.noCommandDetection,
             silentAgent ?? defaultAgent,
             location,
             sendOptions
         );
-        deferred?.complete({
+        const result = {
             kind: "sent",
             data: {
                 ...responseState,
                 agent,
                 slashCommand: agentSlashCommandPart?.command
             }
-        });
+        };
+        for (const deferred of deferreds) {
+            deferred.complete(result);
+        }
     }
     generateInitialChatTitleIfNeeded(model, request, defaultAgent, token) {
         if (model.getRequests().length !== 1 || model.customTitle) {

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

@@ -4,7 +4,7 @@ import { IChatAgentData } from "@codingame/monaco-vscode-api/vscode/vs/workbench
 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 { ChatAgentLocation, ChatPermissionLevel } 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 = {
     timeToFirstProgress: number | undefined;
@@ -22,6 +22,9 @@ export type ChatProviderInvokedEvent = {
     enableCommandDetection: boolean;
     attachmentKinds: string[];
     model: string | undefined;
+    permissionLevel: ChatPermissionLevel | undefined;
+    chatMode: string | undefined;
+    sessionType: string | undefined;
 };
 export type ChatProviderInvokedClassification = {
     timeToFirstProgress: {
@@ -99,6 +102,21 @@ export type ChatProviderInvokedClassification = {
         purpose: "FeatureInsight";
         comment: "The model used to generate the response.";
     };
+    permissionLevel: {
+        classification: "SystemMetaData";
+        purpose: "FeatureInsight";
+        comment: "The tool auto-approval permission level selected in the permission picker (default, autoApprove, or autopilot). Undefined when the picker is not applicable (e.g. ask mode or API-driven requests).";
+    };
+    chatMode: {
+        classification: "SystemMetaData";
+        purpose: "FeatureInsight";
+        comment: "The chat mode used for the request. Built-in modes (ask, agent, edit), extension-contributed names (e.g. Plan), or a hashed identifier for user-created custom agents.";
+    };
+    sessionType: {
+        classification: "SystemMetaData";
+        purpose: "FeatureInsight";
+        comment: "The session type scheme (e.g. vscodeLocalChatSession for local, or remote session scheme).";
+    };
     owner: "roblourens";
     comment: "Provides insight into the performance of Chat agents.";
 };

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

@@ -5,6 +5,7 @@ import { isLocation } from '@codingame/monaco-vscode-api/vscode/vs/editor/common
 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/chatService';
 import { isImageVariableEntry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries';
+import { ChatModeKind } 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';
 import { chatSessionResourceToId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
 
@@ -128,7 +129,10 @@ let ChatRequestTelemetry = class ChatRequestTelemetry {
             citations: request.response?.codeCitations.length ?? 0,
             numCodeBlocks: getCodeBlocks(request.response?.response.toString() ?? "").length,
             attachmentKinds: this.attachmentKindsForTelemetry(request.variableData),
-            model: this.resolveModelId(this.opts.options?.userSelectedModelId)
+            model: this.resolveModelId(this.opts.options?.userSelectedModelId),
+            permissionLevel: this.opts.options?.modeInfo?.kind === ChatModeKind.Ask ? undefined : this.opts.options?.modeInfo?.permissionLevel,
+            chatMode: this.opts.options?.modeInfo?.modeName ?? this.opts.options?.modeInfo?.modeId,
+            sessionType: this.opts.sessionResource.scheme
         });
     }
     attachmentKindsForTelemetry(variableData) {

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

@@ -1,9 +1,11 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 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 { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
 import { IEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
 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 { IUserDataProfilesService } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataProfile/common/userDataProfile.service";
@@ -24,13 +26,15 @@ export declare class ChatSessionStore extends Disposable {
     private readonly userDataProfilesService;
     private readonly configurationService;
     private readonly workspaceEditingService;
+    private readonly dialogService;
+    private readonly openerService;
     private storageRoot;
     private readonly previousEmptyWindowStorageRoot;
     private readonly transferredSessionStorageRoot;
     private readonly storeQueue;
     private storeTask;
     private shuttingDown;
-    constructor(fileService: IFileService, environmentService: IEnvironmentService, logService: ILogService, workspaceContextService: IWorkspaceContextService, telemetryService: ITelemetryService, storageService: IStorageService, lifecycleService: ILifecycleService, userDataProfilesService: IUserDataProfilesService, configurationService: IConfigurationService, workspaceEditingService: IWorkspaceEditingService);
+    constructor(fileService: IFileService, environmentService: IEnvironmentService, logService: ILogService, workspaceContextService: IWorkspaceContextService, telemetryService: ITelemetryService, storageService: IStorageService, lifecycleService: ILifecycleService, userDataProfilesService: IUserDataProfilesService, configurationService: IConfigurationService, workspaceEditingService: IWorkspaceEditingService, dialogService: IDialogService, openerService: IOpenerService);
     private handleWorkspaceTransition;
     private migrateSessionsToNewWorkspace;
     storeSessions(sessions: ChatModel[]): Promise<void>;
@@ -41,6 +45,7 @@ export declare class ChatSessionStore extends Disposable {
     getTransferredSessionData(): URI | undefined;
     readTransferredSession(sessionResource: URI): Promise<ISerializedChatDataReference | undefined>;
     private cleanupTransferredSession;
+    private _didReportIssue;
     private writeSession;
     private writeSessionMetadataOnly;
     private flushIndex;

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

@@ -10,10 +10,12 @@ import { joinPath } from '@codingame/monaco-vscode-api/vscode/vs/base/common/res
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
 import { IEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service';
 import { toFileOperationResult, FileOperationResult } 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 { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
@@ -47,7 +49,9 @@ let ChatSessionStore = class ChatSessionStore extends Disposable {
         lifecycleService,
         userDataProfilesService,
         configurationService,
-        workspaceEditingService
+        workspaceEditingService,
+        dialogService,
+        openerService
     ) {
         super();
         this.fileService = fileService;
@@ -60,8 +64,11 @@ let ChatSessionStore = class ChatSessionStore extends Disposable {
         this.userDataProfilesService = userDataProfilesService;
         this.configurationService = configurationService;
         this.workspaceEditingService = workspaceEditingService;
+        this.dialogService = dialogService;
+        this.openerService = openerService;
         this.storeQueue = ( new Sequencer());
         this.shuttingDown = false;
+        this._didReportIssue = false;
         const workspace = this.workspaceContextService.getWorkspace();
         const isEmptyWindow = !workspace.configuration && workspace.folders.length === 0;
         const workspaceId = this.workspaceContextService.getWorkspace().id;
@@ -91,7 +98,7 @@ let ChatSessionStore = class ChatSessionStore extends Disposable {
             }
             e.join(this.storeTask, {
                 id: "join.chatSessionStore",
-                label: ( localize(6904, "Saving chat history"))
+                label: ( localize(7020, "Saving chat history"))
             });
         }));
     }
@@ -337,10 +344,32 @@ let ChatSessionStore = class ChatSessionStore extends Disposable {
                     if (!session.dataSerializer) {
                         session.dataSerializer = ( new ChatSessionOperationLog());
                     }
-                    const {
-                        op,
-                        data
-                    } = session.dataSerializer.write(session);
+                    let op;
+                    let data;
+                    try {
+                        ({
+                            op,
+                            data
+                        } = session.dataSerializer.write(session));
+                    } catch (e) {
+                        if (!this._didReportIssue) {
+                            this._didReportIssue = true;
+                            this.dialogService.prompt({
+                                custom: true,
+                                title: ( localize(7021, "Error saving chat session")),
+                                message: ( localize(
+                                    7022,
+                                    "Error serializing chat session for storage. The session will be lost if the window is closed. Please report this issue to the VS Code team:\n\n{0}",
+                                    e.stack || toErrorMessage(e)
+                                )),
+                                buttons: [{
+                                    label: ( localize(7023, "Report Issue")),
+                                    run: () => this.openerService.open("https://github.com/microsoft/vscode/issues/new?template=bug_report.md")
+                                }]
+                            });
+                        }
+                        throw e;
+                    }
                     if (data.byteLength > 0) {
                         await this.fileService.writeFile(storageLocation.log, data, {
                             append: op === "append"
@@ -638,7 +667,7 @@ let ChatSessionStore = class ChatSessionStore extends Disposable {
         return this.storageRoot;
     }
 };
-ChatSessionStore = ChatSessionStore_1 = ( __decorate([( __param(0, IFileService)), ( __param(1, IEnvironmentService)), ( __param(2, ILogService)), ( __param(3, IWorkspaceContextService)), ( __param(4, ITelemetryService)), ( __param(5, IStorageService)), ( __param(6, ILifecycleService)), ( __param(7, IUserDataProfilesService)), ( __param(8, IConfigurationService)), ( __param(9, IWorkspaceEditingService))], ChatSessionStore));
+ChatSessionStore = ChatSessionStore_1 = ( __decorate([( __param(0, IFileService)), ( __param(1, IEnvironmentService)), ( __param(2, ILogService)), ( __param(3, IWorkspaceContextService)), ( __param(4, ITelemetryService)), ( __param(5, IStorageService)), ( __param(6, ILifecycleService)), ( __param(7, IUserDataProfilesService)), ( __param(8, IConfigurationService)), ( __param(9, IWorkspaceEditingService)), ( __param(10, IDialogService)), ( __param(11, IOpenerService))], ChatSessionStore));
 function isChatSessionEntryMetadata(obj) {
     return (!!obj && typeof obj === "object" && typeof obj.sessionId === "string" && typeof obj.title === "string" && typeof obj.lastMessageDate === "number");
 }
@@ -679,7 +708,7 @@ async function getSessionMetadata(session) {
     }
     return {
         sessionId: session.sessionId,
-        title: title || ( localize(6905, "New Chat")),
+        title: title || ( localize(7024, "New Chat")),
         lastMessageDate,
         timing,
         initialLocation: session.initialLocation,

package/vscode/src/vs/workbench/contrib/chat/common/model/objectMutationLog.js

@@ -3,6 +3,21 @@ import { assertNever } from '@codingame/monaco-vscode-api/vscode/vs/base/common/
 import { VSBuffer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
 import { isUndefinedOrNull } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 
+function prefixError(e, prefix) {
+    e.message = prefix + e.message;
+    if (e.stack) {
+        const nlIdx = e.stack.indexOf("\n");
+        e.stack = nlIdx !== -1 ? `${e.name}: ${e.message}${e.stack.slice(nlIdx)}` : `${e.name}: ${e.message}`;
+    }
+}
+function rethrowWithPathSegment(e, segment) {
+    if (e instanceof Error) {
+        const part = typeof segment === "number" ? `[${segment}]` : `.${segment}`;
+        const needsSep = !e.message.startsWith("[") && !e.message.startsWith(".");
+        prefixError(e, part + (needsSep ? ": " : ""));
+    }
+    throw e;
+}
 var TransformKind;
 (function(TransformKind) {
     TransformKind[TransformKind["Key"] = 0] = "Key";
@@ -34,7 +49,13 @@ function array(schema) {
     return {
         kind: TransformKind.Array,
         itemSchema: schema,
-        extract: from => from?.map(item => schema.extract(item))
+        extract: from => from?.map((item, i) => {
+            try {
+                return schema.extract(item);
+            } catch (e) {
+                rethrowWithPathSegment(e, i);
+            }
+        })
     };
 }
 function object(schema, options) {
@@ -49,7 +70,11 @@ function object(schema, options) {
             }
             const result = Object.create(null);
             for (const [key, transform] of entries) {
-                result[key] = transform.extract(from);
+                try {
+                    result[key] = transform.extract(from);
+                } catch (e) {
+                    rethrowWithPathSegment(e, key);
+                }
             }
             return result;
         }
@@ -152,7 +177,15 @@ class ObjectMutationLog {
         }
         const entries = [];
         const path = [];
-        this._diff(this._transform, path, this._previous, currentValue, entries);
+        try {
+            this._diff(this._transform, path, this._previous, currentValue, entries);
+        } catch (e) {
+            if (e instanceof Error) {
+                const pathStr = ( path.map(s => typeof s === "number" ? `[${s}]` : `.${s}`)).join("") || "<root>";
+                prefixError(e, `error diffing at ${pathStr}: `);
+            }
+            throw e;
+        }
         if (entries.length === 0) {
             return {
                 op: "append",

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

@@ -3,11 +3,11 @@ import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event"
 import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IProgress } from "@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress";
 import { IChatMessage } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels";
-import { IChatFollowup, IChatProgress, IChatResponseProgressFileTreeData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
+import { IChatFollowup, IChatProgress, IChatResponseProgressFileTreeData, IChatSendRequestOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
 import { ChatAgentLocation, ChatModeKind } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { Target } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService";
+import { Target } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes";
 import { IChatSlashCommandService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatSlashCommands.service";
 export interface IChatSlashData {
     command: string;
@@ -36,7 +36,7 @@ export interface IChatSlashFragment {
     };
 }
 export type IChatSlashCallback = {
-    (prompt: string, progress: IProgress<IChatProgress>, history: IChatMessage[], location: ChatAgentLocation, sessionResource: URI, token: CancellationToken): Promise<{
+    (prompt: string, progress: IProgress<IChatProgress>, history: IChatMessage[], location: ChatAgentLocation, sessionResource: URI, token: CancellationToken, options?: IChatSendRequestOptions): Promise<{
         followUp: IChatFollowup[];
     } | void>;
 };
@@ -51,7 +51,7 @@ export declare class ChatSlashCommandService extends Disposable implements IChat
     registerSlashCommand(data: IChatSlashData, command: IChatSlashCallback): IDisposable;
     getCommands(location: ChatAgentLocation, mode: ChatModeKind): Array<IChatSlashData>;
     hasCommand(id: string): boolean;
-    executeCommand(id: string, prompt: string, progress: IProgress<IChatProgress>, history: IChatMessage[], location: ChatAgentLocation, sessionResource: URI, token: CancellationToken): Promise<{
+    executeCommand(id: string, prompt: string, progress: IProgress<IChatProgress>, history: IChatMessage[], location: ChatAgentLocation, sessionResource: URI, token: CancellationToken, options?: IChatSendRequestOptions): Promise<{
         followUp: IChatFollowup[];
     } | void>;
 }

package/vscode/src/vs/workbench/contrib/chat/common/participants/chatSlashCommands.js

@@ -39,7 +39,7 @@ let ChatSlashCommandService = class ChatSlashCommandService extends Disposable {
     hasCommand(id) {
         return ( this._commands.has(id));
     }
-    async executeCommand(id, prompt, progress, history, location, sessionResource, token) {
+    async executeCommand(id, prompt, progress, history, location, sessionResource, token, options) {
         const data = this._commands.get(id);
         if (!data) {
             throw ( new Error("No command with id ${id} NOT registered"));
@@ -50,7 +50,7 @@ let ChatSlashCommandService = class ChatSlashCommandService extends Disposable {
         if (!data.command) {
             throw ( new Error(`No command with id ${id} NOT resolved`));
         }
-        return await data.command(prompt, progress, history, location, sessionResource, token);
+        return await data.command(prompt, progress, history, location, sessionResource, token, options);
     }
 };
 ChatSlashCommandService = ( __decorate([( __param(0, IExtensionService))], ChatSlashCommandService));

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

@@ -3,7 +3,8 @@ import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { SyncDescriptor0 } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/descriptors";
 import { IMcpServerConfiguration } from "@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpPlatformTypes";
-import { HookType, IHookCommand } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookSchema";
+import { IHookCommand } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookSchema";
+import { HookType } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookTypes";
 import { IMarketplacePlugin } from "./pluginMarketplaceService.js";
 export interface IAgentPluginHook {
     readonly type: HookType;
@@ -28,8 +29,12 @@ export interface IAgentPluginMcpServerDefinition {
 }
 export interface IAgentPlugin {
     readonly uri: URI;
+    /** Human-readable display name for the plugin. */
+    readonly label: string;
     readonly enabled: IObservable<boolean>;
     setEnabled(enabled: boolean): void;
+    /** Removes this plugin from its discovery source (config or installed storage). */
+    remove(): void;
     readonly hooks: IObservable<readonly IAgentPluginHook[]>;
     readonly commands: IObservable<readonly IAgentPluginCommand[]>;
     readonly skills: IObservable<readonly IAgentPluginSkill[]>;