merge duplicate imports packages/cli/src subtask1 (#22040)

packages/cli/src/test-utils/mockCommandContext.ts

@@ -6,8 +6,7 @@
 
 import { vi } from 'vitest';
 import type { CommandContext } from '../ui/commands/types.js';
-import type { LoadedSettings } from '../config/settings.js';
-import { mergeSettings } from '../config/settings.js';
+import { mergeSettings, type LoadedSettings } from '../config/settings.js';
 import type { GitService } from '@google/gemini-cli-core';
 import type { SessionStatsState } from '../ui/contexts/SessionContext.js';
 

packages/cli/src/test-utils/mockConfig.ts

@@ -6,8 +6,11 @@
 
 import { vi } from 'vitest';
 import type { Config } from '@google/gemini-cli-core';
-import type { LoadedSettings, Settings } from '../config/settings.js';
-import { createTestMergedSettings } from '../config/settings.js';
+import {
+  createTestMergedSettings,
+  type LoadedSettings,
+  type Settings,
+} from '../config/settings.js';
 
 /**
  * Creates a mocked Config object with default values and allows overrides.

packages/cli/src/test-utils/render.tsx

@@ -11,10 +11,10 @@ import {
 } from 'ink';
 import { EventEmitter } from 'node:events';
 import { Box } from 'ink';
-import type React from 'react';
 import { Terminal } from '@xterm/headless';
 import { vi } from 'vitest';
 import stripAnsi from 'strip-ansi';
+import type React from 'react';
 import { act, useState } from 'react';
 import os from 'node:os';
 import path from 'node:path';