chore: consistently import node modules with prefix (#3013)

Co-authored-by: N. Taylor Mullen <ntaylormullen@google.com>

packages/cli/src/config/config.integration.test.ts

@@ -5,9 +5,9 @@
  */
 
 import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
-import * as fs from 'fs';
-import * as path from 'path';
-import { tmpdir } from 'os';
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import { tmpdir } from 'node:os';
 import {
   Config,
   ConfigParameters,

packages/cli/src/config/config.test.ts

@@ -5,8 +5,8 @@
  */
 
 import { describe, it, expect, vi, beforeEach, afterEach, Mock } from 'vitest';
-import * as os from 'os';
-import * as path from 'path';
+import * as os from 'node:os';
+import * as path from 'node:path';
 import { ShellTool, EditTool, WriteFileTool } from '@google/gemini-cli-core';
 import { loadCliConfig, parseArguments, CliArgs } from './config.js';
 import { Settings } from './settings.js';
@@ -20,7 +20,7 @@ vi.mock('./trustedFolders.js', () => ({
 
 vi.mock('fs', async (importOriginal) => {
   const actualFs = await importOriginal<typeof import('fs')>();
-  const pathMod = await import('path');
+  const pathMod = await import('node:path');
   const mockHome = '/mock/home/user';
   const MOCK_CWD1 = process.cwd();
   const MOCK_CWD2 = pathMod.resolve(pathMod.sep, 'home', 'user', 'project');

packages/cli/src/config/config.ts

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'fs';
-import * as path from 'path';
+import * as fs from 'node:fs';
+import * as path from 'node:path';
 import { homedir } from 'node:os';
 import yargs from 'yargs/yargs';
 import { hideBin } from 'yargs/helpers';

packages/cli/src/config/extension.test.ts

@@ -5,9 +5,9 @@
  */
 
 import { vi } from 'vitest';
-import * as fs from 'fs';
-import * as os from 'os';
-import * as path from 'path';
+import * as fs from 'node:fs';
+import * as os from 'node:os';
+import * as path from 'node:path';
 import {
   EXTENSIONS_CONFIG_FILENAME,
   INSTALL_METADATA_FILENAME,
@@ -17,7 +17,7 @@ import {
   uninstallExtension,
   updateExtension,
 } from './extension.js';
-import { execSync } from 'child_process';
+import { execSync } from 'node:child_process';
 import { SimpleGit, simpleGit } from 'simple-git';
 
 vi.mock('simple-git', () => ({

packages/cli/src/config/extension.ts

@@ -9,9 +9,9 @@ import {
   GeminiCLIExtension,
   Storage,
 } from '@google/gemini-cli-core';
-import * as fs from 'fs';
-import * as path from 'path';
-import * as os from 'os';
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import * as os from 'node:os';
 import { simpleGit } from 'simple-git';
 
 export const EXTENSIONS_DIRECTORY_NAME = '.gemini/extensions';

packages/cli/src/config/settings.test.ts

@@ -7,7 +7,7 @@
 /// <reference types="vitest/globals" />
 
 // Mock 'os' first.
-import * as osActual from 'os'; // Import for type info for the mock factory
+import * as osActual from 'node:os'; // Import for type info for the mock factory
 vi.mock('os', async (importOriginal) => {
   const actualOs = await importOriginal<typeof osActual>();
   return {
@@ -33,7 +33,7 @@ vi.mock('./trustedFolders.js', () => ({
 }));
 
 // NOW import everything else, including the (now effectively re-exported) settings.js
-import * as pathActual from 'path'; // Restored for MOCK_WORKSPACE_SETTINGS_PATH
+import * as pathActual from 'node:path'; // Restored for MOCK_WORKSPACE_SETTINGS_PATH
 import {
   describe,
   it,
@@ -44,7 +44,7 @@ import {
   type Mocked,
   type Mock,
 } from 'vitest';
-import * as fs from 'fs'; // fs will be mocked separately
+import * as fs from 'node:fs'; // fs will be mocked separately
 import stripJsonComments from 'strip-json-comments'; // Will be mocked separately
 import { isWorkspaceTrusted } from './trustedFolders.js';
 

packages/cli/src/config/settings.ts

@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'fs';
-import * as path from 'path';
-import { homedir, platform } from 'os';
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import { homedir, platform } from 'node:os';
 import * as dotenv from 'dotenv';
 import {
   GEMINI_CONFIG_DIR as GEMINI_DIR,

packages/cli/src/config/trustedFolders.test.ts

@@ -5,7 +5,7 @@
  */
 
 // Mock 'os' first.
-import * as osActual from 'os';
+import * as osActual from 'node:os';
 vi.mock('os', async (importOriginal) => {
   const actualOs = await importOriginal<typeof osActual>();
   return {
@@ -25,9 +25,9 @@ import {
   type Mocked,
   type Mock,
 } from 'vitest';
-import * as fs from 'fs';
+import * as fs from 'node:fs';
 import stripJsonComments from 'strip-json-comments';
-import * as path from 'path';
+import * as path from 'node:path';
 
 import {
   loadTrustedFolders,

packages/cli/src/config/trustedFolders.ts

@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'fs';
-import * as path from 'path';
-import { homedir } from 'os';
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import { homedir } from 'node:os';
 import { getErrorMessage, isWithinRoot } from '@google/gemini-cli-core';
 import { Settings } from './settings.js';
 import stripJsonComments from 'strip-json-comments';

packages/cli/src/services/FileCommandLoader.ts

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { promises as fs } from 'fs';
-import path from 'path';
+import { promises as fs } from 'node:fs';
+import path from 'node:path';
 import toml from '@iarna/toml';
 import { glob } from 'glob';
 import { z } from 'zod';

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

@@ -9,7 +9,7 @@ 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 os from 'os';
+import os from 'node:os';
 import { quote } from 'shell-quote';
 
 // Helper function to determine the expected escaped string based on the current OS,

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

@@ -25,7 +25,7 @@ import { useConsoleMessages } from './hooks/useConsoleMessages.js';
 import { StreamingState, ConsoleMessageItem } from './types.js';
 import { Tips } from './components/Tips.js';
 import { checkForUpdates, UpdateObject } from './utils/updateCheck.js';
-import { EventEmitter } from 'events';
+import { EventEmitter } from 'node:events';
 import { updateEventEmitter } from '../utils/updateEventEmitter.js';
 import * as auth from '../config/auth.js';
 import * as useTerminalSize from './hooks/useTerminalSize.js';

packages/cli/src/ui/App.tsx

@@ -84,7 +84,7 @@ import { useKeypress, Key } from './hooks/useKeypress.js';
 import { KeypressProvider } from './contexts/KeypressContext.js';
 import { useKittyKeyboardProtocol } from './hooks/useKittyKeyboardProtocol.js';
 import { keyMatchers, Command } from './keyMatchers.js';
-import * as fs from 'fs';
+import * as fs from 'node:fs';
 import { UpdateNotification } from './components/UpdateNotification.js';
 import {
   isProQuotaExceededError,

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

@@ -23,9 +23,9 @@ import { createMockCommandContext } from '../../test-utils/mockCommandContext.js
 import { Content } from '@google/genai';
 import { GeminiClient } from '@google/gemini-cli-core';
 
-import * as fsPromises from 'fs/promises';
+import * as fsPromises from 'node:fs/promises';
 import { chatCommand } from './chatCommand.js';
-import { Stats } from 'fs';
+import { Stats } from 'node:fs';
 import { HistoryItemWithoutId } from '../types.js';
 
 vi.mock('fs/promises', () => ({

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

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fsPromises from 'fs/promises';
+import * as fsPromises from 'node:fs/promises';
 import React from 'react';
 import { Text } from 'ink';
 import { Colors } from '../colors.js';
@@ -16,7 +16,7 @@ import {
   SlashCommandActionReturn,
 } from './types.js';
 import { decodeTagName } from '@google/gemini-cli-core';
-import path from 'path';
+import path from 'node:path';
 import { HistoryItemWithoutId, MessageType } from '../types.js';
 
 interface ChatDetail {

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

@@ -9,8 +9,8 @@ import { directoryCommand, expandHomeDir } from './directoryCommand.js';
 import { Config, WorkspaceContext } from '@google/gemini-cli-core';
 import { CommandContext } from './types.js';
 import { MessageType } from '../types.js';
-import * as os from 'os';
-import * as path from 'path';
+import * as os from 'node:os';
+import * as path from 'node:path';
 
 describe('directoryCommand', () => {
   let mockContext: CommandContext;

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

@@ -6,8 +6,8 @@
 
 import { SlashCommand, CommandContext, CommandKind } from './types.js';
 import { MessageType } from '../types.js';
-import * as os from 'os';
-import * as path from 'path';
+import * as os from 'node:os';
+import * as path from 'node:path';
 import { loadServerHierarchicalMemory } from '@google/gemini-cli-core';
 
 export function expandHomeDir(p: string): string {

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

@@ -5,8 +5,8 @@
  */
 
 import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
-import * as fs from 'fs';
-import * as path from 'path';
+import * as fs from 'node:fs';
+import * as path from 'node:path';
 import { initCommand } from './initCommand.js';
 import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
 import { type CommandContext } from './types.js';

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

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'fs';
-import * as path from 'path';
+import * as fs from 'node:fs';
+import * as path from 'node:path';
 import {
   CommandContext,
   SlashCommand,

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

@@ -5,9 +5,9 @@
  */
 
 import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
-import * as fs from 'fs/promises';
-import * as os from 'os';
-import * as path from 'path';
+import * as fs from 'node:fs/promises';
+import * as os from 'node:os';
+import * as path from 'node:path';
 import { restoreCommand } from './restoreCommand.js';
 import { type CommandContext } from './types.js';
 import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';

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

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'fs/promises';
-import path from 'path';
+import * as fs from 'node:fs/promises';
+import path from 'node:path';
 import {
   type CommandContext,
   type SlashCommand,

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

@@ -8,7 +8,7 @@ import { renderWithProviders } from '../../test-utils/render.js';
 import { waitFor } from '@testing-library/react';
 import { vi } from 'vitest';
 import { FolderTrustDialog, FolderTrustChoice } from './FolderTrustDialog.js';
-import * as process from 'process';
+import * as process from 'node:process';
 
 vi.mock('process', async () => {
   const actual = await vi.importActual('process');

packages/cli/src/ui/components/FolderTrustDialog.tsx

@@ -12,7 +12,7 @@ import {
   RadioSelectItem,
 } from './shared/RadioButtonSelect.js';
 import { useKeypress } from '../hooks/useKeypress.js';
-import * as process from 'process';
+import * as process from 'node:process';
 
 export enum FolderTrustChoice {
   TRUST_FOLDER = 'trust_folder',

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

@@ -9,7 +9,7 @@ import { waitFor } from '@testing-library/react';
 import { InputPrompt, InputPromptProps } from './InputPrompt.js';
 import type { TextBuffer } from './shared/text-buffer.js';
 import { Config } from '@google/gemini-cli-core';
-import * as path from 'path';
+import * as path from 'node:path';
 import {
   CommandContext,
   SlashCommand,

packages/cli/src/ui/components/InputPrompt.tsx

@@ -25,7 +25,7 @@ import {
   saveClipboardImage,
   cleanupOldClipboardImages,
 } from '../utils/clipboardUtils.js';
-import * as path from 'path';
+import * as path from 'node:path';
 import { SCREEN_READER_USER_PREFIX } from '../constants.js';
 
 export interface InputPromptProps {

packages/cli/src/ui/components/messages/DiffRenderer.test.tsx

@@ -9,7 +9,7 @@ import { render } from 'ink-testing-library';
 import { DiffRenderer } from './DiffRenderer.js';
 import * as CodeColorizer from '../../utils/CodeColorizer.js';
 import { vi } from 'vitest';
-import { EOL } from 'os';
+import { EOL } from 'node:os';
 
 describe('<OverflowProvider><DiffRenderer /></OverflowProvider>', () => {
   const mockColorizeCode = vi.spyOn(CodeColorizer, 'colorizeCode');

packages/cli/src/ui/components/messages/DiffRenderer.tsx

@@ -6,9 +6,9 @@
 
 import React from 'react';
 import { Box, Text } from 'ink';
-import { EOL } from 'os';
+import { EOL } from 'node:os';
 import { Colors } from '../../colors.js';
-import crypto from 'crypto';
+import crypto from 'node:crypto';
 import { colorizeCode, colorizeLine } from '../../utils/CodeColorizer.js';
 import { MaxSizedBox } from '../shared/MaxSizedBox.js';
 import { theme } from '../../semantic-colors.js';

packages/cli/src/ui/components/shared/text-buffer.ts

@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { spawnSync } from 'child_process';
-import fs from 'fs';
-import os from 'os';
-import pathMod from 'path';
+import { spawnSync } from 'node:child_process';
+import fs from 'node:fs';
+import os from 'node:os';
+import pathMod from 'node:path';
 import { useState, useCallback, useEffect, useMemo, useReducer } from 'react';
 import stringWidth from 'string-width';
 import { unescapePath } from '@google/gemini-cli-core';

packages/cli/src/ui/contexts/KeypressContext.test.tsx

@@ -13,7 +13,7 @@ import {
   Key,
 } from './KeypressContext.js';
 import { useStdin } from 'ink';
-import { EventEmitter } from 'events';
+import { EventEmitter } from 'node:events';
 import {
   KITTY_KEYCODE_ENTER,
   KITTY_KEYCODE_NUMPAD_ENTER,

packages/cli/src/ui/contexts/KeypressContext.tsx

@@ -17,8 +17,8 @@ import React, {
   useEffect,
   useRef,
 } from 'react';
-import readline from 'readline';
-import { PassThrough } from 'stream';
+import readline from 'node:readline';
+import { PassThrough } from 'node:stream';
 import {
   BACKSLASH_ENTER_DETECTION_WINDOW_MS,
   KITTY_CTRL_C,

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

@@ -16,11 +16,11 @@ import {
   COMMON_IGNORE_PATTERNS,
   DEFAULT_FILE_EXCLUDES,
 } from '@google/gemini-cli-core';
-import * as os from 'os';
+import * as os from 'node:os';
 import { ToolCallStatus } from '../types.js';
 import { UseHistoryManagerReturn } from './useHistoryManager.js';
-import * as fsPromises from 'fs/promises';
-import * as path from 'path';
+import * as fsPromises from 'node:fs/promises';
+import * as path from 'node:path';
 
 describe('handleAtCommand', () => {
   let testRootDir: string;

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

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'fs/promises';
-import * as path from 'path';
+import * as fs from 'node:fs/promises';
+import * as path from 'node:path';
 import { PartListUnion, PartUnion } from '@google/genai';
 import {
   AnyToolInvocation,

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

@@ -36,10 +36,10 @@ import {
   type ShellExecutionResult,
   type ShellOutputEvent,
 } from '@google/gemini-cli-core';
-import * as fs from 'fs';
-import * as os from 'os';
-import * as path from 'path';
-import * as crypto from 'crypto';
+import * as fs from 'node:fs';
+import * as os from 'node:os';
+import * as path from 'node:path';
+import * as crypto from 'node:crypto';
 import { ToolCallStatus } from '../types.js';
 
 describe('useShellCommandProcessor', () => {

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

@@ -21,10 +21,10 @@ import { type PartListUnion } from '@google/genai';
 import { UseHistoryManagerReturn } from './useHistoryManager.js';
 import { SHELL_COMMAND_NAME } from '../constants.js';
 import { formatMemoryUsage } from '../utils/formatters.js';
-import crypto from 'crypto';
-import path from 'path';
-import os from 'os';
-import fs from 'fs';
+import crypto from 'node:crypto';
+import path from 'node:path';
+import os from 'node:os';
+import fs from 'node:fs';
 
 export const OUTPUT_UPDATE_INTERVAL_MS = 1000;
 const MAX_OUTPUT_LENGTH = 10000;

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

@@ -5,7 +5,7 @@
  */
 
 import { renderHook, act } from '@testing-library/react';
-import { EventEmitter } from 'events';
+import { EventEmitter } from 'node:events';
 import { useFocus } from './useFocus.js';
 import { vi } from 'vitest';
 import { useStdin, useStdout } from 'ink';

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

@@ -13,7 +13,7 @@ import {
   LoadedTrustedFolders,
   TrustLevel,
 } from '../../config/trustedFolders.js';
-import * as process from 'process';
+import * as process from 'node:process';
 
 import * as trustedFolders from '../../config/trustedFolders.js';
 

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

@@ -12,7 +12,7 @@ import {
   TrustLevel,
   isWorkspaceTrusted,
 } from '../../config/trustedFolders.js';
-import * as process from 'process';
+import * as process from 'node:process';
 
 export const useFolderTrust = (
   settings: LoadedSettings,

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

@@ -47,8 +47,8 @@ import { findLastSafeSplitPoint } from '../utils/markdownUtilities.js';
 import { useStateAndRef } from './useStateAndRef.js';
 import { UseHistoryManagerReturn } from './useHistoryManager.js';
 import { useLogger } from './useLogger.js';
-import { promises as fs } from 'fs';
-import path from 'path';
+import { promises as fs } from 'node:fs';
+import path from 'node:path';
 import {
   useReactToolScheduler,
   mapToDisplay as mapTrackedToolCallsToDisplay,

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

@@ -8,7 +8,7 @@ import { useState, useEffect, useCallback } from 'react';
 import { exec } from 'node:child_process';
 import fs from 'node:fs';
 import fsPromises from 'node:fs/promises';
-import path from 'path';
+import path from 'node:path';
 
 export function useGitBranchName(cwd: string): string | undefined {
   const [branchName, setBranchName] = useState<string | undefined>(undefined);

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

@@ -9,8 +9,8 @@ import { renderHook, act } from '@testing-library/react';
 import { useKeypress, Key } from './useKeypress.js';
 import { KeypressProvider } from '../contexts/KeypressContext.js';
 import { useStdin } from 'ink';
-import { EventEmitter } from 'events';
-import { PassThrough } from 'stream';
+import { EventEmitter } from 'node:events';
+import { PassThrough } from 'node:stream';
 
 // Mock the 'ink' module to control stdin
 vi.mock('ink', async (importOriginal) => {

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

@@ -6,10 +6,10 @@
 
 import { renderHook, act, waitFor } from '@testing-library/react';
 import { useShellHistory } from './useShellHistory.js';
-import * as fs from 'fs/promises';
-import * as path from 'path';
-import * as os from 'os';
-import * as crypto from 'crypto';
+import * as fs from 'node:fs/promises';
+import * as path from 'node:path';
+import * as os from 'node:os';
+import * as crypto from 'node:crypto';
 
 vi.mock('fs/promises', () => ({
   readFile: vi.fn(),

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

@@ -5,8 +5,8 @@
  */
 
 import { useState, useEffect, useCallback } from 'react';
-import * as fs from 'fs/promises';
-import * as path from 'path';
+import * as fs from 'node:fs/promises';
+import * as path from 'node:path';
 import { isNodeError, Storage } from '@google/gemini-cli-core';
 
 const MAX_HISTORY_LENGTH = 100;

packages/cli/src/ui/utils/ConsolePatcher.ts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import util from 'util';
+import util from 'node:util';
 import { ConsoleMessageItem } from '../types.js';
 
 interface ConsolePatcherParams {

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

@@ -9,7 +9,7 @@ import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { MarkdownDisplay } from './MarkdownDisplay.js';
 import { LoadedSettings } from '../../config/settings.js';
 import { SettingsContext } from '../contexts/SettingsContext.js';
-import { EOL } from 'os';
+import { EOL } from 'node:os';
 
 describe('<MarkdownDisplay />', () => {
   const baseProps = {

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

@@ -6,7 +6,7 @@
 
 import React from 'react';
 import { Text, Box } from 'ink';
-import { EOL } from 'os';
+import { EOL } from 'node:os';
 import { Colors } from '../colors.js';
 import { colorizeCode } from './CodeColorizer.js';
 import { TableRenderer } from './TableRenderer.js';

packages/cli/src/ui/utils/clipboardUtils.ts

@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { exec } from 'child_process';
-import { promisify } from 'util';
-import * as fs from 'fs/promises';
-import * as path from 'path';
+import { exec } from 'node:child_process';
+import { promisify } from 'node:util';
+import * as fs from 'node:fs/promises';
+import * as path from 'node:path';
 
 const execAsync = promisify(exec);
 

packages/cli/src/ui/utils/commandUtils.test.ts

@@ -5,8 +5,8 @@
  */
 
 import { vi, describe, it, expect, beforeEach, Mock } from 'vitest';
-import { spawn, SpawnOptions } from 'child_process';
-import { EventEmitter } from 'events';
+import { spawn, SpawnOptions } from 'node:child_process';
+import { EventEmitter } from 'node:events';
 import {
   isAtCommand,
   isSlashCommand,
@@ -44,7 +44,7 @@ describe('commandUtils', () => {
   beforeEach(async () => {
     vi.clearAllMocks();
     // Dynamically import and set up spawn mock
-    const { spawn } = await import('child_process');
+    const { spawn } = await import('node:child_process');
     mockSpawn = spawn as Mock;
 
     // Create mock child process with stdout/stderr emitters

packages/cli/src/ui/utils/commandUtils.ts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { spawn, SpawnOptions } from 'child_process';
+import { spawn, SpawnOptions } from 'node:child_process';
 
 /**
  * Checks if a query string potentially represents an '@' command.

packages/cli/src/ui/utils/terminalSetup.ts

@@ -23,11 +23,11 @@
  * to avoid conflicts with user customizations.
  */
 
-import { promises as fs } from 'fs';
-import * as os from 'os';
-import * as path from 'path';
-import { exec } from 'child_process';
-import { promisify } from 'util';
+import { promises as fs } from 'node:fs';
+import * as os from 'node:os';
+import * as path from 'node:path';
+import { exec } from 'node:child_process';
+import { promisify } from 'node:util';
 import { isKittyProtocolEnabled } from './kittyProtocolDetector.js';
 import { VSCODE_SHIFT_ENTER_SEQUENCE } from './platformConstants.js';
 

packages/cli/src/ui/utils/textUtils.ts

@@ -5,7 +5,7 @@
  */
 
 import stripAnsi from 'strip-ansi';
-import { stripVTControlCharacters } from 'util';
+import { stripVTControlCharacters } from 'node:util';
 
 /**
  * Calculates the maximum width of a multi-line ASCII art string.

packages/cli/src/utils/cleanup.ts

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { promises as fs } from 'fs';
-import { join } from 'path';
+import { promises as fs } from 'node:fs';
+import { join } from 'node:path';
 import { Storage } from '@google/gemini-cli-core';
 
 const cleanupFunctions: Array<(() => void) | (() => Promise<void>)> = [];

packages/cli/src/utils/events.ts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { EventEmitter } from 'events';
+import { EventEmitter } from 'node:events';
 
 export enum AppEvent {
   OpenDebugConsole = 'open-debug-console',

packages/cli/src/utils/gitUtils.test.ts

@@ -5,7 +5,7 @@
  */
 
 import { vi, describe, expect, it, afterEach, beforeEach } from 'vitest';
-import * as child_process from 'child_process';
+import * as child_process from 'node:child_process';
 import {
   isGitHubRepository,
   getGitRepoRoot,

packages/cli/src/utils/gitUtils.ts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { execSync } from 'child_process';
+import { execSync } from 'node:child_process';
 import { ProxyAgent } from 'undici';
 
 /**

packages/cli/src/utils/handleAutoUpdate.ts

@@ -10,7 +10,7 @@ import { getInstallationInfo } from './installationInfo.js';
 import { updateEventEmitter } from './updateEventEmitter.js';
 import { HistoryItem, MessageType } from '../ui/types.js';
 import { spawnWrapper } from './spawnWrapper.js';
-import { spawn } from 'child_process';
+import { spawn } from 'node:child_process';
 
 export function handleAutoUpdate(
   info: UpdateObject | null,

packages/cli/src/utils/installationInfo.test.ts

@@ -6,9 +6,9 @@
 
 import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
 import { getInstallationInfo, PackageManager } from './installationInfo.js';
-import * as fs from 'fs';
-import * as path from 'path';
-import * as childProcess from 'child_process';
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import * as childProcess from 'node:child_process';
 import { isGitRepository } from '@google/gemini-cli-core';
 
 vi.mock('@google/gemini-cli-core', () => ({

packages/cli/src/utils/installationInfo.ts

@@ -5,9 +5,9 @@
  */
 
 import { isGitRepository } from '@google/gemini-cli-core';
-import * as fs from 'fs';
-import * as path from 'path';
-import * as childProcess from 'child_process';
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import * as childProcess from 'node:child_process';
 
 export enum PackageManager {
   NPM = 'npm',

packages/cli/src/utils/package.ts

@@ -8,8 +8,8 @@ import {
   readPackageUp,
   type PackageJson as BasePackageJson,
 } from 'read-package-up';
-import { fileURLToPath } from 'url';
-import path from 'path';
+import { fileURLToPath } from 'node:url';
+import path from 'node:path';
 
 export type PackageJson = BasePackageJson & {
   config?: {

packages/cli/src/utils/resolvePath.ts

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as os from 'os';
-import * as path from 'path';
+import * as os from 'node:os';
+import * as path from 'node:path';
 
 export function resolvePath(p: string): string {
   if (!p) {

packages/cli/src/utils/sandbox.ts

@@ -15,7 +15,7 @@ import {
   USER_SETTINGS_DIR,
   SETTINGS_DIRECTORY_NAME,
 } from '../config/settings.js';
-import { promisify } from 'util';
+import { promisify } from 'node:util';
 import { Config, SandboxConfig } from '@google/gemini-cli-core';
 import { ConsolePatcher } from '../ui/utils/ConsolePatcher.js';
 

packages/cli/src/utils/spawnWrapper.ts

@@ -4,6 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { spawn } from 'child_process';
+import { spawn } from 'node:child_process';
 
 export const spawnWrapper = spawn;

packages/cli/src/utils/startupWarnings.test.ts

@@ -6,7 +6,7 @@
 
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { getStartupWarnings } from './startupWarnings.js';
-import * as fs from 'fs/promises';
+import * as fs from 'node:fs/promises';
 import { getErrorMessage } from '@google/gemini-cli-core';
 
 vi.mock('fs/promises');

packages/cli/src/utils/startupWarnings.ts

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import fs from 'fs/promises';
-import os from 'os';
+import fs from 'node:fs/promises';
+import os from 'node:os';
 import { join as pathJoin } from 'node:path';
 import { getErrorMessage } from '@google/gemini-cli-core';
 

packages/cli/src/utils/updateEventEmitter.ts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { EventEmitter } from 'events';
+import { EventEmitter } from 'node:events';
 
 /**
  * A shared event emitter for application-wide communication

packages/cli/src/utils/userStartupWarnings.test.ts

@@ -6,9 +6,9 @@
 
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { getUserStartupWarnings } from './userStartupWarnings.js';
-import * as os from 'os';
-import fs from 'fs/promises';
-import path from 'path';
+import * as os from 'node:os';
+import fs from 'node:fs/promises';
+import path from 'node:path';
 
 // Mock os.homedir to control the home directory in tests
 vi.mock('os', async (importOriginal) => {

packages/cli/src/utils/userStartupWarnings.ts

@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import fs from 'fs/promises';
-import * as os from 'os';
-import path from 'path';
+import fs from 'node:fs/promises';
+import * as os from 'node:os';
+import path from 'node:path';
 
 type WarningCheck = {
   id: string;

packages/cli/src/zed-integration/acp.ts

@@ -7,7 +7,7 @@
 /* ACP defines a schema for a simple (experimental) JSON-RPC protocol that allows GUI applications to interact with agents. */
 
 import { z } from 'zod';
-import { EOL } from 'os';
+import { EOL } from 'node:os';
 import * as schema from './schema.js';
 export * from './schema.js';
 

packages/cli/src/zed-integration/zedIntegration.ts

@@ -28,11 +28,11 @@ import { AcpFileSystemService } from './fileSystemService.js';
 import { Readable, Writable } from 'node:stream';
 import { Content, Part, FunctionCall } from '@google/genai';
 import { LoadedSettings, SettingScope } from '../config/settings.js';
-import * as fs from 'fs/promises';
-import * as path from 'path';
+import * as fs from 'node:fs/promises';
+import * as path from 'node:path';
 import { z } from 'zod';
 
-import { randomUUID } from 'crypto';
+import { randomUUID } from 'node:crypto';
 import { Extension } from '../config/extension.js';
 import { CliArgs, loadCliConfig } from '../config/config.js';