@codingame/monaco-vscode-chat-service-override 31.0.0 → 32.0.0

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

@@ -9,11 +9,11 @@ import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/comm
 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 { revive } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshalling';
-import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { StopWatch } from '@codingame/monaco-vscode-api/vscode/vs/base/common/stopwatch';
 import { isDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
 import { OffsetRange } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/ranges/offsetRange';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
@@ -28,7 +28,6 @@ import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service';
 import { IChatDebugService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatDebugService.service';
-import { InlineChatConfigKeys } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { IMcpService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service';
 import { awaitStatsForSession } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chat';
 import { clearChatMarks, markChat, ChatPerfMark } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatPerf';
@@ -40,7 +39,7 @@ import { ChatRequestTextPart, ChatRequestSlashCommandPart, getPromptText, ChatRe
 import { ChatRequestParser } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatRequestParser';
 import { ChatPendingRequestChangeEventName, ChatRequestQueueKind, ChatMcpServersStarting, ChatStopCancellationNoopEventName, ResponseModelState } 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 { isAgentHostTarget, 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';
@@ -63,6 +62,16 @@ import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/obse
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 
 const serializedChatKey = "interactive.sessions";
+function hasDraftInput(model) {
+    const state = model.inputModel.state.get();
+    if (!state) {
+        return false;
+    }
+    if (state.inputText.trim().length > 0) {
+        return true;
+    }
+    return state.attachments.length > 0;
+}
 let CancellableRequest = class CancellableRequest {
     get yieldRequested() {
         return this._yieldRequested;
@@ -101,6 +110,8 @@ let CancellableRequest = class CancellableRequest {
     }
 };
 CancellableRequest = ( __decorate([( __param(4, ILanguageModelToolsService))], CancellableRequest));
+const EMPTY_REFERENCES = ( Object.freeze([]));
+const EMPTY_TOOL_ENABLEMENT_MAP = ( new Map());
 let ChatService = class ChatService extends Disposable {
     get transferredSessionResource() {
         return this._transferredSessionResource;
@@ -175,7 +186,7 @@ let ChatService = class ChatService extends Disposable {
                     } else if (this._saveModelsEnabled) {
                         await this._chatSessionStore.storeSessions([model]);
                     }
-                } else if (!localSessionId && model.getRequests().length > 0) {
+                } else if (!localSessionId && (model.getRequests().length > 0 || hasDraftInput(model))) {
                     await this._chatSessionStore.storeSessionsMetadataOnly([model]);
                 }
             }
@@ -230,10 +241,11 @@ let ChatService = class ChatService extends Disposable {
             return;
         }
         const liveLocalChats = Array.from(( this._sessionModels.values())).filter(session => this.shouldStoreSession(session));
-        this._chatSessionStore.storeSessions(liveLocalChats);
         const liveNonLocalChats = Array.from(( this._sessionModels.values())).filter(
             session => !LocalChatSessionUri.parseLocalSessionId(session.sessionResource)
         );
+        this._chatSessionStore.updateAndFlushIndexSync(liveLocalChats, liveNonLocalChats);
+        this._chatSessionStore.storeSessions(liveLocalChats);
         this._chatSessionStore.storeSessionsMetadataOnly(liveNonLocalChats);
     }
     shouldStoreSession(session) {
@@ -330,10 +342,15 @@ let ChatService = class ChatService extends Disposable {
         const index = await this._chatSessionStore.getIndex();
         return ( ( Object.values(index)).filter(entry => !entry.isExternal).filter(entry => !( this._sessionModels.has(LocalChatSessionUri.forSession(entry.sessionId))) && entry.initialLocation === ChatAgentLocation.Chat && !entry.isEmpty).map(entry => {
             const sessionResource = LocalChatSessionUri.forSession(entry.sessionId);
+            const {
+                workingDirectory: workingDirectoryStr,
+                ...rest
+            } = entry;
             return ({
-                ...entry,
+                ...rest,
                 sessionResource,
-                isActive: ( this._sessionModels.has(sessionResource))
+                isActive: ( this._sessionModels.has(sessionResource)),
+                workingDirectory: workingDirectoryStr ? ( URI.parse(workingDirectoryStr)) : undefined
             });
         }));
     }
@@ -341,10 +358,15 @@ let ChatService = class ChatService extends Disposable {
         const index = await this._chatSessionStore.getIndex();
         const metadata = index[( sessionResource.toString())];
         if (metadata) {
+            const {
+                workingDirectory: workingDirectoryStr,
+                ...rest
+            } = metadata;
             return {
-                ...metadata,
+                ...rest,
                 sessionResource,
-                isActive: ( this._sessionModels.has(sessionResource))
+                isActive: ( this._sessionModels.has(sessionResource)),
+                workingDirectory: workingDirectoryStr ? ( URI.parse(workingDirectoryStr)) : undefined
             };
         }
         return undefined;
@@ -475,7 +497,7 @@ let ChatService = class ChatService extends Disposable {
         }, debugOwner ?? "ChatService#loadSessionFromData");
     }
     async acquireOrLoadSession(sessionResource, location, token, debugOwner) {
-        if (sessionResource.scheme === Schemas.vscodeLocalChatSession) {
+        if (LocalChatSessionUri.isLocalSession(sessionResource)) {
             return this.acquireOrRestoreLocalSession(sessionResource, debugOwner);
         } else {
             return this.loadRemoteSession(sessionResource, location, token, debugOwner);
@@ -488,7 +510,7 @@ let ChatService = class ChatService extends Disposable {
                 return existingRef;
             }
         }
-        if (!(await this.chatSessionService.canResolveChatSession(sessionResource.scheme))) {
+        if (!(await this.chatSessionService.canResolveChatSession(getChatSessionType(sessionResource)))) {
             return undefined;
         }
         const providedSession = await this.chatSessionService.getOrCreateChatSession(sessionResource, token);
@@ -508,7 +530,9 @@ let ChatService = class ChatService extends Disposable {
             providedSession.history.filter(m => m.type === "request"),
             req => req.modeInstructions?.uri
         )?.modeInstructions?.uri;
-        const storedPermissionLevel = this._chatSessionStore.getMetadataForSessionSync(sessionResource)?.permissionLevel;
+        const storedMetadata = this._chatSessionStore.getMetadataForSessionSync(sessionResource);
+        const storedPermissionLevel = storedMetadata?.permissionLevel;
+        const storedInputState = storedMetadata?.inputState;
         let initialData = undefined;
         if ((modelId || agentUri)) {
             const mode = agentUri ? {
@@ -553,9 +577,9 @@ let ChatService = class ChatService extends Disposable {
             sessionResource: sessionResource,
             canUseTools: false,
             transferEditingSession: providedSession.transferredState?.editingSession,
-            inputState: providedSession.transferredState?.inputState
+            inputState: providedSession.transferredState?.inputState ?? storedInputState
         }, debugOwner ?? "ChatService#loadRemoteSession");
-        if (storedPermissionLevel && !initialData) {
+        if (storedPermissionLevel && !initialData && !storedInputState) {
             modelRef.object.inputModel.setState({
                 permissionLevel: storedPermissionLevel
             });
@@ -569,6 +593,37 @@ let ChatService = class ChatService extends Disposable {
             disposables.dispose();
             providedSession.dispose();
         }));
+        const isAgentHostSession = isAgentHostTarget(chatSessionType);
+        const requestParser = isAgentHostSession ? this.instantiationService.createInstance(ChatRequestParser) : undefined;
+        const parseAgentHostHistoryPrompt = (text, agent) => {
+            if (requestParser) {
+                try {
+                    const attachmentCapabilities = this.getAttachmentCapabilitiesForParser(chatSessionType, agent);
+                    const parsed = requestParser.parseChatRequestWithReferences(EMPTY_REFERENCES, EMPTY_TOOL_ENABLEMENT_MAP, text, location, {
+                        sessionType: chatSessionType,
+                        forcedAgent: agent,
+                        attachmentCapabilities
+                    });
+                    if (parsed.parts.length > 0) {
+                        return parsed;
+                    }
+                } catch (e) {
+                    this.logService.warn(
+                        `ChatService#loadRemoteSession: failed to re-parse historical prompt for ${chatSessionType}`,
+                        e
+                    );
+                }
+            }
+            return {
+                text,
+                parts: [( new ChatRequestTextPart(( new OffsetRange(0, text.length)), {
+                    startLineNumber: 1,
+                    startColumn: 1,
+                    endLineNumber: 1,
+                    endColumn: text.length + 1
+                }, text))]
+            };
+        };
         let lastRequest;
         for (const message of providedSession.history) {
             if (message.type === "request") {
@@ -576,17 +631,9 @@ let ChatService = class ChatService extends Disposable {
                     lastRequest.response?.complete();
                 }
                 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))]
-                };
                 const agent = message.participant ?
                 this.chatAgentService.getAgent(message.participant) : this.chatAgentService.getAgent(chatSessionType);
+                const parsedRequest = parseAgentHostHistoryPrompt(requestText, agent);
                 const modeInfo = message.modeInstructions ? {
                     kind: ChatModeKind.Agent,
                     isBuiltin: message.modeInstructions.isBuiltin ?? false,
@@ -608,6 +655,11 @@ let ChatService = class ChatService extends Disposable {
                     for (const part of message.parts) {
                         model.acceptResponseProgress(lastRequest, part);
                     }
+                    if (message.details && lastRequest.response) {
+                        lastRequest.response.setResult({
+                            details: message.details
+                        });
+                    }
                 }
             }
         }
@@ -645,24 +697,16 @@ let ChatService = class ChatService extends Disposable {
             if (providedSession.onDidStartServerRequest) {
                 disposables.add(providedSession.onDidStartServerRequest((
                     {
-                        prompt
+                        prompt,
+                        variableData
                     }
                 ) => {
                     if (lastRequest?.response && !lastRequest.response.isComplete) {
                         lastRequest.response.complete();
                     }
-                    const requestText = prompt;
-                    const parsedRequest = {
-                        text: requestText,
-                        parts: [( new ChatRequestTextPart(( new OffsetRange(0, requestText.length)), {
-                            startLineNumber: 1,
-                            startColumn: 1,
-                            endLineNumber: 1,
-                            endColumn: requestText.length + 1
-                        }, requestText))]
-                    };
                     const agent = this.chatAgentService.getAgent(chatSessionType);
-                    lastRequest = model.addRequest(parsedRequest, {
+                    const parsedRequest = parseAgentHostHistoryPrompt(prompt, agent);
+                    lastRequest = model.addRequest(parsedRequest, variableData ?? {
                         variables: []
                     }, 0, undefined, agent);
                     lastProgressLength = 0;
@@ -866,14 +910,20 @@ let ChatService = class ChatService extends Disposable {
             };
         } finally {}
     }
+    getAttachmentCapabilitiesForParser(chatSessionType, agent) {
+        return this.chatSessionService.getCapabilitiesForSessionType(chatSessionType) ?? agent?.capabilities;
+    }
     parseChatRequest(sessionResource, request, location, options) {
         let parserContext = options?.parserContext;
+        let contextAgent = parserContext?.forcedAgent ?? parserContext?.selectedAgent;
         if (options?.agentId) {
             const agent = this.chatAgentService.getAgent(options.agentId);
             if (!agent) {
                 throw ( new Error(`Unknown agent: ${options.agentId}`));
             }
+            contextAgent = agent;
             parserContext = {
+                ...parserContext,
                 selectedAgent: agent,
                 mode: options.modeInfo?.kind
             };
@@ -882,12 +932,20 @@ let ChatService = class ChatService extends Disposable {
         } else if (options?.agentIdSilent && !parserContext?.forcedAgent) {
             const silentAgent = this.chatAgentService.getAgent(options.agentIdSilent);
             if (silentAgent) {
+                contextAgent = silentAgent;
                 parserContext = {
                     ...parserContext,
                     forcedAgent: silentAgent
                 };
             }
         }
+        const attachmentCapabilities = parserContext?.attachmentCapabilities ?? this.getAttachmentCapabilitiesForParser(getChatSessionType(sessionResource), contextAgent);
+        if (attachmentCapabilities) {
+            parserContext = {
+                ...parserContext,
+                attachmentCapabilities
+            };
+        }
         const parsedRequest = this.instantiationService.createInstance(ChatRequestParser).parseChatRequest(sessionResource, request, location, parserContext);
         return parsedRequest;
     }
@@ -983,7 +1041,7 @@ let ChatService = class ChatService extends Disposable {
                         model.acceptResponseProgress(request, {
                             kind: "markdownContent",
                             content: ( new MarkdownString(( localize(
-                                7379,
+                                7688,
                                 "The `{0}` skill requires `{1}` to be enabled. After enabling, reload the window to apply. [Enable in Settings](command:workbench.action.openSettings?{2})",
                                 TROUBLESHOOT_COMMAND_NAME,
                                 AGENT_DEBUG_LOG_FILE_LOGGING_ENABLED_SETTING,
@@ -1017,7 +1075,7 @@ let ChatService = class ChatService extends Disposable {
                 if (agentName) {
                     try {
                         const agents = await this.promptsService.getCustomAgents(token);
-                        const customAgent = agents.find(a => a.name === agentName);
+                        const customAgent = agents.find(a => a.name === agentName && a.enabled);
                         if (customAgent?.hooks) {
                             collectedHooks = mergeHooks(collectedHooks, customAgent.hooks);
                         }
@@ -1149,7 +1207,8 @@ let ChatService = class ChatService extends Disposable {
                             editedFileEvents: thisRequest.editedFileEvents,
                             hooks: collectedHooks,
                             hasHooksEnabled: !!collectedHooks && ( ( Object.values(collectedHooks)).some(arr => arr.length > 0)),
-                            isSystemInitiated: options?.isSystemInitiated
+                            isSystemInitiated: options?.isSystemInitiated,
+                            workingDirectory: model.workingDirectory
                         };
                         let isInitialTools = true;
                         store.add(autorun(reader => {
@@ -1165,7 +1224,7 @@ let ChatService = class ChatService extends Disposable {
                         }));
                         return agentRequest;
                     };
-                    if (this.configurationService.getValue("chat.detectParticipant.enabled") !== false && this.chatAgentService.hasChatParticipantDetectionProviders() && !agentPart && !commandPart && !agentSlashCommandPart && enableCommandDetection && (location !== ChatAgentLocation.EditorInline || !this.configurationService.getValue(InlineChatConfigKeys.EnableV2)) && options?.modeInfo?.kind !== ChatModeKind.Agent && options?.modeInfo?.kind !== ChatModeKind.Edit && !options?.agentIdSilent) {
+                    if (this.configurationService.getValue("chat.detectParticipant.enabled") !== false && this.chatAgentService.hasChatParticipantDetectionProviders() && !agentPart && !commandPart && !agentSlashCommandPart && enableCommandDetection && location !== ChatAgentLocation.EditorInline && options?.modeInfo?.kind !== ChatModeKind.Agent && options?.modeInfo?.kind !== ChatModeKind.Edit && !options?.agentIdSilent) {
                         const defaultAgentHistory = this.getHistoryEntriesFromModel(requests, location, defaultAgent.id);
                         const chatAgentRequest = buildAgentRequest(defaultAgent, undefined, enableCommandDetection, false);
                         const result = await this.chatAgentService.detectAgentOrCommand(chatAgentRequest, defaultAgentHistory, {
@@ -1223,7 +1282,10 @@ let ChatService = class ChatService extends Disposable {
                     const agentResult = await this.chatAgentService.invokeAgent(agent.id, requestProps, progressCallback, history, token);
                     rawResult = agentResult;
                     agentOrCommandFollowups = this.chatAgentService.getFollowups(agent.id, requestProps, agentResult, history, followupsCancelToken);
-                } else if (commandPart && this.chatSlashCommandService.hasCommand(commandPart.slashCommand.command)) {
+                } else if (commandPart && this.chatSlashCommandService.hasCommand(
+                    commandPart.slashCommand.command,
+                    getChatSessionType(model.sessionResource)
+                )) {
                     if (commandPart.slashCommand.silent !== true) {
                         request = model.addRequest(parsedRequest, {
                             variables: []
@@ -1281,7 +1343,7 @@ let ChatService = class ChatService extends Disposable {
                         );
                         rawResult = {
                             errorDetails: {
-                                message: ( localize(7380, "Provider returned null response"))
+                                message: ( localize(7689, "Provider returned null response"))
                             }
                         };
                     }
@@ -1303,7 +1365,7 @@ let ChatService = class ChatService extends Disposable {
                     if (rawResult.errorDetails?.isRateLimited) {
                         this.chatEntitlementService.markAnonymousRateLimited();
                     }
-                    shouldProcessPending = !rawResult.errorDetails && !token.isCancellationRequested;
+                    shouldProcessPending = !rawResult.errorDetails && !token.isCancellationRequested && !request.response?.response.value.some(v => v.kind === "confirmation" && !v.isUsed);
                     request.response?.complete();
                     if (agentOrCommandFollowups) {
                         const completedRequest = request;
@@ -1382,7 +1444,7 @@ let ChatService = class ChatService extends Disposable {
         }
     }
     _isServerManagedQueue(sessionResource) {
-        return sessionResource.scheme.startsWith("agent-host-");
+        return getChatSessionType(sessionResource).startsWith("agent-host-");
     }
     processNextPendingRequest(model) {
         if (this._isServerManagedQueue(model.sessionResource)) {
@@ -1765,7 +1827,7 @@ let ChatService = class ChatService extends Disposable {
 };
 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));
 async function chatModelToChatDetail(model) {
-    const title = model.title || ( localize(7381, "New Chat"));
+    const title = model.title || ( localize(7690, "New Chat"));
     return {
         sessionResource: model.sessionResource,
         title,
@@ -1773,7 +1835,8 @@ async function chatModelToChatDetail(model) {
         timing: model.timing,
         isActive: true,
         stats: await awaitStatsForSession(model),
-        lastResponseState: model.lastRequest?.response?.state ?? ResponseModelState.Pending
+        lastResponseState: model.lastRequest?.response?.state ?? ResponseModelState.Pending,
+        workingDirectory: model.workingDirectory
     };
 }
 

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

@@ -2,12 +2,13 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { isLocation } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
+import { escapeModelIdForTelemetry } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry';
 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';
+import { getChatSessionType, chatSessionResourceToId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
 
 let ChatServiceTelemetry = class ChatServiceTelemetry {
     constructor(telemetryService) {
@@ -56,7 +57,10 @@ let ChatServiceTelemetry = class ChatServiceTelemetry {
                 agentId: action.agentId ?? "",
                 outcome: action.action.outcome,
                 lineCount: action.action.lineCount,
-                hasRemainingEdits: action.action.hasRemainingEdits
+                hasRemainingEdits: action.action.hasRemainingEdits,
+                requestId: action.requestId,
+                modelId: escapeModelIdForTelemetry(action.modelId) ?? "",
+                modeId: action.modeId ?? ""
             });
         }
     }
@@ -131,7 +135,7 @@ let ChatRequestTelemetry = class ChatRequestTelemetry {
             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
+            sessionType: getChatSessionType(this.opts.sessionResource)
         });
     }
     attachmentKindsForTelemetry(variableData) {

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

@@ -55,6 +55,7 @@ const responsePartSchema = v(
             case "planReview":
             case "undoStop":
             case "warning":
+            case "info":
             case "treeData":
             case "workspaceEdit":
             case "disabledClaudeHooks":
@@ -150,7 +151,8 @@ const storageSchema = object({
         m => m.editingSession?.entries.get().some(e => e.state.get() === ModifiedFileEntryState.Modified)
     ),
     repoData: v(m => m.repoData, equals),
-    pendingRequests: t(m => m.getPendingRequests(), array(pendingRequestSchema))
+    pendingRequests: t(m => m.getPendingRequests(), array(pendingRequestSchema)),
+    workingDirectory: v(m => m.workingDirectory?.toString())
 });
 class ChatSessionOperationLog extends ObjectMutationLog {
     constructor() {

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

@@ -14,7 +14,7 @@ import { ILifecycleService } from "@codingame/monaco-vscode-api/vscode/vs/workbe
 import { IWorkspaceEditingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/workspaces/common/workspaceEditing.service";
 import { IChatSessionStats, IChatSessionTiming, ResponseModelState } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
 import { ChatAgentLocation, ChatPermissionLevel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants";
-import { ChatModel, ISerializableChatData, ISerializableChatsData, ISerializedChatDataReference } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
+import { ChatModel, ISerializableChatData, ISerializableChatModelInputState, ISerializableChatsData, ISerializedChatDataReference } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
 export declare class ChatSessionStore extends Disposable {
     private readonly fileService;
     private readonly environmentService;
@@ -71,6 +71,14 @@ export declare class ChatSessionStore extends Disposable {
     private readSessionFromPreviousLocation;
     private getStorageLocation;
     private getTransferredSessionStorageLocation;
+    /**
+     * Synchronously update the in-memory index entries for the given sessions
+     * and flush the index to storage. This ensures the index is persisted
+     * even when called from a synchronous `onWillSaveState` handler where
+     * async file-write work would complete after the storage service has
+     * already flushed.
+     */
+    updateAndFlushIndexSync(localSessions: ChatModel[], externalSessions: ChatModel[]): void;
     getChatStorageFolder(): URI;
 }
 export interface IChatSessionEntryMetadata {
@@ -82,6 +90,11 @@ export interface IChatSessionEntryMetadata {
     hasPendingEdits?: boolean;
     stats?: IChatSessionStats;
     lastResponseState: ResponseModelState;
+    /**
+     * The working directory URI string associated with this session.
+     * Persisted so it survives window reload in the agents/sessions window.
+     */
+    workingDirectory?: string;
     /**
      * This only exists because the migrated data from the storage service had empty sessions persisted, and it's impossible to know which ones are
      * currently in use. Now, `clearSession` deletes empty sessions, so old ones shouldn't take up space in the store anymore, but we still need to
@@ -96,6 +109,12 @@ export interface IChatSessionEntryMetadata {
      * The permission level for tool auto-approval, if not default.
      */
     permissionLevel?: ChatPermissionLevel;
+    /**
+     * Serialized draft input state (text, attachments, mode, selected model, ...) for
+     * external sessions, so that unsent input is preserved when switching away and
+     * back. Local sessions instead persist their full state via storeSessions.
+     */
+    inputState?: ISerializableChatModelInputState;
 }
 export type IChatSessionIndex = Record<string, IChatSessionEntryMetadata>;
 export interface IChatTransfer {

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

@@ -98,7 +98,7 @@ let ChatSessionStore = class ChatSessionStore extends Disposable {
             }
             e.join(this.storeTask, {
                 id: "join.chatSessionStore",
-                label: ( localize(7418, "Saving chat history"))
+                label: ( localize(7727, "Saving chat history"))
             });
         }));
     }
@@ -356,14 +356,14 @@ let ChatSessionStore = class ChatSessionStore extends Disposable {
                             this._didReportIssue = true;
                             this.dialogService.prompt({
                                 custom: true,
-                                title: ( localize(7419, "Error saving chat session")),
+                                title: ( localize(7728, "Error saving chat session")),
                                 message: ( localize(
-                                    7420,
+                                    7729,
                                     "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(7421, "Report Issue")),
+                                    label: ( localize(7730, "Report Issue")),
                                     run: () => this.openerService.open("https://github.com/microsoft/vscode/issues/new?template=bug_report.md")
                                 }]
                             });
@@ -664,6 +664,26 @@ let ChatSessionStore = class ChatSessionStore extends Disposable {
         const sessionId = LocalChatSessionUri.parseLocalSessionId(sessionResource);
         return joinPath(this.transferredSessionStorageRoot, `${sessionId}.json`);
     }
+    updateAndFlushIndexSync(localSessions, externalSessions) {
+        const index = this.internalGetIndex();
+        for (const session of localSessions) {
+            index.entries[session.sessionId] = getSessionMetadataSync(session);
+        }
+        for (const session of externalSessions) {
+            const externalSessionId = ( session.sessionResource.toString());
+            index.entries[externalSessionId] = getSessionMetadataSync(session);
+        }
+        try {
+            this.storageService.store(
+                ChatIndexStorageKey,
+                index,
+                this.getIndexStorageScope(),
+                StorageTarget.MACHINE
+            );
+        } catch (e) {
+            this.reportError("indexWrite", "Error writing index synchronously", e);
+        }
+    }
     getChatStorageFolder() {
         return this.storageRoot;
     }
@@ -690,35 +710,54 @@ function isChatSessionIndex(data) {
     }
     return true;
 }
-async function getSessionMetadata(session) {
-    const title = session.customTitle || (session instanceof ChatModel ? session.title : undefined);
-    let stats;
-    if (session instanceof ChatModel) {
-        stats = await awaitStatsForSession(session);
-    }
-    const lastMessageDate = session instanceof ChatModel ? session.lastMessageDate : session.requests.at(-1)?.timestamp ?? session.creationDate;
-    const timing = session instanceof ChatModel ? session.timing :
-    {
-        created: session.creationDate,
-        lastRequestStarted: session.requests.at(-1)?.timestamp,
-        lastRequestEnded: lastMessageDate
-    };
-    let lastResponseState = session instanceof ChatModel ? (session.lastRequest?.response?.state ?? ResponseModelState.Complete) : ResponseModelState.Complete;
+function getSessionMetadataSync(session) {
+    const title = session.customTitle || session.title;
+    let lastResponseState = session.lastRequest?.response?.state ?? ResponseModelState.Complete;
     if (lastResponseState === ResponseModelState.Pending || lastResponseState === ResponseModelState.NeedsInput) {
         lastResponseState = ResponseModelState.Cancelled;
     }
+    const isExternal = !LocalChatSessionUri.parseLocalSessionId(session.sessionResource);
+    const rawInputState = isExternal ? session.inputModel.toJSON() : undefined;
+    const inputState = rawInputState ? {
+        ...rawInputState,
+        attachments: []
+    } : undefined;
     return {
         sessionId: session.sessionId,
-        title: title || ( localize(7422, "New Chat")),
-        lastMessageDate,
-        timing,
+        title: title || ( localize(7731, "New Chat")),
+        lastMessageDate: session.lastMessageDate,
+        timing: session.timing,
         initialLocation: session.initialLocation,
-        hasPendingEdits: session instanceof ChatModel ? (session.editingSession?.entries.get().some(e => e.state.get() === ModifiedFileEntryState.Modified)) : false,
-        isEmpty: session instanceof ChatModel ? session.getRequests().length === 0 : session.requests.length === 0,
-        stats,
-        isExternal: session instanceof ChatModel && !LocalChatSessionUri.parseLocalSessionId(session.sessionResource),
+        hasPendingEdits: session.editingSession?.entries.get().some(e => e.state.get() === ModifiedFileEntryState.Modified) ?? false,
+        isEmpty: session.getRequests().length === 0,
+        isExternal,
         lastResponseState,
-        permissionLevel: session instanceof ChatModel ? session.inputModel.state.get()?.permissionLevel : undefined
+        permissionLevel: session.inputModel.state.get()?.permissionLevel,
+        inputState,
+        workingDirectory: session.workingDirectory?.toString()
+    };
+}
+async function getSessionMetadata(session) {
+    if (session instanceof ChatModel) {
+        const metadata = getSessionMetadataSync(session);
+        metadata.stats = await awaitStatsForSession(session);
+        return metadata;
+    }
+    const lastMessageDate = session.requests.at(-1)?.timestamp ?? session.creationDate;
+    return {
+        sessionId: session.sessionId,
+        title: session.customTitle || ( localize(7731, "New Chat")),
+        lastMessageDate,
+        timing: {
+            created: session.creationDate,
+            lastRequestStarted: session.requests.at(-1)?.timestamp,
+            lastRequestEnded: lastMessageDate
+        },
+        initialLocation: session.initialLocation,
+        hasPendingEdits: false,
+        isEmpty: session.requests.length === 0,
+        isExternal: false,
+        lastResponseState: ResponseModelState.Complete
     };
 }
 

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

@@ -8,7 +8,6 @@ import { IChatFollowup, IChatProgress, IChatResponseProgressFileTreeData, IChatS
 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/promptTypes";
 import { IChatSlashCommandService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatSlashCommands.service";
 export interface IChatSlashData {
     command: string;
@@ -29,7 +28,7 @@ export interface IChatSlashData {
     silent?: boolean;
     locations: ChatAgentLocation[];
     modes?: ChatModeKind[];
-    targets?: Target[];
+    sessionTypes?: string[];
     /**
      * Optional context key expression that controls visibility of this command.
      * When set, the command is only shown if the expression evaluates to true.
@@ -54,9 +53,12 @@ export declare class ChatSlashCommandService extends Disposable implements IChat
     readonly onDidChangeCommands: Event<void>;
     constructor(_extensionService: IExtensionService);
     dispose(): void;
+    private getSessionScopedCommands;
+    private commandsOverlap;
+    private getCommand;
     registerSlashCommand(data: IChatSlashData, command: IChatSlashCallback): IDisposable;
     getCommands(location: ChatAgentLocation, mode: ChatModeKind): Array<IChatSlashData>;
-    hasCommand(id: string): boolean;
+    hasCommand(id: string, sessionType: string): boolean;
     executeCommand(id: string, prompt: string, progress: IProgress<IChatProgress>, history: IChatMessage[], location: ChatAgentLocation, sessionResource: URI, token: CancellationToken, options?: IChatSendRequestOptions): Promise<{
         followUp: IChatFollowup[];
     } | void>;