@codingame/monaco-vscode-chat-service-override 20.4.1 → 21.0.0

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

@@ -11,6 +11,9 @@ 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 { ChatModeKind } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants";
+import { IChatMode } from "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModes";
+import { IChatModeService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes.service";
+import { PromptModeMetadata } from "../parsers/promptHeader/metadata/mode.js";
 /**
  * Prompt header diagnostics provider for an individual text model
  * of a prompt file.
@@ -19,14 +22,16 @@ declare class PromptHeaderDiagnosticsProvider extends ProviderInstanceBase {
     private readonly markerService;
     private readonly languageModelsService;
     private readonly languageModelToolsService;
-    constructor(model: ITextModel, promptsService: IPromptsService, markerService: IMarkerService, languageModelsService: ILanguageModelsService, languageModelToolsService: ILanguageModelToolsService);
+    private readonly chatModeService;
+    constructor(model: ITextModel, promptsService: IPromptsService, markerService: IMarkerService, languageModelsService: ILanguageModelsService, languageModelToolsService: ILanguageModelToolsService, chatModeService: IChatModeService);
     /**
      * Update diagnostic markers for the current editor.
      */
     protected onPromptSettled(_error: Error | undefined, token: CancellationToken): Promise<void>;
-    validateModel(modelNode: PromptModelMetadata | undefined, modeKind: ChatModeKind | undefined, markers: IMarkerData[]): void;
+    validateModel(modelNode: PromptModelMetadata | undefined, modeKind: string | ChatModeKind | undefined, markers: IMarkerData[]): void;
     findModelByName(languageModes: string[], modelName: string): ILanguageModelChatMetadata | undefined;
-    validateTools(tools: PromptToolsMetadata | undefined, modeKind: ChatModeKind | undefined, markers: IMarkerData[]): void;
+    validateTools(tools: PromptToolsMetadata | undefined, modeKind: string | ChatModeKind | undefined, markers: IMarkerData[]): void;
+    validateMode(modeNode: PromptModeMetadata | undefined, markers: IMarkerData[]): IChatMode | undefined;
     /**
      * Returns a string representation of this object.
      */

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

@@ -15,20 +15,26 @@ import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/w
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { IChatModeService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes.service';
+import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
 
 const MARKERS_OWNER_ID = 'prompts-header-diagnostics-provider';
 let PromptHeaderDiagnosticsProvider = class PromptHeaderDiagnosticsProvider extends ProviderInstanceBase {
-    constructor(model, promptsService, markerService, languageModelsService, languageModelToolsService) {
+    constructor(model, promptsService, markerService, languageModelsService, languageModelToolsService, chatModeService) {
         super(model, promptsService);
         this.markerService = markerService;
         this.languageModelsService = languageModelsService;
         this.languageModelToolsService = languageModelToolsService;
+        this.chatModeService = chatModeService;
         this._register(languageModelsService.onDidChangeLanguageModels(() => {
             this.onPromptSettled(undefined, CancellationToken.None);
         }));
         this._register(languageModelToolsService.onDidChangeTools(() => {
             this.onPromptSettled(undefined, CancellationToken.None);
         }));
+        this._register(chatModeService.onDidChangeChatModes(() => {
+            this.onPromptSettled(undefined, CancellationToken.None);
+        }));
     }
     async onPromptSettled(_error, token) {
         const { header } = this.parser;
@@ -45,8 +51,9 @@ let PromptHeaderDiagnosticsProvider = class PromptHeaderDiagnosticsProvider exte
             markers.push(toMarker(diagnostic));
         }
         if (header instanceof PromptHeader) {
-            this.validateTools(header.metadataUtility.tools, header.metadata.mode, markers);
-            this.validateModel(header.metadataUtility.model, header.metadata.mode, markers);
+            const mode = this.validateMode(header.metadataUtility.mode, markers);
+            this.validateTools(header.metadataUtility.tools, mode?.kind, markers);
+            this.validateModel(header.metadataUtility.model, mode?.kind, markers);
         }
         else if (header instanceof ModeHeader) {
             this.validateTools(header.metadataUtility.tools, ChatModeKind.Agent, markers);
@@ -70,14 +77,14 @@ let PromptHeaderDiagnosticsProvider = class PromptHeaderDiagnosticsProvider exte
         const modelMetadata = this.findModelByName(languageModes, modelNode.value);
         if (!modelMetadata) {
             markers.push({
-                message: ( localize(5442, "Unknown model '{0}'", modelNode.value)),
+                message: ( localize(5569, "Unknown model '{0}'", modelNode.value)),
                 severity: MarkerSeverity.Warning,
                 ...modelNode.range,
             });
         }
         else if (modeKind === ChatModeKind.Agent && !ILanguageModelChatMetadata.suitableForAgentMode(modelMetadata)) {
             markers.push({
-                message: ( localize(5443, "Model '{0}' is not suited for agent mode", modelNode.value)),
+                message: ( localize(5570, "Model '{0}' is not suited for agent mode", modelNode.value)),
                 severity: MarkerSeverity.Warning,
                 ...modelNode.range,
             });
@@ -86,7 +93,7 @@ let PromptHeaderDiagnosticsProvider = class PromptHeaderDiagnosticsProvider exte
     findModelByName(languageModes, modelName) {
         for (const model of languageModes) {
             const metadata = this.languageModelsService.lookupLanguageModel(model);
-            if (metadata && metadata.isUserSelectable !== false && ILanguageModelChatMetadata.asQualifiedName(metadata) === modelName) {
+            if (metadata && metadata.isUserSelectable !== false && ILanguageModelChatMetadata.matchesQualifiedName(modelName, metadata)) {
                 return metadata;
             }
         }
@@ -110,13 +117,38 @@ let PromptHeaderDiagnosticsProvider = class PromptHeaderDiagnosticsProvider exte
             const range = tools.getToolRange(toolName);
             if (range) {
                 markers.push({
-                    message: ( localize(5444, "Unknown tool '{0}'", toolName)),
+                    message: ( localize(5571, "Unknown tool '{0}'", toolName)),
                     severity: MarkerSeverity.Warning,
                     ...range,
                 });
             }
         }
     }
+    validateMode(modeNode, markers) {
+        if (!modeNode || modeNode.value === undefined) {
+            return;
+        }
+        const modeValue = modeNode.value;
+        const modes = this.chatModeService.getModes();
+        const availableModes = [];
+        for (const mode of Iterable.concat(modes.builtin, modes.custom)) {
+            if (mode.name === modeValue) {
+                return mode;
+            }
+            availableModes.push(mode.name);
+        }
+        markers.push({
+            message: ( localize(
+                5572,
+                "Unknown mode '{0}'. Available modes: {1}",
+                modeValue,
+                availableModes.join(', ')
+            )),
+            severity: MarkerSeverity.Warning,
+            ...modeNode.range,
+        });
+        return undefined;
+    }
     toString() {
         return `prompt-header-diagnostics:${this.model.uri.path}`;
     }
@@ -125,7 +157,8 @@ PromptHeaderDiagnosticsProvider = ( __decorate([
     ( __param(1, IPromptsService)),
     ( __param(2, IMarkerService)),
     ( __param(3, ILanguageModelsService)),
-    ( __param(4, ILanguageModelToolsService))
+    ( __param(4, ILanguageModelToolsService)),
+    ( __param(5, IChatModeService))
 ], PromptHeaderDiagnosticsProvider));
 function toMarker(diagnostic) {
     if (diagnostic instanceof PromptMetadataWarning) {

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

@@ -6,20 +6,23 @@ import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common
 import { ILanguageFeaturesService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/languageFeatures.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 { IChatModeService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes.service";
 import { IPromptsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service";
 export declare class PromptHeaderHoverProvider extends Disposable implements HoverProvider {
     private readonly promptsService;
     private readonly languageService;
     private readonly languageModelToolsService;
     private readonly languageModelsService;
+    private readonly chatModeService;
     /**
      * Debug display name for this provider.
      */
     readonly _debugDisplayName: string;
-    constructor(promptsService: IPromptsService, languageService: ILanguageFeaturesService, languageModelToolsService: ILanguageModelToolsService, languageModelsService: ILanguageModelsService);
+    constructor(promptsService: IPromptsService, languageService: ILanguageFeaturesService, languageModelToolsService: ILanguageModelToolsService, languageModelsService: ILanguageModelsService, chatModeService: IChatModeService);
     private createHover;
     provideHover(model: ITextModel, position: Position, token: CancellationToken, _context?: HoverContext): Promise<Hover | undefined>;
     private getToolHover;
     private getToolsetHover;
     private getModelHover;
+    private getModeHover;
 }

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

@@ -7,18 +7,21 @@ 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 { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
+import { isBuiltinChatMode } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModes';
+import { IChatModeService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes.service';
 import { InstructionsHeader } from '../parsers/promptHeader/instructionsHeader.js';
 import { ModeHeader } from '../parsers/promptHeader/modeHeader.js';
 import { ALL_PROMPTS_LANGUAGE_SELECTOR, getPromptsTypeForLanguageId } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service';
 
 let PromptHeaderHoverProvider = class PromptHeaderHoverProvider extends Disposable {
-    constructor(promptsService, languageService, languageModelToolsService, languageModelsService) {
+    constructor(promptsService, languageService, languageModelToolsService, languageModelsService, chatModeService) {
         super();
         this.promptsService = promptsService;
         this.languageService = languageService;
         this.languageModelToolsService = languageModelToolsService;
         this.languageModelsService = languageModelsService;
+        this.chatModeService = chatModeService;
         this._debugDisplayName = 'PromptHeaderHoverProvider';
         this._register(this.languageService.hoverProvider.register(ALL_PROMPTS_LANGUAGE_SELECTOR, this));
     }
@@ -50,14 +53,14 @@ let PromptHeaderHoverProvider = class PromptHeaderHoverProvider extends Disposab
             const descriptionRange = header.metadataUtility.description?.range;
             if (descriptionRange?.containsPosition(position)) {
                 return this.createHover(( localize(
-                    5445,
+                    5573,
                     '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.'
                 )), descriptionRange);
             }
             const applyToRange = header.metadataUtility.applyTo?.range;
             if (applyToRange?.containsPosition(position)) {
                 return this.createHover(( localize(
-                    5446,
+                    5574,
                     '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/**'
                 )), applyToRange);
             }
@@ -66,38 +69,38 @@ let PromptHeaderHoverProvider = class PromptHeaderHoverProvider extends Disposab
             const descriptionRange = header.metadataUtility.description?.range;
             if (descriptionRange?.containsPosition(position)) {
                 return this.createHover(( localize(
-                    5447,
+                    5575,
                     'The description of the mode file. It can be used to provide additional context or information about the mode to the mode author.'
                 )), descriptionRange);
             }
             const model = header.metadataUtility.model;
             if (model?.range.containsPosition(position)) {
-                return this.getModelHover(model, model.range, ( localize(5448, 'The model to use in this mode.')));
+                return this.getModelHover(model, model.range, ( localize(5576, 'The model to use in this mode.')));
             }
             const tools = header.metadataUtility.tools;
-            if (tools?.range?.containsPosition(position)) {
-                return this.getToolHover(tools, position, ( localize(5449, 'The tools to use in this mode.')));
+            if (tools?.range.containsPosition(position)) {
+                return this.getToolHover(tools, position, ( localize(5577, 'The tools to use in this mode.')));
             }
         }
         else {
             const descriptionRange = header.metadataUtility.description?.range;
             if (descriptionRange?.containsPosition(position)) {
                 return this.createHover(( localize(
-                    5450,
+                    5578,
                     'The description of the prompt file. It can be used to provide additional context or information about the prompt to the prompt author.'
                 )), descriptionRange);
             }
             const model = header.metadataUtility.model;
             if (model?.range.containsPosition(position)) {
-                return this.getModelHover(model, model.range, ( localize(5451, 'The model to use in this prompt.')));
+                return this.getModelHover(model, model.range, ( localize(5579, 'The model to use in this prompt.')));
             }
             const tools = header.metadataUtility.tools;
-            if (tools?.range?.containsPosition(position)) {
-                return this.getToolHover(tools, position, ( localize(5452, 'The tools to use in this prompt.')));
+            if (tools?.range.containsPosition(position)) {
+                return this.getToolHover(tools, position, ( localize(5580, 'The tools to use in this prompt.')));
             }
-            const modeRange = header.metadataUtility.mode?.range;
-            if (modeRange?.containsPosition(position)) {
-                return this.createHover(( localize(5453, 'The mode (ask, edit or agent) to use when running this prompt.')), modeRange);
+            const mode = header.metadataUtility.mode;
+            if (mode?.range.containsPosition(position)) {
+                return this.getModeHover(mode, position, ( localize(5581, 'The mode to use in this prompt.')));
             }
         }
         return undefined;
@@ -122,7 +125,7 @@ let PromptHeaderHoverProvider = class PromptHeaderHoverProvider extends Disposab
     }
     getToolsetHover(toolSet, range) {
         const lines = [];
-        lines.push(( localize(5454, 'ToolSet: {0}\n\n', toolSet.referenceName)));
+        lines.push(( localize(5582, 'ToolSet: {0}\n\n', toolSet.referenceName)));
         if (toolSet.description) {
             lines.push(toolSet.description);
         }
@@ -136,14 +139,14 @@ let PromptHeaderHoverProvider = class PromptHeaderHoverProvider extends Disposab
         if (modelName) {
             for (const id of this.languageModelsService.getLanguageModelIds()) {
                 const meta = this.languageModelsService.lookupLanguageModel(id);
-                if (meta && ILanguageModelChatMetadata.asQualifiedName(meta) === modelName) {
+                if (meta && ILanguageModelChatMetadata.matchesQualifiedName(modelName, meta)) {
                     const lines = [];
                     lines.push(baseMessage + '\n');
-                    lines.push(( localize(5455, '- Name: {0}', meta.name)));
-                    lines.push(( localize(5456, '- Family: {0}', meta.family)));
-                    lines.push(( localize(5457, '- Vendor: {0}', meta.vendor)));
-                    if (meta.description) {
-                        lines.push('', '', meta.description);
+                    lines.push(( localize(5583, '- Name: {0}', meta.name)));
+                    lines.push(( localize(5584, '- Family: {0}', meta.family)));
+                    lines.push(( localize(5585, '- Vendor: {0}', meta.vendor)));
+                    if (meta.tooltip) {
+                        lines.push('', '', meta.tooltip);
                     }
                     return this.createHover(lines.join('\n'), range);
                 }
@@ -151,12 +154,42 @@ let PromptHeaderHoverProvider = class PromptHeaderHoverProvider extends Disposab
         }
         return this.createHover(baseMessage, range);
     }
+    getModeHover(mode, position, baseMessage) {
+        const lines = [];
+        const value = mode.value;
+        if (value && mode.valueRange?.containsPosition(position)) {
+            const mode = this.chatModeService.findModeByName(value);
+            if (mode) {
+                const description = mode.description.get() || (isBuiltinChatMode(mode) ? ( localize(5586, 'Built-in chat mode')) : ( localize(5587, 'Custom chat mode')));
+                lines.push(`\`${mode.name}\`: ${description}`);
+            }
+        }
+        else {
+            const modes = this.chatModeService.getModes();
+            lines.push(( localize(5588, 'The chat mode to use when running this prompt.')));
+            lines.push('');
+            lines.push(( localize(5589, '**Built-in modes:**')));
+            for (const mode of modes.builtin) {
+                lines.push(`- \`${mode.name}\`: ${mode.description.get() || mode.label}`);
+            }
+            if (modes.custom.length > 0) {
+                lines.push('');
+                lines.push(( localize(5590, '**Custom modes:**')));
+                for (const mode of modes.custom) {
+                    const description = mode.description.get();
+                    lines.push(`- \`${mode.name}\`: ${description || ( localize(5587, 'Custom chat mode'))}`);
+                }
+            }
+        }
+        return this.createHover(lines.join('\n'), mode.range);
+    }
 };
 PromptHeaderHoverProvider = ( __decorate([
     ( __param(0, IPromptsService)),
     ( __param(1, ILanguageFeaturesService)),
     ( __param(2, ILanguageModelToolsService)),
-    ( __param(3, ILanguageModelsService))
+    ( __param(3, ILanguageModelsService)),
+    ( __param(4, IChatModeService))
 ], PromptHeaderHoverProvider));
 
 export { PromptHeaderHoverProvider };

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

@@ -22,7 +22,7 @@ let PromptLinkDiagnosticsProvider = class PromptLinkDiagnosticsProvider extends
         const stats = await this.fileService.resolveAll(( this.parser.references.map(ref => ({ resource: ref.uri }))));
         for (let i = 0; i < stats.length; i++) {
             if (!stats[i].success) {
-                markers.push(toMarker(this.parser.references[i], ( localize(5458, 'File not found.'))));
+                markers.push(toMarker(this.parser.references[i], ( localize(5591, 'File not found.'))));
             }
         }
         this.markerService.changeOne(MARKERS_OWNER_ID, this.model.uri, markers);

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

@@ -225,7 +225,7 @@ let BasePromptParser = class BasePromptParser extends ObservableDisposable {
         }
         if (tools !== undefined && mode !== ChatModeKind.Ask && mode !== ChatModeKind.Edit) {
             result.tools = tools;
-            result.mode = ChatModeKind.Agent;
+            result.mode = mode || ChatModeKind.Agent;
         }
         else if (mode !== undefined) {
             result.mode = mode;

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/promptHeader/headerBase.js

@@ -65,12 +65,12 @@ class HeaderBase extends Disposable {
             if (token instanceof SimpleToken) {
                 return;
             }
-            this.issues.push(( new PromptMetadataError(token.range, ( localize(5459, "Unexpected token '{0}'.", token.text)))));
+            this.issues.push(( new PromptMetadataError(token.range, ( localize(5592, "Unexpected token '{0}'.", token.text)))));
             return;
         }
         const recordName = token.nameToken.text;
         if (( this.recordNames.has(recordName))) {
-            this.issues.push(( new PromptMetadataWarning(token.range, ( localize(5460, "Duplicate property '{0}' will be ignored.", recordName)))));
+            this.issues.push(( new PromptMetadataWarning(token.range, ( localize(5593, "Duplicate property '{0}' will be ignored.", recordName)))));
             return;
         }
         this.recordNames.add(recordName);
@@ -84,10 +84,10 @@ class HeaderBase extends Disposable {
         if (this.handleToken(token)) {
             return;
         }
-        this.issues.push(( new PromptMetadataWarning(token.range, ( localize(5461, "Unknown property '{0}' will be ignored.", recordName)))));
+        this.issues.push(( new PromptMetadataWarning(token.range, ( localize(5594, "Unknown property '{0}' will be ignored.", recordName)))));
     }
     onError(error) {
-        this.issues.push(( new PromptMetadataError(this.token.range, ( localize(5462, "Failed to parse prompt header: {0}", error.message)))));
+        this.issues.push(( new PromptMetadataError(this.token.range, ( localize(5595, "Failed to parse prompt header: {0}", error.message)))));
     }
     get settled() {
         return this.stream.settled;

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/promptHeader/metadata/applyTo.js

@@ -40,7 +40,7 @@ class PromptApplyToMetadata extends PromptStringMetadata {
         }
         if (this.languageId !== INSTRUCTIONS_LANGUAGE_ID) {
             this.issues.push(( new PromptMetadataError(this.range, ( localize(
-                5463,
+                5596,
                 "The '{0}' header property is only valid in instruction files.",
                 this.recordName
             )))));
@@ -49,7 +49,7 @@ class PromptApplyToMetadata extends PromptStringMetadata {
         }
         const { cleanText } = this.valueToken;
         if (this.isValidGlob(cleanText) === false) {
-            this.issues.push(( new PromptMetadataWarning(this.valueToken.range, ( localize(5464, "Invalid glob pattern '{0}'.", cleanText)))));
+            this.issues.push(( new PromptMetadataWarning(this.valueToken.range, ( localize(5597, "Invalid glob pattern '{0}'.", cleanText)))));
             delete this.valueToken;
             return this.issues;
         }

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/promptHeader/metadata/base/string.d.ts

@@ -2,6 +2,7 @@ import { PromptMetadataRecord } from "./record.js";
 import { PromptMetadataDiagnostic } from "../../diagnostics.js";
 import { FrontMatterSequence } from "../../../../codecs/base/frontMatterCodec/tokens/frontMatterSequence.js";
 import { FrontMatterRecord, FrontMatterString } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/codecs/base/frontMatterCodec/tokens/index";
+import { Range } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range";
 /**
  * Base class for all metadata records with a `string` value.
  */
@@ -14,6 +15,7 @@ export declare abstract class PromptStringMetadata extends PromptMetadataRecord<
      * String value of a metadata record.
      */
     get value(): string | undefined;
+    get valueRange(): Range | undefined;
     constructor(expectedRecordName: string, recordToken: FrontMatterRecord, languageId: string);
     /**
      * Validate the metadata record has a 'string' value.

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/promptHeader/metadata/base/string.js

@@ -28,6 +28,9 @@ class PromptStringMetadata extends PromptMetadataRecord {
     get value() {
         return this.valueToken?.cleanText;
     }
+    get valueRange() {
+        return this.valueToken?.range;
+    }
     constructor(expectedRecordName, recordToken, languageId) {
         super(expectedRecordName, recordToken, languageId);
     }
@@ -40,8 +43,8 @@ class PromptStringMetadata extends PromptMetadataRecord {
             return this.issues;
         }
         this.issues.push(( new PromptMetadataError(valueToken.range, ( localize(
-            5466,
-            "The '{0}' metadata must be a '{1}', got '{2}'.",
+            5598,
+            "The property '{0}' must be of type '{1}', got '{2}'.",
             this.recordName,
             'string',
             (valueToken.valueTypeName.toString())

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/promptHeader/metadata/mode.d.ts

@@ -1,10 +1,10 @@
-import { ChatModeKind } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants";
-import { PromptEnumMetadata } from "./base/enum.js";
+import { PromptStringMetadata } from "./base/string.js";
 import { FrontMatterRecord, FrontMatterToken } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/codecs/base/frontMatterCodec/tokens/index";
 /**
  * Prompt `mode` metadata record inside the prompt header.
+ * Now supports both built-in modes (ask, edit, agent) and custom mode IDs.
  */
-export declare class PromptModeMetadata extends PromptEnumMetadata<ChatModeKind> {
+export declare class PromptModeMetadata extends PromptStringMetadata {
     constructor(recordToken: FrontMatterRecord, languageId: string);
     /**
      * Check if a provided front matter token is a metadata record

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/promptHeader/metadata/mode.js

@@ -1,6 +1,5 @@
 
-import { ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { PromptEnumMetadata } from './base/enum.js';
+import { PromptStringMetadata } from './base/string.js';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import '../../../codecs/base/simpleCodec/tokens/at.js';
 import '../../../codecs/base/simpleCodec/tokens/tab.js';
@@ -23,9 +22,9 @@ import '../../../codecs/base/simpleCodec/tokens/angleBrackets.js';
 import { FrontMatterRecord } from '../../../codecs/base/frontMatterCodec/tokens/frontMatterRecord.js';
 
 const RECORD_NAME = 'mode';
-class PromptModeMetadata extends PromptEnumMetadata {
+class PromptModeMetadata extends PromptStringMetadata {
     constructor(recordToken, languageId) {
-        super([ChatModeKind.Ask, ChatModeKind.Edit, ChatModeKind.Agent], RECORD_NAME, recordToken, languageId);
+        super(RECORD_NAME, recordToken, languageId);
     }
     static isModeRecord(token) {
         if ((token instanceof FrontMatterRecord) === false) {

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/promptHeader/metadata/tools.js

@@ -44,7 +44,7 @@ class PromptToolsMetadata extends PromptMetadataRecord {
         const { valueToken } = this.recordToken;
         if ((valueToken instanceof FrontMatterArray) === false) {
             this.issues.push(( new PromptMetadataError(valueToken.range, ( localize(
-                5467,
+                5599,
                 "Must be an array of tool names, got '{0}'.",
                 (valueToken.valueTypeName.toString())
             )))));
@@ -66,7 +66,7 @@ class PromptToolsMetadata extends PromptMetadataRecord {
         if ((valueToken instanceof FrontMatterString) === false &&
             (valueToken instanceof FrontMatterSequence) === false) {
             issues.push(( new PromptMetadataWarning(valueToken.range, ( localize(
-                5468,
+                5600,
                 "Unexpected tool name '{0}', expected a string literal.",
                 valueToken.text
             )))));
@@ -74,11 +74,11 @@ class PromptToolsMetadata extends PromptMetadataRecord {
         }
         const cleanToolName = valueToken.cleanText.trim();
         if (cleanToolName.length === 0) {
-            issues.push(( new PromptMetadataWarning(valueToken.range, ( localize(5469, "Tool name cannot be empty.")))));
+            issues.push(( new PromptMetadataWarning(valueToken.range, ( localize(5601, "Tool name cannot be empty.")))));
             return issues;
         }
         if (( validToolNames.has(cleanToolName))) {
-            issues.push(( new PromptMetadataWarning(valueToken.range, ( localize(5470, "Duplicate tool name '{0}'.", cleanToolName)))));
+            issues.push(( new PromptMetadataWarning(valueToken.range, ( localize(5602, "Duplicate tool name '{0}'.", cleanToolName)))));
             return issues;
         }
         validToolNames.set(cleanToolName, valueToken.range);

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/promptHeader/promptHeader.d.ts

@@ -32,11 +32,6 @@ export type TPromptMetadata = Partial<TDehydrated<IPromptMetadata>> & {
  */
 export declare class PromptHeader extends HeaderBase<IPromptMetadata> {
     protected handleToken(token: FrontMatterRecord): boolean;
-    /**
-     * Check if value of `tools` and `mode` metadata
-     * are compatible with each other.
-     */
-    private get toolsAndModeCompatible();
     /**
      * Validate that the `tools` and `mode` metadata are compatible
      * with each other. If not, add a warning diagnostic.

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

@@ -2,8 +2,6 @@
 import { ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { PromptMetadataWarning } from './diagnostics.js';
-import { assert } from '@codingame/monaco-vscode-api/vscode/vs/base/common/assert';
-import { assertDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { HeaderBase } from './headerBase.js';
 import { PromptModelMetadata } from './metadata/model.js';
 import { PromptToolsMetadata } from './metadata/tools.js';
@@ -33,29 +31,16 @@ class PromptHeader extends HeaderBase {
         }
         return false;
     }
-    get toolsAndModeCompatible() {
-        const { tools, mode } = this.meta;
-        if (tools === undefined) {
-            return true;
-        }
-        if (mode?.value === undefined) {
-            return true;
-        }
-        return (mode.value === ChatModeKind.Agent);
-    }
     validateToolsAndModeCompatibility() {
-        if (this.toolsAndModeCompatible === true) {
-            return;
-        }
         const { tools, mode } = this.meta;
-        assertDefined(tools, 'Tools metadata must have been present.');
-        assertDefined(mode, 'Mode metadata must have been present.');
-        assert(mode.value !== ChatModeKind.Agent, 'Mode metadata must not be agent mode.');
-        this.issues.push(( new PromptMetadataWarning(tools.range, ( localize(
-            5471,
-            "Tools can only be used when in 'agent' mode, but the mode is set to '{0}'. The tools will be ignored.",
-            mode.value
-        )))));
+        const modeValue = mode?.value;
+        if (tools !== undefined && (modeValue === ChatModeKind.Edit || modeValue === ChatModeKind.Ask)) {
+            this.issues.push(( new PromptMetadataWarning(tools.range, ( localize(
+                5603,
+                "Tools can not be used in '{0}' mode and will be ignored.",
+                modeValue
+            )))));
+        }
     }
 }
 

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

@@ -15,29 +15,29 @@ class TopError {
         const { originalError, parentUri, errorSubject: subject, errorsCount } = this;
         assert(errorsCount >= 1, `Error count must be at least 1, got '${errorsCount}'.`);
         const moreIssuesLabel = (errorsCount > 1)
-            ? ( localize(5472, "\n(+{0} more issues)", errorsCount - 1))
+            ? ( localize(5604, "\n(+{0} more issues)", errorsCount - 1))
             : '';
         if (subject === 'root') {
             if (originalError instanceof OpenFailed) {
-                return localize(5473, "Cannot open '{0}'.{1}", originalError.uri.path, moreIssuesLabel);
+                return localize(5605, "Cannot open '{0}'.{1}", originalError.uri.path, moreIssuesLabel);
             }
             if (originalError instanceof FailedToResolveContentsStream) {
-                return localize(5474, "Cannot read '{0}'.{1}", originalError.uri.path, moreIssuesLabel);
+                return localize(5606, "Cannot read '{0}'.{1}", originalError.uri.path, moreIssuesLabel);
             }
             if (originalError instanceof RecursiveReference) {
-                return localize(5475, "Recursion to itself.");
+                return localize(5607, "Recursion to itself.");
             }
             return originalError.message + moreIssuesLabel;
         }
         assertDefined(parentUri, 'Parent URI must be defined for error of non-root link.');
         const errorMessageStart = (subject === 'child')
-            ? ( localize(5476, "Contains"))
-            : ( localize(5477, "Indirectly referenced prompt '{0}' contains", parentUri.path));
+            ? ( localize(5608, "Contains"))
+            : ( localize(5609, "Indirectly referenced prompt '{0}' contains", parentUri.path));
         const linkIssueName = (originalError instanceof RecursiveReference)
-            ? ( localize(5478, "recursive"))
-            : ( localize(5479, "broken"));
+            ? ( localize(5610, "recursive"))
+            : ( localize(5611, "broken"));
         return localize(
-            5480,
+            5612,
             "{0} a {1} link to '{2}' that will be ignored.{3}",
             errorMessageStart,
             linkIssueName,