support modelSelector option when running inline chat (#279976)

microsoft/vscode-copilot-evaluation#894

Author: jrieken

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

@@ -229,6 +229,23 @@ export interface ILanguageModelChatSelector {
 	readonly extension?: ExtensionIdentifier;
 }
 
+
+export function isILanguageModelChatSelector(value: unknown): value is ILanguageModelChatSelector {
+	if (typeof value !== 'object' || value === null) {
+		return false;
+	}
+	const obj = value as Record<string, unknown>;
+	return (
+		(obj.name === undefined || typeof obj.name === 'string') &&
+		(obj.id === undefined || typeof obj.id === 'string') &&
+		(obj.vendor === undefined || typeof obj.vendor === 'string') &&
+		(obj.version === undefined || typeof obj.version === 'string') &&
+		(obj.family === undefined || typeof obj.family === 'string') &&
+		(obj.tokens === undefined || typeof obj.tokens === 'number') &&
+		(obj.extension === undefined || typeof obj.extension === 'object')
+	);
+}
+
 export const ILanguageModelsService = createDecorator<ILanguageModelsService>('ILanguageModelsService');
 
 export interface ILanguageModelChatMetadataAndIdentifier {

src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts

@@ -120,7 +120,7 @@ export class StartSessionAction extends Action2 {
 		if (arg && InlineChatRunOptions.isInlineChatRunOptions(arg)) {
 			options = arg;
 		}
-		InlineChatController.get(editor)?.run({ ...options });
+		return InlineChatController.get(editor)?.run({ ...options });
 	}
 }
 

src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts

@@ -58,6 +58,7 @@ import { IChatService } from '../../chat/common/chatService.js';
 import { IChatRequestVariableEntry, IDiagnosticVariableEntryFilterData } from '../../chat/common/chatVariableEntries.js';
 import { isResponseVM } from '../../chat/common/chatViewModel.js';
 import { ChatAgentLocation } from '../../chat/common/constants.js';
+import { ILanguageModelChatSelector, ILanguageModelsService, isILanguageModelChatSelector } from '../../chat/common/languageModels.js';
 import { isNotebookContainingCellEditor as isNotebookWithCellEditor } from '../../notebook/browser/notebookEditor.js';
 import { INotebookEditorService } from '../../notebook/browser/services/notebookEditorService.js';
 import { ICellEditOperation } from '../../notebook/common/notebookCommon.js';
@@ -91,16 +92,23 @@ const enum Message {
 }
 
 export abstract class InlineChatRunOptions {
+
 	initialSelection?: ISelection;
 	initialRange?: IRange;
 	message?: string;
 	attachments?: URI[];
 	autoSend?: boolean;
 	existingSession?: Session;
 	position?: IPosition;
+	modelSelector?: ILanguageModelChatSelector;
+
+	static isInlineChatRunOptions(options: unknown): options is InlineChatRunOptions {
 
-	static isInlineChatRunOptions(options: any): options is InlineChatRunOptions {
-		const { initialSelection, initialRange, message, autoSend, position, existingSession, attachments: attachments } = <InlineChatRunOptions>options;
+		if (typeof options !== 'object' || options === null) {
+			return false;
+		}
+
+		const { initialSelection, initialRange, message, autoSend, position, existingSession, attachments, modelSelector } = <InlineChatRunOptions>options;
 		if (
 			typeof message !== 'undefined' && typeof message !== 'string'
 			|| typeof autoSend !== 'undefined' && typeof autoSend !== 'boolean'
@@ -109,9 +117,11 @@ export abstract class InlineChatRunOptions {
 			|| typeof position !== 'undefined' && !Position.isIPosition(position)
 			|| typeof existingSession !== 'undefined' && !(existingSession instanceof Session)
 			|| typeof attachments !== 'undefined' && (!Array.isArray(attachments) || !attachments.every(item => item instanceof URI))
+			|| typeof modelSelector !== 'undefined' && !isILanguageModelChatSelector(modelSelector)
 		) {
 			return false;
 		}
+
 		return true;
 	}
 }
@@ -1270,6 +1280,7 @@ export class InlineChatController2 implements IEditorContribution {
 		@IChatAttachmentResolveService private readonly _chatAttachmentResolveService: IChatAttachmentResolveService,
 		@IEditorService private readonly _editorService: IEditorService,
 		@IMarkerDecorationsService private readonly _markerDecorationsService: IMarkerDecorationsService,
+		@ILanguageModelsService private readonly _languageModelService: ILanguageModelsService,
 		@IChatService chatService: IChatService,
 	) {
 
@@ -1520,10 +1531,6 @@ export class InlineChatController2 implements IEditorContribution {
 		this._zone.rawValue?.widget.focus();
 	}
 
-	markActiveController() {
-		this._isActiveController.set(true, undefined);
-	}
-
 	async run(arg?: InlineChatRunOptions): Promise<boolean> {
 		assertType(this._editor.hasModel());
 
@@ -1536,7 +1543,7 @@ export class InlineChatController2 implements IEditorContribution {
 			existingSession.dispose();
 		}
 
-		this.markActiveController();
+		this._isActiveController.set(true, undefined);
 
 		const session = await this._inlineChatSessions.createSession2(this._editor, uri, CancellationToken.None);
 
@@ -1572,6 +1579,17 @@ export class InlineChatController2 implements IEditorContribution {
 				}));
 				delete arg.attachments;
 			}
+			if (arg.modelSelector) {
+				const id = (await this._languageModelService.selectLanguageModels(arg.modelSelector, false)).sort().at(0);
+				if (!id) {
+					throw new Error(`No language models found matching selector: ${JSON.stringify(arg.modelSelector)}.`);
+				}
+				const model = this._languageModelService.lookupLanguageModel(id);
+				if (!model) {
+					throw new Error(`Language model not loaded: ${id}.`);
+				}
+				this._zone.value.widget.chatWidget.input.setCurrentLanguageModel({ metadata: model, identifier: id });
+			}
 			if (arg.message) {
 				this._zone.value.widget.chatWidget.setInput(arg.message);
 				if (arg.autoSend) {