Move link conversion to participants.ts and add support for 'pull request' pattern

Co-authored-by: alexr00 <38270282+alexr00@users.noreply.github.com>

Author: Copilot

src/common/uri.ts

@@ -796,7 +796,7 @@ export function resolvePath(from: vscode.Uri, to: string) {
 
 /**
  * Converts issue and PR number references in text to clickable markdown links.
- * Matches patterns like "#123", "issue 123", "issue #123", "PR 123", "PR #123"
+ * Matches patterns like "#123", "issue 123", "issue #123", "PR 123", "PR #123", "pull request 123", "pull request #123"
  * @param text The text to process
  * @param owner The repository owner
  * @param repo The repository name
@@ -807,8 +807,9 @@ export function convertIssuePRReferencesToLinks(text: string, owner: string, rep
 	// - #123 (standalone hash with number)
 	// - issue 123 or issue #123 (case-insensitive)
 	// - PR 123 or PR #123 (case-insensitive)
+	// - pull request 123 or pull request #123 (case-insensitive)
 	// Uses word boundaries to avoid matching in the middle of words
-	const pattern = /\b(?:issue\s+#?|PR\s+#?|#)(\d+)\b/gi;
+	const pattern = /\b(?:pull\s+request\s+#?|issue\s+#?|PR\s+#?|#)(\d+)\b/gi;
 
 	return text.replace(pattern, (match, number) => {
 		const url = `https://github.com/${owner}/${repo}/issues/${number}`;

src/extension.ts

@@ -296,7 +296,7 @@ async function init(
 function initChat(context: vscode.ExtensionContext, credentialStore: CredentialStore, reposManager: RepositoriesManager, copilotRemoteManager: CopilotRemoteAgentManager, telemetry: ExperimentationTelemetry, prsTreeModel: PrsTreeModel) {
 	const createParticipant = () => {
 		const chatParticipantState = new ChatParticipantState();
-		context.subscriptions.push(new ChatParticipant(context, chatParticipantState));
+		context.subscriptions.push(new ChatParticipant(context, chatParticipantState, reposManager));
 		registerTools(context, credentialStore, reposManager, chatParticipantState, copilotRemoteManager, telemetry, prsTreeModel);
 	};
 

src/github/copilotRemoteAgent.ts

@@ -21,7 +21,7 @@ import Logger from '../common/logger';
 import { GitHubRemote } from '../common/remote';
 import { CODING_AGENT, CODING_AGENT_AUTO_COMMIT_AND_PUSH } from '../common/settingKeys';
 import { ITelemetry } from '../common/telemetry';
-import { convertIssuePRReferencesToLinks, toOpenPullRequestWebviewUri } from '../common/uri';
+import { toOpenPullRequestWebviewUri } from '../common/uri';
 import { ChatSessionContentBuilder } from './copilotRemoteAgent/chatSessionContentBuilder';
 import { GitOperationsManager } from './copilotRemoteAgent/gitOperationsManager';
 import { extractTitle, formatBodyPlaceholder, truncatePrompt } from './copilotRemoteAgentUtils';
@@ -1246,12 +1246,7 @@ export class CopilotRemoteAgentManager extends Disposable {
 						} else {
 							if (delta.content) {
 								if (!delta.content.startsWith('<pr_title>')) {
-									const convertedContent = convertIssuePRReferencesToLinks(
-										delta.content,
-										pullRequest.remote.owner,
-										pullRequest.remote.repositoryName
-									);
-									stream.markdown(convertedContent);
+									stream.markdown(delta.content);
 									hasStreamedContent = true;
 								}
 							}

src/github/copilotRemoteAgent/chatSessionContentBuilder.ts

@@ -10,7 +10,7 @@ import { parseSessionLogs, parseToolCallDetails, StrReplaceEditorToolData } from
 import { COPILOT_SWE_AGENT } from '../../common/copilot';
 import Logger from '../../common/logger';
 import { CommentEvent, CopilotFinishedEvent, CopilotStartedEvent, EventType, ReviewEvent, TimelineEvent } from '../../common/timelineEvent';
-import { convertIssuePRReferencesToLinks, toOpenPullRequestWebviewUri } from '../../common/uri';
+import { toOpenPullRequestWebviewUri } from '../../common/uri';
 import { InMemFileChangeModel, RemoteFileChangeModel } from '../../view/fileChangeModel';
 import { AssistantDelta, Choice, ToolCall } from '../common';
 import { CopilotApi, SessionInfo } from '../copilotApi';
@@ -288,12 +288,7 @@ export class ChatSessionContentBuilder {
 			}
 
 			if (currentResponseContent.trim()) {
-				const convertedContent = convertIssuePRReferencesToLinks(
-					currentResponseContent.trim(),
-					pullRequest.remote.owner,
-					pullRequest.remote.repositoryName
-				);
-				responseParts.push(new vscode.ChatResponseMarkdownPart(convertedContent));
+				responseParts.push(new vscode.ChatResponseMarkdownPart(currentResponseContent.trim()));
 			}
 
 			if (session.state === 'completed' || session.state === 'failed' /** session can fail with proposed changes */) {
@@ -341,12 +336,7 @@ export class ChatSessionContentBuilder {
 				if (delta.content && delta.content.trim()) {
 					// Add any accumulated content as markdown first
 					if (currentResponseContent.trim()) {
-						const convertedContent = convertIssuePRReferencesToLinks(
-							currentResponseContent.trim(),
-							pullRequest.remote.owner,
-							pullRequest.remote.repositoryName
-						);
-						responseParts.push(new vscode.ChatResponseMarkdownPart(convertedContent));
+						responseParts.push(new vscode.ChatResponseMarkdownPart(currentResponseContent.trim()));
 						currentResponseContent = '';
 					}
 
@@ -367,12 +357,7 @@ export class ChatSessionContentBuilder {
 				if (delta.tool_calls) {
 					// Add any accumulated content as markdown first
 					if (currentResponseContent.trim()) {
-						const convertedContent = convertIssuePRReferencesToLinks(
-							currentResponseContent.trim(),
-							pullRequest.remote.owner,
-							pullRequest.remote.repositoryName
-						);
-						responseParts.push(new vscode.ChatResponseMarkdownPart(convertedContent));
+						responseParts.push(new vscode.ChatResponseMarkdownPart(currentResponseContent.trim()));
 						currentResponseContent = '';
 					}
 

src/lm/participants.ts

@@ -9,6 +9,8 @@ import * as vscode from 'vscode';
 import { ParticipantsPrompt } from './participantsPrompt';
 import { Disposable } from '../common/lifecycle';
 import { IToolCall, TOOL_COMMAND_RESULT, TOOL_MARKDOWN_RESULT } from './tools/toolsUtils';
+import { convertIssuePRReferencesToLinks } from '../common/uri';
+import { RepositoriesManager } from '../github/repositoriesManager';
 
 export class ChatParticipantState {
 	private _messages: vscode.LanguageModelChatMessage[] = [];
@@ -58,7 +60,7 @@ export class ChatParticipantState {
 
 export class ChatParticipant extends Disposable {
 
-	constructor(context: vscode.ExtensionContext, private readonly state: ChatParticipantState) {
+	constructor(context: vscode.ExtensionContext, private readonly state: ChatParticipantState, private readonly repositoriesManager: RepositoriesManager) {
 		super();
 		const ghprChatParticipant = this._register(vscode.chat.createChatParticipant('githubpr', (
 			request: vscode.ChatRequest,
@@ -124,7 +126,12 @@ export class ChatParticipant extends Disposable {
 			for await (const part of response.stream) {
 
 				if (part instanceof vscode.LanguageModelTextPart) {
-					stream.markdown(part.value);
+					const repoInfo = this.getActiveRepositoryInfo();
+					let markdown = part.value;
+					if (repoInfo) {
+						markdown = convertIssuePRReferencesToLinks(markdown, repoInfo.owner, repoInfo.repo);
+					}
+					stream.markdown(markdown);
 				} else if (part instanceof vscode.LanguageModelToolCallPart) {
 
 					const tool = vscode.lm.tools.find(tool => tool.name === part.name);
@@ -169,7 +176,12 @@ export class ChatParticipant extends Disposable {
 						}
 
 						if (part.value === TOOL_MARKDOWN_RESULT) {
-							const markdown = new vscode.MarkdownString((toolCallResult.content[++i] as vscode.LanguageModelTextPart).value);
+							const repoInfo = this.getActiveRepositoryInfo();
+							let markdownText = (toolCallResult.content[++i] as vscode.LanguageModelTextPart).value;
+							if (repoInfo) {
+								markdownText = convertIssuePRReferencesToLinks(markdownText, repoInfo.owner, repoInfo.repo);
+							}
+							const markdown = new vscode.MarkdownString(markdownText);
 							markdown.supportHtml = true;
 							stream.markdown(markdown);
 							shownToUser = true;
@@ -206,5 +218,30 @@ export class ChatParticipant extends Disposable {
 			stream.button(command);
 		}
 	}
+
+	private getActiveRepositoryInfo(): { owner: string; repo: string } | undefined {
+		// Try to get repository info from the active pull request first
+		const folderManager = this.repositoriesManager.folderManagers.find((manager) => manager.activePullRequest);
+		if (folderManager?.activePullRequest) {
+			return {
+				owner: folderManager.activePullRequest.remote.owner,
+				repo: folderManager.activePullRequest.remote.repositoryName
+			};
+		}
+
+		// Fallback to the first available folder manager with a GitHub repository
+		if (this.repositoriesManager.folderManagers.length > 0) {
+			const firstManager = this.repositoriesManager.folderManagers[0];
+			const ghRepo = firstManager.gitHubRepositories[0];
+			if (ghRepo) {
+				return {
+					owner: ghRepo.remote.owner,
+					repo: ghRepo.remote.repositoryName
+				};
+			}
+		}
+
+		return undefined;
+	}
 }
 

src/test/common/uri.test.ts

@@ -180,5 +180,23 @@ describe('uri', () => {
 			const result = convertIssuePRReferencesToLinks(text, owner, repo);
 			assert.strictEqual(result, '');
 		});
+
+		it('should convert pull request references with # prefix', () => {
+			const text = 'See pull request #789 for details.';
+			const result = convertIssuePRReferencesToLinks(text, owner, repo);
+			assert.strictEqual(result, 'See [pull request #789](https://github.com/microsoft/vscode-pull-request-github/issues/789) for details.');
+		});
+
+		it('should convert pull request references without # prefix', () => {
+			const text = 'Related to pull request 456.';
+			const result = convertIssuePRReferencesToLinks(text, owner, repo);
+			assert.strictEqual(result, 'Related to [pull request 456](https://github.com/microsoft/vscode-pull-request-github/issues/456).');
+		});
+
+		it('should handle case-insensitive pull request keyword', () => {
+			const text = 'See Pull Request #100 and PULL REQUEST 200.';
+			const result = convertIssuePRReferencesToLinks(text, owner, repo);
+			assert.strictEqual(result, 'See [Pull Request #100](https://github.com/microsoft/vscode-pull-request-github/issues/100) and [PULL REQUEST 200](https://github.com/microsoft/vscode-pull-request-github/issues/200).');
+		});
 	});
 });