Skip to content

chat: Make customizations multi-root workspace aware #335592

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Jessie Houghton (houghj16) wants to merge 3 commits into
base: main
Choose a base branch
from
+327 −68
Draft

chat: Make customizations multi-root workspace aware #335592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d55b34e
chat: Make customizations multi-root workspace aware
houghj16 Sep 10, 2026
11bd771
chat: Address multi-root customization feedback
houghj16 Sep 11, 2026
f2163be
chat: Rework multi-root customization sections
houghj16 Oct 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/vs/sessions/contrib/chat/browser/aiCustomizationWorkspaceService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,9 +271,9 @@ export class SessionsAICustomizationWorkspaceService implements IAICustomization
}
}

async generateCustomization(type: PromptsType): Promise<void> {
async generateCustomization(type: PromptsType, workspaceFolder?: URI): Promise<void> {
const creator = this.instantiationService.createInstance(CustomizationCreatorService);
await creator.createWithAI(type);
await creator.createWithAI(type, workspaceFolder);
}

async getFilteredPromptSlashCommands(token: CancellationToken): Promise<readonly IChatPromptSlashCommand[]> {
Expand Down
15 changes: 10 additions & 5 deletions src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1365,12 +1365,13 @@ export function registerChatActions() {
});
}

async run(accessor: ServicesAccessor): Promise<void> {
async run(accessor: ServicesAccessor, workspaceFolder?: URI): Promise<void> {
const commandService = accessor.get(ICommandService);
await commandService.executeCommand('workbench.action.chat.open', {
mode: 'agent',
query: '/create-instructions ',
isPartialQuery: true,
attachFiles: workspaceFolder ? [workspaceFolder] : undefined,
});
}
});
Expand All @@ -1388,12 +1389,13 @@ export function registerChatActions() {
});
}

async run(accessor: ServicesAccessor): Promise<void> {
async run(accessor: ServicesAccessor, workspaceFolder?: URI): Promise<void> {
const commandService = accessor.get(ICommandService);
await commandService.executeCommand('workbench.action.chat.open', {
mode: 'agent',
query: '/create-prompt ',
isPartialQuery: true,
attachFiles: workspaceFolder ? [workspaceFolder] : undefined,
});
}
});
Expand All @@ -1411,12 +1413,13 @@ export function registerChatActions() {
});
}

async run(accessor: ServicesAccessor): Promise<void> {
async run(accessor: ServicesAccessor, workspaceFolder?: URI): Promise<void> {
const commandService = accessor.get(ICommandService);
await commandService.executeCommand('workbench.action.chat.open', {
mode: 'agent',
query: '/create-skill ',
isPartialQuery: true,
attachFiles: workspaceFolder ? [workspaceFolder] : undefined,
});
}
});
Expand All @@ -1434,12 +1437,13 @@ export function registerChatActions() {
});
}

async run(accessor: ServicesAccessor): Promise<void> {
async run(accessor: ServicesAccessor, workspaceFolder?: URI): Promise<void> {
const commandService = accessor.get(ICommandService);
await commandService.executeCommand('workbench.action.chat.open', {
mode: 'agent',
query: '/create-agent ',
isPartialQuery: true,
attachFiles: workspaceFolder ? [workspaceFolder] : undefined,
});
}
});
Expand All @@ -1457,12 +1461,13 @@ export function registerChatActions() {
});
}

async run(accessor: ServicesAccessor): Promise<void> {
async run(accessor: ServicesAccessor, workspaceFolder?: URI): Promise<void> {
const commandService = accessor.get(ICommandService);
await commandService.executeCommand('workbench.action.chat.open', {
mode: 'agent',
query: '/create-hook ',
isPartialQuery: true,
attachFiles: workspaceFolder ? [workspaceFolder] : undefined,
});
}
});
Expand Down
72 changes: 45 additions & 27 deletions src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationListWidget.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ import { IAICustomizationListItem } from './aiCustomizationItemSource.js';
import { IAICustomizationItemsModel, ItemsModelSection } from './aiCustomizationItemsModel.js';
import { asTreeRenderer, customizationTreeStyles, getCustomizationTreeContentHeight, ICustomizationTreeGroup } from './customizationTree.js';
import { affectsCustomizationDiscoveryAvailability, isCustomizationDiscoveryAvailable } from './customizationMarketplaceConfiguration.js';
import { getAICustomizationWorkspaceGroupForResource, getAICustomizationWorkspaceGroups, isAICustomizationWorkspaceGroupKey } from './aiCustomizationWorkspaceGroups.js';
import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';

export { truncateToFirstLine } from './aiCustomizationListWidgetUtils.js';

Expand Down Expand Up @@ -613,7 +615,7 @@ interface ICreateAction {
readonly tooltip?: string;
readonly kind?: 'generate';
readonly target?: 'workspace' | 'user';
run(): void;
run(workspaceFolder?: URI): void;
Comment thread
houghj16 marked this conversation as resolved.
}

interface ICustomizationItemGroup {
Expand All @@ -622,6 +624,7 @@ interface ICustomizationItemGroup {
readonly icon: ThemeIcon;
readonly description: string;
readonly items: IAICustomizationListItem[];
readonly workspaceFolder?: URI;
}

/**
Expand Down Expand Up @@ -697,11 +700,11 @@ export class AICustomizationListWidget extends Disposable {
private readonly _onDidChangeItemCount = this._register(new Emitter<number>());
readonly onDidChangeItemCount: Event<number> = this._onDidChangeItemCount.event;

private readonly _onDidRequestCreate = this._register(new Emitter<PromptsType>());
readonly onDidRequestCreate: Event<PromptsType> = this._onDidRequestCreate.event;
private readonly _onDidRequestCreate = this._register(new Emitter<{ type: PromptsType; workspaceFolder?: URI }>());
readonly onDidRequestCreate: Event<{ type: PromptsType; workspaceFolder?: URI }> = this._onDidRequestCreate.event;

private readonly _onDidRequestCreateManual = this._register(new Emitter<{ type: PromptsType; target: 'local' | 'user' | 'workspace-root'; rootFileName?: string }>());
readonly onDidRequestCreateManual: Event<{ type: PromptsType; target: 'local' | 'user' | 'workspace-root'; rootFileName?: string }> = this._onDidRequestCreateManual.event;
private readonly _onDidRequestCreateManual = this._register(new Emitter<{ type: PromptsType; target: 'local' | 'user' | 'workspace-root'; rootFileName?: string; workspaceFolder?: URI }>());
readonly onDidRequestCreateManual: Event<{ type: PromptsType; target: 'local' | 'user' | 'workspace-root'; rootFileName?: string; workspaceFolder?: URI }> = this._onDidRequestCreateManual.event;

private readonly _onDidRequestBrowse = this._register(new Emitter<void>());
readonly onDidRequestBrowse: Event<void> = this._onDidRequestBrowse.event;
Expand All @@ -726,6 +729,7 @@ export class AICustomizationListWidget extends Disposable {
@ICustomizationMarketplaceService private readonly marketplaceService: ICustomizationMarketplaceService,
@IAICustomizationItemsModel private readonly itemsModel: IAICustomizationItemsModel,
@IAgentPluginService private readonly agentPluginService: IAgentPluginService,
@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
) {
super();
this.element = $('.ai-customization-list-widget');
Expand Down Expand Up @@ -756,6 +760,7 @@ export class AICustomizationListWidget extends Disposable {
}
}));
}
this._register(this.workspaceContextService.onDidChangeWorkspaceFolders(() => this.filterItems()));
}

private create(): void {
Expand Down Expand Up @@ -1204,7 +1209,7 @@ export class AICustomizationListWidget extends Disposable {
label: override.label ?? localize('newCustomization', "New {0}", typeLabel),
enabled: true,
target: 'workspace',
run: () => { this._onDidRequestCreateManual.fire({ type: promptType, target: 'workspace-root' }); },
run: workspaceFolder => { this._onDidRequestCreateManual.fire({ type: promptType, target: 'workspace-root', workspaceFolder }); },
});
addedTargets.add('workspace-root');
}
Expand All @@ -1217,7 +1222,7 @@ export class AICustomizationListWidget extends Disposable {
tooltip: localize('generateCustomizationWithAI', "Generate {0} with AI", typeLabel),
enabled: true,
kind: 'generate',
run: () => { this._onDidRequestCreate.fire(promptType); },
run: workspaceFolder => { this._onDidRequestCreate.fire({ type: promptType, workspaceFolder }); },
});
}
if (hasWorkspace) {
Expand All @@ -1226,7 +1231,7 @@ export class AICustomizationListWidget extends Disposable {
compactLabel: localize('newHook', "New Hook"),
enabled: true,
target: 'workspace',
run: () => { this._onDidRequestCreateManual.fire({ type: promptType, target: 'local' }); },
run: workspaceFolder => { this._onDidRequestCreateManual.fire({ type: promptType, target: 'local', workspaceFolder }); },
});
}
actions.push({
Expand All @@ -1250,7 +1255,7 @@ export class AICustomizationListWidget extends Disposable {
tooltip: localize('generateCustomizationWithAI', "Generate {0} with AI", typeLabel),
enabled: true,
kind: 'generate',
run: () => { this._onDidRequestCreate.fire(promptType); },
run: workspaceFolder => { this._onDidRequestCreate.fire({ type: promptType, workspaceFolder }); },
});
} else if (hasWorkspace) {
// Sessions or non-local harness with workspace: workspace is primary
Expand All @@ -1259,7 +1264,7 @@ export class AICustomizationListWidget extends Disposable {
compactLabel: localize('newCustomization', "New {0}", createTypeLabel),
enabled: true,
target: 'workspace',
run: () => { this._onDidRequestCreateManual.fire({ type: promptType, target: 'local' }); },
run: workspaceFolder => { this._onDidRequestCreateManual.fire({ type: promptType, target: 'local', workspaceFolder }); },
});
addedTargets.add('workspace');
} else {
Expand All @@ -1282,7 +1287,7 @@ export class AICustomizationListWidget extends Disposable {
compactLabel: localize('newCustomization', "New {0}", createTypeLabel),
enabled: true,
target: 'workspace',
run: () => { this._onDidRequestCreateManual.fire({ type: promptType, target: 'local' }); },
run: workspaceFolder => { this._onDidRequestCreateManual.fire({ type: promptType, target: 'local', workspaceFolder }); },
});
}

Expand All @@ -1303,7 +1308,7 @@ export class AICustomizationListWidget extends Disposable {
label: localize('newCustomizationFile', "New {0}", fileName),
enabled: true,
target: 'workspace',
run: () => { this._onDidRequestCreateManual.fire({ type: promptType, target: 'workspace-root', rootFileName: fileName }); },
run: workspaceFolder => { this._onDidRequestCreateManual.fire({ type: promptType, target: 'workspace-root', rootFileName: fileName, workspaceFolder }); },
});
}
}
Expand Down Expand Up @@ -1511,16 +1516,19 @@ export class AICustomizationListWidget extends Disposable {
* Groups items by normalized storage/groupKey.
*/
private groupMatchedItems(matchedItems: IAICustomizationListItem[]): void {
const workspaceGroups = getAICustomizationWorkspaceGroups(this.workspaceContextService);
const groups: ICustomizationItemGroup[] = [
{ groupKey: PromptsStorage.user, label: localize('userGroup', "User"), icon: userIcon, description: localize('userGroupDescription', "Customizations stored locally on your machine in a central location. Private to you and available across all projects."), items: [] },
{ groupKey: PromptsStorage.local, label: localize('workspaceGroup', "Workspace"), icon: workspaceIcon, description: localize('workspaceGroupDescription', "Customizations stored as files in your project folder and shared with your team via version control."), items: [] },
...(workspaceGroups.length > 0
? workspaceGroups.map(group => ({ groupKey: group.key, label: group.label, icon: workspaceIcon, description: localize('workspaceGroupDescription', "Customizations stored as files in your project folder and shared with your team via version control."), items: [], workspaceFolder: group.uri }))
: [{ groupKey: PromptsStorage.local, label: localize('workspaceGroup', "Workspace"), icon: workspaceIcon, description: localize('workspaceGroupDescription', "Customizations stored as files in your project folder and shared with your team via version control."), items: [] }]),
{ groupKey: PromptsStorage.plugin, label: localize('pluginGroup', "Plugins"), icon: pluginIcon, description: localize('pluginGroupDescription', "Read-only customizations provided by installed plugins."), items: [] },
{ groupKey: PromptsStorage.extension, label: localize('extensionGroup', "Extensions"), icon: extensionIcon, description: localize('extensionGroupDescription', "Read-only customizations provided by installed extensions."), items: [] },
{ groupKey: PromptsStorage.builtIn, label: localize('builtinGroup', "Built-in"), icon: builtinIcon, description: localize('builtinGroupDescription', "Built-in customizations shipped with the application."), items: [] },
];

for (const item of matchedItems) {
const key = this.getItemGroupKey(item);
const key = this.getItemGroupKey(item, workspaceGroups.length > 0);
let group = groups.find(g => g.groupKey === key);
if (!group) {
// Dynamically create a group for unknown groupKeys from providers
Expand Down Expand Up @@ -1565,7 +1573,11 @@ export class AICustomizationListWidget extends Disposable {
this.buildGroupedEntries(groups);
if (this.usesCustomizationTreePresentation()) {
const isFiltering = !!this.searchQuery.trim();
const alwaysVisibleGroupKeys = new Set(getAlwaysVisibleCustomizationGroupKeys(this.currentSection, isFiltering));
const alwaysVisibleGroupKeys = new Set(isFiltering
? []
: workspaceGroups.length > 0
? [...workspaceGroups.map(group => group.key), PromptsStorage.user]
: getAlwaysVisibleCustomizationGroupKeys(this.currentSection, false));
const visibleGroups = groups.filter(group => group.items.length > 0 || alwaysVisibleGroupKeys.has(group.groupKey));
const treeGroups = visibleGroups.map((group, index): ICustomizationTreeGroup<IListEntry> => {
const element: IGroupHeaderEntry = {
Expand Down Expand Up @@ -1594,22 +1606,27 @@ export class AICustomizationListWidget extends Disposable {
}
}

private getItemGroupKey(item: IAICustomizationListItem): string {
return this.currentSection === AICustomizationManagementSection.Instructions
private getItemGroupKey(item: IAICustomizationListItem, isMultiRoot: boolean): string {
const key = this.currentSection === AICustomizationManagementSection.Instructions
? item.source
: item.groupKey ?? item.source ?? AICustomizationSources.local;
if (key !== PromptsStorage.local || !isMultiRoot) {
return key;
}
return getAICustomizationWorkspaceGroupForResource(item.uri, this.workspaceContextService)?.key ?? key;
}

private usesCustomizationTreePresentation(): boolean {
return usesCustomizationTreePresentation(this.currentSection);
}

private renderTreeGroupActions(entry: IGroupHeaderEntry, container: HTMLElement, disposables: DisposableStore): void {
if (entry.groupKey !== PromptsStorage.local && entry.groupKey !== PromptsStorage.user) {
if (entry.groupKey !== PromptsStorage.local && entry.groupKey !== PromptsStorage.user && !isAICustomizationWorkspaceGroupKey(entry.groupKey)) {
return;
}
const actions = DOM.append(container, $('.plugin-card-section-actions'));
this.renderTargetedCreateActions(actions, entry.groupKey, disposables);
const workspaceFolder = getAICustomizationWorkspaceGroups(this.workspaceContextService).find(group => group.key === entry.groupKey)?.uri;
this.renderTargetedCreateActions(actions, entry.groupKey, disposables, workspaceFolder);
if (entry.groupKey === PromptsStorage.user &&
this.currentSection === AICustomizationManagementSection.Skills &&
isCustomizationDiscoveryAvailable(this.configurationService, this.marketplaceService)) {
Expand All @@ -1631,8 +1648,9 @@ export class AICustomizationListWidget extends Disposable {
}
}

private renderTargetedCreateActions(container: HTMLElement, groupKey: string, disposables: DisposableStore): void {
const target = groupKey === PromptsStorage.local ? 'workspace' : 'user';
private renderTargetedCreateActions(container: HTMLElement, groupKey: string, disposables: DisposableStore, workspaceFolder?: URI): void {
const workspaceGroup = groupKey === PromptsStorage.local || isAICustomizationWorkspaceGroupKey(groupKey);
const target = workspaceGroup ? 'workspace' : 'user';
const hasWorkspace = this.hasActiveWorkspace();
const actions = this.buildCreateActions().filter(action =>
action.target === target
Expand All @@ -1659,7 +1677,7 @@ export class AICustomizationListWidget extends Disposable {
button.element.classList.add('customization-create-action', 'plugin-card-ghost-button', 'plugin-card-icon-button');
button.icon = Codicon.add;
button.enabled = primary.enabled;
disposables.add(button.onDidClick(() => primary.run()));
disposables.add(button.onDidClick(() => primary.run(workspaceFolder)));

const generateAction = actions.find(action => action.kind === 'generate');
if (generateAction && generateAction !== primary) {
Expand All @@ -1677,12 +1695,12 @@ export class AICustomizationListWidget extends Disposable {
generateButton.element.classList.add('customization-generate-action', 'plugin-card-ghost-button');
generateButton.label = generateAction.label;
generateButton.enabled = generateAction.enabled;
disposables.add(generateButton.onDidClick(() => generateAction.run()));
disposables.add(generateButton.onDidClick(() => generateAction.run(workspaceFolder)));
}

const secondaryActions = actions.filter(action => action !== primary && action !== generateAction);
if (secondaryActions.length > 0) {
const moreLabel = localize('moreCreateActions', "More creation actions for {0}", groupKey === PromptsStorage.local ? localize('workspace', "Workspace") : localize('user', "User"));
const moreLabel = localize('moreCreateActions', "More creation actions for {0}", workspaceGroup ? localize('workspace', "Workspace") : localize('user', "User"));
const more = disposables.add(new Button(container, {
...getButtonStyles({
buttonSecondaryBackground: undefined,
Expand All @@ -1696,22 +1714,22 @@ export class AICustomizationListWidget extends Disposable {
}));
more.element.classList.add('plugin-card-icon-button', 'plugin-card-ghost-button', 'customization-create-more-action');
more.icon = Codicon.ellipsis;
disposables.add(more.onDidClick(() => this.showCreateActionsMenu(secondaryActions, more.element)));
disposables.add(more.onDidClick(() => this.showCreateActionsMenu(secondaryActions, more.element, workspaceFolder)));
}
}

private formatTargetedCreateActionLabel(action: ICreateAction): string {
return getTargetedCreateActionLabel(action.label, action.compactLabel);
}

private showCreateActionsMenu(createActions: readonly ICreateAction[], anchor: HTMLElement): void {
private showCreateActionsMenu(createActions: readonly ICreateAction[], anchor: HTMLElement, workspaceFolder?: URI): void {
const disposables = new DisposableStore();
const actions = createActions.map((action, index) => disposables.add(new Action(
`customization.create.${index}`,
action.label.replace(/^\$\([^)]+\)\s*/, ''),
undefined,
action.enabled,
() => action.run(),
() => action.run(workspaceFolder),
)));
this.contextMenuService.showContextMenu({
getAnchor: () => anchor,
Expand Down
Loading
Loading