github-pull-request_activePullRequest returns empty comments array (#7708)

Fixes #7601

Author: alexr00

src/github/activityBarViewProvider.ts

@@ -80,7 +80,7 @@ export class PullRequestViewProvider extends WebviewViewBase implements vscode.W
 		} while (attemptsRemaining > 0 && mergability === PullRequestMergeability.Unknown);
 
 		const result: Partial<PullRequest> = {
-			events: await this._item.getTimelineEvents(this._item),
+			events: await this._item.getTimelineEvents(),
 			mergeable: mergability,
 		};
 		await this.refresh();
@@ -214,7 +214,7 @@ export class PullRequestViewProvider extends WebviewViewBase implements vscode.W
 				pullRequestModel.number,
 			),
 			this._folderRepositoryManager.getPullRequestRepositoryAccessAndMergeMethods(pullRequestModel),
-			pullRequestModel.getTimelineEvents(pullRequestModel),
+			pullRequestModel.getTimelineEvents(),
 			pullRequestModel.getReviewRequests(),
 			this._folderRepositoryManager.getBranchNameForPullRequest(pullRequestModel),
 			this._folderRepositoryManager.getPullRequestRepositoryDefaultBranch(pullRequestModel),

src/github/copilotRemoteAgent/chatSessionContentBuilder.ts

@@ -34,7 +34,7 @@ export class ChatSessionContentBuilder {
 		);
 
 		const history: Array<vscode.ChatRequestTurn | vscode.ChatResponseTurn2> = [];
-		const timelineEvents = await pullRequest.getTimelineEvents(pullRequest);
+		const timelineEvents = await pullRequest.getTimelineEvents();
 
 		Logger.appendLine(`Found ${timelineEvents.length} timeline events`, this.loggerId);
 

src/github/pullRequestModel.ts

@@ -719,17 +719,17 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
 	/**
 	 * Get the timeline events of a pull request, including comments, reviews, commits, merges, deletes, and assigns.
 	 */
-	async getTimelineEvents(pullRequestModel: PullRequestModel): Promise<TimelineEvent[]> {
+	async getTimelineEvents(): Promise<TimelineEvent[]> {
 		const getTimelineEvents = async () => {
-			Logger.debug(`Fetch timeline events of PR #${pullRequestModel.number} - enter`, PullRequestModel.ID);
+			Logger.debug(`Fetch timeline events of PR #${this.number} - enter`, PullRequestModel.ID);
 			const { query, remote, schema } = await this.githubRepository.ensure();
 			try {
 				const { data } = await query<TimelineEventsResponse>({
 					query: schema.TimelineEvents,
 					variables: {
 						owner: remote.owner,
 						name: remote.repositoryName,
-						number: pullRequestModel.number,
+						number: this.number,
 					},
 				});
 
@@ -748,17 +748,17 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
 			getTimelineEvents(),
 			this.getViewerLatestReviewCommit(),
 			(await this.githubRepository.getAuthenticatedUser()).login,
-			pullRequestModel.getReviewThreads()
+			this.getReviewThreads()
 		]);
 
 
 		const ret = data?.repository?.pullRequest.timelineItems.nodes ?? [];
-		const events = await parseCombinedTimelineEvents(ret, await this.getCopilotTimelineEvents(pullRequestModel, true), this.githubRepository);
+		const events = await parseCombinedTimelineEvents(ret, await this.getCopilotTimelineEvents(this, true), this.githubRepository);
 
 		this.addReviewTimelineEventComments(events, reviewThreads);
-		insertNewCommitsSinceReview(events, latestReviewCommitInfo?.sha, currentUser, pullRequestModel.head);
-		Logger.debug(`Fetch timeline events of PR #${pullRequestModel.number} - done`, PullRequestModel.ID);
-		pullRequestModel.timelineEvents = events;
+		insertNewCommitsSinceReview(events, latestReviewCommitInfo?.sha, currentUser, this.head);
+		Logger.debug(`Fetch timeline events of PR #${this.number} - done`, PullRequestModel.ID);
+		this.timelineEvents = events;
 		return events;
 	}
 

src/github/pullRequestOverview.ts

@@ -247,7 +247,7 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 					pullRequestModel.remote.repositoryName,
 					pullRequestModel.number,
 				),
-				pullRequestModel.getTimelineEvents(pullRequestModel),
+				pullRequestModel.getTimelineEvents(),
 				this._folderRepositoryManager.getPullRequestRepositoryDefaultBranch(pullRequestModel),
 				pullRequestModel.getStatusChecks(),
 				pullRequestModel.getReviewRequests(),
@@ -494,7 +494,7 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 	}
 
 	protected override _getTimeline(): Promise<TimelineEvent[]> {
-		return this._item.getTimelineEvents(this._item);
+		return this._item.getTimelineEvents();
 	}
 
 	private async openDiff(message: IRequestMessage<{ comment: IComment }>): Promise<void> {

src/issues/userCompletionProvider.ts

@@ -238,7 +238,7 @@ export class UserCompletionProvider implements vscode.CompletionItemProvider {
 					if (githubRepo) {
 						const pr = await githubRepo.getPullRequest(prNumber);
 						this.cachedForPrNumber = prNumber;
-						this.cachedPrTimelineEvents = await pr!.getTimelineEvents(pr!);
+						this.cachedPrTimelineEvents = await pr!.getTimelineEvents();
 					}
 
 					prRelatedusers = getRelatedUsersFromTimelineEvents(this.cachedPrTimelineEvents);

src/lm/tools/activePullRequestTool.ts

@@ -8,6 +8,7 @@ import * as vscode from 'vscode';
 import { COPILOT_LOGINS } from '../../common/copilot';
 import { GitChangeType, InMemFileChange } from '../../common/file';
 import Logger from '../../common/logger';
+import { CommentEvent, EventType, ReviewEvent } from '../../common/timelineEvent';
 import { CopilotRemoteAgentManager } from '../../github/copilotRemoteAgent';
 import { PullRequestModel } from '../../github/pullRequestModel';
 import { RepositoriesManager } from '../../github/repositoriesManager';
@@ -118,6 +119,7 @@ export abstract class PullRequestTool implements vscode.LanguageModelTool<FetchI
 		}
 
 		const status = await pullRequest.getStatusChecks();
+		const timeline = pullRequest.timelineEvents.length > 0 ? pullRequest.timelineEvents : await pullRequest.getTimelineEvents();
 		const pullRequestInfo = {
 			title: pullRequest.title,
 			body: pullRequest.body,
@@ -131,6 +133,13 @@ export abstract class PullRequestTool implements vscode.LanguageModelTool<FetchI
 					file: comment.path
 				};
 			}),
+			timelineComments: timeline.filter((event): event is ReviewEvent | CommentEvent => event.event === EventType.Reviewed || event.event === EventType.Commented).map(event => {
+				return {
+					author: event.user?.login,
+					body: event.body,
+					commentType: event.event === EventType.Reviewed ? event.state : 'COMMENTED',
+				};
+			}),
 			state: pullRequest.state,
 			statusChecks: status[0]?.statuses.map((status) => {
 				return {

src/notifications/notificationsManager.ts

@@ -320,7 +320,7 @@ export class NotificationsManager extends Disposable implements vscode.TreeDataP
 
 	public async markPullRequests(markAsDone: boolean = false): Promise<void> {
 		const filteredNotifications = Array.from(this._notifications.values()).filter(notification => notification.notification.subject.type === NotificationSubjectType.PullRequest);
-		const timlines = await Promise.all(filteredNotifications.map(notification => (notification.model as PullRequestModel).getTimelineEvents(notification.model as PullRequestModel)));
+		const timlines = await Promise.all(filteredNotifications.map(notification => (notification.model as PullRequestModel).getTimelineEvents()));
 
 		const markPromises: Promise<void>[] = [];