Merge branch 'main' into dev/mjbvz/format-all

Author: mjbvz

chat-model-provider-sample/package-lock.json

@@ -1,8 +1,5 @@
 {
 	"name": "chat-model-provider-sample",
-	"enabledApiProposals": [
-		"chatProvider"
-	],
 	"publisher": "vscode-samples",
 	"displayName": "Copilot Model Provider Sample",
 	"description": "Sample extension which provides chat models via the LM API.",
@@ -12,17 +9,14 @@
 	},
 	"version": "0.1.0",
 	"engines": {
-		"vscode": "^1.103.0-20250721"
+		"vscode": "^1.104"
 	},
 	"categories": [
 		"AI",
 		"Chat"
 	],
-	"activationEvents": [
-		"onStartupFinished"
-	],
 	"contributes": {
-		"languageModels": [
+		"languageModelChatProviders": [
 			{
 				"vendor": "sample",
 				"displayName": "Sample Model Vendor"
@@ -39,12 +33,13 @@
 		"lint": "eslint",
 		"watch": "tsc -watch -p ./"
 	},
+	"dependencies": { },
 	"devDependencies": {
 		"@eslint/js": "^9.13.0",
 		"@stylistic/eslint-plugin": "^2.9.0",
 		"@types/node": "^22",
-		"@types/vscode": "^1.102.0",
 		"@vscode/dts": "^0.4.1",
+		"@types/vscode": "^1.104.0",
 		"eslint": "^9.13.0",
 		"typescript": "^5.9.2",
 		"typescript-eslint": "^8.39.0"

chat-model-provider-sample/package.json

@@ -2,7 +2,7 @@ import * as vscode from 'vscode';
 import { SampleChatModelProvider } from './provider';
 
 export function activate(_: vscode.ExtensionContext) {
-	vscode.lm.registerChatModelProvider('sample', new SampleChatModelProvider());
+	vscode.lm.registerLanguageModelChatProvider('sample', new SampleChatModelProvider());
 }
 
 export function deactivate() { }

chat-model-provider-sample/src/extension.ts

@@ -1,35 +1,35 @@
-import { CancellationToken, ChatResponseFragment2, LanguageModelChatInformation, LanguageModelChatMessage, LanguageModelChatProvider2, LanguageModelChatRequestHandleOptions, LanguageModelTextPart, Progress, ProviderResult } from "vscode";
+import { CancellationToken, LanguageModelChatInformation, LanguageModelChatMessage, LanguageModelChatProvider, LanguageModelResponsePart, LanguageModelTextPart, Progress, ProvideLanguageModelChatResponseOptions, ProviderResult } from "vscode";
 
 function getChatModelInfo(id: string, name: string): LanguageModelChatInformation {
 	return {
 		id,
 		name,
-		description: "A sample chat model for demonstration purposes.",
+		tooltip: "A sample chat model for demonstration purposes.",
 		family: "sample-family",
 		maxInputTokens: 120000,
 		maxOutputTokens: 8192,
 		version: "1.0.0",
 		capabilities: {
 			toolCalling: true,
-			vision: true,
+			imageInput: true,
 		}
 	};
 }
 
-export class SampleChatModelProvider implements LanguageModelChatProvider2 {
-	prepareLanguageModelChat(_options: { silent: boolean; }, _token: CancellationToken): ProviderResult<LanguageModelChatInformation[]> {
+export class SampleChatModelProvider implements LanguageModelChatProvider {
+	provideLanguageModelChatInformation(_options: { silent: boolean; }, _token: CancellationToken): ProviderResult<LanguageModelChatInformation[]> {
 		return [
 			getChatModelInfo("sample-dog-model", "Dog Model"),
 			getChatModelInfo("sample-cat-model", "Cat Model"),
 		];
 	}
-	async provideLanguageModelChatResponse(model: LanguageModelChatInformation, _messages: Array<LanguageModelChatMessage>, _options: LanguageModelChatRequestHandleOptions, progress: Progress<ChatResponseFragment2>, _token: CancellationToken): Promise<void> {
+	async provideLanguageModelChatResponse(model: LanguageModelChatInformation, _messages: Array<LanguageModelChatMessage>, _options: ProvideLanguageModelChatResponseOptions, progress: Progress<LanguageModelResponsePart>, _token: CancellationToken): Promise<void> {
 		if (model.id === "sample-dog-model") {
-			progress.report({ index: 0, part: new LanguageModelTextPart("Woof! This is a dog model response.") });
+			progress.report(new LanguageModelTextPart("Woof! This is a dog model response."));
 		} else if (model.id === "sample-cat-model") {
-			progress.report({ index: 0, part: new LanguageModelTextPart("Meow! This is a cat model response.") });
+			progress.report(new LanguageModelTextPart("Meow! This is a cat model response."));
 		} else {
-			progress.report({ index: 0, part: new LanguageModelTextPart("Unknown model.") });
+			progress.report(new LanguageModelTextPart("Unknown model."));
 		}
 	}
 	async provideTokenCount(_model: LanguageModelChatInformation, _text: string | LanguageModelChatMessage, _token: CancellationToken): Promise<number> {

chat-model-provider-sample/src/provider.ts

@@ -14,10 +14,5 @@
 		// "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
 		// "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */
 		// "noUnusedParameters": true,  /* Report errors on unused parameters. */
-	},
-	"include": [
-		"src/**/*",
-		"vscode.d.ts",
-		"vscode.proposed.chatProvider.d.ts"
-	]
-}
+	}
+}