api - refine agent property of turn instances (microsoft#205231)

microsoft#199908

Author: jrieken

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

@@ -235,11 +235,11 @@ export class ExtHostChatAgents2 implements ExtHostChatAgentsShape2 {
 				{ ...ehResult, metadata: undefined };
 
 			// REQUEST turn
-			res.push(new extHostTypes.ChatAgentRequestTurn(h.request.message, h.request.command, h.request.variables.variables.map(typeConvert.ChatAgentResolvedVariable.to), { extensionId: '', agentId: h.request.agentId }));
+			res.push(new extHostTypes.ChatAgentRequestTurn(h.request.message, h.request.command, h.request.variables.variables.map(typeConvert.ChatAgentResolvedVariable.to), { extensionId: '', agent: h.request.agentId, agentId: h.request.agentId }));
 
 			// RESPONSE turn
 			const parts = coalesce(h.response.map(r => typeConvert.ChatResponsePart.from(r, this.commands.converter)));
-			res.push(new extHostTypes.ChatAgentResponseTurn(parts, result, { extensionId: '', agentId: h.request.agentId }));
+			res.push(new extHostTypes.ChatAgentResponseTurn(parts, result, { extensionId: '', agent: h.request.agentId, agentId: h.request.agentId }));
 		}
 
 		return res;

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

@@ -4257,28 +4257,21 @@ export class ChatResponseReferencePart {
 
 
 export class ChatAgentRequestTurn implements vscode.ChatAgentRequestTurn {
-	agentId: string;
 	constructor(
 		readonly prompt: string,
 		readonly command: string | undefined,
 		readonly variables: vscode.ChatAgentResolvedVariable[],
-		readonly agent: { extensionId: string; agentId: string },
-	) {
-		this.agentId = agent.agentId;
-	}
+		readonly agent: { extensionId: string; agent: string; agentId: string },
+	) { }
 }
 
 export class ChatAgentResponseTurn implements vscode.ChatAgentResponseTurn {
 
-	agentId: string;
-
 	constructor(
 		readonly response: ReadonlyArray<ChatResponseTextPart | ChatResponseMarkdownPart | ChatResponseFileTreePart | ChatResponseAnchorPart | ChatResponseCommandButtonPart>,
 		readonly result: vscode.ChatAgentResult2,
-		readonly agent: { extensionId: string; agentId: string }
-	) {
-		this.agentId = agent.agentId;
-	}
+		readonly agent: { extensionId: string; agent: string; agentId: string }
+	) { }
 }
 
 export class LanguageModelSystemMessage {

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

@@ -22,7 +22,7 @@ declare module 'vscode' {
 		 * The ID of the chat agent to which this request was directed.
 		 */
 		// TODO@API NAME: agentId shouldbe agentName or just agent (because it is ChatAgent#name)
-		readonly agent: { readonly extensionId: string; readonly agentId: string };
+		readonly agent: { readonly extensionId: string; readonly agent: string; readonly agentId: string };
 
 		/**
 		 * The name of the {@link ChatAgentCommand command} that was selected for this request.
@@ -51,7 +51,7 @@ declare module 'vscode' {
 		readonly result: ChatAgentResult2;
 
 		// TODO@API NAME: agentId shouldbe agentName or just agent (because it is ChatAgent#name)
-		readonly agent: { readonly extensionId: string; readonly agentId: string };
+		readonly agent: { readonly extensionId: string; readonly agent: string; readonly agentId: string };
 
 		private constructor(response: ReadonlyArray<ChatResponseTextPart | ChatResponseMarkdownPart | ChatResponseFileTreePart | ChatResponseAnchorPart | ChatResponseCommandButtonPart>, result: ChatAgentResult2, agentId: { extensionId: string; agentId: string });
 	}