add follow up to tool call (#7171)

Author: joshspicer

package.json

@@ -3380,6 +3380,10 @@
 						"body": {
 							"type": "string",
 							"description": "The body/description of the issue. Populate from chat context."
+						},
+						"existingPullRequest": {
+							"type": "number",
+							"description": "The number of an existing pull request that is connected to the current Coding Agent task. Look in the history for this number.  In the chat it may look like 'Coding agent will continue work in #17...'. In this example, return just '17'."
 						}
 					}
 				}

src/github/copilotRemoteAgent.ts

@@ -232,6 +232,34 @@ export class CopilotRemoteAgentManager extends Disposable {
 		}
 	}
 
+	async addFollowUpToExistingPR(pullRequestNumber: number, userPrompt: string, summary?: string): Promise<string | undefined> {
+		const repoInfo = await this.repoInfo();
+		if (!repoInfo) {
+			return;
+		}
+		try {
+			const ghRepo = repoInfo.ghRepository;
+			const pr = await ghRepo.getPullRequest(pullRequestNumber);
+			if (!pr) {
+				Logger.error(`Could not find pull request #${pullRequestNumber}`, CopilotRemoteAgentManager.ID);
+				return;
+			}
+			// Add a comment tagging @copilot with the user's prompt
+			const commentBody = `${COPILOT} ${userPrompt} \n\n --- \n\n ${summary ?? ''}`;
+			const commentResult = await pr.createIssueComment(commentBody);
+			if (!commentResult) {
+				Logger.error(`Failed to add comment to PR #${pullRequestNumber}`, CopilotRemoteAgentManager.ID);
+				return;
+			}
+			Logger.appendLine(`Added comment ${commentResult.htmlUrl}`, CopilotRemoteAgentManager.ID);
+			// allow-any-unicode-next-line
+			return vscode.l10n.t('🚀 Follow-up comment added to [#{0}]({1})', pullRequestNumber, commentResult.htmlUrl);
+		} catch (err) {
+			Logger.error(`Failed to add follow-up comment to PR #${pullRequestNumber}: ${err}`, CopilotRemoteAgentManager.ID);
+			return;
+		}
+	}
+
 	async commandImpl(args?: ICopilotRemoteAgentCommandArgs): Promise<string | undefined> {
 		if (!args) {
 			return;
@@ -253,28 +281,7 @@ export class CopilotRemoteAgentManager extends Disposable {
 		// {"owner":"monalisa","repo":"app","pullRequestNumber":18}
 		let followUpPR: number | undefined = this.parseFollowup(followup, repoInfo);
 		if (followUpPR) {
-			try {
-				const ghRepo = repoInfo.ghRepository;
-				// Fetch the PullRequestModel by number
-				const pr = await ghRepo.getPullRequest(followUpPR);
-				if (!pr) {
-					Logger.error(`Could not find pull request #${followUpPR}`, CopilotRemoteAgentManager.ID);
-					return;
-				}
-				// Add a comment tagging @copilot with the user's prompt
-				const commentBody = `${COPILOT} ${userPrompt} \n\n --- \n\n ${summary ?? ''}`;
-				const commentResult = await pr.createIssueComment(commentBody);
-				if (!commentResult) {
-					Logger.error(`Failed to add comment to PR #${followUpPR}`, CopilotRemoteAgentManager.ID);
-					return;
-				}
-				Logger.appendLine(`Added comment ${commentResult.htmlUrl}`, CopilotRemoteAgentManager.ID);
-				// allow-any-unicode-next-line
-				return vscode.l10n.t('🚀 Follow-up comment added to [#{0}]({1})', followUpPR, commentResult.htmlUrl);
-			} catch (err) {
-				Logger.error(`Failed to add follow-up comment to PR #${followUpPR}: ${err}`, CopilotRemoteAgentManager.ID);
-				return;
-			}
+			return this.addFollowUpToExistingPR(followUpPR, userPrompt, summary);
 		}
 
 		const repoName = `${owner}/${repo}`;

src/lm/tools/copilotRemoteAgentTool.ts

@@ -16,6 +16,7 @@ export interface CopilotRemoteAgentToolParameters {
 	// };
 	title: string;
 	body?: string;
+	existingPullRequest?: string;
 }
 
 export class CopilotRemoteAgentTool implements vscode.LanguageModelTool<CopilotRemoteAgentToolParameters> {
@@ -24,7 +25,7 @@ export class CopilotRemoteAgentTool implements vscode.LanguageModelTool<CopilotR
 	constructor(private manager: CopilotRemoteAgentManager) { }
 
 	async prepareInvocation(options: vscode.LanguageModelToolInvocationPrepareOptions<CopilotRemoteAgentToolParameters>): Promise<vscode.PreparedToolInvocation> {
-		const { title } = options.input;
+		const { title, existingPullRequest } = options.input;
 
 		// Check if the coding agent is available (enabled and assignable)
 		const isAvailable = await this.manager.isAvailable();
@@ -38,9 +39,11 @@ export class CopilotRemoteAgentTool implements vscode.LanguageModelTool<CopilotR
 			pastTenseMessage: vscode.l10n.t('Launched coding agent'),
 			invocationMessage: vscode.l10n.t('Launching coding agent'),
 			confirmationMessages: {
-				message: targetRepo && autoPushEnabled
-					? vscode.l10n.t('The coding agent will continue work on "**{0}**" in a new branch on "**{1}/{2}**". Any uncommitted changes will be **automatically pushed**.', title, targetRepo.owner, targetRepo.repo)
-					: vscode.l10n.t('The coding agent will start working on "**{0}**"', title),
+				message: existingPullRequest
+					? vscode.l10n.t('The coding agent will incorporate your feedback on existing pull request **#{0}**.', existingPullRequest)
+					: (targetRepo && autoPushEnabled
+						? vscode.l10n.t('The coding agent will continue work on "**{0}**" in a new branch on "**{1}/{2}**". Any uncommitted changes will be **automatically pushed**.', title, targetRepo.owner, targetRepo.repo)
+						: vscode.l10n.t('The coding agent will start working on "**{0}**"', title)),
 				title: vscode.l10n.t('Start coding agent?'),
 			}
 		};
@@ -52,12 +55,27 @@ export class CopilotRemoteAgentTool implements vscode.LanguageModelTool<CopilotR
 	): Promise<vscode.LanguageModelToolResult | undefined> {
 		const title = options.input.title;
 		const body = options.input.body || '';
+		const existingPullRequest = options.input.existingPullRequest || '';
 		const targetRepo = await this.manager.repoInfo();
 		if (!targetRepo) {
 			return new vscode.LanguageModelToolResult([
 				new vscode.LanguageModelTextPart(vscode.l10n.t('No repository information found. Please open a workspace with a Git repository.'))
 			]);
 		}
+
+		if (existingPullRequest) {
+			const pullRequestNumber = parseInt(existingPullRequest, 10);
+			if (isNaN(pullRequestNumber)) {
+				return new vscode.LanguageModelToolResult([
+					new vscode.LanguageModelTextPart(vscode.l10n.t('Invalid pull request number: {0}', existingPullRequest))
+				]);
+			}
+			const result = await this.manager.addFollowUpToExistingPR(pullRequestNumber, title, body);
+			return new vscode.LanguageModelToolResult([
+				new vscode.LanguageModelTextPart(vscode.l10n.t('Follow-up added to pull request #{0}.', pullRequestNumber)),
+			]);
+		}
+
 		const result = await this.manager.invokeRemoteAgent(title, body);
 		if (result.state === 'error') {
 			throw new Error(result.error);