Alex Ross (alexr00) · Oct 22, 2026 · Oct 21, 2026 · Oct 21, 2026
diff --git a/src/github/activityBarViewProvider.ts b/src/github/activityBarViewProvider.ts
@@ -488,7 +488,7 @@ export class PullRequestViewProvider extends WebviewViewBase implements vscode.W
 
 	private async approvePullRequestCommand(context: SubmitReviewArgs): Promise<void> {
 		const result = context.addAttestation
-			? await addAttestationCommit(this._folderRepositoryManager, this._item)
+			? await PullRequestReviewCommon.addAttestationForReviewCommand(this.getReviewContext(), ReviewType.Approve)
 			: undefined;
 		if (context.addAttestation && !result) {
 			return;

diff --git a/src/github/pullRequestOverview.ts b/src/github/pullRequestOverview.ts
@@ -1384,7 +1384,7 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 
 	private async approvePullRequestCommand(context: SubmitReviewArgs): Promise<void> {
 		const result = context.addAttestation
-			? await addAttestationCommit(this._folderRepositoryManager, this._item)
+			? await PullRequestReviewCommon.addAttestationForReviewCommand(this.getReviewContext(), ReviewType.Approve)
 			: undefined;
 		if (context.addAttestation && !result) {
 			return;

diff --git a/src/github/pullRequestReviewCommon.ts b/src/github/pullRequestReviewCommon.ts
@@ -5,6 +5,7 @@
 'use strict';
 
 import * as vscode from 'vscode';
+import { addAttestationCommit } from './attestationCommit';
 import { FolderRepositoryManager } from './folderRepositoryManager';
 import { GithubItemStateEnum, IAccount, isITeam, ITeam, MergeMethod, PullRequestMergeability, reviewerId, ReviewState } from './interface';
 import { BranchInfo } from './pullRequestGitHelper';
@@ -13,7 +14,7 @@ import { ConvertToDraftReply, PullRequest, ReadyForReviewReply, ReviewType, Stac
 import Logger from '../common/logger';
 import { DEFAULT_DELETION_METHOD, DELETE_BRANCH_AFTER_MERGE, PR_SETTINGS_NAMESPACE, SELECT_LOCAL_BRANCH, SELECT_REMOTE, SELECT_WORKTREE } from '../common/settingKeys';
 import { assertStacksEnabled } from '../common/settingsUtils';
-import { ReviewEvent, TimelineEvent } from '../common/timelineEvent';
+import { CommitEvent, ReviewEvent, TimelineEvent } from '../common/timelineEvent';
 import { Schemes } from '../common/uri';
 import { formatError } from '../common/utils';
 import { IRequestMessage } from '../common/webview';
@@ -129,6 +130,27 @@ export namespace PullRequestReviewCommon {
 		}
 	}
 
+	/**
+	 * Adds an attestation commit ahead of a review submitted through a webview
+	 * context-menu command. Signing and pushing can take a while, so the webview
+	 * is marked busy up front rather than only once the review itself is sent.
+	 * If the attestation fails, the busy state is cleared and `undefined` is returned.
+	 */
+	export async function addAttestationForReviewCommand(
+		ctx: ReviewContext,
+		reviewType: ReviewType,
+	): Promise<{ sha: string; event: CommitEvent } | undefined> {
+		await ctx.postMessage({
+			command: 'pr.submitting-review',
+			lastReviewType: reviewType
+		});
+		const result = await addAttestationCommit(ctx.folderRepositoryManager, ctx.item);
+		if (!result) {
+			await ctx.postMessage({ command: 'pr.append-review' });
+		}
+		return result;
+	}
+
 	export async function doReviewMessage(
 		ctx: ReviewContext,
 		message: IRequestMessage<string>,

diff --git a/src/github/views.ts b/src/github/views.ts
@@ -106,6 +106,7 @@ export interface PullRequest extends Issue {
 	emailForCommit?: string;
 	pendingReviewType?: ReviewType;
 	pendingReviewSummaryText?: string;
+	pendingAttestation?: boolean;
 	status: PullRequestChecks | null;
 	reviewRequirement: PullRequestReviewRequirement | null;
 	canUpdateBranch: boolean;

diff --git a/webviews/common/cache.ts b/webviews/common/cache.ts
@@ -16,6 +16,7 @@ export function setState(pullRequest: PullRequest | undefined): void {
 	if (oldPullRequest && oldPullRequest.number && oldPullRequest.number === pullRequest?.number) {
 		pullRequest.pendingCommentText = oldPullRequest.pendingCommentText;
 		pullRequest.pendingReviewSummaryText = oldPullRequest.pendingReviewSummaryText;
+		pullRequest.pendingAttestation = oldPullRequest.pendingAttestation;
 	}
 
 	if (pullRequest) {

diff --git a/webviews/common/context.tsx b/webviews/common/context.tsx
@@ -420,6 +420,7 @@ export class PRContext {
 		state.pendingCommentText = '';
 		state.pendingReviewSummaryText = '';
 		state.pendingReviewType = undefined;
+		state.pendingAttestation = false;
 		this.updatePR(state);
 	}
 

diff --git a/webviews/components/comment.tsx b/webviews/components/comment.tsx
@@ -506,11 +506,12 @@ export function AddComment({
 	repo,
 	number,
 	attestationCommitsEnabled,
-	isCurrentlyCheckedOut
+	isCurrentlyCheckedOut,
+	pendingAttestation
 }: PullRequest) {
 	const { updatePR, requestChanges, approve, close, openOnGitHub, submit, uploadFilesIntoPendingComment, uploadPastedFilesIntoPendingComment } = useContext(PullRequestContext);
 	const [isBusy, setBusy] = useState(false);
-	const [addAttestation, setAddAttestation] = useState(false);
+	const addAttestation = !!pendingAttestation;
 	const form = useRef<HTMLFormElement>();
 	const textareaRef = useRef<HTMLTextAreaElement>();
 
@@ -628,7 +629,7 @@ export function AddComment({
 								name="add-attestation"
 								checked={addAttestation}
 								disabled={isBusy || busy}
-								onChange={(e) => setAddAttestation(e.currentTarget.checked)}
+								onChange={(e) => updatePR({ pendingAttestation: e.currentTarget.checked })}
 							/>
 							<label htmlFor="attestation-checkbox" className="attestation-checkbox-label">Add attestation</label>
 						</div>
@@ -719,7 +720,7 @@ const makeCommentMenuContext = (owner: string, repo: string, number: number, ava
 export const AddCommentSimple = (pr: PullRequest) => {
 	const { updatePR, requestChanges, approve, submit, openOnGitHub, uploadFilesIntoPendingComment, uploadPastedFilesIntoPendingComment } = useContext(PullRequestContext);
 	const [isBusy, setBusy] = useState(false);
-	const [addAttestation, setAddAttestation] = useState(false);
+	const addAttestation = !!pr.pendingAttestation;
 	const textareaRef = useRef<HTMLTextAreaElement>();
 	let currentSelection: ReviewType = pr.lastReviewType ?? (pr.currentUserReviewState === 'APPROVED' ? ReviewType.Approve : (pr.currentUserReviewState === 'CHANGES_REQUESTED' ? ReviewType.RequestChanges : ReviewType.Comment));
 
@@ -807,7 +808,7 @@ export const AddCommentSimple = (pr: PullRequest) => {
 						name="add-attestation"
 						checked={addAttestation}
 						disabled={isBusy || pr.busy}
-						onChange={(e) => setAddAttestation(e.currentTarget.checked)}
+						onChange={(e) => updatePR({ pendingAttestation: e.currentTarget.checked })}
 					/>
 					<label htmlFor="attestation-checkbox-simple" className="attestation-checkbox-label">Add attestation</label>
 				</div>

diff --git a/webviews/components/timeline.tsx b/webviews/components/timeline.tsx
@@ -316,7 +316,7 @@ function AddReviewSummaryComment() {
 	const comment = useRef<HTMLTextAreaElement>();
 	const [isBusy, setBusy] = useState(false);
 	const commentText = pr.pendingReviewSummaryText ?? '';
-	const [addAttestation, setAddAttestation] = useState(false);
+	const addAttestation = !!pr.pendingAttestation;
 
 	const showAttestationCheckbox = !isAuthor && !!pr?.attestationCommitsEnabled && !!pr?.isCurrentlyCheckedOut;
 
@@ -385,7 +385,7 @@ function AddReviewSummaryComment() {
 							name="add-attestation"
 							checked={addAttestation}
 							disabled={isBusy || pr?.busy}
-							onChange={(e) => setAddAttestation(e.currentTarget.checked)}
+							onChange={(e) => updatePR({ pendingAttestation: e.currentTarget.checked })}
 						/>
 						<label htmlFor="attestation-checkbox-summary" className="attestation-checkbox-label">Add attestation</label>
 					</div>

diff --git a/webviews/editorWebview/test/attestation.test.tsx b/webviews/editorWebview/test/attestation.test.tsx
@@ -0,0 +1,84 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { default as assert } from 'assert';
+import * as React from 'react';
+import { act, cleanup, fireEvent, render, wait } from 'react-testing-library';
+
+import { PullRequestBuilder } from './builder/pullRequest';
+import { EventType, ReviewEvent } from '../../../src/common/timelineEvent';
+import { PullRequest } from '../../../src/github/views';
+import { PRContext, default as PullRequestContext } from '../../common/context';
+import { vscode } from '../../common/message';
+import { AddComment, AddCommentSimple } from '../../components/comment';
+import { Timeline } from '../../components/timeline';
+import { Root } from '../app';
+
+const forms: { name: string, render: (pr: PullRequest) => React.ReactElement }[] = [
+	{ name: 'overview comment', render: pr => <AddComment {...pr} /> },
+	{ name: 'sidebar comment', render: pr => <AddCommentSimple {...pr} /> },
+	{ name: 'review summary', render: pr => <Timeline events={pr.events} isIssue={pr.isIssue} /> },
+];
+
+describe('Attestation checkbox', function () {
+	afterEach(function () {
+		cleanup();
+		vscode.setState(undefined);
+	});
+
+	for (const form of forms) {
+		it(`unchecks the ${form.name} checkbox only after a review is submitted`, async function () {
+			const pr = new PullRequestBuilder()
+				.isAuthor(false)
+				.hasReviewDraft(true)
+				.build();
+			pr.attestationCommitsEnabled = true;
+			const pendingReview: ReviewEvent = {
+				id: 1,
+				event: EventType.Reviewed,
+				comments: [],
+				submittedAt: '',
+				body: '',
+				htmlUrl: '',
+				user: pr.author,
+				authorAssociation: 'OWNER',
+				state: 'PENDING',
+			};
+			pr.events = [pendingReview];
+
+			const context = new PRContext(pr);
+			context.setPR(pr);
+			const view = render(
+				<PullRequestContext.Provider value={context}>
+					<Root>{form.render}</Root>
+				</PullRequestContext.Provider>,
+			);
+			const checkbox = view.getByLabelText('Add attestation') as HTMLInputElement;
+
+			fireEvent.click(checkbox);
+			await wait(() => assert.strictEqual(checkbox.checked, true));
+			assert.strictEqual(context.pr?.pendingAttestation, true);
+
+			// A failed attestation or review clears busy without a reviewed event.
+			act(() => {
+				context.handleMessage({ command: 'pr.submitting-review', lastReviewType: 'approve' });
+				context.handleMessage({ command: 'pr.append-review' });
+			});
+			assert.strictEqual(checkbox.checked, true);
+			assert.strictEqual(context.pr?.busy, false);
+
+			act(() => {
+				context.handleMessage({ command: 'pr.submitting-review', lastReviewType: 'approve' });
+				context.handleMessage({
+					command: 'pr.append-review',
+					events: [],
+					reviewedEvent: { ...pendingReview, id: 2, state: 'APPROVED' },
+				});
+			});
+			assert.strictEqual(checkbox.checked, false);
+			assert.strictEqual(context.pr?.pendingAttestation, false);
+		});
+	}
+});