Ability to add an open (but not checked out) PR as context to chat (#7596)

* Ability to add an open (but not checked out) PR as context to chat
Fixes #7332

* active/open in the confirmation title

Author: alexr00

package.json

@@ -4027,11 +4027,25 @@
 				],
 				"toolReferenceName": "activePullRequest",
 				"displayName": "%languageModelTools.github-pull-request_activePullRequest.displayName%",
-				"modelDescription": "Get comprehensive information about the active or current GitHub pull request (PR). This includes the PR title, full description, list of changed files, review comments, PR state, and status checks/CI results. For PRs created by Copilot, it also includes the session logs which indicate the development process and decisions made by the coding agent. When asked about the active or current pull request, do this first! Use this tool for any request related to \"current changes,\" \"pull request details,\" \"what changed,\" \"PR status,\" or similar queries even if the user does not explicitly mention \"pull request.\"",
+				"modelDescription": "Get comprehensive information about the active GitHub pull request (PR). The active PR is the one that is currently checked out. This includes the PR title, full description, list of changed files, review comments, PR state, and status checks/CI results. For PRs created by Copilot, it also includes the session logs which indicate the development process and decisions made by the coding agent. When asked about the active or current pull request, do this first! Use this tool for any request related to \"current changes,\" \"pull request details,\" \"what changed,\" \"PR status,\" or similar queries even if the user does not explicitly mention \"pull request.\" When asked to use this tool, ALWAYS use it.",
 				"icon": "$(git-pull-request)",
 				"canBeReferencedInPrompt": true,
 				"userDescription": "%languageModelTools.github-pull-request_activePullRequest.description%",
 				"when": "config.githubPullRequests.experimental.chat"
+			},
+			{
+				"name": "github-pull-request_openPullRequest",
+				"tags": [
+					"github",
+					"pull request"
+				],
+				"toolReferenceName": "openPullRequest",
+				"displayName": "%languageModelTools.github-pull-request_openPullRequest.displayName%",
+				"modelDescription": "Get comprehensive information about the GitHub pull request (PR) which is currently visible, but not necessarily checked out. This includes the PR title, full description, list of changed files, review comments, PR state, and status checks/CI results. For PRs created by Copilot, it also includes the session logs which indicate the development process and decisions made by the coding agent. When asked about the currently open pull request, do this first! Use this tool for any request related to \"pull request details,\" \"what changed,\" \"PR status,\" or similar queries even if the user does not explicitly mention \"pull request.\" When asked to use this tool, ALWAYS use it.",
+				"icon": "$(git-pull-request)",
+				"canBeReferencedInPrompt": true,
+				"userDescription": "%languageModelTools.github-pull-request_openPullRequest.description%",
+				"when": "config.githubPullRequests.experimental.chat"
 			}
 		]
 	},

package.nls.json

@@ -385,6 +385,8 @@
 	"languageModelTools.github-pull-request_renderIssues.displayName": "Render issue items in a markdown table",
 	"languageModelTools.github-pull-request_activePullRequest.displayName": "Active Pull Request",
 	"languageModelTools.github-pull-request_activePullRequest.description": "Get information about the active GitHub pull request. This information includes: comments, files changed, pull request title + description, pull request state, and pull request status checks/CI.",
+	"languageModelTools.github-pull-request_openPullRequest.displayName": "Open Pull Request",
+	"languageModelTools.github-pull-request_openPullRequest.description": "Get information about the open GitHub pull request. This information includes: comments, files changed, pull request title + description, pull request state, and pull request status checks/CI.",
 	"languageModelTools.github-pull-request_copilot-coding-agent.displayName": "Copilot coding agent",
 	"languageModelTools.github-pull-request_copilot-coding-agent.userDescription": "Completes the provided task using an asynchronous coding agent. Use when the user wants copilot continue completing a task in the background or asynchronously. Launch an autonomous GitHub Copilot agent to work on coding tasks in the background. The agent will create a new branch, implement the requested changes, and open a pull request with the completed work."
 }

src/lm/tools/activePullRequestTool.ts

@@ -10,33 +10,29 @@ import { GitChangeType, InMemFileChange } from '../../common/file';
 import Logger from '../../common/logger';
 import { CopilotRemoteAgentManager } from '../../github/copilotRemoteAgent';
 import { PullRequestModel } from '../../github/pullRequestModel';
-import { PullRequestOverviewPanel } from '../../github/pullRequestOverview';
 import { RepositoriesManager } from '../../github/repositoriesManager';
 import { FetchIssueResult } from './fetchIssueTool';
 
-export class ActivePullRequestTool implements vscode.LanguageModelTool<FetchIssueResult> {
-	public static readonly toolId = 'github-pull-request_activePullRequest';
+export abstract class PullRequestTool implements vscode.LanguageModelTool<FetchIssueResult> {
 	constructor(
-		private readonly folderManagers: RepositoriesManager,
+		protected readonly folderManagers: RepositoriesManager,
 		private readonly copilotRemoteAgentManager: CopilotRemoteAgentManager
 	) { }
 
-	private _findActivePullRequest(): PullRequestModel | undefined {
-		const folderManager = this.folderManagers.folderManagers.find((manager) => manager.activePullRequest);
-		return folderManager?.activePullRequest ?? PullRequestOverviewPanel.currentPanel?.getCurrentItem();
-	}
+	protected abstract _findActivePullRequest(): PullRequestModel | undefined;
+
+	protected abstract _confirmationTitle(): string;
 
 	private shouldIncludeCodingAgentSession(pullRequest?: PullRequestModel): boolean {
 		return !!pullRequest && this.copilotRemoteAgentManager.enabled && COPILOT_LOGINS.includes(pullRequest.author.login);
 	}
 
-
 	async prepareInvocation(): Promise<vscode.PreparedToolInvocation> {
 		const pullRequest = this._findActivePullRequest();
 		return {
 			pastTenseMessage: pullRequest ? vscode.l10n.t('Read pull request "{0}"', pullRequest.title) : vscode.l10n.t('No active pull request'),
 			invocationMessage: pullRequest ? vscode.l10n.t('Reading pull request "{0}"', pullRequest.title) : vscode.l10n.t('Reading active pull request'),
-			confirmationMessages: { title: vscode.l10n.t('Active Pull Request'), message: pullRequest ? vscode.l10n.t('Allow reading the details of "{0}"?', pullRequest.title) : vscode.l10n.t('Allow reading the details of the active pull request?') },
+			confirmationMessages: { title: this._confirmationTitle(), message: pullRequest ? vscode.l10n.t('Allow reading the details of "{0}"?', pullRequest.title) : vscode.l10n.t('Allow reading the details of the active pull request?') },
 		};
 	}
 
@@ -166,4 +162,17 @@ export class ActivePullRequestTool implements vscode.LanguageModelTool<FetchIssu
 		return result;
 	}
 
+}
+
+export class ActivePullRequestTool extends PullRequestTool {
+	public static readonly toolId = 'github-pull-request_activePullRequest';
+
+	protected _findActivePullRequest(): PullRequestModel | undefined {
+		const folderManager = this.folderManagers.folderManagers.find((manager) => manager.activePullRequest);
+		return folderManager?.activePullRequest;
+	}
+
+	protected _confirmationTitle(): string {
+		return vscode.l10n.t('Active Pull Request');
+	}
 }

src/lm/tools/openPullRequestTool.ts

@@ -0,0 +1,21 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import { PullRequestModel } from '../../github/pullRequestModel';
+import { PullRequestOverviewPanel } from '../../github/pullRequestOverview';
+import { PullRequestTool } from './activePullRequestTool';
+
+export class OpenPullRequestTool extends PullRequestTool {
+	public static readonly toolId = 'github-pull-request_openPullRequest';
+
+	protected _findActivePullRequest(): PullRequestModel | undefined {
+		return PullRequestOverviewPanel.currentPanel?.getCurrentItem();
+	}
+
+	protected _confirmationTitle(): string {
+		return vscode.l10n.t('Open Pull Request');
+	}
+}

src/lm/tools/tools.ts

@@ -15,6 +15,7 @@ import { CopilotRemoteAgentTool } from './copilotRemoteAgentTool';
 import { DisplayIssuesTool } from './displayIssuesTool';
 import { FetchIssueTool } from './fetchIssueTool';
 import { FetchNotificationTool } from './fetchNotificationTool';
+import { OpenPullRequestTool } from './openPullRequestTool';
 import { ConvertToSearchSyntaxTool, SearchTool } from './searchTools';
 import { SuggestFixTool } from './suggestFixTool';
 import { IssueSummarizationTool } from './summarizeIssueTool';
@@ -27,6 +28,7 @@ export function registerTools(context: vscode.ExtensionContext, credentialStore:
 	registerSearchTools(context, credentialStore, repositoriesManager, chatParticipantState);
 	registerCopilotAgentTools(context, copilotRemoteAgentManager, telemetry);
 	context.subscriptions.push(vscode.lm.registerTool(ActivePullRequestTool.toolId, new ActivePullRequestTool(repositoriesManager, copilotRemoteAgentManager)));
+	context.subscriptions.push(vscode.lm.registerTool(OpenPullRequestTool.toolId, new OpenPullRequestTool(repositoriesManager, copilotRemoteAgentManager)));
 }
 
 function registerFetchingTools(context: vscode.ExtensionContext, credentialStore: CredentialStore, repositoriesManager: RepositoriesManager, chatParticipantState: ChatParticipantState) {