@codingame/monaco-vscode-chat-service-override 22.1.8 → 23.0.0

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

@@ -1,7 +1,7 @@
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
-import { IChatAgentData } from "@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatAgents";
-import { ChatRequestModel } from "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart } from "@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes";
+import { IChatAgentData } from "@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/chat/common/chatAgents";
+import { ChatRequestModel } from "@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart } from "@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes";
 import { IChatSendRequestOptions, IChatUserActionEvent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
 import { ChatAgentLocation } 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";
@@ -113,7 +113,7 @@ export declare class ChatRequestTelemetry {
     private readonly languageModelsService;
     private isComplete;
     constructor(opts: {
-        agentPart: ChatRequestAgentPart | undefined;
+        agent: IChatAgentData;
         agentSlashCommandPart: ChatRequestAgentSubcommandPart | undefined;
         commandPart: ChatRequestSlashCommandPart | undefined;
         sessionId: string;

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

@@ -114,8 +114,8 @@ let ChatRequestTelemetry = class ChatRequestTelemetry {
             totalTime,
             result,
             requestType,
-            agent: detectedAgent?.id ?? this.opts.agentPart?.agent.id ?? '',
-            agentExtensionId: detectedAgent?.extensionId.value ?? this.opts.agentPart?.agent.extensionId.value ?? '',
+            agent: detectedAgent?.id ?? this.opts.agent.id,
+            agentExtensionId: detectedAgent?.extensionId.value ?? this.opts.agent.extensionId.value,
             slashCommand: this.opts.agentSlashCommandPart ? this.opts.agentSlashCommandPart.command.name : this.opts.commandPart?.slashCommand.command,
             chatSessionId: this.opts.sessionId,
             enableCommandDetection: this.opts.enableCommandDetection,

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-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { ChatModel, ISerializableChatData, ISerializableChatsData } from "@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModel";
 import { ChatAgentLocation, ChatModeKind } 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-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { normalizeSerializableChatData, ChatModel } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/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(5602, "Saving chat history"))
+                label: ( localize(5805, "Saving chat history"))
             });
         }));
     }
@@ -323,12 +323,10 @@ function isChatSessionIndex(data) {
     return true;
 }
 function getSessionMetadata(session) {
-    const title = session instanceof ChatModel ?
-        session.customTitle || (session.getRequests().length > 0 ? ChatModel.getDefaultTitle(session.getRequests()) : '') :
-        session.customTitle ?? (session.requests.length > 0 ? ChatModel.getDefaultTitle(session.requests) : '');
+    const title = session.customTitle || (session instanceof ChatModel ? session.title : undefined);
     return {
         sessionId: session.sessionId,
-        title,
+        title: title || ( localize(5806, "New Chat")),
         lastMessageDate: session.lastMessageDate,
         isImported: session.isImported,
         initialLocation: session.initialLocation,

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

@@ -1,4 +1,5 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import { IChatTodoListService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatTodoListService.service";
 export interface IChatTodo {
@@ -8,21 +9,24 @@ export interface IChatTodo {
     status: "not-started" | "in-progress" | "completed";
 }
 export interface IChatTodoListStorage {
-    getTodoList(sessionId: string): IChatTodo[];
-    setTodoList(sessionId: string, todoList: IChatTodo[]): void;
+    getTodoList(sessionResource: URI): IChatTodo[];
+    setTodoList(sessionResource: URI, todoList: IChatTodo[]): void;
 }
 export declare class ChatTodoListStorage implements IChatTodoListStorage {
     private memento;
     constructor(storageService: IStorageService);
     private getSessionData;
     private setSessionData;
-    getTodoList(sessionId: string): IChatTodo[];
-    setTodoList(sessionId: string, todoList: IChatTodo[]): void;
+    getTodoList(sessionResource: URI): IChatTodo[];
+    setTodoList(sessionResource: URI, todoList: IChatTodo[]): void;
+    private toKey;
 }
 export declare class ChatTodoListService extends Disposable implements IChatTodoListService {
     readonly _serviceBrand: undefined;
+    private readonly _onDidUpdateTodos;
+    readonly onDidUpdateTodos: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<URI>;
     private todoListStorage;
     constructor(storageService: IStorageService);
-    getTodos(sessionId: string): IChatTodo[];
-    setTodos(sessionId: string, todos: IChatTodo[]): void;
+    getTodos(sessionResource: URI): IChatTodo[];
+    setTodos(sessionResource: URI, todos: IChatTodo[]): void;
 }

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

@@ -1,28 +1,33 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 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 { Memento } from '@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common/vscode/vs/workbench/common/memento';
+import { chatSessionResourceToId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatUri';
 
 let ChatTodoListStorage = class ChatTodoListStorage {
     constructor(storageService) {
         this.memento = ( new Memento('chat-todo-list', storageService));
     }
-    getSessionData(sessionId) {
+    getSessionData(sessionResource) {
         const storage = this.memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
-        return storage[sessionId] || [];
+        return storage[this.toKey(sessionResource)] || [];
     }
-    setSessionData(sessionId, todoList) {
+    setSessionData(sessionResource, todoList) {
         const storage = this.memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
-        storage[sessionId] = todoList;
+        storage[this.toKey(sessionResource)] = todoList;
         this.memento.saveMemento();
     }
-    getTodoList(sessionId) {
-        return this.getSessionData(sessionId);
+    getTodoList(sessionResource) {
+        return this.getSessionData(sessionResource);
     }
-    setTodoList(sessionId, todoList) {
-        this.setSessionData(sessionId, todoList);
+    setTodoList(sessionResource, todoList) {
+        this.setSessionData(sessionResource, todoList);
+    }
+    toKey(sessionResource) {
+        return chatSessionResourceToId(sessionResource);
     }
 };
 ChatTodoListStorage = ( __decorate([
@@ -31,13 +36,16 @@ ChatTodoListStorage = ( __decorate([
 let ChatTodoListService = class ChatTodoListService extends Disposable {
     constructor(storageService) {
         super();
+        this._onDidUpdateTodos = this._register(( new Emitter()));
+        this.onDidUpdateTodos = this._onDidUpdateTodos.event;
         this.todoListStorage = ( new ChatTodoListStorage(storageService));
     }
-    getTodos(sessionId) {
-        return this.todoListStorage.getTodoList(sessionId);
+    getTodos(sessionResource) {
+        return this.todoListStorage.getTodoList(sessionResource);
     }
-    setTodos(sessionId, todos) {
-        this.todoListStorage.setTodoList(sessionId, todos);
+    setTodos(sessionResource, todos) {
+        this.todoListStorage.setTodoList(sessionResource, todos);
+        this._onDidUpdateTodos.fire(sessionResource);
     }
 };
 ChatTodoListService = ( __decorate([

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

@@ -4,15 +4,14 @@ import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ExtensionsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
 import { joinPath, isEqualOrParent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service';
-import { PromptsType } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
+import { PromptsType } from '@codingame/monaco-vscode-8d4ef243-d8c1-540d-9f11-38df46f54c9f-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { checkProposedApiEnabled } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions';
 
 function registerChatFilesExtensionPoint(point) {
     return ExtensionsRegistry.registerExtensionPoint({
         extensionPoint: point,
         jsonSchema: {
-            description: ( localize(5620, 'Contributes {0} for chat prompts.', point)),
+            description: ( localize(5824, 'Contributes {0} for chat prompts.', point)),
             type: 'array',
             items: {
                 additionalProperties: false,
@@ -28,18 +27,18 @@ function registerChatFilesExtensionPoint(point) {
                 properties: {
                     name: {
                         description: ( localize(
-                            5621,
+                            5825,
                             'Identifier for this file. Must be unique within this extension for this contribution point.'
                         )),
                         type: 'string',
                         pattern: '^[\\w.-]+$'
                     },
                     path: {
-                        description: ( localize(5622, 'Path to the file relative to the extension root.')),
+                        description: ( localize(5826, 'Path to the file relative to the extension root.')),
                         type: 'string'
                     },
                     description: {
-                        description: ( localize(5623, '(Optional) Description of the file.')),
+                        description: ( localize(5827, '(Optional) Description of the file.')),
                         type: 'string'
                     }
                 }
@@ -49,12 +48,12 @@ function registerChatFilesExtensionPoint(point) {
 }
 const epPrompt = registerChatFilesExtensionPoint('chatPromptFiles');
 const epInstructions = registerChatFilesExtensionPoint('chatInstructions');
-const epModes = registerChatFilesExtensionPoint('chatModes');
+const epAgents = registerChatFilesExtensionPoint('chatAgents');
 function pointToType(contributionPoint) {
     switch (contributionPoint) {
         case 'chatPromptFiles': return PromptsType.prompt;
         case 'chatInstructions': return PromptsType.instructions;
-        case 'chatModes': return PromptsType.mode;
+        case 'chatAgents': return PromptsType.agent;
     }
 }
 function key(extensionId, type, name) {
@@ -67,19 +66,16 @@ let ChatPromptFilesExtensionPointHandler = class ChatPromptFilesExtensionPointHa
         this.registrations = ( new DisposableMap());
         this.handle(epPrompt, 'chatPromptFiles');
         this.handle(epInstructions, 'chatInstructions');
-        this.handle(epModes, 'chatModes');
+        this.handle(epAgents, 'chatAgents');
     }
     handle(extensionPoint, contributionPoint) {
         extensionPoint.setHandler((_extensions, delta) => {
             for (const ext of delta.added) {
-                if (contributionPoint === 'chatModes') {
-                    checkProposedApiEnabled(ext.description, 'chatParticipantPrivate');
-                }
                 const type = pointToType(contributionPoint);
                 for (const raw of ext.value) {
                     if (!raw.name || !raw.name.match(/^[\w.-]+$/)) {
                         ext.collector.error(( localize(
-                            5624,
+                            5828,
                             "Extension '{0}' cannot register {1} entry with invalid name '{2}'.",
                             ext.description.identifier.value,
                             contributionPoint,
@@ -89,7 +85,7 @@ let ChatPromptFilesExtensionPointHandler = class ChatPromptFilesExtensionPointHa
                     }
                     if (!raw.path) {
                         ext.collector.error(( localize(
-                            5625,
+                            5829,
                             "Extension '{0}' cannot register {1} entry '{2}' without path.",
                             ext.description.identifier.value,
                             contributionPoint,
@@ -99,7 +95,7 @@ let ChatPromptFilesExtensionPointHandler = class ChatPromptFilesExtensionPointHa
                     }
                     if (!raw.description) {
                         ext.collector.error(( localize(
-                            5626,
+                            5830,
                             "Extension '{0}' cannot register {1} entry '{2}' without description.",
                             ext.description.identifier.value,
                             contributionPoint,
@@ -110,7 +106,7 @@ let ChatPromptFilesExtensionPointHandler = class ChatPromptFilesExtensionPointHa
                     const fileUri = joinPath(ext.description.extensionLocation, raw.path);
                     if (!isEqualOrParent(fileUri, ext.description.extensionLocation)) {
                         ext.collector.error(( localize(
-                            5627,
+                            5831,
                             "Extension '{0}' {1} entry '{2}' path resolves outside the extension.",
                             ext.description.identifier.value,
                             contributionPoint,
@@ -125,7 +121,7 @@ let ChatPromptFilesExtensionPointHandler = class ChatPromptFilesExtensionPointHa
                     catch (e) {
                         const msg = e instanceof Error ? e.message : String(e);
                         ext.collector.error(( localize(
-                            5628,
+                            5832,
                             "Failed to register {0} entry '{1}': {2}",
                             contributionPoint,
                             raw.name,

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

@@ -2,7 +2,8 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { IChatModeService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes.service';
-import { getPromptsTypeForLanguageId } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
+import { getPromptsTypeForLanguageId } from '@codingame/monaco-vscode-8d4ef243-d8c1-540d-9f11-38df46f54c9f-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
+import { PromptHeaderAttributes } from '@codingame/monaco-vscode-8d4ef243-d8c1-540d-9f11-38df46f54c9f-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptFileParser';
 import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service';
 
 let PromptHeaderDefinitionProvider = class PromptHeaderDefinitionProvider {
@@ -16,17 +17,17 @@ let PromptHeaderDefinitionProvider = class PromptHeaderDefinitionProvider {
         if (!promptType) {
             return undefined;
         }
-        const parser = this.promptsService.getParsedPromptFile(model);
-        const header = parser.header;
+        const promptAST = this.promptsService.getParsedPromptFile(model);
+        const header = promptAST.header;
         if (!header) {
             return undefined;
         }
-        const modeAttr = header.getAttribute('mode');
-        if (modeAttr && modeAttr.value.type === 'string' && modeAttr.range.containsPosition(position)) {
-            const mode = this.chatModeService.findModeByName(modeAttr.value.value);
-            if (mode && mode.uri) {
+        const agentAttr = header.getAttribute(PromptHeaderAttributes.agent) ?? header.getAttribute(PromptHeaderAttributes.mode);
+        if (agentAttr && agentAttr.value.type === 'string' && agentAttr.range.containsPosition(position)) {
+            const agent = this.chatModeService.findModeByName(agentAttr.value.value);
+            if (agent && agent.uri) {
                 return {
-                    uri: mode.uri.get(),
+                    uri: agent.uri.get(),
                     range: ( new Range(1, 1, 1, 1))
                 };
             }

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

@@ -32,4 +32,5 @@ export declare class PromptBodyAutocompletion implements CompletionItemProvider
      * Finds a file reference that suites the provided `position`.
      */
     private findVariableReference;
+    private collectDefaultCompletions;
 }

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

@@ -1,15 +1,14 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { extUri, dirname } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
-import { PromptsType } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
+import { getPromptsTypeForLanguageId, PromptsType } from '@codingame/monaco-vscode-8d4ef243-d8c1-540d-9f11-38df46f54c9f-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { CompletionItemKind } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
 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-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { chatVariableLeader } from '@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
-import { getPromptFileType } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
 
 let PromptBodyAutocompletion = class PromptBodyAutocompletion {
     constructor(fileService, languageModelToolsService) {
@@ -19,21 +18,36 @@ let PromptBodyAutocompletion = class PromptBodyAutocompletion {
         this.triggerCharacters = [':', '.', '/', '\\'];
     }
     async provideCompletionItems(model, position, context, token) {
+        const promptsType = getPromptsTypeForLanguageId(model.getLanguageId());
+        if (!promptsType) {
+            return undefined;
+        }
         const reference = await this.findVariableReference(model, position, token);
         if (!reference) {
             return undefined;
         }
         const suggestions = [];
-        if (reference.type === 'file') {
-            if (reference.contentRange.containsPosition(position)) {
-                await this.collectFilePathCompletions(model, position, reference.contentRange, suggestions);
-            }
-        }
-        else if (reference.type === '') {
-            const promptFileType = getPromptFileType(model.uri);
-            if (promptFileType === PromptsType.mode || promptFileType === PromptsType.prompt) {
-                await this.collectToolCompletions(model, position, reference.contentRange, suggestions);
-            }
+        switch (reference.type) {
+            case 'file':
+                if (reference.contentRange.containsPosition(position)) {
+                    await this.collectFilePathCompletions(model, position, reference.contentRange, suggestions);
+                }
+                else {
+                    await this.collectDefaultCompletions(model, reference.range, promptsType, suggestions);
+                }
+                break;
+            case 'tool':
+                if (reference.contentRange.containsPosition(position)) {
+                    if (promptsType === PromptsType.agent || promptsType === PromptsType.prompt) {
+                        await this.collectToolCompletions(model, position, reference.contentRange, suggestions);
+                    }
+                }
+                else {
+                    await this.collectDefaultCompletions(model, reference.range, promptsType, suggestions);
+                }
+                break;
+            default:
+                await this.collectDefaultCompletions(model, reference.range, promptsType, suggestions);
         }
         return { suggestions };
     }
@@ -106,19 +120,35 @@ let PromptBodyAutocompletion = class PromptBodyAutocompletion {
         if (!varWord) {
             return undefined;
         }
+        const range = ( new Range(
+            position.lineNumber,
+            varWord.startColumn + 1,
+            position.lineNumber,
+            varWord.endColumn
+        ));
         const nameMatch = varWord.word.match(/^#(\w+:)?/);
         if (nameMatch) {
+            const contentCol = varWord.startColumn + nameMatch[0].length;
             if (nameMatch[1] === 'file:') {
-                const contentCol = varWord.startColumn + nameMatch[0].length;
-                return { type: 'file', contentRange: ( new Range(position.lineNumber, contentCol, position.lineNumber, varWord.endColumn)) };
+                return { type: 'file', contentRange: ( new Range(position.lineNumber, contentCol, position.lineNumber, varWord.endColumn)), range };
+            }
+            else if (nameMatch[1] === 'tool:') {
+                return { type: 'tool', contentRange: ( new Range(position.lineNumber, contentCol, position.lineNumber, varWord.endColumn)), range };
             }
         }
-        return { type: '', contentRange: ( new Range(
-            position.lineNumber,
-            varWord.startColumn + 1,
-            position.lineNumber,
-            varWord.endColumn
-        )) };
+        return { type: '', contentRange: range, range };
+    }
+    async collectDefaultCompletions(model, range, promptFileType, suggestions) {
+        const labels = promptFileType === PromptsType.instructions ? ['file'] : ['file', 'tool'];
+        labels.forEach(label => {
+            suggestions.push({
+                label: `${label}:`,
+                kind: CompletionItemKind.Keyword,
+                insertText: `${label}:`,
+                range: range,
+                command: { id: 'editor.action.triggerSuggest', title: 'Suggest' }
+            });
+        });
     }
 };
 PromptBodyAutocompletion = ( __decorate([

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

@@ -1,18 +1,22 @@
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { Range } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range";
-import { CodeActionContext, CodeActionList, CodeActionProvider, ProviderResult } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
+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 { 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";
 export declare class PromptCodeActionProvider implements CodeActionProvider {
     private readonly promptsService;
     private readonly languageModelToolsService;
+    private readonly fileService;
     /**
      * Debug display name for this provider.
      */
     readonly _debugDisplayName: string;
-    constructor(promptsService: IPromptsService, languageModelToolsService: ILanguageModelToolsService);
-    provideCodeActions(model: ITextModel, range: Range | Selection, context: CodeActionContext, token: CancellationToken): ProviderResult<CodeActionList>;
+    constructor(promptsService: IPromptsService, languageModelToolsService: ILanguageModelToolsService, fileService: IFileService);
+    provideCodeActions(model: ITextModel, range: Range | Selection, context: CodeActionContext, token: CancellationToken): Promise<CodeActionList | undefined>;
+    private getUpdateModeCodeActions;
+    private getMigrateModeFileCodeActions;
     private getUpdateToolsCodeActions;
 }

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

@@ -3,31 +3,88 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
-import { getPromptsTypeForLanguageId } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
+import { getPromptsTypeForLanguageId, PromptsType } from '@codingame/monaco-vscode-8d4ef243-d8c1-540d-9f11-38df46f54c9f-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service';
+import { PromptHeaderAttributes } from '@codingame/monaco-vscode-8d4ef243-d8c1-540d-9f11-38df46f54c9f-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptFileParser';
 import { Lazy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
+import { LEGACY_MODE_FILE_EXTENSION } from '@codingame/monaco-vscode-8d4ef243-d8c1-540d-9f11-38df46f54c9f-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
+import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
+import { isGithubTarget } from './promptValidator.js';
 
 let PromptCodeActionProvider = class PromptCodeActionProvider {
-    constructor(promptsService, languageModelToolsService) {
+    constructor(promptsService, languageModelToolsService, fileService) {
         this.promptsService = promptsService;
         this.languageModelToolsService = languageModelToolsService;
+        this.fileService = fileService;
         this._debugDisplayName = 'PromptCodeActionProvider';
     }
-    provideCodeActions(model, range, context, token) {
+    async provideCodeActions(model, range, context, token) {
         const promptType = getPromptsTypeForLanguageId(model.getLanguageId());
-        if (!promptType) {
+        if (!promptType || promptType === PromptsType.instructions) {
             return undefined;
         }
-        const parser = this.promptsService.getParsedPromptFile(model);
-        const toolsAttr = parser.header?.getAttribute('tools');
-        if (!toolsAttr || toolsAttr.value.type !== 'array' || !toolsAttr.value.range.containsRange(range)) {
+        const result = [];
+        const promptAST = this.promptsService.getParsedPromptFile(model);
+        switch (promptType) {
+            case PromptsType.agent:
+                this.getUpdateToolsCodeActions(promptAST, promptType, model, range, result);
+                await this.getMigrateModeFileCodeActions(model.uri, result);
+                break;
+            case PromptsType.prompt:
+                this.getUpdateModeCodeActions(promptAST, model, range, result);
+                this.getUpdateToolsCodeActions(promptAST, promptType, model, range, result);
+                break;
+        }
+        if (result.length === 0) {
             return undefined;
         }
-        return this.getUpdateToolsCodeActions(toolsAttr.value.items, model, range);
+        return {
+            actions: result,
+            dispose: () => { }
+        };
+    }
+    getUpdateModeCodeActions(promptFile, model, range, result) {
+        const modeAttr = promptFile.header?.getAttribute(PromptHeaderAttributes.mode);
+        if (!modeAttr?.range.containsRange(range)) {
+            return;
+        }
+        const keyRange = ( new Range(
+            modeAttr.range.startLineNumber,
+            modeAttr.range.startColumn,
+            modeAttr.range.startLineNumber,
+            modeAttr.range.startColumn + modeAttr.key.length
+        ));
+        result.push({
+            title: ( localize(5840, "Rename to 'agent'")),
+            edit: {
+                edits: [asWorkspaceTextEdit(model, { range: keyRange, text: 'agent' })]
+            }
+        });
+    }
+    async getMigrateModeFileCodeActions(uri, result) {
+        if (uri.path.endsWith(LEGACY_MODE_FILE_EXTENSION)) {
+            const location = this.promptsService.getAgentFileURIFromModeFile(uri);
+            if (location && (await this.fileService.canMove(uri, location))) {
+                const edit = { oldResource: uri, newResource: location, options: { overwrite: false, copy: false } };
+                result.push({
+                    title: ( localize(5841, "Migrate to custom agent file")),
+                    edit: {
+                        edits: [edit]
+                    }
+                });
+            }
+        }
     }
-    getUpdateToolsCodeActions(values, model, range) {
+    getUpdateToolsCodeActions(promptFile, promptType, model, range, result) {
+        const toolsAttr = promptFile.header?.getAttribute(PromptHeaderAttributes.tools);
+        if (toolsAttr?.value.type !== 'array' || !toolsAttr.value.range.containsRange(range)) {
+            return;
+        }
+        if (isGithubTarget(promptType, promptFile.header?.target)) {
+            return;
+        }
+        const values = toolsAttr.value.items;
         const deprecatedNames = ( new Lazy(() => this.languageModelToolsService.getDeprecatedQualifiedToolNames()));
-        const actions = [];
         const edits = [];
         for (const item of values) {
             if (item.type !== 'string') {
@@ -45,8 +102,8 @@ let PromptCodeActionProvider = class PromptCodeActionProvider {
                 const edit = { range: item.range, text };
                 edits.push(edit);
                 if (item.range.containsRange(range)) {
-                    actions.push({
-                        title: ( localize(5636, "Update to '{0}'", newName)),
+                    result.push({
+                        title: ( localize(5842, "Update to '{0}'", newName)),
                         edit: {
                             edits: [asWorkspaceTextEdit(model, edit)]
                         }
@@ -54,23 +111,20 @@ let PromptCodeActionProvider = class PromptCodeActionProvider {
                 }
             }
         }
-        if (edits.length && actions.length === 0 || edits.length > 1) {
-            actions.push({
-                title: ( localize(5637, "Update all tool names")),
+        if (edits.length && result.length === 0 || edits.length > 1) {
+            result.push({
+                title: ( localize(5843, "Update all tool names")),
                 edit: {
                     edits: ( edits.map(edit => asWorkspaceTextEdit(model, edit)))
                 }
             });
         }
-        if (actions.length) {
-            return { actions, dispose: () => { } };
-        }
-        return undefined;
     }
 };
 PromptCodeActionProvider = ( __decorate([
     ( __param(0, IPromptsService)),
-    ( __param(1, ILanguageModelToolsService))
+    ( __param(1, ILanguageModelToolsService)),
+    ( __param(2, IFileService))
 ], PromptCodeActionProvider));
 function asWorkspaceTextEdit(model, textEdit) {
     return {