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

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

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.