add 'Configure' in context picker for instructions (#251484)

Author: aeschli

src/vs/workbench/contrib/chat/browser/actions/chatContext.ts

@@ -21,7 +21,7 @@ import { IHostService } from '../../../../services/host/browser/host.js';
 import { UntitledTextEditorInput } from '../../../../services/untitled/common/untitledTextEditorInput.js';
 import { FileEditorInput } from '../../../files/browser/editors/fileEditorInput.js';
 import { NotebookEditorInput } from '../../../notebook/common/notebookEditorInput.js';
-import { IChatContextPickService, IChatContextValueItem, IChatContextPickerItem, IChatContextPickerPickItem } from '../chatContextPickService.js';
+import { IChatContextPickService, IChatContextValueItem, IChatContextPickerItem, IChatContextPickerPickItem, IChatContextPicker } from '../chatContextPickService.js';
 import { IChatEditingService } from '../../common/chatEditingService.js';
 import { IChatRequestToolEntry, IChatRequestToolSetEntry, IChatRequestVariableEntry, IImageVariableEntry, OmittedState } from '../../common/chatVariableEntries.js';
 import { IToolData, ToolDataSource, ToolSet } from '../../common/languageModelToolsService.js';
@@ -65,10 +65,7 @@ class ToolsContextPickerPick implements IChatContextPickerItem {
 	readonly icon: ThemeIcon = Codicon.tools;
 	readonly ordinal = -500;
 
-	asPicker(widget: IChatWidget): {
-		readonly placeholder: string;
-		readonly picks: Promise<(IChatContextPickerPickItem | IQuickPickSeparator)[]>;
-	} {
+	asPicker(widget: IChatWidget): IChatContextPicker {
 
 		type Pick = IChatContextPickerPickItem & { toolInfo: { ordinal: number; label: string } };
 		const items: Pick[] = [];
@@ -198,10 +195,7 @@ class RelatedFilesContextPickerPick implements IChatContextPickerItem {
 		return this._chatEditingService.hasRelatedFilesProviders() && (Boolean(widget.getInput()) || widget.attachmentModel.fileAttachments.length > 0);
 	}
 
-	asPicker(widget: IChatWidget): {
-		readonly placeholder: string;
-		readonly picks: Promise<(IChatContextPickerPickItem | IQuickPickSeparator)[]>;
-	} {
+	asPicker(widget: IChatWidget): IChatContextPicker {
 
 		const picks = (async () => {
 			const chatSessionId = widget.viewModel?.sessionId;

src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts

@@ -19,6 +19,7 @@ import { ITextModelService } from '../../../../../editor/common/services/resolve
 import { AbstractGotoSymbolQuickAccessProvider, IGotoSymbolQuickPickItem } from '../../../../../editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.js';
 import { localize, localize2 } from '../../../../../nls.js';
 import { Action2, MenuId, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
 import { ContextKeyExpr, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
 import { IFileService } from '../../../../../platform/files/common/files.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
@@ -420,7 +421,7 @@ export class AttachContextAction extends Action2 {
 		const quickInputService = accessor.get(IQuickInputService);
 		const quickChatService = accessor.get(IQuickChatService);
 		const instantiationService = accessor.get(IInstantiationService);
-
+		const commandService = accessor.get(ICommandService);
 
 		const providerOptions: AnythingQuickAccessProviderRunOptions = {
 			additionPicks,
@@ -433,7 +434,7 @@ export class AttachContextAction extends Action2 {
 						this._handleContextPick(item.item, widget);
 
 					} else if (item.item.type === 'pickerPick') {
-						isDone = await this._handleContextPickerItem(quickInputService, item.item, widget);
+						isDone = await this._handleContextPickerItem(quickInputService, commandService, item.item, widget);
 					}
 
 					if (!isDone) {
@@ -466,7 +467,6 @@ export class AttachContextAction extends Action2 {
 		const fileService = accessor.get(IFileService);
 		const textModelService = accessor.get(ITextModelService);
 
-
 		const toAttach: IChatRequestVariableEntry[] = [];
 
 		if (isIQuickPickItemWithResource(pick) && pick.resource) {
@@ -532,7 +532,7 @@ export class AttachContextAction extends Action2 {
 		}
 	}
 
-	private async _handleContextPickerItem(quickInputService: IQuickInputService, item: IChatContextPickerItem, widget: IChatWidget): Promise<boolean> {
+	private async _handleContextPickerItem(quickInputService: IQuickInputService, commandService: ICommandService, item: IChatContextPickerItem, widget: IChatWidget): Promise<boolean> {
 
 		const pickerConfig = item.asPicker(widget);
 
@@ -542,7 +542,16 @@ export class AttachContextAction extends Action2 {
 			label: localize('goBack', 'Go back ↩'),
 			alwaysShow: true
 		};
-		const extraPicks: QuickPickItem[] = [{ type: 'separator' }, goBackItem];
+		const configureItem = pickerConfig.configure ? {
+			label: pickerConfig.configure.label,
+			commandId: pickerConfig.configure.commandId,
+			alwaysShow: true
+		} : undefined;
+		const extraPicks: QuickPickItem[] = [{ type: 'separator' }];
+		if (configureItem) {
+			extraPicks.push(configureItem);
+		}
+		extraPicks.push(goBackItem);
 
 		const qp = store.add(quickInputService.createQuickPick({ useSeparators: true }));
 
@@ -597,6 +606,10 @@ export class AttachContextAction extends Action2 {
 			if (selected === goBackItem) {
 				defer.complete(false);
 			}
+			if (selected === configureItem) {
+				defer.complete(true);
+				commandService.executeCommand(configureItem.commandId);
+			}
 			if (!e.inBackground) {
 				defer.complete(true);
 			}

src/vs/workbench/contrib/chat/browser/chatContextPickService.ts

@@ -43,18 +43,25 @@ export interface IChatContextValueItem extends IChatContextItem {
 
 export type ChatContextPick = IChatContextPickerPickItem | IQuickPickSeparator;
 
+export interface IChatContextPicker {
+	readonly placeholder: string;
+	/**
+	 * Picks that should either be:
+	 * - A promise that resolves to the picked items
+	 * - A function that maps input query into items to display.
+	 */
+	readonly picks: Promise<ChatContextPick[]> | ((query: IObservable<string>, token: CancellationToken) => IObservable<{ busy: boolean; picks: ChatContextPick[] }>);
+
+	readonly configure?: {
+		label: string;
+		commandId: string;
+	};
+}
+
 export interface IChatContextPickerItem extends IChatContextItem {
 	readonly type: 'pickerPick';
 
-	asPicker(widget: IChatWidget): {
-		readonly placeholder: string;
-		/**
-		 * Picks that should either be:
-		 * - A promise that resolves to the picked items
-		 * - A function that maps input query into items to display.
-		 */
-		readonly picks: Promise<ChatContextPick[]> | ((query: IObservable<string>, token: CancellationToken) => IObservable<{ busy: boolean; picks: ChatContextPick[] }>);
-	};
+	asPicker(widget: IChatWidget): IChatContextPicker;
 }
 
 /**

src/vs/workbench/contrib/chat/browser/promptSyntax/attachInstructionsAction.ts

@@ -16,7 +16,7 @@ import { ServicesAccessor } from '../../../../../editor/browser/editorExtensions
 import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
 import { Action2, MenuId, registerAction2 } from '../../../../../platform/actions/common/actions.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
-import { ChatContextPick, IChatContextPickerItem, IChatContextPickerPickItem } from '../chatContextPickService.js';
+import { IChatContextPickerItem, IChatContextPickerPickItem, IChatContextPicker } from '../chatContextPickService.js';
 import { IQuickPickSeparator } from '../../../../../platform/quickinput/common/quickInput.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { getCleanPromptName } from '../../common/promptSyntax/config/promptFileLocations.js';
@@ -233,7 +233,7 @@ export class ChatInstructionsPickerPick implements IChatContextPickerItem {
 		return PromptsConfig.enabled(this.configurationService);
 	}
 
-	asPicker(): { readonly placeholder: string; readonly picks: Promise<ChatContextPick[]> } {
+	asPicker(): IChatContextPicker {
 
 		const picks = this.promptsService.listPromptFiles(PromptsType.instructions, CancellationToken.None).then(value => {
 
@@ -267,8 +267,13 @@ export class ChatInstructionsPickerPick implements IChatContextPickerItem {
 
 		return {
 			placeholder: localize('placeholder', 'Select instructions files to attach'),
-			picks
+			picks,
+			configure: {
+				label: localize('configureInstructions', 'Configure Instructions...'),
+				commandId: CONFIGURE_INSTRUCTIONS_ACTION_ID
+			}
 		};
 	}
 
+
 }

src/vs/workbench/contrib/markers/browser/markersChatContext.ts

@@ -14,7 +14,7 @@ import { ILabelService } from '../../../../platform/label/common/label.js';
 import { IMarkerService, MarkerSeverity } from '../../../../platform/markers/common/markers.js';
 import { IQuickPickSeparator } from '../../../../platform/quickinput/common/quickInput.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
-import { IChatContextPickerItem, IChatContextPickerPickItem, IChatContextPickService } from '../../chat/browser/chatContextPickService.js';
+import { IChatContextPickerItem, IChatContextPickerPickItem, IChatContextPickService, IChatContextPicker } from '../../chat/browser/chatContextPickService.js';
 import { IDiagnosticVariableEntryFilterData } from '../../chat/common/chatVariableEntries.js';
 
 class MarkerChatContextPick implements IChatContextPickerItem {
@@ -29,7 +29,7 @@ class MarkerChatContextPick implements IChatContextPickerItem {
 		@ILabelService private readonly _labelService: ILabelService,
 	) { }
 
-	asPicker(): { readonly placeholder: string; readonly picks: Promise<(IChatContextPickerPickItem | IQuickPickSeparator)[]> } {
+	asPicker(): IChatContextPicker {
 
 		const markers = this._markerService.read({ severities: MarkerSeverity.Error | MarkerSeverity.Warning | MarkerSeverity.Info });
 		const grouped = groupBy(markers, (a, b) => extUri.compare(a.resource, b.resource));

src/vs/workbench/contrib/notebook/browser/controller/chat/notebook.chat.contribution.ts

@@ -17,7 +17,7 @@ import { localize } from '../../../../../../nls.js';
 import { Action2, MenuId, registerAction2 } from '../../../../../../platform/actions/common/actions.js';
 import { ContextKeyExpr, IContextKey, IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.js';
 import { ServicesAccessor } from '../../../../../../platform/instantiation/common/instantiation.js';
-import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from '../../../../../../platform/quickinput/common/quickInput.js';
+import { IQuickInputService, IQuickPickItem } from '../../../../../../platform/quickinput/common/quickInput.js';
 import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../../../common/contributions.js';
 import { IEditorService } from '../../../../../services/editor/common/editorService.js';
 import { IChatWidget, IChatWidgetService, showChatView } from '../../../../chat/browser/chat.js';
@@ -37,7 +37,7 @@ import './cellChatActions.js';
 import { CTX_NOTEBOOK_CHAT_HAS_AGENT } from './notebookChatContext.js';
 import { IViewsService } from '../../../../../services/views/common/viewsService.js';
 import { createNotebookOutputVariableEntry, NOTEBOOK_CELL_OUTPUT_MIME_TYPE_LIST_FOR_CHAT_CONST } from '../../contrib/chat/notebookChatUtils.js';
-import { IChatContextPickerItem, IChatContextPickerPickItem, IChatContextPickService } from '../../../../chat/browser/chatContextPickService.js';
+import { IChatContextPickerItem, IChatContextPickerPickItem, IChatContextPickService, IChatContextPicker } from '../../../../chat/browser/chatContextPickService.js';
 import { Codicon } from '../../../../../../base/common/codicons.js';
 
 const NotebookKernelVariableKey = 'kernelVariable';
@@ -260,7 +260,7 @@ class KernelVariableContextPicker implements IChatContextPickerItem {
 		return widget.location === ChatAgentLocation.Notebook && Boolean(getNotebookEditorFromEditorPane(this.editorService.activeEditorPane)?.getViewModel()?.notebookDocument);
 	}
 
-	asPicker(): { readonly placeholder: string; readonly picks: Promise<(IChatContextPickerPickItem | IQuickPickSeparator)[]> } {
+	asPicker(): IChatContextPicker {
 
 		const picks = (async () => {