@codingame/monaco-vscode-api 18.4.0 → 19.0.1

package/vscode/src/vs/workbench/services/themes/common/colorExtensionPoint.js

@@ -28,30 +28,30 @@ const colorIdPattern = '^\\w+[.\\w+]*$';
 const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'colors',
     jsonSchema: {
-        description: ( localize(12922, 'Contributes extension defined themable colors')),
+        description: ( localize(13198, 'Contributes extension defined themable colors')),
         type: 'array',
         items: {
             type: 'object',
             properties: {
                 id: {
                     type: 'string',
-                    description: ( localize(12923, 'The identifier of the themable color')),
+                    description: ( localize(13199, 'The identifier of the themable color')),
                     pattern: colorIdPattern,
                     patternErrorMessage: ( localize(
-                        12924,
+                        13200,
                         'Identifiers must only contain letters, digits and dots and can not start with a dot'
                     )),
                 },
                 description: {
                     type: 'string',
-                    description: ( localize(12925, 'The description of the themable color')),
+                    description: ( localize(13201, 'The description of the themable color')),
                 },
                 defaults: {
                     type: 'object',
                     properties: {
                         light: {
                             description: ( localize(
-                                12926,
+                                13202,
                                 'The default color for light themes. Either a color value in hex (#RRGGBB[AA]) or the identifier of a themable color which provides the default.'
                             )),
                             type: 'string',
@@ -62,7 +62,7 @@ const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
                         },
                         dark: {
                             description: ( localize(
-                                12927,
+                                13203,
                                 'The default color for dark themes. Either a color value in hex (#RRGGBB[AA]) or the identifier of a themable color which provides the default.'
                             )),
                             type: 'string',
@@ -73,7 +73,7 @@ const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
                         },
                         highContrast: {
                             description: ( localize(
-                                12928,
+                                13204,
                                 'The default color for high contrast dark themes. Either a color value in hex (#RRGGBB[AA]) or the identifier of a themable color which provides the default. If not provided, the `dark` color is used as default for high contrast dark themes.'
                             )),
                             type: 'string',
@@ -84,7 +84,7 @@ const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
                         },
                         highContrastLight: {
                             description: ( localize(
-                                12929,
+                                13205,
                                 'The default color for high contrast light themes. Either a color value in hex (#RRGGBB[AA]) or the identifier of a themable color which provides the default. If not provided, the `light` color is used as default for high contrast light themes.'
                             )),
                             type: 'string',
@@ -107,7 +107,7 @@ class ColorExtensionPoint {
                 const extensionValue = extension.value;
                 const collector = extension.collector;
                 if (!extensionValue || !Array.isArray(extensionValue)) {
-                    collector.error(( localize(12930, "'configuration.colors' must be a array")));
+                    collector.error(( localize(13206, "'configuration.colors' must be a array")));
                     return;
                 }
                 const parseColorValue = (s, name) => {
@@ -120,7 +120,7 @@ class ColorExtensionPoint {
                         }
                     }
                     collector.error(( localize(
-                        12931,
+                        13207,
                         "{0} must be either a color value in hex (#RRGGBB[AA] or #RGB[A]) or the identifier of a themable color which provides the default.",
                         name
                     )));
@@ -128,19 +128,19 @@ class ColorExtensionPoint {
                 };
                 for (const colorContribution of extensionValue) {
                     if (typeof colorContribution.id !== 'string' || colorContribution.id.length === 0) {
-                        collector.error(( localize(12932, "'configuration.colors.id' must be defined and can not be empty")));
+                        collector.error(( localize(13208, "'configuration.colors.id' must be defined and can not be empty")));
                         return;
                     }
                     if (!colorContribution.id.match(colorIdPattern)) {
                         collector.error(( localize(
-                            12933,
+                            13209,
                             "'configuration.colors.id' must only contain letters, digits and dots and can not start with a dot"
                         )));
                         return;
                     }
                     if (typeof colorContribution.description !== 'string' || colorContribution.id.length === 0) {
                         collector.error(( localize(
-                            12934,
+                            13210,
                             "'configuration.colors.description' must be defined and can not be empty"
                         )));
                         return;
@@ -148,21 +148,21 @@ class ColorExtensionPoint {
                     const defaults = colorContribution.defaults;
                     if (!defaults || typeof defaults !== 'object' || typeof defaults.light !== 'string' || typeof defaults.dark !== 'string') {
                         collector.error(( localize(
-                            12935,
+                            13211,
                             "'configuration.colors.defaults' must be defined and must contain 'light' and 'dark'"
                         )));
                         return;
                     }
                     if (defaults.highContrast && typeof defaults.highContrast !== 'string') {
                         collector.error(( localize(
-                            12936,
+                            13212,
                             "If defined, 'configuration.colors.defaults.highContrast' must be a string."
                         )));
                         return;
                     }
                     if (defaults.highContrastLight && typeof defaults.highContrastLight !== 'string') {
                         collector.error(( localize(
-                            12937,
+                            13213,
                             "If defined, 'configuration.colors.defaults.highContrastLight' must be a string."
                         )));
                         return;
@@ -198,11 +198,11 @@ class ColorDataRenderer extends Disposable {
             return { data: { headers: [], rows: [] }, dispose: () => { } };
         }
         const headers = [
-            ( localize(12938, "ID")),
-            ( localize(12939, "Description")),
-            ( localize(12940, "Dark Default")),
-            ( localize(12941, "Light Default")),
-            ( localize(12942, "High Contrast Default")),
+            ( localize(13214, "ID")),
+            ( localize(13215, "Description")),
+            ( localize(13216, "Dark Default")),
+            ( localize(13217, "Light Default")),
+            ( localize(13218, "High Contrast Default")),
         ];
         const toColor = (colorReference) => colorReference[0] === '#' ? ( Color.fromHex(colorReference)) : undefined;
         const rows = ( colors.sort((a, b) => a.id.localeCompare(b.id))
@@ -226,7 +226,7 @@ class ColorDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions$1.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: 'colors',
-    label: ( localize(12943, "Colors")),
+    label: ( localize(13219, "Colors")),
     access: {
         canToggle: false
     },

package/vscode/src/vs/workbench/services/themes/common/iconExtensionPoint.js

@@ -16,13 +16,13 @@ const iconIdPattern = `^${ThemeIcon.iconNameSegment}(-${ThemeIcon.iconNameSegmen
 const iconConfigurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'icons',
     jsonSchema: {
-        description: ( localize(13002, 'Contributes extension defined themable icons')),
+        description: ( localize(13278, 'Contributes extension defined themable icons')),
         type: 'object',
         propertyNames: {
             pattern: iconIdPattern,
-            description: ( localize(13003, 'The identifier of the themable icon')),
+            description: ( localize(13279, 'The identifier of the themable icon')),
             patternErrorMessage: ( localize(
-                13004,
+                13280,
                 'Identifiers can only contain letters, digits and minuses and need to consist of at least two segments in the form `component-iconname`.'
             )),
         },
@@ -31,7 +31,7 @@ const iconConfigurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
             properties: {
                 description: {
                     type: 'string',
-                    description: ( localize(13005, 'The description of the themable icon')),
+                    description: ( localize(13281, 'The description of the themable icon')),
                 },
                 default: {
                     anyOf: [
@@ -40,11 +40,11 @@ const iconConfigurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
                             type: 'object',
                             properties: {
                                 fontPath: {
-                                    description: ( localize(13006, 'The path of the icon font that defines the icon.')),
+                                    description: ( localize(13282, 'The path of the icon font that defines the icon.')),
                                     type: 'string'
                                 },
                                 fontCharacter: {
-                                    description: ( localize(13007, 'The character for the icon in the icon font.')),
+                                    description: ( localize(13283, 'The character for the icon in the icon font.')),
                                     type: 'string'
                                 }
                             },
@@ -53,7 +53,7 @@ const iconConfigurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
                         }
                     ],
                     description: ( localize(
-                        13008,
+                        13284,
                         'The default of the icon. Either a reference to an existing ThemeIcon or an icon in an icon font.'
                     )),
                 }
@@ -72,7 +72,7 @@ class IconExtensionPoint {
                 const collector = extension.collector;
                 if (!extensionValue || typeof extensionValue !== 'object') {
                     collector.error(( localize(
-                        13009,
+                        13285,
                         "'configuration.icons' must be an object with the icon names as properties."
                     )));
                     return;
@@ -80,7 +80,7 @@ class IconExtensionPoint {
                 for (const id in extensionValue) {
                     if (!id.match(iconIdPattern)) {
                         collector.error(( localize(
-                            13010,
+                            13286,
                             "'configuration.icons' keys represent the icon id and can only contain letter, digits and minuses. They need to consist of at least two segments in the form `component-iconname`."
                         )));
                         return;
@@ -88,7 +88,7 @@ class IconExtensionPoint {
                     const iconContribution = extensionValue[id];
                     if (typeof iconContribution.description !== 'string' || iconContribution.description.length === 0) {
                         collector.error(( localize(
-                            13011,
+                            13287,
                             "'configuration.icons.description' must be defined and can not be empty"
                         )));
                         return;
@@ -102,7 +102,7 @@ class IconExtensionPoint {
                         const format = formatMap[fileExt];
                         if (!format) {
                             collector.warn(( localize(
-                                13012,
+                                13288,
                                 "Expected `contributes.icons.default.fontPath` to have file extension 'woff', woff2' or 'ttf', is '{0}'.",
                                 fileExt
                             )));
@@ -114,7 +114,7 @@ class IconExtensionPoint {
                         const definition = iconRegistry.registerIconFont(fontId, { src: [{ location: iconFontLocation, format }] });
                         if (!isEqualOrParent(iconFontLocation, extensionLocation)) {
                             collector.warn(( localize(
-                                13013,
+                                13289,
                                 "Expected `contributes.icons.default.fontPath` ({0}) to be included inside extension's folder ({0}).",
                                 iconFontLocation.path,
                                 extensionLocation.path
@@ -131,7 +131,7 @@ class IconExtensionPoint {
                     }
                     else {
                         collector.error(( localize(
-                            13014,
+                            13290,
                             "'configuration.icons.default' must be either a reference to the id of an other theme icon (string) or a icon definition (object) with properties `fontPath` and `fontCharacter`."
                         )));
                     }

package/vscode/src/vs/workbench/services/userDataSync/common/userDataSync.js

@@ -8,15 +8,16 @@ import { Categories } from '../../../../platform/action/common/actionCommonCateg
 
 function getSyncAreaLabel(source) {
     switch (source) {
-        case SyncResource.Settings: return localize(13185, "Settings");
-        case SyncResource.Keybindings: return localize(13186, "Keyboard Shortcuts");
-        case SyncResource.Snippets: return localize(13187, "Snippets");
-        case SyncResource.Prompts: return localize(13188, "Prompts and Instructions");
-        case SyncResource.Tasks: return localize(13189, "Tasks");
-        case SyncResource.Extensions: return localize(13190, "Extensions");
-        case SyncResource.GlobalState: return localize(13191, "UI State");
-        case SyncResource.Profiles: return localize(13192, "Profiles");
-        case SyncResource.WorkspaceState: return localize(13193, "Workspace State");
+        case SyncResource.Settings: return localize(13462, "Settings");
+        case SyncResource.Keybindings: return localize(13463, "Keyboard Shortcuts");
+        case SyncResource.Snippets: return localize(13464, "Snippets");
+        case SyncResource.Prompts: return localize(13465, "Prompts and Instructions");
+        case SyncResource.Tasks: return localize(13466, "Tasks");
+        case SyncResource.Mcp: return localize(13467, "MCP Servers");
+        case SyncResource.Extensions: return localize(13468, "Extensions");
+        case SyncResource.GlobalState: return localize(13469, "UI State");
+        case SyncResource.Profiles: return localize(13470, "Profiles");
+        case SyncResource.WorkspaceState: return localize(13471, "Workspace State");
     }
 }
 var AccountStatus;
@@ -25,8 +26,8 @@ var AccountStatus;
     AccountStatus["Unavailable"] = "unavailable";
     AccountStatus["Available"] = "available";
 })(AccountStatus || (AccountStatus = {}));
-const SYNC_TITLE = ( localize2(13194, "Settings Sync"));
-const SYNC_VIEW_ICON = registerIcon('settings-sync-view-icon', Codicon.sync, ( localize(13195, 'View icon of the Settings Sync view.')));
+const SYNC_TITLE = ( localize2(13472, "Settings Sync"));
+const SYNC_VIEW_ICON = registerIcon('settings-sync-view-icon', Codicon.sync, ( localize(13473, 'View icon of the Settings Sync view.')));
 const CONTEXT_SYNC_STATE = ( new RawContextKey('syncStatus', SyncStatus.Uninitialized));
 const CONTEXT_SYNC_ENABLEMENT = ( new RawContextKey('syncEnabled', false));
 const CONTEXT_ACCOUNT_STATE = ( new RawContextKey('userDataSyncAccountStatus', AccountStatus.Uninitialized));
@@ -39,7 +40,7 @@ const SYNC_VIEW_CONTAINER_ID = 'workbench.view.sync';
 const SYNC_CONFLICTS_VIEW_ID = 'workbench.views.sync.conflicts';
 const DOWNLOAD_ACTIVITY_ACTION_DESCRIPTOR = {
     id: 'workbench.userDataSync.actions.downloadSyncActivity',
-    title: ( localize2(13196, "Download Settings Sync Activity")),
+    title: ( localize2(13474, "Download Settings Sync Activity")),
     category: Categories.Developer,
     f1: true,
     precondition: ( ContextKeyExpr.and(( CONTEXT_ACCOUNT_STATE.isEqualTo(AccountStatus.Available)), ( CONTEXT_SYNC_STATE.notEqualsTo(SyncStatus.Uninitialized))))

package/vscode/src/vs/workbench/services/workingCopy/common/workingCopyBackup.d.ts

@@ -1,5 +1,5 @@
 import { VSBufferReadableStream } from "../../../../base/common/buffer.js";
-import { IWorkingCopyBackupMeta } from "@codingame/monaco-vscode-a4683c2b-a0d2-5112-96ba-eedc605346d2-common/vscode/vs/workbench/services/workingCopy/common/workingCopy";
+import { IWorkingCopyBackupMeta } from "@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common/vscode/vs/workbench/services/workingCopy/common/workingCopy";
 export interface IResolvedWorkingCopyBackup<T extends IWorkingCopyBackupMeta> {
     readonly value: VSBufferReadableStream;
     readonly meta?: T;

package/vscode/src/vs/workbench/services/workingCopy/common/workingCopyBackup.service.d.ts

@@ -1,6 +1,6 @@
 import { VSBufferReadable, VSBufferReadableStream } from "../../../../base/common/buffer.js";
 import { CancellationToken } from "../../../../base/common/cancellation.js";
-import { IWorkingCopyIdentifier, IWorkingCopyBackupMeta } from "@codingame/monaco-vscode-a4683c2b-a0d2-5112-96ba-eedc605346d2-common/vscode/vs/workbench/services/workingCopy/common/workingCopy";
+import { IWorkingCopyIdentifier, IWorkingCopyBackupMeta } from "@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common/vscode/vs/workbench/services/workingCopy/common/workingCopy";
 import { IResolvedWorkingCopyBackup } from "./workingCopyBackup.js";
 export declare const IWorkingCopyBackupService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IWorkingCopyBackupService>;
 export interface IWorkingCopyBackupService {

package/vscode/src/vs/workbench/services/workingCopy/common/workingCopyEditorService.service.d.ts

@@ -1,7 +1,7 @@
 import { Event } from "../../../../base/common/event.js";
 import { IDisposable } from "../../../../base/common/lifecycle.js";
 import { IEditorIdentifier } from "../../../common/editor.js";
-import { IWorkingCopy } from "@codingame/monaco-vscode-a4683c2b-a0d2-5112-96ba-eedc605346d2-common/vscode/vs/workbench/services/workingCopy/common/workingCopy";
+import { IWorkingCopy } from "@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common/vscode/vs/workbench/services/workingCopy/common/workingCopy";
 import { IWorkingCopyEditorHandler } from "@codingame/monaco-vscode-working-copy-service-override/vscode/vs/workbench/services/workingCopy/common/workingCopyEditorService";
 export declare const IWorkingCopyEditorService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IWorkingCopyEditorService>;
 export interface IWorkingCopyEditorService {

package/vscode/src/vs/workbench/services/workingCopy/common/workingCopyFileService.service.d.ts

@@ -4,8 +4,8 @@ import { IDisposable } from "../../../../base/common/lifecycle.js";
 import { URI } from "../../../../base/common/uri.js";
 import { IFileStatWithMetadata } from "../../../../platform/files/common/files.js";
 import { IProgress, IProgressStep } from "../../../../platform/progress/common/progress.js";
-import { IStoredFileWorkingCopy, IStoredFileWorkingCopyModel } from "@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/services/workingCopy/common/storedFileWorkingCopy";
-import { IWorkingCopy } from "@codingame/monaco-vscode-a4683c2b-a0d2-5112-96ba-eedc605346d2-common/vscode/vs/workbench/services/workingCopy/common/workingCopy";
+import { IStoredFileWorkingCopy, IStoredFileWorkingCopyModel } from "@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/services/workingCopy/common/storedFileWorkingCopy";
+import { IWorkingCopy } from "@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common/vscode/vs/workbench/services/workingCopy/common/workingCopy";
 import { WorkingCopyFileEvent, IWorkingCopyFileOperationParticipant, IStoredFileWorkingCopySaveParticipant, IStoredFileWorkingCopySaveParticipantContext, ICreateFileOperation, IFileOperationUndoRedoInfo, ICreateOperation, IMoveOperation, ICopyOperation, IDeleteOperation, WorkingCopyProvider } from "@codingame/monaco-vscode-base-service-override/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService";
 export declare const IWorkingCopyFileService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IWorkingCopyFileService>;
 export interface IWorkingCopyFileService {

package/vscode/src/vs/workbench/services/workingCopy/common/workingCopyService.service.d.ts

@@ -1,7 +1,7 @@
 import { Event } from "../../../../base/common/event.js";
 import { IDisposable } from "../../../../base/common/lifecycle.js";
 import { URI } from "../../../../base/common/uri.js";
-import { IWorkingCopy, IWorkingCopyIdentifier } from "@codingame/monaco-vscode-a4683c2b-a0d2-5112-96ba-eedc605346d2-common/vscode/vs/workbench/services/workingCopy/common/workingCopy";
+import { IWorkingCopy, IWorkingCopyIdentifier } from "@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common/vscode/vs/workbench/services/workingCopy/common/workingCopy";
 import { IWorkingCopySaveEvent } from "@codingame/monaco-vscode-working-copy-service-override/vscode/vs/workbench/services/workingCopy/common/workingCopyService";
 export declare const IWorkingCopyService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IWorkingCopyService>;
 export interface IWorkingCopyService {

package/vscode-dts/vscode.proposed.authProviderSpecific.d.ts

@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+declare module 'vscode' {
+
+	// https://github.com/microsoft/vscode/issues/251648
+
+	export interface AuthenticationProviderSessionOptions {
+		/**
+		 * Allows the authentication provider to take in additional parameters.
+		 * It is up to the provider to define what these parameters are and handle them.
+		 * This is useful for passing in additional information that is specific to the provider
+		 * and not part of the standard authentication flow.
+		 */
+		[key: string]: any;
+	}
+
+	// TODO: Implement this interface if needed via an extension
+	// export interface AuthenticationGetSessionOptions {
+	// 	/**
+	// 	 * Allows the authentication provider to take in additional parameters.
+	// 	 * It is up to the provider to define what these parameters are and handle them.
+	// 	 * This is useful for passing in additional information that is specific to the provider
+	// 	 * and not part of the standard authentication flow.
+	// 	 */
+	// 	[key: string]: any;
+	// }
+}

package/vscode-dts/vscode.proposed.chatParticipantAdditions.d.ts

@@ -334,6 +334,10 @@ declare module 'vscode' {
 		copiedCharacters: number;
 		totalCharacters: number;
 		copiedText: string;
+		totalLines: number;
+		copiedLines: number;
+		modelId: string;
+		languageId?: string;
 	}
 
 	export interface ChatInsertAction {
@@ -341,6 +345,9 @@ declare module 'vscode' {
 		kind: 'insert';
 		codeBlockIndex: number;
 		totalCharacters: number;
+		totalLines: number;
+		languageId?: string;
+		modelId: string;
 		newFile?: boolean;
 	}
 
@@ -349,6 +356,9 @@ declare module 'vscode' {
 		kind: 'apply';
 		codeBlockIndex: number;
 		totalCharacters: number;
+		totalLines: number;
+		languageId?: string;
+		modelId: string;
 		newFile?: boolean;
 		codeMapper?: string;
 	}

package/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts

@@ -190,6 +190,16 @@ declare module 'vscode' {
 		terminalCommand?: string;
 	}
 
+	export interface LanguageModelToolInvocationPrepareOptions<T> {
+		/**
+		 * The input that the tool is being invoked with.
+		 */
+		input: T;
+		chatRequestId?: string;
+		chatSessionId?: string;
+		chatInteractionId?: string;
+	}
+
 	export interface PreparedToolInvocation {
 		pastTenseMessage?: string | MarkdownString;
 		presentation?: 'hidden' | undefined;

package/vscode-dts/vscode.proposed.chatProvider.d.ts

@@ -5,10 +5,6 @@
 
 declare module 'vscode' {
 
-	export interface ChatResponseFragment2 {
-		index: number;
-		part: LanguageModelTextPart | LanguageModelToolCallPart;
-	}
 
 	// @API extension ship a d.ts files for their options
 
@@ -16,19 +12,141 @@ declare module 'vscode' {
 	// concrete models. The `provideLanguageModelChatData` would do the discovery and auth dances and later
 	// the model data is passed to the concrete function for making a requested or counting token
 
-	export interface LanguageModelChatData {
-		// like ChatResponseProviderMetadata
+
+	// TODO@API name scheme
+	export interface LanguageModelChatRequestHandleOptions {
+
+		// initiator
+		readonly extensionId: string;
+
+		/**
+		 * A set of options that control the behavior of the language model. These options are specific to the language model
+		 * and need to be looked up in the respective documentation.
+		 */
+		readonly modelOptions: { [name: string]: any };
+
+		/**
+		 * An optional list of tools that are available to the language model. These could be registered tools available via
+		 * {@link lm.tools}, or private tools that are just implemented within the calling extension.
+		 *
+		 * If the LLM requests to call one of these tools, it will return a {@link LanguageModelToolCallPart} in
+		 * {@link LanguageModelChatResponse.stream}. It's the caller's responsibility to invoke the tool. If it's a tool
+		 * registered in {@link lm.tools}, that means calling {@link lm.invokeTool}.
+		 *
+		 * Then, the tool result can be provided to the LLM by creating an Assistant-type {@link LanguageModelChatMessage} with a
+		 * {@link LanguageModelToolCallPart}, followed by a User-type message with a {@link LanguageModelToolResultPart}.
+		 */
+		tools?: LanguageModelChatTool[];
+
+		/**
+		 * 	The tool-selecting mode to use. {@link LanguageModelChatToolMode.Auto} by default.
+		 */
+		toolMode?: LanguageModelChatToolMode;
+	}
+
+	// TODO@API names: LanguageModelChatMetadata, LanguageModelChatItem
+	export interface LanguageModelChatInformation {
+
+		// TODO@API IMPLICT from package-json registration
+		// readonly vendor: string;
+
+		readonly id: string;
+
+		/**
+		 * Human-readable name of the language model.
+		 */
+		readonly name: string;
+		/**
+		 * Opaque family-name of the language model. Values might be `gpt-3.5-turbo`, `gpt4`, `phi2`, or `llama`
+		 * but they are defined by extensions contributing languages and subject to change.
+		 */
+		readonly family: string;
+
+		/**
+		 * An optional, human-readable description of the language model.
+		 */
+		readonly description?: string;
+
+		/**
+		 * An optional, human-readable string representing the cost of using the language model.
+		 */
+		readonly cost?: string;
+
+		/**
+		 * Opaque version string of the model. This is defined by the extension contributing the language model
+		 * and subject to change while the identifier is stable.
+		 */
+		readonly version: string;
+
+		readonly maxInputTokens: number;
+
+		readonly maxOutputTokens: number;
+
+		/**
+		 * When present, this gates the use of `requestLanguageModelAccess` behind an authorization flow where
+		 * the user must approve of another extension accessing the models contributed by this extension.
+		 * Additionally, the extension can provide a label that will be shown in the UI.
+		 */
+		auth?: true | { label: string };
+
+		// TODO@API maybe an enum, LanguageModelChatProviderPickerAvailability?
+		// TODO@API isPreselected proposed
+		readonly isDefault?: boolean;
+
+		// TODO@API nuke
+		readonly isUserSelectable?: boolean;
+
+		readonly capabilities?: {
+
+			// TODO@API have mimeTypes that you support
+			readonly vision?: boolean;
+
+			// TODO@API should be `boolean | number` so extensions can express how many tools they support
+			readonly toolCalling?: boolean | number;
+
+			// TODO@API DO NOT SUPPORT THIS
+			// readonly agentMode?: boolean;
+
+			// TODO@API support prompt TSX style messages, MAYBE leave it out for now
+			readonly promptTsx?: boolean;
+		};
+
+		/**
+		 * Optional category to group models by in the model picker.
+		 * The lower the order, the higher the category appears in the list.
+		 * Has no effect if `isUserSelectable` is `false`.
+		 * If not specified, the model will appear in the "Other Models" category.
+		 */
+		readonly category?: { label: string; order: number };
 	}
 
-	export interface LanguageModelChatProvider2 {
+	export interface LanguageModelChatProvider2<T extends LanguageModelChatInformation = LanguageModelChatInformation> {
 
-		provideLanguageModelChatData(options: { force: boolean }, token: CancellationToken): ProviderResult<LanguageModelChatData[]>;
+		// signals a change from the provider to the editor so that prepareLanguageModelChat is called again
+		onDidChange?: Event<void>;
 
-		provideResponse(model: LanguageModelChatData, messages: Array<LanguageModelChatMessage | LanguageModelChatMessage2>, options: LanguageModelChatRequestOptions, extensionId: string, progress: Progress<ChatResponseFragment2>, token: CancellationToken): Thenable<any>;
+		// NOT cacheable (between reloads)
+		prepareLanguageModelChat(options: { silent: boolean }, token: CancellationToken): ProviderResult<T[]>;
 
-		provideTokenCount(model: LanguageModelChatData, text: string | LanguageModelChatMessage | LanguageModelChatMessage2, token: CancellationToken): Thenable<number>;
+		provideLanguageModelChatResponse(model: T, messages: Array<LanguageModelChatMessage | LanguageModelChatMessage2>, options: LanguageModelChatRequestHandleOptions, progress: Progress<LanguageModelTextPart | LanguageModelToolCallPart>, token: CancellationToken): Thenable<any>;
+
+		provideTokenCount(model: T, text: string | LanguageModelChatMessage | LanguageModelChatMessage2, token: CancellationToken): Thenable<number>;
+	}
+
+	export namespace lm {
+
+		//
+		// export function registerChatModelProvider(vendor: string, provider: LanguageModelChatProvider2): Disposable;
 	}
 
+
+
+	export interface ChatResponseFragment2 {
+		index: number;
+		part: LanguageModelTextPart | LanguageModelToolCallPart;
+	}
+
+
 	/**
 	 * Represents a large language model that accepts ChatML messages and produces a streaming response
 	*/
@@ -37,6 +155,8 @@ declare module 'vscode' {
 		// TODO@API remove or keep proposed?
 		onDidReceiveLanguageModelResponse2?: Event<{ readonly extensionId: string; readonly participant?: string; readonly tokenCount?: number }>;
 
+		// TODO@API
+		// have dedicated options, don't reuse the LanguageModelChatRequestOptions so that consumer and provider part of the API can develop independently
 		provideLanguageModelResponse(messages: Array<LanguageModelChatMessage | LanguageModelChatMessage2>, options: LanguageModelChatRequestOptions, extensionId: string, progress: Progress<ChatResponseFragment2>, token: CancellationToken): Thenable<any>;
 
 		provideTokenCount(text: string | LanguageModelChatMessage | LanguageModelChatMessage2, token: CancellationToken): Thenable<number>;
@@ -88,10 +208,18 @@ declare module 'vscode' {
 		// TODO@API maybe an enum, LanguageModelChatProviderPickerAvailability?
 		readonly isDefault?: boolean;
 		readonly isUserSelectable?: boolean;
+
 		readonly capabilities?: {
 			readonly vision?: boolean;
+
+			// TODO@API should be `boolean | number` so extensions can express how many tools they support
 			readonly toolCalling?: boolean;
+
+			// TODO@API WHY is agentMode a capability? This seems wrong?
 			readonly agentMode?: boolean;
+
+			// TODO@API support prompt TSX style messages
+			// readonly promptTsx?:boolean
 		};
 
 		/**
@@ -105,6 +233,7 @@ declare module 'vscode' {
 
 	export interface ChatResponseProviderMetadata {
 		// limit this provider to some extensions
+		// TODO@API remove? unused?
 		extensions?: string[];
 	}