From 8d5eb3bf9ce17242dd88e35dd4f64dad155fd67e Mon Sep 17 00:00:00 2001
From: Luke Parker <10430890+Hona@users.noreply.github.com>
Date: Thu, 24 Sep 2026 10:29:32 +1000
Subject: [PATCH] fix(app): start MCP sign-in from row click (#51001)

---
 packages/app/src/session/summary/server-panel.tsx | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/app/src/session/summary/server-panel.tsx b/packages/app/src/session/summary/server-panel.tsx
index 6e8e1e4626c..3b7ecf155c9 100644
--- a/packages/app/src/session/summary/server-panel.tsx
+++ b/packages/app/src/session/summary/server-panel.tsx
@@ -243,6 +243,16 @@ function McpMenu(props: ServiceMenuProps) {
                 aria-busy={props.mcp?.pending ?? toggle.isPending}
                 onChange={change}
                 onClick={(event: MouseEvent) => {
+                  if (
+                    !(event.target instanceof Element) ||
+                    event.target.closest('[data-slot="switch-control"], [data-slot="switch-input"]')
+                  )
+                    return
+                  // Outside the switch itself, a row that requires sign-in starts sign-in instead of toggling.
+                  if (!preview() && server().status.status === "needs_auth") {
+                    event.preventDefault()
+                    return change(true)
+                  }
                   if (event.target === event.currentTarget) change(!enabled())
                 }}
                 title={preview() ? server().name : (error() ?? server().name)}