@codingame/monaco-vscode-chat-service-override 23.3.0 → 24.1.0

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

@@ -8,10 +8,10 @@ import { ILanguageModelChatMetadata } from '@codingame/monaco-vscode-api/vscode/
 import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
 import { IChatModeService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes.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 { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
-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 { isGithubTarget, getValidAttributeNames, knownGithubCopilotTools } from './promptValidator.js';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 
@@ -29,6 +29,22 @@ let PromptHeaderAutocompletion = class PromptHeaderAutocompletion {
         if (!promptType) {
             return undefined;
         }
+        if (/^\s*$/.test(model.getValue())) {
+            return {
+                suggestions: [{
+                        label: ( localize(5987, "Add Prompt Header")),
+                        kind: CompletionItemKind.Snippet,
+                        insertText: [
+                            `---`,
+                            `description: $1`,
+                            `---`,
+                            `$0`
+                        ].join('\n'),
+                        insertTextRules: CompletionItemInsertTextRule.InsertAsSnippet,
+                        range: model.getFullModelRange(),
+                    }]
+            };
+        }
         const parsedAST = this.promptsService.getParsedPromptFile(model);
         const header = parsedAST.header;
         if (!header) {
@@ -128,7 +144,7 @@ let PromptHeaderAutocompletion = class PromptHeaderAutocompletion {
                 '    send: true'
             ].join('\n');
             const item = {
-                label: ( localize(5867, "Handoff Example")),
+                label: ( localize(5988, "Handoff Example")),
                 kind: CompletionItemKind.Value,
                 insertText: whilespaceAfterColon === 0 ? ` ${value}` : value,
                 range: ( new Range(
@@ -159,6 +175,7 @@ let PromptHeaderAutocompletion = class PromptHeaderAutocompletion {
                     }
                     return suggestions;
                 }
+                break;
             case PromptHeaderAttributes.target:
                 if (promptType === PromptsType.agent) {
                     return ['vscode', 'github-copilot'];
@@ -173,6 +190,12 @@ let PromptHeaderAutocompletion = class PromptHeaderAutocompletion {
                 if (promptType === PromptsType.prompt || promptType === PromptsType.agent) {
                     return this.getModelNames(promptType === PromptsType.agent);
                 }
+                break;
+            case PromptHeaderAttributes.infer:
+                if (promptType === PromptsType.agent) {
+                    return ['true', 'false'];
+                }
+                break;
         }
         return [];
     }
@@ -195,7 +218,7 @@ let PromptHeaderAutocompletion = class PromptHeaderAutocompletion {
         }
         const getSuggestions = (toolRange) => {
             const suggestions = [];
-            const toolNames = isGitHubTarget ? ( Object.keys(knownGithubCopilotTools)) : this.languageModelToolsService.getQualifiedToolNames();
+            const toolNames = isGitHubTarget ? knownGithubCopilotTools : this.languageModelToolsService.getFullReferenceNames();
             for (const toolName of toolNames) {
                 let insertText;
                 if (!toolRange.isEmpty()) {

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

@@ -6,12 +6,12 @@ import { ILanguageModelChatMetadata } from '@codingame/monaco-vscode-api/vscode/
 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/languageModelToolsService';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
-import { isBuiltinChatMode } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModes';
+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-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, Target } from '@codingame/monaco-vscode-8d4ef243-d8c1-540d-9f11-38df46f54c9f-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptFileParser';
-import { isGithubTarget, knownGithubCopilotTools } from './promptValidator.js';
+import { PromptHeaderAttributes } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptFileParser';
+import { isGithubTarget } from './promptValidator.js';
 
 let PromptHoverProvider = class PromptHoverProvider {
     constructor(promptsService, languageModelToolsService, languageModelsService, chatModeService) {
@@ -57,17 +57,17 @@ let PromptHoverProvider = class PromptHoverProvider {
                     switch (attribute.key) {
                         case PromptHeaderAttributes.name:
                             return this.createHover(( localize(
-                                5868,
+                                5989,
                                 '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(
-                                5869,
+                                5990,
                                 '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(
-                                5870,
+                                5991,
                                 '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);
                     }
@@ -80,28 +80,30 @@ let PromptHoverProvider = class PromptHoverProvider {
                 if (attribute.range.containsPosition(position)) {
                     switch (attribute.key) {
                         case PromptHeaderAttributes.name:
-                            return this.createHover(( localize(5871, 'The name of the agent as shown in the UI.')), attribute.range);
+                            return this.createHover(( localize(5992, 'The name of the agent as shown in the UI.')), attribute.range);
                         case PromptHeaderAttributes.description:
                             return this.createHover(( localize(
-                                5872,
+                                5993,
                                 'The description of the custom agent, what it does and when to use it.'
                             )), attribute.range);
                         case PromptHeaderAttributes.argumentHint:
                             return this.createHover(( localize(
-                                5873,
+                                5994,
                                 'The argument-hint describes what inputs the custom agent expects or supports.'
                             )), attribute.range);
                         case PromptHeaderAttributes.model:
-                            return this.getModelHover(attribute, attribute.range, ( localize(5874, 'Specify the model that runs this custom agent.')), isGitHubTarget);
+                            return this.getModelHover(attribute, attribute.range, ( localize(5995, 'Specify the model that runs this custom agent.')), isGitHubTarget);
                         case PromptHeaderAttributes.tools:
-                            return this.getToolHover(attribute, position, ( localize(5875, 'The set of tools that the custom agent has access to.')), header.target);
+                            return this.getToolHover(attribute, position, ( localize(5996, '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(
-                                5876,
+                                5997,
                                 '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(5998, 'Whether the agent can be used as a subagent.')), attribute.range);
                     }
                 }
             }
@@ -112,23 +114,23 @@ let PromptHoverProvider = class PromptHoverProvider {
                     switch (attribute.key) {
                         case PromptHeaderAttributes.name:
                             return this.createHover(( localize(
-                                5877,
+                                5999,
                                 '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(
-                                5878,
+                                6000,
                                 'The description of the reusable prompt, what it does and when to use it.'
                             )), attribute.range);
                         case PromptHeaderAttributes.argumentHint:
                             return this.createHover(( localize(
-                                5879,
+                                6001,
                                 'The argument-hint describes what inputs the prompt expects or supports.'
                             )), attribute.range);
                         case PromptHeaderAttributes.model:
-                            return this.getModelHover(attribute, attribute.range, ( localize(5880, 'The model to use in this prompt.')), false);
+                            return this.getModelHover(attribute, attribute.range, ( localize(6002, 'The model to use in this prompt.')), false);
                         case PromptHeaderAttributes.tools:
-                            return this.getToolHover(attribute, position, ( localize(5881, 'The tools to use in this prompt.')), Target.VSCode);
+                            return this.getToolHover(attribute, position, ( localize(6003, 'The tools to use in this prompt.')));
                         case PromptHeaderAttributes.agent:
                         case PromptHeaderAttributes.mode:
                             return this.getAgentHover(attribute, position);
@@ -138,25 +140,13 @@ let PromptHoverProvider = class PromptHoverProvider {
         }
         return undefined;
     }
-    getToolHover(node, position, baseMessage, target) {
+    getToolHover(node, position, baseMessage) {
         if (node.value.type === 'array') {
             for (const toolName of node.value.items) {
                 if (toolName.type === 'string' && toolName.range.containsPosition(position)) {
-                    let toolNameValue = toolName.value;
-                    if (target === undefined) {
-                        toolNameValue = this.languageModelToolsService.mapGithubToolName(toolNameValue);
-                    }
-                    if (target === Target.VSCode || target === undefined) {
-                        const description = this.getToolHoverByName(toolNameValue, toolName.range);
-                        if (description) {
-                            return description;
-                        }
-                    }
-                    if (target === Target.GitHubCopilot || target === undefined) {
-                        const description = knownGithubCopilotTools[toolNameValue];
-                        if (description) {
-                            return this.createHover(description, toolName.range);
-                        }
+                    const description = this.getToolHoverByName(toolName.value, toolName.range);
+                    if (description) {
+                        return description;
                     }
                 }
             }
@@ -164,7 +154,7 @@ let PromptHoverProvider = class PromptHoverProvider {
         return this.createHover(baseMessage, node.range);
     }
     getToolHoverByName(toolName, range) {
-        const tool = this.languageModelToolsService.getToolByQualifiedName(toolName);
+        const tool = this.languageModelToolsService.getToolByFullReferenceName(toolName);
         if (tool !== undefined) {
             if (tool instanceof ToolSet) {
                 return this.getToolsetHover(tool, range);
@@ -177,7 +167,7 @@ let PromptHoverProvider = class PromptHoverProvider {
     }
     getToolsetHover(toolSet, range) {
         const lines = [];
-        lines.push(( localize(5882, 'ToolSet: {0}\n\n', toolSet.referenceName)));
+        lines.push(( localize(6004, 'ToolSet: {0}\n\n', toolSet.referenceName)));
         if (toolSet.description) {
             lines.push(toolSet.description);
         }
@@ -188,7 +178,7 @@ let PromptHoverProvider = class PromptHoverProvider {
     }
     getModelHover(node, range, baseMessage, isGitHubTarget) {
         if (isGitHubTarget) {
-            return this.createHover(baseMessage + '\n\n' + ( localize(5883, 'Note: This attribute is not used when target is github-copilot.')), range);
+            return this.createHover(baseMessage + '\n\n' + ( localize(6005, 'Note: This attribute is not used when target is github-copilot.')), range);
         }
         if (node.value.type === 'string') {
             for (const id of this.languageModelsService.getLanguageModelIds()) {
@@ -196,9 +186,9 @@ let PromptHoverProvider = class PromptHoverProvider {
                 if (meta && ILanguageModelChatMetadata.matchesQualifiedName(node.value.value, meta)) {
                     const lines = [];
                     lines.push(baseMessage + '\n');
-                    lines.push(( localize(5884, '- Name: {0}', meta.name)));
-                    lines.push(( localize(5885, '- Family: {0}', meta.family)));
-                    lines.push(( localize(5886, '- Vendor: {0}', meta.vendor)));
+                    lines.push(( localize(6006, '- Name: {0}', meta.name)));
+                    lines.push(( localize(6007, '- Family: {0}', meta.family)));
+                    lines.push(( localize(6008, '- Vendor: {0}', meta.vendor)));
                     if (meta.tooltip) {
                         lines.push('', '', meta.tooltip);
                     }
@@ -214,33 +204,33 @@ let PromptHoverProvider = class PromptHoverProvider {
         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(5887, 'Built-in agent')) : ( localize(5888, 'Custom agent')));
+                const description = agent.description.get() || (isBuiltinChatMode(agent) ? ( localize(6009, 'Built-in agent')) : ( localize(6010, 'Custom agent')));
                 lines.push(`\`${agent.name.get()}\`: ${description}`);
             }
         }
         else {
             const agents = this.chatModeService.getModes();
-            lines.push(( localize(5889, 'The agent to use when running this prompt.')));
+            lines.push(( localize(6011, 'The agent to use when running this prompt.')));
             lines.push('');
-            lines.push(( localize(5890, '**Built-in agents:**')));
+            lines.push(( localize(6012, '**Built-in agents:**')));
             for (const agent of agents.builtin) {
                 lines.push(`- \`${agent.name.get()}\`: ${agent.description.get() || agent.label.get()}`);
             }
             if (agents.custom.length > 0) {
                 lines.push('');
-                lines.push(( localize(5891, '**Custom agents:**')));
+                lines.push(( localize(6013, '**Custom agents:**')));
                 for (const agent of agents.custom) {
                     const description = agent.description.get();
-                    lines.push(`- \`${agent.name.get()}\`: ${description || ( localize(5888, 'Custom agent'))}`);
+                    lines.push(`- \`${agent.name.get()}\`: ${description || ( localize(6010, 'Custom agent'))}`);
                 }
             }
         }
         return this.createHover(lines.join('\n'), agentAttribute.range);
     }
     getHandsOffHover(attribute, position, isGitHubTarget) {
-        const handoffsBaseMessage = ( localize(5892, 'Possible handoff actions when the agent has completed its task.'));
+        const handoffsBaseMessage = ( localize(6014, 'Possible handoff actions when the agent has completed its task.'));
         if (isGitHubTarget) {
-            return this.createHover(handoffsBaseMessage + '\n\n' + ( localize(5893, 'Note: This attribute is not used when target is github-copilot.')), attribute.range);
+            return this.createHover(handoffsBaseMessage + '\n\n' + ( localize(6015, 'Note: This attribute is not used when target is github-copilot.')), attribute.range);
         }
         return this.createHover(handoffsBaseMessage, attribute.range);
     }

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

@@ -5,12 +5,13 @@ import { IMarkerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/
 import { IChatModeService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes.service";
 import { ILanguageModelsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service";
 import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service";
-import { PromptsType } from "@codingame/monaco-vscode-8d4ef243-d8c1-540d-9f11-38df46f54c9f-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes";
-import { ParsedPromptFile } from "@codingame/monaco-vscode-8d4ef243-d8c1-540d-9f11-38df46f54c9f-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptFileParser";
+import { PromptsType } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes";
+import { ParsedPromptFile } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptFileParser";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { IPromptsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service";
 import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
+export declare const MARKERS_OWNER_ID = "prompts-diagnostics-provider";
 export declare class PromptValidator {
     private readonly languageModelsService;
     private readonly languageModelToolsService;
@@ -36,11 +37,12 @@ export declare class PromptValidator {
     private validateApplyTo;
     private validateExcludeAgent;
     private validateHandoffs;
+    private validateInfer;
     private validateTarget;
 }
 export declare function getValidAttributeNames(promptType: PromptsType, includeNonRecommended: boolean, isGitHubTarget: boolean): string[];
 export declare function isNonRecommendedAttribute(attributeName: string): boolean;
-export declare const knownGithubCopilotTools: Record<string, string>;
+export declare const knownGithubCopilotTools: string[];
 export declare function isGithubTarget(promptType: PromptsType, target: string | undefined): boolean;
 export declare class PromptValidatorContribution extends Disposable {
     private modelService;