diff options
Diffstat (limited to 'packages/cli/src')
24 files changed, 31 insertions, 32 deletions
diff --git a/packages/cli/src/config/config.test.ts b/packages/cli/src/config/config.test.ts index e443bbe5..9f288372 100644 --- a/packages/cli/src/config/config.test.ts +++ b/packages/cli/src/config/config.test.ts @@ -10,7 +10,7 @@ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'; import * as os from 'os'; import { loadCliConfig } from './config.js'; import { Settings } from './settings.js'; -import * as ServerConfig from '@gemini-code/server'; +import * as ServerConfig from '@gemini-code/core'; const MOCK_HOME_DIR = '/mock/home/user'; @@ -28,10 +28,9 @@ vi.mock('read-package-up', () => ({ ), })); -vi.mock('@gemini-code/server', async () => { - const actualServer = await vi.importActual<typeof ServerConfig>( - '@gemini-code/server', - ); +vi.mock('@gemini-code/core', async () => { + const actualServer = + await vi.importActual<typeof ServerConfig>('@gemini-code/core'); return { ...actualServer, loadEnvironment: vi.fn(), diff --git a/packages/cli/src/config/config.ts b/packages/cli/src/config/config.ts index 1808f545..18de4b22 100644 --- a/packages/cli/src/config/config.ts +++ b/packages/cli/src/config/config.ts @@ -13,7 +13,7 @@ import { createServerConfig, loadServerHierarchicalMemory, ConfigParameters, -} from '@gemini-code/server'; +} from '@gemini-code/core'; import { Settings } from './settings.js'; import { readPackageUp } from 'read-package-up'; diff --git a/packages/cli/src/config/settings.ts b/packages/cli/src/config/settings.ts index efb083cc..107ef522 100644 --- a/packages/cli/src/config/settings.ts +++ b/packages/cli/src/config/settings.ts @@ -7,7 +7,7 @@ import * as fs from 'fs'; import * as path from 'path'; import { homedir } from 'os'; -import { MCPServerConfig } from '@gemini-code/server/src/config/config.js'; +import { MCPServerConfig } from '@gemini-code/core/src/config/config.js'; import stripJsonComments from 'strip-json-comments'; export const SETTINGS_DIRECTORY_NAME = '.gemini'; diff --git a/packages/cli/src/gemini.tsx b/packages/cli/src/gemini.tsx index 9cfaef37..e7ab6baa 100644 --- a/packages/cli/src/gemini.tsx +++ b/packages/cli/src/gemini.tsx @@ -9,7 +9,7 @@ import { render } from 'ink'; import { App } from './ui/App.js'; import { loadCliConfig } from './config/config.js'; import { readStdin } from './utils/readStdin.js'; -import { GeminiClient } from '@gemini-code/server'; +import { GeminiClient } from '@gemini-code/core'; import { readPackageUp } from 'read-package-up'; import { fileURLToPath } from 'node:url'; import { dirname } from 'node:path'; diff --git a/packages/cli/src/ui/App.tsx b/packages/cli/src/ui/App.tsx index 7b1eb2cb..90426ccc 100644 --- a/packages/cli/src/ui/App.tsx +++ b/packages/cli/src/ui/App.tsx @@ -39,7 +39,7 @@ import { DetailedMessagesDisplay } from './components/DetailedMessagesDisplay.js import { HistoryItemDisplay } from './components/HistoryItemDisplay.js'; import { useHistory } from './hooks/useHistoryManager.js'; import process from 'node:process'; -import { getErrorMessage, type Config } from '@gemini-code/server'; +import { getErrorMessage, type Config } from '@gemini-code/core'; import { useLogger } from './hooks/useLogger.js'; import { StreamingContext } from './contexts/StreamingContext.js'; import { useGitBranchName } from './hooks/useGitBranchName.js'; diff --git a/packages/cli/src/ui/components/Footer.tsx b/packages/cli/src/ui/components/Footer.tsx index 22615779..61632bcb 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 } from '@gemini-code/server'; +import { shortenPath, tildeifyPath } from '@gemini-code/core'; import { ConsoleSummaryDisplay } from './ConsoleSummaryDisplay.js'; import process from 'node:process'; import { MemoryUsageDisplay } from './MemoryUsageDisplay.js'; diff --git a/packages/cli/src/ui/components/InputPrompt.tsx b/packages/cli/src/ui/components/InputPrompt.tsx index 78426aa3..b6c1b8da 100644 --- a/packages/cli/src/ui/components/InputPrompt.tsx +++ b/packages/cli/src/ui/components/InputPrompt.tsx @@ -17,7 +17,7 @@ import process from 'node:process'; import { useCompletion } from '../hooks/useCompletion.js'; import { isAtCommand, isSlashCommand } from '../utils/commandUtils.js'; import { SlashCommand } from '../hooks/slashCommandProcessor.js'; -import { Config } from '@gemini-code/server'; +import { Config } from '@gemini-code/core'; interface InputPromptProps { onSubmit: (value: string) => void; diff --git a/packages/cli/src/ui/components/Tips.tsx b/packages/cli/src/ui/components/Tips.tsx index b0207246..63403082 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-code/server'; +import { type Config } from '@gemini-code/core'; interface TipsProps { config: Config; diff --git a/packages/cli/src/ui/components/messages/ToolConfirmationMessage.tsx b/packages/cli/src/ui/components/messages/ToolConfirmationMessage.tsx index 65030309..7db9402f 100644 --- a/packages/cli/src/ui/components/messages/ToolConfirmationMessage.tsx +++ b/packages/cli/src/ui/components/messages/ToolConfirmationMessage.tsx @@ -13,7 +13,7 @@ import { ToolConfirmationOutcome, ToolExecuteConfirmationDetails, ToolMcpConfirmationDetails, -} from '@gemini-code/server'; +} from '@gemini-code/core'; import { RadioButtonSelect, RadioSelectItem, diff --git a/packages/cli/src/ui/hooks/atCommandProcessor.test.ts b/packages/cli/src/ui/hooks/atCommandProcessor.test.ts index ed37ec14..176a1210 100644 --- a/packages/cli/src/ui/hooks/atCommandProcessor.test.ts +++ b/packages/cli/src/ui/hooks/atCommandProcessor.test.ts @@ -6,7 +6,7 @@ import { describe, it, expect, vi, beforeEach, afterEach, Mock } from 'vitest'; import { handleAtCommand } from './atCommandProcessor.js'; -import { Config } from '@gemini-code/server'; +import { Config } from '@gemini-code/core'; import { ToolCallStatus } from '../types.js'; import { UseHistoryManagerReturn } from './useHistoryManager.js'; import * as fsPromises from 'fs/promises'; diff --git a/packages/cli/src/ui/hooks/atCommandProcessor.ts b/packages/cli/src/ui/hooks/atCommandProcessor.ts index 4416ef82..54b10d51 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-code/server'; +} from '@gemini-code/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 2fd32087..2f0f6604 100644 --- a/packages/cli/src/ui/hooks/shellCommandProcessor.test.ts +++ b/packages/cli/src/ui/hooks/shellCommandProcessor.test.ts @@ -7,7 +7,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { act, renderHook } from '@testing-library/react'; import { useShellCommandProcessor } from './shellCommandProcessor.js'; -import { type Config } from '@gemini-code/server'; +import { type Config } from '@gemini-code/core'; import { type PartListUnion } from '@google/genai'; import { existsSync, readFileSync, unlinkSync } from 'fs'; import type * as FsMod from 'fs'; diff --git a/packages/cli/src/ui/hooks/shellCommandProcessor.ts b/packages/cli/src/ui/hooks/shellCommandProcessor.ts index 1325fd1d..111df009 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 type { HistoryItemWithoutId } from '../types.js'; import type { exec as ExecType } from 'child_process'; import { useCallback } from 'react'; -import { Config } from '@gemini-code/server'; +import { Config } from '@gemini-code/core'; import { type PartListUnion } from '@google/genai'; import { UseHistoryManagerReturn } from './useHistoryManager.js'; import crypto from 'crypto'; diff --git a/packages/cli/src/ui/hooks/slashCommandProcessor.test.ts b/packages/cli/src/ui/hooks/slashCommandProcessor.test.ts index 7696c40d..747e09de 100644 --- a/packages/cli/src/ui/hooks/slashCommandProcessor.test.ts +++ b/packages/cli/src/ui/hooks/slashCommandProcessor.test.ts @@ -56,7 +56,7 @@ import { type SlashCommandActionReturn, } from './slashCommandProcessor.js'; import { MessageType } from '../types.js'; -import { type Config } from '@gemini-code/server'; +import { type Config } from '@gemini-code/core'; import * as ShowMemoryCommandModule from './useShowMemoryCommand.js'; import { GIT_COMMIT_INFO } from '../../generated/git-commit.js'; diff --git a/packages/cli/src/ui/hooks/slashCommandProcessor.ts b/packages/cli/src/ui/hooks/slashCommandProcessor.ts index 8f294380..6515ed78 100644 --- a/packages/cli/src/ui/hooks/slashCommandProcessor.ts +++ b/packages/cli/src/ui/hooks/slashCommandProcessor.ts @@ -9,7 +9,7 @@ import { type PartListUnion } from '@google/genai'; import open from 'open'; import process from 'node:process'; import { UseHistoryManagerReturn } from './useHistoryManager.js'; -import { Config } from '@gemini-code/server'; +import { Config } from '@gemini-code/core'; import { Message, MessageType, HistoryItemWithoutId } from '../types.js'; import { createShowMemoryAction } from './useShowMemoryCommand.js'; import { GIT_COMMIT_INFO } from '../../generated/git-commit.js'; diff --git a/packages/cli/src/ui/hooks/useAutoAcceptIndicator.test.ts b/packages/cli/src/ui/hooks/useAutoAcceptIndicator.test.ts index 9973b8eb..8c611ccc 100644 --- a/packages/cli/src/ui/hooks/useAutoAcceptIndicator.test.ts +++ b/packages/cli/src/ui/hooks/useAutoAcceptIndicator.test.ts @@ -16,14 +16,14 @@ import { import { renderHook, act } from '@testing-library/react'; import { useAutoAcceptIndicator } from './useAutoAcceptIndicator.js'; -import type { Config as ActualConfigType } from '@gemini-code/server'; +import type { Config as ActualConfigType } from '@gemini-code/core'; import { useInput, type Key as InkKey } from 'ink'; vi.mock('ink'); -vi.mock('@gemini-code/server', async () => { +vi.mock('@gemini-code/core', async () => { const actualServerModule = (await vi.importActual( - '@gemini-code/server', + '@gemini-code/core', )) as Record<string, unknown>; return { ...actualServerModule, @@ -31,7 +31,7 @@ vi.mock('@gemini-code/server', async () => { }; }); -import { Config } from '@gemini-code/server'; +import { Config } from '@gemini-code/core'; interface MockConfigInstanceShape { getAlwaysSkipModificationConfirmation: Mock<() => boolean>; diff --git a/packages/cli/src/ui/hooks/useAutoAcceptIndicator.ts b/packages/cli/src/ui/hooks/useAutoAcceptIndicator.ts index 17cffd40..5af1783b 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 type { Config } from '@gemini-code/server'; +import type { Config } from '@gemini-code/core'; export interface UseAutoAcceptIndicatorArgs { config: Config; diff --git a/packages/cli/src/ui/hooks/useCompletion.ts b/packages/cli/src/ui/hooks/useCompletion.ts index 182ee4e4..f2c85458 100644 --- a/packages/cli/src/ui/hooks/useCompletion.ts +++ b/packages/cli/src/ui/hooks/useCompletion.ts @@ -12,7 +12,7 @@ import { escapePath, unescapePath, getErrorMessage, -} from '@gemini-code/server'; +} from '@gemini-code/core'; import { MAX_SUGGESTIONS_TO_SHOW, Suggestion, diff --git a/packages/cli/src/ui/hooks/useGeminiStream.ts b/packages/cli/src/ui/hooks/useGeminiStream.ts index 9dd6f728..77be6879 100644 --- a/packages/cli/src/ui/hooks/useGeminiStream.ts +++ b/packages/cli/src/ui/hooks/useGeminiStream.ts @@ -22,7 +22,7 @@ import { ToolExecuteConfirmationDetails, ToolResultDisplay, ToolCallRequestInfo, -} from '@gemini-code/server'; +} from '@gemini-code/core'; import { type PartListUnion, type Part } from '@google/genai'; import { StreamingState, @@ -39,7 +39,7 @@ import { useStateAndRef } from './useStateAndRef.js'; import { UseHistoryManagerReturn } from './useHistoryManager.js'; import { useLogger } from './useLogger.js'; import { useToolScheduler, mapToDisplay } from './useToolScheduler.js'; -import { GeminiChat } from '@gemini-code/server/src/core/geminiChat.js'; +import { GeminiChat } from '@gemini-code/core/src/core/geminiChat.js'; export function mergePartListUnions(list: PartListUnion[]): PartListUnion { const resultParts: PartListUnion = []; diff --git a/packages/cli/src/ui/hooks/useLogger.ts b/packages/cli/src/ui/hooks/useLogger.ts index 080c3da9..bdc3ba7f 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 { Logger } from '@gemini-code/server'; +import { Logger } from '@gemini-code/core'; /** * Hook to manage the logger instance. diff --git a/packages/cli/src/ui/hooks/useShowMemoryCommand.ts b/packages/cli/src/ui/hooks/useShowMemoryCommand.ts index c8719bbd..89f01632 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-code/server'; +import { Config } from '@gemini-code/core'; export function createShowMemoryAction( config: Config | null, diff --git a/packages/cli/src/ui/hooks/useToolScheduler.ts b/packages/cli/src/ui/hooks/useToolScheduler.ts index d4cb0d54..9233ebcf 100644 --- a/packages/cli/src/ui/hooks/useToolScheduler.ts +++ b/packages/cli/src/ui/hooks/useToolScheduler.ts @@ -12,7 +12,7 @@ import { Tool, ToolCallConfirmationDetails, ToolResult, -} from '@gemini-code/server'; +} from '@gemini-code/core'; import { Part, PartUnion, PartListUnion } from '@google/genai'; import { useCallback, useEffect, useState } from 'react'; import { diff --git a/packages/cli/src/ui/types.ts b/packages/cli/src/ui/types.ts index 3a8c55bb..f22d0d8a 100644 --- a/packages/cli/src/ui/types.ts +++ b/packages/cli/src/ui/types.ts @@ -7,7 +7,7 @@ import { ToolCallConfirmationDetails, ToolResultDisplay, -} from '@gemini-code/server'; +} from '@gemini-code/core'; // Only defining the state enum needed by the UI export enum StreamingState { diff --git a/packages/cli/src/utils/startupWarnings.ts b/packages/cli/src/utils/startupWarnings.ts index a55003e6..b8b9a1ac 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-code/server'; +import { getErrorMessage } from '@gemini-code/core'; const warningsFilePath = pathJoin(os.tmpdir(), 'gemini-code-cli-warnings.txt'); |