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

packages/cli/src/ui/commands/aboutCommand.ts

@@ -4,8 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { CommandContext, SlashCommand } from './types.js';
-import { CommandKind } from './types.js';
+import {
+  CommandKind,
+  type CommandContext,
+  type SlashCommand,
+} from './types.js';
 import process from 'node:process';
 import { MessageType, type HistoryItemAbout } from '../types.js';
 import {

packages/cli/src/ui/commands/clearCommand.test.ts

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Mock } from 'vitest';
-import { vi, describe, it, expect, beforeEach } from 'vitest';
+import { vi, describe, it, expect, beforeEach, type Mock } from 'vitest';
 import { clearCommand } from './clearCommand.js';
 import { type CommandContext } from './types.js';
 import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
@@ -22,8 +21,7 @@ vi.mock('@google/gemini-cli-core', async () => {
   };
 });
 
-import type { GeminiClient } from '@google/gemini-cli-core';
-import { uiTelemetryService } from '@google/gemini-cli-core';
+import { uiTelemetryService, type GeminiClient } from '@google/gemini-cli-core';
 
 describe('clearCommand', () => {
   let mockContext: CommandContext;

packages/cli/src/ui/commands/clearCommand.ts

@@ -10,8 +10,7 @@ import {
   SessionStartSource,
   flushTelemetry,
 } from '@google/gemini-cli-core';
-import type { SlashCommand } from './types.js';
-import { CommandKind } from './types.js';
+import { CommandKind, type SlashCommand } from './types.js';
 import { MessageType } from '../types.js';
 import { randomUUID } from 'node:crypto';
 

packages/cli/src/ui/commands/compressCommand.ts

@@ -4,10 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { HistoryItemCompression } from '../types.js';
-import { MessageType } from '../types.js';
-import type { SlashCommand } from './types.js';
-import { CommandKind } from './types.js';
+import { MessageType, type HistoryItemCompression } from '../types.js';
+import { CommandKind, type SlashCommand } from './types.js';
 
 export const compressCommand: SlashCommand = {
   name: 'compress',

packages/cli/src/ui/commands/copyCommand.test.ts

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Mock } from 'vitest';
-import { vi, describe, it, expect, beforeEach } from 'vitest';
+import { vi, describe, it, expect, beforeEach, type Mock } from 'vitest';
 import { copyCommand } from './copyCommand.js';
 import { type CommandContext } from './types.js';
 import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';

packages/cli/src/ui/commands/copyCommand.ts

@@ -6,8 +6,11 @@
 
 import { debugLogger } from '@google/gemini-cli-core';
 import { copyToClipboard } from '../utils/commandUtils.js';
-import type { SlashCommand, SlashCommandActionReturn } from './types.js';
-import { CommandKind } from './types.js';
+import {
+  CommandKind,
+  type SlashCommand,
+  type SlashCommandActionReturn,
+} from './types.js';
 
 export const copyCommand: SlashCommand = {
   name: 'copy',

packages/cli/src/ui/commands/directoryCommand.test.tsx

@@ -4,8 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
-import type { Mock } from 'vitest';
+import {
+  vi,
+  describe,
+  it,
+  expect,
+  beforeEach,
+  afterEach,
+  type Mock,
+} from 'vitest';
 import { directoryCommand } from './directoryCommand.js';
 import {
   expandHomeDir,

packages/cli/src/ui/commands/directoryCommand.tsx

@@ -9,16 +9,21 @@ import {
   loadTrustedFolders,
 } from '../../config/trustedFolders.js';
 import { MultiFolderTrustDialog } from '../components/MultiFolderTrustDialog.js';
-import type { SlashCommand, CommandContext } from './types.js';
-import { CommandKind } from './types.js';
+import {
+  CommandKind,
+  type SlashCommand,
+  type CommandContext,
+} from './types.js';
 import { MessageType, type HistoryItem } from '../types.js';
-import { refreshServerHierarchicalMemory } from '@google/gemini-cli-core';
+import {
+  refreshServerHierarchicalMemory,
+  type Config,
+} from '@google/gemini-cli-core';
 import {
   expandHomeDir,
   getDirectorySuggestions,
   batchAddDirectories,
 } from '../utils/directoryUtils.js';
-import type { Config } from '@google/gemini-cli-core';
 import * as path from 'node:path';
 import * as fs from 'node:fs';
 

packages/cli/src/ui/commands/helpCommand.test.ts

@@ -6,10 +6,9 @@
 
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { helpCommand } from './helpCommand.js';
-import { type CommandContext } from './types.js';
+import { CommandKind, type CommandContext } from './types.js';
 import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
 import { MessageType } from '../types.js';
-import { CommandKind } from './types.js';
 
 describe('helpCommand', () => {
   let mockContext: CommandContext;

packages/cli/src/ui/commands/helpCommand.ts

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { SlashCommand } from './types.js';
-import { CommandKind } from './types.js';
+import { CommandKind, type SlashCommand } from './types.js';
 import { MessageType, type HistoryItemHelp } from '../types.js';
 
 export const helpCommand: SlashCommand = {

packages/cli/src/ui/commands/hooksCommand.test.ts

@@ -7,8 +7,12 @@
 import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
 import { hooksCommand } from './hooksCommand.js';
 import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
-import type { HookRegistryEntry } from '@google/gemini-cli-core';
-import { HookType, HookEventName, ConfigSource } from '@google/gemini-cli-core';
+import {
+  HookType,
+  HookEventName,
+  ConfigSource,
+  type HookRegistryEntry,
+} from '@google/gemini-cli-core';
 import type { CommandContext } from './types.js';
 import { SettingScope } from '../../config/settings.js';
 

packages/cli/src/ui/commands/ideCommand.test.ts

@@ -4,8 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { MockInstance } from 'vitest';
-import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
+import {
+  vi,
+  describe,
+  it,
+  expect,
+  beforeEach,
+  afterEach,
+  type MockInstance,
+} from 'vitest';
 import { ideCommand } from './ideCommand.js';
 import { type CommandContext } from './types.js';
 import { IDE_DEFINITIONS } from '@google/gemini-cli-core';

packages/cli/src/ui/commands/memoryCommand.test.ts

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Mock } from 'vitest';
-import { vi, describe, it, expect, beforeEach } from 'vitest';
+import { vi, describe, it, expect, beforeEach, type Mock } from 'vitest';
 import { memoryCommand } from './memoryCommand.js';
 import type { SlashCommand, CommandContext } from './types.js';
 import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';

packages/cli/src/ui/commands/memoryCommand.ts

@@ -11,8 +11,11 @@ import {
   showMemory,
 } from '@google/gemini-cli-core';
 import { MessageType } from '../types.js';
-import type { SlashCommand, SlashCommandActionReturn } from './types.js';
-import { CommandKind } from './types.js';
+import {
+  CommandKind,
+  type SlashCommand,
+  type SlashCommandActionReturn,
+} from './types.js';
 
 export const memoryCommand: SlashCommand = {
   name: 'memory',

packages/cli/src/ui/commands/privacyCommand.ts

@@ -4,8 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { OpenDialogActionReturn, SlashCommand } from './types.js';
-import { CommandKind } from './types.js';
+import {
+  CommandKind,
+  type OpenDialogActionReturn,
+  type SlashCommand,
+} from './types.js';
 
 export const privacyCommand: SlashCommand = {
   name: 'privacy',

packages/cli/src/ui/commands/settingsCommand.ts

@@ -4,8 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { OpenDialogActionReturn, SlashCommand } from './types.js';
-import { CommandKind } from './types.js';
+import {
+  CommandKind,
+  type OpenDialogActionReturn,
+  type SlashCommand,
+} from './types.js';
 
 export const settingsCommand: SlashCommand = {
   name: 'settings',

packages/cli/src/ui/commands/setupGithubCommand.test.ts

@@ -17,8 +17,7 @@ import {
 } from './setupGithubCommand.js';
 import type { CommandContext } from './types.js';
 import * as commandUtils from '../utils/commandUtils.js';
-import type { ToolActionReturn } from '@google/gemini-cli-core';
-import { debugLogger } from '@google/gemini-cli-core';
+import { debugLogger, type ToolActionReturn } from '@google/gemini-cli-core';
 
 vi.mock('child_process');
 

packages/cli/src/ui/commands/setupGithubCommand.ts

@@ -17,8 +17,11 @@ import {
   getGitHubRepoInfo,
 } from '../../utils/gitUtils.js';
 
-import type { SlashCommand, SlashCommandActionReturn } from './types.js';
-import { CommandKind } from './types.js';
+import {
+  CommandKind,
+  type SlashCommand,
+  type SlashCommandActionReturn,
+} from './types.js';
 import { getUrlOpenCommand } from '../../ui/utils/commandUtils.js';
 import { debugLogger } from '@google/gemini-cli-core';
 

packages/cli/src/ui/commands/shortcutsCommand.ts

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { SlashCommand } from './types.js';
-import { CommandKind } from './types.js';
+import { CommandKind, type SlashCommand } from './types.js';
 
 export const shortcutsCommand: SlashCommand = {
   name: 'shortcuts',

packages/cli/src/ui/commands/terminalSetupCommand.ts

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { SlashCommand } from './types.js';
-import { CommandKind } from './types.js';
+import { CommandKind, type SlashCommand } from './types.js';
 import { terminalSetup } from '../utils/terminalSetup.js';
 import { type MessageActionReturn } from '@google/gemini-cli-core';
 

packages/cli/src/ui/commands/themeCommand.ts

@@ -4,8 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { OpenDialogActionReturn, SlashCommand } from './types.js';
-import { CommandKind } from './types.js';
+import {
+  CommandKind,
+  type OpenDialogActionReturn,
+  type SlashCommand,
+} from './types.js';
 
 export const themeCommand: SlashCommand = {
   name: 'theme',

packages/cli/src/ui/commands/toolsCommand.test.ts

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { vi } from 'vitest';
-import { describe, it, expect } from 'vitest';
+import { describe, it, expect, type vi } from 'vitest';
 import { toolsCommand } from './toolsCommand.js';
 import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
 import { MessageType } from '../types.js';

packages/cli/src/ui/commands/upgradeCommand.ts

@@ -10,8 +10,7 @@ import {
   shouldLaunchBrowser,
   UPGRADE_URL_PAGE,
 } from '@google/gemini-cli-core';
-import type { SlashCommand } from './types.js';
-import { CommandKind } from './types.js';
+import { CommandKind, type SlashCommand } from './types.js';
 
 /**
  * Command to open the upgrade page for Gemini Code Assist.

packages/cli/src/ui/commands/vimCommand.ts

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { SlashCommand } from './types.js';
-import { CommandKind } from './types.js';
+import { CommandKind, type SlashCommand } from './types.js';
 
 export const vimCommand: SlashCommand = {
   name: 'vim',