Fix for adding comment to PR (#1383)

Author: osortega

src/extension/chatSessions/vscode-node/copilotChatSessionsProvider.ts

@@ -606,19 +606,14 @@ export class CopilotChatSessionsProvider extends Disposable implements vscode.Ch
 			}
 			// Add a comment tagging @copilot with the user's prompt
 			const commentBody = `${this.COPILOT} ${userPrompt} \n\n --- \n\n ${summary ?? ''}`;
-			const commentResult = {
-				body: commentBody,
-				user: {
-					login: pr.author?.login
-				},
-				createdAt: new Date().toISOString()
-			};
+
+			const commentResult = await this._octoKitService.addPullRequestComment(pr.id, commentBody);
 			if (!commentResult) {
 				this.logService.error(`Failed to add comment to PR #${pullRequestNumber}`);
 				return;
 			}
 			// allow-any-unicode-next-line
-			return vscode.l10n.t('🚀 Follow-up comment added to [#{0}]({1})', pullRequestNumber, commentResult.body);
+			return vscode.l10n.t('🚀 Follow-up comment added to [#{0}]({1})', pullRequestNumber, commentResult.url);
 		} catch (err) {
 			this.logService.error(`Failed to add follow-up comment to PR #${pullRequestNumber}: ${err}`);
 			return;

src/platform/github/common/githubAPI.ts

@@ -62,6 +62,16 @@ export interface SessionInfo {
 	error: string | null;
 }
 
+export interface PullRequestComment {
+	id: string;
+	body: string;
+	createdAt: string;
+	author: {
+		login: string;
+	};
+	url: string;
+}
+
 export async function makeGitHubAPIRequest(
 	fetcherService: IFetcherService,
 	logService: ILogService,
@@ -210,3 +220,42 @@ export async function makeSearchGraphQLRequest(
 
 	return result ? result.data.search.nodes : [];
 }
+
+export async function addPullRequestCommentGraphQLRequest(
+	fetcherService: IFetcherService,
+	logService: ILogService,
+	telemetry: ITelemetryService,
+	host: string,
+	token: string | undefined,
+	pullRequestId: string,
+	commentBody: string,
+): Promise<PullRequestComment | null> {
+	const mutation = `
+		mutation AddPullRequestComment($pullRequestId: ID!, $body: String!) {
+			addComment(input: {subjectId: $pullRequestId, body: $body}) {
+				commentEdge {
+					node {
+						id
+						body
+						createdAt
+						author {
+							login
+						}
+						url
+					}
+				}
+			}
+		}
+	`;
+
+	logService.debug(`[GitHubAPI] Adding comment to pull request ${pullRequestId}`);
+
+	const variables = {
+		pullRequestId,
+		body: commentBody
+	};
+
+	const result = await makeGitHubGraphQLRequest(fetcherService, logService, telemetry, host, mutation, token, variables);
+
+	return result?.data?.addComment?.commentEdge?.node || null;
+}

src/platform/github/common/githubService.ts

@@ -9,7 +9,7 @@ import { ICAPIClientService } from '../../endpoint/common/capiClient';
 import { ILogService } from '../../log/common/logService';
 import { IFetcherService } from '../../networking/common/fetcherService';
 import { ITelemetryService } from '../../telemetry/common/telemetry';
-import { makeGitHubAPIRequest, makeSearchGraphQLRequest, PullRequestSearchItem, SessionInfo } from './githubAPI';
+import { addPullRequestCommentGraphQLRequest, makeGitHubAPIRequest, makeSearchGraphQLRequest, PullRequestComment, PullRequestSearchItem, SessionInfo } from './githubAPI';
 
 export type IGetRepositoryInfoResponseData = Endpoints["GET /repos/{owner}/{repo}"]["response"]["data"];
 
@@ -177,6 +177,11 @@ export interface IOctoKitService {
 	 * Gets a job by its job ID.
 	 */
 	getJobByJobId(owner: string, repo: string, jobId: string, userAgent: string): Promise<JobInfo>;
+
+	/**
+	 * Adds a comment to a pull request.
+	 */
+	addPullRequestComment(pullRequestId: string, commentBody: string): Promise<PullRequestComment | null>;
 }
 
 /**
@@ -229,4 +234,8 @@ export class BaseOctoKitService {
 	protected async getJobByJobIdWithToken(owner: string, repo: string, jobId: string, userAgent: string, token: string): Promise<JobInfo> {
 		return makeGitHubAPIRequest(this._fetcherService, this._logService, this._telemetryService, 'https://api.githubcopilot.com', `agents/swe/v1/jobs/${owner}/${repo}/${jobId}`, 'GET', token, undefined, undefined, undefined, userAgent);
 	}
+
+	protected async addPullRequestCommentWithToken(pullRequestId: string, commentBody: string, token: string): Promise<PullRequestComment | null> {
+		return addPullRequestCommentGraphQLRequest(this._fetcherService, this._logService, this._telemetryService, this._capiClientService.dotcomAPIURL, token, pullRequestId, commentBody);
+	}
 }

src/platform/github/common/octoKitServiceImpl.ts

@@ -7,7 +7,7 @@ import { ICAPIClientService } from '../../endpoint/common/capiClient';
 import { ILogService } from '../../log/common/logService';
 import { IFetcherService } from '../../networking/common/fetcherService';
 import { ITelemetryService } from '../../telemetry/common/telemetry';
-import { PullRequestSearchItem, SessionInfo } from './githubAPI';
+import { PullRequestComment, PullRequestSearchItem, SessionInfo } from './githubAPI';
 import { BaseOctoKitService, IOctoKitService, IOctoKitUser, JobInfo, RemoteAgentJobPayload, RemoteAgentJobResponse } from './githubService';
 
 export class OctoKitService extends BaseOctoKitService implements IOctoKitService {
@@ -107,4 +107,12 @@ export class OctoKitService extends BaseOctoKitService implements IOctoKitServic
 		}
 		return this.getJobByJobIdWithToken(owner, repo, jobId, userAgent, authToken);
 	}
+
+	async addPullRequestComment(pullRequestId: string, commentBody: string): Promise<PullRequestComment | null> {
+		const authToken = (await this._authService.getAnyGitHubSession())?.accessToken;
+		if (!authToken) {
+			throw new Error('No authentication token available');
+		}
+		return this.addPullRequestCommentWithToken(pullRequestId, commentBody, authToken);
+	}
 }