From daad04613e2c84cfbfcc6d1783e4a368d6098ca9 Mon Sep 17 00:00:00 2001 From: Fan Date: Wed, 23 Jul 2025 00:27:14 +0800 Subject: [PATCH] pre-release: fix ci (#1) * fix aoneci * remove codeql * sync version to 0.0.1-alpha.7 * renaming org to qwen-code --- .github/workflows/ci.yml | 19 -------- README.md | 2 +- package-lock.json | 46 +++++++++---------- package.json | 6 +-- packages/cli/package.json | 8 ++-- packages/cli/src/config/auth.test.ts | 2 +- packages/cli/src/config/auth.ts | 2 +- .../cli/src/config/config.integration.test.ts | 6 +-- packages/cli/src/config/config.test.ts | 8 ++-- packages/cli/src/config/config.ts | 2 +- packages/cli/src/config/extension.ts | 2 +- packages/cli/src/config/sandboxConfig.ts | 2 +- packages/cli/src/config/settings.ts | 2 +- packages/cli/src/gemini.tsx | 2 +- packages/cli/src/nonInteractiveCli.test.ts | 16 +++---- packages/cli/src/nonInteractiveCli.ts | 2 +- packages/cli/src/ui/App.test.tsx | 8 ++-- packages/cli/src/ui/App.tsx | 4 +- .../cli/src/ui/commands/memoryCommand.test.ts | 7 +-- packages/cli/src/ui/commands/memoryCommand.ts | 2 +- packages/cli/src/ui/commands/types.ts | 2 +- .../cli/src/ui/components/AuthDialog.test.tsx | 2 +- packages/cli/src/ui/components/AuthDialog.tsx | 2 +- .../src/ui/components/AutoAcceptIndicator.tsx | 2 +- .../ui/components/ContextSummaryDisplay.tsx | 2 +- .../ui/components/EditorSettingsDialog.tsx | 2 +- packages/cli/src/ui/components/Footer.tsx | 6 ++- .../src/ui/components/HistoryItemDisplay.tsx | 2 +- .../src/ui/components/InputPrompt.test.tsx | 2 +- .../cli/src/ui/components/InputPrompt.tsx | 2 +- .../src/ui/components/LoadingIndicator.tsx | 2 +- packages/cli/src/ui/components/Tips.tsx | 2 +- .../src/ui/components/ToolStatsDisplay.tsx | 2 +- .../messages/ToolConfirmationMessage.test.tsx | 2 +- .../messages/ToolConfirmationMessage.tsx | 2 +- .../components/messages/ToolGroupMessage.tsx | 2 +- .../src/ui/components/shared/text-buffer.ts | 2 +- .../src/ui/contexts/SessionContext.test.tsx | 2 +- .../cli/src/ui/contexts/SessionContext.tsx | 2 +- .../src/ui/editors/editorSettingsManager.ts | 2 +- .../src/ui/hooks/atCommandProcessor.test.ts | 6 +-- .../cli/src/ui/hooks/atCommandProcessor.ts | 2 +- .../ui/hooks/shellCommandProcessor.test.ts | 4 +- .../cli/src/ui/hooks/shellCommandProcessor.ts | 2 +- .../ui/hooks/slashCommandProcessor.test.ts | 7 +-- .../cli/src/ui/hooks/slashCommandProcessor.ts | 2 +- packages/cli/src/ui/hooks/useAuthCommand.ts | 2 +- .../ui/hooks/useAutoAcceptIndicator.test.ts | 6 +-- .../src/ui/hooks/useAutoAcceptIndicator.ts | 2 +- .../hooks/useCompletion.integration.test.ts | 6 +-- packages/cli/src/ui/hooks/useCompletion.ts | 2 +- .../src/ui/hooks/useEditorSettings.test.ts | 6 +-- .../cli/src/ui/hooks/useEditorSettings.ts | 2 +- .../cli/src/ui/hooks/useGeminiStream.test.tsx | 4 +- packages/cli/src/ui/hooks/useGeminiStream.ts | 2 +- packages/cli/src/ui/hooks/useLogger.ts | 2 +- .../cli/src/ui/hooks/usePrivacySettings.ts | 6 ++- .../cli/src/ui/hooks/useReactToolScheduler.ts | 2 +- packages/cli/src/ui/hooks/useShellHistory.ts | 2 +- .../cli/src/ui/hooks/useShowMemoryCommand.ts | 2 +- .../cli/src/ui/hooks/useToolScheduler.test.ts | 6 +-- .../src/ui/privacy/CloudFreePrivacyNotice.tsx | 2 +- packages/cli/src/ui/privacy/PrivacyNotice.tsx | 2 +- packages/cli/src/ui/types.ts | 2 +- .../cli/src/ui/utils/errorParsing.test.ts | 2 +- packages/cli/src/ui/utils/errorParsing.ts | 2 +- packages/cli/src/utils/cleanup.ts | 2 +- packages/cli/src/utils/sandbox.ts | 2 +- .../cli/src/utils/startupWarnings.test.ts | 4 +- packages/cli/src/utils/startupWarnings.ts | 2 +- packages/core/package-lock.json | 4 +- packages/core/package.json | 4 +- .../vscode-ide-companion/package-lock.json | 4 +- packages/vscode-ide-companion/package.json | 4 +- 74 files changed, 147 insertions(+), 156 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2ef43ed..d7c59a4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -144,22 +144,3 @@ jobs: core_full_text_summary_file: coverage_artifact/core/coverage/full-text-summary.txt node_version: ${{ matrix.node-version }} github_token: ${{ secrets.GITHUB_TOKEN }} - - codeql: - name: CodeQL - runs-on: ubuntu-latest - permissions: - actions: read - contents: read - security-events: write - steps: - - name: Checkout - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 - - - name: Initialize CodeQL - uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3 - with: - languages: javascript - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3 diff --git a/README.md b/README.md index 0d41db7..4c4497c 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Qwen Code is a command-line AI workflow tool adapted from [**Gemini CLI**](https Ensure you have [Node.js version 20](https://nodejs.org/en/download) or higher installed. -```bash +```bash curl -qL https://www.npmjs.com/install.sh | sh ``` diff --git a/package-lock.json b/package-lock.json index 7079f56..915367b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { - "name": "@qwen/qwen-code", - "version": "0.0.1-dev1", + "name": "@qwen-code/qwen-code", + "version": "0.0.1-alpha.7", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "@qwen/qwen-code", - "version": "0.0.1-dev1", + "name": "@qwen-code/qwen-code", + "version": "0.0.1-alpha.7", "workspaces": [ "packages/*" ], @@ -81,18 +81,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/@qwen/qwen-code": { - "resolved": "packages/cli", - "link": true - }, - "node_modules/@qwen/qwen-code-core": { - "resolved": "packages/core", - "link": true - }, - "node_modules/@qwen/qwen-code-vscode-ide-companion": { - "resolved": "packages/vscode-ide-companion", - "link": true - }, "node_modules/@ampproject/remapping": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", @@ -1970,6 +1958,18 @@ "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==", "license": "BSD-3-Clause" }, + "node_modules/@qwen-code/qwen-code": { + "resolved": "packages/cli", + "link": true + }, + "node_modules/@qwen-code/qwen-code-core": { + "resolved": "packages/core", + "link": true + }, + "node_modules/@qwen-code/qwen-code-vscode-ide-companion": { + "resolved": "packages/vscode-ide-companion", + "link": true + }, "node_modules/@rollup/rollup-android-arm-eabi": { "version": "4.44.0", "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.44.0.tgz", @@ -11935,10 +11935,10 @@ } }, "packages/cli": { - "name": "@qwen/qwen-code", - "version": "0.0.1-dev1", + "name": "@qwen-code/qwen-code", + "version": "0.0.1-alpha.7", "dependencies": { - "@qwen/qwen-code-core": "file:../core", + "@qwen-code/qwen-code-core": "file:../core", "@types/update-notifier": "^6.0.8", "command-exists": "^1.2.9", "diff": "^7.0.0", @@ -12113,8 +12113,8 @@ } }, "packages/core": { - "name": "@qwen/qwen-code-core", - "version": "0.0.1-dev1", + "name": "@qwen-code/qwen-code-core", + "version": "0.0.1-alpha.7", "dependencies": { "@google/genai": "1.8.0", "@modelcontextprotocol/sdk": "^1.11.0", @@ -12186,8 +12186,8 @@ "license": "MIT" }, "packages/vscode-ide-companion": { - "name": "@qwen/qwen-code-vscode-ide-companion", - "version": "0.0.1-dev1", + "name": "@qwen-code/qwen-code-vscode-ide-companion", + "version": "0.0.1-alpha.7", "dependencies": { "@modelcontextprotocol/sdk": "^1.15.1", "cors": "^2.8.5", diff --git a/package.json b/package.json index 93602c6..7fae85b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "@qwen/qwen-code", - "version": "0.0.1-dev1", + "name": "@qwen-code/qwen-code", + "version": "0.0.1-alpha.7", "engines": { "node": ">=20" }, @@ -14,7 +14,7 @@ "url": "git+http://gitlab.alibaba-inc.com/Qwen-Coder/qwen-code.git" }, "config": { - "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.0.1-dev1" + "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.0.1-alpha.7" }, "scripts": { "start": "node scripts/start.js", diff --git a/packages/cli/package.json b/packages/cli/package.json index 48a1861..ae5d456 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { - "name": "@qwen/qwen-code", - "version": "0.0.1-dev1", + "name": "@qwen-code/qwen-code", + "version": "0.0.1-alpha.7", "description": "Gemini CLI", "repository": { "type": "git", @@ -25,10 +25,10 @@ "dist" ], "config": { - "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.0.1-dev1" + "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.0.1-alpha.7" }, "dependencies": { - "@qwen/qwen-code-core": "file:../core", + "@qwen-code/qwen-code-core": "file:../core", "@types/update-notifier": "^6.0.8", "command-exists": "^1.2.9", "diff": "^7.0.0", diff --git a/packages/cli/src/config/auth.test.ts b/packages/cli/src/config/auth.test.ts index e4991a0..e0380c2 100644 --- a/packages/cli/src/config/auth.test.ts +++ b/packages/cli/src/config/auth.test.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { AuthType } from '@qwen/qwen-code-core'; +import { AuthType } from '@qwen-code/qwen-code-core'; import { vi } from 'vitest'; import { validateAuthMethod } from './auth.js'; diff --git a/packages/cli/src/config/auth.ts b/packages/cli/src/config/auth.ts index b235231..45b44df 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 '@qwen/qwen-code-core'; +import { AuthType } from '@qwen-code/qwen-code-core'; import { loadEnvironment } from './settings.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 c2ddeb4..8058a36 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 '@qwen/qwen-code-core'; +} from '@qwen-code/qwen-code-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('@qwen/qwen-code-core', async () => { - const actual = await vi.importActual('@qwen/qwen-code-core'); +vi.mock('@qwen-code/qwen-code-core', async () => { + const actual = await vi.importActual('@qwen-code/qwen-code-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 4014b6a..e322c3b 100644 --- a/packages/cli/src/config/config.test.ts +++ b/packages/cli/src/config/config.test.ts @@ -9,12 +9,12 @@ import * as os from 'os'; import { loadCliConfig, parseArguments } from './config.js'; import { Settings } from './settings.js'; import { Extension } from './extension.js'; -import * as ServerConfig from '@qwen/qwen-code-core'; +import * as ServerConfig from '@qwen-code/qwen-code-core'; import { TelemetryTarget, ConfigParameters, DEFAULT_TELEMETRY_TARGET, -} from '@qwen/qwen-code-core'; +} from '@qwen-code/qwen-code-core'; vi.mock('os', async (importOriginal) => { const actualOs = await importOriginal(); @@ -34,9 +34,9 @@ vi.mock('read-package-up', () => ({ ), })); -vi.mock('@qwen/qwen-code-core', async () => { +vi.mock('@qwen-code/qwen-code-core', async () => { const actualServer = await vi.importActual( - '@qwen/qwen-code-core', + '@qwen-code/qwen-code-core', ); return { ...actualServer, diff --git a/packages/cli/src/config/config.ts b/packages/cli/src/config/config.ts index b96944b..12e6868 100644 --- a/packages/cli/src/config/config.ts +++ b/packages/cli/src/config/config.ts @@ -18,7 +18,7 @@ import { FileDiscoveryService, TelemetryTarget, MCPServerConfig, -} from '@qwen/qwen-code-core'; +} from '@qwen-code/qwen-code-core'; import { Settings } from './settings.js'; import { Extension, filterActiveExtensions } from './extension.js'; diff --git a/packages/cli/src/config/extension.ts b/packages/cli/src/config/extension.ts index b6c3cb6..75fc4ed 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 '@qwen/qwen-code-core'; +import { MCPServerConfig } from '@qwen-code/qwen-code-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 3d73bdb..59193ab 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 '@qwen/qwen-code-core'; +import { SandboxConfig } from '@qwen-code/qwen-code-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 df86eae..8c5f22b 100644 --- a/packages/cli/src/config/settings.ts +++ b/packages/cli/src/config/settings.ts @@ -15,7 +15,7 @@ import { BugCommandSettings, TelemetrySettings, AuthType, -} from '@qwen/qwen-code-core'; +} from '@qwen-code/qwen-code-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 9dcd48d..fe016d9 100644 --- a/packages/cli/src/gemini.tsx +++ b/packages/cli/src/gemini.tsx @@ -37,7 +37,7 @@ import { logUserPrompt, AuthType, getOauthClient, -} from '@qwen/qwen-code-core'; +} from '@qwen-code/qwen-code-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 b22fea1..9a0d4eb 100644 --- a/packages/cli/src/nonInteractiveCli.test.ts +++ b/packages/cli/src/nonInteractiveCli.test.ts @@ -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 '@qwen/qwen-code-core'; +import { Config, GeminiClient, ToolRegistry } from '@qwen-code/qwen-code-core'; import { GenerateContentResponse, Part, FunctionCall } from '@google/genai'; // Mock dependencies -vi.mock('@qwen/qwen-code-core', async () => { +vi.mock('@qwen-code/qwen-code-core', async () => { const actualCore = await vi.importActual< - typeof import('@qwen/qwen-code-core') - >('@qwen/qwen-code-core'); + typeof import('@qwen-code/qwen-code-core') + >('@qwen-code/qwen-code-core'); return { ...actualCore, GeminiClient: vi.fn(), @@ -114,7 +114,7 @@ describe('runNonInteractive', () => { }; const { executeToolCall: mockCoreExecuteToolCall } = await import( - '@qwen/qwen-code-core' + '@qwen-code/qwen-code-core' ); vi.mocked(mockCoreExecuteToolCall).mockResolvedValue({ callId: 'fc1', @@ -168,7 +168,7 @@ describe('runNonInteractive', () => { }; const { executeToolCall: mockCoreExecuteToolCall } = await import( - '@qwen/qwen-code-core' + '@qwen-code/qwen-code-core' ); vi.mocked(mockCoreExecuteToolCall).mockResolvedValue({ callId: 'fcError', @@ -241,7 +241,7 @@ describe('runNonInteractive', () => { }; const { executeToolCall: mockCoreExecuteToolCall } = await import( - '@qwen/qwen-code-core' + '@qwen-code/qwen-code-core' ); vi.mocked(mockCoreExecuteToolCall).mockResolvedValue({ callId: 'fcNotFound', @@ -314,7 +314,7 @@ describe('runNonInteractive', () => { vi.mocked(mockConfig.getMaxSessionTurns).mockReturnValue(1); const { executeToolCall: mockCoreExecuteToolCall } = await import( - '@qwen/qwen-code-core' + '@qwen-code/qwen-code-core' ); vi.mocked(mockCoreExecuteToolCall).mockResolvedValue({ callId: 'fcLoop', diff --git a/packages/cli/src/nonInteractiveCli.ts b/packages/cli/src/nonInteractiveCli.ts index c062874..f2421ba 100644 --- a/packages/cli/src/nonInteractiveCli.ts +++ b/packages/cli/src/nonInteractiveCli.ts @@ -12,7 +12,7 @@ import { shutdownTelemetry, isTelemetrySdkInitialized, ToolResultDisplay, -} from '@qwen/qwen-code-core'; +} from '@qwen-code/qwen-code-core'; import { Content, Part, diff --git a/packages/cli/src/ui/App.test.tsx b/packages/cli/src/ui/App.test.tsx index 6336f7f..00a932f 100644 --- a/packages/cli/src/ui/App.test.tsx +++ b/packages/cli/src/ui/App.test.tsx @@ -15,7 +15,7 @@ import { AccessibilitySettings, SandboxConfig, GeminiClient, -} from '@qwen/qwen-code-core'; +} from '@qwen-code/qwen-code-core'; import { LoadedSettings, SettingsFile, Settings } from '../config/settings.js'; import process from 'node:process'; import { useGeminiStream } from './hooks/useGeminiStream.js'; @@ -74,10 +74,10 @@ interface MockServerConfig { getUserTier: Mock<() => Promise>; } -// Mock @qwen/qwen-code-core and its Config class -vi.mock('@qwen/qwen-code-core', async (importOriginal) => { +// Mock @qwen-code/qwen-code-core and its Config class +vi.mock('@qwen-code/qwen-code-core', async (importOriginal) => { const actualCore = - await importOriginal(); + await importOriginal(); const ConfigClassMock = vi .fn() .mockImplementation((optionsPassedToConstructor) => { diff --git a/packages/cli/src/ui/App.tsx b/packages/cli/src/ui/App.tsx index ac3eb74..090e1c1 100644 --- a/packages/cli/src/ui/App.tsx +++ b/packages/cli/src/ui/App.tsx @@ -57,7 +57,7 @@ import { EditorType, FlashFallbackEvent, logFlashFallback, -} from '@qwen/qwen-code-core'; +} from '@qwen-code/qwen-code-core'; import { validateAuthMethod } from '../config/auth.js'; import { useLogger } from './hooks/useLogger.js'; import { StreamingContext } from './contexts/StreamingContext.js'; @@ -74,7 +74,7 @@ import { isProQuotaExceededError, isGenericQuotaExceededError, UserTierId, -} from '@qwen/qwen-code-core'; +} from '@qwen-code/qwen-code-core'; import { checkForUpdates } from './utils/updateCheck.js'; import ansiEscapes from 'ansi-escapes'; import { OverflowProvider } from './contexts/OverflowContext.js'; diff --git a/packages/cli/src/ui/commands/memoryCommand.test.ts b/packages/cli/src/ui/commands/memoryCommand.test.ts index 4d99fa0..9aa2e05 100644 --- a/packages/cli/src/ui/commands/memoryCommand.test.ts +++ b/packages/cli/src/ui/commands/memoryCommand.test.ts @@ -9,10 +9,11 @@ import { memoryCommand } from './memoryCommand.js'; import { type CommandContext, SlashCommand } from './types.js'; import { createMockCommandContext } from '../../test-utils/mockCommandContext.js'; import { MessageType } from '../types.js'; -import { getErrorMessage } from '@qwen/qwen-code-core'; +import { getErrorMessage } from '@qwen-code/qwen-code-core'; -vi.mock('@qwen/qwen-code-core', async (importOriginal) => { - const original = await importOriginal(); +vi.mock('@qwen-code/qwen-code-core', async (importOriginal) => { + const original = + await importOriginal(); return { ...original, getErrorMessage: vi.fn((error: unknown) => { diff --git a/packages/cli/src/ui/commands/memoryCommand.ts b/packages/cli/src/ui/commands/memoryCommand.ts index d697404..3abd957 100644 --- a/packages/cli/src/ui/commands/memoryCommand.ts +++ b/packages/cli/src/ui/commands/memoryCommand.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { getErrorMessage } from '@qwen/qwen-code-core'; +import { getErrorMessage } from '@qwen-code/qwen-code-core'; import { MessageType } from '../types.js'; import { SlashCommand, SlashCommandActionReturn } from './types.js'; diff --git a/packages/cli/src/ui/commands/types.ts b/packages/cli/src/ui/commands/types.ts index 3a31738..e293bf6 100644 --- a/packages/cli/src/ui/commands/types.ts +++ b/packages/cli/src/ui/commands/types.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Config, GitService, Logger } from '@qwen/qwen-code-core'; +import { Config, GitService, Logger } from '@qwen-code/qwen-code-core'; import { LoadedSettings } from '../../config/settings.js'; import { UseHistoryManagerReturn } from '../hooks/useHistoryManager.js'; import { SessionStatsState } from '../contexts/SessionContext.js'; diff --git a/packages/cli/src/ui/components/AuthDialog.test.tsx b/packages/cli/src/ui/components/AuthDialog.test.tsx index 20d6465..9815fb3 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, beforeEach, afterEach } from 'vitest'; import { AuthDialog } from './AuthDialog.js'; import { LoadedSettings, SettingScope } from '../../config/settings.js'; -import { AuthType } from '@qwen/qwen-code-core'; +import { AuthType } from '@qwen-code/qwen-code-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 39bb72b..1a7c73a 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 '@qwen/qwen-code-core'; +import { AuthType } from '@qwen-code/qwen-code-core'; import { validateAuthMethod, setOpenAIApiKey, diff --git a/packages/cli/src/ui/components/AutoAcceptIndicator.tsx b/packages/cli/src/ui/components/AutoAcceptIndicator.tsx index a4556fa..2cfe18c 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 '@qwen/qwen-code-core'; +import { ApprovalMode } from '@qwen-code/qwen-code-core'; interface AutoAcceptIndicatorProps { approvalMode: ApprovalMode; diff --git a/packages/cli/src/ui/components/ContextSummaryDisplay.tsx b/packages/cli/src/ui/components/ContextSummaryDisplay.tsx index 36da554..a31d39e 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 '@qwen/qwen-code-core'; +import { type MCPServerConfig } from '@qwen-code/qwen-code-core'; interface ContextSummaryDisplayProps { geminiMdFileCount: number; diff --git a/packages/cli/src/ui/components/EditorSettingsDialog.tsx b/packages/cli/src/ui/components/EditorSettingsDialog.tsx index 179516a..3f32f40 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 '@qwen/qwen-code-core'; +import { EditorType, isEditorAvailable } from '@qwen-code/qwen-code-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 0a9e741..cdcc687 100644 --- a/packages/cli/src/ui/components/Footer.tsx +++ b/packages/cli/src/ui/components/Footer.tsx @@ -7,7 +7,11 @@ import React from 'react'; import { Box, Text } from 'ink'; import { Colors } from '../colors.js'; -import { shortenPath, tildeifyPath, tokenLimit } from '@qwen/qwen-code-core'; +import { + shortenPath, + tildeifyPath, + tokenLimit, +} from '@qwen-code/qwen-code-core'; import { ConsoleSummaryDisplay } from './ConsoleSummaryDisplay.js'; import process from 'node:process'; import Gradient from 'ink-gradient'; diff --git a/packages/cli/src/ui/components/HistoryItemDisplay.tsx b/packages/cli/src/ui/components/HistoryItemDisplay.tsx index 295a85d..0018233 100644 --- a/packages/cli/src/ui/components/HistoryItemDisplay.tsx +++ b/packages/cli/src/ui/components/HistoryItemDisplay.tsx @@ -20,7 +20,7 @@ import { StatsDisplay } from './StatsDisplay.js'; import { ModelStatsDisplay } from './ModelStatsDisplay.js'; import { ToolStatsDisplay } from './ToolStatsDisplay.js'; import { SessionSummaryDisplay } from './SessionSummaryDisplay.js'; -import { Config } from '@qwen/qwen-code-core'; +import { Config } from '@qwen-code/qwen-code-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 814f2cd..3bd0ef6 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 '@qwen/qwen-code-core'; +import { Config } from '@qwen-code/qwen-code-core'; import { CommandContext, SlashCommand } from '../commands/types.js'; import { vi } from 'vitest'; import { useShellHistory } from '../hooks/useShellHistory.js'; diff --git a/packages/cli/src/ui/components/InputPrompt.tsx b/packages/cli/src/ui/components/InputPrompt.tsx index 1bc70fc..50e64fa 100644 --- a/packages/cli/src/ui/components/InputPrompt.tsx +++ b/packages/cli/src/ui/components/InputPrompt.tsx @@ -18,7 +18,7 @@ import { useCompletion } from '../hooks/useCompletion.js'; import { useKeypress, Key } from '../hooks/useKeypress.js'; import { isAtCommand, isSlashCommand } from '../utils/commandUtils.js'; import { CommandContext, SlashCommand } from '../commands/types.js'; -import { Config } from '@qwen/qwen-code-core'; +import { Config } from '@qwen-code/qwen-code-core'; import { clipboardHasImage, saveClipboardImage, diff --git a/packages/cli/src/ui/components/LoadingIndicator.tsx b/packages/cli/src/ui/components/LoadingIndicator.tsx index 7a51256..1639daf 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 '@qwen/qwen-code-core'; +import { ThoughtSummary } from '@qwen-code/qwen-code-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 7675905..3f0f8bb 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 '@qwen/qwen-code-core'; +import { type Config } from '@qwen-code/qwen-code-core'; interface TipsProps { config: Config; diff --git a/packages/cli/src/ui/components/ToolStatsDisplay.tsx b/packages/cli/src/ui/components/ToolStatsDisplay.tsx index faa9b6f..8781ad6 100644 --- a/packages/cli/src/ui/components/ToolStatsDisplay.tsx +++ b/packages/cli/src/ui/components/ToolStatsDisplay.tsx @@ -16,7 +16,7 @@ import { USER_AGREEMENT_RATE_MEDIUM, } from '../utils/displayUtils.js'; import { useSessionStats } from '../contexts/SessionContext.js'; -import { ToolCallStats } from '@qwen/qwen-code-core'; +import { ToolCallStats } from '@qwen-code/qwen-code-core'; const TOOL_NAME_COL_WIDTH = 25; const CALLS_COL_WIDTH = 8; diff --git a/packages/cli/src/ui/components/messages/ToolConfirmationMessage.test.tsx b/packages/cli/src/ui/components/messages/ToolConfirmationMessage.test.tsx index b370469..8110996 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 '@qwen/qwen-code-core'; +import { ToolCallConfirmationDetails } from '@qwen-code/qwen-code-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 8398f7c..fae8c85 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 '@qwen/qwen-code-core'; +} from '@qwen-code/qwen-code-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 6352d36..2eb8043 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 '@qwen/qwen-code-core'; +import { Config } from '@qwen-code/qwen-code-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 e0bb10c..899f37a 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, useReducer } from 'react'; import stringWidth from 'string-width'; -import { unescapePath } from '@qwen/qwen-code-core'; +import { unescapePath } from '@qwen-code/qwen-code-core'; import { toCodePoints, cpLen, cpSlice } from '../../utils/textUtils.js'; export type Direction = diff --git a/packages/cli/src/ui/contexts/SessionContext.test.tsx b/packages/cli/src/ui/contexts/SessionContext.test.tsx index 71bf9ca..7aaf69c 100644 --- a/packages/cli/src/ui/contexts/SessionContext.test.tsx +++ b/packages/cli/src/ui/contexts/SessionContext.test.tsx @@ -14,7 +14,7 @@ import { SessionMetrics, } from './SessionContext.js'; import { describe, it, expect, vi } from 'vitest'; -import { uiTelemetryService } from '@qwen/qwen-code-core'; +import { uiTelemetryService } from '@qwen-code/qwen-code-core'; /** * A test harness component that uses the hook and exposes the context value diff --git a/packages/cli/src/ui/contexts/SessionContext.tsx b/packages/cli/src/ui/contexts/SessionContext.tsx index 4ca7bc4..0a588c0 100644 --- a/packages/cli/src/ui/contexts/SessionContext.tsx +++ b/packages/cli/src/ui/contexts/SessionContext.tsx @@ -17,7 +17,7 @@ import { uiTelemetryService, SessionMetrics, ModelMetrics, -} from '@qwen/qwen-code-core'; +} from '@qwen-code/qwen-code-core'; // --- Interface Definitions --- diff --git a/packages/cli/src/ui/editors/editorSettingsManager.ts b/packages/cli/src/ui/editors/editorSettingsManager.ts index 41550e8..ccc0e0b 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 '@qwen/qwen-code-core'; +} from '@qwen-code/qwen-code-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 dc89d4a..5bd90f7 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 '@qwen/qwen-code-core'; +import { Config, FileDiscoveryService } from '@qwen-code/qwen-code-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('@qwen/qwen-code-core', async () => { - const actual = await vi.importActual('@qwen/qwen-code-core'); +vi.mock('@qwen-code/qwen-code-core', async () => { + const actual = await vi.importActual('@qwen-code/qwen-code-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 486de9f..eff284a 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 '@qwen/qwen-code-core'; +} from '@qwen-code/qwen-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 4ac6bb2..1094eb8 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 '@qwen/qwen-code-core'; +import { Config, GeminiClient } from '@qwen-code/qwen-code-core'; import * as fs from 'fs'; import EventEmitter from 'events'; @@ -22,7 +22,7 @@ vi.mock('os', () => ({ platform: () => 'linux', tmpdir: () => '/tmp', })); -vi.mock('@qwen/qwen-code-core'); +vi.mock('@qwen-code/qwen-code-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 a314fb8..bc67eed 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 '@qwen/qwen-code-core'; +import { Config, GeminiClient } from '@qwen-code/qwen-code-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 ae9f836..1eacf57 100644 --- a/packages/cli/src/ui/hooks/slashCommandProcessor.test.ts +++ b/packages/cli/src/ui/hooks/slashCommandProcessor.test.ts @@ -65,7 +65,7 @@ import { getMCPDiscoveryState, getMCPServerStatus, GeminiClient, -} from '@qwen/qwen-code-core'; +} from '@qwen-code/qwen-code-core'; import { useSessionStats } from '../contexts/SessionContext.js'; import { LoadedSettings } from '../../config/settings.js'; import * as ShowMemoryCommandModule from './useShowMemoryCommand.js'; @@ -88,8 +88,9 @@ vi.mock('open', () => ({ default: vi.fn(), })); -vi.mock('@qwen/qwen-code-core', async (importOriginal) => { - const actual = await importOriginal(); +vi.mock('@qwen-code/qwen-code-core', async (importOriginal) => { + const actual = + await importOriginal(); return { ...actual, getMCPServerStatus: vi.fn(), diff --git a/packages/cli/src/ui/hooks/slashCommandProcessor.ts b/packages/cli/src/ui/hooks/slashCommandProcessor.ts index 0a85d7b..afd5bec 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 '@qwen/qwen-code-core'; +} from '@qwen-code/qwen-code-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 0c7ec25..0f51d3e 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 '@qwen/qwen-code-core'; +} from '@qwen-code/qwen-code-core'; import { runExitCleanup } from '../../utils/cleanup.js'; export const useAuthCommand = ( diff --git a/packages/cli/src/ui/hooks/useAutoAcceptIndicator.test.ts b/packages/cli/src/ui/hooks/useAutoAcceptIndicator.test.ts index fba41e0..ee6c151 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 '@qwen/qwen-code-core'; +} from '@qwen-code/qwen-code-core'; import { useInput, type Key as InkKey } from 'ink'; vi.mock('ink'); -vi.mock('@qwen/qwen-code-core', async () => { +vi.mock('@qwen-code/qwen-code-core', async () => { const actualServerModule = (await vi.importActual( - '@qwen/qwen-code-core', + '@qwen-code/qwen-code-core', )) as Record; return { ...actualServerModule, diff --git a/packages/cli/src/ui/hooks/useAutoAcceptIndicator.ts b/packages/cli/src/ui/hooks/useAutoAcceptIndicator.ts index d6a4bd2..e1d004e 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 '@qwen/qwen-code-core'; +import { ApprovalMode, type Config } from '@qwen-code/qwen-code-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 f039492..c1eb1fc 100644 --- a/packages/cli/src/ui/hooks/useCompletion.integration.test.ts +++ b/packages/cli/src/ui/hooks/useCompletion.integration.test.ts @@ -11,7 +11,7 @@ import { useCompletion } from './useCompletion.js'; import * as fs from 'fs/promises'; import { glob } from 'glob'; import { CommandContext, SlashCommand } from '../commands/types.js'; -import { Config, FileDiscoveryService } from '@qwen/qwen-code-core'; +import { Config, FileDiscoveryService } from '@qwen-code/qwen-code-core'; interface MockConfig { getFileFilteringRespectGitIgnore: () => boolean; @@ -21,8 +21,8 @@ interface MockConfig { // Mock dependencies vi.mock('fs/promises'); -vi.mock('@qwen/qwen-code-core', async () => { - const actual = await vi.importActual('@qwen/qwen-code-core'); +vi.mock('@qwen-code/qwen-code-core', async () => { + const actual = await vi.importActual('@qwen-code/qwen-code-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 9cb53dd..21cf057 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 '@qwen/qwen-code-core'; +} from '@qwen-code/qwen-code-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 4d11f29..5227aee 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 '@qwen/qwen-code-core'; +} from '@qwen-code/qwen-code-core'; -vi.mock('@qwen/qwen-code-core', async () => { - const actual = await vi.importActual('@qwen/qwen-code-core'); +vi.mock('@qwen-code/qwen-code-core', async () => { + const actual = await vi.importActual('@qwen-code/qwen-code-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 a133ba3..a05060d 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 '@qwen/qwen-code-core'; +} from '@qwen-code/qwen-code-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 ccab613..2a92c49 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 '@qwen/qwen-code-core'; +import { Config, EditorType, AuthType } from '@qwen-code/qwen-code-core'; import { Part, PartListUnion } from '@google/genai'; import { UseHistoryManagerReturn } from './useHistoryManager.js'; import { @@ -47,7 +47,7 @@ const MockedUserPromptEvent = vi.hoisted(() => vi.fn().mockImplementation(() => {}), ); -vi.mock('@qwen/qwen-code-core', async (importOriginal) => { +vi.mock('@qwen-code/qwen-code-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 3a1df8d..fae1892 100644 --- a/packages/cli/src/ui/hooks/useGeminiStream.ts +++ b/packages/cli/src/ui/hooks/useGeminiStream.ts @@ -25,7 +25,7 @@ import { UnauthorizedError, UserPromptEvent, DEFAULT_GEMINI_FLASH_MODEL, -} from '@qwen/qwen-code-core'; +} from '@qwen-code/qwen-code-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 43e038d..162d055 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 '@qwen/qwen-code-core'; +import { sessionId, Logger } from '@qwen-code/qwen-code-core'; /** * Hook to manage the logger instance. diff --git a/packages/cli/src/ui/hooks/usePrivacySettings.ts b/packages/cli/src/ui/hooks/usePrivacySettings.ts index e76c69f..663bfad 100644 --- a/packages/cli/src/ui/hooks/usePrivacySettings.ts +++ b/packages/cli/src/ui/hooks/usePrivacySettings.ts @@ -6,7 +6,11 @@ import { GaxiosError } from 'gaxios'; import { useState, useEffect, useCallback } from 'react'; -import { Config, CodeAssistServer, UserTierId } from '@qwen/qwen-code-core'; +import { + Config, + CodeAssistServer, + UserTierId, +} from '@qwen-code/qwen-code-core'; export interface PrivacyState { isLoading: boolean; diff --git a/packages/cli/src/ui/hooks/useReactToolScheduler.ts b/packages/cli/src/ui/hooks/useReactToolScheduler.ts index 0fe864e..cbe31d7 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 '@qwen/qwen-code-core'; +} from '@qwen-code/qwen-code-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 88e516b..2eddcbb 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 '@qwen/qwen-code-core'; +import { isNodeError, getProjectTempDir } from '@qwen-code/qwen-code-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 023dd0d..4276101 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 '@qwen/qwen-code-core'; +import { Config } from '@qwen-code/qwen-code-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 f0c3f33..befec52 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 '@qwen/qwen-code-core'; +} from '@qwen-code/qwen-code-core'; import { HistoryItemWithoutId, ToolCallStatus, @@ -32,8 +32,8 @@ import { } from '../types.js'; // Mocks -vi.mock('@qwen/qwen-code-core', async () => { - const actual = await vi.importActual('@qwen/qwen-code-core'); +vi.mock('@qwen-code/qwen-code-core', async () => { + const actual = await vi.importActual('@qwen-code/qwen-code-core'); return { ...actual, ToolRegistry: vi.fn(), diff --git a/packages/cli/src/ui/privacy/CloudFreePrivacyNotice.tsx b/packages/cli/src/ui/privacy/CloudFreePrivacyNotice.tsx index 273a6ba..2d360ab 100644 --- a/packages/cli/src/ui/privacy/CloudFreePrivacyNotice.tsx +++ b/packages/cli/src/ui/privacy/CloudFreePrivacyNotice.tsx @@ -8,7 +8,7 @@ import { Box, Newline, Text, useInput } from 'ink'; import { RadioButtonSelect } from '../components/shared/RadioButtonSelect.js'; import { usePrivacySettings } from '../hooks/usePrivacySettings.js'; import { CloudPaidPrivacyNotice } from './CloudPaidPrivacyNotice.js'; -import { Config } from '@qwen/qwen-code-core'; +import { Config } from '@qwen-code/qwen-code-core'; import { Colors } from '../colors.js'; interface CloudFreePrivacyNoticeProps { diff --git a/packages/cli/src/ui/privacy/PrivacyNotice.tsx b/packages/cli/src/ui/privacy/PrivacyNotice.tsx index 35950df..f65ff5b 100644 --- a/packages/cli/src/ui/privacy/PrivacyNotice.tsx +++ b/packages/cli/src/ui/privacy/PrivacyNotice.tsx @@ -5,7 +5,7 @@ */ import { Box } from 'ink'; -import { type Config, AuthType } from '@qwen/qwen-code-core'; +import { type Config, AuthType } from '@qwen-code/qwen-code-core'; import { GeminiPrivacyNotice } from './GeminiPrivacyNotice.js'; import { CloudPaidPrivacyNotice } from './CloudPaidPrivacyNotice.js'; import { CloudFreePrivacyNotice } from './CloudFreePrivacyNotice.js'; diff --git a/packages/cli/src/ui/types.ts b/packages/cli/src/ui/types.ts index 3a95bd6..78f8ea6 100644 --- a/packages/cli/src/ui/types.ts +++ b/packages/cli/src/ui/types.ts @@ -7,7 +7,7 @@ import { ToolCallConfirmationDetails, ToolResultDisplay, -} from '@qwen/qwen-code-core'; +} from '@qwen-code/qwen-code-core'; // Only defining the state enum needed by the UI export enum StreamingState { diff --git a/packages/cli/src/ui/utils/errorParsing.test.ts b/packages/cli/src/ui/utils/errorParsing.test.ts index b188f98..3d388ad 100644 --- a/packages/cli/src/ui/utils/errorParsing.test.ts +++ b/packages/cli/src/ui/utils/errorParsing.test.ts @@ -11,7 +11,7 @@ import { UserTierId, DEFAULT_GEMINI_FLASH_MODEL, isProQuotaExceededError, -} from '@qwen/qwen-code-core'; +} from '@qwen-code/qwen-code-core'; describe('parseAndFormatApiError', () => { const _enterpriseMessage = diff --git a/packages/cli/src/ui/utils/errorParsing.ts b/packages/cli/src/ui/utils/errorParsing.ts index 5d2beb7..6e82f53 100644 --- a/packages/cli/src/ui/utils/errorParsing.ts +++ b/packages/cli/src/ui/utils/errorParsing.ts @@ -13,7 +13,7 @@ import { isGenericQuotaExceededError, isApiError, isStructuredError, -} from '@qwen/qwen-code-core'; +} from '@qwen-code/qwen-code-core'; // Free Tier message functions const getRateLimitErrorMessageGoogleFree = ( fallbackModel: string = DEFAULT_GEMINI_FLASH_MODEL, diff --git a/packages/cli/src/utils/cleanup.ts b/packages/cli/src/utils/cleanup.ts index 10905aa..08e1e95 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 '@qwen/qwen-code-core'; +import { getProjectTempDir } from '@qwen-code/qwen-code-core'; const cleanupFunctions: Array<() => void> = []; diff --git a/packages/cli/src/utils/sandbox.ts b/packages/cli/src/utils/sandbox.ts index d020ed0..96acc76 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 '@qwen/qwen-code-core'; +import { SandboxConfig } from '@qwen-code/qwen-code-core'; const execAsync = promisify(exec); diff --git a/packages/cli/src/utils/startupWarnings.test.ts b/packages/cli/src/utils/startupWarnings.test.ts index fa3f6e6..a22f84f 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 '@qwen/qwen-code-core'; +import { getErrorMessage } from '@qwen-code/qwen-code-core'; vi.mock('fs/promises'); -vi.mock('@qwen/qwen-code-core', async (importOriginal) => { +vi.mock('@qwen-code/qwen-code-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 0bd41d2..baa7345 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 '@qwen/qwen-code-core'; +import { getErrorMessage } from '@qwen-code/qwen-code-core'; const warningsFilePath = pathJoin(os.tmpdir(), 'gemini-cli-warnings.txt'); diff --git a/packages/core/package-lock.json b/packages/core/package-lock.json index 5d8205c..e82fbda 100644 --- a/packages/core/package-lock.json +++ b/packages/core/package-lock.json @@ -1,12 +1,12 @@ { "name": "@google/gemini-cli-core", - "version": "0.0.1-dev1", + "version": "0.0.1-alpha.7", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@google/gemini-cli-core", - "version": "0.0.1-dev1", + "version": "0.0.1-alpha.7", "dependencies": { "@google/genai": "^1.4.0", "@modelcontextprotocol/sdk": "^1.11.0", diff --git a/packages/core/package.json b/packages/core/package.json index db7ed89..299a264 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { - "name": "@qwen/qwen-code-core", - "version": "0.0.1-dev1", + "name": "@qwen-code/qwen-code-core", + "version": "0.0.1-alpha.7", "description": "Qwen Code Core", "repository": { "type": "git", diff --git a/packages/vscode-ide-companion/package-lock.json b/packages/vscode-ide-companion/package-lock.json index 7395efb..2af2a63 100644 --- a/packages/vscode-ide-companion/package-lock.json +++ b/packages/vscode-ide-companion/package-lock.json @@ -1,12 +1,12 @@ { "name": "qwen-code-vscode", - "version": "0.0.1-dev1", + "version": "0.0.1-alpha.7", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "qwen-code-vscode", - "version": "0.0.1-dev1", + "version": "0.0.1-alpha.7", "dependencies": { "@modelcontextprotocol/sdk": "^1.15.1", "cors": "^2.8.5", diff --git a/packages/vscode-ide-companion/package.json b/packages/vscode-ide-companion/package.json index 273b158..6775ed5 100644 --- a/packages/vscode-ide-companion/package.json +++ b/packages/vscode-ide-companion/package.json @@ -1,8 +1,8 @@ { - "name": "@qwen/qwen-code-vscode-ide-companion", + "name": "@qwen-code/qwen-code-vscode-ide-companion", "displayName": "Qwen Code VSCode IDE Companion", "description": "", - "version": "0.0.1-dev1", + "version": "0.0.1-alpha.7", "engines": { "vscode": "^1.101.0" },