prompt files: allow names to contain spaces (#278395)

allow names to contain spaces

Author: aeschli

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

@@ -16,7 +16,7 @@ import { ChatModeKind } from '../../constants.js';
 import { ILanguageModelChatMetadata, ILanguageModelsService } from '../../languageModels.js';
 import { ILanguageModelToolsService } from '../../languageModelToolsService.js';
 import { getPromptsTypeForLanguageId, PromptsType } from '../promptTypes.js';
-import { GithubPromptHeaderAttributes, IArrayValue, IHeaderAttribute, IStringValue, ParsedPromptFile, PROMPT_NAME_REGEXP, PromptHeaderAttributes, Target } from '../promptFileParser.js';
+import { GithubPromptHeaderAttributes, IArrayValue, IHeaderAttribute, IStringValue, ParsedPromptFile, PromptHeaderAttributes, Target } from '../promptFileParser.js';
 import { Disposable, DisposableStore, toDisposable } from '../../../../../../base/common/lifecycle.js';
 import { Delayer } from '../../../../../../base/common/async.js';
 import { ResourceMap } from '../../../../../../base/common/map.js';
@@ -197,9 +197,6 @@ export class PromptValidator {
 			report(toMarker(localize('promptValidator.nameShouldNotBeEmpty', "The 'name' attribute must not be empty."), nameAttribute.value.range, MarkerSeverity.Error));
 			return;
 		}
-		if (!PROMPT_NAME_REGEXP.test(nameAttribute.value.value)) {
-			report(toMarker(localize('promptValidator.nameInvalidCharacters', "The 'name' attribute can only consist of letters, digits, underscores, hyphens, and periods."), nameAttribute.value.range, MarkerSeverity.Error));
-		}
 	}
 
 	private validateDescription(attributes: IHeaderAttribute[], report: (markers: IMarkerData) => void): void {

src/vs/workbench/contrib/chat/common/promptSyntax/promptFileParser.ts

@@ -10,8 +10,6 @@ import { URI } from '../../../../../base/common/uri.js';
 import { parse, YamlNode, YamlParseError, Position as YamlPosition } from '../../../../../base/common/yaml.js';
 import { Range } from '../../../../../editor/common/core/range.js';
 
-export const PROMPT_NAME_REGEXP = /^[\p{L}\d_\-\.]+$/u;
-
 export class PromptFileParser {
 	constructor() {
 	}
@@ -162,11 +160,7 @@ export class PromptHeader {
 	}
 
 	public get name(): string | undefined {
-		const name = this.getStringAttribute(PromptHeaderAttributes.name);
-		if (name && PROMPT_NAME_REGEXP.test(name)) {
-			return name;
-		}
-		return undefined;
+		return this.getStringAttribute(PromptHeaderAttributes.name);
 	}
 
 	public get description(): string | undefined {

src/vs/workbench/contrib/chat/common/promptSyntax/service/promptsServiceImpl.ts

@@ -246,8 +246,10 @@ export class PromptsService extends Disposable implements IPromptsService {
 	}
 
 	private asChatPromptSlashCommand(parsedPromptFile: ParsedPromptFile, promptPath: IPromptPath): IChatPromptSlashCommand {
+		let name = parsedPromptFile?.header?.name ?? promptPath.name ?? getCleanPromptName(promptPath.uri);
+		name = name.replace(/[^\p{L}\d_\-\.]+/gu, '-'); // replace spaces with dashes
 		return {
-			name: parsedPromptFile?.header?.name ?? promptPath.name ?? getCleanPromptName(promptPath.uri),
+			name: name,
 			description: parsedPromptFile?.header?.description ?? promptPath.description,
 			argumentHint: parsedPromptFile?.header?.argumentHint,
 			parsedPromptFile,

src/vs/workbench/contrib/chat/test/browser/promptSytntax/promptValidator.test.ts

@@ -472,27 +472,11 @@ suite('PromptValidator', () => {
 				assert.strictEqual(markers[0].message, `The 'name' attribute must be a string.`);
 			}
 
-			// Invalid characters in name
-			{
-				const content = [
-					'---',
-					'name: "My@Agent!"',
-					'description: "Test agent"',
-					'target: vscode',
-					'---',
-					'Body',
-				].join('\n');
-				const markers = await validate(content, PromptsType.agent);
-				assert.strictEqual(markers.length, 1);
-				assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
-				assert.strictEqual(markers[0].message, `The 'name' attribute can only consist of letters, digits, underscores, hyphens, and periods.`);
-			}
-
 			// Valid name with allowed characters
 			{
 				const content = [
 					'---',
-					'name: "My_Agent-2.0"',
+					'name: "My_Agent-2.0 with spaces"',
 					'description: "Test agent"',
 					'target: vscode',
 					'---',
@@ -632,22 +616,6 @@ suite('PromptValidator', () => {
 				assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
 				assert.strictEqual(markers[0].message, `The 'name' attribute must not be empty.`);
 			}
-
-			// Invalid characters in name
-			{
-				const content = [
-					'---',
-					'name: "My Instructions#"',
-					'description: "Test instructions"',
-					'applyTo: "**/*.ts"',
-					'---',
-					'Body',
-				].join('\n');
-				const markers = await validate(content, PromptsType.instructions);
-				assert.strictEqual(markers.length, 1);
-				assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
-				assert.strictEqual(markers[0].message, `The 'name' attribute can only consist of letters, digits, underscores, hyphens, and periods.`);
-			}
 		});
 	});
 
@@ -786,21 +754,6 @@ suite('PromptValidator', () => {
 				assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
 				assert.strictEqual(markers[0].message, `The 'name' attribute must not be empty.`);
 			}
-
-			// Invalid characters in name
-			{
-				const content = [
-					'---',
-					'name: "My Prompt!"',
-					'description: "Test prompt"',
-					'---',
-					'Body',
-				].join('\n');
-				const markers = await validate(content, PromptsType.prompt);
-				assert.strictEqual(markers.length, 1);
-				assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
-				assert.strictEqual(markers[0].message, `The 'name' attribute can only consist of letters, digits, underscores, hyphens, and periods.`);
-			}
 		});
 	});