From 5159b081bd25abdd6e0d74caf9dee8e23ab53647 Mon Sep 17 00:00:00 2001
From: David Pierce <davidapierce@google.com>
Date: Thu, 14 May 2026 19:44:03 +0000
Subject: [PATCH] fix(core): ensure stable admin settings comparison across IPC
 to prevent restart loop (#27066)

---
 packages/core/src/code_assist/admin/admin_controls.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/core/src/code_assist/admin/admin_controls.ts b/packages/core/src/code_assist/admin/admin_controls.ts
index 7182ee972e..80ddb106af 100644
--- a/packages/core/src/code_assist/admin/admin_controls.ts
+++ b/packages/core/src/code_assist/admin/admin_controls.ts
@@ -87,7 +87,9 @@ export function sanitizeAdminSettings(
     mcpSetting: {
       mcpEnabled: sanitized.mcpSetting?.mcpEnabled ?? false,
       mcpConfig: mcpConfig ?? {},
-      requiredMcpConfig: mcpConfig?.requiredMcpServers,
+      ...(mcpConfig?.requiredMcpServers && {
+        requiredMcpConfig: mcpConfig.requiredMcpServers,
+      }),
     },
   };
 }