mirror of
https://github.com/QwenLM/qwen-code.git
synced 2025-12-20 16:57:46 +00:00
refactor: rename gemini-code to gemini-cli (#822)
This commit is contained in:
@@ -8,11 +8,11 @@ import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
|
||||
import * as fs from 'fs';
|
||||
import * as path from 'path';
|
||||
import { tmpdir } from 'os';
|
||||
import { Config, ConfigParameters } from '@gemini-code/core';
|
||||
import { Config, ConfigParameters } from '@gemini-cli/core';
|
||||
|
||||
// Mock file discovery service and tool registry
|
||||
vi.mock('@gemini-code/core', async () => {
|
||||
const actual = await vi.importActual('@gemini-code/core');
|
||||
vi.mock('@gemini-cli/core', async () => {
|
||||
const actual = await vi.importActual('@gemini-cli/core');
|
||||
return {
|
||||
...actual,
|
||||
FileDiscoveryService: vi.fn().mockImplementation(() => ({
|
||||
|
||||
@@ -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/core';
|
||||
import * as ServerConfig from '@gemini-cli/core';
|
||||
|
||||
const MOCK_HOME_DIR = '/mock/home/user';
|
||||
|
||||
@@ -28,9 +28,9 @@ vi.mock('read-package-up', () => ({
|
||||
),
|
||||
}));
|
||||
|
||||
vi.mock('@gemini-code/core', async () => {
|
||||
vi.mock('@gemini-cli/core', async () => {
|
||||
const actualServer =
|
||||
await vi.importActual<typeof ServerConfig>('@gemini-code/core');
|
||||
await vi.importActual<typeof ServerConfig>('@gemini-cli/core');
|
||||
return {
|
||||
...actualServer,
|
||||
loadEnvironment: vi.fn(),
|
||||
|
||||
@@ -14,7 +14,7 @@ import {
|
||||
setGeminiMdFilename as setServerGeminiMdFilename,
|
||||
getCurrentGeminiMdFilename,
|
||||
ApprovalMode,
|
||||
} from '@gemini-code/core';
|
||||
} from '@gemini-cli/core';
|
||||
import { Settings } from './settings.js';
|
||||
import { getEffectiveModel } from '../utils/modelCheck.js';
|
||||
import { getCliVersion } from '../utils/version.js';
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
import * as fs from 'fs';
|
||||
import * as path from 'path';
|
||||
import { homedir } from 'os';
|
||||
import { MCPServerConfig, getErrorMessage } from '@gemini-code/core';
|
||||
import { MCPServerConfig, getErrorMessage } from '@gemini-cli/core';
|
||||
import stripJsonComments from 'strip-json-comments';
|
||||
import { DefaultLight } from '../ui/themes/default-light.js';
|
||||
import { DefaultDark } from '../ui/themes/default.js';
|
||||
|
||||
@@ -28,7 +28,7 @@ import {
|
||||
ShellTool,
|
||||
WebFetchTool,
|
||||
WebSearchTool,
|
||||
} from '@gemini-code/core';
|
||||
} from '@gemini-cli/core';
|
||||
|
||||
export async function main() {
|
||||
// warn about deprecated environment variables
|
||||
|
||||
@@ -7,14 +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-code/core';
|
||||
import { Config, GeminiClient, ToolRegistry } from '@gemini-cli/core';
|
||||
import { GenerateContentResponse, Part, FunctionCall } from '@google/genai';
|
||||
|
||||
// Mock dependencies
|
||||
vi.mock('@gemini-code/core', async () => {
|
||||
vi.mock('@gemini-cli/core', async () => {
|
||||
const actualCore =
|
||||
await vi.importActual<typeof import('@gemini-code/core')>(
|
||||
'@gemini-code/core',
|
||||
await vi.importActual<typeof import('@gemini-cli/core')>(
|
||||
'@gemini-cli/core',
|
||||
);
|
||||
return {
|
||||
...actualCore,
|
||||
@@ -108,7 +108,7 @@ describe('runNonInteractive', () => {
|
||||
};
|
||||
|
||||
const { executeToolCall: mockCoreExecuteToolCall } = await import(
|
||||
'@gemini-code/core'
|
||||
'@gemini-cli/core'
|
||||
);
|
||||
vi.mocked(mockCoreExecuteToolCall).mockResolvedValue({
|
||||
callId: 'fc1',
|
||||
@@ -160,7 +160,7 @@ describe('runNonInteractive', () => {
|
||||
};
|
||||
|
||||
const { executeToolCall: mockCoreExecuteToolCall } = await import(
|
||||
'@gemini-code/core'
|
||||
'@gemini-cli/core'
|
||||
);
|
||||
vi.mocked(mockCoreExecuteToolCall).mockResolvedValue({
|
||||
callId: 'fcError',
|
||||
|
||||
@@ -9,7 +9,7 @@ import {
|
||||
ToolCallRequestInfo,
|
||||
executeToolCall,
|
||||
ToolRegistry,
|
||||
} from '@gemini-code/core';
|
||||
} from '@gemini-cli/core';
|
||||
import {
|
||||
Content,
|
||||
Part,
|
||||
|
||||
@@ -13,7 +13,7 @@ import {
|
||||
ApprovalMode,
|
||||
ToolRegistry,
|
||||
AccessibilitySettings,
|
||||
} from '@gemini-code/core';
|
||||
} from '@gemini-cli/core';
|
||||
import { LoadedSettings, SettingsFile, Settings } from '../config/settings.js';
|
||||
import process from 'node:process';
|
||||
|
||||
@@ -65,9 +65,9 @@ interface MockServerConfig {
|
||||
getAccessibility: Mock<() => AccessibilitySettings>;
|
||||
}
|
||||
|
||||
// Mock @gemini-code/core and its Config class
|
||||
vi.mock('@gemini-code/core', async (importOriginal) => {
|
||||
const actualCore = await importOriginal<typeof import('@gemini-code/core')>();
|
||||
// Mock @gemini-cli/core and its Config class
|
||||
vi.mock('@gemini-cli/core', async (importOriginal) => {
|
||||
const actualCore = await importOriginal<typeof import('@gemini-cli/core')>();
|
||||
const ConfigClassMock = vi
|
||||
.fn()
|
||||
.mockImplementation((optionsPassedToConstructor) => {
|
||||
|
||||
@@ -45,7 +45,7 @@ import {
|
||||
type Config,
|
||||
getCurrentGeminiMdFilename,
|
||||
ApprovalMode,
|
||||
} from '@gemini-code/core';
|
||||
} from '@gemini-cli/core';
|
||||
import { useLogger } from './hooks/useLogger.js';
|
||||
import { StreamingContext } from './contexts/StreamingContext.js';
|
||||
import { useGitBranchName } from './hooks/useGitBranchName.js';
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
import React from 'react';
|
||||
import { Box, Text } from 'ink';
|
||||
import { Colors } from '../colors.js';
|
||||
import { ApprovalMode } from '@gemini-code/core';
|
||||
import { ApprovalMode } from '@gemini-cli/core';
|
||||
|
||||
interface AutoAcceptIndicatorProps {
|
||||
approvalMode: ApprovalMode;
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
import React from 'react';
|
||||
import { Text } from 'ink';
|
||||
import { Colors } from '../colors.js';
|
||||
import { type MCPServerConfig } from '@gemini-code/core';
|
||||
import { type MCPServerConfig } from '@gemini-cli/core';
|
||||
|
||||
interface ContextSummaryDisplayProps {
|
||||
geminiMdFileCount: number;
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
import React from 'react';
|
||||
import { Box, Text } from 'ink';
|
||||
import { Colors } from '../colors.js';
|
||||
import { shortenPath, tildeifyPath } from '@gemini-code/core';
|
||||
import { shortenPath, tildeifyPath } from '@gemini-cli/core';
|
||||
import { ConsoleSummaryDisplay } from './ConsoleSummaryDisplay.js';
|
||||
import process from 'node:process';
|
||||
import { MemoryUsageDisplay } from './MemoryUsageDisplay.js';
|
||||
|
||||
@@ -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/core';
|
||||
import { Config } from '@gemini-cli/core';
|
||||
|
||||
export interface InputPromptProps {
|
||||
onSubmit: (value: string) => void;
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
import React from 'react';
|
||||
import { Box, Text } from 'ink';
|
||||
import { Colors } from '../colors.js';
|
||||
import { type Config } from '@gemini-code/core';
|
||||
import { type Config } from '@gemini-cli/core';
|
||||
|
||||
interface TipsProps {
|
||||
config: Config;
|
||||
|
||||
@@ -13,7 +13,7 @@ import {
|
||||
ToolConfirmationOutcome,
|
||||
ToolExecuteConfirmationDetails,
|
||||
ToolMcpConfirmationDetails,
|
||||
} from '@gemini-code/core';
|
||||
} from '@gemini-cli/core';
|
||||
import {
|
||||
RadioButtonSelect,
|
||||
RadioSelectItem,
|
||||
|
||||
@@ -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-code/core';
|
||||
import { Config, FileDiscoveryService } from '@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-code/core', async () => {
|
||||
const actual = await vi.importActual('@gemini-code/core');
|
||||
vi.mock('@gemini-cli/core', async () => {
|
||||
const actual = await vi.importActual('@gemini-cli/core');
|
||||
return {
|
||||
...actual,
|
||||
FileDiscoveryService: vi.fn(),
|
||||
|
||||
@@ -12,7 +12,7 @@ import {
|
||||
getErrorMessage,
|
||||
isNodeError,
|
||||
unescapePath,
|
||||
} from '@gemini-code/core';
|
||||
} from '@gemini-cli/core';
|
||||
import {
|
||||
HistoryItem,
|
||||
IndividualToolCallDisplay,
|
||||
|
||||
@@ -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/core';
|
||||
import { type Config } from '@gemini-cli/core';
|
||||
import { type PartListUnion } from '@google/genai';
|
||||
import { existsSync, readFileSync, unlinkSync } from 'fs';
|
||||
import type * as FsMod from 'fs';
|
||||
|
||||
@@ -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/core';
|
||||
import { Config } from '@gemini-cli/core';
|
||||
import { type PartListUnion } from '@google/genai';
|
||||
import { UseHistoryManagerReturn } from './useHistoryManager.js';
|
||||
import crypto from 'crypto';
|
||||
|
||||
@@ -60,7 +60,7 @@ import {
|
||||
type Config,
|
||||
MCPServerStatus,
|
||||
getMCPServerStatus,
|
||||
} from '@gemini-code/core';
|
||||
} from '@gemini-cli/core';
|
||||
|
||||
import * as ShowMemoryCommandModule from './useShowMemoryCommand.js';
|
||||
import { GIT_COMMIT_INFO } from '../../generated/git-commit.js';
|
||||
@@ -451,7 +451,7 @@ Add any other context about the problem here.
|
||||
describe('/mcp command', () => {
|
||||
beforeEach(() => {
|
||||
// Mock the core module with getMCPServerStatus
|
||||
vi.mock('@gemini-code/core', async (importOriginal) => {
|
||||
vi.mock('@gemini-cli/core', async (importOriginal) => {
|
||||
const actual = await importOriginal();
|
||||
return {
|
||||
...actual,
|
||||
|
||||
@@ -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, MCPServerStatus, getMCPServerStatus } from '@gemini-code/core';
|
||||
import { Config, MCPServerStatus, getMCPServerStatus } from '@gemini-cli/core';
|
||||
import { Message, MessageType, HistoryItemWithoutId } from '../types.js';
|
||||
import { createShowMemoryAction } from './useShowMemoryCommand.js';
|
||||
import { GIT_COMMIT_INFO } from '../../generated/git-commit.js';
|
||||
@@ -114,7 +114,7 @@ export const useSlashCommandProcessor = (
|
||||
{
|
||||
name: 'help',
|
||||
altName: '?',
|
||||
description: 'for help on gemini-code',
|
||||
description: 'for help on gemini-cli',
|
||||
action: (_mainCommand, _subCommand, _args) => {
|
||||
onDebugMessage('Opening help.');
|
||||
setShowHelp(true);
|
||||
|
||||
@@ -20,14 +20,14 @@ import {
|
||||
Config,
|
||||
Config as ActualConfigType,
|
||||
ApprovalMode,
|
||||
} from '@gemini-code/core';
|
||||
} from '@gemini-cli/core';
|
||||
import { useInput, type Key as InkKey } from 'ink';
|
||||
|
||||
vi.mock('ink');
|
||||
|
||||
vi.mock('@gemini-code/core', async () => {
|
||||
vi.mock('@gemini-cli/core', async () => {
|
||||
const actualServerModule = (await vi.importActual(
|
||||
'@gemini-code/core',
|
||||
'@gemini-cli/core',
|
||||
)) as Record<string, unknown>;
|
||||
return {
|
||||
...actualServerModule,
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
import { useState, useEffect } from 'react';
|
||||
import { useInput } from 'ink';
|
||||
import { ApprovalMode, type Config } from '@gemini-code/core';
|
||||
import { ApprovalMode, type Config } from '@gemini-cli/core';
|
||||
|
||||
export interface UseAutoAcceptIndicatorArgs {
|
||||
config: Config;
|
||||
|
||||
@@ -9,12 +9,12 @@ 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-code/core';
|
||||
import { FileDiscoveryService } from '@gemini-cli/core';
|
||||
|
||||
// Mock dependencies
|
||||
vi.mock('fs/promises');
|
||||
vi.mock('@gemini-code/core', async () => {
|
||||
const actual = await vi.importActual('@gemini-code/core');
|
||||
vi.mock('@gemini-cli/core', async () => {
|
||||
const actual = await vi.importActual('@gemini-cli/core');
|
||||
return {
|
||||
...actual,
|
||||
FileDiscoveryService: vi.fn(),
|
||||
|
||||
@@ -13,7 +13,7 @@ import {
|
||||
unescapePath,
|
||||
getErrorMessage,
|
||||
Config,
|
||||
} from '@gemini-code/core';
|
||||
} from '@gemini-cli/core';
|
||||
import {
|
||||
MAX_SUGGESTIONS_TO_SHOW,
|
||||
Suggestion,
|
||||
|
||||
@@ -15,7 +15,7 @@ import {
|
||||
TrackedExecutingToolCall,
|
||||
TrackedCancelledToolCall,
|
||||
} from './useReactToolScheduler.js';
|
||||
import { Config } from '@gemini-code/core';
|
||||
import { Config } from '@gemini-cli/core';
|
||||
import { Part, PartListUnion } from '@google/genai';
|
||||
import { UseHistoryManagerReturn } from './useHistoryManager.js';
|
||||
|
||||
@@ -33,7 +33,7 @@ const MockedGeminiClientClass = vi.hoisted(() =>
|
||||
}),
|
||||
);
|
||||
|
||||
vi.mock('@gemini-code/core', async (importOriginal) => {
|
||||
vi.mock('@gemini-cli/core', async (importOriginal) => {
|
||||
const actualCoreModule = (await importOriginal()) as any;
|
||||
return {
|
||||
...(actualCoreModule || {}),
|
||||
|
||||
@@ -18,7 +18,7 @@ import {
|
||||
MessageSenderType,
|
||||
ToolCallRequestInfo,
|
||||
logUserPrompt,
|
||||
} from '@gemini-code/core';
|
||||
} from '@gemini-cli/core';
|
||||
import { type PartListUnion } from '@google/genai';
|
||||
import {
|
||||
StreamingState,
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
*/
|
||||
|
||||
import { useState, useEffect } from 'react';
|
||||
import { Logger } from '@gemini-code/core';
|
||||
import { Logger } from '@gemini-cli/core';
|
||||
|
||||
/**
|
||||
* Hook to manage the logger instance.
|
||||
|
||||
@@ -21,7 +21,7 @@ import {
|
||||
ToolCall,
|
||||
Status as CoreStatus,
|
||||
logToolCall,
|
||||
} from '@gemini-code/core';
|
||||
} from '@gemini-cli/core';
|
||||
import { useCallback, useState, useMemo } from 'react';
|
||||
import {
|
||||
HistoryItemToolGroup,
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
*/
|
||||
|
||||
import { Message, MessageType } from '../types.js';
|
||||
import { Config } from '@gemini-code/core';
|
||||
import { Config } from '@gemini-cli/core';
|
||||
|
||||
export function createShowMemoryAction(
|
||||
config: Config | null,
|
||||
|
||||
@@ -24,7 +24,7 @@ import {
|
||||
ToolCall, // Import from core
|
||||
Status as ToolCallStatusType,
|
||||
ApprovalMode, // Import from core
|
||||
} from '@gemini-code/core';
|
||||
} from '@gemini-cli/core';
|
||||
import {
|
||||
HistoryItemWithoutId,
|
||||
ToolCallStatus,
|
||||
@@ -32,8 +32,8 @@ import {
|
||||
} from '../types.js';
|
||||
|
||||
// Mocks
|
||||
vi.mock('@gemini-code/core', async () => {
|
||||
const actual = await vi.importActual('@gemini-code/core');
|
||||
vi.mock('@gemini-cli/core', async () => {
|
||||
const actual = await vi.importActual('@gemini-cli/core');
|
||||
return {
|
||||
...actual,
|
||||
ToolRegistry: vi.fn(),
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
import {
|
||||
ToolCallConfirmationDetails,
|
||||
ToolResultDisplay,
|
||||
} from '@gemini-code/core';
|
||||
} from '@gemini-cli/core';
|
||||
|
||||
// Only defining the state enum needed by the UI
|
||||
export enum StreamingState {
|
||||
|
||||
@@ -7,9 +7,9 @@
|
||||
import fs from 'fs/promises';
|
||||
import os from 'os';
|
||||
import { join as pathJoin } from 'node:path';
|
||||
import { getErrorMessage } from '@gemini-code/core';
|
||||
import { getErrorMessage } from '@gemini-cli/core';
|
||||
|
||||
const warningsFilePath = pathJoin(os.tmpdir(), 'gemini-code-cli-warnings.txt');
|
||||
const warningsFilePath = pathJoin(os.tmpdir(), 'gemini-cli-warnings.txt');
|
||||
|
||||
export async function getStartupWarnings(): Promise<string[]> {
|
||||
try {
|
||||
|
||||
Reference in New Issue
Block a user