@codingame/monaco-vscode-chat-service-override 24.2.0 → 25.0.0

package/vscode/src/vs/workbench/contrib/chat/common/{chatProgressTypes → model/chatProgressTypes}/chatToolInvocation.js

@@ -2,8 +2,8 @@
 import { encodeBase64 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { ToolConfirmKind, IChatToolInvocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService';
-import { isToolResultOutputDetails } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
+import { ToolConfirmKind, IChatToolInvocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
+import { isToolResultOutputDetails } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 
 class ChatToolInvocation {
@@ -14,7 +14,7 @@ class ChatToolInvocation {
         this.toolCallId = toolCallId;
         this.kind = 'toolInvocation';
         this._progress = observableValue(this, { progress: 0 });
-        const defaultMessage = ( localize(5944, "Using {0}", `"${toolData.displayName}"`));
+        const defaultMessage = ( localize(5965, "Using {0}", `"${toolData.displayName}"`));
         const invocationMessage = preparedInvocation?.invocationMessage ?? defaultMessage;
         this.invocationMessage = invocationMessage;
         this.pastTenseMessage = preparedInvocation?.pastTenseMessage;
@@ -27,7 +27,7 @@ class ChatToolInvocation {
         this.fromSubAgent = fromSubAgent;
         this.parameters = parameters;
         if (!this.confirmationMessages?.title) {
-            this._state = observableValue(this, { type: IChatToolInvocation.StateKind.Executing, confirmed: { type: ToolConfirmKind.ConfirmationNotNeeded }, progress: this._progress });
+            this._state = observableValue(this, { type: IChatToolInvocation.StateKind.Executing, confirmed: { type: ToolConfirmKind.ConfirmationNotNeeded, reason: this.confirmationMessages?.confirmationNotNeededReason }, progress: this._progress });
         }
         else {
             this._state = observableValue(this, {

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

@@ -8,8 +8,8 @@ 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, IChatModelInputState, ISerializableChatData, ISerializableChatsData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { IChatSessionStats, ResponseModelState, IChatSessionTiming } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
+import { ChatModel, ISerializableChatData, ISerializableChatsData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
+import { IChatSessionStats, IChatSessionTiming, ResponseModelState } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
 import { ChatAgentLocation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants";
 export declare class ChatSessionStore extends Disposable {
     private readonly fileService;
@@ -22,12 +22,19 @@ export declare class ChatSessionStore extends Disposable {
     private readonly userDataProfilesService;
     private readonly storageRoot;
     private readonly previousEmptyWindowStorageRoot;
+    private readonly transferredSessionStorageRoot;
     private readonly storeQueue;
     private storeTask;
     private shuttingDown;
     constructor(fileService: IFileService, environmentService: IEnvironmentService, logService: ILogService, workspaceContextService: IWorkspaceContextService, telemetryService: ITelemetryService, storageService: IStorageService, lifecycleService: ILifecycleService, userDataProfilesService: IUserDataProfilesService);
     storeSessions(sessions: ChatModel[]): Promise<void>;
     storeSessionsMetadataOnly(sessions: ChatModel[]): Promise<void>;
+    storeTransferSession(transferData: IChatTransfer, session: ChatModel): Promise<void>;
+    private getTransferredSessionIndex;
+    private static readonly TRANSFER_EXPIRATION_MS;
+    getTransferredSessionData(): URI | undefined;
+    readTransferredSession(sessionResource: URI): Promise<ISerializableChatData | undefined>;
+    private cleanupTransferredSession;
     private writeSession;
     private writeSessionMetadataOnly;
     private flushIndex;
@@ -43,12 +50,16 @@ export declare class ChatSessionStore extends Disposable {
     private indexCache;
     private internalGetIndex;
     getIndex(): Promise<IChatSessionIndex>;
+    getMetadataForSessionSync(sessionResource: URI): IChatSessionEntryMetadata | undefined;
+    private getIndexKey;
     logIndex(): void;
     migrateDataIfNeeded(getInitialData: () => ISerializableChatsData | undefined): Promise<void>;
     private migrate;
     readSession(sessionId: string): Promise<ISerializableChatData | undefined>;
+    private readSessionFromLocation;
     private readSessionFromPreviousLocation;
     private getStorageLocation;
+    private getTransferredSessionStorageLocation;
     getChatStorageFolder(): URI;
 }
 export interface IChatSessionEntryMetadata {
@@ -74,13 +85,9 @@ export interface IChatSessionEntryMetadata {
 export type IChatSessionIndex = Record<string, IChatSessionEntryMetadata>;
 export interface IChatTransfer {
     toWorkspace: URI;
+    sessionResource: URI;
     timestampInMilliseconds: number;
-    inputState: IChatModelInputState | undefined;
-    location: ChatAgentLocation;
 }
 export interface IChatTransfer2 extends IChatTransfer {
     chat: ISerializableChatData;
 }
-/**
- * Map of destination workspace URI to chat transfer data
- */

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

@@ -7,26 +7,30 @@ import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/comm
 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 { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service';
 import { toFileOperationResult, FileOperationResult } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
-import { StorageTarget, StorageScope } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
+import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 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 { awaitStatsForSession } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chat';
-import { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
-import { normalizeSerializableChatData, ChatModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel';
-import { ResponseModelState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService';
-import { LocalChatSessionUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatUri';
+import { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService';
+import { normalizeSerializableChatData, ChatModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel';
+import { ResponseModelState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
+import { LocalChatSessionUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
 
+var ChatSessionStore_1;
 const maxPersistedSessions = 25;
 const ChatIndexStorageKey = 'chat.ChatSessionStore.index';
+const ChatTransferIndexStorageKey = 'ChatSessionStore.transferIndex';
 let ChatSessionStore = class ChatSessionStore extends Disposable {
+    static { ChatSessionStore_1 = this; }
     constructor(fileService, environmentService, logService, workspaceContextService, telemetryService, storageService, lifecycleService, userDataProfilesService) {
         super();
         this.fileService = fileService;
@@ -48,6 +52,7 @@ let ChatSessionStore = class ChatSessionStore extends Disposable {
         this.previousEmptyWindowStorageRoot = isEmptyWindow ?
             joinPath(this.environmentService.workspaceStorageHome, 'no-workspace', 'chatSessions') :
             undefined;
+        this.transferredSessionStorageRoot = joinPath(this.userDataProfilesService.defaultProfile.globalStorageHome, 'transferredChatSessions');
         this._register(this.lifecycleService.onWillShutdown(e => {
             this.shuttingDown = true;
             if (!this.storeTask) {
@@ -55,7 +60,7 @@ let ChatSessionStore = class ChatSessionStore extends Disposable {
             }
             e.join(this.storeTask, {
                 id: 'join.chatSessionStore',
-                label: ( localize(5947, "Saving chat history"))
+                label: ( localize(5966, "Saving chat history"))
             });
         }));
     }
@@ -100,6 +105,111 @@ let ChatSessionStore = class ChatSessionStore extends Disposable {
             this.storeTask = undefined;
         }
     }
+    async storeTransferSession(transferData, session) {
+        const index = this.getTransferredSessionIndex();
+        const workspaceKey = ( transferData.toWorkspace.toString());
+        const existingTransfer = index[workspaceKey];
+        if (existingTransfer) {
+            try {
+                const existingSessionResource = URI.revive(existingTransfer.sessionResource);
+                if (existingSessionResource && LocalChatSessionUri.parseLocalSessionId(existingSessionResource)) {
+                    const existingStorageLocation = this.getTransferredSessionStorageLocation(existingSessionResource);
+                    await this.fileService.del(existingStorageLocation);
+                }
+            }
+            catch (e) {
+                if (toFileOperationResult(e) !== FileOperationResult.FILE_NOT_FOUND) {
+                    this.reportError('storeTransferSession', 'Error deleting old transferred session file', e);
+                }
+            }
+        }
+        try {
+            const content = JSON.stringify(session, undefined, 2);
+            const storageLocation = this.getTransferredSessionStorageLocation(session.sessionResource);
+            await this.fileService.writeFile(storageLocation, VSBuffer.fromString(content));
+        }
+        catch (e) {
+            this.reportError('sessionWrite', 'Error writing chat session', e);
+            return;
+        }
+        index[workspaceKey] = transferData;
+        try {
+            this.storageService.store(ChatTransferIndexStorageKey, index, StorageScope.PROFILE, StorageTarget.MACHINE);
+        }
+        catch (e) {
+            this.reportError('storeTransferSession', 'Error storing chat transfer session', e);
+        }
+    }
+    getTransferredSessionIndex() {
+        try {
+            const data = this.storageService.getObject(ChatTransferIndexStorageKey, StorageScope.PROFILE, {});
+            return data;
+        }
+        catch (e) {
+            this.reportError('getTransferredSessionIndex', 'Error reading chat transfer index', e);
+            return {};
+        }
+    }
+    static { this.TRANSFER_EXPIRATION_MS = 60 * 1000 * 5; }
+    getTransferredSessionData() {
+        try {
+            const index = this.getTransferredSessionIndex();
+            const workspaceFolders = this.workspaceContextService.getWorkspace().folders;
+            if (workspaceFolders.length !== 1) {
+                return undefined;
+            }
+            const workspaceKey = ( workspaceFolders[0].uri.toString());
+            const transferredSessionForWorkspace = index[workspaceKey];
+            if (!transferredSessionForWorkspace) {
+                return undefined;
+            }
+            const revivedTransferData = revive(transferredSessionForWorkspace);
+            if (Date.now() - transferredSessionForWorkspace.timestampInMilliseconds > ChatSessionStore_1.TRANSFER_EXPIRATION_MS) {
+                this.logService.info('ChatSessionStore: Transferred session has expired');
+                this.cleanupTransferredSession(revivedTransferData.sessionResource);
+                return undefined;
+            }
+            return !!LocalChatSessionUri.parseLocalSessionId(revivedTransferData.sessionResource) && revivedTransferData.sessionResource;
+        }
+        catch (e) {
+            this.reportError('getTransferredSession', 'Error getting transferred chat session URI', e);
+            return undefined;
+        }
+    }
+    async readTransferredSession(sessionResource) {
+        try {
+            const storageLocation = this.getTransferredSessionStorageLocation(sessionResource);
+            const sessionId = LocalChatSessionUri.parseLocalSessionId(sessionResource);
+            if (!sessionId) {
+                return undefined;
+            }
+            const sessionData = await this.readSessionFromLocation(storageLocation, sessionId);
+            await this.cleanupTransferredSession(sessionResource);
+            return sessionData;
+        }
+        catch (e) {
+            this.reportError('getTransferredSession', 'Error getting transferred chat session', e);
+            return undefined;
+        }
+    }
+    async cleanupTransferredSession(sessionResource) {
+        try {
+            const index = this.getTransferredSessionIndex();
+            const workspaceFolders = this.workspaceContextService.getWorkspace().folders;
+            if (workspaceFolders.length === 1) {
+                const workspaceKey = ( workspaceFolders[0].uri.toString());
+                delete index[workspaceKey];
+                this.storageService.store(ChatTransferIndexStorageKey, index, StorageScope.PROFILE, StorageTarget.MACHINE);
+            }
+            const storageLocation = this.getTransferredSessionStorageLocation(sessionResource);
+            await this.fileService.del(storageLocation);
+        }
+        catch (e) {
+            if (toFileOperationResult(e) !== FileOperationResult.FILE_NOT_FOUND) {
+                this.reportError('cleanupTransferredSession', 'Error cleaning up transferred session', e);
+            }
+        }
+    }
     async writeSession(session) {
         try {
             const index = this.internalGetIndex();
@@ -240,6 +350,14 @@ let ChatSessionStore = class ChatSessionStore extends Disposable {
             return this.internalGetIndex().entries;
         });
     }
+    getMetadataForSessionSync(sessionResource) {
+        const index = this.internalGetIndex();
+        return index.entries[this.getIndexKey(sessionResource)];
+    }
+    getIndexKey(sessionResource) {
+        const sessionId = LocalChatSessionUri.parseLocalSessionId(sessionResource);
+        return sessionId ?? ( sessionResource.toString());
+    }
     logIndex() {
         const data = this.storageService.get(ChatIndexStorageKey, this.getIndexStorageScope(), undefined);
         this.logService.info('ChatSessionStore index: ', data);
@@ -266,42 +384,45 @@ let ChatSessionStore = class ChatSessionStore extends Disposable {
     }
     async readSession(sessionId) {
         return await this.storeQueue.queue(async () => {
-            let rawData;
             const storageLocation = this.getStorageLocation(sessionId);
-            try {
-                rawData = ( (await this.fileService.readFile(storageLocation)).value.toString());
+            return this.readSessionFromLocation(storageLocation, sessionId);
+        });
+    }
+    async readSessionFromLocation(storageLocation, sessionId) {
+        let rawData;
+        try {
+            rawData = ( (await this.fileService.readFile(storageLocation)).value.toString());
+        }
+        catch (e) {
+            this.reportError('sessionReadFile', `Error reading chat session file ${sessionId}`, e);
+            if (toFileOperationResult(e) === FileOperationResult.FILE_NOT_FOUND && this.previousEmptyWindowStorageRoot) {
+                rawData = await this.readSessionFromPreviousLocation(sessionId);
             }
-            catch (e) {
-                this.reportError('sessionReadFile', `Error reading chat session file ${sessionId}`, e);
-                if (toFileOperationResult(e) === FileOperationResult.FILE_NOT_FOUND && this.previousEmptyWindowStorageRoot) {
-                    rawData = await this.readSessionFromPreviousLocation(sessionId);
-                }
-                if (!rawData) {
-                    return undefined;
-                }
+            if (!rawData) {
+                return undefined;
             }
-            try {
-                const session = revive(JSON.parse(rawData));
-                for (const request of session.requests) {
-                    if (Array.isArray(request.response)) {
-                        request.response = ( request.response.map((response) => {
-                            if (typeof response === 'string') {
-                                return ( new MarkdownString(response));
-                            }
-                            return response;
-                        }));
-                    }
-                    else if (typeof request.response === 'string') {
-                        request.response = [( new MarkdownString(request.response))];
-                    }
+        }
+        try {
+            const session = revive(JSON.parse(rawData));
+            for (const request of session.requests) {
+                if (Array.isArray(request.response)) {
+                    request.response = ( request.response.map((response) => {
+                        if (typeof response === 'string') {
+                            return ( new MarkdownString(response));
+                        }
+                        return response;
+                    }));
+                }
+                else if (typeof request.response === 'string') {
+                    request.response = [( new MarkdownString(request.response))];
                 }
-                return normalizeSerializableChatData(session);
-            }
-            catch (err) {
-                this.reportError('malformedSession', `Malformed session data in ${storageLocation.fsPath}: [${rawData.substring(0, 20)}${rawData.length > 20 ? '...' : ''}]`, err);
-                return undefined;
             }
-        });
+            return normalizeSerializableChatData(session);
+        }
+        catch (err) {
+            this.reportError('malformedSession', `Malformed session data in ${storageLocation.fsPath}: [${rawData.substring(0, 20)}${rawData.length > 20 ? '...' : ''}]`, err);
+            return undefined;
+        }
     }
     async readSessionFromPreviousLocation(sessionId) {
         let rawData;
@@ -321,11 +442,15 @@ let ChatSessionStore = class ChatSessionStore extends Disposable {
     getStorageLocation(chatSessionId) {
         return joinPath(this.storageRoot, `${chatSessionId}.json`);
     }
+    getTransferredSessionStorageLocation(sessionResource) {
+        const sessionId = LocalChatSessionUri.parseLocalSessionId(sessionResource);
+        return joinPath(this.transferredSessionStorageRoot, `${sessionId}.json`);
+    }
     getChatStorageFolder() {
         return this.storageRoot;
     }
 };
-ChatSessionStore = ( __decorate([
+ChatSessionStore = ChatSessionStore_1 = ( __decorate([
     ( __param(0, IFileService)),
     ( __param(1, IEnvironmentService)),
     ( __param(2, ILogService)),
@@ -374,7 +499,7 @@ async function getSessionMetadata(session) {
         };
     return {
         sessionId: session.sessionId,
-        title: title || ( localize(5948, "New Chat")),
+        title: title || ( localize(5967, "New Chat")),
         lastMessageDate: session.lastMessageDate,
         timing,
         initialLocation: session.initialLocation,

package/vscode/src/vs/workbench/contrib/chat/common/{chatTransferService.d.ts → model/chatTransferService.d.ts}

@@ -3,7 +3,7 @@ import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform
 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";
+import { IChatTransferService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatTransferService.service";
 export declare class ChatTransferService implements IChatTransferService {
     private readonly workspaceService;
     private readonly storageService;
@@ -11,8 +11,8 @@ export declare class ChatTransferService implements IChatTransferService {
     private readonly workspaceTrustManagementService;
     _serviceBrand: undefined;
     constructor(workspaceService: IWorkspaceContextService, storageService: IStorageService, fileService: IFileService, workspaceTrustManagementService: IWorkspaceTrustManagementService);
-    deleteWorkspaceFromTransferredList(workspace: URI): void;
+    private deleteWorkspaceFromTransferredList;
     addWorkspaceToTransferred(workspace: URI): void;
     checkAndSetTransferredWorkspaceTrust(): Promise<void>;
-    isChatTransferredWorkspace(workspace: URI, storageService: IStorageService): boolean;
+    private isChatTransferredWorkspace;
 }

package/vscode/src/vs/workbench/contrib/chat/common/{chatTransferService.js → model/chatTransferService.js}

@@ -5,7 +5,7 @@ import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode
 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 { areWorkspaceFoldersEmpty } from '../../../services/workspaces/common/workspaceUtils.js';
+import { areWorkspaceFoldersEmpty } from '../../../../services/workspaces/common/workspaceUtils.js';
 
 const transferredWorkspacesKey = 'chat.transferedWorkspaces';
 let ChatTransferService = class ChatTransferService {

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

@@ -3,11 +3,11 @@ import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event"
 import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IProgress } from "@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress";
 import { IChatMessage } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels";
-import { IChatFollowup, IChatProgress, IChatResponseProgressFileTreeData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
+import { IChatFollowup, IChatProgress, IChatResponseProgressFileTreeData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
 import { ChatAgentLocation, ChatModeKind } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { IChatSlashCommandService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSlashCommands.service";
+import { IChatSlashCommandService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatSlashCommands.service";
 export interface IChatSlashData {
     command: string;
     detail: string;

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

@@ -11,34 +11,30 @@ function registerChatFilesExtensionPoint(point) {
     return ExtensionsRegistry.registerExtensionPoint({
         extensionPoint: point,
         jsonSchema: {
-            description: ( localize(5966, 'Contributes {0} for chat prompts.', point)),
+            description: ( localize(5968, 'Contributes {0} for chat prompts.', point)),
             type: 'array',
             items: {
                 additionalProperties: false,
                 type: 'object',
                 defaultSnippets: [{
                         body: {
-                            name: 'exampleName',
                             path: './relative/path/to/file.md',
-                            description: 'Optional description'
                         }
                     }],
-                required: ['name', 'path'],
+                required: ['path'],
                 properties: {
-                    name: {
-                        description: ( localize(
-                            5967,
-                            'Identifier for this file. Must be unique within this extension for this contribution point.'
-                        )),
-                        type: 'string',
-                        pattern: '^[\\w.-]+$'
-                    },
                     path: {
-                        description: ( localize(5968, 'Path to the file relative to the extension root.')),
+                        description: ( localize(5969, 'Path to the file relative to the extension root.')),
+                        type: 'string'
+                    },
+                    name: {
+                        description: ( localize(5970, '(Optional) Name for this entry.')),
+                        deprecationMessage: ( localize(5971, 'Specify "name" in the prompt file itself instead.')),
                         type: 'string'
                     },
                     description: {
-                        description: ( localize(5969, '(Optional) Description of the file.')),
+                        description: ( localize(5972, '(Optional) Description of the entry.')),
+                        deprecationMessage: ( localize(5973, 'Specify "description" in the prompt file itself instead.')),
                         type: 'string'
                     }
                 }
@@ -56,8 +52,8 @@ function pointToType(contributionPoint) {
         case 'chatAgents': return PromptsType.agent;
     }
 }
-function key(extensionId, type, name) {
-    return `${extensionId.value}/${type}/${name}`;
+function key(extensionId, type, path) {
+    return `${extensionId.value}/${type}/${path}`;
 }
 let ChatPromptFilesExtensionPointHandler = class ChatPromptFilesExtensionPointHandler {
     static { this.ID = 'workbench.contrib.chatPromptFilesExtensionPointHandler'; }
@@ -73,58 +69,38 @@ let ChatPromptFilesExtensionPointHandler = class ChatPromptFilesExtensionPointHa
             for (const ext of delta.added) {
                 const type = pointToType(contributionPoint);
                 for (const raw of ext.value) {
-                    if (!raw.name || !raw.name.match(/^[\w.-]+$/)) {
-                        ext.collector.error(( localize(
-                            5970,
-                            "Extension '{0}' cannot register {1} entry with invalid name '{2}'.",
-                            ext.description.identifier.value,
-                            contributionPoint,
-                            raw.name
-                        )));
-                        continue;
-                    }
                     if (!raw.path) {
                         ext.collector.error(( localize(
-                            5971,
-                            "Extension '{0}' cannot register {1} entry '{2}' without path.",
-                            ext.description.identifier.value,
-                            contributionPoint,
-                            raw.name
-                        )));
-                        continue;
-                    }
-                    if (!raw.description) {
-                        ext.collector.error(( localize(
-                            5972,
-                            "Extension '{0}' cannot register {1} entry '{2}' without description.",
+                            5974,
+                            "Extension '{0}' cannot register {1} entry without path.",
                             ext.description.identifier.value,
-                            contributionPoint,
-                            raw.name
+                            contributionPoint
                         )));
                         continue;
                     }
                     const fileUri = joinPath(ext.description.extensionLocation, raw.path);
                     if (!isEqualOrParent(fileUri, ext.description.extensionLocation)) {
                         ext.collector.error(( localize(
-                            5973,
-                            "Extension '{0}' {1} entry '{2}' path resolves outside the extension.",
+                            5975,
+                            "Extension '{0}' {1} entry '{2}' resolves outside the extension.",
                             ext.description.identifier.value,
                             contributionPoint,
-                            raw.name
+                            raw.path
                         )));
                         continue;
                     }
                     try {
-                        const d = this.promptsService.registerContributedFile(type, raw.name, raw.description, fileUri, ext.description);
-                        this.registrations.set(key(ext.description.identifier, type, raw.name), d);
+                        const d = this.promptsService.registerContributedFile(type, fileUri, ext.description, raw.name, raw.description);
+                        this.registrations.set(key(ext.description.identifier, type, raw.path), d);
                     }
                     catch (e) {
                         const msg = e instanceof Error ? e.message : String(e);
                         ext.collector.error(( localize(
-                            5974,
-                            "Failed to register {0} entry '{1}': {2}",
+                            5976,
+                            "Extension '{0}' {1}. Failed to register {2}: {3}",
+                            ext.description.identifier.value,
                             contributionPoint,
-                            raw.name,
+                            raw.path,
                             msg
                         )));
                     }
@@ -133,7 +109,7 @@ let ChatPromptFilesExtensionPointHandler = class ChatPromptFilesExtensionPointHa
             for (const ext of delta.removed) {
                 const type = pointToType(contributionPoint);
                 for (const raw of ext.value) {
-                    this.registrations.deleteAndDispose(key(ext.description.identifier, type, raw.name));
+                    this.registrations.deleteAndDispose(key(ext.description.identifier, type, raw.path));
                 }
             }
         });

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptBodyAutocompletion.d.ts

@@ -3,7 +3,7 @@ import { Position } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/c
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { CompletionContext, CompletionItemProvider, CompletionList } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
-import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service";
+import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service";
 /**
  * Provides autocompletion for the variables inside prompt bodies.
  * - #file: paths to files and folders in the workspace

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptBodyAutocompletion.js

@@ -7,8 +7,8 @@ import { CompletionItemKind } from '@codingame/monaco-vscode-api/vscode/vs/edito
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { CharCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/charCode';
 import { getWordAtText } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/wordHelper';
-import { chatVariableLeader } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
-import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
+import { chatVariableLeader } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatParserTypes';
+import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
 
 let PromptBodyAutocompletion = class PromptBodyAutocompletion {
     constructor(fileService, languageModelToolsService) {

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptCodeActions.d.ts

@@ -2,7 +2,7 @@ import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/c
 import { Range } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range";
 import { CodeActionContext, CodeActionList, CodeActionProvider } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
 import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
-import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service";
+import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service";
 import { IPromptsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service";
 import { Selection } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/selection";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";