fix(patch): cherry-pick 356f76e to release/v0.24.0-preview.1-pr-16252 to patch version v0.24.0-preview.1 and create version 0.24.0-preview.2 (#16552)

Co-authored-by: Gal Zahavi <38544478+galz10@users.noreply.github.com>
Co-authored-by: Abhi <43648792+abhipatel12@users.noreply.github.com>

packages/cli/src/ui/App.test.tsx

@@ -14,11 +14,7 @@ import { StreamingState } from './types.js';
 import { ConfigContext } from './contexts/ConfigContext.js';
 import { AppContext, type AppState } from './contexts/AppContext.js';
 import { SettingsContext } from './contexts/SettingsContext.js';
-import {
-  type SettingScope,
-  LoadedSettings,
-  type SettingsFile,
-} from '../config/settings.js';
+import { LoadedSettings, type SettingsFile } from '../config/settings.js';
 
 vi.mock('ink', async (importOriginal) => {
   const original = await importOriginal<typeof import('ink')>();
@@ -92,7 +88,7 @@ describe('App', () => {
     mockSettingsFile,
     mockSettingsFile,
     true,
-    new Set<SettingScope>(),
+    [],
   );
 
   const mockAppState: AppState = {

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

@@ -105,7 +105,7 @@ const createMockSettings = (
       path: '/workspace/settings.json',
     },
     true,
-    new Set(),
+    [],
   );
 
 vi.mock('../../config/settingsSchema.js', async (importOriginal) => {

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

@@ -51,7 +51,7 @@ const createMockSettings = (
       path: '/workspace/settings.json',
     },
     true,
-    new Set(),
+    [],
   );
 
 describe('ThemeDialog Snapshots', () => {

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

@@ -24,7 +24,7 @@ describe('colorizeCode', () => {
       },
       { path: '', settings: {}, originalSettings: {} },
       true,
-      new Set(),
+      [],
     );
 
     const result = colorizeCode({

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

@@ -198,7 +198,7 @@ Another paragraph.
         },
         { path: '', settings: {}, originalSettings: {} },
         true,
-        new Set(),
+        [],
       );
 
       const { lastFrame } = renderWithProviders(