@xiaozhi-client/cli 1.9.4-beta.10 → 1.9.4-beta.11

package/README.md

@@ -76,7 +76,7 @@ import { configManager } from "@/lib/config/manager";
 pnpm build
 
 # 类型检查
-pnpm type-check
+pnpm check:type
 
 # 运行测试
 pnpm test

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xiaozhi-client/cli",
-  "version": "1.9.4-beta.10",
+  "version": "1.9.4-beta.11",
   "private": false,
   "repository": {
     "type": "git",

package/src/Container.ts

@@ -140,18 +140,18 @@ export class DIContainer implements IDIContainer {
 
     // 注册服务层
     container.registerSingleton("processManager", () => {
-      const ProcessManagerModule = require("@cli/services/ProcessManager.js");
+      const ProcessManagerModule = require("./services/ProcessManager.js");
       return new ProcessManagerModule.ProcessManagerImpl();
     });
 
     container.registerSingleton("daemonManager", () => {
-      const DaemonManagerModule = require("@cli/services/DaemonManager.js");
+      const DaemonManagerModule = require("./services/DaemonManager.js");
       const processManager = container.get("processManager") as any;
       return new DaemonManagerModule.DaemonManagerImpl(processManager);
     });
 
     container.registerSingleton("serviceManager", () => {
-      const ServiceManagerModule = require("@cli/services/ServiceManager.js");
+      const ServiceManagerModule = require("./services/ServiceManager.js");
       const processManager = container.get("processManager") as any;
       const configManager = container.get("configManager") as any;
       return new ServiceManagerModule.ServiceManagerImpl(
@@ -162,7 +162,7 @@ export class DIContainer implements IDIContainer {
 
     container.registerSingleton("templateManager", () => {
       // 使用动态导入的同步版本
-      const TemplateManagerModule = require("@cli/services/TemplateManager.js");
+      const TemplateManagerModule = require("./services/TemplateManager.js");
       return new TemplateManagerModule.TemplateManagerImpl();
     });
 

package/src/commands/CommandHandlerFactory.ts

@@ -52,9 +52,7 @@ export class CommandHandlerFactory implements ICommandHandlerFactory {
    */
   private createServiceCommandHandler(): CommandHandler {
     // 动态导入以避免循环依赖
-    const {
-      ServiceCommandHandler,
-    } = require("@cli/commands/ServiceCommandHandler.js");
+    const { ServiceCommandHandler } = require("./ServiceCommandHandler.js");
     return new ServiceCommandHandler(this.container);
   }
 
@@ -62,9 +60,7 @@ export class CommandHandlerFactory implements ICommandHandlerFactory {
    * 创建配置命令处理器
    */
   private createConfigCommandHandler(): CommandHandler {
-    const {
-      ConfigCommandHandler,
-    } = require("@cli/commands/ConfigCommandHandler.js");
+    const { ConfigCommandHandler } = require("./ConfigCommandHandler.js");
     return new ConfigCommandHandler(this.container);
   }
 
@@ -72,9 +68,7 @@ export class CommandHandlerFactory implements ICommandHandlerFactory {
    * 创建项目命令处理器
    */
   private createProjectCommandHandler(): CommandHandler {
-    const {
-      ProjectCommandHandler,
-    } = require("@cli/commands/ProjectCommandHandler.js");
+    const { ProjectCommandHandler } = require("./ProjectCommandHandler.js");
     return new ProjectCommandHandler(this.container);
   }
 
@@ -82,7 +76,7 @@ export class CommandHandlerFactory implements ICommandHandlerFactory {
    * 创建MCP命令处理器
    */
   private createMcpCommandHandler(): CommandHandler {
-    const { McpCommandHandler } = require("@cli/commands/McpCommandHandler.js");
+    const { McpCommandHandler } = require("./McpCommandHandler.js");
     return new McpCommandHandler(this.container);
   }
 
@@ -90,9 +84,7 @@ export class CommandHandlerFactory implements ICommandHandlerFactory {
    * 创建端点命令处理器
    */
   private createEndpointCommandHandler(): CommandHandler {
-    const {
-      EndpointCommandHandler,
-    } = require("@cli/commands/EndpointCommandHandler.js");
+    const { EndpointCommandHandler } = require("./EndpointCommandHandler.js");
     return new EndpointCommandHandler(this.container);
   }
 }

package/src/commands/ServiceCommandHandler.ts

@@ -79,7 +79,7 @@ export class ServiceCommandHandler extends BaseCommandHandler {
     try {
       // 处理--debug参数
       if (options.debug) {
-        consola.level = "debug";
+        consola.level = 5; // debug 级别
       }
 
       const serviceManager = this.getService<any>("serviceManager");

package/src/commands/__tests__/McpCommandHandler.test.ts

@@ -1,4 +1,3 @@
-import type { IDIContainer } from "@cli/interfaces/Config.js";
 import { configManager } from "@xiaozhi-client/config";
 import type {
   MCPServerConfig,
@@ -7,6 +6,7 @@ import type {
 } from "@xiaozhi-client/config";
 import ora from "ora";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { IDIContainer } from "../../interfaces/Config.js";
 import { McpCommandHandler } from "../McpCommandHandler.js";
 
 // 测试专用类型定义
@@ -143,7 +143,7 @@ const mockGetServiceStatus = vi
   .fn()
   .mockReturnValue({ running: false, pid: null });
 
-vi.mock("@cli/services/ProcessManager.js", () => ({
+vi.mock("../../services/ProcessManager.js", () => ({
   ProcessManagerImpl: vi.fn().mockImplementation(() => ({
     getServiceStatus: mockGetServiceStatus,
   })),

package/src/services/__tests__/DaemonManager.test.ts

@@ -2,10 +2,10 @@
  * 守护进程管理服务单元测试
  */
 
-import { ServiceError } from "@cli/errors/index.js";
-import type { ProcessManager } from "@cli/interfaces/Service.js";
 import consola from "consola";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { ServiceError } from "../../errors/index.js";
+import type { ProcessManager } from "../../interfaces/Service.js";
 import type { DaemonOptions } from "../DaemonManager";
 import { DaemonManagerImpl } from "../DaemonManager";
 
@@ -49,7 +49,7 @@ vi.mock("node:fs", () => ({
 }));
 
 // Mock utils
-vi.mock("@cli/utils/PathUtils.js", () => ({
+vi.mock("../../utils/PathUtils.js", () => ({
   PathUtils: {
     getWebServerLauncherPath: vi.fn(() => "/path/to/webserver.js"),
     getConfigDir: vi.fn(() => "/config"),
@@ -57,7 +57,7 @@ vi.mock("@cli/utils/PathUtils.js", () => ({
   },
 }));
 
-vi.mock("@cli/utils/PlatformUtils.js", () => ({
+vi.mock("../../utils/PlatformUtils.js", () => ({
   PlatformUtils: {
     getTailCommand: vi.fn(() => ({
       command: "tail",

package/src/services/__tests__/DaemonMode.integration.test.ts

@@ -1,6 +1,6 @@
-import type { ServiceStartOptions } from "@cli/interfaces/Service.js";
-import { PathUtils } from "@cli/utils/PathUtils.js";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { ServiceStartOptions } from "../../interfaces/Service.js";
+import { PathUtils } from "../../utils/PathUtils.js";
 import { ServiceManagerImpl } from "../ServiceManager";
 
 // Mock external dependencies
@@ -19,7 +19,7 @@ vi.mock("node:fs", () => ({
   mkdirSync: vi.fn(),
 }));
 
-vi.mock("@cli/utils/PathUtils.js", () => ({
+vi.mock("../../utils/PathUtils.js", () => ({
   PathUtils: {
     getWebServerLauncherPath: vi.fn(),
     getExecutablePath: vi.fn(),

package/src/services/__tests__/ProcessManager.test.ts

@@ -2,16 +2,16 @@
  * 进程管理服务单元测试
  */
 
-import { FileUtils } from "@cli/utils/FileUtils.js";
-import { PathUtils } from "@cli/utils/PathUtils.js";
-import { PlatformUtils } from "@cli/utils/PlatformUtils.js";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { FileUtils } from "../../utils/FileUtils.js";
+import { PathUtils } from "../../utils/PathUtils.js";
+import { PlatformUtils } from "../../utils/PlatformUtils.js";
 import { ProcessManagerImpl } from "../ProcessManager";
 
 // Mock 依赖
-vi.mock("@cli/utils/FileUtils.js");
-vi.mock("@cli/utils/PathUtils.js");
-vi.mock("@cli/utils/PlatformUtils.js");
+vi.mock("../../utils/FileUtils.js");
+vi.mock("../../utils/PathUtils.js");
+vi.mock("../../utils/PlatformUtils.js");
 
 const mockFileUtils = vi.mocked(FileUtils);
 const mockPathUtils = vi.mocked(PathUtils);

package/src/services/__tests__/ServiceManager.test.ts

@@ -2,12 +2,12 @@
  * 服务管理服务单元测试
  */
 
-import { ConfigError, ServiceError } from "@cli/errors/index.js";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { ConfigError, ServiceError } from "../../errors/index.js";
 import type {
   ProcessManager,
   ServiceStartOptions,
-} from "@cli/interfaces/Service.js";
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+} from "../../interfaces/Service.js";
 import { ServiceManagerImpl } from "../ServiceManager";
 
 // Mock 依赖
@@ -62,7 +62,7 @@ vi.mock("@services/MCPServer.js", () => ({
 }));
 
 // Mock PathUtils
-vi.mock("@cli/utils/PathUtils.js", () => ({
+vi.mock("../../utils/PathUtils.js", () => ({
   PathUtils: {
     getWebServerLauncherPath: vi
       .fn()
@@ -158,7 +158,7 @@ describe("ServiceManagerImpl 服务管理器实现", () => {
     mockProcessExit.mockClear();
 
     // Reset PathUtils mocks
-    const { PathUtils } = await import("@cli/utils/PathUtils.js");
+    const { PathUtils } = await import("../../utils/PathUtils.js");
     vi.mocked(PathUtils.getWebServerLauncherPath).mockReturnValue(
       "/mock/path/WebServerLauncher.js"
     );

package/src/services/__tests__/TemplateManager.test.ts

@@ -2,20 +2,20 @@
  * 模板管理服务单元测试
  */
 
-import { FileError, ValidationError } from "@cli/errors/index.js";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { FileError, ValidationError } from "../../errors/index.js";
 import type { TemplateCreateOptions } from "../TemplateManager";
 import { TemplateManagerImpl } from "../TemplateManager";
 
 // Mock 依赖
-vi.mock("@cli/utils/PathUtils.js", () => ({
+vi.mock("../../utils/PathUtils.js", () => ({
   PathUtils: {
     findTemplatesDir: vi.fn(),
     getTemplatePath: vi.fn(),
   },
 }));
 
-vi.mock("@cli/utils/FileUtils.js", () => ({
+vi.mock("../../utils/FileUtils.js", () => ({
   FileUtils: {
     exists: vi.fn(),
     readFile: vi.fn(),
@@ -26,7 +26,7 @@ vi.mock("@cli/utils/FileUtils.js", () => ({
   },
 }));
 
-vi.mock("@cli/utils/Validation.js", () => ({
+vi.mock("../../utils/Validation.js", () => ({
   Validation: {
     validateTemplateName: vi.fn(),
     validateRequired: vi.fn(),
@@ -48,9 +48,9 @@ vi.mock("node:path", () => ({
   },
 }));
 
-const { PathUtils } = await import("@cli/utils/PathUtils.js");
-const { FileUtils } = await import("@cli/utils/FileUtils.js");
-const { Validation } = await import("@cli/utils/Validation.js");
+const { PathUtils } = await import("../../utils/PathUtils.js");
+const { FileUtils } = await import("../../utils/FileUtils.js");
+const { Validation } = await import("../../utils/Validation.js");
 const fs = await import("node:fs");
 
 describe("TemplateManagerImpl", () => {

package/src/utils/__tests__/PathUtils.test.ts

@@ -2,11 +2,11 @@ import { realpathSync } from "node:fs";
 import { tmpdir } from "node:os";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
-import { PathUtils } from "@cli/utils/PathUtils.js";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { PathUtils } from "../PathUtils.js";
 
 // Mock dependencies - 需要使用与源文件相同的导入方式
-vi.mock("@cli/utils/FileUtils.js", () => ({
+vi.mock("../FileUtils.js", () => ({
   FileUtils: {
     exists: vi.fn(),
   },
@@ -38,7 +38,7 @@ describe("PathUtils 路径工具", () => {
     vi.clearAllMocks();
 
     // Setup mocks
-    const { FileUtils } = await import("@cli/utils/FileUtils.js");
+    const { FileUtils } = await import("../FileUtils.js");
     mockFileExists = vi.mocked(FileUtils.exists);
     mockTmpdir = vi.mocked(tmpdir);
     mockFileURLToPath = vi.mocked(fileURLToPath);

package/tsconfig.json

@@ -1,32 +1,11 @@
 {
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "target": "ES2022",
-    "module": "ESNext",
-    "moduleResolution": "bundler",
-    "lib": ["ES2022"],
-    "strict": false,
-    "esModuleInterop": true,
-    "skipLibCheck": true,
-    "forceConsistentCasingInFileNames": true,
-    "resolveJsonModule": true,
-    "allowSyntheticDefaultImports": true,
-    "noEmit": true,
-    "baseUrl": ".",
-    "moduleSuffixes": [".ts", ".js"],
-    "paths": {
-      "@/*": ["src/*"],
-      "@cli/commands": ["src/commands"],
-      "@cli/commands/*": ["src/commands/*"],
-      "@cli/services": ["src/services"],
-      "@cli/services/*": ["src/services/*"],
-      "@cli/utils": ["src/utils"],
-      "@cli/utils/*": ["src/utils/*"],
-      "@cli/errors": ["src/errors"],
-      "@cli/errors/*": ["src/errors/*"],
-      "@cli/interfaces": ["src/interfaces"],
-      "@cli/interfaces/*": ["src/interfaces/*"]
-    }
+    "composite": true,
+    "outDir": "../../dist/cli",
+    "rootDir": "src"
   },
   "include": ["src/**/*.ts"],
-  "exclude": ["node_modules", "dist", "**/*.test.ts", "**/*.spec.ts"]
+  "exclude": ["node_modules", "dist", "**/*.test.ts"],
+  "references": [{ "path": "../../apps/backend" }, { "path": "../config" }]
 }

package/vitest.config.ts

@@ -46,17 +46,6 @@ export default defineConfig({
   },
   resolve: {
     alias: {
-      // CLI 内部路径别名（__dirname 是 packages/cli，所以使用相对路径）
-      "@cli/commands": resolve(__dirname, "./src/commands"),
-      "@cli/commands/*": resolve(__dirname, "./src/commands/*"),
-      "@cli/services": resolve(__dirname, "./src/services"),
-      "@cli/services/*": resolve(__dirname, "./src/services/*"),
-      "@cli/utils": resolve(__dirname, "./src/utils"),
-      "@cli/utils/*": resolve(__dirname, "./src/utils/*"),
-      "@cli/errors": resolve(__dirname, "./src/errors"),
-      "@cli/errors/*": resolve(__dirname, "./src/errors/*"),
-      "@cli/interfaces": resolve(__dirname, "./src/interfaces"),
-      "@cli/interfaces/*": resolve(__dirname, "./src/interfaces/*"),
       // Backend 路径别名（从 packages/cli 向上到项目根目录）
       "@handlers": resolve(__dirname, "../../apps/backend/handlers"),
       "@handlers/*": resolve(__dirname, "../../apps/backend/handlers/*"),