@codingame/monaco-vscode-api 16.1.1 → 17.1.0

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

@@ -44,6 +44,13 @@ declare module 'vscode' {
 		showInlineEditMenu?: boolean;
 
 		action?: Command;
+
+		displayLocation?: InlineCompletionDisplayLocation;
+	}
+
+	export interface InlineCompletionDisplayLocation {
+		range: Range;
+		label: string;
 	}
 
 	export interface InlineCompletionWarning {
@@ -72,10 +79,27 @@ declare module 'vscode' {
 		handleDidShowCompletionItem?(completionItem: InlineCompletionItem, updatedInsertText: string): void;
 
 		/**
-		 * @param completionItem The completion item that was rejected.
+		 * Is called when an inline completion item was accepted partially.
+		 * @param info Additional info for the partial accepted trigger.
+		 */
+		// eslint-disable-next-line local/vscode-dts-provider-naming
+		handleDidPartiallyAcceptCompletionItem?(completionItem: InlineCompletionItem, info: PartialAcceptInfo): void;
+
+		/**
+		 * Is called when an inline completion item is no longer being used.
+		 * Provides a reason of why it is not used anymore.
 		*/
 		// eslint-disable-next-line local/vscode-dts-provider-naming
-		handleDidRejectCompletionItem?(completionItem: InlineCompletionItem): void;
+		handleEndOfLifetime?(completionItem: InlineCompletionItem, reason: InlineCompletionEndOfLifeReason): void;
+
+		readonly debounceDelayMs?: number;
+
+		onDidChange?: Event<void>;
+
+		// #region Deprecated methods
+
+		/** @deprecated */
+		provideInlineEditsForRange?(document: TextDocument, range: Range, context: InlineCompletionContext, token: CancellationToken): ProviderResult<InlineCompletionItem[] | InlineCompletionList>;
 
 		/**
 		 * Is called when an inline completion item was accepted partially.
@@ -86,17 +110,31 @@ declare module 'vscode' {
 		handleDidPartiallyAcceptCompletionItem?(completionItem: InlineCompletionItem, acceptedLength: number): void;
 
 		/**
-		 * Is called when an inline completion item was accepted partially.
-		 * @param info Additional info for the partial accepted trigger.
-		 */
+		 * @param completionItem The completion item that was rejected.
+		 * @deprecated Use {@link handleEndOfLifetime} instead.
+		*/
 		// eslint-disable-next-line local/vscode-dts-provider-naming
-		handleDidPartiallyAcceptCompletionItem?(completionItem: InlineCompletionItem, info: PartialAcceptInfo): void;
+		handleDidRejectCompletionItem?(completionItem: InlineCompletionItem): void;
 
-		provideInlineEditsForRange?(document: TextDocument, range: Range, context: InlineCompletionContext, token: CancellationToken): ProviderResult<InlineCompletionItem[] | InlineCompletionList>;
+		// #endregion
+	}
 
-		readonly debounceDelayMs?: number;
+	export enum InlineCompletionEndOfLifeReasonKind {
+		Accepted = 0,
+		Rejected = 1,
+		Ignored = 2,
 	}
 
+	export type InlineCompletionEndOfLifeReason = {
+		kind: InlineCompletionEndOfLifeReasonKind.Accepted; // User did an explicit action to accept
+	} | {
+		kind: InlineCompletionEndOfLifeReasonKind.Rejected; // User did an explicit action to reject
+	} | {
+		kind: InlineCompletionEndOfLifeReasonKind.Ignored;
+		supersededBy?: InlineCompletionItem;
+		userTypingDisagreed: boolean;
+	};
+
 	export interface InlineCompletionContext {
 		readonly userPrompt?: string;
 

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

@@ -3,6 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+// version: 2
+
 declare module 'vscode' {
 
 	export interface LanguageModelChat {
@@ -21,7 +23,7 @@ declare module 'vscode' {
 		 * @param content The content of the message.
 		 * @param name The optional name of a user for the message.
 		 */
-		static User(content: string | Array<LanguageModelTextPart | LanguageModelToolResultPart | LanguageModelDataPart>, name?: string): LanguageModelChatMessage2;
+		static User(content: string | Array<LanguageModelTextPart | LanguageModelToolResultPart2 | LanguageModelDataPart | LanguageModelExtraDataPart>, name?: string): LanguageModelChatMessage2;
 
 		/**
 		 * Utility to create a new assistant message.
@@ -29,7 +31,7 @@ declare module 'vscode' {
 		 * @param content The content of the message.
 		 * @param name The optional name of a user for the message.
 		 */
-		static Assistant(content: string | Array<LanguageModelTextPart | LanguageModelToolCallPart | LanguageModelDataPart>, name?: string): LanguageModelChatMessage2;
+		static Assistant(content: string | Array<LanguageModelTextPart | LanguageModelToolCallPart | LanguageModelDataPart | LanguageModelExtraDataPart>, name?: string): LanguageModelChatMessage2;
 
 		/**
 		 * The role of this message.
@@ -40,7 +42,7 @@ declare module 'vscode' {
 		 * A string or heterogeneous array of things that a message can contain as content. Some parts may be message-type
 		 * specific for some models.
 		 */
-		content: Array<LanguageModelTextPart | LanguageModelToolResultPart | LanguageModelToolCallPart | LanguageModelDataPart>;
+		content: Array<LanguageModelTextPart | LanguageModelToolResultPart2 | LanguageModelToolCallPart | LanguageModelDataPart | LanguageModelExtraDataPart>;
 
 		/**
 		 * The optional name of a user for this message.
@@ -54,23 +56,39 @@ declare module 'vscode' {
 		 * @param content The content of the message.
 		 * @param name The optional name of a user for the message.
 		 */
-		constructor(role: LanguageModelChatMessageRole, content: string | Array<LanguageModelTextPart | LanguageModelToolResultPart | LanguageModelToolCallPart | LanguageModelDataPart>, name?: string);
+		constructor(role: LanguageModelChatMessageRole, content: string | Array<LanguageModelTextPart | LanguageModelToolResultPart2 | LanguageModelToolCallPart | LanguageModelDataPart | LanguageModelExtraDataPart>, name?: string);
 	}
 
 	/**
- * A language model response part containing an image, returned from a {@link LanguageModelChatResponse}.
- */
+	 * A language model response part containing arbitrary data, returned from a {@link LanguageModelChatResponse}.
+	 */
 	export class LanguageModelDataPart {
 		/**
-		 * The image content of the part.
+		 * Factory function to create a `LanguageModelDataPart` for an image.
+		 * @param data Binary image data
+		 * @param mimeType The MIME type of the image
 		 */
-		value: ChatImagePart;
+		static image(data: Uint8Array, mimeType: ChatImageMimeType): LanguageModelDataPart;
+
+		static json(value: object): LanguageModelDataPart;
+
+		static text(value: string): LanguageModelDataPart;
 
 		/**
-		 * Construct an image part with the given content.
-		 * @param value The image content of the part.
+		 * The mime type which determines how the data property is interpreted.
+		 */
+		mimeType: string;
+
+		/**
+		 * The data of the part.
 		 */
-		constructor(value: ChatImagePart);
+		data: Uint8Array;
+
+		/**
+		 * Construct a generic data part with the given content.
+		 * @param value The data of the part.
+		 */
+		constructor(data: Uint8Array, mimeType: string);
 	}
 
 	/**
@@ -84,15 +102,87 @@ declare module 'vscode' {
 		BMP = 'image/bmp',
 	}
 
-	export interface ChatImagePart {
+	/**
+	 * Tagging onto this proposal, because otherwise managing two different extensions of LanguageModelChatMessage could be confusing.
+	 * A language model response part containing arbitrary model-specific data, returned from a {@link LanguageModelChatResponse}.
+	 * TODO@API naming, looking at LanguageModelChatRequestOptions.modelOptions, but LanguageModelModelData is not very good.
+	 * LanguageModelOpaqueData from prompt-tsx?
+	 */
+	export class LanguageModelExtraDataPart {
 		/**
-		 * The image's MIME type.
+		 * The type of data. The allowed values and data types here are model-specific.
 		 */
-		mimeType: ChatImageMimeType;
+		kind: string;
 
 		/**
-		 * The raw binary data of the image, encoded as a Uint8Array. Note: do not use base64 encoding. Maximum image size is 5MB.
+		 * Extra model-specific data.
 		 */
-		data: Uint8Array;
+		data: any;
+
+		/**
+		 * Construct an extra data part with the given content.
+		 * @param value The image content of the part.
+		 */
+		constructor(kind: string, data: any);
+	}
+
+
+	/**
+	 * The result of a tool call. This is the counterpart of a {@link LanguageModelToolCallPart tool call} and
+	 * it can only be included in the content of a User message
+	 */
+	export class LanguageModelToolResultPart2 {
+		/**
+		 * The ID of the tool call.
+		 *
+		 * *Note* that this should match the {@link LanguageModelToolCallPart.callId callId} of a tool call part.
+		 */
+		callId: string;
+
+		/**
+		 * The value of the tool result.
+		 */
+		content: Array<LanguageModelTextPart | LanguageModelPromptTsxPart | LanguageModelDataPart | unknown>;
+
+		/**
+		 * @param callId The ID of the tool call.
+		 * @param content The content of the tool result.
+		 */
+		constructor(callId: string, content: Array<LanguageModelTextPart | LanguageModelPromptTsxPart | LanguageModelDataPart | unknown>);
+	}
+
+
+	/**
+	 * A tool that can be invoked by a call to a {@link LanguageModelChat}.
+	 */
+	export interface LanguageModelTool<T> {
+		/**
+		 * Invoke the tool with the given input and return a result.
+		 *
+		 * The provided {@link LanguageModelToolInvocationOptions.input} has been validated against the declared schema.
+		 */
+		invoke(options: LanguageModelToolInvocationOptions<T>, token: CancellationToken): ProviderResult<LanguageModelToolResult2>;
+	}
+
+	/**
+ * A result returned from a tool invocation. If using `@vscode/prompt-tsx`, this result may be rendered using a `ToolResult`.
+ */
+	export class LanguageModelToolResult2 {
+		/**
+		 * A list of tool result content parts. Includes `unknown` becauses this list may be extended with new content types in
+		 * the future.
+		 * @see {@link lm.invokeTool}.
+		 */
+		content: Array<LanguageModelTextPart | LanguageModelPromptTsxPart | LanguageModelDataPart | unknown>;
+
+		/**
+		 * Create a LanguageModelToolResult
+		 * @param content A list of tool result content parts
+		 */
+		constructor(content: Array<LanguageModelTextPart | LanguageModelPromptTsxPart | LanguageModelDataPart | unknown>);
+	}
+
+	export namespace lm {
+		export function invokeTool(name: string, options: LanguageModelToolInvocationOptions<object>, token?: CancellationToken): Thenable<LanguageModelToolResult2>;
 	}
 }

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

@@ -75,6 +75,8 @@ declare module 'vscode' {
 		readonly codeBlocks: { code: string; resource: Uri; markdownBeforeBlock?: string }[];
 		readonly location?: string;
 		readonly chatRequestId?: string;
+		readonly chatRequestModel?: string;
+		readonly chatSessionId?: string;
 	}
 
 	export interface MappedEditsResponseStream {

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

@@ -6,40 +6,134 @@ declare module 'vscode' {
 
 	// https://github.com/microsoft/vscode/issues/243522
 
+	/**
+	 * McpStdioServerDefinition represents an MCP server available by running
+	 * a local process and listening to its stdin and stdout streams. The process
+	 * will be spawned as a child process of the extension host and by default
+	 * will not run in a shell environment.
+	 */
 	export class McpStdioServerDefinition {
-
-		label: string;
-
+		/**
+		 * The human-readable name of the server.
+		 */
+		readonly label: string;
+
+		/**
+		 * The working directory used to start the server.
+		 */
 		cwd?: Uri;
+
+		/**
+		 * The command used to start the server. Node.js-based servers may use
+		 * `process.execPath` to use the editor's version of Node.js to run the script.
+		 */
 		command: string;
-		args: readonly string[];
+		/**
+		 * Additional command-line arguments passed to the server.
+		 */
+		args: string[];
+
+		/**
+		 * Optional additional environment information for the server. Variables
+		 * in this environment will overwrite or remove (if null) the default
+		 * environment variables.
+		 */
 		env: Record<string, string | number | null>;
 
-		constructor(label: string, command: string, args: string[], env: { [key: string]: string });
+		/**
+		 * Optional version identification for the server. If this changes, the
+		 * editor will indicate that tools have changed and prompt to refresh them.
+		 */
+		version?: string;
+
+		/**
+		 * @param label The human-readable name of the server.
+		 * @param command The command used to start the server.
+		 * @param args Additional command-line arguments passed to the server.
+		 * @param env Optional additional environment information for the server.
+		 * @param version Optional version identification for the server.
+		 */
+		constructor(label: string, command: string, args?: string[], env?: Record<string, string | number | null>, version?: string);
 	}
 
-	export class McpSSEServerDefinition {
-
-		label: string;
-
+	/**
+	 * McpHttpServerDefinition represents an MCP server available using the
+	 * Streamable HTTP transport.
+	 */
+	export class McpHttpServerDefinition {
+		/**
+		 * The human-readable name of the server.
+		 */
+		readonly label: string;
+
+		/**
+		 * The URI of the server. The editor will make a POST request to this URI
+		 * to begin each session.
+		 */
 		uri: Uri;
 
-		headers: [string, string][];
-
-		constructor(label: string, uri: Uri);
+		/**
+		 * Optional additional heads included with each request to the server.
+		 */
+		headers: Record<string, string>;
+
+		/**
+		 * Optional version identification for the server. If this changes, the
+		 * editor will indicate that tools have changed and prompt to refresh them.
+		 */
+		version?: string;
+
+		/**
+		 * @param label The human-readable name of the server.
+		 * @param uri The URI of the server.
+		 * @param headers Optional additional heads included with each request to the server.
+		 */
+		constructor(label: string, uri: Uri, headers?: Record<string, string>, version?: string);
 	}
 
-	export type McpServerDefinition = McpStdioServerDefinition | McpSSEServerDefinition;
-
-	export interface McpConfigurationProvider {
-
-		onDidChange?: Event<void>;
-
-		provideMcpServerDefinitions(token: CancellationToken): ProviderResult<McpServerDefinition[]>;
-
+	export type McpServerDefinition = McpStdioServerDefinition | McpHttpServerDefinition;
+
+	/**
+	 * A type that can provide server configurations. This may only be used in
+	 * conjunction with `contributes.modelContextServerCollections` in the
+	 * extension's package.json.
+	 *
+	 * To allow the editor to cache available servers, extensions should register
+	 * this before `activate()` resolves.
+	 */
+	export interface McpServerDefinitionProvider<T extends McpServerDefinition = McpServerDefinition> {
+		/**
+		 * Optional event fired to signal that the set of available servers has changed.
+		 */
+		onDidChangeServerDefinitions?: Event<void>;
+
+		/**
+		 * Provides available MCP servers. The editor will call this method eagerly
+		 * to ensure the availability of servers for the language model, and so
+		 * extensions should not take actions which would require user
+		 * interaction, such as authentication.
+		 *
+		 * @param token A cancellation token.
+		 * @returns An array of MCP available MCP servers
+		 */
+		provideMcpServerDefinitions(token: CancellationToken): ProviderResult<T[]>;
+
+		/**
+		 * This function will be called when the editor needs to start MCP server.
+		 * At this point, the extension may take any actions which may require user
+		 * interaction, such as authentication.
+		 *
+		 * The extension may return undefined on error to indicate that the server
+		 * should not be started.
+		 *
+		 * @param server The MCP server to resolve
+		 * @param token A cancellation token.
+		 * @returns The given, resolved server or thenable that resolves to such.
+		 */
+		resolveMcpServerDefinition?(server: T, token: CancellationToken): ProviderResult<T>;
 	}
 
 	namespace lm {
-		export function registerMcpConfigurationProvider(id: string, provider: McpConfigurationProvider): Disposable;
+		export function registerMcpServerDefinitionProvider(id: string, provider: McpServerDefinitionProvider): Disposable;
 	}
 }

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

@@ -8,11 +8,15 @@ declare module 'vscode' {
 	// https://github.com/microsoft/vscode/issues/169012
 
 	export namespace window {
-		export function registerQuickDiffProvider(selector: DocumentSelector, quickDiffProvider: QuickDiffProvider, label: string, rootUri?: Uri): Disposable;
+		export function registerQuickDiffProvider(selector: DocumentSelector, quickDiffProvider: QuickDiffProvider, id: string, label: string, rootUri?: Uri): Disposable;
+	}
+
+	export interface SourceControl {
+		secondaryQuickDiffProvider?: QuickDiffProvider;
 	}
 
 	export interface QuickDiffProvider {
-		label?: string;
-		readonly visible?: boolean;
+		readonly id?: string;
+		readonly label?: string;
 	}
 }

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

@@ -237,12 +237,34 @@ declare module 'vscode' {
 		lineNumber: number;
 	}
 
+	/**
+	 * Keyword suggestion for AI search.
+	 */
+	export class AISearchKeyword {
+		/**
+		 * @param keyword The keyword associated with the search.
+		 */
+		constructor(keyword: string);
+
+		/**
+		 * The keyword associated with the search.
+		 */
+		keyword: string;
+	}
+
 	/**
 	 * A result payload for a text search, pertaining to {@link TextSearchMatch2 matches}
 	 * and its associated {@link TextSearchContext2 context} within a single file.
 	 */
 	export type TextSearchResult2 = TextSearchMatch2 | TextSearchContext2;
 
+	/**
+	 * A result payload for an AI search.
+	 * This can be a {@link TextSearchMatch2 match} or a {@link AISearchKeyword keyword}.
+	 * The result can be a match or a keyword.
+	 */
+	export type AISearchResult = TextSearchResult2 | AISearchKeyword;
+
 	/**
 	 * A TextSearchProvider provides search results for text results inside files in the workspace.
 	 */
@@ -255,7 +277,7 @@ declare module 'vscode' {
 		 * These results can be direct matches, or context that surrounds matches.
 		 * @param token A cancellation token.
 		 */
-		provideTextSearchResults(query: TextSearchQuery2, options: TextSearchProviderOptions, progress: Progress<TextSearchResult2>, token: CancellationToken): ProviderResult<TextSearchComplete2>;
+		provideTextSearchResults(query: TextSearchQuery2, options: TextSearchProviderOptions, progress: Progress<AISearchResult>, token: CancellationToken): ProviderResult<TextSearchComplete2>;
 	}
 
 	export namespace workspace {

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

@@ -0,0 +1,25 @@
+/*---------------------------------------------------------------------------------------------
+ *  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' {
+
+	/**
+	 * A progress update during an {@link LanguageModelTool.invoke} call.
+	 */
+	export interface ToolProgressStep {
+		/**
+		 * A progress message that represents a chunk of work
+		 */
+		message?: string | MarkdownString;
+		/**
+		 * An increment for discrete progress. Increments will be summed up until 100 (100%) is reached
+		 */
+		increment?: number;
+	}
+
+	export interface LanguageModelTool<T> {
+		invoke(options: LanguageModelToolInvocationOptions<T>, token: CancellationToken, progress: Progress<ToolProgressStep>): ProviderResult<LanguageModelToolResult>;
+	}
+}

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

@@ -31,7 +31,7 @@ declare module 'vscode' {
 
 	export interface TunnelProvider {
 		/**
-		 * Provides port forwarding capabilities. If there is a resolver that already provids tunnels, then the resolver's provider will
+		 * Provides port forwarding capabilities. If there is a resolver that already provides tunnels, then the resolver's provider will
 		 * be used. If multiple providers are registered, then only the first will be used.
 		 */
 		provideTunnel(tunnelOptions: TunnelOptions, tunnelCreationOptions: TunnelCreationOptions, token: CancellationToken): ProviderResult<Tunnel>;

package/workbench.d.ts

@@ -1,5 +1,5 @@
 import { type IAnyWorkspaceIdentifier } from "./vscode/src/vs/platform/workspace/common/workspace.js";
-import type { IWorkbenchConstructionOptions } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/browser/web.api";
+import type { IWorkbenchConstructionOptions } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/browser/web.api";
 import { URI } from "./vscode/src/vs/base/common/uri.js";
 export interface EnvironmentOverride {
     userHome?: URI;

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

@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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' {
-	// Enables access to providing language model tools to agent mode
-}