@codingame/monaco-vscode-chat-service-override 16.1.0 → 17.0.0

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

@@ -25,13 +25,13 @@ import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs
 import { IWorkbenchAssignmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/assignment/common/assignmentService.service';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { normalizeSerializableChatData, ChatModel, ChatRequestRemovalReason, updateRanges, toChatHistoryContent, ChatRequestModel } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatModel';
-import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, chatSubcommandLeader, chatAgentLeader, ChatRequestSlashCommandPart, getPromptText } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
-import { ChatRequestParser } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
+import { normalizeSerializableChatData, ChatModel, ChatRequestRemovalReason, updateRanges, isImageVariableEntry, toChatHistoryContent, ChatRequestModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, chatSubcommandLeader, chatAgentLeader, ChatRequestSlashCommandPart, getPromptText } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { ChatRequestParser } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
 import { ChatServiceTelemetry } from './chatServiceTelemetry.js';
 import { ChatSessionStore } from './chatSessionStore.js';
 import { IChatSlashCommandService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSlashCommands.service';
-import { IChatVariablesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariables.service';
+import { IChatTransferService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatTransferService.service';
 import { ChatConfiguration, ChatAgentLocation, ChatMode } 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 { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
@@ -63,17 +63,17 @@ let ChatService = class ChatService extends Disposable {
     get transferredSessionData() {
         return this._transferredSessionData;
     }
-    get unifiedViewEnabled() {
-        return !!this.configurationService.getValue(ChatConfiguration.UnifiedChatView);
-    }
     get useFileStorage() {
         return this.configurationService.getValue(ChatConfiguration.UseFileStorage);
     }
+    get edits2Enabled() {
+        return this.configurationService.getValue(ChatConfiguration.Edits2Enabled);
+    }
     get isEmptyWindow() {
         const workspace = this.workspaceContextService.getWorkspace();
         return !workspace.configuration && workspace.folders.length === 0;
     }
-    constructor(storageService, logService, extensionService, instantiationService, telemetryService, workspaceContextService, chatSlashCommandService, chatVariablesService, chatAgentService, configurationService, experimentService) {
+    constructor(storageService, logService, extensionService, instantiationService, telemetryService, workspaceContextService, chatSlashCommandService, chatAgentService, configurationService, experimentService, chatTransferService) {
         super();
         this.storageService = storageService;
         this.logService = logService;
@@ -82,10 +82,10 @@ let ChatService = class ChatService extends Disposable {
         this.telemetryService = telemetryService;
         this.workspaceContextService = workspaceContextService;
         this.chatSlashCommandService = chatSlashCommandService;
-        this.chatVariablesService = chatVariablesService;
         this.chatAgentService = chatAgentService;
         this.configurationService = configurationService;
         this.experimentService = experimentService;
+        this.chatTransferService = chatTransferService;
         this._sessionModels = this._register(( new DisposableMap()));
         this._pendingRequests = this._register(( new DisposableMap()));
         this._deletedChatIds = ( new Set());
@@ -131,7 +131,7 @@ let ChatService = class ChatService extends Disposable {
     }
     saveState() {
         const liveChats = Array.from(( this._sessionModels.values()))
-            .filter(session => session.initialLocation === ChatAgentLocation.Panel || session.initialLocation === ChatAgentLocation.EditingSession);
+            .filter(session => session.initialLocation === ChatAgentLocation.Panel);
         if (this.useFileStorage) {
             this._chatSessionStore.storeSessions(liveChats);
         }
@@ -145,19 +145,6 @@ let ChatService = class ChatService extends Disposable {
                     .filter(session => !( this._sessionModels.has(session.sessionId)))
                     .filter(session => session.requests.length));
                 allSessions.sort((a, b) => (b.creationDate ?? 0) - (a.creationDate ?? 0));
-                let hasPersistedEditSession = false;
-                allSessions = allSessions.filter(s => {
-                    if (s.initialLocation === ChatAgentLocation.EditingSession) {
-                        if (hasPersistedEditSession) {
-                            return false;
-                        }
-                        else {
-                            hasPersistedEditSession = true;
-                            return true;
-                        }
-                    }
-                    return true;
-                });
                 allSessions = allSessions.slice(0, maxPersistedSessions);
                 if (allSessions.length) {
                     this.trace('onWillSaveState', `Persisting ${allSessions.length} sessions`);
@@ -210,6 +197,12 @@ let ChatService = class ChatService extends Disposable {
     notifyUserAction(action) {
         this._chatServiceTelemetry.notifyUserAction(action);
         this._onDidPerformUserAction.fire(action);
+        if (action.action.kind === 'chatEditingSessionAction') {
+            const model = this._sessionModels.get(action.sessionId);
+            if (model) {
+                model.notifyEditingAction(action.action);
+            }
+        }
     }
     async setChatSessionTitle(sessionId, title) {
         const model = this._sessionModels.get(sessionId);
@@ -283,9 +276,9 @@ let ChatService = class ChatService extends Disposable {
     async getHistory() {
         if (this.useFileStorage) {
             const liveSessionItems = ( Array.from(( this._sessionModels.values()))
-                .filter(session => !session.isImported && (session.initialLocation !== ChatAgentLocation.EditingSession || this.unifiedViewEnabled))
+                .filter(session => !session.isImported)
                 .map(session => {
-                const title = session.title || ( localize(4984, "New Chat"));
+                const title = session.title || ( localize(5054, "New Chat"));
                 return {
                     sessionId: session.sessionId,
                     title,
@@ -306,7 +299,7 @@ let ChatService = class ChatService extends Disposable {
             .filter(session => session.requests.length > 0)
             .filter(session => !( this._sessionModels.has(session.sessionId)));
         const persistedSessionItems = ( persistedSessions
-            .filter(session => !session.isImported && session.initialLocation !== ChatAgentLocation.EditingSession)
+            .filter(session => !session.isImported)
             .map(session => {
             const title = session.customTitle ?? ChatModel.getDefaultTitle(session.requests);
             return {
@@ -317,9 +310,9 @@ let ChatService = class ChatService extends Disposable {
             };
         }));
         const liveSessionItems = ( Array.from(( this._sessionModels.values()))
-            .filter(session => !session.isImported && session.initialLocation !== ChatAgentLocation.EditingSession)
+            .filter(session => !session.isImported)
             .map(session => {
-            const title = session.title || ( localize(4984, "New Chat"));
+            const title = session.title || ( localize(5054, "New Chat"));
             return {
                 sessionId: session.sessionId,
                 title,
@@ -355,7 +348,7 @@ let ChatService = class ChatService extends Disposable {
     }
     _startSession(someSessionHistory, location, isGlobalEditingSession, token) {
         const model = this.instantiationService.createInstance(ChatModel, someSessionHistory, location);
-        if (location === ChatAgentLocation.EditingSession || (this.unifiedViewEnabled && location === ChatAgentLocation.Panel)) {
+        if (location === ChatAgentLocation.Panel) {
             model.startEditingSession(isGlobalEditingSession);
         }
         this._sessionModels.set(model.sessionId, model);
@@ -366,21 +359,7 @@ let ChatService = class ChatService extends Disposable {
         try {
             this.trace('initializeSession', `Initialize session ${model.sessionId}`);
             model.startInitialize();
-            await this.extensionService.whenInstalledExtensionsRegistered();
-            const defaultAgentData = this.chatAgentService.getContributedDefaultAgent(model.initialLocation) ?? this.chatAgentService.getContributedDefaultAgent(ChatAgentLocation.Panel);
-            if (!defaultAgentData) {
-                throw ( new ErrorNoTelemetry('No default agent contributed'));
-            }
-            if (this.configurationService.getValue('chat.setupFromDialog')) {
-                this.extensionService.activateByEvent(`onChatParticipant:${defaultAgentData.id}`);
-            }
-            else {
-                await this.extensionService.activateByEvent(`onChatParticipant:${defaultAgentData.id}`);
-                const defaultAgent = this.chatAgentService.getActivatedAgents().find(agent => agent.id === defaultAgentData.id);
-                if (!defaultAgent) {
-                    throw ( new ErrorNoTelemetry('No default agent registered'));
-                }
-            }
+            this.activateDefaultAgent(model.initialLocation).catch(e => this.logService.error(e));
             model.initialize();
         }
         catch (err) {
@@ -390,6 +369,18 @@ let ChatService = class ChatService extends Disposable {
             this._onDidDisposeSession.fire({ sessionId: model.sessionId, reason: 'initializationFailed' });
         }
     }
+    async activateDefaultAgent(location) {
+        await this.extensionService.whenInstalledExtensionsRegistered();
+        const defaultAgentData = this.chatAgentService.getContributedDefaultAgent(location) ?? this.chatAgentService.getContributedDefaultAgent(ChatAgentLocation.Panel);
+        if (!defaultAgentData) {
+            throw ( new ErrorNoTelemetry('No default agent contributed'));
+        }
+        await this.extensionService.activateByEvent(`onChatParticipant:${defaultAgentData.id}`);
+        const defaultAgent = this.chatAgentService.getActivatedAgents().find(agent => agent.id === defaultAgentData.id);
+        if (!defaultAgent) {
+            throw ( new ErrorNoTelemetry('No default agent registered'));
+        }
+    }
     getSession(sessionId) {
         return this._sessionModels.get(sessionId);
     }
@@ -400,11 +391,11 @@ let ChatService = class ChatService extends Disposable {
             return model;
         }
         let sessionData;
-        if (this.useFileStorage) {
-            sessionData = revive(await this._chatSessionStore.readSession(sessionId));
+        if (!this.useFileStorage || this.transferredSessionData?.sessionId === sessionId) {
+            sessionData = revive(this._persistedSessions[sessionId]);
         }
         else {
-            sessionData = revive(this._persistedSessions[sessionId]);
+            sessionData = revive(await this._chatSessionStore.readSession(sessionId));
         }
         if (!sessionData) {
             return undefined;
@@ -446,16 +437,12 @@ let ChatService = class ChatService extends Disposable {
             ...options,
             locationData: request.locationData,
             attachedContext: request.attachedContext,
-            hasInstructionAttachments: options?.hasInstructionAttachments ?? false,
         };
         await this._sendRequestAsync(model, model.sessionId, request.message, attempt, enableCommandDetection, defaultAgent, location, resendOptions).responseCompletePromise;
     }
     async sendRequest(sessionId, request, options) {
         this.trace('sendRequest', `sessionId: ${sessionId}, message: ${request.substring(0, 20)}${request.length > 20 ? '[...]' : ''}}`);
-        if (!request.trim() && options?.hasInstructionAttachments) {
-            request = 'Follow these instructions.';
-        }
-        if (!request.trim() && !options?.slashCommand && !options?.agentId && !options?.hasInstructionAttachments) {
+        if (!request.trim() && !options?.slashCommand && !options?.agentId) {
             this.trace('sendRequest', 'Rejected empty message');
             return;
         }
@@ -574,7 +561,7 @@ let ChatService = class ChatService extends Disposable {
                 let agentOrCommandFollowups = undefined;
                 let chatTitlePromise;
                 if (agentPart || (defaultAgent && !commandPart)) {
-                    const prepareChatAgentRequest = async (agent, command, enableCommandDetection, chatRequest, isParticipantDetected) => {
+                    const prepareChatAgentRequest = (agent, command, enableCommandDetection, chatRequest, isParticipantDetected) => {
                         const initVariableData = { variables: [] };
                         request = chatRequest ?? model.addRequest(parsedRequest, initVariableData, attempt, agent, command, options?.confirmation, options?.locationData, options?.attachedContext, undefined, options?.userSelectedModelId);
                         let variableData;
@@ -584,7 +571,7 @@ let ChatService = class ChatService extends Disposable {
                             message = getPromptText(request.message).message;
                         }
                         else {
-                            variableData = this.chatVariablesService.resolveVariables(parsedRequest, request.attachedContext);
+                            variableData = { variables: this.prepareContext(request.attachedContext) };
                             model.updateRequest(request, variableData);
                             const promptTextResult = getPromptText(request.message);
                             variableData = updateRanges(variableData, promptTextResult.diff);
@@ -605,12 +592,15 @@ let ChatService = class ChatService extends Disposable {
                             acceptedConfirmationData: options?.acceptedConfirmationData,
                             rejectedConfirmationData: options?.rejectedConfirmationData,
                             userSelectedModelId: options?.userSelectedModelId,
-                            userSelectedTools: options?.userSelectedTools
+                            userSelectedTools: options?.userSelectedTools,
+                            userSelectedTools2: options?.userSelectedTools2,
+                            toolSelectionIsExclusive: options?.toolSelectionIsExclusive,
+                            editedFileEvents: request.editedFileEvents
                         };
                     };
                     if (this.configurationService.getValue('chat.detectParticipant.enabled') !== false && this.chatAgentService.hasChatParticipantDetectionProviders() && !agentPart && !commandPart && !agentSlashCommandPart && enableCommandDetection && options?.mode !== ChatMode.Agent && options?.mode !== ChatMode.Edit) {
                         const defaultAgentHistory = this.getHistoryEntriesFromModel(requests, model.sessionId, location, defaultAgent.id);
-                        const chatAgentRequest = await prepareChatAgentRequest(defaultAgent, undefined, enableCommandDetection, undefined, false);
+                        const chatAgentRequest = prepareChatAgentRequest(defaultAgent, undefined, enableCommandDetection, undefined, false);
                         const result = await this.chatAgentService.detectAgentOrCommand(chatAgentRequest, defaultAgentHistory, { location }, token);
                         if (result && this.chatAgentService.getAgent(result.agent.id)?.locations?.includes(location)) {
                             request.response?.setAgent(result.agent, result.command);
@@ -623,7 +613,7 @@ let ChatService = class ChatService extends Disposable {
                     await this.extensionService.activateByEvent(`onChatParticipant:${agent.id}`);
                     await this.checkAgentAllowed(agent);
                     const history = this.getHistoryEntriesFromModel(requests, model.sessionId, location, agent.id);
-                    const requestProps = await prepareChatAgentRequest(agent, command, enableCommandDetection, request , !!detectedAgent);
+                    const requestProps = prepareChatAgentRequest(agent, command, enableCommandDetection, request , !!detectedAgent);
                     const pendingRequest = this._pendingRequests.get(sessionId);
                     if (pendingRequest && !pendingRequest.requestId) {
                         pendingRequest.requestId = requestProps.requestId;
@@ -635,15 +625,17 @@ let ChatService = class ChatService extends Disposable {
                     chatTitlePromise = model.getRequests().length === 1 && !model.customTitle ? this.chatAgentService.getChatTitle(defaultAgent.id, this.getHistoryEntriesFromModel(model.getRequests(), model.sessionId, location, agent.id), CancellationToken.None) : undefined;
                 }
                 else if (commandPart && this.chatSlashCommandService.hasCommand(commandPart.slashCommand.command)) {
-                    request = model.addRequest(parsedRequest, { variables: [] }, attempt);
-                    completeResponseCreated();
+                    if (commandPart.slashCommand.silent !== true) {
+                        request = model.addRequest(parsedRequest, { variables: [] }, attempt);
+                        completeResponseCreated();
+                    }
                     const history = [];
-                    for (const request of model.getRequests()) {
-                        if (!request.response) {
+                    for (const modelRequest of model.getRequests()) {
+                        if (!modelRequest.response) {
                             continue;
                         }
-                        history.push({ role: ChatMessageRole.User, content: [{ type: 'text', value: request.message.text }] });
-                        history.push({ role: ChatMessageRole.Assistant, content: [{ type: 'text', value: ( request.response.response.toString()) }] });
+                        history.push({ role: ChatMessageRole.User, content: [{ type: 'text', value: modelRequest.message.text }] });
+                        history.push({ role: ChatMessageRole.Assistant, content: [{ type: 'text', value: ( modelRequest.response.response.toString()) }] });
                     }
                     const message = parsedRequest.text;
                     const commandResult = await this.chatSlashCommandService.executeCommand(commandPart.slashCommand.command, message.substring(commandPart.slashCommand.command.length + 1).trimStart(), ( new Progress(p => {
@@ -661,7 +653,7 @@ let ChatService = class ChatService extends Disposable {
                 else {
                     if (!rawResult) {
                         this.trace('sendRequest', `Provider returned no response for session ${model.sessionId}`);
-                        rawResult = { errorDetails: { message: ( localize(4985, "Provider returned null response")) } };
+                        rawResult = { errorDetails: { message: ( localize(5055, "Provider returned null response")) } };
                     }
                     const result = rawResult.errorDetails?.responseIsFiltered ? 'filtered' :
                         rawResult.errorDetails && gotProgress ? 'errorWithOutput' :
@@ -742,8 +734,24 @@ let ChatService = class ChatService extends Disposable {
             responseCompletePromise: rawResponsePromise,
         };
     }
+    prepareContext(attachedContextVariables) {
+        attachedContextVariables ??= [];
+        attachedContextVariables.sort((a, b) => {
+            if (!a.range && !b.range) {
+                return 0;
+            }
+            if (!a.range) {
+                return 1;
+            }
+            if (!b.range) {
+                return -1;
+            }
+            return b.range.start - a.range.start;
+        });
+        return attachedContextVariables;
+    }
     async checkAgentAllowed(agent) {
-        if (agent.isToolsAgent) {
+        if (agent.modes.includes(ChatMode.Agent)) {
             const enabled = await this.experimentService.getTreatment('chatAgentEnabled');
             if (enabled === false) {
                 throw ( new Error('Agent is currently disabled'));
@@ -756,7 +764,7 @@ let ChatService = class ChatService extends Disposable {
                 return 'implicit';
             }
             else if (v.range) {
-                if (v.isTool) {
+                if (v.kind === 'tool') {
                     return 'toolInPrompt';
                 }
                 else {
@@ -769,13 +777,13 @@ let ChatService = class ChatService extends Disposable {
             else if (v.kind === 'symbol') {
                 return 'symbol';
             }
-            else if (v.isImage) {
+            else if (isImageVariableEntry(v)) {
                 return 'image';
             }
-            else if (v.isDirectory) {
+            else if (v.kind === 'directory') {
                 return 'directory';
             }
-            else if (v.isTool) {
+            else if (v.kind === 'tool') {
                 return 'tool';
             }
             else {
@@ -809,7 +817,8 @@ let ChatService = class ChatService extends Disposable {
                 message: promptTextResult.message,
                 command: request.response.slashCommand?.name,
                 variables: updateRanges(request.variableData, promptTextResult.diff),
-                location: ChatAgentLocation.Panel
+                location: ChatAgentLocation.Panel,
+                editedFileEvents: request.editedFileEvents,
             };
             history.push({ request: historyRequest, response: toChatHistoryContent(request.response.response.value), result: request.response.result ?? {} });
         }
@@ -933,11 +942,9 @@ let ChatService = class ChatService extends Disposable {
             mode: transferredSessionData.mode,
         });
         this.storageService.store(globalChatKey, JSON.stringify(existingRaw), StorageScope.PROFILE, StorageTarget.MACHINE);
+        this.chatTransferService.addWorkspaceToTransferred(toWorkspace);
         this.trace('transferChatSession', `Transferred session ${model.sessionId} to workspace ${( toWorkspace.toString())}`);
     }
-    isEditingLocation(location) {
-        return location === ChatAgentLocation.EditingSession || this.unifiedViewEnabled;
-    }
     getChatStorageFolder() {
         return this._chatSessionStore.getChatStorageFolder();
     }
@@ -945,9 +952,6 @@ let ChatService = class ChatService extends Disposable {
         this._chatSessionStore.logIndex();
     }
 };
-ChatService.__decorator = ( __decorate([
-    memoize
-], ChatService.prototype, "unifiedViewEnabled", null));
 ChatService.__decorator = ( __decorate([
     memoize
 ], ChatService.prototype, "useFileStorage", null));
@@ -959,10 +963,10 @@ ChatService = ( __decorate([
     ( __param(4, ITelemetryService)),
     ( __param(5, IWorkspaceContextService)),
     ( __param(6, IChatSlashCommandService)),
-    ( __param(7, IChatVariablesService)),
-    ( __param(8, IChatAgentService)),
-    ( __param(9, IConfigurationService)),
-    ( __param(10, IWorkbenchAssignmentService))
+    ( __param(7, IChatAgentService)),
+    ( __param(8, IConfigurationService)),
+    ( __param(9, IWorkbenchAssignmentService)),
+    ( __param(10, IChatTransferService))
 ], ChatService));
 function getCodeBlocks(text) {
     const lines = text.split('\n');

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

@@ -8,7 +8,7 @@ import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platfo
 import { IUserDataProfilesService } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataProfile/common/userDataProfile.service";
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
 import { ILifecycleService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service";
-import { ChatModel, ISerializableChatData, ISerializableChatsData } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { ChatModel, ISerializableChatData, ISerializableChatsData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
 import { ChatAgentLocation, ChatMode } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants";
 export declare class ChatSessionStore extends Disposable {
     private readonly fileService;

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

@@ -18,7 +18,7 @@ import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platfo
 import { IUserDataProfilesService } from '@codingame/monaco-vscode-api/vscode/vs/platform/userDataProfile/common/userDataProfile.service';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { ILifecycleService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
-import { normalizeSerializableChatData, ChatModel } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { normalizeSerializableChatData, ChatModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel';
 
 const maxPersistedSessions = 25;
 const ChatIndexStorageKey = 'chat.ChatSessionStore.index';
@@ -51,7 +51,7 @@ let ChatSessionStore = class ChatSessionStore extends Disposable {
             }
             e.join(this.storeTask, {
                 id: 'join.chatSessionStore',
-                label: ( localize(4986, "Saving chat history"))
+                label: ( localize(5056, "Saving chat history"))
             });
         }));
     }
@@ -324,7 +324,7 @@ function isChatSessionIndex(data) {
 }
 function getSessionMetadata(session) {
     const title = session instanceof ChatModel ?
-        (session.title || ( localize(4987, "New Chat"))) :
+        (session.title || ( localize(5057, "New Chat"))) :
         session.customTitle ?? ChatModel.getDefaultTitle(session.requests);
     return {
         sessionId: session.sessionId,

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

@@ -12,6 +12,7 @@ export interface IChatSlashData {
     detail: string;
     sortText?: string;
     executeImmediately?: boolean;
+    silent?: boolean;
     locations: ChatAgentLocation[];
     modes?: ChatMode[];
 }

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

@@ -2,6 +2,7 @@ import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { IWorkspaceTrustManagementService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspaceTrust.service";
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IChatTransferService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatTransferService.service";
 export declare class ChatTransferService implements IChatTransferService {
     private readonly workspaceService;
@@ -10,5 +11,8 @@ export declare class ChatTransferService implements IChatTransferService {
     private readonly workspaceTrustManagementService;
     _serviceBrand: undefined;
     constructor(workspaceService: IWorkspaceContextService, storageService: IStorageService, fileService: IFileService, workspaceTrustManagementService: IWorkspaceTrustManagementService);
-    checkAndSetWorkspaceTrust(): Promise<void>;
+    deleteWorkspaceFromTransferredList(workspace: URI): void;
+    addWorkspaceToTransferred(workspace: URI): void;
+    checkAndSetTransferredWorkspaceTrust(): Promise<void>;
+    isChatTransferredWorkspace(workspace: URI, storageService: IStorageService): boolean;
 }

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

@@ -1,11 +1,13 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.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 { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { IWorkspaceTrustManagementService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspaceTrust.service';
-import { isChatTransferredWorkspace, areWorkspaceFoldersEmpty } from '../../../services/workspaces/common/workspaceUtils.js';
+import { areWorkspaceFoldersEmpty } from '../../../services/workspaces/common/workspaceUtils.js';
 
+const transferredWorkspacesKey = 'chat.transferedWorkspaces';
 let ChatTransferService = class ChatTransferService {
     constructor(workspaceService, storageService, fileService, workspaceTrustManagementService) {
         this.workspaceService = workspaceService;
@@ -13,11 +15,33 @@ let ChatTransferService = class ChatTransferService {
         this.fileService = fileService;
         this.workspaceTrustManagementService = workspaceTrustManagementService;
     }
-    async checkAndSetWorkspaceTrust() {
+    deleteWorkspaceFromTransferredList(workspace) {
+        const transferredWorkspaces = this.storageService.getObject(transferredWorkspacesKey, StorageScope.PROFILE, []);
+        const updatedWorkspaces = transferredWorkspaces.filter(uri => uri !== ( workspace.toString()));
+        this.storageService.store(transferredWorkspacesKey, updatedWorkspaces, StorageScope.PROFILE, StorageTarget.MACHINE);
+    }
+    addWorkspaceToTransferred(workspace) {
+        const transferredWorkspaces = this.storageService.getObject(transferredWorkspacesKey, StorageScope.PROFILE, []);
+        transferredWorkspaces.push(( workspace.toString()));
+        this.storageService.store(transferredWorkspacesKey, transferredWorkspaces, StorageScope.PROFILE, StorageTarget.MACHINE);
+    }
+    async checkAndSetTransferredWorkspaceTrust() {
         const workspace = this.workspaceService.getWorkspace();
-        if (isChatTransferredWorkspace(workspace, this.storageService) && (await areWorkspaceFoldersEmpty(workspace, this.fileService))) {
+        const currentWorkspaceUri = workspace.folders[0]?.uri;
+        if (!currentWorkspaceUri) {
+            return;
+        }
+        if (this.isChatTransferredWorkspace(currentWorkspaceUri, this.storageService) && (await areWorkspaceFoldersEmpty(workspace, this.fileService))) {
             await this.workspaceTrustManagementService.setWorkspaceTrust(true);
+            this.deleteWorkspaceFromTransferredList(currentWorkspaceUri);
+        }
+    }
+    isChatTransferredWorkspace(workspace, storageService) {
+        if (!workspace) {
+            return false;
         }
+        const chatWorkspaceTransfer = storageService.getObject(transferredWorkspacesKey, StorageScope.PROFILE, []);
+        return ( chatWorkspaceTransfer.some(item => ( item.toString()) === ( workspace.toString())));
     }
 };
 ChatTransferService = ( __decorate([

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/contributions/configMigration.d.ts

@@ -0,0 +1,5 @@
+import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+export declare class ConfigMigration implements IWorkbenchContribution {
+    constructor(configService: IConfigurationService);
+}

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/contributions/configMigration.js

@@ -0,0 +1,62 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { assert } from '@codingame/monaco-vscode-api/vscode/vs/base/common/assert';
+import { asBoolean } from '@codingame/monaco-vscode-51fed910-d648-5620-9b80-9232cd79d116-common/vscode/vs/platform/prompts/common/config';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { CONFIG_KEY, PROMPT_LOCATIONS_CONFIG_KEY } from '@codingame/monaco-vscode-51fed910-d648-5620-9b80-9232cd79d116-common/vscode/vs/platform/prompts/common/constants';
+
+let ConfigMigration = class ConfigMigration {
+    constructor(configService) {
+        const value = configService.getValue(CONFIG_KEY);
+        if ((value === undefined) || (value === null)) {
+            return;
+        }
+        if ((typeof value === 'boolean') || (asBoolean(value) !== undefined)) {
+            return;
+        }
+        if (Array.isArray(value)) {
+            const locationsValue = {};
+            for (const filePath of value) {
+                if (typeof filePath !== 'string') {
+                    continue;
+                }
+                const trimmedValue = filePath.trim();
+                if (!trimmedValue) {
+                    continue;
+                }
+                locationsValue[trimmedValue] = true;
+            }
+            configService.updateValue(CONFIG_KEY, true);
+            configService.updateValue(PROMPT_LOCATIONS_CONFIG_KEY, locationsValue);
+            return;
+        }
+        if (typeof value === 'object') {
+            assert(value !== null, 'Object value must not be a null.');
+            const locationsValue = {};
+            for (const [location, enabled] of Object.entries(value)) {
+                if ((typeof enabled !== 'boolean') || (asBoolean(enabled) === undefined)) {
+                    continue;
+                }
+                const trimmedValue = location.trim();
+                if (!trimmedValue) {
+                    continue;
+                }
+                locationsValue[trimmedValue] = enabled;
+            }
+            configService.updateValue(CONFIG_KEY, true);
+            configService.updateValue(PROMPT_LOCATIONS_CONFIG_KEY, locationsValue);
+            return;
+        }
+        if (typeof value === 'string') {
+            assert(asBoolean(value) === undefined, `String value must not be a boolean, got '${value}'.`);
+            configService.updateValue(CONFIG_KEY, true);
+            configService.updateValue(PROMPT_LOCATIONS_CONFIG_KEY, { [value]: true });
+            return;
+        }
+    }
+};
+ConfigMigration = ( __decorate([
+    ( __param(0, IConfigurationService))
+], ConfigMigration));
+
+export { ConfigMigration };

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/contributions/index.d.ts

@@ -0,0 +1,3 @@
+import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
+export declare const registerPromptFileContributions: () => void;
+export type TContribution = new (...args: any[]) => IWorkbenchContribution;

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/contributions/index.js

@@ -0,0 +1,16 @@
+
+import { ConfigMigration } from './configMigration.js';
+import './languageFeatures/index.js';
+import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
+import { LifecyclePhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle';
+import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
+
+const registerPromptFileContributions = () => {
+    registerContribution(ConfigMigration);
+};
+const registerContribution = (contribution) => {
+    ( Registry.as(Extensions.Workbench))
+        .registerWorkbenchContribution(contribution, LifecyclePhase.Eventually);
+};
+
+export { registerPromptFileContributions };

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/contributions/languageFeatures/index.d.ts

@@ -0,0 +1,2 @@
+import { TContribution } from "../index.js";
+export declare const LANGUAGE_FEATURE_CONTRIBUTIONS: readonly TContribution[];

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/contributions/languageFeatures/index.js

@@ -0,0 +1,17 @@
+
+import { PromptLinkProvider } from './providers/promptLinkProvider.js';
+import { isWindows } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
+import { PromptPathAutocompletion } from './providers/promptPathAutocompletion.js';
+import { PromptLinkDiagnosticsInstanceManager } from './providers/promptLinkDiagnosticsProvider.js';
+import { PromptHeaderDiagnosticsInstanceManager } from './providers/promptHeaderDiagnosticsProvider.js';
+import { PromptDecorationsProviderInstanceManager } from './providers/decorationsProvider/promptDecorationsProvider.js';
+
+const CONTRIBUTIONS = [
+    PromptLinkProvider,
+    PromptLinkDiagnosticsInstanceManager,
+    PromptHeaderDiagnosticsInstanceManager,
+    PromptDecorationsProviderInstanceManager,
+];
+if (isWindows === false) {
+    CONTRIBUTIONS.push(PromptPathAutocompletion);
+}