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

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

@@ -12,16 +12,17 @@ import { IChatModeService } from '@codingame/monaco-vscode-api/vscode/vs/workben
 import { ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 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 { SpecedToolAliases } 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 { PromptsType, getPromptsTypeForLanguageId } from '@codingame/monaco-vscode-8d4ef243-d8c1-540d-9f11-38df46f54c9f-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
-import { PromptHeaderAttributes, PROMPT_NAME_REGEXP, Target, GithubPromptHeaderAttributes } from '@codingame/monaco-vscode-8d4ef243-d8c1-540d-9f11-38df46f54c9f-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptFileParser';
+import { PromptsType, getPromptsTypeForLanguageId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
+import { PromptHeaderAttributes, Target, GithubPromptHeaderAttributes } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptFileParser';
 import { Disposable, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { Delayer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
 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';
-import { LEGACY_MODE_FILE_EXTENSION, AGENTS_SOURCE_FOLDER } from '@codingame/monaco-vscode-8d4ef243-d8c1-540d-9f11-38df46f54c9f-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
+import { LEGACY_MODE_FILE_EXTENSION, AGENTS_SOURCE_FOLDER } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
 import { Lazy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
 
 const MARKERS_OWNER_ID = 'prompts-diagnostics-provider';
@@ -45,14 +46,14 @@ let PromptValidator = class PromptValidator {
             const location = this.promptsService.getAgentFileURIFromModeFile(promptAST.uri);
             if (location && (await this.fileService.canCreateFile(location))) {
                 report(toMarker(( localize(
-                    5894,
+                    6016,
                     "Chat modes have been renamed to agents. Please move this file to {0}",
                     (location.toString())
                 )), ( new Range(1, 1, 1, 4)), MarkerSeverity.Warning));
             }
             else {
                 report(toMarker(( localize(
-                    5895,
+                    6017,
                     "Chat modes have been renamed to agents. Please move the file to {0}",
                     AGENTS_SOURCE_FOLDER
                 )), ( new Range(1, 1, 1, 4)), MarkerSeverity.Warning));
@@ -68,7 +69,7 @@ let PromptValidator = class PromptValidator {
         for (const ref of body.fileReferences) {
             const resolved = body.resolveFilePath(ref.content);
             if (!resolved) {
-                report(toMarker(( localize(5896, "Invalid file reference '{0}'.", ref.content)), ref.range, MarkerSeverity.Warning));
+                report(toMarker(( localize(6018, "Invalid file reference '{0}'.", ref.content)), ref.range, MarkerSeverity.Warning));
                 continue;
             }
             if (promptAST.uri.scheme === resolved.scheme) {
@@ -82,7 +83,7 @@ let PromptValidator = class PromptValidator {
                     catch {
                     }
                     const loc = this.labelService.getUriLabel(resolved);
-                    report(toMarker(( localize(5897, "File '{0}' not found at '{1}'.", ref.content, loc)), ref.range, MarkerSeverity.Warning));
+                    report(toMarker(( localize(6019, "File '{0}' not found at '{1}'.", ref.content, loc)), ref.range, MarkerSeverity.Warning));
                 })());
             }
         }
@@ -91,28 +92,42 @@ let PromptValidator = class PromptValidator {
             const headerTools = promptAST.header?.tools;
             const headerTarget = promptAST.header?.target;
             const headerToolsMap = headerTools ? this.languageModelToolsService.toToolAndToolSetEnablementMap(headerTools, headerTarget) : undefined;
-            const available = ( new Set(this.languageModelToolsService.getQualifiedToolNames()));
-            const deprecatedNames = this.languageModelToolsService.getDeprecatedQualifiedToolNames();
+            const available = ( new Set(this.languageModelToolsService.getFullReferenceNames()));
+            const deprecatedNames = this.languageModelToolsService.getDeprecatedFullReferenceNames();
             for (const variable of body.variableReferences) {
                 if (!( available.has(variable.name))) {
                     if (( deprecatedNames.has(variable.name))) {
-                        const currentName = deprecatedNames.get(variable.name);
-                        report(toMarker(( localize(
-                            5898,
-                            "Tool or toolset '{0}' has been renamed, use '{1}' instead.",
-                            variable.name,
-                            currentName
-                        )), variable.range, MarkerSeverity.Info));
+                        const currentNames = deprecatedNames.get(variable.name);
+                        if (currentNames && currentNames.size > 0) {
+                            if (currentNames.size === 1) {
+                                const newName = Array.from(currentNames)[0];
+                                report(toMarker(( localize(
+                                    6020,
+                                    "Tool or toolset '{0}' has been renamed, use '{1}' instead.",
+                                    variable.name,
+                                    newName
+                                )), variable.range, MarkerSeverity.Info));
+                            }
+                            else {
+                                const newNames = Array.from(currentNames).sort((a, b) => a.localeCompare(b)).join(', ');
+                                report(toMarker(( localize(
+                                    6021,
+                                    "Tool or toolset '{0}' has been renamed, use the following tools instead: {1}",
+                                    variable.name,
+                                    newNames
+                                )), variable.range, MarkerSeverity.Info));
+                            }
+                        }
                     }
                     else {
-                        report(toMarker(( localize(5899, "Unknown tool or toolset '{0}'.", variable.name)), variable.range, MarkerSeverity.Warning));
+                        report(toMarker(( localize(6022, "Unknown tool or toolset '{0}'.", variable.name)), variable.range, MarkerSeverity.Warning));
                     }
                 }
                 else if (headerToolsMap) {
-                    const tool = this.languageModelToolsService.getToolByQualifiedName(variable.name);
+                    const tool = this.languageModelToolsService.getToolByFullReferenceName(variable.name);
                     if (tool && headerToolsMap.get(tool) === false) {
                         report(toMarker(( localize(
-                            5900,
+                            6023,
                             "Tool or toolset '{0}' also needs to be enabled in the header.",
                             variable.name
                         )), variable.range, MarkerSeverity.Warning));
@@ -146,6 +161,7 @@ let PromptValidator = class PromptValidator {
                 break;
             case PromptsType.agent: {
                 this.validateTarget(attributes, report);
+                this.validateInfer(attributes, report);
                 this.validateTools(attributes, ChatModeKind.Agent, header.target, report);
                 if (!isGitHubTarget) {
                     this.validateModel(attributes, ChatModeKind.Agent, report);
@@ -166,7 +182,7 @@ let PromptValidator = class PromptValidator {
                 switch (promptType) {
                     case PromptsType.prompt:
                         report(toMarker(( localize(
-                            5901,
+                            6024,
                             "Attribute '{0}' is not supported in prompt files. Supported: {1}.",
                             attribute.key,
                             supportedNames.value
@@ -175,7 +191,7 @@ let PromptValidator = class PromptValidator {
                     case PromptsType.agent:
                         if (isGitHubTarget) {
                             report(toMarker(( localize(
-                                5902,
+                                6025,
                                 "Attribute '{0}' is not supported in custom GitHub Copilot agent files. Supported: {1}.",
                                 attribute.key,
                                 supportedNames.value
@@ -184,14 +200,14 @@ let PromptValidator = class PromptValidator {
                         else {
                             if (( validGithubCopilotAttributeNames.value.has(attribute.key))) {
                                 report(toMarker(( localize(
-                                    5903,
+                                    6026,
                                     "Attribute '{0}' is ignored when running locally in VS Code.",
                                     attribute.key
                                 )), attribute.range, MarkerSeverity.Info));
                             }
                             else {
                                 report(toMarker(( localize(
-                                    5904,
+                                    6027,
                                     "Attribute '{0}' is not supported in VS Code agent files. Supported: {1}.",
                                     attribute.key,
                                     supportedNames.value
@@ -201,7 +217,7 @@ let PromptValidator = class PromptValidator {
                         break;
                     case PromptsType.instructions:
                         report(toMarker(( localize(
-                            5905,
+                            6028,
                             "Attribute '{0}' is not supported in instructions files. Supported: {1}.",
                             attribute.key,
                             supportedNames.value
@@ -217,19 +233,13 @@ let PromptValidator = class PromptValidator {
             return;
         }
         if (nameAttribute.value.type !== 'string') {
-            report(toMarker(( localize(5906, "The 'name' attribute must be a string.")), nameAttribute.range, MarkerSeverity.Error));
+            report(toMarker(( localize(6029, "The 'name' attribute must be a string.")), nameAttribute.range, MarkerSeverity.Error));
             return;
         }
         if (nameAttribute.value.value.trim().length === 0) {
-            report(toMarker(( localize(5907, "The 'name' attribute must not be empty.")), nameAttribute.value.range, MarkerSeverity.Error));
+            report(toMarker(( localize(6030, "The 'name' attribute must not be empty.")), nameAttribute.value.range, MarkerSeverity.Error));
             return;
         }
-        if (!PROMPT_NAME_REGEXP.test(nameAttribute.value.value)) {
-            report(toMarker(( localize(
-                5908,
-                "The 'name' attribute can only consist of letters, digits, underscores, hyphens, and periods."
-            )), nameAttribute.value.range, MarkerSeverity.Error));
-        }
     }
     validateDescription(attributes, report) {
         const descriptionAttribute = attributes.find(attr => attr.key === PromptHeaderAttributes.description);
@@ -237,11 +247,11 @@ let PromptValidator = class PromptValidator {
             return;
         }
         if (descriptionAttribute.value.type !== 'string') {
-            report(toMarker(( localize(5909, "The 'description' attribute must be a string.")), descriptionAttribute.range, MarkerSeverity.Error));
+            report(toMarker(( localize(6031, "The 'description' attribute must be a string.")), descriptionAttribute.range, MarkerSeverity.Error));
             return;
         }
         if (descriptionAttribute.value.value.trim().length === 0) {
-            report(toMarker(( localize(5910, "The 'description' attribute should not be empty.")), descriptionAttribute.value.range, MarkerSeverity.Error));
+            report(toMarker(( localize(6032, "The 'description' attribute should not be empty.")), descriptionAttribute.value.range, MarkerSeverity.Error));
             return;
         }
     }
@@ -251,11 +261,11 @@ let PromptValidator = class PromptValidator {
             return;
         }
         if (argumentHintAttribute.value.type !== 'string') {
-            report(toMarker(( localize(5911, "The 'argument-hint' attribute must be a string.")), argumentHintAttribute.range, MarkerSeverity.Error));
+            report(toMarker(( localize(6033, "The 'argument-hint' attribute must be a string.")), argumentHintAttribute.range, MarkerSeverity.Error));
             return;
         }
         if (argumentHintAttribute.value.value.trim().length === 0) {
-            report(toMarker(( localize(5912, "The 'argument-hint' attribute should not be empty.")), argumentHintAttribute.value.range, MarkerSeverity.Error));
+            report(toMarker(( localize(6034, "The 'argument-hint' attribute should not be empty.")), argumentHintAttribute.value.range, MarkerSeverity.Error));
             return;
         }
     }
@@ -265,12 +275,12 @@ let PromptValidator = class PromptValidator {
             return;
         }
         if (attribute.value.type !== 'string') {
-            report(toMarker(( localize(5913, "The 'model' attribute must be a string.")), attribute.value.range, MarkerSeverity.Error));
+            report(toMarker(( localize(6035, "The 'model' attribute must be a string.")), attribute.value.range, MarkerSeverity.Error));
             return;
         }
         const modelName = attribute.value.value.trim();
         if (modelName.length === 0) {
-            report(toMarker(( localize(5914, "The 'model' attribute must be a non-empty string.")), attribute.value.range, MarkerSeverity.Error));
+            report(toMarker(( localize(6036, "The 'model' attribute must be a non-empty string.")), attribute.value.range, MarkerSeverity.Error));
             return;
         }
         const languageModes = this.languageModelsService.getLanguageModelIds();
@@ -279,10 +289,10 @@ let PromptValidator = class PromptValidator {
         }
         const modelMetadata = this.findModelByName(languageModes, modelName);
         if (!modelMetadata) {
-            report(toMarker(( localize(5915, "Unknown model '{0}'.", modelName)), attribute.value.range, MarkerSeverity.Warning));
+            report(toMarker(( localize(6037, "Unknown model '{0}'.", modelName)), attribute.value.range, MarkerSeverity.Warning));
         }
         else if (agentKind === ChatModeKind.Agent && !ILanguageModelChatMetadata.suitableForAgentMode(modelMetadata)) {
-            report(toMarker(( localize(5916, "Model '{0}' is not suited for agent mode.", modelName)), attribute.value.range, MarkerSeverity.Warning));
+            report(toMarker(( localize(6038, "Model '{0}' is not suited for agent mode.", modelName)), attribute.value.range, MarkerSeverity.Warning));
         }
     }
     findModelByName(languageModes, modelName) {
@@ -300,13 +310,13 @@ let PromptValidator = class PromptValidator {
         if (modeAttribute) {
             if (agentAttribute) {
                 report(toMarker(( localize(
-                    5917,
+                    6039,
                     "The 'mode' attribute has been deprecated. The 'agent' attribute is used instead."
                 )), modeAttribute.range, MarkerSeverity.Warning));
             }
             else {
                 report(toMarker(( localize(
-                    5918,
+                    6040,
                     "The 'mode' attribute has been deprecated. Please rename it to 'agent'."
                 )), modeAttribute.range, MarkerSeverity.Error));
             }
@@ -316,12 +326,12 @@ let PromptValidator = class PromptValidator {
             return undefined;
         }
         if (attribute.value.type !== 'string') {
-            report(toMarker(( localize(5919, "The '{0}' attribute must be a string.", attribute.key)), attribute.value.range, MarkerSeverity.Error));
+            report(toMarker(( localize(6041, "The '{0}' attribute must be a string.", attribute.key)), attribute.value.range, MarkerSeverity.Error));
             return undefined;
         }
         const agentValue = attribute.value.value;
         if (agentValue.trim().length === 0) {
-            report(toMarker(( localize(5920, "The '{0}' attribute must be a non-empty string.", attribute.key)), attribute.value.range, MarkerSeverity.Error));
+            report(toMarker(( localize(6042, "The '{0}' attribute must be a non-empty string.", attribute.key)), attribute.value.range, MarkerSeverity.Error));
             return undefined;
         }
         return this.validateAgentValue(attribute.value, report);
@@ -336,7 +346,7 @@ let PromptValidator = class PromptValidator {
             availableAgents.push(agent.name.get());
         }
         const errorMessage = ( localize(
-            5921,
+            6043,
             "Unknown agent '{0}'. Available agents: {1}.",
             value.value,
             availableAgents.join(', ')
@@ -351,7 +361,7 @@ let PromptValidator = class PromptValidator {
         }
         if (agentKind !== ChatModeKind.Agent) {
             report(toMarker(( localize(
-                5922,
+                6044,
                 "The 'tools' attribute is only supported when using agents. Attribute will be ignored."
             )), attribute.range, MarkerSeverity.Warning));
         }
@@ -363,31 +373,42 @@ let PromptValidator = class PromptValidator {
                 }
                 break;
             default:
-                report(toMarker(( localize(5923, "The 'tools' attribute must be an array.")), attribute.value.range, MarkerSeverity.Error));
+                report(toMarker(( localize(6045, "The 'tools' attribute must be an array.")), attribute.value.range, MarkerSeverity.Error));
         }
     }
     validateVSCodeTools(valueItem, target, report) {
         if (valueItem.items.length > 0) {
-            const available = ( new Set(this.languageModelToolsService.getQualifiedToolNames()));
-            const deprecatedNames = this.languageModelToolsService.getDeprecatedQualifiedToolNames();
+            const available = ( new Set(this.languageModelToolsService.getFullReferenceNames()));
+            const deprecatedNames = this.languageModelToolsService.getDeprecatedFullReferenceNames();
             for (const item of valueItem.items) {
                 if (item.type !== 'string') {
-                    report(toMarker(( localize(5924, "Each tool name in the 'tools' attribute must be a string.")), item.range, MarkerSeverity.Error));
+                    report(toMarker(( localize(6046, "Each tool name in the 'tools' attribute must be a string.")), item.range, MarkerSeverity.Error));
                 }
                 else if (item.value) {
-                    const toolName = target === undefined ? this.languageModelToolsService.mapGithubToolName(item.value) : item.value;
-                    if (!( available.has(toolName))) {
-                        if (( deprecatedNames.has(toolName))) {
-                            const currentName = deprecatedNames.get(toolName);
-                            report(toMarker(( localize(
-                                5925,
-                                "Tool or toolset '{0}' has been renamed, use '{1}' instead.",
-                                toolName,
-                                currentName
-                            )), item.range, MarkerSeverity.Info));
+                    if (!( available.has(item.value))) {
+                        const currentNames = deprecatedNames.get(item.value);
+                        if (currentNames) {
+                            if (currentNames?.size === 1) {
+                                const newName = Array.from(currentNames)[0];
+                                report(toMarker(( localize(
+                                    6047,
+                                    "Tool or toolset '{0}' has been renamed, use '{1}' instead.",
+                                    item.value,
+                                    newName
+                                )), item.range, MarkerSeverity.Info));
+                            }
+                            else {
+                                const newNames = Array.from(currentNames).sort((a, b) => a.localeCompare(b)).join(', ');
+                                report(toMarker(( localize(
+                                    6048,
+                                    "Tool or toolset '{0}' has been renamed, use the following tools instead: {1}",
+                                    item.value,
+                                    newNames
+                                )), item.range, MarkerSeverity.Info));
+                            }
                         }
                         else {
-                            report(toMarker(( localize(5926, "Unknown tool '{0}'.", toolName)), item.range, MarkerSeverity.Warning));
+                            report(toMarker(( localize(6049, "Unknown tool '{0}'.", item.value)), item.range, MarkerSeverity.Warning));
                         }
                     }
                 }
@@ -400,26 +421,26 @@ let PromptValidator = class PromptValidator {
             return;
         }
         if (attribute.value.type !== 'string') {
-            report(toMarker(( localize(5927, "The 'applyTo' attribute must be a string.")), attribute.value.range, MarkerSeverity.Error));
+            report(toMarker(( localize(6050, "The 'applyTo' attribute must be a string.")), attribute.value.range, MarkerSeverity.Error));
             return;
         }
         const pattern = attribute.value.value;
         try {
             const patterns = splitGlobAware(pattern, ',');
             if (patterns.length === 0) {
-                report(toMarker(( localize(5928, "The 'applyTo' attribute must be a valid glob pattern.")), attribute.value.range, MarkerSeverity.Error));
+                report(toMarker(( localize(6051, "The 'applyTo' attribute must be a valid glob pattern.")), attribute.value.range, MarkerSeverity.Error));
                 return;
             }
             for (const pattern of patterns) {
                 const globPattern = parse(pattern);
                 if (isEmptyPattern(globPattern)) {
-                    report(toMarker(( localize(5928, "The 'applyTo' attribute must be a valid glob pattern.")), attribute.value.range, MarkerSeverity.Error));
+                    report(toMarker(( localize(6051, "The 'applyTo' attribute must be a valid glob pattern.")), attribute.value.range, MarkerSeverity.Error));
                     return;
                 }
             }
         }
         catch (_error) {
-            report(toMarker(( localize(5928, "The 'applyTo' attribute must be a valid glob pattern.")), attribute.value.range, MarkerSeverity.Error));
+            report(toMarker(( localize(6051, "The 'applyTo' attribute must be a valid glob pattern.")), attribute.value.range, MarkerSeverity.Error));
         }
     }
     validateExcludeAgent(attributes, report) {
@@ -428,7 +449,7 @@ let PromptValidator = class PromptValidator {
             return;
         }
         if (attribute.value.type !== 'array') {
-            report(toMarker(( localize(5929, "The 'excludeAgent' attribute must be an array.")), attribute.value.range, MarkerSeverity.Error));
+            report(toMarker(( localize(6052, "The 'excludeAgent' attribute must be an array.")), attribute.value.range, MarkerSeverity.Error));
             return;
         }
     }
@@ -438,13 +459,13 @@ let PromptValidator = class PromptValidator {
             return;
         }
         if (attribute.value.type !== 'array') {
-            report(toMarker(( localize(5930, "The 'handoffs' attribute must be an array.")), attribute.value.range, MarkerSeverity.Error));
+            report(toMarker(( localize(6053, "The 'handoffs' attribute must be an array.")), attribute.value.range, MarkerSeverity.Error));
             return;
         }
         for (const item of attribute.value.items) {
             if (item.type !== 'object') {
                 report(toMarker(( localize(
-                    5931,
+                    6054,
                     "Each handoff in the 'handoffs' attribute must be an object with 'label', 'agent', 'prompt' and optional 'send'."
                 )), item.range, MarkerSeverity.Error));
                 continue;
@@ -454,12 +475,12 @@ let PromptValidator = class PromptValidator {
                 switch (prop.key.value) {
                     case 'label':
                         if (prop.value.type !== 'string' || prop.value.value.trim().length === 0) {
-                            report(toMarker(( localize(5932, "The 'label' property in a handoff must be a non-empty string.")), prop.value.range, MarkerSeverity.Error));
+                            report(toMarker(( localize(6055, "The 'label' property in a handoff must be a non-empty string.")), prop.value.range, MarkerSeverity.Error));
                         }
                         break;
                     case 'agent':
                         if (prop.value.type !== 'string' || prop.value.value.trim().length === 0) {
-                            report(toMarker(( localize(5933, "The 'agent' property in a handoff must be a non-empty string.")), prop.value.range, MarkerSeverity.Error));
+                            report(toMarker(( localize(6056, "The 'agent' property in a handoff must be a non-empty string.")), prop.value.range, MarkerSeverity.Error));
                         }
                         else {
                             this.validateAgentValue(prop.value, report);
@@ -467,18 +488,23 @@ let PromptValidator = class PromptValidator {
                         break;
                     case 'prompt':
                         if (prop.value.type !== 'string') {
-                            report(toMarker(( localize(5934, "The 'prompt' property in a handoff must be a string.")), prop.value.range, MarkerSeverity.Error));
+                            report(toMarker(( localize(6057, "The 'prompt' property in a handoff must be a string.")), prop.value.range, MarkerSeverity.Error));
                         }
                         break;
                     case 'send':
                         if (prop.value.type !== 'boolean') {
-                            report(toMarker(( localize(5935, "The 'send' property in a handoff must be a boolean.")), prop.value.range, MarkerSeverity.Error));
+                            report(toMarker(( localize(6058, "The 'send' property in a handoff must be a boolean.")), prop.value.range, MarkerSeverity.Error));
+                        }
+                        break;
+                    case 'showContinueOn':
+                        if (prop.value.type !== 'boolean') {
+                            report(toMarker(( localize(6059, "The 'showContinueOn' property in a handoff must be a boolean.")), prop.value.range, MarkerSeverity.Error));
                         }
                         break;
                     default:
                         report(toMarker(( localize(
-                            5936,
-                            "Unknown property '{0}' in handoff object. Supported properties are 'label', 'agent', 'prompt' and optional 'send'.",
+                            6060,
+                            "Unknown property '{0}' in handoff object. Supported properties are 'label', 'agent', 'prompt' and optional 'send', 'showContinueOn'.",
                             prop.key.value
                         )), prop.value.range, MarkerSeverity.Warning));
                 }
@@ -486,31 +512,41 @@ let PromptValidator = class PromptValidator {
             }
             if (required.size > 0) {
                 report(toMarker(( localize(
-                    5937,
+                    6061,
                     "Missing required properties {0} in handoff object.",
                     ( Array.from(required).map(s => `'${s}'`)).join(', ')
                 )), item.range, MarkerSeverity.Error));
             }
         }
     }
+    validateInfer(attributes, report) {
+        const attribute = attributes.find(attr => attr.key === PromptHeaderAttributes.infer);
+        if (!attribute) {
+            return;
+        }
+        if (attribute.value.type !== 'boolean') {
+            report(toMarker(( localize(6062, "The 'infer' attribute must be a boolean.")), attribute.value.range, MarkerSeverity.Error));
+            return;
+        }
+    }
     validateTarget(attributes, report) {
         const attribute = attributes.find(attr => attr.key === PromptHeaderAttributes.target);
         if (!attribute) {
             return;
         }
         if (attribute.value.type !== 'string') {
-            report(toMarker(( localize(5938, "The 'target' attribute must be a string.")), attribute.value.range, MarkerSeverity.Error));
+            report(toMarker(( localize(6063, "The 'target' attribute must be a string.")), attribute.value.range, MarkerSeverity.Error));
             return;
         }
         const targetValue = attribute.value.value.trim();
         if (targetValue.length === 0) {
-            report(toMarker(( localize(5939, "The 'target' attribute must be a non-empty string.")), attribute.value.range, MarkerSeverity.Error));
+            report(toMarker(( localize(6064, "The 'target' attribute must be a non-empty string.")), attribute.value.range, MarkerSeverity.Error));
             return;
         }
         const validTargets = ['github-copilot', 'vscode'];
         if (!validTargets.includes(targetValue)) {
             report(toMarker(( localize(
-                5940,
+                6065,
                 "The 'target' attribute must be one of: {0}.",
                 validTargets.join(', ')
             )), attribute.value.range, MarkerSeverity.Error));
@@ -528,9 +564,9 @@ PromptValidator = ( __decorate([
 const allAttributeNames = {
     [PromptsType.prompt]: [PromptHeaderAttributes.name, PromptHeaderAttributes.description, PromptHeaderAttributes.model, PromptHeaderAttributes.tools, PromptHeaderAttributes.mode, PromptHeaderAttributes.agent, PromptHeaderAttributes.argumentHint],
     [PromptsType.instructions]: [PromptHeaderAttributes.name, PromptHeaderAttributes.description, PromptHeaderAttributes.applyTo, PromptHeaderAttributes.excludeAgent],
-    [PromptsType.agent]: [PromptHeaderAttributes.name, PromptHeaderAttributes.description, PromptHeaderAttributes.model, PromptHeaderAttributes.tools, PromptHeaderAttributes.advancedOptions, PromptHeaderAttributes.handOffs, PromptHeaderAttributes.argumentHint, PromptHeaderAttributes.target]
+    [PromptsType.agent]: [PromptHeaderAttributes.name, PromptHeaderAttributes.description, PromptHeaderAttributes.model, PromptHeaderAttributes.tools, PromptHeaderAttributes.advancedOptions, PromptHeaderAttributes.handOffs, PromptHeaderAttributes.argumentHint, PromptHeaderAttributes.target, PromptHeaderAttributes.infer]
 };
-const githubCopilotAgentAttributeNames = [PromptHeaderAttributes.name, PromptHeaderAttributes.description, PromptHeaderAttributes.tools, PromptHeaderAttributes.target, GithubPromptHeaderAttributes.mcpServers];
+const githubCopilotAgentAttributeNames = [PromptHeaderAttributes.name, PromptHeaderAttributes.description, PromptHeaderAttributes.tools, PromptHeaderAttributes.target, GithubPromptHeaderAttributes.mcpServers, PromptHeaderAttributes.infer];
 const recommendedAttributeNames = {
     [PromptsType.prompt]: allAttributeNames[PromptsType.prompt].filter(name => !isNonRecommendedAttribute(name)),
     [PromptsType.instructions]: allAttributeNames[PromptsType.instructions].filter(name => !isNonRecommendedAttribute(name)),
@@ -545,12 +581,9 @@ function getValidAttributeNames(promptType, includeNonRecommended, isGitHubTarge
 function isNonRecommendedAttribute(attributeName) {
     return attributeName === PromptHeaderAttributes.advancedOptions || attributeName === PromptHeaderAttributes.excludeAgent || attributeName === PromptHeaderAttributes.mode;
 }
-const knownGithubCopilotTools = {
-    'shell': ( localize(5941, 'Execute shell commands')),
-    'edit': ( localize(5942, 'Edit files')),
-    'search': ( localize(5943, 'Search in files')),
-    'custom-agent': ( localize(5944, 'Call custom agents'))
-};
+const knownGithubCopilotTools = [
+    SpecedToolAliases.execute, SpecedToolAliases.read, SpecedToolAliases.edit, SpecedToolAliases.search, SpecedToolAliases.agent,
+];
 function isGithubTarget(promptType, target) {
     return promptType === PromptsType.agent && target === Target.GitHubCopilot;
 }
@@ -653,4 +686,4 @@ ModelTracker = ( __decorate([
     ( __param(4, IMarkerService))
 ], ModelTracker));
 
-export { PromptValidator, PromptValidatorContribution, getValidAttributeNames, isGithubTarget, isNonRecommendedAttribute, knownGithubCopilotTools };
+export { MARKERS_OWNER_ID, PromptValidator, PromptValidatorContribution, getValidAttributeNames, isGithubTarget, isNonRecommendedAttribute, knownGithubCopilotTools };

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

@@ -10,7 +10,7 @@ import { PromptDocumentSemanticTokensProvider } from './languageProviders/prompt
 import { PromptCodeActionProvider } from './languageProviders/promptCodeActions.js';
 import { ILanguageFeaturesService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/languageFeatures.service';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { ALL_PROMPTS_LANGUAGE_SELECTOR } from '@codingame/monaco-vscode-8d4ef243-d8c1-540d-9f11-38df46f54c9f-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
+import { ALL_PROMPTS_LANGUAGE_SELECTOR } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 
 let PromptLanguageFeaturesProvider = class PromptLanguageFeaturesProvider extends Disposable {