mirror of
https://github.com/QwenLM/qwen-code.git
synced 2025-12-20 16:57:46 +00:00
Rename server->core (#638)
This commit is contained in:
committed by
GitHub
parent
c81148a0cc
commit
21fba832d1
@@ -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(),
|
||||
|
||||
@@ -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';
|
||||
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -13,7 +13,7 @@ import {
|
||||
ToolConfirmationOutcome,
|
||||
ToolExecuteConfirmationDetails,
|
||||
ToolMcpConfirmationDetails,
|
||||
} from '@gemini-code/server';
|
||||
} from '@gemini-code/core';
|
||||
import {
|
||||
RadioButtonSelect,
|
||||
RadioSelectItem,
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -12,7 +12,7 @@ import {
|
||||
getErrorMessage,
|
||||
isNodeError,
|
||||
unescapePath,
|
||||
} from '@gemini-code/server';
|
||||
} from '@gemini-code/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/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';
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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>;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -12,7 +12,7 @@ import {
|
||||
escapePath,
|
||||
unescapePath,
|
||||
getErrorMessage,
|
||||
} from '@gemini-code/server';
|
||||
} from '@gemini-code/core';
|
||||
import {
|
||||
MAX_SUGGESTIONS_TO_SHOW,
|
||||
Suggestion,
|
||||
|
||||
@@ -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 = [];
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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');
|
||||
|
||||
|
||||
Reference in New Issue
Block a user