@codingame/monaco-vscode-chat-service-override 23.3.0 → 24.1.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-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 { IChatAgentData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents";
+import { ChatRequestModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart } from "@codingame/monaco-vscode-api/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";

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

@@ -8,8 +8,9 @@ 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-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";
+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 { ChatAgentLocation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants";
 export declare class ChatSessionStore extends Disposable {
     private readonly fileService;
     private readonly environmentService;
@@ -26,7 +27,9 @@ export declare class ChatSessionStore extends Disposable {
     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>;
     private writeSession;
+    private writeSessionMetadataOnly;
     private flushIndex;
     private getIndexStorageScope;
     private trimEntries;
@@ -48,31 +51,36 @@ export declare class ChatSessionStore extends Disposable {
     private getStorageLocation;
     getChatStorageFolder(): URI;
 }
-interface IChatSessionEntryMetadata {
+export interface IChatSessionEntryMetadata {
     sessionId: string;
     title: string;
     lastMessageDate: number;
-    isImported?: boolean;
+    timing?: IChatSessionTiming;
     initialLocation?: ChatAgentLocation;
+    hasPendingEdits?: boolean;
+    stats?: IChatSessionStats;
+    lastResponseState?: ResponseModelState;
     /**
      * This only exists because the migrated data from the storage service had empty sessions persisted, and it's impossible to know which ones are
      * currently in use. Now, `clearSession` deletes empty sessions, so old ones shouldn't take up space in the store anymore, but we still need to
      * filter the old ones out of history.
      */
     isEmpty?: boolean;
+    /**
+     * Whether this session was loaded from an external provider (eg background/cloud sessions).
+     */
+    isExternal?: boolean;
 }
 export type IChatSessionIndex = Record<string, IChatSessionEntryMetadata>;
 export interface IChatTransfer {
     toWorkspace: URI;
     timestampInMilliseconds: number;
-    inputValue: string;
+    inputState: IChatModelInputState | undefined;
     location: ChatAgentLocation;
-    mode: ChatModeKind;
 }
 export interface IChatTransfer2 extends IChatTransfer {
     chat: ISerializableChatData;
 }
-export {};
 /**
  * Map of destination workspace URI to chat transfer data
  */

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

@@ -18,7 +18,11 @@ 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-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModel';
+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';
 
 const maxPersistedSessions = 25;
 const ChatIndexStorageKey = 'chat.ChatSessionStore.index';
@@ -51,7 +55,7 @@ let ChatSessionStore = class ChatSessionStore extends Disposable {
             }
             e.join(this.storeTask, {
                 id: 'join.chatSessionStore',
-                label: ( localize(5828, "Saving chat history"))
+                label: ( localize(5947, "Saving chat history"))
             });
         }));
     }
@@ -76,18 +80,51 @@ let ChatSessionStore = class ChatSessionStore extends Disposable {
             this.storeTask = undefined;
         }
     }
+    async storeSessionsMetadataOnly(sessions) {
+        if (this.shuttingDown) {
+            return;
+        }
+        try {
+            this.storeTask = this.storeQueue.queue(async () => {
+                try {
+                    await Promise.all(( sessions.map(session => this.writeSessionMetadataOnly(session))));
+                    await this.flushIndex();
+                }
+                catch (e) {
+                    this.reportError('storeSessions', 'Error storing chat sessions', e);
+                }
+            });
+            await this.storeTask;
+        }
+        finally {
+            this.storeTask = undefined;
+        }
+    }
     async writeSession(session) {
         try {
             const index = this.internalGetIndex();
             const storageLocation = this.getStorageLocation(session.sessionId);
             const content = JSON.stringify(session, undefined, 2);
             await this.fileService.writeFile(storageLocation, VSBuffer.fromString(content));
-            index.entries[session.sessionId] = getSessionMetadata(session);
+            index.entries[session.sessionId] = await getSessionMetadata(session);
         }
         catch (e) {
             this.reportError('sessionWrite', 'Error writing chat session', e);
         }
     }
+    async writeSessionMetadataOnly(session) {
+        if (LocalChatSessionUri.parseLocalSessionId(session.sessionResource)) {
+            return;
+        }
+        try {
+            const index = this.internalGetIndex();
+            const externalSessionId = ( session.sessionResource.toString());
+            index.entries[externalSessionId] = await getSessionMetadata(session);
+        }
+        catch (e) {
+            this.reportError('sessionMetadataWrite', 'Error writing chat session metadata', e);
+        }
+    }
     async flushIndex() {
         const index = this.internalGetIndex();
         try {
@@ -105,6 +142,7 @@ let ChatSessionStore = class ChatSessionStore extends Disposable {
     async trimEntries() {
         const index = this.internalGetIndex();
         const entries = ( Object.entries(index.entries)
+            .filter(([_id, entry]) => !entry.isExternal)
             .sort((a, b) => b[1].lastMessageDate - a[1].lastMessageDate)
             .map(([id]) => id));
         if (entries.length > maxPersistedSessions) {
@@ -322,15 +360,31 @@ function isChatSessionIndex(data) {
     }
     return true;
 }
-function getSessionMetadata(session) {
+async function getSessionMetadata(session) {
     const title = session.customTitle || (session instanceof ChatModel ? session.title : undefined);
+    let stats;
+    if (session instanceof ChatModel) {
+        stats = await awaitStatsForSession(session);
+    }
+    const timing = session instanceof ChatModel ?
+        session.timing :
+        {
+            startTime: session.creationDate,
+            endTime: session.lastMessageDate
+        };
     return {
         sessionId: session.sessionId,
-        title: title || ( localize(5829, "New Chat")),
+        title: title || ( localize(5948, "New Chat")),
         lastMessageDate: session.lastMessageDate,
-        isImported: session.isImported,
+        timing,
         initialLocation: session.initialLocation,
-        isEmpty: session instanceof ChatModel ? session.getRequests().length === 0 : session.requests.length === 0
+        hasPendingEdits: session instanceof ChatModel ? (session.editingSession?.entries.get().some(e => e.state.get() === ModifiedFileEntryState.Modified)) : false,
+        isEmpty: session instanceof ChatModel ? session.getRequests().length === 0 : session.requests.length === 0,
+        stats,
+        isExternal: session instanceof ChatModel && !LocalChatSessionUri.parseLocalSessionId(session.sessionResource),
+        lastResponseState: session instanceof ChatModel ?
+            (session.lastRequest?.response?.state ?? ResponseModelState.Complete) :
+            ResponseModelState.Complete
     };
 }
 

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

@@ -6,6 +6,7 @@ import { IChatMessage } from "@codingame/monaco-vscode-api/vscode/vs/workbench/c
 import { IChatFollowup, IChatProgress, IChatResponseProgressFileTreeData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/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";
 export interface IChatSlashData {
     command: string;
@@ -33,7 +34,7 @@ export interface IChatSlashFragment {
     };
 }
 export type IChatSlashCallback = {
-    (prompt: string, progress: IProgress<IChatProgress>, history: IChatMessage[], location: ChatAgentLocation, token: CancellationToken): Promise<{
+    (prompt: string, progress: IProgress<IChatProgress>, history: IChatMessage[], location: ChatAgentLocation, sessionResource: URI, token: CancellationToken): Promise<{
         followUp: IChatFollowup[];
     } | void>;
 };
@@ -48,7 +49,7 @@ export declare class ChatSlashCommandService extends Disposable implements IChat
     registerSlashCommand(data: IChatSlashData, command: IChatSlashCallback): IDisposable;
     getCommands(location: ChatAgentLocation, mode: ChatModeKind): Array<IChatSlashData>;
     hasCommand(id: string): boolean;
-    executeCommand(id: string, prompt: string, progress: IProgress<IChatProgress>, history: IChatMessage[], location: ChatAgentLocation, token: CancellationToken): Promise<{
+    executeCommand(id: string, prompt: string, progress: IProgress<IChatProgress>, history: IChatMessage[], location: ChatAgentLocation, sessionResource: URI, token: CancellationToken): Promise<{
         followUp: IChatFollowup[];
     } | void>;
 }

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

@@ -36,7 +36,7 @@ let ChatSlashCommandService = class ChatSlashCommandService extends Disposable {
     hasCommand(id) {
         return ( this._commands.has(id));
     }
-    async executeCommand(id, prompt, progress, history, location, token) {
+    async executeCommand(id, prompt, progress, history, location, sessionResource, token) {
         const data = this._commands.get(id);
         if (!data) {
             throw ( new Error('No command with id ${id} NOT registered'));
@@ -47,7 +47,7 @@ let ChatSlashCommandService = class ChatSlashCommandService extends Disposable {
         if (!data.command) {
             throw ( new Error(`No command with id ${id} NOT resolved`));
         }
-        return await data.command(prompt, progress, history, location, token);
+        return await data.command(prompt, progress, history, location, sessionResource, token);
     }
 };
 ChatSlashCommandService = ( __decorate([

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

@@ -4,7 +4,7 @@ import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/even
 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 { Memento } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/memento';
 import { chatSessionResourceToId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatUri';
 
 let ChatTodoListStorage = class ChatTodoListStorage {

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

@@ -4,14 +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-8d4ef243-d8c1-540d-9f11-38df46f54c9f-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
+import { PromptsType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 
 function registerChatFilesExtensionPoint(point) {
     return ExtensionsRegistry.registerExtensionPoint({
         extensionPoint: point,
         jsonSchema: {
-            description: ( localize(5847, 'Contributes {0} for chat prompts.', point)),
+            description: ( localize(5966, 'Contributes {0} for chat prompts.', point)),
             type: 'array',
             items: {
                 additionalProperties: false,
@@ -27,18 +27,18 @@ function registerChatFilesExtensionPoint(point) {
                 properties: {
                     name: {
                         description: ( localize(
-                            5848,
+                            5967,
                             'Identifier for this file. Must be unique within this extension for this contribution point.'
                         )),
                         type: 'string',
                         pattern: '^[\\w.-]+$'
                     },
                     path: {
-                        description: ( localize(5849, 'Path to the file relative to the extension root.')),
+                        description: ( localize(5968, 'Path to the file relative to the extension root.')),
                         type: 'string'
                     },
                     description: {
-                        description: ( localize(5850, '(Optional) Description of the file.')),
+                        description: ( localize(5969, '(Optional) Description of the file.')),
                         type: 'string'
                     }
                 }
@@ -75,7 +75,7 @@ let ChatPromptFilesExtensionPointHandler = class ChatPromptFilesExtensionPointHa
                 for (const raw of ext.value) {
                     if (!raw.name || !raw.name.match(/^[\w.-]+$/)) {
                         ext.collector.error(( localize(
-                            5851,
+                            5970,
                             "Extension '{0}' cannot register {1} entry with invalid name '{2}'.",
                             ext.description.identifier.value,
                             contributionPoint,
@@ -85,7 +85,7 @@ let ChatPromptFilesExtensionPointHandler = class ChatPromptFilesExtensionPointHa
                     }
                     if (!raw.path) {
                         ext.collector.error(( localize(
-                            5852,
+                            5971,
                             "Extension '{0}' cannot register {1} entry '{2}' without path.",
                             ext.description.identifier.value,
                             contributionPoint,
@@ -95,7 +95,7 @@ let ChatPromptFilesExtensionPointHandler = class ChatPromptFilesExtensionPointHa
                     }
                     if (!raw.description) {
                         ext.collector.error(( localize(
-                            5853,
+                            5972,
                             "Extension '{0}' cannot register {1} entry '{2}' without description.",
                             ext.description.identifier.value,
                             contributionPoint,
@@ -106,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(
-                            5854,
+                            5973,
                             "Extension '{0}' {1} entry '{2}' path resolves outside the extension.",
                             ext.description.identifier.value,
                             contributionPoint,
@@ -121,7 +121,7 @@ let ChatPromptFilesExtensionPointHandler = class ChatPromptFilesExtensionPointHa
                     catch (e) {
                         const msg = e instanceof Error ? e.message : String(e);
                         ext.collector.error(( localize(
-                            5855,
+                            5974,
                             "Failed to register {0} entry '{1}': {2}",
                             contributionPoint,
                             raw.name,

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

@@ -2,8 +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-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 { getPromptsTypeForLanguageId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
+import { PromptHeaderAttributes } from '@codingame/monaco-vscode-api/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 {

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

@@ -1,13 +1,13 @@
 
 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 { getPromptsTypeForLanguageId, PromptsType } from '@codingame/monaco-vscode-8d4ef243-d8c1-540d-9f11-38df46f54c9f-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
+import { getPromptsTypeForLanguageId, PromptsType } from '@codingame/monaco-vscode-api/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-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+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';
 
 let PromptBodyAutocompletion = class PromptBodyAutocompletion {
@@ -52,7 +52,7 @@ let PromptBodyAutocompletion = class PromptBodyAutocompletion {
         return { suggestions };
     }
     async collectToolCompletions(model, position, toolRange, suggestions) {
-        for (const toolName of this.languageModelToolsService.getQualifiedToolNames()) {
+        for (const toolName of this.languageModelToolsService.getFullReferenceNames()) {
             suggestions.push({
                 label: toolName,
                 kind: CompletionItemKind.Value,

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

@@ -6,16 +6,20 @@ import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/
 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";
+import { IMarkerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers.service";
 export declare class PromptCodeActionProvider implements CodeActionProvider {
     private readonly promptsService;
     private readonly languageModelToolsService;
     private readonly fileService;
+    private readonly markerService;
     /**
      * Debug display name for this provider.
      */
     readonly _debugDisplayName: string;
-    constructor(promptsService: IPromptsService, languageModelToolsService: ILanguageModelToolsService, fileService: IFileService);
+    constructor(promptsService: IPromptsService, languageModelToolsService: ILanguageModelToolsService, fileService: IFileService, markerService: IMarkerService);
     provideCodeActions(model: ITextModel, range: Range | Selection, context: CodeActionContext, token: CancellationToken): Promise<CodeActionList | undefined>;
+    private getMarkers;
+    private createCodeAction;
     private getUpdateModeCodeActions;
     private getMigrateModeFileCodeActions;
     private getUpdateToolsCodeActions;

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

@@ -3,19 +3,22 @@ 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, PromptsType } from '@codingame/monaco-vscode-8d4ef243-d8c1-540d-9f11-38df46f54c9f-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
+import { getPromptsTypeForLanguageId, PromptsType } from '@codingame/monaco-vscode-api/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 { PromptHeaderAttributes } from '@codingame/monaco-vscode-api/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 { LEGACY_MODE_FILE_EXTENSION } from '@codingame/monaco-vscode-api/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';
+import { MARKERS_OWNER_ID, isGithubTarget } from './promptValidator.js';
+import { IMarkerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers.service';
+import { CodeActionKind } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/codeAction/common/types';
 
 let PromptCodeActionProvider = class PromptCodeActionProvider {
-    constructor(promptsService, languageModelToolsService, fileService) {
+    constructor(promptsService, languageModelToolsService, fileService, markerService) {
         this.promptsService = promptsService;
         this.languageModelToolsService = languageModelToolsService;
         this.fileService = fileService;
+        this.markerService = markerService;
         this._debugDisplayName = 'PromptCodeActionProvider';
     }
     async provideCodeActions(model, range, context, token) {
@@ -28,7 +31,7 @@ let PromptCodeActionProvider = class PromptCodeActionProvider {
         switch (promptType) {
             case PromptsType.agent:
                 this.getUpdateToolsCodeActions(promptAST, promptType, model, range, result);
-                await this.getMigrateModeFileCodeActions(model.uri, result);
+                await this.getMigrateModeFileCodeActions(model, result);
                 break;
             case PromptsType.prompt:
                 this.getUpdateModeCodeActions(promptAST, model, range, result);
@@ -43,6 +46,19 @@ let PromptCodeActionProvider = class PromptCodeActionProvider {
             dispose: () => { }
         };
     }
+    getMarkers(model, range) {
+        const markers = this.markerService.read({ resource: model.uri, owner: MARKERS_OWNER_ID });
+        return markers.filter(marker => range.containsRange(marker));
+    }
+    createCodeAction(model, range, title, edits) {
+        return {
+            title,
+            edit: { edits },
+            ranges: [range],
+            diagnostics: this.getMarkers(model, range),
+            kind: CodeActionKind.QuickFix.value
+        };
+    }
     getUpdateModeCodeActions(promptFile, model, range, result) {
         const modeAttr = promptFile.header?.getAttribute(PromptHeaderAttributes.mode);
         if (!modeAttr?.range.containsRange(range)) {
@@ -54,24 +70,14 @@ let PromptCodeActionProvider = class PromptCodeActionProvider {
             modeAttr.range.startLineNumber,
             modeAttr.range.startColumn + modeAttr.key.length
         ));
-        result.push({
-            title: ( localize(5863, "Rename to 'agent'")),
-            edit: {
-                edits: [asWorkspaceTextEdit(model, { range: keyRange, text: 'agent' })]
-            }
-        });
+        result.push(this.createCodeAction(model, keyRange, ( localize(5982, "Rename to 'agent'")), [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(5864, "Migrate to custom agent file")),
-                    edit: {
-                        edits: [edit]
-                    }
-                });
+    async getMigrateModeFileCodeActions(model, result) {
+        if (model.uri.path.endsWith(LEGACY_MODE_FILE_EXTENSION)) {
+            const location = this.promptsService.getAgentFileURIFromModeFile(model.uri);
+            if (location && (await this.fileService.canMove(model.uri, location))) {
+                const edit = { oldResource: model.uri, newResource: location, options: { overwrite: false, copy: false } };
+                result.push(this.createCodeAction(model, ( new Range(1, 1, 1, 4)), ( localize(5983, "Migrate to custom agent file")), [edit]));
             }
         }
     }
@@ -84,47 +90,58 @@ let PromptCodeActionProvider = class PromptCodeActionProvider {
             return;
         }
         const values = toolsAttr.value.items;
-        const deprecatedNames = ( new Lazy(() => this.languageModelToolsService.getDeprecatedQualifiedToolNames()));
+        const deprecatedNames = ( new Lazy(() => this.languageModelToolsService.getDeprecatedFullReferenceNames()));
         const edits = [];
         for (const item of values) {
             if (item.type !== 'string') {
                 continue;
             }
-            const newName = deprecatedNames.value.get(item.value);
-            if (newName) {
+            const newNames = deprecatedNames.value.get(item.value);
+            if (newNames && newNames.size > 0) {
                 const quote = model.getValueInRange(( new Range(
                     item.range.startLineNumber,
                     item.range.startColumn,
                     item.range.endLineNumber,
                     item.range.startColumn + 1
                 )));
-                const text = (quote === `'` || quote === '"') ? (quote + newName + quote) : newName;
-                const edit = { range: item.range, text };
-                edits.push(edit);
-                if (item.range.containsRange(range)) {
-                    result.push({
-                        title: ( localize(5865, "Update to '{0}'", newName)),
-                        edit: {
-                            edits: [asWorkspaceTextEdit(model, edit)]
-                        }
-                    });
+                if (newNames.size === 1) {
+                    const newName = Array.from(newNames)[0];
+                    const text = (quote === `'` || quote === '"') ? (quote + newName + quote) : newName;
+                    const edit = { range: item.range, text };
+                    edits.push(edit);
+                    if (item.range.containsRange(range)) {
+                        result.push(this.createCodeAction(model, item.range, ( localize(5984, "Update to '{0}'", newName)), [asWorkspaceTextEdit(model, edit)]));
+                    }
+                }
+                else {
+                    const newNamesArray = Array.from(newNames).sort((a, b) => a.localeCompare(b));
+                    const separator = model.getValueInRange(( new Range(
+                        item.range.startLineNumber,
+                        item.range.endColumn,
+                        item.range.endLineNumber,
+                        item.range.endColumn + 2
+                    )));
+                    const useCommaSpace = separator.includes(',');
+                    const delimiterText = useCommaSpace ? ', ' : ',';
+                    const newNamesText = ( newNamesArray.map(name => (quote === `'` || quote === '"') ? (quote + name + quote) : name)).join(delimiterText);
+                    const edit = { range: item.range, text: newNamesText };
+                    edits.push(edit);
+                    if (item.range.containsRange(range)) {
+                        result.push(this.createCodeAction(model, item.range, ( localize(5985, "Expand to {0} tools", newNames.size)), [asWorkspaceTextEdit(model, edit)]));
+                    }
                 }
             }
         }
         if (edits.length && result.length === 0 || edits.length > 1) {
-            result.push({
-                title: ( localize(5866, "Update all tool names")),
-                edit: {
-                    edits: ( edits.map(edit => asWorkspaceTextEdit(model, edit)))
-                }
-            });
+            result.push(this.createCodeAction(model, toolsAttr.value.range, ( localize(5986, "Update all tool names")), ( edits.map(edit => asWorkspaceTextEdit(model, edit)))));
         }
     }
 };
 PromptCodeActionProvider = ( __decorate([
     ( __param(0, IPromptsService)),
     ( __param(1, ILanguageModelToolsService)),
-    ( __param(2, IFileService))
+    ( __param(2, IFileService)),
+    ( __param(3, IMarkerService))
 ], PromptCodeActionProvider));
 function asWorkspaceTextEdit(model, textEdit) {
     return {

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

@@ -1,6 +1,6 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { getPromptsTypeForLanguageId } from '@codingame/monaco-vscode-8d4ef243-d8c1-540d-9f11-38df46f54c9f-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
+import { getPromptsTypeForLanguageId } from '@codingame/monaco-vscode-api/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 { isGithubTarget } from './promptValidator.js';