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,

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

@@ -21,10 +21,12 @@ const createMockSettings = (
   new LoadedSettings(
     {
       settings: { ui: { customThemes: {} }, ...systemSettings },
+      originalSettings: { ui: { customThemes: {} }, ...systemSettings },
       path: '/system/settings.json',
     },
     {
       settings: {},
+      originalSettings: {},
       path: '/system/system-defaults.json',
     },
     {
@@ -32,6 +34,10 @@ const createMockSettings = (
         ui: { customThemes: {} },
         ...userSettings,
       },
+      originalSettings: {
+        ui: { customThemes: {} },
+        ...userSettings,
+      },
       path: '/user/settings.json',
     },
     {
@@ -39,6 +45,10 @@ const createMockSettings = (
         ui: { customThemes: {} },
         ...workspaceSettings,
       },
+      originalSettings: {
+        ui: { customThemes: {} },
+        ...workspaceSettings,
+      },
       path: '/workspace/settings.json',
     },
     true,

packages/cli/src/ui/utils/MarkdownDisplay.test.tsx

@@ -19,10 +19,10 @@ describe('<MarkdownDisplay />', () => {
   };
 
   const mockSettings = new LoadedSettings(
-    { path: '', settings: {} },
-    { path: '', settings: {} },
-    { path: '', settings: {} },
-    { path: '', settings: {} },
+    { path: '', settings: {}, originalSettings: {} },
+    { path: '', settings: {}, originalSettings: {} },
+    { path: '', settings: {}, originalSettings: {} },
+    { path: '', settings: {}, originalSettings: {} },
     true,
     new Set(),
   );
@@ -222,10 +222,14 @@ Another paragraph.
   it('hides line numbers in code blocks when showLineNumbers is false', () => {
     const text = '```javascript\nconst x = 1;\n```'.replace(/\n/g, EOL);
     const settings = new LoadedSettings(
-      { path: '', settings: {} },
-      { path: '', settings: {} },
-      { path: '', settings: { ui: { showLineNumbers: false } } },
-      { path: '', settings: {} },
+      { path: '', settings: {}, originalSettings: {} },
+      { path: '', settings: {}, originalSettings: {} },
+      {
+        path: '',
+        settings: { ui: { showLineNumbers: false } },
+        originalSettings: { ui: { showLineNumbers: false } },
+      },
+      { path: '', settings: {}, originalSettings: {} },
       true,
       new Set(),
     );