From a63d14dba9c3180fd93c44d925047b742062f484 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 8 Apr 2026 12:13:40 +0000
Subject: [PATCH 1/2] Initial plan


From d789baccd251a8869cda41495d4fdc48eefac34e Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 8 Apr 2026 12:20:01 +0000
Subject: [PATCH 2/2] Fix duplicated Fix entry points on marker hover

When an AI code action is present, skip rendering menu-contributed
actions (e.g. inline chat FixDiagnosticsAction) to avoid showing
two "Fix" buttons in the hover status bar.

Agent-Logs-Url: https://github.com/microsoft/vscode/sessions/52d215c6-9411-43f1-b6b6-15c542e0ed81

Co-authored-by: jrieken <1794099+jrieken@users.noreply.github.com>
---
 .../editor/contrib/hover/browser/markerHoverParticipant.ts  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/vs/editor/contrib/hover/browser/markerHoverParticipant.ts b/src/vs/editor/contrib/hover/browser/markerHoverParticipant.ts
index 4964af49280ac..d76df671aa8c8 100644
--- a/src/vs/editor/contrib/hover/browser/markerHoverParticipant.ts
+++ b/src/vs/editor/contrib/hover/browser/markerHoverParticipant.ts
@@ -307,10 +307,12 @@ export class MarkerHoverParticipant implements IEditorHoverParticipant<MarkerHov
 							controller?.applyCodeAction(aiCodeAction, false, false, ApplyCodeActionReason.FromProblemsHover);
 						}
 					});
+				} else {
+					// Only show menu-contributed actions (e.g. inline chat Fix) when there
+					// is no AI code action, to avoid duplicate Fix entry points.
+					renderMenuActions();
 				}
 
-				renderMenuActions();
-
 				// Notify that the contents have changed given we added
 				// actions to the hover
 				// https://github.com/microsoft/vscode/issues/250424