diff options
| author | Tommaso Sciortino <[email protected]> | 2025-05-30 18:25:47 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2025-05-30 18:25:47 -0700 |
| commit | 21fba832d1b4ea7af43fb887d9b2b38fcf8210d0 (patch) | |
| tree | 7200d2fac3a55c385e0a2dac34b5282c942364bc /packages | |
| parent | c81148a0cc8489f657901c2cc7247c0834075e1a (diff) | |
Rename server->core (#638)
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/cli/package.json | 4 | ||||
| -rw-r--r-- | packages/cli/src/config/config.test.ts | 9 | ||||
| -rw-r--r-- | packages/cli/src/config/config.ts | 2 | ||||
| -rw-r--r-- | packages/cli/src/config/settings.ts | 2 | ||||
| -rw-r--r-- | packages/cli/src/gemini.tsx | 2 | ||||
| -rw-r--r-- | packages/cli/src/ui/App.tsx | 2 | ||||
| -rw-r--r-- | packages/cli/src/ui/components/Footer.tsx | 2 | ||||
| -rw-r--r-- | packages/cli/src/ui/components/InputPrompt.tsx | 2 | ||||
| -rw-r--r-- | packages/cli/src/ui/components/Tips.tsx | 2 | ||||
| -rw-r--r-- | packages/cli/src/ui/components/messages/ToolConfirmationMessage.tsx | 2 | ||||
| -rw-r--r-- | packages/cli/src/ui/hooks/atCommandProcessor.test.ts | 2 | ||||
| -rw-r--r-- | packages/cli/src/ui/hooks/atCommandProcessor.ts | 2 | ||||
| -rw-r--r-- | packages/cli/src/ui/hooks/shellCommandProcessor.test.ts | 2 | ||||
| -rw-r--r-- | packages/cli/src/ui/hooks/shellCommandProcessor.ts | 2 | ||||
| -rw-r--r-- | packages/cli/src/ui/hooks/slashCommandProcessor.test.ts | 2 | ||||
| -rw-r--r-- | packages/cli/src/ui/hooks/slashCommandProcessor.ts | 2 | ||||
| -rw-r--r-- | packages/cli/src/ui/hooks/useAutoAcceptIndicator.test.ts | 8 | ||||
| -rw-r--r-- | packages/cli/src/ui/hooks/useAutoAcceptIndicator.ts | 2 | ||||
| -rw-r--r-- | packages/cli/src/ui/hooks/useCompletion.ts | 2 | ||||
| -rw-r--r-- | packages/cli/src/ui/hooks/useGeminiStream.ts | 4 | ||||
| -rw-r--r-- | packages/cli/src/ui/hooks/useLogger.ts | 2 | ||||
| -rw-r--r-- | packages/cli/src/ui/hooks/useShowMemoryCommand.ts | 2 | ||||
| -rw-r--r-- | packages/cli/src/ui/hooks/useToolScheduler.ts | 2 | ||||
| -rw-r--r-- | packages/cli/src/ui/types.ts | 2 | ||||
| -rw-r--r-- | packages/cli/src/utils/startupWarnings.ts | 2 | ||||
| -rw-r--r-- | packages/cli/tsconfig.json | 2 | ||||
| -rw-r--r-- | packages/core/README.md (renamed from packages/server/README.md) | 0 | ||||
| -rw-r--r-- | packages/core/index.ts (renamed from packages/server/index.ts) | 0 | ||||
| -rw-r--r-- | packages/core/package.json (renamed from packages/server/package.json) | 2 | ||||
| -rw-r--r-- | packages/core/src/__mocks__/fs/promises.ts (renamed from packages/server/src/__mocks__/fs/promises.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/config/config.test.ts (renamed from packages/server/src/config/config.test.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/config/config.ts (renamed from packages/server/src/config/config.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/core/__snapshots__/prompts.test.ts.snap (renamed from packages/server/src/core/__snapshots__/prompts.test.ts.snap) | 0 | ||||
| -rw-r--r-- | packages/core/src/core/client.test.ts (renamed from packages/server/src/core/client.test.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/core/client.ts (renamed from packages/server/src/core/client.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/core/geminiChat.test.ts (renamed from packages/server/src/core/geminiChat.test.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/core/geminiChat.ts (renamed from packages/server/src/core/geminiChat.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/core/geminiRequest.ts (renamed from packages/server/src/core/geminiRequest.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/core/logger.test.ts (renamed from packages/server/src/core/logger.test.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/core/logger.ts (renamed from packages/server/src/core/logger.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/core/prompts.test.ts (renamed from packages/server/src/core/prompts.test.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/core/prompts.ts (renamed from packages/server/src/core/prompts.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/core/turn.test.ts (renamed from packages/server/src/core/turn.test.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/core/turn.ts (renamed from packages/server/src/core/turn.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/index.test.ts (renamed from packages/server/src/index.test.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/index.ts (renamed from packages/server/src/index.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/tools/diffOptions.ts (renamed from packages/server/src/tools/diffOptions.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/tools/edit.test.ts (renamed from packages/server/src/tools/edit.test.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/tools/edit.ts (renamed from packages/server/src/tools/edit.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/tools/glob.test.ts (renamed from packages/server/src/tools/glob.test.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/tools/glob.ts (renamed from packages/server/src/tools/glob.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/tools/grep.test.ts (renamed from packages/server/src/tools/grep.test.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/tools/grep.ts (renamed from packages/server/src/tools/grep.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/tools/ls.ts (renamed from packages/server/src/tools/ls.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/tools/mcp-client.test.ts (renamed from packages/server/src/tools/mcp-client.test.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/tools/mcp-client.ts (renamed from packages/server/src/tools/mcp-client.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/tools/mcp-tool.test.ts (renamed from packages/server/src/tools/mcp-tool.test.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/tools/mcp-tool.ts (renamed from packages/server/src/tools/mcp-tool.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/tools/memoryTool.test.ts (renamed from packages/server/src/tools/memoryTool.test.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/tools/memoryTool.ts (renamed from packages/server/src/tools/memoryTool.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/tools/read-file.test.ts (renamed from packages/server/src/tools/read-file.test.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/tools/read-file.ts (renamed from packages/server/src/tools/read-file.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/tools/read-many-files.test.ts (renamed from packages/server/src/tools/read-many-files.test.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/tools/read-many-files.ts (renamed from packages/server/src/tools/read-many-files.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/tools/shell.json (renamed from packages/server/src/tools/shell.json) | 0 | ||||
| -rw-r--r-- | packages/core/src/tools/shell.md (renamed from packages/server/src/tools/shell.md) | 0 | ||||
| -rw-r--r-- | packages/core/src/tools/shell.ts (renamed from packages/server/src/tools/shell.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/tools/tool-registry.test.ts (renamed from packages/server/src/tools/tool-registry.test.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/tools/tool-registry.ts (renamed from packages/server/src/tools/tool-registry.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/tools/tools.ts (renamed from packages/server/src/tools/tools.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/tools/web-fetch.ts (renamed from packages/server/src/tools/web-fetch.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/tools/web-search.ts (renamed from packages/server/src/tools/web-search.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/tools/write-file.test.ts (renamed from packages/server/src/tools/write-file.test.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/tools/write-file.ts (renamed from packages/server/src/tools/write-file.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/utils/LruCache.ts (renamed from packages/server/src/utils/LruCache.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/utils/editCorrector.test.ts (renamed from packages/server/src/utils/editCorrector.test.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/utils/editCorrector.ts (renamed from packages/server/src/utils/editCorrector.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/utils/errorReporting.test.ts (renamed from packages/server/src/utils/errorReporting.test.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/utils/errorReporting.ts (renamed from packages/server/src/utils/errorReporting.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/utils/errors.ts (renamed from packages/server/src/utils/errors.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/utils/fileUtils.test.ts (renamed from packages/server/src/utils/fileUtils.test.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/utils/fileUtils.ts (renamed from packages/server/src/utils/fileUtils.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/utils/generateContentResponseUtilities.ts (renamed from packages/server/src/utils/generateContentResponseUtilities.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/utils/getFolderStructure.test.ts (renamed from packages/server/src/utils/getFolderStructure.test.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/utils/getFolderStructure.ts (renamed from packages/server/src/utils/getFolderStructure.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/utils/memoryDiscovery.test.ts (renamed from packages/server/src/utils/memoryDiscovery.test.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/utils/memoryDiscovery.ts (renamed from packages/server/src/utils/memoryDiscovery.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/utils/messageInspectors.ts (renamed from packages/server/src/utils/messageInspectors.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/utils/nextSpeakerChecker.test.ts (renamed from packages/server/src/utils/nextSpeakerChecker.test.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/utils/nextSpeakerChecker.ts (renamed from packages/server/src/utils/nextSpeakerChecker.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/utils/paths.ts (renamed from packages/server/src/utils/paths.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/utils/retry.test.ts (renamed from packages/server/src/utils/retry.test.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/utils/retry.ts (renamed from packages/server/src/utils/retry.ts) | 0 | ||||
| -rw-r--r-- | packages/core/src/utils/schemaValidator.ts (renamed from packages/server/src/utils/schemaValidator.ts) | 0 | ||||
| -rw-r--r-- | packages/core/tsconfig.json (renamed from packages/server/tsconfig.json) | 0 | ||||
| -rw-r--r-- | packages/core/vitest.config.ts (renamed from packages/server/vitest.config.ts) | 0 |
96 files changed, 35 insertions, 36 deletions
diff --git a/packages/cli/package.json b/packages/cli/package.json index 615e344d..447b35f1 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -19,7 +19,7 @@ "typecheck": "tsc --noEmit", "prerelease:version": "node ../../scripts/bind_package_version.js", "prerelease:deps": "node ../../scripts/bind_package_dependencies.js", - "prepublishOnly": "npm publish --workspace=@gemini-code/server", + "prepublishOnly": "npm publish --workspace=@gemini-code/core", "prepack": "npm run build" }, "files": [ @@ -29,7 +29,7 @@ "sandboxImageUri": "gemini-cli-sandbox" }, "dependencies": { - "@gemini-code/server": "0.1.0", + "@gemini-code/core": "0.1.0", "diff": "^7.0.0", "dotenv": "^16.4.7", "highlight.js": "^11.11.1", 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'); diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json index 38ef1972..1ffbb402 100644 --- a/packages/cli/tsconfig.json +++ b/packages/cli/tsconfig.json @@ -8,5 +8,5 @@ }, "include": ["index.ts", "src/**/*.ts", "src/**/*.tsx", "src/**/*.json"], "exclude": ["node_modules", "dist"], - "references": [{ "path": "../server" }] + "references": [{ "path": "../core" }] } diff --git a/packages/server/README.md b/packages/core/README.md index 3345cebd..3345cebd 100644 --- a/packages/server/README.md +++ b/packages/core/README.md diff --git a/packages/server/index.ts b/packages/core/index.ts index 3e74d6be..3e74d6be 100644 --- a/packages/server/index.ts +++ b/packages/core/index.ts diff --git a/packages/server/package.json b/packages/core/package.json index abb679cc..4bd8de98 100644 --- a/packages/server/package.json +++ b/packages/core/package.json @@ -1,5 +1,5 @@ { - "name": "@gemini-code/server", + "name": "@gemini-code/core", "version": "0.1.0", "description": "Gemini CLI Server", "type": "module", diff --git a/packages/server/src/__mocks__/fs/promises.ts b/packages/core/src/__mocks__/fs/promises.ts index 42385911..42385911 100644 --- a/packages/server/src/__mocks__/fs/promises.ts +++ b/packages/core/src/__mocks__/fs/promises.ts diff --git a/packages/server/src/config/config.test.ts b/packages/core/src/config/config.test.ts index f84ad746..f84ad746 100644 --- a/packages/server/src/config/config.test.ts +++ b/packages/core/src/config/config.test.ts diff --git a/packages/server/src/config/config.ts b/packages/core/src/config/config.ts index 0cd7a4fa..0cd7a4fa 100644 --- a/packages/server/src/config/config.ts +++ b/packages/core/src/config/config.ts diff --git a/packages/server/src/core/__snapshots__/prompts.test.ts.snap b/packages/core/src/core/__snapshots__/prompts.test.ts.snap index 2f2abb95..2f2abb95 100644 --- a/packages/server/src/core/__snapshots__/prompts.test.ts.snap +++ b/packages/core/src/core/__snapshots__/prompts.test.ts.snap diff --git a/packages/server/src/core/client.test.ts b/packages/core/src/core/client.test.ts index 228701d8..228701d8 100644 --- a/packages/server/src/core/client.test.ts +++ b/packages/core/src/core/client.test.ts diff --git a/packages/server/src/core/client.ts b/packages/core/src/core/client.ts index 9006c675..9006c675 100644 --- a/packages/server/src/core/client.ts +++ b/packages/core/src/core/client.ts diff --git a/packages/server/src/core/geminiChat.test.ts b/packages/core/src/core/geminiChat.test.ts index 11e222c9..11e222c9 100644 --- a/packages/server/src/core/geminiChat.test.ts +++ b/packages/core/src/core/geminiChat.test.ts diff --git a/packages/server/src/core/geminiChat.ts b/packages/core/src/core/geminiChat.ts index b34b6f35..b34b6f35 100644 --- a/packages/server/src/core/geminiChat.ts +++ b/packages/core/src/core/geminiChat.ts diff --git a/packages/server/src/core/geminiRequest.ts b/packages/core/src/core/geminiRequest.ts index e85bd51e..e85bd51e 100644 --- a/packages/server/src/core/geminiRequest.ts +++ b/packages/core/src/core/geminiRequest.ts diff --git a/packages/server/src/core/logger.test.ts b/packages/core/src/core/logger.test.ts index 2663a6be..2663a6be 100644 --- a/packages/server/src/core/logger.test.ts +++ b/packages/core/src/core/logger.test.ts diff --git a/packages/server/src/core/logger.ts b/packages/core/src/core/logger.ts index feb16944..feb16944 100644 --- a/packages/server/src/core/logger.ts +++ b/packages/core/src/core/logger.ts diff --git a/packages/server/src/core/prompts.test.ts b/packages/core/src/core/prompts.test.ts index 49502f92..49502f92 100644 --- a/packages/server/src/core/prompts.test.ts +++ b/packages/core/src/core/prompts.test.ts diff --git a/packages/server/src/core/prompts.ts b/packages/core/src/core/prompts.ts index a02e509f..a02e509f 100644 --- a/packages/server/src/core/prompts.ts +++ b/packages/core/src/core/prompts.ts diff --git a/packages/server/src/core/turn.test.ts b/packages/core/src/core/turn.test.ts index 8fb3a4c1..8fb3a4c1 100644 --- a/packages/server/src/core/turn.test.ts +++ b/packages/core/src/core/turn.test.ts diff --git a/packages/server/src/core/turn.ts b/packages/core/src/core/turn.ts index 22b01cce..22b01cce 100644 --- a/packages/server/src/core/turn.ts +++ b/packages/core/src/core/turn.ts diff --git a/packages/server/src/index.test.ts b/packages/core/src/index.test.ts index 154c96a6..154c96a6 100644 --- a/packages/server/src/index.test.ts +++ b/packages/core/src/index.test.ts diff --git a/packages/server/src/index.ts b/packages/core/src/index.ts index 70426d57..70426d57 100644 --- a/packages/server/src/index.ts +++ b/packages/core/src/index.ts diff --git a/packages/server/src/tools/diffOptions.ts b/packages/core/src/tools/diffOptions.ts index 598b46f1..598b46f1 100644 --- a/packages/server/src/tools/diffOptions.ts +++ b/packages/core/src/tools/diffOptions.ts diff --git a/packages/server/src/tools/edit.test.ts b/packages/core/src/tools/edit.test.ts index 08d0860d..08d0860d 100644 --- a/packages/server/src/tools/edit.test.ts +++ b/packages/core/src/tools/edit.test.ts diff --git a/packages/server/src/tools/edit.ts b/packages/core/src/tools/edit.ts index d85c89b0..d85c89b0 100644 --- a/packages/server/src/tools/edit.ts +++ b/packages/core/src/tools/edit.ts diff --git a/packages/server/src/tools/glob.test.ts b/packages/core/src/tools/glob.test.ts index d42e5b1c..d42e5b1c 100644 --- a/packages/server/src/tools/glob.test.ts +++ b/packages/core/src/tools/glob.test.ts diff --git a/packages/server/src/tools/glob.ts b/packages/core/src/tools/glob.ts index 86aef44f..86aef44f 100644 --- a/packages/server/src/tools/glob.ts +++ b/packages/core/src/tools/glob.ts diff --git a/packages/server/src/tools/grep.test.ts b/packages/core/src/tools/grep.test.ts index 59eb75a4..59eb75a4 100644 --- a/packages/server/src/tools/grep.test.ts +++ b/packages/core/src/tools/grep.test.ts diff --git a/packages/server/src/tools/grep.ts b/packages/core/src/tools/grep.ts index acdf0bc8..acdf0bc8 100644 --- a/packages/server/src/tools/grep.ts +++ b/packages/core/src/tools/grep.ts diff --git a/packages/server/src/tools/ls.ts b/packages/core/src/tools/ls.ts index fea95187..fea95187 100644 --- a/packages/server/src/tools/ls.ts +++ b/packages/core/src/tools/ls.ts diff --git a/packages/server/src/tools/mcp-client.test.ts b/packages/core/src/tools/mcp-client.test.ts index 4664669d..4664669d 100644 --- a/packages/server/src/tools/mcp-client.test.ts +++ b/packages/core/src/tools/mcp-client.test.ts diff --git a/packages/server/src/tools/mcp-client.ts b/packages/core/src/tools/mcp-client.ts index 97a73289..97a73289 100644 --- a/packages/server/src/tools/mcp-client.ts +++ b/packages/core/src/tools/mcp-client.ts diff --git a/packages/server/src/tools/mcp-tool.test.ts b/packages/core/src/tools/mcp-tool.test.ts index 5c784c5d..5c784c5d 100644 --- a/packages/server/src/tools/mcp-tool.test.ts +++ b/packages/core/src/tools/mcp-tool.test.ts diff --git a/packages/server/src/tools/mcp-tool.ts b/packages/core/src/tools/mcp-tool.ts index d02b8632..d02b8632 100644 --- a/packages/server/src/tools/mcp-tool.ts +++ b/packages/core/src/tools/mcp-tool.ts diff --git a/packages/server/src/tools/memoryTool.test.ts b/packages/core/src/tools/memoryTool.test.ts index 42b1329d..42b1329d 100644 --- a/packages/server/src/tools/memoryTool.test.ts +++ b/packages/core/src/tools/memoryTool.test.ts diff --git a/packages/server/src/tools/memoryTool.ts b/packages/core/src/tools/memoryTool.ts index 49dce59d..49dce59d 100644 --- a/packages/server/src/tools/memoryTool.ts +++ b/packages/core/src/tools/memoryTool.ts diff --git a/packages/server/src/tools/read-file.test.ts b/packages/core/src/tools/read-file.test.ts index 8ea42134..8ea42134 100644 --- a/packages/server/src/tools/read-file.test.ts +++ b/packages/core/src/tools/read-file.test.ts diff --git a/packages/server/src/tools/read-file.ts b/packages/core/src/tools/read-file.ts index 4bb3bd56..4bb3bd56 100644 --- a/packages/server/src/tools/read-file.ts +++ b/packages/core/src/tools/read-file.ts diff --git a/packages/server/src/tools/read-many-files.test.ts b/packages/core/src/tools/read-many-files.test.ts index 5c6d94fa..5c6d94fa 100644 --- a/packages/server/src/tools/read-many-files.test.ts +++ b/packages/core/src/tools/read-many-files.test.ts diff --git a/packages/server/src/tools/read-many-files.ts b/packages/core/src/tools/read-many-files.ts index d826c9ba..d826c9ba 100644 --- a/packages/server/src/tools/read-many-files.ts +++ b/packages/core/src/tools/read-many-files.ts diff --git a/packages/server/src/tools/shell.json b/packages/core/src/tools/shell.json index a4c018c7..a4c018c7 100644 --- a/packages/server/src/tools/shell.json +++ b/packages/core/src/tools/shell.json diff --git a/packages/server/src/tools/shell.md b/packages/core/src/tools/shell.md index 069a76db..069a76db 100644 --- a/packages/server/src/tools/shell.md +++ b/packages/core/src/tools/shell.md diff --git a/packages/server/src/tools/shell.ts b/packages/core/src/tools/shell.ts index 4efc3500..4efc3500 100644 --- a/packages/server/src/tools/shell.ts +++ b/packages/core/src/tools/shell.ts diff --git a/packages/server/src/tools/tool-registry.test.ts b/packages/core/src/tools/tool-registry.test.ts index 121e91c8..121e91c8 100644 --- a/packages/server/src/tools/tool-registry.test.ts +++ b/packages/core/src/tools/tool-registry.test.ts diff --git a/packages/server/src/tools/tool-registry.ts b/packages/core/src/tools/tool-registry.ts index e241ada5..e241ada5 100644 --- a/packages/server/src/tools/tool-registry.ts +++ b/packages/core/src/tools/tool-registry.ts diff --git a/packages/server/src/tools/tools.ts b/packages/core/src/tools/tools.ts index a2e7fa06..a2e7fa06 100644 --- a/packages/server/src/tools/tools.ts +++ b/packages/core/src/tools/tools.ts diff --git a/packages/server/src/tools/web-fetch.ts b/packages/core/src/tools/web-fetch.ts index 24617902..24617902 100644 --- a/packages/server/src/tools/web-fetch.ts +++ b/packages/core/src/tools/web-fetch.ts diff --git a/packages/server/src/tools/web-search.ts b/packages/core/src/tools/web-search.ts index ed2f341f..ed2f341f 100644 --- a/packages/server/src/tools/web-search.ts +++ b/packages/core/src/tools/web-search.ts diff --git a/packages/server/src/tools/write-file.test.ts b/packages/core/src/tools/write-file.test.ts index 3fd97c9e..3fd97c9e 100644 --- a/packages/server/src/tools/write-file.test.ts +++ b/packages/core/src/tools/write-file.test.ts diff --git a/packages/server/src/tools/write-file.ts b/packages/core/src/tools/write-file.ts index 2285c819..2285c819 100644 --- a/packages/server/src/tools/write-file.ts +++ b/packages/core/src/tools/write-file.ts diff --git a/packages/server/src/utils/LruCache.ts b/packages/core/src/utils/LruCache.ts index 076828c4..076828c4 100644 --- a/packages/server/src/utils/LruCache.ts +++ b/packages/core/src/utils/LruCache.ts diff --git a/packages/server/src/utils/editCorrector.test.ts b/packages/core/src/utils/editCorrector.test.ts index 7d6f5a53..7d6f5a53 100644 --- a/packages/server/src/utils/editCorrector.test.ts +++ b/packages/core/src/utils/editCorrector.test.ts diff --git a/packages/server/src/utils/editCorrector.ts b/packages/core/src/utils/editCorrector.ts index 78663954..78663954 100644 --- a/packages/server/src/utils/editCorrector.ts +++ b/packages/core/src/utils/editCorrector.ts diff --git a/packages/server/src/utils/errorReporting.test.ts b/packages/core/src/utils/errorReporting.test.ts index 1faba5f6..1faba5f6 100644 --- a/packages/server/src/utils/errorReporting.test.ts +++ b/packages/core/src/utils/errorReporting.test.ts diff --git a/packages/server/src/utils/errorReporting.ts b/packages/core/src/utils/errorReporting.ts index 41ce3468..41ce3468 100644 --- a/packages/server/src/utils/errorReporting.ts +++ b/packages/core/src/utils/errorReporting.ts diff --git a/packages/server/src/utils/errors.ts b/packages/core/src/utils/errors.ts index 32139c1a..32139c1a 100644 --- a/packages/server/src/utils/errors.ts +++ b/packages/core/src/utils/errors.ts diff --git a/packages/server/src/utils/fileUtils.test.ts b/packages/core/src/utils/fileUtils.test.ts index 4f4c7c1e..4f4c7c1e 100644 --- a/packages/server/src/utils/fileUtils.test.ts +++ b/packages/core/src/utils/fileUtils.test.ts diff --git a/packages/server/src/utils/fileUtils.ts b/packages/core/src/utils/fileUtils.ts index d726c053..d726c053 100644 --- a/packages/server/src/utils/fileUtils.ts +++ b/packages/core/src/utils/fileUtils.ts diff --git a/packages/server/src/utils/generateContentResponseUtilities.ts b/packages/core/src/utils/generateContentResponseUtilities.ts index a1d62124..a1d62124 100644 --- a/packages/server/src/utils/generateContentResponseUtilities.ts +++ b/packages/core/src/utils/generateContentResponseUtilities.ts diff --git a/packages/server/src/utils/getFolderStructure.test.ts b/packages/core/src/utils/getFolderStructure.test.ts index aecd35c5..aecd35c5 100644 --- a/packages/server/src/utils/getFolderStructure.test.ts +++ b/packages/core/src/utils/getFolderStructure.test.ts diff --git a/packages/server/src/utils/getFolderStructure.ts b/packages/core/src/utils/getFolderStructure.ts index 6d921811..6d921811 100644 --- a/packages/server/src/utils/getFolderStructure.ts +++ b/packages/core/src/utils/getFolderStructure.ts diff --git a/packages/server/src/utils/memoryDiscovery.test.ts b/packages/core/src/utils/memoryDiscovery.test.ts index 229f51e5..229f51e5 100644 --- a/packages/server/src/utils/memoryDiscovery.test.ts +++ b/packages/core/src/utils/memoryDiscovery.test.ts diff --git a/packages/server/src/utils/memoryDiscovery.ts b/packages/core/src/utils/memoryDiscovery.ts index 362134d8..362134d8 100644 --- a/packages/server/src/utils/memoryDiscovery.ts +++ b/packages/core/src/utils/memoryDiscovery.ts diff --git a/packages/server/src/utils/messageInspectors.ts b/packages/core/src/utils/messageInspectors.ts index b2c3cdce..b2c3cdce 100644 --- a/packages/server/src/utils/messageInspectors.ts +++ b/packages/core/src/utils/messageInspectors.ts diff --git a/packages/server/src/utils/nextSpeakerChecker.test.ts b/packages/core/src/utils/nextSpeakerChecker.test.ts index 872e00f6..872e00f6 100644 --- a/packages/server/src/utils/nextSpeakerChecker.test.ts +++ b/packages/core/src/utils/nextSpeakerChecker.test.ts diff --git a/packages/server/src/utils/nextSpeakerChecker.ts b/packages/core/src/utils/nextSpeakerChecker.ts index 66fa4395..66fa4395 100644 --- a/packages/server/src/utils/nextSpeakerChecker.ts +++ b/packages/core/src/utils/nextSpeakerChecker.ts diff --git a/packages/server/src/utils/paths.ts b/packages/core/src/utils/paths.ts index bbd479fd..bbd479fd 100644 --- a/packages/server/src/utils/paths.ts +++ b/packages/core/src/utils/paths.ts diff --git a/packages/server/src/utils/retry.test.ts b/packages/core/src/utils/retry.test.ts index ea344d60..ea344d60 100644 --- a/packages/server/src/utils/retry.test.ts +++ b/packages/core/src/utils/retry.test.ts diff --git a/packages/server/src/utils/retry.ts b/packages/core/src/utils/retry.ts index 1e7d5bcb..1e7d5bcb 100644 --- a/packages/server/src/utils/retry.ts +++ b/packages/core/src/utils/retry.ts diff --git a/packages/server/src/utils/schemaValidator.ts b/packages/core/src/utils/schemaValidator.ts index 34ed5843..34ed5843 100644 --- a/packages/server/src/utils/schemaValidator.ts +++ b/packages/core/src/utils/schemaValidator.ts diff --git a/packages/server/tsconfig.json b/packages/core/tsconfig.json index b788af47..b788af47 100644 --- a/packages/server/tsconfig.json +++ b/packages/core/tsconfig.json diff --git a/packages/server/vitest.config.ts b/packages/core/vitest.config.ts index 17defb41..17defb41 100644 --- a/packages/server/vitest.config.ts +++ b/packages/core/vitest.config.ts |
