Resolve Conversation with Commit

[JustinGrote]

When working through a review, I like to resolve conversations with one commit per conversation request. Right now the workflow is pretty cumbersome, I create the commit via vscode source editor, then copy the commit ID, then paste it into the conversation request as "Resolved" and finally close the issue.

I would like a "Fix with Commit" button on a conversation that will take my staged changes (or all changes if none staged) and once clicked, automate these steps:

1. Commit to the PR
2. Update the conversation where the button was clicked with a new "Resolved " comment
3. Resolve the conversation.

[mohamedamara1]

I would like to work on this, any suggestions on where to start, things to consider ? @alexr00

[alexr00]

I don't think we should reinvent the wheel (or the git commit flow) for this. An alternative flow:

1. Commit to the PR
2. Go to the conversation that you want to resolve
3. Click a new "Resolve with Existing Commit" action
4. A picker shows to choose which commit resolves the conversation.
5. User chooses which commit applies to this conversation
6. An automatic reply is added to the conversation with the text "Resolved with "
7. The conversation is resolved

@JustinGrote what do you think of this?

[JustinGrote]

While not ideal, it's a reasonable compromise, thanks @alexr00!

[alexr00]

@mohamedamara1 if you want to work on this then please feel free. #5710 (comment) outlines the flow.

The "Resolve thread" command shows how to resolve a thread:

vscode-pull-request-github/src/commands.ts

Lines 942 to 955 in 92476fc

	context.subscriptions.push(
	vscode.commands.registerCommand('pr.resolveReviewThread', async (commentLike: CommentReply | GHPRCommentThread | GHPRComment) => {
	/* __GDPR__
	"pr.resolveReviewThread" : {}
	*/
	telemetry.sendTelemetryEvent('pr.resolveReviewThread');
	const { thread, text } = threadAndText(commentLike);
	const handler = resolveCommentHandler(thread);
	if (handler) {
	await handler.resolveReviewThread(thread, text);
	}
	}),
	);

The "create comment" command shows how to reply to a comment:

vscode-pull-request-github/src/commands.ts

Lines 998 to 1010 in 92476fc

	context.subscriptions.push(
	vscode.commands.registerCommand('pr.createComment', async (reply: CommentReply) => {
	/* __GDPR__
	"pr.createComment" : {}
	*/
	telemetry.sendTelemetryEvent('pr.createComment');
	const handler = resolveCommentHandler(reply.thread);
	if (handler) {
	handler.createOrReplyComment(reply.thread, reply.text, false);
	}
	}),
	);

I don't know if this action should be given the same prominence as the existing "resolve" action. It could be placed here instead:

vscode-pull-request-github/package.json

Lines 2473 to 2474 in 92476fc

	"comments/commentThread/title": [
	{

This is where the current resolve action is:

vscode-pull-request-github/package.json

Lines 2408 to 2409 in 92476fc

	"comments/commentThread/additionalActions": [
	{

[JustinGrote]

In POCing this, I've determined I often need to resolve lots of comments with a single commit (for example after a code review) a better flow is to have a button to "mark" comments to resolve with next commit.

1. Go to each comment and click a new button named "Resolve with next commit"
2. Github extension stores this info in state
3. Trigger on vscode source control commit -> Go to each comment that was flagged this way and comment Resolved and close the conversation.

[clarkjensen]

I would like a way to automatically resolve conversations with the CLI. Github Copilot can read and address comments, but can't mark them as resolved.