Explict imports & exports with type modifier (#3774)

packages/cli/src/ui/hooks/atCommandProcessor.test.ts

@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach, Mock } from 'vitest';
+import type { Mock } from 'vitest';
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { handleAtCommand } from './atCommandProcessor.js';
+import type { Config } from '@google/gemini-cli-core';
 import {
-  Config,
   FileDiscoveryService,
   GlobTool,
   ReadManyFilesTool,
@@ -18,7 +19,7 @@ import {
 } from '@google/gemini-cli-core';
 import * as os from 'node:os';
 import { ToolCallStatus } from '../types.js';
-import { UseHistoryManagerReturn } from './useHistoryManager.js';
+import type { UseHistoryManagerReturn } from './useHistoryManager.js';
 import * as fsPromises from 'node:fs/promises';
 import * as path from 'node:path';
 

packages/cli/src/ui/hooks/atCommandProcessor.ts

@@ -6,20 +6,16 @@
 
 import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
-import { PartListUnion, PartUnion } from '@google/genai';
+import type { PartListUnion, PartUnion } from '@google/genai';
+import type { AnyToolInvocation, Config } from '@google/gemini-cli-core';
 import {
-  AnyToolInvocation,
-  Config,
   getErrorMessage,
   isNodeError,
   unescapePath,
 } from '@google/gemini-cli-core';
-import {
-  HistoryItem,
-  IndividualToolCallDisplay,
-  ToolCallStatus,
-} from '../types.js';
-import { UseHistoryManagerReturn } from './useHistoryManager.js';
+import type { HistoryItem, IndividualToolCallDisplay } from '../types.js';
+import { ToolCallStatus } from '../types.js';
+import type { UseHistoryManagerReturn } from './useHistoryManager.js';
 
 interface HandleAtCommandParams {
   query: string;

packages/cli/src/ui/hooks/shellCommandProcessor.ts

@@ -4,21 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
+import type {
   HistoryItemWithoutId,
   IndividualToolCallDisplay,
-  ToolCallStatus,
 } from '../types.js';
+import { ToolCallStatus } from '../types.js';
 import { useCallback } from 'react';
-import {
+import type {
   Config,
   GeminiClient,
-  isBinary,
   ShellExecutionResult,
-  ShellExecutionService,
 } from '@google/gemini-cli-core';
+import { isBinary, ShellExecutionService } from '@google/gemini-cli-core';
 import { type PartListUnion } from '@google/genai';
-import { UseHistoryManagerReturn } from './useHistoryManager.js';
+import type { UseHistoryManagerReturn } from './useHistoryManager.js';
 import { SHELL_COMMAND_NAME } from '../constants.js';
 import { formatMemoryUsage } from '../utils/formatters.js';
 import crypto from 'node:crypto';

packages/cli/src/ui/hooks/slashCommandProcessor.test.ts

@@ -71,14 +71,14 @@ vi.mock('../../utils/cleanup.js', () => ({
 import { act, renderHook, waitFor } from '@testing-library/react';
 import { vi, describe, it, expect, beforeEach, type Mock } from 'vitest';
 import { useSlashCommandProcessor } from './slashCommandProcessor.js';
-import {
+import type {
   CommandContext,
-  CommandKind,
   ConfirmShellCommandsActionReturn,
   SlashCommand,
 } from '../commands/types.js';
+import { CommandKind } from '../commands/types.js';
 import { ToolConfirmationOutcome } from '@google/gemini-cli-core';
-import { LoadedSettings } from '../../config/settings.js';
+import type { LoadedSettings } from '../../config/settings.js';
 import { MessageType } from '../types.js';
 import { BuiltinCommandLoader } from '../../services/BuiltinCommandLoader.js';
 import { FileCommandLoader } from '../../services/FileCommandLoader.js';

packages/cli/src/ui/hooks/slashCommandProcessor.ts

@@ -7,9 +7,9 @@
 import { useCallback, useMemo, useEffect, useState } from 'react';
 import { type PartListUnion } from '@google/genai';
 import process from 'node:process';
-import { UseHistoryManagerReturn } from './useHistoryManager.js';
+import type { UseHistoryManagerReturn } from './useHistoryManager.js';
+import type { Config } from '@google/gemini-cli-core';
 import {
-  Config,
   GitService,
   Logger,
   logSlashCommand,
@@ -20,14 +20,14 @@ import {
 } from '@google/gemini-cli-core';
 import { useSessionStats } from '../contexts/SessionContext.js';
 import { runExitCleanup } from '../../utils/cleanup.js';
-import {
+import type {
   Message,
-  MessageType,
   HistoryItemWithoutId,
   HistoryItem,
   SlashCommandProcessorResult,
 } from '../types.js';
-import { LoadedSettings } from '../../config/settings.js';
+import { MessageType } from '../types.js';
+import type { LoadedSettings } from '../../config/settings.js';
 import { type CommandContext, type SlashCommand } from '../commands/types.js';
 import { CommandService } from '../../services/CommandService.js';
 import { BuiltinCommandLoader } from '../../services/BuiltinCommandLoader.js';

packages/cli/src/ui/hooks/useAtCompletion.test.ts

@@ -9,14 +9,12 @@
 import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
 import { renderHook, waitFor, act } from '@testing-library/react';
 import { useAtCompletion } from './useAtCompletion.js';
-import { Config, FileSearch, FileSearchFactory } from '@google/gemini-cli-core';
-import {
-  createTmpDir,
-  cleanupTmpDir,
-  FileSystemStructure,
-} from '@google/gemini-cli-test-utils';
+import type { Config, FileSearch } from '@google/gemini-cli-core';
+import { FileSearchFactory } from '@google/gemini-cli-core';
+import type { FileSystemStructure } from '@google/gemini-cli-test-utils';
+import { createTmpDir, cleanupTmpDir } from '@google/gemini-cli-test-utils';
 import { useState } from 'react';
-import { Suggestion } from '../components/SuggestionsDisplay.js';
+import type { Suggestion } from '../components/SuggestionsDisplay.js';
 
 // Test harness to capture the state from the hook's callbacks.
 function useTestHarnessForAtCompletion(

packages/cli/src/ui/hooks/useAtCompletion.ts

@@ -5,16 +5,10 @@
  */
 
 import { useEffect, useReducer, useRef } from 'react';
-import {
-  Config,
-  FileSearch,
-  FileSearchFactory,
-  escapePath,
-} from '@google/gemini-cli-core';
-import {
-  Suggestion,
-  MAX_SUGGESTIONS_TO_SHOW,
-} from '../components/SuggestionsDisplay.js';
+import type { Config, FileSearch } from '@google/gemini-cli-core';
+import { FileSearchFactory, escapePath } from '@google/gemini-cli-core';
+import type { Suggestion } from '../components/SuggestionsDisplay.js';
+import { MAX_SUGGESTIONS_TO_SHOW } from '../components/SuggestionsDisplay.js';
 
 export enum AtCompletionStatus {
   IDLE = 'idle',

packages/cli/src/ui/hooks/useAuthCommand.ts

@@ -5,10 +5,9 @@
  */
 
 import { useState, useCallback, useEffect } from 'react';
-import { LoadedSettings, SettingScope } from '../../config/settings.js';
+import type { LoadedSettings, SettingScope } from '../../config/settings.js';
+import { AuthType, type Config } from '@google/gemini-cli-core';
 import {
-  AuthType,
-  Config,
   clearCachedCredentialFile,
   getErrorMessage,
 } from '@google/gemini-cli-core';

packages/cli/src/ui/hooks/useAutoAcceptIndicator.test.ts

@@ -16,12 +16,10 @@ import {
 import { renderHook, act } from '@testing-library/react';
 import { useAutoAcceptIndicator } from './useAutoAcceptIndicator.js';
 
-import {
-  Config,
-  Config as ActualConfigType,
-  ApprovalMode,
-} from '@google/gemini-cli-core';
-import { useKeypress, Key } from './useKeypress.js';
+import type { Config as ActualConfigType } from '@google/gemini-cli-core';
+import { Config, ApprovalMode } from '@google/gemini-cli-core';
+import type { Key } from './useKeypress.js';
+import { useKeypress } from './useKeypress.js';
 
 vi.mock('./useKeypress.js');
 

packages/cli/src/ui/hooks/useCommandCompletion.test.ts

@@ -9,16 +9,15 @@
 import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
 import { renderHook, act, waitFor } from '@testing-library/react';
 import { useCommandCompletion } from './useCommandCompletion.js';
-import { CommandContext } from '../commands/types.js';
-import { Config } from '@google/gemini-cli-core';
+import type { CommandContext } from '../commands/types.js';
+import type { Config } from '@google/gemini-cli-core';
 import { useTextBuffer } from '../components/shared/text-buffer.js';
 import { useEffect } from 'react';
-import { Suggestion } from '../components/SuggestionsDisplay.js';
-import { UseAtCompletionProps, useAtCompletion } from './useAtCompletion.js';
-import {
-  UseSlashCompletionProps,
-  useSlashCompletion,
-} from './useSlashCompletion.js';
+import type { Suggestion } from '../components/SuggestionsDisplay.js';
+import type { UseAtCompletionProps } from './useAtCompletion.js';
+import { useAtCompletion } from './useAtCompletion.js';
+import type { UseSlashCompletionProps } from './useSlashCompletion.js';
+import { useSlashCompletion } from './useSlashCompletion.js';
 
 vi.mock('./useAtCompletion', () => ({
   useAtCompletion: vi.fn(),

packages/cli/src/ui/hooks/useCommandCompletion.tsx

@@ -5,22 +5,20 @@
  */
 
 import { useCallback, useMemo, useEffect } from 'react';
-import { Suggestion } from '../components/SuggestionsDisplay.js';
-import { CommandContext, SlashCommand } from '../commands/types.js';
-import {
-  logicalPosToOffset,
-  TextBuffer,
-} from '../components/shared/text-buffer.js';
+import type { Suggestion } from '../components/SuggestionsDisplay.js';
+import type { CommandContext, SlashCommand } from '../commands/types.js';
+import type { TextBuffer } from '../components/shared/text-buffer.js';
+import { logicalPosToOffset } from '../components/shared/text-buffer.js';
 import { isSlashCommand } from '../utils/commandUtils.js';
 import { toCodePoints } from '../utils/textUtils.js';
 import { useAtCompletion } from './useAtCompletion.js';
 import { useSlashCompletion } from './useSlashCompletion.js';
+import type { PromptCompletion } from './usePromptCompletion.js';
 import {
   usePromptCompletion,
-  PromptCompletion,
   PROMPT_COMPLETION_MIN_LENGTH,
 } from './usePromptCompletion.js';
-import { Config } from '@google/gemini-cli-core';
+import type { Config } from '@google/gemini-cli-core';
 import { useCompletion } from './useCompletion.js';
 
 export enum CompletionMode {

packages/cli/src/ui/hooks/useCompletion.ts

@@ -6,10 +6,8 @@
 
 import { useState, useCallback } from 'react';
 
-import {
-  MAX_SUGGESTIONS_TO_SHOW,
-  Suggestion,
-} from '../components/SuggestionsDisplay.js';
+import type { Suggestion } from '../components/SuggestionsDisplay.js';
+import { MAX_SUGGESTIONS_TO_SHOW } from '../components/SuggestionsDisplay.js';
 
 export interface UseCompletionReturn {
   suggestions: Suggestion[];

packages/cli/src/ui/hooks/useConsoleMessages.ts

@@ -11,7 +11,7 @@ import {
   useRef,
   useTransition,
 } from 'react';
-import { ConsoleMessageItem } from '../types.js';
+import type { ConsoleMessageItem } from '../types.js';
 
 export interface UseConsoleMessagesReturn {
   consoleMessages: ConsoleMessageItem[];

packages/cli/src/ui/hooks/useEditorSettings.test.ts

@@ -16,7 +16,8 @@ import {
 import { act } from 'react';
 import { renderHook } from '@testing-library/react';
 import { useEditorSettings } from './useEditorSettings.js';
-import { LoadedSettings, SettingScope } from '../../config/settings.js';
+import type { LoadedSettings } from '../../config/settings.js';
+import { SettingScope } from '../../config/settings.js';
 import { MessageType, type HistoryItem } from '../types.js';
 import {
   type EditorType,

packages/cli/src/ui/hooks/useEditorSettings.ts

@@ -5,12 +5,12 @@
  */
 
 import { useState, useCallback } from 'react';
-import { LoadedSettings, SettingScope } from '../../config/settings.js';
+import type { LoadedSettings, SettingScope } from '../../config/settings.js';
 import { type HistoryItem, MessageType } from '../types.js';
+import type { EditorType } from '@google/gemini-cli-core';
 import {
   allowEditorTypeInSandbox,
   checkHasEditorType,
-  EditorType,
 } from '@google/gemini-cli-core';
 
 interface UseEditorSettingsReturn {

packages/cli/src/ui/hooks/useFolderTrust.test.ts

@@ -7,12 +7,10 @@
 import { vi } from 'vitest';
 import { renderHook, act } from '@testing-library/react';
 import { useFolderTrust } from './useFolderTrust.js';
-import { LoadedSettings } from '../../config/settings.js';
+import type { LoadedSettings } from '../../config/settings.js';
 import { FolderTrustChoice } from '../components/FolderTrustDialog.js';
-import {
-  LoadedTrustedFolders,
-  TrustLevel,
-} from '../../config/trustedFolders.js';
+import type { LoadedTrustedFolders } from '../../config/trustedFolders.js';
+import { TrustLevel } from '../../config/trustedFolders.js';
 import * as process from 'node:process';
 
 import * as trustedFolders from '../../config/trustedFolders.js';

packages/cli/src/ui/hooks/useFolderTrust.ts

@@ -5,7 +5,7 @@
  */
 
 import { useState, useCallback, useEffect } from 'react';
-import { Settings, LoadedSettings } from '../../config/settings.js';
+import type { Settings, LoadedSettings } from '../../config/settings.js';
 import { FolderTrustChoice } from '../components/FolderTrustDialog.js';
 import {
   loadTrustedFolders,

packages/cli/src/ui/hooks/useGeminiStream.test.tsx

@@ -5,45 +5,36 @@
  */
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import {
-  describe,
-  it,
-  expect,
-  vi,
-  beforeEach,
-  Mock,
-  MockInstance,
-} from 'vitest';
+import type { Mock, MockInstance } from 'vitest';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { renderHook, act, waitFor } from '@testing-library/react';
 import { useGeminiStream } from './useGeminiStream.js';
 import { useKeypress } from './useKeypress.js';
 import * as atCommandProcessor from './atCommandProcessor.js';
-import {
-  useReactToolScheduler,
+import type {
   TrackedToolCall,
   TrackedCompletedToolCall,
   TrackedExecutingToolCall,
   TrackedCancelledToolCall,
 } from './useReactToolScheduler.js';
-import {
-  ApprovalMode,
+import { useReactToolScheduler } from './useReactToolScheduler.js';
+import type {
   Config,
   EditorType,
-  AuthType,
   GeminiClient,
-  GeminiEventType as ServerGeminiEventType,
   AnyToolInvocation,
-  ToolErrorType, // <-- Import ToolErrorType
 } from '@google/gemini-cli-core';
-import { Part, PartListUnion } from '@google/genai';
-import { UseHistoryManagerReturn } from './useHistoryManager.js';
 import {
-  HistoryItem,
-  MessageType,
-  SlashCommandProcessorResult,
-  StreamingState,
-} from '../types.js';
-import { LoadedSettings } from '../../config/settings.js';
+  ApprovalMode,
+  AuthType,
+  GeminiEventType as ServerGeminiEventType,
+  ToolErrorType,
+} from '@google/gemini-cli-core';
+import type { Part, PartListUnion } from '@google/genai';
+import type { UseHistoryManagerReturn } from './useHistoryManager.js';
+import type { HistoryItem, SlashCommandProcessorResult } from '../types.js';
+import { MessageType, StreamingState } from '../types.js';
+import type { LoadedSettings } from '../../config/settings.js';
 
 // --- MOCKS ---
 const mockSendMessageStream = vi

packages/cli/src/ui/hooks/useGeminiStream.ts

@@ -5,23 +5,25 @@
  */
 
 import { useState, useRef, useCallback, useEffect, useMemo } from 'react';
-import {
+import type {
   Config,
   GeminiClient,
-  GeminiEventType as ServerGeminiEventType,
   ServerGeminiStreamEvent as GeminiEvent,
   ServerGeminiContentEvent as ContentEvent,
   ServerGeminiErrorEvent as ErrorEvent,
   ServerGeminiChatCompressedEvent,
   ServerGeminiFinishedEvent,
+  ToolCallRequestInfo,
+  EditorType,
+  ThoughtSummary,
+} from '@google/gemini-cli-core';
+import {
+  GeminiEventType as ServerGeminiEventType,
   getErrorMessage,
   isNodeError,
   MessageSenderType,
-  ToolCallRequestInfo,
   logUserPrompt,
   GitService,
-  EditorType,
-  ThoughtSummary,
   UnauthorizedError,
   UserPromptEvent,
   DEFAULT_GEMINI_FLASH_MODEL,
@@ -31,30 +33,30 @@ import {
   parseAndFormatApiError,
 } from '@google/gemini-cli-core';
 import { type Part, type PartListUnion, FinishReason } from '@google/genai';
-import {
-  StreamingState,
+import type {
   HistoryItem,
   HistoryItemWithoutId,
   HistoryItemToolGroup,
-  MessageType,
   SlashCommandProcessorResult,
-  ToolCallStatus,
 } from '../types.js';
+import { StreamingState, MessageType, ToolCallStatus } from '../types.js';
 import { isAtCommand } from '../utils/commandUtils.js';
 import { useShellCommandProcessor } from './shellCommandProcessor.js';
 import { handleAtCommand } from './atCommandProcessor.js';
 import { findLastSafeSplitPoint } from '../utils/markdownUtilities.js';
 import { useStateAndRef } from './useStateAndRef.js';
-import { UseHistoryManagerReturn } from './useHistoryManager.js';
+import type { UseHistoryManagerReturn } from './useHistoryManager.js';
 import { useLogger } from './useLogger.js';
+import type {
+  TrackedToolCall,
+  TrackedCompletedToolCall,
+  TrackedCancelledToolCall,
+} from './useReactToolScheduler.js';
 import { promises as fs } from 'node:fs';
 import path from 'node:path';
 import {
   useReactToolScheduler,
   mapToDisplay as mapTrackedToolCallsToDisplay,
-  TrackedToolCall,
-  TrackedCompletedToolCall,
-  TrackedCancelledToolCall,
 } from './useReactToolScheduler.js';
 import { useSessionStats } from '../contexts/SessionContext.js';
 import { useKeypress } from './useKeypress.js';

packages/cli/src/ui/hooks/useGitBranchName.test.ts

@@ -4,15 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  afterEach,
-  beforeEach,
-  describe,
-  expect,
-  it,
-  vi,
-  MockedFunction,
-} from 'vitest';
+import type { MockedFunction } from 'vitest';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { act } from 'react';
 import { renderHook } from '@testing-library/react';
 import { useGitBranchName } from './useGitBranchName.js';

packages/cli/src/ui/hooks/useHistoryManager.test.ts

@@ -7,7 +7,7 @@
 import { describe, it, expect } from 'vitest';
 import { renderHook, act } from '@testing-library/react';
 import { useHistory } from './useHistoryManager.js';
-import { HistoryItem } from '../types.js';
+import type { HistoryItem } from '../types.js';
 
 describe('useHistoryManager', () => {
   it('should initialize with an empty history', () => {

packages/cli/src/ui/hooks/useHistoryManager.ts

@@ -5,7 +5,7 @@
  */
 
 import { useState, useRef, useCallback } from 'react';
-import { HistoryItem } from '../types.js';
+import type { HistoryItem } from '../types.js';
 
 // Type for the updater function passed to updateHistoryItem
 type HistoryItemUpdater = (

packages/cli/src/ui/hooks/useKeypress.test.ts

@@ -6,7 +6,8 @@
 
 import React from 'react';
 import { renderHook, act } from '@testing-library/react';
-import { useKeypress, Key } from './useKeypress.js';
+import type { Key } from './useKeypress.js';
+import { useKeypress } from './useKeypress.js';
 import { KeypressProvider } from '../contexts/KeypressContext.js';
 import { useStdin } from 'ink';
 import { EventEmitter } from 'node:events';

packages/cli/src/ui/hooks/useKeypress.ts

@@ -5,13 +5,10 @@
  */
 
 import { useEffect } from 'react';
-import {
-  useKeypressContext,
-  KeypressHandler,
-  Key,
-} from '../contexts/KeypressContext.js';
+import type { KeypressHandler, Key } from '../contexts/KeypressContext.js';
+import { useKeypressContext } from '../contexts/KeypressContext.js';
 
-export { Key };
+export type { Key };
 
 /**
  * A hook that listens for keypress events from stdin.

packages/cli/src/ui/hooks/useLogger.ts

@@ -5,7 +5,8 @@
  */
 
 import { useState, useEffect } from 'react';
-import { sessionId, Logger, Storage } from '@google/gemini-cli-core';
+import type { Storage } from '@google/gemini-cli-core';
+import { sessionId, Logger } from '@google/gemini-cli-core';
 
 /**
  * Hook to manage the logger instance.

packages/cli/src/ui/hooks/usePrivacySettings.test.ts

@@ -6,15 +6,17 @@
 
 import { describe, it, expect, beforeEach, vi } from 'vitest';
 import { renderHook, waitFor } from '@testing-library/react';
-import {
+import type {
   Config,
-  CodeAssistServer,
-  LoggingContentGenerator,
-  UserTierId,
   GeminiClient,
   ContentGenerator,
 } from '@google/gemini-cli-core';
-import { OAuth2Client } from 'google-auth-library';
+import {
+  CodeAssistServer,
+  LoggingContentGenerator,
+  UserTierId,
+} from '@google/gemini-cli-core';
+import type { OAuth2Client } from 'google-auth-library';
 import { usePrivacySettings } from './usePrivacySettings.js';
 
 // Mock the dependencies

packages/cli/src/ui/hooks/usePrivacySettings.ts

@@ -5,8 +5,8 @@
  */
 
 import { useState, useEffect, useCallback } from 'react';
+import type { Config } from '@google/gemini-cli-core';
 import {
-  Config,
   CodeAssistServer,
   UserTierId,
   LoggingContentGenerator,

packages/cli/src/ui/hooks/usePromptCompletion.ts

@@ -5,13 +5,13 @@
  */
 
 import { useState, useCallback, useRef, useEffect, useMemo } from 'react';
+import type { Config } from '@google/gemini-cli-core';
 import {
-  Config,
   DEFAULT_GEMINI_FLASH_LITE_MODEL,
   getResponseText,
 } from '@google/gemini-cli-core';
-import { Content, GenerateContentConfig } from '@google/genai';
-import { TextBuffer } from '../components/shared/text-buffer.js';
+import type { Content, GenerateContentConfig } from '@google/genai';
+import type { TextBuffer } from '../components/shared/text-buffer.js';
 
 export const PROMPT_COMPLETION_MIN_LENGTH = 5;
 export const PROMPT_COMPLETION_DEBOUNCE_MS = 250;

packages/cli/src/ui/hooks/useReactToolScheduler.ts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
+import type {
   Config,
   ToolCallRequestInfo,
   ExecutingToolCall,
@@ -13,7 +13,6 @@ import {
   WaitingToolCall,
   CompletedToolCall,
   CancelledToolCall,
-  CoreToolScheduler,
   OutputUpdateHandler,
   AllToolCallsCompleteHandler,
   ToolCallsUpdateHandler,
@@ -21,13 +20,14 @@ import {
   Status as CoreStatus,
   EditorType,
 } from '@google/gemini-cli-core';
+import { CoreToolScheduler } from '@google/gemini-cli-core';
 import { useCallback, useState, useMemo } from 'react';
-import {
+import type {
   HistoryItemToolGroup,
   IndividualToolCallDisplay,
-  ToolCallStatus,
   HistoryItemWithoutId,
 } from '../types.js';
+import { ToolCallStatus } from '../types.js';
 
 export type ScheduleFn = (
   request: ToolCallRequestInfo | ToolCallRequestInfo[],

packages/cli/src/ui/hooks/useReverseSearchCompletion.tsx

@@ -6,8 +6,8 @@
 
 import { useEffect, useCallback } from 'react';
 import { useCompletion } from './useCompletion.js';
-import { TextBuffer } from '../components/shared/text-buffer.js';
-import { Suggestion } from '../components/SuggestionsDisplay.js';
+import type { TextBuffer } from '../components/shared/text-buffer.js';
+import type { Suggestion } from '../components/SuggestionsDisplay.js';
 
 export interface UseReverseSearchCompletionReturn {
   suggestions: Suggestion[];

packages/cli/src/ui/hooks/useShowMemoryCommand.ts

@@ -4,9 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Message, MessageType } from '../types.js';
-import { Config } from '@google/gemini-cli-core';
-import { LoadedSettings } from '../../config/settings.js';
+import type { Message } from '../types.js';
+import { MessageType } from '../types.js';
+import type { Config } from '@google/gemini-cli-core';
+import type { LoadedSettings } from '../../config/settings.js';
 
 export function createShowMemoryAction(
   config: Config | null,

packages/cli/src/ui/hooks/useSlashCompletion.test.ts

@@ -9,9 +9,9 @@
 import { describe, it, expect, vi } from 'vitest';
 import { renderHook, waitFor } from '@testing-library/react';
 import { useSlashCompletion } from './useSlashCompletion.js';
-import { CommandContext, SlashCommand } from '../commands/types.js';
+import type { CommandContext, SlashCommand } from '../commands/types.js';
 import { useState } from 'react';
-import { Suggestion } from '../components/SuggestionsDisplay.js';
+import type { Suggestion } from '../components/SuggestionsDisplay.js';
 
 // Test harness to capture the state from the hook's callbacks.
 function useTestHarnessForSlashCompletion(

packages/cli/src/ui/hooks/useSlashCompletion.ts

@@ -5,8 +5,8 @@
  */
 
 import { useState, useEffect } from 'react';
-import { Suggestion } from '../components/SuggestionsDisplay.js';
-import { CommandContext, SlashCommand } from '../commands/types.js';
+import type { Suggestion } from '../components/SuggestionsDisplay.js';
+import type { CommandContext, SlashCommand } from '../commands/types.js';
 
 export interface UseSlashCompletionProps {
   enabled: boolean;

packages/cli/src/ui/hooks/useThemeCommand.ts

@@ -6,7 +6,7 @@
 
 import { useState, useCallback, useEffect } from 'react';
 import { themeManager } from '../themes/theme-manager.js';
-import { LoadedSettings, SettingScope } from '../../config/settings.js'; // Import LoadedSettings, AppSettings, MergedSetting
+import type { LoadedSettings, SettingScope } from '../../config/settings.js'; // Import LoadedSettings, AppSettings, MergedSetting
 import { type HistoryItem, MessageType } from '../types.js';
 import process from 'node:process';
 

packages/cli/src/ui/hooks/useToolScheduler.test.ts

@@ -5,36 +5,36 @@
  */
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { describe, it, expect, vi, beforeEach, afterEach, Mock } from 'vitest';
+import type { Mock } from 'vitest';
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { renderHook, act } from '@testing-library/react';
 import {
   useReactToolScheduler,
   mapToDisplay,
 } from './useReactToolScheduler.js';
-import { PartUnion, FunctionResponse } from '@google/genai';
-import {
+import type { PartUnion, FunctionResponse } from '@google/genai';
+import type {
   Config,
   ToolCallRequestInfo,
   ToolRegistry,
   ToolResult,
   ToolCallConfirmationDetails,
-  ToolConfirmationOutcome,
   ToolCallResponseInfo,
   ToolCall, // Import from core
   Status as ToolCallStatusType,
-  ApprovalMode,
-  Kind,
-  BaseDeclarativeTool,
-  BaseToolInvocation,
   ToolInvocation,
   AnyDeclarativeTool,
   AnyToolInvocation,
 } from '@google/gemini-cli-core';
 import {
-  HistoryItemWithoutId,
-  ToolCallStatus,
-  HistoryItemToolGroup,
-} from '../types.js';
+  ToolConfirmationOutcome,
+  ApprovalMode,
+  Kind,
+  BaseDeclarativeTool,
+  BaseToolInvocation,
+} from '@google/gemini-cli-core';
+import type { HistoryItemWithoutId, HistoryItemToolGroup } from '../types.js';
+import { ToolCallStatus } from '../types.js';
 
 // Mocks
 vi.mock('@google/gemini-cli-core', async () => {

packages/cli/src/ui/hooks/vim.test.ts

@@ -6,7 +6,7 @@
 
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { renderHook, act } from '@testing-library/react';
-import React from 'react';
+import type React from 'react';
 import { useVim } from './vim.js';
 import type { TextBuffer } from '../components/shared/text-buffer.js';
 import { textBufferReducer } from '../components/shared/text-buffer.js';