add ICustomizationHarnessService.getCustomAgent

extensions/copilot/src/extension/chatSessions/copilotcli/node/copilotCli.ts

@@ -278,6 +278,8 @@ export interface CLIAgentInfo {
 	readonly agent: Readonly<SweCustomAgent>;
 	/** File URI for prompt-file agents, synthetic `copilotcli:` URI for SDK-only agents. */
 	readonly sourceUri: URI;
+	readonly extensionId?: string;
+	readonly pluginUri?: URI;
 }
 
 export interface ICopilotCLIAgents {

extensions/copilot/src/extension/chatSessions/copilotcli/vscode-node/copilotCLICustomizationProvider.ts

@@ -189,6 +189,8 @@ export class CopilotCLICustomizationProvider extends Disposable implements vscod
 			uri: s.uri,
 			type: vscode.ChatSessionCustomizationType.Skill,
 			name: s.name,
+			extensionId: s.extensionId,
+			pluginUri: s.pluginUri,
 		}));
 	}
 

src/vs/sessions/contrib/remoteAgentHost/browser/remoteAgentHostCustomizationHarness.ts

@@ -90,6 +90,8 @@ export class RemoteAgentCustomizationItemProvider extends Disposable implements
 				status: toStatusString(sc.status),
 				statusMessage: sc.statusMessage,
 				enabled: sc.enabled,
+				extensionId: undefined,
+				pluginUri: undefined
 			}));
 		}
 
@@ -99,6 +101,8 @@ export class RemoteAgentCustomizationItemProvider extends Disposable implements
 			type: 'plugin',
 			name: ref.displayName,
 			description: ref.description,
+			extensionId: undefined,
+			pluginUri: undefined
 		}));
 	}
 }

src/vs/workbench/api/browser/mainThreadChatAgents2.ts

@@ -746,6 +746,8 @@ export class MainThreadChatAgents2 extends Disposable implements MainThreadChatA
 					groupKey: item.groupKey,
 					badge: item.badge,
 					badgeTooltip: item.badgeTooltip,
+					extensionId: undefined,
+					pluginUri: undefined
 				}));
 			},
 		};

src/vs/workbench/api/common/extHost.protocol.ts

@@ -1738,6 +1738,7 @@ export interface IChatSessionCustomizationItemDto {
 	readonly description?: string;
 	readonly groupKey?: string;
 	readonly badge?: string;
+
 	readonly badgeTooltip?: string;
 }
 export interface IChatParticipantMetadata {

src/vs/workbench/api/common/extHostChatAgents2.ts

@@ -830,8 +830,8 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 				description: item.description,
 				groupKey: item.groupKey,
 				badge: item.badge,
-				badgeTooltip: item.badgeTooltip,
-			}));
+				badgeTooltip: item.badgeTooltip
+			} satisfies IChatSessionCustomizationItemDto));
 		} catch (err) {
 			return undefined;
 		}

src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationItemSource.ts

@@ -156,6 +156,8 @@ export async function expandHookFileItems(
 							enabled: item.enabled,
 							groupKey: item.groupKey,
 							storage: item.storage,
+							extensionId: item.extensionId,
+							pluginUri: item.pluginUri
 						});
 					}
 				}
@@ -449,6 +451,8 @@ export class ProviderCustomizationItemSource implements IAICustomizationItemSour
 				enabled: !disabledPromptFiles.has(p.uri),
 				badge: uiTooltip ? uiIntegrationBadge : undefined,
 				badgeTooltip: uiTooltip,
+				extensionId: undefined,
+				pluginUri: undefined
 			};
 			appended.push(this.itemNormalizer.normalizeItem(builtinItem, promptType, uriUseCounts));
 		}
@@ -484,6 +488,8 @@ export class ProviderCustomizationItemSource implements IAICustomizationItemSour
 				name: getFriendlyName(basename(file.uri)),
 				groupKey: 'sync-local',
 				enabled: true,
+				extensionId: undefined,
+				pluginUri: undefined
 			}));
 
 		return this.itemNormalizer.normalizeItems(providerItems, promptType)

src/vs/workbench/contrib/chat/browser/aiCustomization/promptsServiceCustomizationItemProvider.ts

@@ -75,6 +75,8 @@ export class PromptsServiceCustomizationItemProvider implements ICustomizationIt
 					description: agent.description,
 					storage: agent.source.storage,
 					enabled: !disabledUris.has(agent.uri),
+					extensionId: agent.source.storage === PromptsStorage.extension ? agent.source.extensionId.value : undefined,
+					pluginUri: agent.source.storage === PromptsStorage.plugin ? agent.source.pluginUri : undefined
 				});
 				if (agent.source.storage === PromptsStorage.extension && !extensionInfoByUri.has(agent.uri)) {
 					extensionInfoByUri.set(agent.uri, { id: agent.source.extensionId });
@@ -104,6 +106,8 @@ export class PromptsServiceCustomizationItemProvider implements ICustomizationIt
 					enabled: true,
 					badge: uiTooltip ? localize('uiIntegrationBadge', "UI Integration") : undefined,
 					badgeTooltip: uiTooltip,
+					extensionId: skill.extension?.identifier.value,
+					pluginUri: skill.pluginUri
 				});
 			}
 			if (disabledUris.size > 0) {
@@ -121,6 +125,8 @@ export class PromptsServiceCustomizationItemProvider implements ICustomizationIt
 							enabled: false,
 							badge: uiTooltip ? localize('uiIntegrationBadge', "UI Integration") : undefined,
 							badgeTooltip: uiTooltip,
+							extensionId: file.extension?.identifier.value,
+							pluginUri: file.pluginUri
 						});
 					}
 				}
@@ -138,6 +144,8 @@ export class PromptsServiceCustomizationItemProvider implements ICustomizationIt
 					description: command.description,
 					storage: command.storage,
 					enabled: !disabledUris.has(command.uri),
+					extensionId: command.extension?.identifier.value,
+					pluginUri: command.pluginUri
 				});
 				if (command.extension) {
 					extensionInfoByUri.set(command.uri, { id: command.extension.identifier, displayName: command.extension.displayName });
@@ -166,6 +174,8 @@ export class PromptsServiceCustomizationItemProvider implements ICustomizationIt
 				name: f.name || getFriendlyName(basename(f.uri)),
 				storage: f.storage,
 				enabled: !disabledUris.has(f.uri),
+				extensionId: f.extension?.identifier.value,
+				pluginUri: f.pluginUri
 			});
 		}
 
@@ -193,6 +203,8 @@ export class PromptsServiceCustomizationItemProvider implements ICustomizationIt
 						storage: agent.source.storage,
 						groupKey: 'agents',
 						enabled: !disabledUris.has(agent.uri),
+						extensionId: agent.source.storage === PromptsStorage.extension ? agent.source.extensionId.value : undefined,
+						pluginUri: agent.source.storage === PromptsStorage.plugin ? agent.source.pluginUri : undefined
 					});
 				}
 			}
@@ -219,10 +231,12 @@ export class PromptsServiceCustomizationItemProvider implements ICustomizationIt
 				storage,
 				groupKey: 'agent-instructions',
 				enabled: !disabledUris.has(file.uri),
+				extensionId: undefined,
+				pluginUri: undefined
 			});
 		}
 
-		for (const { uri, pattern, name, description, storage } of instructionFiles) {
+		for (const { uri, pattern, name, description, storage, extension, pluginUri } of instructionFiles) {
 			if (agentInstructionUris.has(uri)) {
 				continue;
 			}
@@ -246,6 +260,8 @@ export class PromptsServiceCustomizationItemProvider implements ICustomizationIt
 					storage,
 					groupKey: 'context-instructions',
 					enabled: !disabledUris.has(uri),
+					extensionId: extension?.identifier.value,
+					pluginUri
 				});
 			} else {
 				items.push({
@@ -256,6 +272,8 @@ export class PromptsServiceCustomizationItemProvider implements ICustomizationIt
 					storage,
 					groupKey: 'on-demand-instructions',
 					enabled: !disabledUris.has(uri),
+					extensionId: extension?.identifier.value,
+					pluginUri
 				});
 			}
 		}

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

@@ -494,7 +494,7 @@ function serializeChatModeSource(source: IAgentSource | undefined): IChatModeSou
 		return undefined;
 	}
 	if (source.storage === PromptsStorage.extension) {
-		return { storage: PromptsStorage.extension, extensionId: source.extensionId.value, type: source.type };
+		return { storage: PromptsStorage.extension, extensionId: source.extensionId.value };
 	}
 	if (source.storage === PromptsStorage.plugin) {
 		return { storage: PromptsStorage.plugin, pluginUri: source.pluginUri };
@@ -507,14 +507,7 @@ function reviveChatModeSource(data: IChatModeSourceData | undefined): IAgentSour
 		return undefined;
 	}
 	if (data.storage === PromptsStorage.extension) {
-		// Migrate old ExtensionAgentSourceType values ('contribution'/'provider') to PromptFileSource values
-		let type: PromptFileSource.ExtensionContribution | PromptFileSource.ExtensionAPI;
-		if (data.type === 'provider' as string /* old type value */ || data.type === PromptFileSource.ExtensionAPI) {
-			type = PromptFileSource.ExtensionAPI;
-		} else {
-			type = PromptFileSource.ExtensionContribution;
-		}
-		return { storage: PromptsStorage.extension, extensionId: new ExtensionIdentifier(data.extensionId), type };
+		return { storage: PromptsStorage.extension, extensionId: new ExtensionIdentifier(data.extensionId) };
 	}
 	if (data.storage === PromptsStorage.plugin) {
 		return { storage: PromptsStorage.plugin, pluginUri: URI.revive(data.pluginUri) };

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

@@ -15,9 +15,11 @@ import { createDecorator } from '../../../../platform/instantiation/common/insta
 import { AICustomizationManagementSection, IStorageSourceFilter } from './aiCustomizationWorkspaceService.js';
 import { PromptsType } from './promptSyntax/promptTypes.js';
 import { AGENT_MD_FILENAME } from './promptSyntax/config/promptFileLocations.js';
-import { IChatPromptSlashCommand, IPromptsService, IResolvedChatPromptSlashCommand, matchesSessionType, PromptsStorage } from './promptSyntax/service/promptsService.js';
+import { IAgentSource, IChatPromptSlashCommand, ICustomAgent, IPromptsService, IResolvedChatPromptSlashCommand, matchesSessionType, PromptsStorage } from './promptSyntax/service/promptsService.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { SessionType } from './chatSessionsService.js';
+import { CustomAgent } from './promptSyntax/service/promptsServiceImpl.js';
+import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
 
 export const ICustomizationHarnessService = createDecorator<ICustomizationHarnessService>('customizationHarnessService');
 
@@ -146,6 +148,10 @@ export interface ICustomizationItem {
 	readonly storage?: PromptsStorage;
 	/** Display name of the contributing extension (e.g. "GitHub Copilot Chat"). */
 	readonly extensionLabel?: string;
+	/** The extension identifier that contributed this customization, if any. */
+	readonly extensionId: string | undefined;
+	/** The URI of the plugin that contributed this customization, if any. */
+	readonly pluginUri: URI | undefined;
 	/** Server-reported loading status for this customization. */
 	readonly status?: 'loading' | 'loaded' | 'degraded' | 'error';
 	/** Human-readable status detail (e.g. error message or warning). */
@@ -265,13 +271,25 @@ export interface ICustomizationHarnessService {
 	 */
 	readonly onDidChangeSlashCommands: Event<{ readonly sessionType: string }>;
 
+	/**
+	 * Fires when one of the provided custom agents changes.
+	 */
+	readonly onDidChangeCustomAgents: Event<{ readonly sessionType: string }>;
+
 	/**
 	 * Returns the prompt and skill slash commands for the given session type.
 	 * Provider-backed harnesses contribute their own items directly; the default
 	 * VS Code harness falls back to the core prompts service.
 	 */
 	getSlashCommands(sessionType: string, token: CancellationToken): Promise<readonly IChatPromptSlashCommand[]>;
 
+	/**
+	 * Returns the custom agents for the given session type.
+	 * Provider-backed harnesses select items via their own provider and resolve
+	 * details via the core prompts service.
+	 */
+	getCustomAgents(sessionType: string, token: CancellationToken): Promise<readonly ICustomAgent[]>;
+
 	/**
 	 * Resolves a slash command to its full metadata, including the parsed prompt file for prompt commands.
 	 * Provider-backed harnesses resolve their own items directly; the default VS Code harness falls back to the core prompts service.
@@ -481,7 +499,10 @@ export class CustomizationHarnessServiceBase implements ICustomizationHarnessSer
 	declare readonly _serviceBrand: undefined;
 	private readonly _onDidChangeSlashCommands = new Emitter<{ readonly sessionType: string }>();
 	readonly onDidChangeSlashCommands = this._onDidChangeSlashCommands.event;
+	private readonly _onDidChangeCustomAgents = new Emitter<{ readonly sessionType: string }>();
+	readonly onDidChangeCustomAgents = this._onDidChangeCustomAgents.event;
 	private readonly _providerListeners: IDisposable[] = [];
+	private _isDisposed = false;
 
 	private readonly _activeHarness: ISettableObservable<string>;
 	readonly activeHarness: IObservable<string>;
@@ -516,6 +537,9 @@ export class CustomizationHarnessServiceBase implements ICustomizationHarnessSer
 	}
 
 	private _refreshAvailableHarnesses(): void {
+		if (this._isDisposed) {
+			return;
+		}
 		this._availableHarnesses.set(this._getAllHarnesses(), undefined);
 		this._rebindProviderListeners();
 	}
@@ -529,25 +553,32 @@ export class CustomizationHarnessServiceBase implements ICustomizationHarnessSer
 			const provider = harness.itemProvider;
 			if (!provider) {
 				this._providerListeners.push(this.promptsService.onDidChangeSlashCommands(() => this._onDidChangeSlashCommands.fire({ sessionType: harness.id })));
+				this._providerListeners.push(this.promptsService.onDidChangeCustomAgents(() => this._onDidChangeCustomAgents.fire({ sessionType: harness.id })));
 			} else {
 				this._providerListeners.push(provider.onDidChange(() => this._onDidChangeSlashCommands.fire({ sessionType: harness.id })));
+				this._providerListeners.push(provider.onDidChange(() => this._onDidChangeCustomAgents.fire({ sessionType: harness.id })));
 			}
 		}
 	}
 
 	dispose(): void {
+		this._isDisposed = true;
 		for (const listener of this._providerListeners) {
 			listener.dispose();
 		}
 		this._providerListeners.length = 0;
 		this._onDidChangeSlashCommands.dispose();
+		this._onDidChangeCustomAgents.dispose();
 	}
 
 	registerExternalHarness(descriptor: IHarnessDescriptor): IDisposable {
 		this._externalHarnesses.push(descriptor);
 		this._refreshAvailableHarnesses();
 		return {
 			dispose: () => {
+				if (this._isDisposed) {
+					return;
+				}
 				const idx = this._externalHarnesses.indexOf(descriptor);
 				if (idx >= 0) {
 					this._externalHarnesses.splice(idx, 1);
@@ -624,6 +655,47 @@ export class CustomizationHarnessServiceBase implements ICustomizationHarnessSer
 		return result;
 	}
 
+	async getCustomAgents(sessionType: string, token: CancellationToken): Promise<readonly ICustomAgent[]> {
+		const harness = this.findHarnessById(sessionType);
+		if (!harness || !harness.itemProvider) {
+			const allAgents = await this.promptsService.getCustomAgents(token);
+			return allAgents.filter(agent => matchesSessionType(agent.sessionTypes, sessionType));
+		}
+
+		const items = await harness.itemProvider.provideChatSessionCustomizations(token);
+		if (!items) {
+			return [];
+		}
+
+		const getSource = (item: ICustomizationItem): IAgentSource => {
+			if (item.storage === PromptsStorage.extension && item.extensionId) {
+				return { storage: PromptsStorage.extension, extensionId: new ExtensionIdentifier(item.extensionId) };
+			} else if (item.storage === PromptsStorage.plugin && item.pluginUri) {
+				return { storage: PromptsStorage.plugin, pluginUri: item.pluginUri };
+			} else if (item.storage === PromptsStorage.user) {
+				return { storage: PromptsStorage.user };
+			}
+			return { storage: PromptsStorage.local };
+		};
+
+		const result: ICustomAgent[] = [];
+		for (const item of items) {
+			if ((item.enabled !== false) && item.type === PromptsType.agent) {
+				const promptFile = await this.promptsService.parseNew(item.uri, token);
+				const extra = {
+					name: item.name,
+					description: item.description,
+					sessionTypes: [sessionType],
+					hooks: undefined,
+					source: getSource(item),
+					type: PromptsType.agent,
+				};
+				result.push(CustomAgent.fromParsedPromptFile(promptFile, extra));
+			}
+		}
+		return result;
+	}
+
 	public async resolvePromptSlashCommand(name: string, sessionType: string, token: CancellationToken): Promise<IResolvedChatPromptSlashCommand | undefined> {
 		const harness = this.findHarnessById(sessionType);
 		if (!harness || !harness.itemProvider) {

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

@@ -196,7 +196,6 @@ export interface IPluginPromptPath extends IPromptPathBase {
 export type IAgentSource = {
 	readonly storage: PromptsStorage.extension;
 	readonly extensionId: ExtensionIdentifier;
-	readonly type: PromptFileSource.ExtensionContribution | PromptFileSource.ExtensionAPI;
 } | {
 	readonly storage: PromptsStorage.local | PromptsStorage.user;
 } | {