@codingame/monaco-vscode-chat-service-override 25.1.2 → 26.0.0

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

@@ -2,24 +2,28 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { ILanguageModelChatMetadata } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels';
 import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
-import { ToolSet } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
+import { isToolSet } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
 import { isBuiltinChatMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes';
 import { IChatModeService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes.service';
 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-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptFileParser';
-import { isGithubTarget } from './promptValidator.js';
+import { getAttributeDescription, isGithubTarget } from './promptValidator.js';
 
 let PromptHoverProvider = class PromptHoverProvider {
-    constructor(promptsService, languageModelToolsService, languageModelsService, chatModeService) {
+    constructor(
+        promptsService,
+        languageModelToolsService,
+        languageModelsService,
+        chatModeService
+    ) {
         this.promptsService = promptsService;
         this.languageModelToolsService = languageModelToolsService;
         this.languageModelsService = languageModelsService;
         this.chatModeService = chatModeService;
-        this._debugDisplayName = 'PromptHoverProvider';
+        this._debugDisplayName = "PromptHoverProvider";
     }
     createHover(contents, range) {
         return {
@@ -51,89 +55,36 @@ let PromptHoverProvider = class PromptHoverProvider {
         return undefined;
     }
     async provideHeaderHover(position, promptType, header) {
-        if (promptType === PromptsType.instructions) {
-            for (const attribute of header.attributes) {
-                if (attribute.range.containsPosition(position)) {
+        for (const attribute of header.attributes) {
+            if (attribute.range.containsPosition(position)) {
+                const description = getAttributeDescription(attribute.key, promptType);
+                if (description) {
                     switch (attribute.key) {
-                        case PromptHeaderAttributes.name:
-                            return this.createHover(( localize(
-                                5991,
-                                'The name of the instruction file as shown in the UI. If not set, the name is derived from the file name.'
-                            )), attribute.range);
-                        case PromptHeaderAttributes.description:
-                            return this.createHover(( localize(
-                                5992,
-                                'The description of the instruction file. It can be used to provide additional context or information about the instructions and is passed to the language model as part of the prompt.'
-                            )), attribute.range);
-                        case PromptHeaderAttributes.applyTo:
-                            return this.createHover(( localize(
-                                5993,
-                                'One or more glob pattern (separated by comma) that describe for which files the instructions apply to. Based on these patterns, the file is automatically included in the prompt, when the context contains a file that matches one or more of these patterns. Use `**` when you want this file to always be added.\nExample: `**/*.ts`, `**/*.js`, `client/**`'
-                            )), attribute.range);
-                    }
-                }
-            }
-        }
-        else if (promptType === PromptsType.agent) {
-            const isGitHubTarget = isGithubTarget(promptType, header.target);
-            for (const attribute of header.attributes) {
-                if (attribute.range.containsPosition(position)) {
-                    switch (attribute.key) {
-                        case PromptHeaderAttributes.name:
-                            return this.createHover(( localize(5994, 'The name of the agent as shown in the UI.')), attribute.range);
-                        case PromptHeaderAttributes.description:
-                            return this.createHover(( localize(
-                                5995,
-                                'The description of the custom agent, what it does and when to use it.'
-                            )), attribute.range);
-                        case PromptHeaderAttributes.argumentHint:
-                            return this.createHover(( localize(
-                                5996,
-                                'The argument-hint describes what inputs the custom agent expects or supports.'
-                            )), attribute.range);
-                        case PromptHeaderAttributes.model:
-                            return this.getModelHover(attribute, attribute.range, ( localize(5997, 'Specify the model that runs this custom agent.')), isGitHubTarget);
-                        case PromptHeaderAttributes.tools:
-                            return this.getToolHover(attribute, position, ( localize(5998, 'The set of tools that the custom agent has access to.')));
-                        case PromptHeaderAttributes.handOffs:
-                            return this.getHandsOffHover(attribute, position, isGitHubTarget);
-                        case PromptHeaderAttributes.target:
-                            return this.createHover(( localize(
-                                5999,
-                                'The target to which the header attributes like tools apply to. Possible values are `github-copilot` and `vscode`.'
-                            )), attribute.range);
-                        case PromptHeaderAttributes.infer:
-                            return this.createHover(( localize(6000, 'Whether the agent can be used as a subagent.')), attribute.range);
-                    }
-                }
-            }
-        }
-        else {
-            for (const attribute of header.attributes) {
-                if (attribute.range.containsPosition(position)) {
-                    switch (attribute.key) {
-                        case PromptHeaderAttributes.name:
-                            return this.createHover(( localize(
-                                6001,
-                                'The name of the prompt. This is also the name of the slash command that will run this prompt.'
-                            )), attribute.range);
-                        case PromptHeaderAttributes.description:
-                            return this.createHover(( localize(
-                                6002,
-                                'The description of the reusable prompt, what it does and when to use it.'
-                            )), attribute.range);
-                        case PromptHeaderAttributes.argumentHint:
-                            return this.createHover(( localize(
-                                6003,
-                                'The argument-hint describes what inputs the prompt expects or supports.'
-                            )), attribute.range);
-                        case PromptHeaderAttributes.model:
-                            return this.getModelHover(attribute, attribute.range, ( localize(6004, 'The model to use in this prompt.')), false);
-                        case PromptHeaderAttributes.tools:
-                            return this.getToolHover(attribute, position, ( localize(6005, 'The tools to use in this prompt.')));
-                        case PromptHeaderAttributes.agent:
-                        case PromptHeaderAttributes.mode:
-                            return this.getAgentHover(attribute, position);
+                    case PromptHeaderAttributes.model:
+                        return this.getModelHover(
+                            attribute,
+                            position,
+                            description,
+                            promptType === PromptsType.agent && isGithubTarget(promptType, header.target)
+                        );
+                    case PromptHeaderAttributes.tools:
+                        return this.getToolHover(attribute, position, description);
+                    case PromptHeaderAttributes.agent:
+                    case PromptHeaderAttributes.mode:
+                        return this.getAgentHover(attribute, position, description);
+                    case PromptHeaderAttributes.handOffs:
+                        return this.getHandsOffHover(
+                            attribute,
+                            position,
+                            promptType === PromptsType.agent && isGithubTarget(promptType, header.target)
+                        );
+                    case PromptHeaderAttributes.infer:
+                        return this.createHover(description + "\n\n" + ( localize(
+                            6285,
+                            "Deprecated: Use `user-invokable` and `disable-model-invocation` instead."
+                        )), attribute.range);
+                    default:
+                        return this.createHover(description, attribute.range);
                     }
                 }
             }
@@ -141,9 +92,9 @@ let PromptHoverProvider = class PromptHoverProvider {
         return undefined;
     }
     getToolHover(node, position, baseMessage) {
-        if (node.value.type === 'array') {
+        if (node.value.type === "array") {
             for (const toolName of node.value.items) {
-                if (toolName.type === 'string' && toolName.range.containsPosition(position)) {
+                if (toolName.type === "string" && toolName.range.containsPosition(position)) {
                     const description = this.getToolHoverByName(toolName.value, toolName.range);
                     if (description) {
                         return description;
@@ -156,10 +107,9 @@ let PromptHoverProvider = class PromptHoverProvider {
     getToolHoverByName(toolName, range) {
         const tool = this.languageModelToolsService.getToolByFullReferenceName(toolName);
         if (tool !== undefined) {
-            if (tool instanceof ToolSet) {
+            if (isToolSet(tool)) {
                 return this.getToolsetHover(tool, range);
-            }
-            else {
+            } else {
                 return this.createHover(tool.userDescription ?? tool.modelDescription, range);
             }
         }
@@ -167,79 +117,89 @@ let PromptHoverProvider = class PromptHoverProvider {
     }
     getToolsetHover(toolSet, range) {
         const lines = [];
-        lines.push(( localize(6006, 'ToolSet: {0}\n\n', toolSet.referenceName)));
+        lines.push(( localize(6286, "ToolSet: {0}\n\n", toolSet.referenceName)));
         if (toolSet.description) {
             lines.push(toolSet.description);
         }
         for (const tool of toolSet.getTools()) {
             lines.push(`- ${tool.toolReferenceName ?? tool.displayName}`);
         }
-        return this.createHover(lines.join('\n'), range);
+        return this.createHover(lines.join("\n"), range);
     }
-    getModelHover(node, range, baseMessage, isGitHubTarget) {
+    getModelHover(node, position, baseMessage, isGitHubTarget) {
         if (isGitHubTarget) {
-            return this.createHover(baseMessage + '\n\n' + ( localize(6007, 'Note: This attribute is not used when target is github-copilot.')), range);
-        }
-        if (node.value.type === 'string') {
-            for (const id of this.languageModelsService.getLanguageModelIds()) {
-                const meta = this.languageModelsService.lookupLanguageModel(id);
-                if (meta && ILanguageModelChatMetadata.matchesQualifiedName(node.value.value, meta)) {
-                    const lines = [];
-                    lines.push(baseMessage + '\n');
-                    lines.push(( localize(6008, '- Name: {0}', meta.name)));
-                    lines.push(( localize(6009, '- Family: {0}', meta.family)));
-                    lines.push(( localize(6010, '- Vendor: {0}', meta.vendor)));
-                    if (meta.tooltip) {
-                        lines.push('', '', meta.tooltip);
+            return this.createHover(baseMessage + "\n\n" + ( localize(6287, "Note: This attribute is not used when target is github-copilot.")), node.range);
+        }
+        const modelHoverContent = modelName => {
+            const meta = this.languageModelsService.lookupLanguageModelByQualifiedName(modelName);
+            if (meta) {
+                const lines = [];
+                lines.push(baseMessage + "\n");
+                lines.push(( localize(6288, "- Name: {0}", meta.name)));
+                lines.push(( localize(6289, "- Family: {0}", meta.family)));
+                lines.push(( localize(6290, "- Vendor: {0}", meta.vendor)));
+                if (meta.tooltip) {
+                    lines.push("", "", meta.tooltip);
+                }
+                return this.createHover(lines.join("\n"), node.range);
+            }
+            return undefined;
+        };
+        if (node.value.type === "string") {
+            const hover = modelHoverContent(node.value.value);
+            if (hover) {
+                return hover;
+            }
+        } else if (node.value.type === "array") {
+            for (const item of node.value.items) {
+                if (item.type === "string" && item.range.containsPosition(position)) {
+                    const hover = modelHoverContent(item.value);
+                    if (hover) {
+                        return hover;
                     }
-                    return this.createHover(lines.join('\n'), range);
                 }
             }
         }
-        return this.createHover(baseMessage, range);
+        return this.createHover(baseMessage, node.range);
     }
-    getAgentHover(agentAttribute, position) {
+    getAgentHover(agentAttribute, position, baseMessage) {
         const lines = [];
         const value = agentAttribute.value;
-        if (value.type === 'string' && value.range.containsPosition(position)) {
+        if (value.type === "string" && value.range.containsPosition(position)) {
             const agent = this.chatModeService.findModeByName(value.value);
             if (agent) {
-                const description = agent.description.get() || (isBuiltinChatMode(agent) ? ( localize(6011, 'Built-in agent')) : ( localize(6012, 'Custom agent')));
+                const description = agent.description.get() || (isBuiltinChatMode(agent) ? ( localize(6291, "Built-in agent")) : ( localize(6292, "Custom agent")));
                 lines.push(`\`${agent.name.get()}\`: ${description}`);
             }
-        }
-        else {
+        } else {
             const agents = this.chatModeService.getModes();
-            lines.push(( localize(6013, 'The agent to use when running this prompt.')));
-            lines.push('');
-            lines.push(( localize(6014, '**Built-in agents:**')));
+            lines.push(baseMessage);
+            lines.push("");
+            lines.push(( localize(6293, "**Built-in agents:**")));
             for (const agent of agents.builtin) {
-                lines.push(`- \`${agent.name.get()}\`: ${agent.description.get() || agent.label.get()}`);
+                lines.push(
+                    `- \`${agent.name.get()}\`: ${agent.description.get() || agent.label.get()}`
+                );
             }
             if (agents.custom.length > 0) {
-                lines.push('');
-                lines.push(( localize(6015, '**Custom agents:**')));
+                lines.push("");
+                lines.push(( localize(6294, "**Custom agents:**")));
                 for (const agent of agents.custom) {
                     const description = agent.description.get();
-                    lines.push(`- \`${agent.name.get()}\`: ${description || ( localize(6012, 'Custom agent'))}`);
+                    lines.push(`- \`${agent.name.get()}\`: ${description || ( localize(6292, "Custom agent"))}`);
                 }
             }
         }
-        return this.createHover(lines.join('\n'), agentAttribute.range);
+        return this.createHover(lines.join("\n"), agentAttribute.range);
     }
     getHandsOffHover(attribute, position, isGitHubTarget) {
-        const handoffsBaseMessage = ( localize(6016, 'Possible handoff actions when the agent has completed its task.'));
+        const handoffsBaseMessage = getAttributeDescription(PromptHeaderAttributes.handOffs, PromptsType.agent);
         if (isGitHubTarget) {
-            return this.createHover(handoffsBaseMessage + '\n\n' + ( localize(6017, 'Note: This attribute is not used when target is github-copilot.')), attribute.range);
+            return this.createHover(handoffsBaseMessage + "\n\n" + ( localize(6295, "Note: This attribute is not used when target is github-copilot.")), attribute.range);
         }
         return this.createHover(handoffsBaseMessage, attribute.range);
     }
 };
-PromptHoverProvider = ( __decorate([
-    ( __param(0, IPromptsService)),
-    ( __param(1, ILanguageModelToolsService)),
-    ( __param(2, ILanguageModelsService)),
-    ( __param(3, IChatModeService))
-], PromptHoverProvider));
+PromptHoverProvider = ( __decorate([( __param(0, IPromptsService)), ( __param(1, ILanguageModelToolsService)), ( __param(2, ILanguageModelsService)), ( __param(3, IChatModeService))], PromptHoverProvider));
 
 export { PromptHoverProvider };

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

@@ -16,15 +16,18 @@ let PromptLinkProvider = class PromptLinkProvider {
             if (!ref.isMarkdownLink) {
                 const url = promptAST.body.resolveFilePath(ref.content);
                 if (url) {
-                    links.push({ range: ref.range, url });
+                    links.push({
+                        range: ref.range,
+                        url
+                    });
                 }
             }
         }
-        return { links };
+        return {
+            links
+        };
     }
 };
-PromptLinkProvider = ( __decorate([
-    ( __param(0, IPromptsService))
-], PromptLinkProvider));
+PromptLinkProvider = ( __decorate([( __param(0, IPromptsService))], PromptLinkProvider));
 
 export { PromptLinkProvider };

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

@@ -22,6 +22,7 @@ export declare class PromptValidator {
     constructor(languageModelsService: ILanguageModelsService, languageModelToolsService: ILanguageModelToolsService, chatModeService: IChatModeService, fileService: IFileService, labelService: ILabelService, promptsService: IPromptsService);
     validate(promptAST: ParsedPromptFile, promptType: PromptsType, report: (markers: IMarkerData) => void): Promise<void>;
     private validateFileName;
+    private validateSkillFolderName;
     private validateBody;
     private validateHeader;
     private checkForInvalidArguments;
@@ -39,9 +40,13 @@ export declare class PromptValidator {
     private validateHandoffs;
     private validateInfer;
     private validateTarget;
+    private validateUserInvokable;
+    private validateDisableModelInvocation;
+    private validateAgentsAttribute;
 }
 export declare function getValidAttributeNames(promptType: PromptsType, includeNonRecommended: boolean, isGitHubTarget: boolean): string[];
 export declare function isNonRecommendedAttribute(attributeName: string): boolean;
+export declare function getAttributeDescription(attributeName: string, promptType: PromptsType): string | undefined;
 export declare const knownGithubCopilotTools: string[];
 export declare function isGithubTarget(promptType: PromptsType, target: string | undefined): boolean;
 export declare class PromptValidatorContribution extends Disposable {