Skip to content

Serialize resolveCommentThread to fix race condition with rapid resolves #8651

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexr00 merged 3 commits into from
Apr 8, 2026
+27 −14
Merged

Serialize resolveCommentThread to fix race condition with rapid resolves #8651

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
83f7827
Initial plan
Copilot Apr 8, 2026
deb6ad5
Serialize resolveCommentThread operations to fix race condition
Copilot Apr 8, 2026
930cc50
CCR feedback
alexr00 Apr 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 27 additions & 14 deletions src/github/pullRequestOverview.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode

private _prListeners: vscode.Disposable[] = [];
private _updatingPromise: Promise<unknown> | undefined;
private _resolveCommentThreadQueue: Promise<void> = Promise.resolve();

public static override async createOrShow(
telemetry: ITelemetry,
Expand Down Expand Up @@ -785,20 +786,32 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
return PullRequestModel.openChanges(this._folderRepositoryManager, this._item, openToTheSide);
}

private async resolveCommentThread(message: IRequestMessage<{ threadId: string, toResolve: boolean, thread: IComment[] }>) {
try {
if (message.args.toResolve) {
await this._item.resolveReviewThread(message.args.threadId);
}
else {
await this._item.unresolveReviewThread(message.args.threadId);
}
const timelineEvents = await this._getTimeline();
this._replyMessage(message, timelineEvents);
} catch (e) {
vscode.window.showErrorMessage(e);
this._replyMessage(message, undefined);
}
private resolveCommentThread(message: IRequestMessage<{ threadId: string, toResolve: boolean, thread: IComment[] }>) {
// Serialize resolve/unresolve operations so that concurrent calls don't race.
// Each call fetches the full timeline after its mutation, and without serialization
// a stale timeline response from an earlier call can overwrite a newer one.
// Normalize any prior rejection so one unexpected failure does not permanently
// block later resolve/unresolve requests from running.
this._resolveCommentThreadQueue = this._resolveCommentThreadQueue
.catch(error => {
Logger.error(`Resolve comment thread queue failed: ${formatError(error)}`, PullRequestOverviewPanel.ID);
})
.then(async () => {
try {
if (message.args.toResolve) {
await this._item.resolveReviewThread(message.args.threadId);
}
else {
await this._item.unresolveReviewThread(message.args.threadId);
}
const timelineEvents = await this._getTimeline();
this._replyMessage(message, timelineEvents);
} catch (e) {
Logger.error(`Failed to ${message.args.toResolve ? 'resolve' : 'unresolve'} comment thread: ${formatError(e)}`, PullRequestOverviewPanel.ID);
vscode.window.showErrorMessage(vscode.l10n.t('Failed to {0} comment thread: {1}', message.args.toResolve ? 'resolve' : 'unresolve', formatError(e)));
this._replyMessage(message, undefined);
}
});
}

private checkoutPullRequest(message: IRequestMessage<any>): void {
Expand Down
Loading