@codingame/monaco-vscode-chat-service-override 28.4.1 → 29.0.0

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

@@ -1,13 +1,13 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { DeferredPromise } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import { DeferredPromise, raceTimeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { CancellationToken, CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { toErrorMessage } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errorMessage';
 import { ErrorNoTelemetry, BugIndicatingError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 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, DisposableResourceMap, DisposableStore, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable, DisposableResourceMap, DisposableStore, MutableDisposable, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { revive } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshalling';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
@@ -36,24 +36,29 @@ import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbe
 import { chatEditingSessionIsReady } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService';
 import { normalizeSerializableChatData, ChatModel, ChatRequestRemovalReason, ChatRequestModel, updateRanges, toChatHistoryContent } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel';
 import { ChatModelStore } from '../model/chatModelStore.js';
-import { ChatRequestTextPart, ChatRequestAgentPart, ChatRequestAgentSubcommandPart, chatSubcommandLeader, chatAgentLeader, ChatRequestSlashCommandPart, getPromptText } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatParserTypes';
+import { ChatRequestTextPart, ChatRequestSlashCommandPart, getPromptText, ChatRequestAgentPart, ChatRequestAgentSubcommandPart, chatSubcommandLeader, chatAgentLeader } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatParserTypes';
 import { ChatRequestParser } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatRequestParser';
 import { ResponseModelState, ChatPendingRequestChangeEventName, ChatRequestQueueKind, ChatMcpServersStarting, ChatStopCancellationNoopEventName } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
 import { ChatServiceTelemetry, ChatRequestTelemetry } from './chatServiceTelemetry.js';
+import { localChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
 import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
 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 { LocalChatSessionUri, getChatSessionType, chatSessionResourceToId, isUntitledChatSession } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
+import { IChatRequestVariableEntry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries';
 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 { AGENT_DEBUG_LOG_ENABLED_SETTING, AGENT_DEBUG_LOG_FILE_LOGGING_ENABLED_SETTING, TROUBLESHOOT_COMMAND_NAME, COPILOT_SKILL_URI_SCHEME, TROUBLESHOOT_SKILL_PATH } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { mergeHooks } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookSchema';
+import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/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';
+import { autorun, autorunIterableDelta } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
+import { observableSignalFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableSignalFromEvent';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 
 const serializedChatKey = "interactive.sessions";
@@ -61,9 +66,17 @@ let CancellableRequest = class CancellableRequest {
     get yieldRequested() {
         return this._yieldRequested;
     }
-    constructor(cancellationTokenSource, requestId, toolsService) {
+    constructor(
+        cancellationTokenSource,
+        requestId,
+        responseCompletePromise,
+        sendOptions,
+        toolsService
+    ) {
         this.cancellationTokenSource = cancellationTokenSource;
         this.requestId = requestId;
+        this.responseCompletePromise = responseCompletePromise;
+        this.sendOptions = sendOptions;
         this.toolsService = toolsService;
         this._yieldRequested = observableValue(this, false);
     }
@@ -86,7 +99,7 @@ let CancellableRequest = class CancellableRequest {
         this._yieldRequested.set(false, undefined);
     }
 };
-CancellableRequest = ( __decorate([( __param(2, ILanguageModelToolsService))], CancellableRequest));
+CancellableRequest = ( __decorate([( __param(4, ILanguageModelToolsService))], CancellableRequest));
 let ChatService = class ChatService extends Disposable {
     get transferredSessionResource() {
         return this._transferredSessionResource;
@@ -331,7 +344,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(6984, "New Chat"));
+            const title = session.title || ( localize(7200, "New Chat"));
             return {
                 sessionResource: session.sessionResource,
                 title,
@@ -496,13 +509,15 @@ let ChatService = class ChatService extends Disposable {
         }
     }
     async loadRemoteSession(sessionResource, location, token) {
-        await this.chatSessionService.canResolveChatSession(sessionResource.scheme);
         {
             const existingRef = this.acquireExistingSession(sessionResource);
             if (existingRef) {
                 return existingRef;
             }
         }
+        if (!(await this.chatSessionService.canResolveChatSession(sessionResource.scheme))) {
+            return undefined;
+        }
         const providedSession = await this.chatSessionService.getOrCreateChatSession(sessionResource, token);
         {
             const existingRef = this.acquireExistingSession(sessionResource);
@@ -511,7 +526,7 @@ let ChatService = class ChatService extends Disposable {
                 return existingRef;
             }
         }
-        const chatSessionType = sessionResource.scheme;
+        const chatSessionType = getChatSessionType(sessionResource);
         const modelRef = this._sessionModels.acquireOrCreate({
             initialData: undefined,
             location,
@@ -521,9 +536,7 @@ let ChatService = class ChatService extends Disposable {
             inputState: providedSession.transferredState?.inputState
         });
         modelRef.object.setContributedChatSession({
-            chatSessionResource: sessionResource,
-            chatSessionType,
-            isUntitled: sessionResource.path.startsWith("/untitled-")
+            chatSessionResource: sessionResource
         });
         if (providedSession.title) {
             modelRef.object.setCustomTitle(providedSession.title);
@@ -573,22 +586,24 @@ let ChatService = class ChatService extends Disposable {
             lastRequest?.response?.complete();
         }
         if (providedSession.progressObs && lastRequest && providedSession.interruptActiveResponseCallback) {
-            const initialCancellationRequest = this.instantiationService.createInstance(CancellableRequest, ( new CancellationTokenSource()), undefined);
+            const initialCancellationRequest = this.instantiationService.createInstance(CancellableRequest, ( new CancellationTokenSource()), undefined, undefined, undefined);
             this._pendingRequests.set(model.sessionResource, initialCancellationRequest);
             this.telemetryService.publicLog2(ChatPendingRequestChangeEventName, {
                 action: "add",
-                source: "remoteSession"
+                source: "remoteSession",
+                chatSessionId: chatSessionResourceToId(model.sessionResource)
             });
             const cancellationListener = disposables.add(( new MutableDisposable()));
             const createCancellationListener = token => {
                 return token.onCancellationRequested(() => {
                     providedSession.interruptActiveResponseCallback?.().then(userConfirmedInterruption => {
                         if (!userConfirmedInterruption) {
-                            const newCancellationRequest = this.instantiationService.createInstance(CancellableRequest, ( new CancellationTokenSource()), undefined);
+                            const newCancellationRequest = this.instantiationService.createInstance(CancellableRequest, ( new CancellationTokenSource()), undefined, undefined, undefined);
                             this._pendingRequests.set(model.sessionResource, newCancellationRequest);
                             this.telemetryService.publicLog2(ChatPendingRequestChangeEventName, {
                                 action: "add",
-                                source: "remoteSession"
+                                source: "remoteSession",
+                                chatSessionId: chatSessionResourceToId(model.sessionResource)
                             });
                             cancellationListener.value = createCancellationListener(newCancellationRequest.cancellationTokenSource.token);
                         }
@@ -615,7 +630,8 @@ let ChatService = class ChatService extends Disposable {
         } else {
             this.telemetryService.publicLog2(ChatPendingRequestChangeEventName, {
                 action: "notCancelable",
-                source: "remoteSession"
+                source: "remoteSession",
+                chatSessionId: chatSessionResourceToId(model.sessionResource)
             });
             if (lastRequest && model.editingSession) {
                 await chatEditingSessionIsReady(model.editingSession);
@@ -708,10 +724,40 @@ let ChatService = class ChatService extends Disposable {
                 reason: "Empty message"
             };
         }
-        const model = this._sessionModels.get(sessionResource);
+        let model = this._sessionModels.get(sessionResource);
         if (!model) {
             throw ( new Error(`Unknown session: ${sessionResource}`));
         }
+        let newSessionResource;
+        if (!model.hasRequests && isUntitledChatSession(sessionResource) && getChatSessionType(sessionResource) !== localChatSessionType) {
+            const parsedRequest = this.parseChatRequest(
+                sessionResource,
+                request,
+                options?.location ?? model.initialLocation,
+                options
+            );
+            const commandPart = parsedRequest.parts.find(r => r instanceof ChatRequestSlashCommandPart);
+            const requestText = getPromptText(parsedRequest).message;
+            const initialSessionOptions = this.chatSessionService.getSessionOptions(sessionResource);
+            const newItem = await this.chatSessionService.createNewChatSessionItem(getChatSessionType(sessionResource), {
+                prompt: requestText,
+                command: commandPart?.text,
+                initialSessionOptions
+            }, CancellationToken.None);
+            if (newItem) {
+                model = (await this.loadRemoteSession(newItem.resource, model.initialLocation, CancellationToken.None))?.object;
+                if (!model) {
+                    throw ( new Error(`Failed to load session for resource: ${newItem.resource}`));
+                }
+                this.chatSessionService.registerSessionResourceAlias(sessionResource, newItem.resource);
+                model.setContributedChatSession({
+                    chatSessionResource: newItem.resource,
+                    initialSessionOptions: initialSessionOptions
+                });
+                sessionResource = newItem.resource;
+                newSessionResource = newItem.resource;
+            }
+        }
         const hasPendingRequest = ( this._pendingRequests.has(sessionResource));
         if (options?.queue) {
             const queued = this.queuePendingRequest(model, sessionResource, request, options);
@@ -746,6 +792,7 @@ let ChatService = class ChatService extends Disposable {
         const agentSlashCommandPart = parsedRequest.parts.find(r => r instanceof ChatRequestAgentSubcommandPart);
         return {
             kind: "sent",
+            newSessionResource,
             data: {
                 ...this._sendRequestAsync(
                     model,
@@ -859,6 +906,49 @@ let ChatService = class ChatService extends Disposable {
             };
             let detectedAgent;
             let detectedCommand;
+            {
+                const debugLogEnabled = this.configurationService.getValue(AGENT_DEBUG_LOG_ENABLED_SETTING);
+                const fileLoggingEnabled = this.configurationService.getValue(AGENT_DEBUG_LOG_FILE_LOGGING_ENABLED_SETTING);
+                if (!debugLogEnabled || !fileLoggingEnabled) {
+                    const isTroubleshootCommand = agentSlashCommandPart?.command.name === TROUBLESHOOT_COMMAND_NAME;
+                    const hasTroubleshootSkill = options?.attachedContext?.some(v => {
+                        const uri = IChatRequestVariableEntry.toUri(v);
+                        return uri && (uri.scheme === COPILOT_SKILL_URI_SCHEME || uri.path.includes(TROUBLESHOOT_SKILL_PATH));
+                    });
+                    if (isTroubleshootCommand || hasTroubleshootSkill) {
+                        request = model.addRequest(parsedRequest, {
+                            variables: []
+                        }, attempt, options?.modeInfo);
+                        completeResponseCreated();
+                        const missingSettings = [];
+                        if (!debugLogEnabled) {
+                            missingSettings.push("`" + AGENT_DEBUG_LOG_ENABLED_SETTING + "`");
+                        }
+                        if (!fileLoggingEnabled) {
+                            missingSettings.push("`" + AGENT_DEBUG_LOG_FILE_LOGGING_ENABLED_SETTING + "`");
+                        }
+                        const settingsQuery = !debugLogEnabled && !fileLoggingEnabled ? AGENT_DEBUG_LOG_ENABLED_SETTING : !debugLogEnabled ? "@id:" + AGENT_DEBUG_LOG_ENABLED_SETTING : "@id:" + AGENT_DEBUG_LOG_FILE_LOGGING_ENABLED_SETTING;
+                        const settingsArg = encodeURIComponent(JSON.stringify(settingsQuery));
+                        model.acceptResponseProgress(request, {
+                            kind: "markdownContent",
+                            content: ( new MarkdownString(( localize(
+                                7201,
+                                "The `{0}` skill requires the following settings to be enabled: {1}. After enabling, reload the window to apply. [Enable in Settings](command:workbench.action.openSettings?{2})",
+                                TROUBLESHOOT_COMMAND_NAME,
+                                missingSettings.join(", "),
+                                settingsArg
+                            )), {
+                                isTrusted: {
+                                    enabledCommands: ["workbench.action.openSettings"]
+                                }
+                            }))
+                        });
+                        model.setResponse(request, {});
+                        request.response?.complete();
+                        return;
+                    }
+                }
+            }
             let collectedHooks;
             let hasDisabledClaudeHooks = false;
             try {
@@ -957,6 +1047,7 @@ let ChatService = class ChatService extends Disposable {
                             acceptedConfirmationData: options?.acceptedConfirmationData,
                             rejectedConfirmationData: options?.rejectedConfirmationData,
                             userSelectedModelId: options?.userSelectedModelId,
+                            modelConfiguration: options?.userSelectedModelId ? this.languageModelsService.getModelConfiguration(options.userSelectedModelId) : undefined,
                             userSelectedTools: options?.userSelectedTools?.get(),
                             modeInstructions: options?.modeInfo?.modeInstructions,
                             permissionLevel: options?.modeInfo?.permissionLevel,
@@ -1011,21 +1102,27 @@ let ChatService = class ChatService extends Disposable {
                             }
                         }));
                         pendingRequest.requestId ??= requestProps.requestId;
+                        if (pendingRequest.requestId) {
+                            this.telemetryService.publicLog2(ChatPendingRequestChangeEventName, {
+                                action: "add",
+                                source: "sendRequestId",
+                                requestId: pendingRequest.requestId,
+                                chatSessionId: chatSessionResourceToId(sessionResource)
+                            });
+                        }
                     }
                     completeResponseCreated();
                     const disabledClaudeHooksDismissedKey = "chat.disabledClaudeHooks.notification";
-                    if (!this.storageService.getBoolean(disabledClaudeHooksDismissedKey, StorageScope.WORKSPACE)) {
+                    if (hasDisabledClaudeHooks && !this.storageService.getBoolean(disabledClaudeHooksDismissedKey, StorageScope.WORKSPACE)) {
                         this.storageService.store(
                             disabledClaudeHooksDismissedKey,
                             true,
                             StorageScope.WORKSPACE,
                             StorageTarget.USER
                         );
-                        if (hasDisabledClaudeHooks) {
-                            progressCallback([{
-                                kind: "disabledClaudeHooks"
-                            }]);
-                        }
+                        progressCallback([{
+                            kind: "disabledClaudeHooks"
+                        }]);
                     }
                     if (model.canUseTools) {
                         const autostartResult = ( new ChatMcpServersStarting(this.mcpService.autostart(token)));
@@ -1095,7 +1192,7 @@ let ChatService = class ChatService extends Disposable {
                         );
                         rawResult = {
                             errorDetails: {
-                                message: ( localize(6985, "Provider returned null response"))
+                                message: ( localize(7202, "Provider returned null response"))
                             }
                         };
                     }
@@ -1153,18 +1250,21 @@ let ChatService = class ChatService extends Disposable {
         };
         let shouldProcessPending = false;
         const rawResponsePromise = sendRequestInternal();
-        const cancellableRequest = this.instantiationService.createInstance(CancellableRequest, source, undefined);
+        const cancellableRequest = this.instantiationService.createInstance(CancellableRequest, source, undefined, rawResponsePromise, options);
         this._pendingRequests.set(model.sessionResource, cancellableRequest);
         this.telemetryService.publicLog2(ChatPendingRequestChangeEventName, {
             action: "add",
-            source: "sendRequest"
+            source: "sendRequest",
+            chatSessionId: chatSessionResourceToId(model.sessionResource)
         });
         rawResponsePromise.finally(() => {
             if (this._pendingRequests.get(model.sessionResource) === cancellableRequest) {
                 this._pendingRequests.deleteAndDispose(model.sessionResource);
                 this.telemetryService.publicLog2(ChatPendingRequestChangeEventName, {
                     action: "remove",
-                    source: "sendRequestComplete"
+                    source: "sendRequestComplete",
+                    requestId: cancellableRequest.requestId,
+                    chatSessionId: chatSessionResourceToId(model.sessionResource)
                 });
             }
             if (shouldProcessPending) {
@@ -1349,7 +1449,9 @@ let ChatService = class ChatService extends Disposable {
             this._pendingRequests.deleteAndDispose(sessionResource);
             this.telemetryService.publicLog2(ChatPendingRequestChangeEventName, {
                 action: "remove",
-                source: "removeRequest"
+                source: "removeRequest",
+                requestId,
+                chatSessionId: chatSessionResourceToId(model.sessionResource)
             });
         }
         model.removeRequest(requestId);
@@ -1371,11 +1473,15 @@ let ChatService = class ChatService extends Disposable {
                 this._pendingRequests.set(target.sessionResource, cts);
                 this.telemetryService.publicLog2(ChatPendingRequestChangeEventName, {
                     action: "remove",
-                    source: "adoptRequest"
+                    source: "adoptRequest",
+                    requestId: request.id,
+                    chatSessionId: chatSessionResourceToId(oldOwner.sessionResource)
                 });
                 this.telemetryService.publicLog2(ChatPendingRequestChangeEventName, {
                     action: "add",
-                    source: "adoptRequest"
+                    source: "adoptRequest",
+                    requestId: request.id,
+                    chatSessionId: chatSessionResourceToId(target.sessionResource)
                 });
             }
         }
@@ -1406,7 +1512,7 @@ let ChatService = class ChatService extends Disposable {
         }
         request.response?.complete();
     }
-    cancelCurrentRequestForSession(sessionResource, source) {
+    async cancelCurrentRequestForSession(sessionResource, source) {
         this.trace("cancelCurrentRequestForSession", `session: ${sessionResource}`);
         const pendingRequest = this._pendingRequests.get(sessionResource);
         if (!pendingRequest) {
@@ -1420,7 +1526,8 @@ let ChatService = class ChatService extends Disposable {
                 requestInProgress: requestInProgress === undefined ? "unknown" : requestInProgress ? "true" : "false",
                 pendingRequests: pendingRequestsCount,
                 sessionScheme: sessionResource.scheme,
-                lastRequestId: lastRequest?.id
+                lastRequestId: lastRequest?.id,
+                chatSessionId: chatSessionResourceToId(sessionResource)
             });
             this.info(
                 "cancelCurrentRequestForSession",
@@ -1428,12 +1535,18 @@ let ChatService = class ChatService extends Disposable {
             );
             return;
         }
+        const responseCompletePromise = pendingRequest.responseCompletePromise;
         pendingRequest.cancel();
         this._pendingRequests.deleteAndDispose(sessionResource);
         this.telemetryService.publicLog2(ChatPendingRequestChangeEventName, {
             action: "remove",
-            source: source ?? "cancelRequest"
+            source: source ?? "cancelRequest",
+            requestId: pendingRequest.requestId,
+            chatSessionId: chatSessionResourceToId(sessionResource)
         });
+        if (responseCompletePromise) {
+            await raceTimeout(responseCompletePromise, 1000);
+        }
     }
     setYieldRequested(sessionResource) {
         const pendingRequest = this._pendingRequests.get(sessionResource);
@@ -1441,6 +1554,25 @@ let ChatService = class ChatService extends Disposable {
             pendingRequest.setYieldRequested();
         }
     }
+    migrateRequests(originalResource, targetResource) {
+        const model = this._sessionModels.get(originalResource);
+        if (!model) {
+            return;
+        }
+        const pendingRequests = [...model.getPendingRequests()];
+        if (pendingRequests.length === 0) {
+            return;
+        }
+        for (const pending of pendingRequests) {
+            this.removePendingRequest(originalResource, pending.request.id);
+        }
+        for (const pending of pendingRequests) {
+            void this.sendRequest(targetResource, pending.request.message.text, {
+                ...pending.sendOptions,
+                queue: pending.kind
+            });
+        }
+    }
     removePendingRequest(sessionResource, requestId) {
         const model = this._sessionModels.get(sessionResource);
         if (model) {
@@ -1520,6 +1652,45 @@ let ChatService = class ChatService extends Disposable {
         }
         return localSessionId;
     }
+    registerChatModelChangeListeners(chatSessionType, onChange) {
+        const disposableStore = ( new DisposableStore());
+        const chatModelsICareAbout = ( this.chatModels.map(
+            models => Array.from(models).filter(model => model.sessionResource.scheme === chatSessionType)
+        ));
+        const listeners = ( new ResourceMap());
+        const autoRunDisposable = autorunIterableDelta(reader => chatModelsICareAbout.read(reader), (
+            {
+                addedValues,
+                removedValues
+            }
+        ) => {
+            removedValues.forEach(removed => {
+                const listener = listeners.get(removed.sessionResource);
+                if (listener) {
+                    listeners.delete(removed.sessionResource);
+                    listener.dispose();
+                }
+            });
+            addedValues.forEach(added => {
+                const requestChangeListener = ( added.lastRequestObs.map(
+                    last => last?.response && observableSignalFromEvent("chatSessions.modelRequestChangeListener", last.response.onDidChange)
+                ));
+                const modelChangeListener = observableSignalFromEvent("chatSessions.modelChangeListener", added.onDidChange);
+                listeners.set(added.sessionResource, autorun(reader => {
+                    requestChangeListener.read(reader)?.read(reader);
+                    modelChangeListener.read(reader);
+                    onChange(added.sessionResource);
+                }));
+            });
+        });
+        disposableStore.add(toDisposable(() => {
+            for (const listener of ( listeners.values())) {
+                listener.dispose();
+            }
+        }));
+        disposableStore.add(autoRunDisposable);
+        return disposableStore;
+    }
 };
 ChatService = ( __decorate([( __param(0, IStorageService)), ( __param(1, ILogService)), ( __param(2, ITelemetryService)), ( __param(3, IExtensionService)), ( __param(4, IInstantiationService)), ( __param(5, IWorkspaceContextService)), ( __param(6, IChatSlashCommandService)), ( __param(7, IChatAgentService)), ( __param(8, IConfigurationService)), ( __param(9, IChatTransferService)), ( __param(10, IChatSessionsService)), ( __param(11, IMcpService)), ( __param(12, IPromptsService)), ( __param(13, IChatEntitlementService)), ( __param(14, ILanguageModelsService)), ( __param(15, IChatDebugService))], ChatService));
 

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

@@ -1,5 +1,5 @@
 
-import { assertNever } from '@codingame/monaco-vscode-api/vscode/vs/base/common/assert';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { isMarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { equals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objects';
 import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
@@ -59,7 +59,7 @@ const responsePartSchema = v(
                 return a.kind === b.kind;
             default:
                 {
-                    assertNever();
+                    return equals(a, b);
                 }
             }
         }
@@ -109,7 +109,8 @@ const requestSchema = object({
     usedContext: v(m => m.response?.usedContext, equals),
     contentReferences: v(m => m.response?.contentReferences, equals),
     codeCitations: v(m => m.response?.codeCitations, equals),
-    timeSpentWaiting: v(m => m.response?.timestamp)
+    timeSpentWaiting: v(m => m.response?.timestamp),
+    modeInfo: v(m => m.modeInfo, equals)
 }, {
     sealed: o => o.modelState?.value === ResponseModelState.Cancelled || o.modelState?.value === ResponseModelState.Failed || o.modelState?.value === ResponseModelState.Complete
 });

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

@@ -6,7 +6,7 @@ import { toErrorMessage } from '@codingame/monaco-vscode-api/vscode/vs/base/comm
 import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { revive } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshalling';
-import { joinPath } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { joinPath, isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 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';
@@ -98,7 +98,7 @@ let ChatSessionStore = class ChatSessionStore extends Disposable {
             }
             e.join(this.storeTask, {
                 id: "join.chatSessionStore",
-                label: ( localize(7020, "Saving chat history"))
+                label: ( localize(7243, "Saving chat history"))
             });
         }));
     }
@@ -126,7 +126,7 @@ let ChatSessionStore = class ChatSessionStore extends Disposable {
             newWorkspaceId,
             "chatSessions"
         );
-        if (( oldStorageRoot.toString()) === ( newStorageRoot.toString())) {
+        if (isEqual(oldStorageRoot, newStorageRoot)) {
             this.storageRoot = newStorageRoot;
             return;
         }
@@ -356,14 +356,14 @@ let ChatSessionStore = class ChatSessionStore extends Disposable {
                             this._didReportIssue = true;
                             this.dialogService.prompt({
                                 custom: true,
-                                title: ( localize(7021, "Error saving chat session")),
+                                title: ( localize(7244, "Error saving chat session")),
                                 message: ( localize(
-                                    7022,
+                                    7245,
                                     "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")),
+                                    label: ( localize(7246, "Report Issue")),
                                     run: () => this.openerService.open("https://github.com/microsoft/vscode/issues/new?template=bug_report.md")
                                 }]
                             });
@@ -708,7 +708,7 @@ async function getSessionMetadata(session) {
     }
     return {
         sessionId: session.sessionId,
-        title: title || ( localize(7024, "New Chat")),
+        title: title || ( localize(7247, "New Chat")),
         lastMessageDate,
         timing,
         initialLocation: session.initialLocation,

package/vscode/src/vs/workbench/contrib/chat/common/participants/chatSlashCommands.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, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { ContextKeyExpression } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey";
 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, IChatSendRequestOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
@@ -28,7 +29,12 @@ export interface IChatSlashData {
     silent?: boolean;
     locations: ChatAgentLocation[];
     modes?: ChatModeKind[];
-    target?: Target;
+    targets?: Target[];
+    /**
+     * Optional context key expression that controls visibility of this command.
+     * When set, the command is only shown if the expression evaluates to true.
+     */
+    when?: ContextKeyExpression;
 }
 export interface IChatSlashFragment {
     content: string | {

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

@@ -3,12 +3,15 @@ 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 { ContributionEnablementState, IEnablementModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/enablement";
 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;
     readonly hooks: readonly IHookCommand[];
+    /** URI where this hook is defined -- not unique, multiple hooks may be in a manifest */
+    readonly uri: URI;
     readonly originalId: string;
 }
 export interface IAgentPluginCommand {
@@ -23,29 +26,34 @@ export interface IAgentPluginAgent {
     readonly uri: URI;
     readonly name: string;
 }
+export interface IAgentPluginInstruction {
+    readonly uri: URI;
+    readonly name: string;
+}
 export interface IAgentPluginMcpServerDefinition {
     readonly name: string;
     readonly configuration: IMcpServerConfiguration;
+    readonly uri: URI;
 }
 export interface IAgentPlugin {
     readonly uri: URI;
     /** Human-readable display name for the plugin. */
     readonly label: string;
-    readonly enabled: IObservable<boolean>;
-    setEnabled(enabled: boolean): void;
+    readonly enablement: IObservable<ContributionEnablementState>;
     /** 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[]>;
     readonly agents: IObservable<readonly IAgentPluginAgent[]>;
+    readonly instructions: IObservable<readonly IAgentPluginInstruction[]>;
     readonly mcpServerDefinitions: IObservable<readonly IAgentPluginMcpServerDefinition[]>;
     /** Set when the plugin was installed from a marketplace repository. */
     readonly fromMarketplace?: IMarketplacePlugin;
 }
 export interface IAgentPluginDiscovery extends IDisposable {
     readonly plugins: IObservable<readonly IAgentPlugin[]>;
-    start(): void;
+    start(enablementModel: IEnablementModel): void;
 }
 export declare function getCanonicalPluginCommandId(plugin: IAgentPlugin, commandName: string): string;
 declare class AgentPluginDiscoveryRegistry {