Explict imports & exports with type modifier (#3774)

packages/cli/src/services/BuiltinCommandLoader.test.ts

@@ -22,7 +22,7 @@ vi.mock('../ui/commands/restoreCommand.js', () => ({
 
 import { describe, it, expect, vi, beforeEach, type Mock } from 'vitest';
 import { BuiltinCommandLoader } from './BuiltinCommandLoader.js';
-import { Config } from '@google/gemini-cli-core';
+import type { Config } from '@google/gemini-cli-core';
 import { CommandKind } from '../ui/commands/types.js';
 
 import { ideCommand } from '../ui/commands/ideCommand.js';

packages/cli/src/services/BuiltinCommandLoader.ts

@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { ICommandLoader } from './types.js';
-import { SlashCommand } from '../ui/commands/types.js';
-import { Config } from '@google/gemini-cli-core';
+import type { ICommandLoader } from './types.js';
+import type { SlashCommand } from '../ui/commands/types.js';
+import type { Config } from '@google/gemini-cli-core';
 import { aboutCommand } from '../ui/commands/aboutCommand.js';
 import { authCommand } from '../ui/commands/authCommand.js';
 import { bugCommand } from '../ui/commands/bugCommand.js';

packages/cli/src/services/CommandService.ts

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { SlashCommand } from '../ui/commands/types.js';
-import { ICommandLoader } from './types.js';
+import type { SlashCommand } from '../ui/commands/types.js';
+import type { ICommandLoader } from './types.js';
 
 /**
  * Orchestrates the discovery and loading of all slash commands for the CLI.

packages/cli/src/services/FileCommandLoader.test.ts

@@ -5,7 +5,8 @@
  */
 
 import * as path from 'node:path';
-import { Config, Storage } from '@google/gemini-cli-core';
+import type { Config } from '@google/gemini-cli-core';
+import { Storage } from '@google/gemini-cli-core';
 import mock from 'mock-fs';
 import { FileCommandLoader } from './FileCommandLoader.js';
 import { assert, vi } from 'vitest';
@@ -19,7 +20,7 @@ import {
   ShellProcessor,
 } from './prompt-processors/shellProcessor.js';
 import { DefaultArgumentProcessor } from './prompt-processors/argumentProcessor.js';
-import { CommandContext } from '../ui/commands/types.js';
+import type { CommandContext } from '../ui/commands/types.js';
 
 const mockShellProcess = vi.hoisted(() => vi.fn());
 vi.mock('./prompt-processors/shellProcessor.js', () => ({

packages/cli/src/services/FileCommandLoader.ts

@@ -9,17 +9,18 @@ import path from 'node:path';
 import toml from '@iarna/toml';
 import { glob } from 'glob';
 import { z } from 'zod';
-import { Config, Storage } from '@google/gemini-cli-core';
-import { ICommandLoader } from './types.js';
-import {
+import type { Config } from '@google/gemini-cli-core';
+import { Storage } from '@google/gemini-cli-core';
+import type { ICommandLoader } from './types.js';
+import type {
   CommandContext,
-  CommandKind,
   SlashCommand,
   SlashCommandActionReturn,
 } from '../ui/commands/types.js';
+import { CommandKind } from '../ui/commands/types.js';
 import { DefaultArgumentProcessor } from './prompt-processors/argumentProcessor.js';
+import type { IPromptProcessor } from './prompt-processors/types.js';
 import {
-  IPromptProcessor,
   SHORTHAND_ARGS_PLACEHOLDER,
   SHELL_INJECTION_TRIGGER,
 } from './prompt-processors/types.js';

packages/cli/src/services/McpPromptLoader.test.ts

@@ -5,8 +5,8 @@
  */
 
 import { McpPromptLoader } from './McpPromptLoader.js';
-import { Config } from '@google/gemini-cli-core';
-import { PromptArgument } from '@modelcontextprotocol/sdk/types.js';
+import type { Config } from '@google/gemini-cli-core';
+import type { PromptArgument } from '@modelcontextprotocol/sdk/types.js';
 import { describe, it, expect } from 'vitest';
 
 describe('McpPromptLoader', () => {

packages/cli/src/services/McpPromptLoader.ts

@@ -4,19 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  Config,
-  getErrorMessage,
-  getMCPServerPrompts,
-} from '@google/gemini-cli-core';
-import {
+import type { Config } from '@google/gemini-cli-core';
+import { getErrorMessage, getMCPServerPrompts } from '@google/gemini-cli-core';
+import type {
   CommandContext,
-  CommandKind,
   SlashCommand,
   SlashCommandActionReturn,
 } from '../ui/commands/types.js';
-import { ICommandLoader } from './types.js';
-import { PromptArgument } from '@modelcontextprotocol/sdk/types.js';
+import { CommandKind } from '../ui/commands/types.js';
+import type { ICommandLoader } from './types.js';
+import type { PromptArgument } from '@modelcontextprotocol/sdk/types.js';
 
 /**
  * Discovers and loads executable slash commands from prompts exposed by

packages/cli/src/services/prompt-processors/argumentProcessor.ts

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { IPromptProcessor } from './types.js';
-import { CommandContext } from '../../ui/commands/types.js';
+import type { IPromptProcessor } from './types.js';
+import type { CommandContext } from '../../ui/commands/types.js';
 
 /**
  * Appends the user's full command invocation to the prompt if arguments are

packages/cli/src/services/prompt-processors/shellProcessor.test.ts

@@ -7,8 +7,9 @@
 import { describe, it, expect, beforeEach, vi, type Mock } from 'vitest';
 import { ConfirmationRequiredError, ShellProcessor } from './shellProcessor.js';
 import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
-import { CommandContext } from '../../ui/commands/types.js';
-import { ApprovalMode, Config } from '@google/gemini-cli-core';
+import type { CommandContext } from '../../ui/commands/types.js';
+import type { Config } from '@google/gemini-cli-core';
+import { ApprovalMode } from '@google/gemini-cli-core';
 import os from 'node:os';
 import { quote } from 'shell-quote';
 

packages/cli/src/services/prompt-processors/shellProcessor.ts

@@ -12,9 +12,9 @@ import {
   ShellExecutionService,
 } from '@google/gemini-cli-core';
 
-import { CommandContext } from '../../ui/commands/types.js';
+import type { CommandContext } from '../../ui/commands/types.js';
+import type { IPromptProcessor } from './types.js';
 import {
-  IPromptProcessor,
   SHELL_INJECTION_TRIGGER,
   SHORTHAND_ARGS_PLACEHOLDER,
 } from './types.js';

packages/cli/src/services/prompt-processors/types.ts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { CommandContext } from '../../ui/commands/types.js';
+import type { CommandContext } from '../../ui/commands/types.js';
 
 /**
  * Defines the interface for a prompt processor, a module that can transform

packages/cli/src/services/types.ts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { SlashCommand } from '../ui/commands/types.js';
+import type { SlashCommand } from '../ui/commands/types.js';
 
 /**
  * Defines the contract for any class that can load and provide slash commands.