Revert proposal changes

Author: alexr00

src/@types/vscode.proposed.chatContextProvider.d.ts

@@ -11,45 +11,16 @@ declare module 'vscode' {
 	export namespace chat {
 
 		/**
-		 * Register a chat workspace context provider. Workspace context is automatically included in all chat requests.
+		 * Register a chat context provider. Chat context can be provided:
+		 * - For a resource. Make sure to pass a selector that matches the resource you want to provide context for.
+		 *   Providers registered without a selector will not be called for resource-based context.
+		 * - Explicitly. These context items are shown as options when the user explicitly attaches context.
 		 *
 		 * To ensure your extension is activated when chat context is requested, make sure to include the following activations events:
 		 * - If your extension implements `provideWorkspaceChatContext` or `provideChatContextForResource`, find an activation event which is a good signal to activate.
 		 *   Ex: `onLanguage:<languageId>`, `onWebviewPanel:<viewType>`, etc.`
 		 * - If your extension implements `provideChatContextExplicit`, your extension will be automatically activated when the user requests explicit context.
 		 *
-		 * @param id Unique identifier for the provider.
-		* @param provider The chat workspace context provider.
-		*/
-		export function registerChatWorkspaceContextProvider(id: string, provider: ChatWorkspaceContextProvider): Disposable;
-
-		/**
-		 * Register a chat explicit context provider. Explicit context items are shown as options when the user explicitly attaches context.
-		 *
-		 * To ensure your extension is activated when chat context is requested, make sure to include the `onChatContextProvider:<id>` activation event in your `package.json`.
-		 *
-		 * @param id Unique identifier for the provider.
-		 * @param provider The chat explicit context provider.
-		 */
-		export function registerChatExplicitContextProvider(id: string, provider: ChatExplicitContextProvider): Disposable;
-
-		/**
-		 * Register a chat resource context provider. Resource context is provided for a specific resource.
-		 * Make sure to pass a selector that matches the resource you want to provide context for.
-		 *
-		 * To ensure your extension is activated when chat context is requested, make sure to include the `onChatContextProvider:<id>` activation event in your `package.json`.
-		 *
-		 * @param selector Document selector to filter which resources the provider is called for.
-		 * @param id Unique identifier for the provider.
-		 * @param provider The chat resource context provider.
-		 */
-		export function registerChatResourceContextProvider(selector: DocumentSelector, id: string, provider: ChatResourceContextProvider): Disposable;
-
-		/**
-		 * Register a chat context provider.
-		 *
-		 * @deprecated Use {@link registerChatWorkspaceContextProvider}, {@link registerChatExplicitContextProvider}, or {@link registerChatResourceContextProvider} instead.
-		 *
 		 * @param selector Optional document selector to filter which resources the provider is called for. If omitted, the provider will only be called for explicit context requests.
 		 * @param id Unique identifier for the provider.
 		 * @param provider The chat context provider.
@@ -61,21 +32,12 @@ declare module 'vscode' {
 	export interface ChatContextItem {
 		/**
 		 * Icon for the context item.
-		 * - If `icon` is not defined, no icon is shown.
-		 * - If `icon` is defined and is a file or folder icon, the icon is derived from {@link resourceUri} if `resourceUri` is defined.
-		 * - Otherwise, `icon` is used.
 		 */
-		icon?: ThemeIcon;
+		icon: ThemeIcon;
 		/**
 		 * Human readable label for the context item.
-		 * If not set, the label is derived from {@link resourceUri}.
-		 */
-		label?: string;
-		/**
-		 * A resource URI for the context item.
-		 * Used to derive the {@link label} and {@link icon} if they are not set.
 		 */
-		resourceUri?: Uri;
+		label: string;
 		/**
 		 * An optional description of the context item, e.g. to describe the item to the language model.
 		 */
@@ -95,24 +57,23 @@ declare module 'vscode' {
 		command?: Command;
 	}
 
-	export interface ChatWorkspaceContextProvider<T extends ChatContextItem = ChatContextItem> {
+	export interface ChatContextProvider<T extends ChatContextItem = ChatContextItem> {
 
 		/**
 		 * An optional event that should be fired when the workspace chat context has changed.
 		 */
 		onDidChangeWorkspaceChatContext?: Event<void>;
 
 		/**
+		 * TODO @API: should this be a separate provider interface?
+		 *
 		 * Provide a list of chat context items to be included as workspace context for all chat requests.
 		 * This should be used very sparingly to avoid providing useless context and to avoid using up the context window.
 		 * A good example use case is to provide information about which branch the user is working on in a source control context.
 		 *
 		 * @param token A cancellation token.
 		 */
-		provideChatContext(token: CancellationToken): ProviderResult<T[]>;
-	}
-
-	export interface ChatExplicitContextProvider<T extends ChatContextItem = ChatContextItem> {
+		provideWorkspaceChatContext?(token: CancellationToken): ProviderResult<T[]>;
 
 		/**
 		 * Provide a list of chat context items that a user can choose from. These context items are shown as options when the user explicitly attaches context.
@@ -121,18 +82,7 @@ declare module 'vscode' {
 		 *
 		 * @param token A cancellation token.
 		 */
-		provideChatContext(token: CancellationToken): ProviderResult<T[]>;
-
-		/**
-		 * If a chat context item is provided without a `value`, this method is called to resolve the `value` for the item.
-		 *
-		 * @param context The context item to resolve.
-		 * @param token A cancellation token.
-		 */
-		resolveChatContext(context: T, token: CancellationToken): ProviderResult<ChatContextItem>;
-	}
-
-	export interface ChatResourceContextProvider<T extends ChatContextItem = ChatContextItem> {
+		provideChatContextExplicit?(token: CancellationToken): ProviderResult<T[]>;
 
 		/**
 		 * Given a particular resource, provide a chat context item for it. This is used for implicit context (see the settings `chat.implicitContext.enabled` and `chat.implicitContext.suggestedContext`).
@@ -144,51 +94,15 @@ declare module 'vscode' {
 		 * @param options Options include the resource for which to provide context.
 		 * @param token A cancellation token.
 		 */
-		provideChatContext(options: { resource: Uri }, token: CancellationToken): ProviderResult<T | undefined>;
+		provideChatContextForResource?(options: { resource: Uri }, token: CancellationToken): ProviderResult<T | undefined>;
 
 		/**
-		 * If a chat context item is provided without a `value`, this method is called to resolve the `value` for the item.
+		 * If a chat context item is provided without a `value`, from either of the `provide` methods, this method is called to resolve the `value` for the item.
 		 *
 		 * @param context The context item to resolve.
 		 * @param token A cancellation token.
 		 */
 		resolveChatContext(context: T, token: CancellationToken): ProviderResult<ChatContextItem>;
 	}
 
-	/**
-	 * @deprecated Use {@link ChatWorkspaceContextProvider}, {@link ChatExplicitContextProvider}, or {@link ChatResourceContextProvider} instead.
-	 */
-	export interface ChatContextProvider<T extends ChatContextItem = ChatContextItem> {
-
-		/**
-		 * An optional event that should be fired when the workspace chat context has changed.
-		 * @deprecated Use {@link ChatWorkspaceContextProvider.onDidChangeWorkspaceChatContext} instead.
-		 */
-		onDidChangeWorkspaceChatContext?: Event<void>;
-
-		/**
-		 * Provide a list of chat context items to be included as workspace context for all chat requests.
-		 * @deprecated Use {@link ChatWorkspaceContextProvider.provideChatContext} instead.
-		 */
-		provideWorkspaceChatContext?(token: CancellationToken): ProviderResult<T[]>;
-
-		/**
-		 * Provide a list of chat context items that a user can choose from.
-		 * @deprecated Use {@link ChatExplicitContextProvider.provideChatContext} instead.
-		 */
-		provideChatContextExplicit?(token: CancellationToken): ProviderResult<T[]>;
-
-		/**
-		 * Given a particular resource, provide a chat context item for it.
-		 * @deprecated Use {@link ChatResourceContextProvider.provideChatContext} instead.
-		 */
-		provideChatContextForResource?(options: { resource: Uri }, token: CancellationToken): ProviderResult<T | undefined>;
-
-		/**
-		 * If a chat context item is provided without a `value`, this method is called to resolve the `value` for the item.
-		 * @deprecated Use the `resolveChatContext` method on the specific provider type instead.
-		 */
-		resolveChatContext?(context: T, token: CancellationToken): ProviderResult<ChatContextItem>;
-	}
-
 }

src/@types/vscode.proposed.chatParticipantAdditions.d.ts

@@ -3,8 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-// version: 1
-
 declare module 'vscode' {
 
 	export interface ChatParticipant {
@@ -98,108 +96,6 @@ declare module 'vscode' {
 		constructor(title: string, message: string | MarkdownString, data: any, buttons?: string[]);
 	}
 
-	/**
-	 * An option for a question in a carousel.
-	 */
-	export interface ChatQuestionOption {
-		/**
-		 * Unique identifier for the option.
-		 */
-		id: string;
-		/**
-		 * The display label for the option.
-		 */
-		label: string;
-		/**
-		 * The value returned when this option is selected.
-		 */
-		value: unknown;
-	}
-
-	/**
-	 * The type of question for a chat question carousel.
-	 */
-	export enum ChatQuestionType {
-		/**
-		 * A free-form text input question.
-		 */
-		Text = 1,
-		/**
-		 * A single-select question with radio buttons.
-		 */
-		SingleSelect = 2,
-		/**
-		 * A multi-select question with checkboxes.
-		 */
-		MultiSelect = 3
-	}
-
-	/**
-	 * A question to be displayed in a question carousel.
-	 */
-	export class ChatQuestion {
-		/**
-		 * Unique identifier for the question.
-		 */
-		id: string;
-		/**
-		 * The type of question: Text for free-form input, SingleSelect for radio buttons, MultiSelect for checkboxes.
-		 */
-		type: ChatQuestionType;
-		/**
-		 * The title/header of the question.
-		 */
-		title: string;
-		/**
-		 * Optional detailed message or description for the question.
-		 */
-		message?: string | MarkdownString;
-		/**
-		 * Options for singleSelect or multiSelect questions.
-		 */
-		options?: ChatQuestionOption[];
-		/**
-		 * The id(s) of the default selected option(s).
-		 * For SingleSelect, this should be a single option id.
-		 * For MultiSelect, this can be an array of option ids.
-		 */
-		defaultValue?: string | string[];
-		/**
-		 * Whether to allow free-form text input in addition to predefined options.
-		 * When true, users can provide their own text answer even for SingleSelect or MultiSelect questions.
-		 */
-		allowFreeformInput?: boolean;
-
-		constructor(
-			id: string,
-			type: ChatQuestionType,
-			title: string,
-			options?: {
-				message?: string | MarkdownString;
-				options?: ChatQuestionOption[];
-				defaultValue?: string | string[];
-				allowFreeformInput?: boolean;
-			}
-		);
-	}
-
-	/**
-	 * A carousel view for presenting multiple questions inline in the chat.
-	 * The UI is displayed but does not block the chat input.
-	 */
-	export class ChatResponseQuestionCarouselPart {
-		/**
-		 * The questions to display in the carousel.
-		 */
-		questions: ChatQuestion[];
-		/**
-		 * Whether users can skip answering the questions.
-		 */
-		allowSkip: boolean;
-
-		constructor(questions: ChatQuestion[], allowSkip?: boolean);
-	}
-
 	export class ChatResponseCodeCitationPart {
 		value: Uri;
 		license: string;
@@ -266,20 +162,6 @@ declare module 'vscode' {
 		output: McpToolInvocationContentData[];
 	}
 
-	export enum ChatTodoStatus {
-		NotStarted = 1,
-		InProgress = 2,
-		Completed = 3
-	}
-
-	export interface ChatTodoToolInvocationData {
-		todoList: Array<{
-			id: number;
-			title: string;
-			status: ChatTodoStatus;
-		}>;
-	}
-
 	export class ChatToolInvocationPart {
 		toolName: string;
 		toolCallId: string;
@@ -289,8 +171,8 @@ declare module 'vscode' {
 		pastTenseMessage?: string | MarkdownString;
 		isConfirmed?: boolean;
 		isComplete?: boolean;
-		toolSpecificData?: ChatTerminalToolInvocationData | ChatMcpToolInvocationData | ChatTodoToolInvocationData;
-		subAgentInvocationId?: string;
+		toolSpecificData?: ChatTerminalToolInvocationData;
+		fromSubAgent?: boolean;
 		presentation?: 'hidden' | 'hiddenAfterComplete' | undefined;
 
 		constructor(toolName: string, toolCallId: string, isError?: boolean);
@@ -362,7 +244,7 @@ declare module 'vscode' {
 		constructor(uris: Uri[], callback: () => Thenable<unknown>);
 	}
 
-	export type ExtendedChatResponsePart = ChatResponsePart | ChatResponseTextEditPart | ChatResponseNotebookEditPart | ChatResponseWorkspaceEditPart | ChatResponseConfirmationPart | ChatResponseCodeCitationPart | ChatResponseReferencePart2 | ChatResponseMovePart | ChatResponseExtensionsPart | ChatResponsePullRequestPart | ChatToolInvocationPart | ChatResponseMultiDiffPart | ChatResponseThinkingProgressPart | ChatResponseExternalEditPart | ChatResponseQuestionCarouselPart;
+	export type ExtendedChatResponsePart = ChatResponsePart | ChatResponseTextEditPart | ChatResponseNotebookEditPart | ChatResponseConfirmationPart | ChatResponseCodeCitationPart | ChatResponseReferencePart2 | ChatResponseMovePart | ChatResponseExtensionsPart | ChatResponsePullRequestPart | ChatPrepareToolInvocationPart | ChatToolInvocationPart | ChatResponseMultiDiffPart | ChatResponseThinkingProgressPart | ChatResponseExternalEditPart;
 	export class ChatResponseWarningPart {
 		value: MarkdownString;
 		constructor(value: string | MarkdownString);
@@ -526,15 +408,6 @@ declare module 'vscode' {
 		 */
 		confirmation(title: string, message: string | MarkdownString, data: any, buttons?: string[]): void;
 
-		/**
-		 * Show an inline carousel of questions to gather information from the user.
-		 * This is a blocking call that waits for the user to submit or skip the questions.
-		 * @param questions Array of questions to display to the user
-		 * @param allowSkip Whether the user can skip questions without answering
-		 * @returns A promise that resolves with the user's answers, or undefined if skipped
-		 */
-		questionCarousel(questions: ChatQuestion[], allowSkip?: boolean): Thenable<Record<string, unknown> | undefined>;
-
 		/**
 		 * Push a warning to this stream. Short-hand for
 		 * `push(new ChatResponseWarningPart(message))`.
@@ -569,13 +442,6 @@ declare module 'vscode' {
 		push(part: ExtendedChatResponsePart): void;
 
 		clearToPreviousToolInvocation(reason: ChatResponseClearToPreviousToolInvocationReason): void;
-
-		/**
-		 * Report token usage information for this request.
-		 * This is typically called when the underlying language model provides usage statistics.
-		 * @param usage Token usage information including prompt and completion tokens
-		 */
-		usage(usage: ChatResultUsage): void;
 	}
 
 	export enum ChatResponseReferencePartStatusKind {
@@ -767,6 +633,12 @@ declare module 'vscode' {
 		 * An optional detail string that will be rendered at the end of the response in certain UI contexts.
 		 */
 		details?: string;
+
+		/**
+		 * Token usage information for this request, if available.
+		 * This is typically provided by the underlying language model.
+		 */
+		readonly usage?: ChatResultUsage;
 	}
 
 	export namespace chat {