Replace infer with disable-model-invocation and user-invokable

Author: aeschli

src/vs/workbench/contrib/chat/common/chatModes.ts

@@ -20,10 +20,10 @@ import { IChatAgentService } from './participants/chatAgents.js';
 import { ChatContextKeys } from './actions/chatContextKeys.js';
 import { ChatConfiguration, ChatModeKind } from './constants.js';
 import { IHandOff } from './promptSyntax/promptFileParser.js';
-import { ExtensionAgentSourceType, IAgentSource, ICustomAgent, InferValue, IPromptsService, PromptsStorage } from './promptSyntax/service/promptsService.js';
+import { ExtensionAgentSourceType, IAgentSource, ICustomAgent, ICustomAgentVisibility, IPromptsService, isCustomAgentVisibility, PromptsStorage } from './promptSyntax/service/promptsService.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { Codicon } from '../../../../base/common/codicons.js';
-import { isBoolean, isString } from '../../../../base/common/types.js';
+import { isString } from '../../../../base/common/types.js';
 
 export const IChatModeService = createDecorator<IChatModeService>('chatModeService');
 export interface IChatModeService {
@@ -122,7 +122,7 @@ export class ChatModeService extends Disposable implements IChatModeService {
 						agentInstructions: cachedMode.modeInstructions ?? { content: cachedMode.body ?? '', toolReferences: [] },
 						handOffs: cachedMode.handOffs,
 						target: cachedMode.target,
-						infer: isBoolean(cachedMode.infer) ? (cachedMode.infer ? 'all' : 'user') : cachedMode.infer,
+						visibility: cachedMode.visibility ?? { userInvokable: true, agentInvokable: cachedMode.infer !== false },
 						agents: cachedMode.agents,
 						source: reviveChatModeSource(cachedMode.source) ?? { storage: PromptsStorage.local }
 					};
@@ -154,8 +154,7 @@ export class ChatModeService extends Disposable implements IChatModeService {
 			const seenUris = new Set<string>();
 
 			for (const customMode of customModes) {
-				if (customMode.infer === 'agent' || customMode.infer === 'hidden') {
-					// Skip modes that are only for subagent use or hidden
+				if (!customMode.visibility.userInvokable) {
 					continue;
 				}
 
@@ -250,8 +249,9 @@ export interface IChatModeData {
 	readonly uri?: URI;
 	readonly source?: IChatModeSourceData;
 	readonly target?: string;
-	readonly infer?: InferValue | boolean;
+	readonly visibility?: ICustomAgentVisibility;
 	readonly agents?: readonly string[];
+	readonly infer?: boolean; // deprecated, only available in old cached data
 }
 
 export interface IChatMode {
@@ -270,7 +270,7 @@ export interface IChatMode {
 	readonly uri?: IObservable<URI>;
 	readonly source?: IAgentSource;
 	readonly target?: IObservable<string | undefined>;
-	readonly infer?: IObservable<InferValue | undefined>;
+	readonly visibility?: IObservable<ICustomAgentVisibility | undefined>;
 	readonly agents?: IObservable<readonly string[] | undefined>;
 }
 
@@ -303,7 +303,7 @@ function isCachedChatModeData(data: unknown): data is IChatModeData {
 		(mode.uri === undefined || (typeof mode.uri === 'object' && mode.uri !== null)) &&
 		(mode.source === undefined || isChatModeSourceData(mode.source)) &&
 		(mode.target === undefined || typeof mode.target === 'string') &&
-		(mode.infer === undefined || mode.infer === 'all' || mode.infer === 'user' || mode.infer === 'agent' || mode.infer === 'hidden' || typeof mode.infer === 'boolean') &&
+		(mode.visibility === undefined || isCustomAgentVisibility(mode.visibility)) &&
 		(mode.agents === undefined || Array.isArray(mode.agents));
 }
 
@@ -317,7 +317,7 @@ export class CustomChatMode implements IChatMode {
 	private readonly _argumentHintObservable: ISettableObservable<string | undefined>;
 	private readonly _handoffsObservable: ISettableObservable<readonly IHandOff[] | undefined>;
 	private readonly _targetObservable: ISettableObservable<string | undefined>;
-	private readonly _inferObservable: ISettableObservable<InferValue | undefined>;
+	private readonly _visibilityObservable: ISettableObservable<ICustomAgentVisibility | undefined>;
 	private readonly _agentsObservable: ISettableObservable<readonly string[] | undefined>;
 	private _source: IAgentSource;
 
@@ -375,8 +375,8 @@ export class CustomChatMode implements IChatMode {
 		return this._targetObservable;
 	}
 
-	get infer(): IObservable<InferValue | undefined> {
-		return this._inferObservable;
+	get visibility(): IObservable<ICustomAgentVisibility | undefined> {
+		return this._visibilityObservable;
 	}
 
 	get agents(): IObservable<readonly string[] | undefined> {
@@ -396,7 +396,7 @@ export class CustomChatMode implements IChatMode {
 		this._argumentHintObservable = observableValue('argumentHint', customChatMode.argumentHint);
 		this._handoffsObservable = observableValue('handOffs', customChatMode.handOffs);
 		this._targetObservable = observableValue('target', customChatMode.target);
-		this._inferObservable = observableValue('infer', customChatMode.infer);
+		this._visibilityObservable = observableValue('visibility', customChatMode.visibility);
 		this._agentsObservable = observableValue('agents', customChatMode.agents);
 		this._modeInstructions = observableValue('_modeInstructions', customChatMode.agentInstructions);
 		this._uriObservable = observableValue('uri', customChatMode.uri);
@@ -415,7 +415,7 @@ export class CustomChatMode implements IChatMode {
 			this._argumentHintObservable.set(newData.argumentHint, tx);
 			this._handoffsObservable.set(newData.handOffs, tx);
 			this._targetObservable.set(newData.target, tx);
-			this._inferObservable.set(newData.infer, tx);
+			this._visibilityObservable.set(newData.visibility, tx);
 			this._agentsObservable.set(newData.agents, tx);
 			this._modeInstructions.set(newData.agentInstructions, tx);
 			this._uriObservable.set(newData.uri, tx);
@@ -437,7 +437,7 @@ export class CustomChatMode implements IChatMode {
 			handOffs: this.handOffs.get(),
 			source: serializeChatModeSource(this._source),
 			target: this.target.get(),
-			infer: this.infer.get(),
+			visibility: this.visibility.get(),
 			agents: this.agents.get()
 		};
 	}

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

@@ -350,7 +350,7 @@ export class ComputeAutomaticInstructions {
 		if (runSubagentTool && this._configurationService.getValue(ChatConfiguration.SubagentToolCustomAgents)) {
 			const canUseAgent = (() => {
 				if (!this._enabledSubagents || this._enabledSubagents.includes('*')) {
-					return (agent: ICustomAgent) => (agent.infer === 'all' || agent.infer === 'agent');
+					return (agent: ICustomAgent) => agent.visibility.agentInvokable;
 				} else {
 					const subagents = this._enabledSubagents;
 					return (agent: ICustomAgent) => subagents.includes(agent.name);

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

@@ -248,14 +248,24 @@ export class PromptHeaderAutocompletion implements CompletionItemProvider {
 				break;
 			case PromptHeaderAttributes.infer:
 				if (promptType === PromptsType.agent) {
-					return ['all', 'user', 'agent', 'hidden', 'true', 'false'];
+					return ['true', 'false'];
 				}
 				break;
 			case PromptHeaderAttributes.agents:
 				if (promptType === PromptsType.agent) {
 					return ['["*"]'];
 				}
 				break;
+			case PromptHeaderAttributes.userInvokable:
+				if (promptType === PromptsType.agent) {
+					return ['true', 'false'];
+				}
+				break;
+			case PromptHeaderAttributes.disableModelInvocation:
+				if (promptType === PromptsType.agent) {
+					return ['true', 'false'];
+				}
+				break;
 		}
 		return [];
 	}

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

@@ -83,7 +83,7 @@ export class PromptHoverProvider implements HoverProvider {
 						case PromptHeaderAttributes.handOffs:
 							return this.getHandsOffHover(attribute, position, promptType === PromptsType.agent && isGithubTarget(promptType, header.target));
 						case PromptHeaderAttributes.infer:
-							return this.createHover(description + '\n\n' + localize('promptHeader.attribute.infer.hover', '- `all`, `true`: Available in the agent picker and can be used as a subagent.\n- `user`, `false`: Only available in the agent picker.\n- `agent`: Only available as a subagent (not shown in picker).\n- `hidden`: Not available in the picker nor as a subagent.'), attribute.range);
+							return this.createHover(description + '\n\n' + localize('promptHeader.attribute.infer.hover', 'Deprecated: Use `user-invokable` and `disable-model-invocation` instead.'), attribute.range);
 						default:
 							return this.createHover(description, attribute.range);
 					}

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

@@ -183,6 +183,8 @@ export class PromptValidator {
 			case PromptsType.agent: {
 				this.validateTarget(attributes, report);
 				this.validateInfer(attributes, report);
+				this.validateUserInvokable(attributes, report);
+				this.validateDisableModelInvocation(attributes, report);
 				this.validateTools(attributes, ChatModeKind.Agent, header.target, report);
 				if (!isGitHubTarget) {
 					this.validateModel(attributes, ChatModeKind.Agent, report);
@@ -536,19 +538,7 @@ export class PromptValidator {
 		if (!attribute) {
 			return;
 		}
-		// Accept boolean for backwards compatibility (true -> 'all', false -> 'user')
-		if (attribute.value.type === 'boolean') {
-			return;
-		}
-		if (attribute.value.type !== 'string') {
-			report(toMarker(localize('promptValidator.inferMustBeStringOrBoolean', "The 'infer' attribute must be 'all', 'user', 'agent', 'hidden', or a boolean."), attribute.value.range, MarkerSeverity.Error));
-			return;
-		}
-		const validInferValues = ['all', 'user', 'agent', 'hidden'];
-		if (!validInferValues.includes(attribute.value.value)) {
-			report(toMarker(localize('promptValidator.invalidInferValue', "The 'infer' attribute must be one of: {0}.", validInferValues.join(', ')), attribute.value.range, MarkerSeverity.Error));
-			return;
-		}
+		report(toMarker(localize('promptValidator.inferDeprecated', "The 'infer' attribute is deprecated in favour of 'user-invokable' and 'disable-model-invocation'."), attribute.value.range, MarkerSeverity.Error));
 	}
 
 	private validateTarget(attributes: IHeaderAttribute[], report: (markers: IMarkerData) => void): undefined {
@@ -571,6 +561,28 @@ export class PromptValidator {
 		}
 	}
 
+	private validateUserInvokable(attributes: IHeaderAttribute[], report: (markers: IMarkerData) => void): undefined {
+		const attribute = attributes.find(attr => attr.key === PromptHeaderAttributes.userInvokable);
+		if (!attribute) {
+			return;
+		}
+		if (attribute.value.type !== 'boolean') {
+			report(toMarker(localize('promptValidator.userInvokableMustBeBoolean', "The 'user-invokable' attribute must be a boolean."), attribute.value.range, MarkerSeverity.Error));
+			return;
+		}
+	}
+
+	private validateDisableModelInvocation(attributes: IHeaderAttribute[], report: (markers: IMarkerData) => void): undefined {
+		const attribute = attributes.find(attr => attr.key === PromptHeaderAttributes.disableModelInvocation);
+		if (!attribute) {
+			return;
+		}
+		if (attribute.value.type !== 'boolean') {
+			report(toMarker(localize('promptValidator.disableModelInvocationMustBeBoolean', "The 'disable-model-invocation' attribute must be a boolean."), attribute.value.range, MarkerSeverity.Error));
+			return;
+		}
+	}
+
 	private async validateAgentsAttribute(attributes: IHeaderAttribute[], header: PromptHeader, report: (markers: IMarkerData) => void): Promise<undefined> {
 		const attribute = attributes.find(attr => attr.key === PromptHeaderAttributes.agents);
 		if (!attribute) {
@@ -612,7 +624,7 @@ export class PromptValidator {
 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, PromptHeaderAttributes.infer, PromptHeaderAttributes.agents],
+	[PromptsType.agent]: [PromptHeaderAttributes.name, PromptHeaderAttributes.description, PromptHeaderAttributes.model, PromptHeaderAttributes.tools, PromptHeaderAttributes.advancedOptions, PromptHeaderAttributes.handOffs, PromptHeaderAttributes.argumentHint, PromptHeaderAttributes.target, PromptHeaderAttributes.infer, PromptHeaderAttributes.agents, PromptHeaderAttributes.userInvokable, PromptHeaderAttributes.disableModelInvocation],
 	[PromptsType.skill]: [PromptHeaderAttributes.name, PromptHeaderAttributes.description, PromptHeaderAttributes.license, PromptHeaderAttributes.compatibility, PromptHeaderAttributes.metadata],
 };
 const githubCopilotAgentAttributeNames = [PromptHeaderAttributes.name, PromptHeaderAttributes.description, PromptHeaderAttributes.tools, PromptHeaderAttributes.target, GithubPromptHeaderAttributes.mcpServers, PromptHeaderAttributes.infer];
@@ -631,7 +643,7 @@ export function getValidAttributeNames(promptType: PromptsType, includeNonRecomm
 }
 
 export function isNonRecommendedAttribute(attributeName: string): boolean {
-	return attributeName === PromptHeaderAttributes.advancedOptions || attributeName === PromptHeaderAttributes.excludeAgent || attributeName === PromptHeaderAttributes.mode;
+	return attributeName === PromptHeaderAttributes.advancedOptions || attributeName === PromptHeaderAttributes.excludeAgent || attributeName === PromptHeaderAttributes.mode || attributeName === PromptHeaderAttributes.infer;
 }
 
 export function getAttributeDescription(attributeName: string, promptType: PromptsType): string | undefined {
@@ -674,6 +686,10 @@ export function getAttributeDescription(attributeName: string, promptType: Promp
 					return localize('promptHeader.agent.infer', 'Controls visibility of the agent.');
 				case PromptHeaderAttributes.agents:
 					return localize('promptHeader.agent.agents', 'One or more agents that this agent can use as subagents. Use \'*\' to specify all available agents.');
+				case PromptHeaderAttributes.userInvokable:
+					return localize('promptHeader.agent.userInvokable', 'Whether the agent can be selected and invoked by users in the UI.');
+				case PromptHeaderAttributes.disableModelInvocation:
+					return localize('promptHeader.agent.disableModelInvocation', 'If true, prevents the agent from being invoked as a subagent.');
 			}
 			break;
 		case PromptsType.prompt:

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

@@ -9,7 +9,6 @@ import { splitLinesIncludeSeparators } from '../../../../../base/common/strings.
 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';
-import { InferValue, parseInferValue } from './service/promptsService.js';
 
 export class PromptFileParser {
 	constructor() {
@@ -80,6 +79,8 @@ export namespace PromptHeaderAttributes {
 	export const compatibility = 'compatibility';
 	export const metadata = 'metadata';
 	export const agents = 'agents';
+	export const userInvokable = 'user-invokable';
+	export const disableModelInvocation = 'disable-model-invocation';
 }
 
 export namespace GithubPromptHeaderAttributes {
@@ -193,13 +194,10 @@ export class PromptHeader {
 		return this.getStringAttribute(PromptHeaderAttributes.target);
 	}
 
-	public get infer(): InferValue | undefined {
+	public get infer(): boolean | undefined {
 		const attribute = this._parsedHeader.attributes.find(attr => attr.key === PromptHeaderAttributes.infer);
 		if (attribute?.value.type === 'boolean') {
-			return attribute.value.value ? 'all' : 'user';
-		}
-		if (attribute?.value.type === 'string' && attribute.value.value) {
-			return parseInferValue(attribute.value.value);
+			return attribute.value.value;
 		}
 		return undefined;
 	}
@@ -321,6 +319,22 @@ export class PromptHeader {
 	public get agents(): string[] | undefined {
 		return this.getStringArrayAttribute(PromptHeaderAttributes.agents);
 	}
+
+	public get userInvokable(): boolean | undefined {
+		return this.getBooleanAttribute(PromptHeaderAttributes.userInvokable);
+	}
+
+	public get disableModelInvocation(): boolean | undefined {
+		return this.getBooleanAttribute(PromptHeaderAttributes.disableModelInvocation);
+	}
+
+	private getBooleanAttribute(key: string): boolean | undefined {
+		const attribute = this._parsedHeader.attributes.find(attr => attr.key === key);
+		if (attribute?.value.type === 'boolean') {
+			return attribute.value.value;
+		}
+		return undefined;
+	}
 }
 
 export interface IHandOff {

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

@@ -123,23 +123,17 @@ export type IAgentSource = {
  * - 'agent': only usable as subagent by the subagent tool
  * - 'hidden': neither in picker nor usable as subagent
  */
-export type InferValue = 'all' | 'user' | 'agent' | 'hidden';
+export type ICustomAgentVisibility = {
+	readonly userInvokable: boolean;
+	readonly agentInvokable: boolean;
+};
 
-/**
- * Parses an infer value from the raw header value.
- * Boolean true maps to 'all', false maps to 'user'.
- */
-export function parseInferValue(value: boolean | string | undefined): InferValue | undefined {
-	if (value === undefined) {
-		return undefined;
-	}
-	if (typeof value === 'boolean') {
-		return value ? 'all' : 'user';
-	}
-	if (value === 'all' || value === 'user' || value === 'agent' || value === 'hidden') {
-		return value;
+export function isCustomAgentVisibility(obj: unknown): obj is ICustomAgentVisibility {
+	if (typeof obj !== 'object' || obj === null) {
+		return false;
 	}
-	return undefined;
+	const v = obj as { userInvokable?: unknown; agentInvokable?: unknown };
+	return typeof v.userInvokable === 'boolean' && typeof v.agentInvokable === 'boolean';
 }
 
 export interface ICustomAgent {
@@ -179,13 +173,9 @@ export interface ICustomAgent {
 	readonly target?: string;
 
 	/**
-	 * Infer metadata controlling agent visibility.
-	 * - 'all': available as custom agent in picker AND can be used as subagent
-	 * - 'user': only available in the custom agent picker
-	 * - 'agent': only usable as subagent by the subagent tool
-	 * - 'hidden': neither in picker nor usable as subagent
+	 * What visibility the agent has (user invokable, subagent invokable).
 	 */
-	readonly infer?: InferValue;
+	readonly visibility: ICustomAgentVisibility;
 
 	/**
 	 * Contents of the custom agent file body and other agent instructions.