Fix #8077: Settings command overwrites entire JSON file, leaking environment variables (#8154)

Co-authored-by: Shreya Keshive <skeshive@gmail.com>

packages/cli/src/ui/components/SettingsDialog.test.tsx

@@ -58,10 +58,16 @@ const createMockSettings = (
   new LoadedSettings(
     {
       settings: { ui: { customThemes: {} }, mcpServers: {}, ...systemSettings },
+      originalSettings: {
+        ui: { customThemes: {} },
+        mcpServers: {},
+        ...systemSettings,
+      },
       path: '/system/settings.json',
     },
     {
       settings: {},
+      originalSettings: {},
       path: '/system/system-defaults.json',
     },
     {
@@ -70,6 +76,11 @@ const createMockSettings = (
         mcpServers: {},
         ...userSettings,
       },
+      originalSettings: {
+        ui: { customThemes: {} },
+        mcpServers: {},
+        ...userSettings,
+      },
       path: '/user/settings.json',
     },
     {
@@ -78,6 +89,11 @@ const createMockSettings = (
         mcpServers: {},
         ...workspaceSettings,
       },
+      originalSettings: {
+        ui: { customThemes: {} },
+        mcpServers: {},
+        ...workspaceSettings,
+      },
       path: '/workspace/settings.json',
     },
     true,