Inline and document more chatAgents2 API

src/vs/workbench/api/common/extHostChatAgents2.ts

@@ -78,7 +78,7 @@ export class ExtHostChatAgents2 implements ExtHostChatAgentsShape2 {
 					slashCommand
 				},
 				{ history: context.history.map(typeConvert.ChatMessage.to) },
-				new Progress<vscode.InteractiveProgress>(p => {
+				new Progress<vscode.ChatAgentProgress>(p => {
 					throwIfDone();
 					const convertedProgress = typeConvert.ChatResponseProgress.from(p);
 					this._proxy.$handleProgressChunk(requestId, convertedProgress);
@@ -332,7 +332,7 @@ class ExtHostChatAgent {
 		} satisfies vscode.ChatAgent2;
 	}
 
-	invoke(request: vscode.ChatAgentRequest, context: vscode.ChatAgentContext, progress: Progress<vscode.InteractiveProgress>, token: CancellationToken): vscode.ProviderResult<vscode.ChatAgentResult2> {
+	invoke(request: vscode.ChatAgentRequest, context: vscode.ChatAgentContext, progress: Progress<vscode.ChatAgentProgress>, token: CancellationToken): vscode.ProviderResult<vscode.ChatAgentResult2> {
 		return this._callback(request, context, progress, token);
 	}
 }

src/vs/workbench/api/common/extHostTypeConverters.ts

@@ -2302,13 +2302,16 @@ export namespace InteractiveEditorResponseFeedbackKind {
 }
 
 export namespace ChatResponseProgress {
-	export function from(progress: vscode.InteractiveProgress): extHostProtocol.IChatResponseProgressDto {
+	export function from(progress: vscode.InteractiveProgress | vscode.ChatAgentProgress): extHostProtocol.IChatResponseProgressDto {
 		if ('placeholder' in progress && 'resolvedContent' in progress) {
 			return { placeholder: progress.placeholder };
 		} else if ('responseId' in progress) {
 			return { requestId: progress.responseId };
 		} else if ('content' in progress) {
-			return { content: typeof progress.content === 'string' ? progress.content : MarkdownString.from(progress.content) };
+			return {
+				content: 'markdownContent' in progress ? progress.markdownContent :
+					(typeof progress.content === 'string' ? progress.content : MarkdownString.from(progress.content))
+			};
 		} else if ('documents' in progress) {
 			return {
 				documents: progress.documents.map(d => ({

src/vs/workbench/api/common/extHostTypes.ts

@@ -4083,8 +4083,8 @@ export class InteractiveWindowInput {
 //#region Interactive session
 
 export enum InteractiveSessionVoteDirection {
-	Up = 1,
-	Down = 2
+	Down = 0,
+	Up = 1
 }
 
 export enum InteractiveSessionCopyKind {

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

@@ -164,8 +164,8 @@ export type IChatFollowup = IChatReplyFollowup | IChatResponseCommandFollowup;
 
 // Name has to match the one in vscode.d.ts for some reason
 export enum InteractiveSessionVoteDirection {
-	Up = 1,
-	Down = 2
+	Down = 0,
+	Up = 1
 }
 
 export interface IChatVoteAction {

src/vscode-dts/vscode.proposed.chatAgents2.d.ts

@@ -146,8 +146,110 @@ declare module 'vscode' {
 		variables: Record<string, ChatVariableValue[]>;
 	}
 
-	// TODO@API InteractiveProgress is a lot to inline...
-	export type ChatAgentHandler = (request: ChatAgentRequest, context: ChatAgentContext, progress: Progress<InteractiveProgress>, token: CancellationToken) => ProviderResult<ChatAgentResult2>;
+	// TODO@API should these each be prefixed ChatAgentProgress*?
+	export type ChatAgentProgress =
+		| ChatAgentContent
+		| ChatAgentTask
+		| ChatAgentFileTree
+		| ChatAgentUsedContext
+		| ChatAgentContentReference
+		| ChatAgentInlineContentReference;
+
+	/**
+	 * Indicates a piece of content that was used by the chat agent while processing the request. Will be displayed to the user.
+	 */
+	export interface ChatAgentContentReference {
+		/**
+		 * The resource that was referenced.
+		 */
+		reference: Uri | Location;
+	}
+
+	/**
+	 * A reference to a piece of content that will be rendered inline with the markdown content.
+	 */
+	export interface ChatAgentInlineContentReference {
+		/**
+		 * The resource being referenced.
+		 */
+		inlineReference: Uri | Location;
+
+		/**
+		 * An alternate title for the resource.
+		 */
+		title?: string;
+	}
+
+	/**
+	 * A piece of the chat response's content. Will be merged with other progress pieces as needed, and rendered as markdown.
+	 */
+	export interface ChatAgentContent {
+		/**
+		 * The content as a string of markdown source.
+		 */
+		content: string;
+	}
+
+	/**
+	 * Represents a piece of the chat response's content that is resolved asynchronously. It is rendered immediately with a placeholder,
+	 * which is replaced once the full content is available.
+	 */
+	export interface ChatAgentTask {
+		/**
+		 * The markdown string to be rendered immediately.
+		 */
+		placeholder: string;
+
+		/**
+		 * A Thenable resolving to the real content. The placeholder will be replaced with this content once it's available.
+		 */
+		resolvedContent: Thenable<ChatAgentContent | ChatAgentFileTree>;
+	}
+
+	/**
+	 * Represents a tree, such as a file and directory structure, rendered in the chat response.
+	 */
+	export interface ChatAgentFileTree {
+		/**
+		 * The root node of the tree.
+		 */
+		treeData: ChatAgentFileTreeData;
+	}
+
+	/**
+	 * Represents a node in a chat response tree.
+	 */
+	export interface ChatAgentFileTreeData {
+		/**
+		 * A human-readable string describing this node.
+		 */
+		label: string;
+
+		/**
+		 * A Uri for this node, opened when it's clicked.
+		 */
+		uri: Uri;
+
+		/**
+		 * The children of this node.
+		 */
+		children?: ChatAgentFileTreeData[];
+	}
+
+	export interface ChatAgentDocumentContext {
+		uri: Uri;
+		version: number;
+		ranges: Range[];
+	}
+
+	/**
+	 * Document references that should be used by the MappedEditsProvider.
+	 */
+	export interface ChatAgentUsedContext {
+		documents: ChatAgentDocumentContext[];
+	}
+
+	export type ChatAgentHandler = (request: ChatAgentRequest, context: ChatAgentContext, progress: Progress<ChatAgentProgress>, token: CancellationToken) => ProviderResult<ChatAgentResult2>;
 
 	export namespace chat {
 

src/vscode-dts/vscode.proposed.chatAgents2Additions.d.ts

@@ -10,6 +10,11 @@ declare module 'vscode' {
 		readonly action: InteractiveSessionCopyAction | InteractiveSessionInsertAction | InteractiveSessionTerminalAction | InteractiveSessionCommandAction;
 	}
 
+	export interface ChatAgentContent {
+		// TODO@API This is an awkward way to describe this but this is temporary until inline references are fully supported and adopted
+		markdownContent: MarkdownString;
+	}
+
 	export interface ChatAgent2 {
 
 		// TODO@API We need this- can't handle telemetry on the vscode side yet

src/vscode-dts/vscode.proposed.interactiveUserActions.d.ts

@@ -6,8 +6,8 @@
 declare module 'vscode' {
 
 	export enum InteractiveSessionVoteDirection {
-		Up = 1,
-		Down = 2
+		Down = 0,
+		Up = 1
 	}
 
 	export interface InteractiveSessionVoteAction {