Add Accept Suggestion flow

Accept suggestions directly from comment threads and from the Comments
Overview multi‑select UI. The Comments Overview now allows selecting
multiple unresolved comments and applying suggestions in one action,
while individual comment threads expose a single‑click Accept Suggestion
action. Both invoke cursor agent to apply the suggestion and mark the
corresponding comments as resolved.

Additional changes:
- Remove AI Review from the command palette
- Bundle the Gerrit MCP server in build output

Author: Abhinav Malik

package.json

@@ -290,6 +290,11 @@
 				"title": "Comments Overview",
 				"icon": "$(comment-discussion)"
 			},
+			{
+				"command": "gerrit.acceptSuggestion",
+				"title": "Accept Suggestion",
+				"icon": "$(lightbulb)"
+			},
 			{
 				"command": "cmd.gerrit.changeGitRepo",
 				"title": "Gerrit: Change git repo"
@@ -384,18 +389,18 @@
 				"command": "cmd.gerrit.openLineOnGitilesPermalink",
 				"title": "Gerrit: Open line on Gitiles (permalink)"
 			},
-			{
-				"command": "cmd.gerrit.aiReview",
-				"title": "Gerrit: AI Review Change",
-				"icon": "$(lightbulb)"
-			},
 			{
 				"command": "cmd.gerrit.enableAiReview",
 				"title": "Gerrit: Enable AI Review"
 			},
 			{
 				"command": "cmd.gerrit.selectAiModel",
 				"title": "Gerrit: Select AI Review Model"
+			},
+			{
+				"command": "cmd.gerrit.commentsOverview",
+				"title": "Gerrit: Comments Overview",
+				"icon": "$(comment-discussion)"
 			}
 		],
 		"keybindings": [
@@ -638,6 +643,10 @@
 					"command": "gerrit.commentsOverview",
 					"when": "false"
 				},
+				{
+					"command": "gerrit.acceptSuggestion",
+					"when": "false"
+				},
 				{
 					"command": "cmd.gerrit.changeGitRepo",
 					"when": "true"
@@ -719,15 +728,15 @@
 					"when": "true"
 				},
 				{
-					"command": "cmd.gerrit.aiReview",
+					"command": "cmd.gerrit.enableAiReview",
 					"when": "true"
 				},
 				{
-					"command": "cmd.gerrit.enableAiReview",
+					"command": "cmd.gerrit.selectAiModel",
 					"when": "true"
 				},
 				{
-					"command": "cmd.gerrit.selectAiModel",
+					"command": "cmd.gerrit.commentsOverview",
 					"when": "true"
 				}
 			],
@@ -817,6 +826,11 @@
 					"command": "gerrit.deleteComment",
 					"when": "commentController == gerrit && comment =~ /deletable/",
 					"group": "inline@4"
+				},
+				{
+					"command": "gerrit.acceptSuggestion",
+					"when": "commentController == gerrit && comment =~ /quickActionable/",
+					"group": "inline@5"
 				}
 			],
 			"view/item/context": [
@@ -831,12 +845,12 @@
 					"group": "inline@2"
 				},
 				{
-					"command": "gerrit.checkoutBranch",
+					"command": "gerrit.aiReview",
 					"when": "view == gerrit:changeExplorer && viewItem =~ /gerritchange/",
 					"group": "inline@3"
 				},
 				{
-					"command": "gerrit.aiReview",
+					"command": "gerrit.checkoutBranch",
 					"when": "view == gerrit:changeExplorer && viewItem =~ /gerritchange/",
 					"group": "inline@4"
 				},
@@ -1491,8 +1505,8 @@
 				},
 				"gerrit.aiReview.enabled": {
 					"type": "boolean",
-					"title": "Enable AI Review feature",
-					"description": "Enable AI-powered code review using Cursor CLI",
+					"title": "Enable AI Review",
+					"description": "Enable AI-powered code reviews using Cursor agent",
 					"default": false
 				},
 				"gerrit.aiReview.checkoutBehavior": {
@@ -1502,21 +1516,21 @@
 						"always",
 						"never"
 					],
-					"title": "Checkout behavior for AI Review",
-					"description": "Whether to checkout the change locally before running AI review. \"ask\" prompts each time, \"always\" checks out automatically, \"never\" uses Gerrit context only.",
+					"title": "AI Review Checkout Behavior",
+					"description": "Whether to checkout changes before AI review for better context",
 					"default": "ask"
 				},
 				"gerrit.aiReview.defaultModel": {
 					"type": "string",
-					"title": "Default AI model for reviews",
-					"description": "Default Cursor model to use for AI reviews (e.g. claude-4.6-sonnet). Leave empty for auto.",
+					"title": "Default AI Review Model",
+					"description": "Default AI model to use for reviews (e.g., claude-4.6-opus, gpt-4o). Leave empty for auto-selection.",
 					"default": ""
 				},
 				"gerrit.aiReview.customPromptFile": {
 					"type": "string",
-					"title": "Custom review prompt file",
-					"description": "Path to a Markdown file with additional review instructions. Relative to workspace root.",
-					"default": ".gerrit-review-prompt.md"
+					"title": "Custom AI Review Prompt File",
+					"description": "Path to a custom Markdown file with additional review guidelines (relative to workspace root)",
+					"default": ".gerrit-ai-prompt.md"
 				}
 			}
 		}
@@ -1544,8 +1558,10 @@
 		"build:review:css": "npm run copy -- src/views/activityBar/review/css/index.css out/review/index.css",
 		"build:main": "esbuild --minify --bundle --outfile=out/extension.js src/extension.ts --platform=node --external:vscode",
 		"build:debug:main": "esbuild --bundle --outfile=out/extension.js src/extension.ts --platform=node --external:vscode --define:process.env.DEV_OVERRIDE=true",
-		"build": "rimraf ./out && npm run build:main && npm run build:review:js && npm run build:review:css && npm run build:review:codicons:css && npm run build:review:codicons:ttf",
-		"build:debug": "rimraf ./out && npm run build:debug:main && npm run build:debug:review:js && npm run build:review:css && npm run build:review:codicons:css && npm run build:review:codicons:ttf",
+		"build:mcp": "esbuild --bundle --outfile=out/lib/mcp/gerritMcpServer.js src/lib/mcp/gerritMcpServer.ts --platform=node --external:vscode",
+		"build:debug:mcp": "esbuild --bundle --outfile=out/lib/mcp/gerritMcpServer.js src/lib/mcp/gerritMcpServer.ts --platform=node --external:vscode",
+		"build": "rimraf ./out && npm run build:main && npm run build:mcp && npm run build:review:js && npm run build:review:css && npm run build:review:codicons:css && npm run build:review:codicons:ttf",
+		"build:debug": "rimraf ./out && npm run build:debug:main && npm run build:debug:mcp && npm run build:debug:review:js && npm run build:review:css && npm run build:review:codicons:css && npm run build:review:codicons:ttf",
 		"pretest": "npm run compile && npm run lint",
 		"lint": "eslint src --ext ts",
 		"format-staged": "(git diff --ignore-submodules --quiet && npm run format) || pretty-quick src/",

src/commands/command-names.ts

@@ -55,4 +55,5 @@ export enum GerritExtensionCommands {
 	ENABLE_AI_REVIEW = 'gerrit.enableAiReview',
 	SELECT_AI_MODEL = 'gerrit.selectAiModel',
 	COMMENTS_OVERVIEW = 'gerrit.commentsOverview',
+	ACCEPT_SUGGESTION = 'gerrit.acceptSuggestion',
 }

src/commands/commands.ts

@@ -43,32 +43,45 @@ import {
   nextUnresolvedComment,
   previousUnresolvedComment,
 } from '../providers/comments/commentCommands';
+import {
+  getChangeIDFromCheckoutString,
+  gitReview,
+  gitFetchAndCheckoutChange,
+} from '../lib/git/git';
 import { CanFetchMoreTreeProvider } from '../views/activityBar/shared/canFetchMoreTreeProvider';
+import {
+  CommentThread,
+  ExtensionContext,
+  Uri,
+  window,
+  ProgressLocation,
+} from 'vscode';
 import { fetchMoreTreeItemEntries } from '../views/activityBar/changes/fetchMoreTreeItem';
 import { openCurrentChangeOnline } from '../lib/commandHandlers/openCurrentChangeOnline';
+import {
+  showCommentsOverview,
+  setExtensionPath,
+} from '../views/commentsOverview';
 import { clearSearchResults, search } from '../views/activityBar/search/search';
 import { ChangeTreeView } from '../views/activityBar/changes/changeTreeView';
 import { QuickCheckoutTreeEntry } from '../views/activityBar/quickCheckout';
 import { listenForStreamEvents } from '../lib/stream-events/stream-events';
 import { GerritCommentBase } from '../lib/gerrit/gerritAPI/gerritComment';
-import { getChangeIDFromCheckoutString, gitReview, gitFetchAndCheckoutChange } from '../lib/git/git';
 import { createAutoRegisterCommand } from 'vscode-generate-package-json';
 import { enterCredentials } from '../lib/credentials/enterCredentials';
 import { rebaseOntoParent, recursiveRebase } from '../lib/git/rebase';
-import { CommentThread, ExtensionContext, Uri, window, ProgressLocation } from 'vscode';
 import { GerritChange } from '../lib/gerrit/gerritAPI/gerritChange';
+import { runAIReview } from '../lib/ai-review/reviewOrchestrator';
 import { focusChange } from '../lib/commandHandlers/focusChange';
+import { enableAiReview } from '../lib/ai-review/enableAiReview';
+import { acceptSuggestion } from '../lib/ai-review/commentFixer';
+import { selectAiModel } from '../lib/ai-review/modelSelector';
 import { Repository } from '../types/vscode-extension-git';
 import { checkConnection } from '../lib/gerrit/gerritAPI';
 import { GerritExtensionCommands } from './command-names';
 import { openOnGitiles } from '../lib/gitiles/gitiles';
 import { commands as vscodeCommands } from 'vscode';
 import { commands, GerritCodicons } from './defs';
-import { tryExecAsync } from '../lib/git/gitCLI';
-import { runAIReview } from '../lib/ai-review/reviewOrchestrator';
-import { enableAiReview } from '../lib/ai-review/enableAiReview';
-import { selectAiModel } from '../lib/ai-review/modelSelector';
-import { showCommentsOverview } from '../views/commentsOverview';
 
 async function checkoutChange(
   uri: string,
@@ -117,6 +130,7 @@ export function registerCommands(
   gerritRepo: Repository,
   context: ExtensionContext
 ): void {
+  setExtensionPath(context.extensionPath);
   const registerCommand = createAutoRegisterCommand<GerritCodicons>(commands);
 
   // Credentials/connection
@@ -606,4 +620,12 @@ export function registerCommands(
         )
     )
   );
+
+  context.subscriptions.push(
+    registerCommand(
+      GerritExtensionCommands.ACCEPT_SUGGESTION,
+      (comment: GerritCommentBase) =>
+        acceptSuggestion(comment, gerritRepo, context.extensionPath)
+    )
+  );
 }

src/commands/defs.ts

@@ -292,7 +292,7 @@ export const commands: {
   'gerrit.aiReview': {
     title: 'AI Review Change',
     icon: '$(lightbulb)',
-    inCommandPalette: contextProp('gerrit:connected'),
+    inCommandPalette: false,
   },
   'gerrit.enableAiReview': {
     title: 'Enable AI Review',
@@ -307,6 +307,11 @@ export const commands: {
     icon: '$(comment-discussion)',
     inCommandPalette: contextProp('gerrit:connected'),
   },
+  'gerrit.acceptSuggestion': {
+    title: 'Accept Suggestion',
+    icon: '$(lightbulb)',
+    inCommandPalette: false,
+  },
 };
 
 export const views: {
@@ -430,6 +435,13 @@ export const views: {
           commentContains(COMMENT_IS_DELETABLE)
         ),
       },
+      {
+        command: GerritExtensionCommands.ACCEPT_SUGGESTION,
+        when: and(
+          IS_GERRTIT_COMMENT_CONTROLLER,
+          commentContains(COMMENT_QUICK_ACTIONS_POSSIBLE)
+        ),
+      },
     ],
   },
   'view/item/context': {
@@ -448,6 +460,13 @@ export const views: {
           viewItemContains(TREE_ITEM_TYPE_CHANGE)
         ),
       },
+      {
+        command: GerritExtensionCommands.AI_REVIEW,
+        when: and(
+          IS_GERRIT_CHANGE_EXPLORER_VIEW,
+          viewItemContains(TREE_ITEM_TYPE_CHANGE)
+        ),
+      },
       {
         command: GerritExtensionCommands.CHECKOUT_BRANCH,
         when: and(

src/extension.ts

@@ -75,6 +75,26 @@ export async function activate(context: ExtensionContext): Promise<void> {
 	GerritSecrets.secretStorage = context.secrets;
 	await setAPIGitReviewFile(gerritRepo);
 
+	// Set AI Review enabled context
+	const aiReviewEnabled = getConfiguration().get(
+		'gerrit.aiReview.enabled',
+		false
+	);
+	await setContextProp('gerrit:aiReview.enabled', aiReviewEnabled);
+
+	// Watch for config changes to update AI Review enabled context
+	context.subscriptions.push(
+		workspace.onDidChangeConfiguration((e) => {
+			if (e.affectsConfiguration('gerrit.aiReview.enabled')) {
+				const enabled = getConfiguration().get(
+					'gerrit.aiReview.enabled',
+					false
+				);
+				void setContextProp('gerrit:aiReview.enabled', enabled);
+			}
+		})
+	);
+
 	// Register commands
 	const statusBar = new CurrentChangeStatusBarManager();
 	context.subscriptions.push(statusBar);