diff options
Diffstat (limited to 'packages/cli/src')
55 files changed, 85 insertions, 84 deletions
diff --git a/packages/cli/src/config/auth.ts b/packages/cli/src/config/auth.ts index da4234e0..51178513 100644 --- a/packages/cli/src/config/auth.ts +++ b/packages/cli/src/config/auth.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { AuthType } from '@gemini-cli/core'; +import { AuthType } from '@google/gemini-cli-core'; import { loadEnvironment } from './config.js'; export const validateAuthMethod = (authMethod: string): string | null => { diff --git a/packages/cli/src/config/config.integration.test.ts b/packages/cli/src/config/config.integration.test.ts index 6d8a6c7d..5d83986e 100644 --- a/packages/cli/src/config/config.integration.test.ts +++ b/packages/cli/src/config/config.integration.test.ts @@ -12,7 +12,7 @@ import { Config, ConfigParameters, ContentGeneratorConfig, -} from '@gemini-cli/core'; +} from '@google/gemini-cli-core'; const TEST_CONTENT_GENERATOR_CONFIG: ContentGeneratorConfig = { apiKey: 'test-key', @@ -21,8 +21,8 @@ const TEST_CONTENT_GENERATOR_CONFIG: ContentGeneratorConfig = { }; // Mock file discovery service and tool registry -vi.mock('@gemini-cli/core', async () => { - const actual = await vi.importActual('@gemini-cli/core'); +vi.mock('@google/gemini-cli-core', async () => { + const actual = await vi.importActual('@google/gemini-cli-core'); return { ...actual, FileDiscoveryService: vi.fn().mockImplementation(() => ({ diff --git a/packages/cli/src/config/config.test.ts b/packages/cli/src/config/config.test.ts index cc1310dd..9808c407 100644 --- a/packages/cli/src/config/config.test.ts +++ b/packages/cli/src/config/config.test.ts @@ -9,7 +9,7 @@ import * as os from 'os'; import { loadCliConfig } from './config.js'; import { Settings } from './settings.js'; import { Extension } from './extension.js'; -import * as ServerConfig from '@gemini-cli/core'; +import * as ServerConfig from '@google/gemini-cli-core'; vi.mock('os', async (importOriginal) => { const actualOs = await importOriginal<typeof os>(); @@ -29,9 +29,10 @@ vi.mock('read-package-up', () => ({ ), })); -vi.mock('@gemini-cli/core', async () => { - const actualServer = - await vi.importActual<typeof ServerConfig>('@gemini-cli/core'); +vi.mock('@google/gemini-cli-core', async () => { + const actualServer = await vi.importActual<typeof ServerConfig>( + '@google/gemini-cli-core', + ); return { ...actualServer, loadEnvironment: vi.fn(), diff --git a/packages/cli/src/config/config.ts b/packages/cli/src/config/config.ts index 7f957245..c053f4b6 100644 --- a/packages/cli/src/config/config.ts +++ b/packages/cli/src/config/config.ts @@ -18,7 +18,7 @@ import { DEFAULT_GEMINI_EMBEDDING_MODEL, FileDiscoveryService, TelemetryTarget, -} from '@gemini-cli/core'; +} from '@google/gemini-cli-core'; import { Settings } from './settings.js'; import { Extension } from './extension.js'; diff --git a/packages/cli/src/config/extension.ts b/packages/cli/src/config/extension.ts index 418e5fb9..31a6111f 100644 --- a/packages/cli/src/config/extension.ts +++ b/packages/cli/src/config/extension.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { MCPServerConfig } from '@gemini-cli/core'; +import { MCPServerConfig } from '@google/gemini-cli-core'; import * as fs from 'fs'; import * as path from 'path'; import * as os from 'os'; diff --git a/packages/cli/src/config/sandboxConfig.ts b/packages/cli/src/config/sandboxConfig.ts index 9997046f..d31bfc7f 100644 --- a/packages/cli/src/config/sandboxConfig.ts +++ b/packages/cli/src/config/sandboxConfig.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { SandboxConfig } from '@gemini-cli/core'; +import { SandboxConfig } from '@google/gemini-cli-core'; import commandExists from 'command-exists'; import * as os from 'node:os'; import { getPackageJson } from '../utils/package.js'; diff --git a/packages/cli/src/config/settings.ts b/packages/cli/src/config/settings.ts index 36b16446..de1e5569 100644 --- a/packages/cli/src/config/settings.ts +++ b/packages/cli/src/config/settings.ts @@ -13,7 +13,7 @@ import { BugCommandSettings, TelemetrySettings, AuthType, -} from '@gemini-cli/core'; +} from '@google/gemini-cli-core'; import stripJsonComments from 'strip-json-comments'; import { DefaultLight } from '../ui/themes/default-light.js'; import { DefaultDark } from '../ui/themes/default.js'; diff --git a/packages/cli/src/gemini.tsx b/packages/cli/src/gemini.tsx index cd8e23fc..44c8e6eb 100644 --- a/packages/cli/src/gemini.tsx +++ b/packages/cli/src/gemini.tsx @@ -33,7 +33,7 @@ import { sessionId, logUserPrompt, AuthType, -} from '@gemini-cli/core'; +} from '@google/gemini-cli-core'; import { validateAuthMethod } from './config/auth.js'; import { setMaxSizedBoxDebugging } from './ui/components/shared/MaxSizedBox.js'; diff --git a/packages/cli/src/nonInteractiveCli.test.ts b/packages/cli/src/nonInteractiveCli.test.ts index 3b6f1f2d..54d57ae2 100644 --- a/packages/cli/src/nonInteractiveCli.test.ts +++ b/packages/cli/src/nonInteractiveCli.test.ts @@ -7,15 +7,14 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'; import { runNonInteractive } from './nonInteractiveCli.js'; -import { Config, GeminiClient, ToolRegistry } from '@gemini-cli/core'; +import { Config, GeminiClient, ToolRegistry } from '@google/gemini-cli-core'; import { GenerateContentResponse, Part, FunctionCall } from '@google/genai'; // Mock dependencies -vi.mock('@gemini-cli/core', async () => { - const actualCore = - await vi.importActual<typeof import('@gemini-cli/core')>( - '@gemini-cli/core', - ); +vi.mock('@google/gemini-cli-core', async () => { + const actualCore = await vi.importActual< + typeof import('@google/gemini-cli-core') + >('@google/gemini-cli-core'); return { ...actualCore, GeminiClient: vi.fn(), @@ -110,7 +109,7 @@ describe('runNonInteractive', () => { }; const { executeToolCall: mockCoreExecuteToolCall } = await import( - '@gemini-cli/core' + '@google/gemini-cli-core' ); vi.mocked(mockCoreExecuteToolCall).mockResolvedValue({ callId: 'fc1', @@ -163,7 +162,7 @@ describe('runNonInteractive', () => { }; const { executeToolCall: mockCoreExecuteToolCall } = await import( - '@gemini-cli/core' + '@google/gemini-cli-core' ); vi.mocked(mockCoreExecuteToolCall).mockResolvedValue({ callId: 'fcError', diff --git a/packages/cli/src/nonInteractiveCli.ts b/packages/cli/src/nonInteractiveCli.ts index 0855fc6d..95a9c51c 100644 --- a/packages/cli/src/nonInteractiveCli.ts +++ b/packages/cli/src/nonInteractiveCli.ts @@ -11,7 +11,7 @@ import { ToolRegistry, shutdownTelemetry, isTelemetrySdkInitialized, -} from '@gemini-cli/core'; +} from '@google/gemini-cli-core'; import { Content, Part, diff --git a/packages/cli/src/ui/App.test.tsx b/packages/cli/src/ui/App.test.tsx index 75de2cf2..2f12615b 100644 --- a/packages/cli/src/ui/App.test.tsx +++ b/packages/cli/src/ui/App.test.tsx @@ -14,7 +14,7 @@ import { ToolRegistry, AccessibilitySettings, SandboxConfig, -} from '@gemini-cli/core'; +} from '@google/gemini-cli-core'; import { LoadedSettings, SettingsFile, Settings } from '../config/settings.js'; import process from 'node:process'; @@ -68,9 +68,10 @@ interface MockServerConfig { getAllGeminiMdFilenames: Mock<() => string[]>; } -// Mock @gemini-cli/core and its Config class -vi.mock('@gemini-cli/core', async (importOriginal) => { - const actualCore = await importOriginal<typeof import('@gemini-cli/core')>(); +// Mock @google/gemini-cli-core and its Config class +vi.mock('@google/gemini-cli-core', async (importOriginal) => { + const actualCore = + await importOriginal<typeof import('@google/gemini-cli-core')>(); const ConfigClassMock = vi .fn() .mockImplementation((optionsPassedToConstructor) => { diff --git a/packages/cli/src/ui/App.tsx b/packages/cli/src/ui/App.tsx index 7824f0f7..2d2e9db4 100644 --- a/packages/cli/src/ui/App.tsx +++ b/packages/cli/src/ui/App.tsx @@ -54,7 +54,7 @@ import { ApprovalMode, isEditorAvailable, EditorType, -} from '@gemini-cli/core'; +} from '@google/gemini-cli-core'; import { validateAuthMethod } from '../config/auth.js'; import { useLogger } from './hooks/useLogger.js'; import { StreamingContext } from './contexts/StreamingContext.js'; diff --git a/packages/cli/src/ui/components/AuthDialog.test.tsx b/packages/cli/src/ui/components/AuthDialog.test.tsx index 8d56e96a..65e35332 100644 --- a/packages/cli/src/ui/components/AuthDialog.test.tsx +++ b/packages/cli/src/ui/components/AuthDialog.test.tsx @@ -8,7 +8,7 @@ import { render } from 'ink-testing-library'; import { describe, it, expect, vi } from 'vitest'; import { AuthDialog } from './AuthDialog.js'; import { LoadedSettings, SettingScope } from '../../config/settings.js'; -import { AuthType } from '@gemini-cli/core'; +import { AuthType } from '@google/gemini-cli-core'; describe('AuthDialog', () => { const wait = (ms = 50) => new Promise((resolve) => setTimeout(resolve, ms)); diff --git a/packages/cli/src/ui/components/AuthDialog.tsx b/packages/cli/src/ui/components/AuthDialog.tsx index ba19df70..2db9c080 100644 --- a/packages/cli/src/ui/components/AuthDialog.tsx +++ b/packages/cli/src/ui/components/AuthDialog.tsx @@ -9,7 +9,7 @@ import { Box, Text, useInput } from 'ink'; import { Colors } from '../colors.js'; import { RadioButtonSelect } from './shared/RadioButtonSelect.js'; import { LoadedSettings, SettingScope } from '../../config/settings.js'; -import { AuthType } from '@gemini-cli/core'; +import { AuthType } from '@google/gemini-cli-core'; import { validateAuthMethod } from '../../config/auth.js'; interface AuthDialogProps { diff --git a/packages/cli/src/ui/components/AutoAcceptIndicator.tsx b/packages/cli/src/ui/components/AutoAcceptIndicator.tsx index c6e0556c..f8d50fd0 100644 --- a/packages/cli/src/ui/components/AutoAcceptIndicator.tsx +++ b/packages/cli/src/ui/components/AutoAcceptIndicator.tsx @@ -7,7 +7,7 @@ import React from 'react'; import { Box, Text } from 'ink'; import { Colors } from '../colors.js'; -import { ApprovalMode } from '@gemini-cli/core'; +import { ApprovalMode } from '@google/gemini-cli-core'; interface AutoAcceptIndicatorProps { approvalMode: ApprovalMode; diff --git a/packages/cli/src/ui/components/ContextSummaryDisplay.tsx b/packages/cli/src/ui/components/ContextSummaryDisplay.tsx index 548d1325..00a95e19 100644 --- a/packages/cli/src/ui/components/ContextSummaryDisplay.tsx +++ b/packages/cli/src/ui/components/ContextSummaryDisplay.tsx @@ -7,7 +7,7 @@ import React from 'react'; import { Text } from 'ink'; import { Colors } from '../colors.js'; -import { type MCPServerConfig } from '@gemini-cli/core'; +import { type MCPServerConfig } from '@google/gemini-cli-core'; interface ContextSummaryDisplayProps { geminiMdFileCount: number; diff --git a/packages/cli/src/ui/components/EditorSettingsDialog.tsx b/packages/cli/src/ui/components/EditorSettingsDialog.tsx index 304354b5..0b45d7f4 100644 --- a/packages/cli/src/ui/components/EditorSettingsDialog.tsx +++ b/packages/cli/src/ui/components/EditorSettingsDialog.tsx @@ -14,7 +14,7 @@ import { } from '../editors/editorSettingsManager.js'; import { RadioButtonSelect } from './shared/RadioButtonSelect.js'; import { LoadedSettings, SettingScope } from '../../config/settings.js'; -import { EditorType, isEditorAvailable } from '@gemini-cli/core'; +import { EditorType, isEditorAvailable } from '@google/gemini-cli-core'; interface EditorDialogProps { onSelect: (editorType: EditorType | undefined, scope: SettingScope) => void; diff --git a/packages/cli/src/ui/components/Footer.tsx b/packages/cli/src/ui/components/Footer.tsx index e43e9e5e..4ece6c92 100644 --- a/packages/cli/src/ui/components/Footer.tsx +++ b/packages/cli/src/ui/components/Footer.tsx @@ -7,7 +7,7 @@ import React from 'react'; import { Box, Text } from 'ink'; import { Colors } from '../colors.js'; -import { shortenPath, tildeifyPath, tokenLimit } from '@gemini-cli/core'; +import { shortenPath, tildeifyPath, tokenLimit } from '@google/gemini-cli-core'; import { ConsoleSummaryDisplay } from './ConsoleSummaryDisplay.js'; import process from 'node:process'; import { MemoryUsageDisplay } from './MemoryUsageDisplay.js'; diff --git a/packages/cli/src/ui/components/HistoryItemDisplay.tsx b/packages/cli/src/ui/components/HistoryItemDisplay.tsx index ec0ef1f6..dbbb5938 100644 --- a/packages/cli/src/ui/components/HistoryItemDisplay.tsx +++ b/packages/cli/src/ui/components/HistoryItemDisplay.tsx @@ -18,7 +18,7 @@ import { Box } from 'ink'; import { AboutBox } from './AboutBox.js'; import { StatsDisplay } from './StatsDisplay.js'; import { SessionSummaryDisplay } from './SessionSummaryDisplay.js'; -import { Config } from '@gemini-cli/core'; +import { Config } from '@google/gemini-cli-core'; interface HistoryItemDisplayProps { item: HistoryItem; diff --git a/packages/cli/src/ui/components/InputPrompt.test.tsx b/packages/cli/src/ui/components/InputPrompt.test.tsx index d0133e53..7d0cfcbb 100644 --- a/packages/cli/src/ui/components/InputPrompt.test.tsx +++ b/packages/cli/src/ui/components/InputPrompt.test.tsx @@ -7,7 +7,7 @@ import { render } from 'ink-testing-library'; import { InputPrompt, InputPromptProps } from './InputPrompt.js'; import type { TextBuffer } from './shared/text-buffer.js'; -import { Config } from '@gemini-cli/core'; +import { Config } from '@google/gemini-cli-core'; import { vi } from 'vitest'; import { useShellHistory } from '../hooks/useShellHistory.js'; import { useCompletion } from '../hooks/useCompletion.js'; diff --git a/packages/cli/src/ui/components/InputPrompt.tsx b/packages/cli/src/ui/components/InputPrompt.tsx index 8b897186..6721132d 100644 --- a/packages/cli/src/ui/components/InputPrompt.tsx +++ b/packages/cli/src/ui/components/InputPrompt.tsx @@ -18,7 +18,7 @@ import { useShellHistory } from '../hooks/useShellHistory.js'; import { useCompletion } from '../hooks/useCompletion.js'; import { isAtCommand, isSlashCommand } from '../utils/commandUtils.js'; import { SlashCommand } from '../hooks/slashCommandProcessor.js'; -import { Config } from '@gemini-cli/core'; +import { Config } from '@google/gemini-cli-core'; export interface InputPromptProps { buffer: TextBuffer; diff --git a/packages/cli/src/ui/components/LoadingIndicator.tsx b/packages/cli/src/ui/components/LoadingIndicator.tsx index 855894e6..88a66b31 100644 --- a/packages/cli/src/ui/components/LoadingIndicator.tsx +++ b/packages/cli/src/ui/components/LoadingIndicator.tsx @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { ThoughtSummary } from '@gemini-cli/core'; +import { ThoughtSummary } from '@google/gemini-cli-core'; import React from 'react'; import { Box, Text } from 'ink'; import { Colors } from '../colors.js'; diff --git a/packages/cli/src/ui/components/Tips.tsx b/packages/cli/src/ui/components/Tips.tsx index cca0b3e1..0db6611c 100644 --- a/packages/cli/src/ui/components/Tips.tsx +++ b/packages/cli/src/ui/components/Tips.tsx @@ -7,7 +7,7 @@ import React from 'react'; import { Box, Text } from 'ink'; import { Colors } from '../colors.js'; -import { type Config } from '@gemini-cli/core'; +import { type Config } from '@google/gemini-cli-core'; interface TipsProps { config: Config; diff --git a/packages/cli/src/ui/components/messages/ToolConfirmationMessage.test.tsx b/packages/cli/src/ui/components/messages/ToolConfirmationMessage.test.tsx index 6af03d54..968c1d6f 100644 --- a/packages/cli/src/ui/components/messages/ToolConfirmationMessage.test.tsx +++ b/packages/cli/src/ui/components/messages/ToolConfirmationMessage.test.tsx @@ -7,7 +7,7 @@ import { render } from 'ink-testing-library'; import { describe, it, expect, vi } from 'vitest'; import { ToolConfirmationMessage } from './ToolConfirmationMessage.js'; -import { ToolCallConfirmationDetails } from '@gemini-cli/core'; +import { ToolCallConfirmationDetails } from '@google/gemini-cli-core'; describe('ToolConfirmationMessage', () => { it('should not display urls if prompt and url are the same', () => { diff --git a/packages/cli/src/ui/components/messages/ToolConfirmationMessage.tsx b/packages/cli/src/ui/components/messages/ToolConfirmationMessage.tsx index 4f2c31d3..52df0357 100644 --- a/packages/cli/src/ui/components/messages/ToolConfirmationMessage.tsx +++ b/packages/cli/src/ui/components/messages/ToolConfirmationMessage.tsx @@ -14,7 +14,7 @@ import { ToolExecuteConfirmationDetails, ToolMcpConfirmationDetails, Config, -} from '@gemini-cli/core'; +} from '@google/gemini-cli-core'; import { RadioButtonSelect, RadioSelectItem, diff --git a/packages/cli/src/ui/components/messages/ToolGroupMessage.tsx b/packages/cli/src/ui/components/messages/ToolGroupMessage.tsx index df692246..25289c86 100644 --- a/packages/cli/src/ui/components/messages/ToolGroupMessage.tsx +++ b/packages/cli/src/ui/components/messages/ToolGroupMessage.tsx @@ -10,7 +10,7 @@ import { IndividualToolCallDisplay, ToolCallStatus } from '../../types.js'; import { ToolMessage } from './ToolMessage.js'; import { ToolConfirmationMessage } from './ToolConfirmationMessage.js'; import { Colors } from '../../colors.js'; -import { Config } from '@gemini-cli/core'; +import { Config } from '@google/gemini-cli-core'; interface ToolGroupMessageProps { groupId: number; diff --git a/packages/cli/src/ui/components/shared/text-buffer.ts b/packages/cli/src/ui/components/shared/text-buffer.ts index 93364ebe..82f10fa1 100644 --- a/packages/cli/src/ui/components/shared/text-buffer.ts +++ b/packages/cli/src/ui/components/shared/text-buffer.ts @@ -11,7 +11,7 @@ import os from 'os'; import pathMod from 'path'; import { useState, useCallback, useEffect, useMemo } from 'react'; import stringWidth from 'string-width'; -import { unescapePath } from '@gemini-cli/core'; +import { unescapePath } from '@google/gemini-cli-core'; import { toCodePoints, cpLen, cpSlice } from '../../utils/textUtils.js'; export type Direction = diff --git a/packages/cli/src/ui/editors/editorSettingsManager.ts b/packages/cli/src/ui/editors/editorSettingsManager.ts index fe4f7902..99d02a11 100644 --- a/packages/cli/src/ui/editors/editorSettingsManager.ts +++ b/packages/cli/src/ui/editors/editorSettingsManager.ts @@ -8,7 +8,7 @@ import { allowEditorTypeInSandbox, checkHasEditorType, type EditorType, -} from '@gemini-cli/core'; +} from '@google/gemini-cli-core'; export interface EditorDisplay { name: string; diff --git a/packages/cli/src/ui/hooks/atCommandProcessor.test.ts b/packages/cli/src/ui/hooks/atCommandProcessor.test.ts index 572131af..08631634 100644 --- a/packages/cli/src/ui/hooks/atCommandProcessor.test.ts +++ b/packages/cli/src/ui/hooks/atCommandProcessor.test.ts @@ -7,7 +7,7 @@ import { describe, it, expect, vi, beforeEach, afterEach, Mock } from 'vitest'; import type { Mocked } from 'vitest'; import { handleAtCommand } from './atCommandProcessor.js'; -import { Config, FileDiscoveryService } from '@gemini-cli/core'; +import { Config, FileDiscoveryService } from '@google/gemini-cli-core'; import { ToolCallStatus } from '../types.js'; import { UseHistoryManagerReturn } from './useHistoryManager.js'; import * as fsPromises from 'fs/promises'; @@ -52,8 +52,8 @@ vi.mock('fs/promises', async () => { }; }); -vi.mock('@gemini-cli/core', async () => { - const actual = await vi.importActual('@gemini-cli/core'); +vi.mock('@google/gemini-cli-core', async () => { + const actual = await vi.importActual('@google/gemini-cli-core'); return { ...actual, FileDiscoveryService: vi.fn(), diff --git a/packages/cli/src/ui/hooks/atCommandProcessor.ts b/packages/cli/src/ui/hooks/atCommandProcessor.ts index 3bbdce0d..80393ef2 100644 --- a/packages/cli/src/ui/hooks/atCommandProcessor.ts +++ b/packages/cli/src/ui/hooks/atCommandProcessor.ts @@ -12,7 +12,7 @@ import { getErrorMessage, isNodeError, unescapePath, -} from '@gemini-cli/core'; +} from '@google/gemini-cli-core'; import { HistoryItem, IndividualToolCallDisplay, diff --git a/packages/cli/src/ui/hooks/shellCommandProcessor.test.ts b/packages/cli/src/ui/hooks/shellCommandProcessor.test.ts index 847ce054..4549f929 100644 --- a/packages/cli/src/ui/hooks/shellCommandProcessor.test.ts +++ b/packages/cli/src/ui/hooks/shellCommandProcessor.test.ts @@ -7,7 +7,7 @@ import { act, renderHook } from '@testing-library/react'; import { vi } from 'vitest'; import { useShellCommandProcessor } from './shellCommandProcessor'; -import { Config, GeminiClient } from '@gemini-cli/core'; +import { Config, GeminiClient } from '@google/gemini-cli-core'; import * as fs from 'fs'; import EventEmitter from 'events'; @@ -22,7 +22,7 @@ vi.mock('os', () => ({ platform: () => 'linux', tmpdir: () => '/tmp', })); -vi.mock('@gemini-cli/core'); +vi.mock('@google/gemini-cli-core'); vi.mock('../utils/textUtils.js', () => ({ isBinary: vi.fn(), })); diff --git a/packages/cli/src/ui/hooks/shellCommandProcessor.ts b/packages/cli/src/ui/hooks/shellCommandProcessor.ts index fbd62d0c..c6b89515 100644 --- a/packages/cli/src/ui/hooks/shellCommandProcessor.ts +++ b/packages/cli/src/ui/hooks/shellCommandProcessor.ts @@ -8,7 +8,7 @@ import { spawn } from 'child_process'; import { StringDecoder } from 'string_decoder'; import type { HistoryItemWithoutId } from '../types.js'; import { useCallback } from 'react'; -import { Config, GeminiClient } from '@gemini-cli/core'; +import { Config, GeminiClient } from '@google/gemini-cli-core'; import { type PartListUnion } from '@google/genai'; import { formatMemoryUsage } from '../utils/formatters.js'; import { isBinary } from '../utils/textUtils.js'; diff --git a/packages/cli/src/ui/hooks/slashCommandProcessor.test.ts b/packages/cli/src/ui/hooks/slashCommandProcessor.test.ts index d411a2da..dd3e7c4f 100644 --- a/packages/cli/src/ui/hooks/slashCommandProcessor.test.ts +++ b/packages/cli/src/ui/hooks/slashCommandProcessor.test.ts @@ -68,7 +68,7 @@ import { getMCPDiscoveryState, getMCPServerStatus, GeminiClient, -} from '@gemini-cli/core'; +} from '@google/gemini-cli-core'; import { useSessionStats } from '../contexts/SessionContext.js'; import { LoadedSettings } from '../../config/settings.js'; @@ -712,7 +712,7 @@ Add any other context about the problem here. describe('/mcp command', () => { beforeEach(() => { // Mock the core module with getMCPServerStatus and getMCPDiscoveryState - vi.mock('@gemini-cli/core', async (importOriginal) => { + vi.mock('@google/gemini-cli-core', async (importOriginal) => { const actual = await importOriginal(); return { ...actual, diff --git a/packages/cli/src/ui/hooks/slashCommandProcessor.ts b/packages/cli/src/ui/hooks/slashCommandProcessor.ts index f76580b7..8a34ddfe 100644 --- a/packages/cli/src/ui/hooks/slashCommandProcessor.ts +++ b/packages/cli/src/ui/hooks/slashCommandProcessor.ts @@ -18,7 +18,7 @@ import { MCPServerStatus, getMCPDiscoveryState, getMCPServerStatus, -} from '@gemini-cli/core'; +} from '@google/gemini-cli-core'; import { useSessionStats } from '../contexts/SessionContext.js'; import { Message, diff --git a/packages/cli/src/ui/hooks/useAuthCommand.ts b/packages/cli/src/ui/hooks/useAuthCommand.ts index fe890706..bccb285e 100644 --- a/packages/cli/src/ui/hooks/useAuthCommand.ts +++ b/packages/cli/src/ui/hooks/useAuthCommand.ts @@ -11,7 +11,7 @@ import { Config, clearCachedCredentialFile, getErrorMessage, -} from '@gemini-cli/core'; +} from '@google/gemini-cli-core'; async function performAuthFlow(authMethod: AuthType, config: Config) { await config.refreshAuth(authMethod); diff --git a/packages/cli/src/ui/hooks/useAutoAcceptIndicator.test.ts b/packages/cli/src/ui/hooks/useAutoAcceptIndicator.test.ts index 834039ea..bda6c259 100644 --- a/packages/cli/src/ui/hooks/useAutoAcceptIndicator.test.ts +++ b/packages/cli/src/ui/hooks/useAutoAcceptIndicator.test.ts @@ -20,14 +20,14 @@ import { Config, Config as ActualConfigType, ApprovalMode, -} from '@gemini-cli/core'; +} from '@google/gemini-cli-core'; import { useInput, type Key as InkKey } from 'ink'; vi.mock('ink'); -vi.mock('@gemini-cli/core', async () => { +vi.mock('@google/gemini-cli-core', async () => { const actualServerModule = (await vi.importActual( - '@gemini-cli/core', + '@google/gemini-cli-core', )) as Record<string, unknown>; return { ...actualServerModule, diff --git a/packages/cli/src/ui/hooks/useAutoAcceptIndicator.ts b/packages/cli/src/ui/hooks/useAutoAcceptIndicator.ts index b6e722a3..8af3cea1 100644 --- a/packages/cli/src/ui/hooks/useAutoAcceptIndicator.ts +++ b/packages/cli/src/ui/hooks/useAutoAcceptIndicator.ts @@ -6,7 +6,7 @@ import { useState, useEffect } from 'react'; import { useInput } from 'ink'; -import { ApprovalMode, type Config } from '@gemini-cli/core'; +import { ApprovalMode, type Config } from '@google/gemini-cli-core'; export interface UseAutoAcceptIndicatorArgs { config: Config; diff --git a/packages/cli/src/ui/hooks/useCompletion.integration.test.ts b/packages/cli/src/ui/hooks/useCompletion.integration.test.ts index 237b6aae..6a178fb1 100644 --- a/packages/cli/src/ui/hooks/useCompletion.integration.test.ts +++ b/packages/cli/src/ui/hooks/useCompletion.integration.test.ts @@ -9,13 +9,13 @@ import type { Mocked } from 'vitest'; import { renderHook, act } from '@testing-library/react'; import { useCompletion } from './useCompletion.js'; import * as fs from 'fs/promises'; -import { FileDiscoveryService } from '@gemini-cli/core'; +import { FileDiscoveryService } from '@google/gemini-cli-core'; import { glob } from 'glob'; // Mock dependencies vi.mock('fs/promises'); -vi.mock('@gemini-cli/core', async () => { - const actual = await vi.importActual('@gemini-cli/core'); +vi.mock('@google/gemini-cli-core', async () => { + const actual = await vi.importActual('@google/gemini-cli-core'); return { ...actual, FileDiscoveryService: vi.fn(), diff --git a/packages/cli/src/ui/hooks/useCompletion.ts b/packages/cli/src/ui/hooks/useCompletion.ts index eef54fc8..8e18e32f 100644 --- a/packages/cli/src/ui/hooks/useCompletion.ts +++ b/packages/cli/src/ui/hooks/useCompletion.ts @@ -15,7 +15,7 @@ import { getErrorMessage, Config, FileDiscoveryService, -} from '@gemini-cli/core'; +} from '@google/gemini-cli-core'; import { MAX_SUGGESTIONS_TO_SHOW, Suggestion, diff --git a/packages/cli/src/ui/hooks/useEditorSettings.test.ts b/packages/cli/src/ui/hooks/useEditorSettings.test.ts index c69c2a31..7b056c2a 100644 --- a/packages/cli/src/ui/hooks/useEditorSettings.test.ts +++ b/packages/cli/src/ui/hooks/useEditorSettings.test.ts @@ -22,10 +22,10 @@ import { type EditorType, checkHasEditorType, allowEditorTypeInSandbox, -} from '@gemini-cli/core'; +} from '@google/gemini-cli-core'; -vi.mock('@gemini-cli/core', async () => { - const actual = await vi.importActual('@gemini-cli/core'); +vi.mock('@google/gemini-cli-core', async () => { + const actual = await vi.importActual('@google/gemini-cli-core'); return { ...actual, checkHasEditorType: vi.fn(() => true), diff --git a/packages/cli/src/ui/hooks/useEditorSettings.ts b/packages/cli/src/ui/hooks/useEditorSettings.ts index 1fe3983e..60c16798 100644 --- a/packages/cli/src/ui/hooks/useEditorSettings.ts +++ b/packages/cli/src/ui/hooks/useEditorSettings.ts @@ -11,7 +11,7 @@ import { allowEditorTypeInSandbox, checkHasEditorType, EditorType, -} from '@gemini-cli/core'; +} from '@google/gemini-cli-core'; interface UseEditorSettingsReturn { isEditorDialogOpen: boolean; diff --git a/packages/cli/src/ui/hooks/useGeminiStream.test.tsx b/packages/cli/src/ui/hooks/useGeminiStream.test.tsx index ed1eea4d..3da95ffd 100644 --- a/packages/cli/src/ui/hooks/useGeminiStream.test.tsx +++ b/packages/cli/src/ui/hooks/useGeminiStream.test.tsx @@ -16,7 +16,7 @@ import { TrackedExecutingToolCall, TrackedCancelledToolCall, } from './useReactToolScheduler.js'; -import { Config, EditorType, AuthType } from '@gemini-cli/core'; +import { Config, EditorType, AuthType } from '@google/gemini-cli-core'; import { Part, PartListUnion } from '@google/genai'; import { UseHistoryManagerReturn } from './useHistoryManager.js'; import { HistoryItem, MessageType, StreamingState } from '../types.js'; @@ -42,7 +42,7 @@ const MockedUserPromptEvent = vi.hoisted(() => vi.fn().mockImplementation(() => {}), ); -vi.mock('@gemini-cli/core', async (importOriginal) => { +vi.mock('@google/gemini-cli-core', async (importOriginal) => { const actualCoreModule = (await importOriginal()) as any; return { ...actualCoreModule, diff --git a/packages/cli/src/ui/hooks/useGeminiStream.ts b/packages/cli/src/ui/hooks/useGeminiStream.ts index a8816f98..ddd7c185 100644 --- a/packages/cli/src/ui/hooks/useGeminiStream.ts +++ b/packages/cli/src/ui/hooks/useGeminiStream.ts @@ -24,7 +24,7 @@ import { ThoughtSummary, UnauthorizedError, UserPromptEvent, -} from '@gemini-cli/core'; +} from '@google/gemini-cli-core'; import { type Part, type PartListUnion } from '@google/genai'; import { StreamingState, diff --git a/packages/cli/src/ui/hooks/useLogger.ts b/packages/cli/src/ui/hooks/useLogger.ts index eda14187..879e9dd7 100644 --- a/packages/cli/src/ui/hooks/useLogger.ts +++ b/packages/cli/src/ui/hooks/useLogger.ts @@ -5,7 +5,7 @@ */ import { useState, useEffect } from 'react'; -import { sessionId, Logger } from '@gemini-cli/core'; +import { sessionId, Logger } from '@google/gemini-cli-core'; /** * Hook to manage the logger instance. diff --git a/packages/cli/src/ui/hooks/useReactToolScheduler.ts b/packages/cli/src/ui/hooks/useReactToolScheduler.ts index 7f08c81f..5e1bbd25 100644 --- a/packages/cli/src/ui/hooks/useReactToolScheduler.ts +++ b/packages/cli/src/ui/hooks/useReactToolScheduler.ts @@ -21,7 +21,7 @@ import { ToolCall, Status as CoreStatus, EditorType, -} from '@gemini-cli/core'; +} from '@google/gemini-cli-core'; import { useCallback, useState, useMemo } from 'react'; import { HistoryItemToolGroup, diff --git a/packages/cli/src/ui/hooks/useShellHistory.ts b/packages/cli/src/ui/hooks/useShellHistory.ts index 507a18de..90248cc0 100644 --- a/packages/cli/src/ui/hooks/useShellHistory.ts +++ b/packages/cli/src/ui/hooks/useShellHistory.ts @@ -7,7 +7,7 @@ import { useState, useEffect, useCallback } from 'react'; import * as fs from 'fs/promises'; import * as path from 'path'; -import { isNodeError, getProjectTempDir } from '@gemini-cli/core'; +import { isNodeError, getProjectTempDir } from '@google/gemini-cli-core'; const HISTORY_FILE = 'shell_history'; const MAX_HISTORY_LENGTH = 100; diff --git a/packages/cli/src/ui/hooks/useShowMemoryCommand.ts b/packages/cli/src/ui/hooks/useShowMemoryCommand.ts index 341298ba..c1811507 100644 --- a/packages/cli/src/ui/hooks/useShowMemoryCommand.ts +++ b/packages/cli/src/ui/hooks/useShowMemoryCommand.ts @@ -5,7 +5,7 @@ */ import { Message, MessageType } from '../types.js'; -import { Config } from '@gemini-cli/core'; +import { Config } from '@google/gemini-cli-core'; import { LoadedSettings } from '../../config/settings.js'; export function createShowMemoryAction( diff --git a/packages/cli/src/ui/hooks/useToolScheduler.test.ts b/packages/cli/src/ui/hooks/useToolScheduler.test.ts index 1bc9e6be..4b88adaa 100644 --- a/packages/cli/src/ui/hooks/useToolScheduler.test.ts +++ b/packages/cli/src/ui/hooks/useToolScheduler.test.ts @@ -24,7 +24,7 @@ import { ToolCall, // Import from core Status as ToolCallStatusType, ApprovalMode, // Import from core -} from '@gemini-cli/core'; +} from '@google/gemini-cli-core'; import { HistoryItemWithoutId, ToolCallStatus, @@ -32,8 +32,8 @@ import { } from '../types.js'; // Mocks -vi.mock('@gemini-cli/core', async () => { - const actual = await vi.importActual('@gemini-cli/core'); +vi.mock('@google/gemini-cli-core', async () => { + const actual = await vi.importActual('@google/gemini-cli-core'); return { ...actual, ToolRegistry: vi.fn(), diff --git a/packages/cli/src/ui/types.ts b/packages/cli/src/ui/types.ts index 5cf372b4..1bddfc32 100644 --- a/packages/cli/src/ui/types.ts +++ b/packages/cli/src/ui/types.ts @@ -7,7 +7,7 @@ import { ToolCallConfirmationDetails, ToolResultDisplay, -} from '@gemini-cli/core'; +} from '@google/gemini-cli-core'; import { CumulativeStats } from './contexts/SessionContext.js'; // Only defining the state enum needed by the UI diff --git a/packages/cli/src/ui/utils/errorParsing.test.ts b/packages/cli/src/ui/utils/errorParsing.test.ts index ccc2522e..cf7234c2 100644 --- a/packages/cli/src/ui/utils/errorParsing.test.ts +++ b/packages/cli/src/ui/utils/errorParsing.test.ts @@ -6,7 +6,7 @@ import { describe, it, expect } from 'vitest'; import { parseAndFormatApiError } from './errorParsing.js'; -import { AuthType, StructuredError } from '@gemini-cli/core'; +import { AuthType, StructuredError } from '@google/gemini-cli-core'; describe('parseAndFormatApiError', () => { const enterpriseMessage = 'upgrade to a plan with higher limits'; diff --git a/packages/cli/src/ui/utils/errorParsing.ts b/packages/cli/src/ui/utils/errorParsing.ts index b0f2d00a..7935e4f3 100644 --- a/packages/cli/src/ui/utils/errorParsing.ts +++ b/packages/cli/src/ui/utils/errorParsing.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { AuthType, StructuredError } from '@gemini-cli/core'; +import { AuthType, StructuredError } from '@google/gemini-cli-core'; const RATE_LIMIT_ERROR_MESSAGE_GOOGLE = '\nPlease wait and try again later. To increase your limits, upgrade to a plan with higher limits, or use /auth to switch to using a paid API key from AI Studio at https://aistudio.google.com/apikey'; diff --git a/packages/cli/src/utils/cleanup.ts b/packages/cli/src/utils/cleanup.ts index 747bbf8e..4011ae30 100644 --- a/packages/cli/src/utils/cleanup.ts +++ b/packages/cli/src/utils/cleanup.ts @@ -6,7 +6,7 @@ import { promises as fs } from 'fs'; import { join } from 'path'; -import { getProjectTempDir } from '@gemini-cli/core'; +import { getProjectTempDir } from '@google/gemini-cli-core'; export async function cleanupCheckpoints() { const tempDir = getProjectTempDir(process.cwd()); diff --git a/packages/cli/src/utils/sandbox.ts b/packages/cli/src/utils/sandbox.ts index ce374ceb..670d8930 100644 --- a/packages/cli/src/utils/sandbox.ts +++ b/packages/cli/src/utils/sandbox.ts @@ -15,7 +15,7 @@ import { SETTINGS_DIRECTORY_NAME, } from '../config/settings.js'; import { promisify } from 'util'; -import { SandboxConfig } from '@gemini-cli/core'; +import { SandboxConfig } from '@google/gemini-cli-core'; const execAsync = promisify(exec); diff --git a/packages/cli/src/utils/startupWarnings.test.ts b/packages/cli/src/utils/startupWarnings.test.ts index 980d6fe5..e0664d0f 100644 --- a/packages/cli/src/utils/startupWarnings.test.ts +++ b/packages/cli/src/utils/startupWarnings.test.ts @@ -7,10 +7,10 @@ import { describe, it, expect, vi, beforeEach } from 'vitest'; import { getStartupWarnings } from './startupWarnings.js'; import * as fs from 'fs/promises'; -import { getErrorMessage } from '@gemini-cli/core'; +import { getErrorMessage } from '@google/gemini-cli-core'; vi.mock('fs/promises'); -vi.mock('@gemini-cli/core', async (importOriginal) => { +vi.mock('@google/gemini-cli-core', async (importOriginal) => { const actual = await importOriginal(); return { ...actual, diff --git a/packages/cli/src/utils/startupWarnings.ts b/packages/cli/src/utils/startupWarnings.ts index 5ad35de7..065fa186 100644 --- a/packages/cli/src/utils/startupWarnings.ts +++ b/packages/cli/src/utils/startupWarnings.ts @@ -7,7 +7,7 @@ import fs from 'fs/promises'; import os from 'os'; import { join as pathJoin } from 'node:path'; -import { getErrorMessage } from '@gemini-cli/core'; +import { getErrorMessage } from '@google/gemini-cli-core'; const warningsFilePath = pathJoin(os.tmpdir(), 'gemini-cli-warnings.txt'); |