@chatbi-v/cli 3.0.0 → 3.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chatbi-v/cli",
-  "version": "3.0.0",
+  "version": "3.1.2",
   "description": "Standardized CLI tooling for ChatBI Monorepo",
   "type": "module",
   "main": "dist/index.js",
@@ -24,10 +24,19 @@
   "publishConfig": {
     "access": "public"
   },
+  "scripts": {
+    "build": "tsup",
+    "dev": "tsup --watch",
+    "test": "vitest run tests/**/*.test.ts --exclude tests/e2e/**",
+    "test:e2e": "pnpm build && vitest run tests/e2e/plugin-create.e2e.test.ts tests/e2e/sandbox-isolation.e2e.test.ts",
+    "test:all": "pnpm test && pnpm test:e2e"
+  },
   "dependencies": {
+    "@chatbi-v/config": "workspace:*",
+    "@chatbi-v/core": "workspace:*",
     "boxen": "^8.0.1",
     "cac": "^6.7.14",
-    "execa": "^8.0.1",
+    "esbuild": "^0.24.0",
     "fast-glob": "^3.3.3",
     "figlet": "^1.9.4",
     "fs-extra": "^11.2.0",
@@ -37,26 +46,22 @@
     "ora": "^7.0.1",
     "picocolors": "^1.0.0",
     "prompts": "^2.4.2",
-    "vite": "^5.4.11"
+    "vite": "^5.4.11",
+    "zod": "^3.23.8"
   },
   "devDependencies": {
-    "tsup": "^8.5.1",
-    "typescript": "^5.0.0",
-    "@types/eslint": "^9.6.1",
     "@types/boxen": "^3.0.5",
     "@types/figlet": "^1.7.0",
     "@types/fs-extra": "^11.0.0",
     "@types/gradient-string": "^1.1.6",
     "@types/node": "^20.0.0",
     "@types/prompts": "^2.4.9",
-    "@vitest/coverage-v8": "1.6.1",
-    "vitest": "^1.0.0",
+    "@types/tmp": "^0.2.6",
     "eslint": "^9.17.0",
-    "@chatbi-v/eslint-plugin-theme": "3.0.0"
-  },
-  "scripts": {
-    "build": "tsup",
-    "dev": "tsup --watch",
-    "test": "vitest"
+    "execa": "^8.0.1",
+    "tmp-promise": "^3.0.3",
+    "tsup": "^8.5.1",
+    "typescript": "^5.0.0",
+    "vitest": "^1.3.1"
   }
-}
+}

package/templates/app/package.json.hbs

@@ -12,9 +12,6 @@
   "dependencies": {
     "@ant-design/icons": "^5.2.6",
     "@ant-design/x": "^2.1.0",
-    "@chatbi-v/core": "^3.0.0",
-    "@chatbi-v/react": "^3.0.0",
-    "@chatbi-v/mocks": "^3.0.0",
     "antd": "^5.20.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
@@ -22,8 +19,7 @@
     "zustand": "^5.0.3"
   },
   "devDependencies": {
-    "@chatbi-v/cli": "^3.0.0",
-    "@chatbi-v/config":"^3.0.0",
+    "@chatbi-v/cli": "^{{cliVersion}}",
     "@types/node": "^25.0.3",
     "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.1",

package/templates/app/src/App.tsx.hbs

@@ -1,6 +1,6 @@
 import React, { lazy, Suspense, useMemo } from 'react';
 import { useLocation } from 'react-router-dom';
-import { PluginSlot, Slot } from '@chatbi-v/core';
+import { Slot, PluginSlot } from '@chatbi-v/react';
 
 import { GlobalSettingsModal } from './components/GlobalSettingsModal';
 import { ContentSkeleton, NavSkeleton } from './components/LayoutSkeletons';

package/templates/app/src/hooks/usePluginLoader.ts.hbs

@@ -15,12 +15,14 @@ export const usePluginLoader = () => {
      * 将 Vite 扫描到的物理路径转换为内核可识别的规范化 ID
      * 规范化规则：
      * 1. @chatbi-plugins/xxx/src/index -> packages/plugins/xxx/src/index
-     * 2. ../../plugins/xxx/src/index  -> packages/plugins/xxx/src/index
+     * 2. ../../packages/plugins/xxx/src/index -> packages/plugins/xxx/src/index
+     * 3. @chatbi-apps/xxx/src/index -> apps/xxx/src/index
+     * 4. ../../apps/xxx/src/index 或 ../../packages/apps/xxx/src/index -> apps/xxx/src/index
      */
     const normalizeModulePath = (path: string) => {
       const mapping = [
-        { pattern: /^(@chatbi-plugins\/|(\.\.\/)+plugins\/)/, replacement: 'packages/plugins/' },
-        { pattern: /^(@chatbi-apps\/|(\.\.\/)+apps\/)/, replacement: 'packages/apps/' }
+        { pattern: /^(@chatbi-plugins\/|(\.\.\/)+packages\/plugins\/)/, replacement: 'packages/plugins/' },
+        { pattern: /^(@chatbi-apps\/|(\.\.\/)+apps\/|(\.\.\/)+packages\/apps\/)/, replacement: 'apps/' }
       ];
 
       for (const { pattern, replacement } of mapping) {
@@ -35,6 +37,8 @@ export const usePluginLoader = () => {
     const globModules = import.meta.glob<any>([
       '@chatbi-plugins/*/src/index.{ts,tsx}',
       '@chatbi-apps/*/src/index.{ts,tsx}',
+      '../../../../apps/*/src/index.{ts,tsx}',
+      '../../../../packages/apps/*/src/index.{ts,tsx}',
     ], { eager: false });
 
     const normalizedModules: Record<string, () => Promise<any>> = {};

package/templates/app/tailwind.config.js.hbs

@@ -11,8 +11,9 @@ export default {
   content: [
     path.resolve(__dirname, './index.html'),
     path.resolve(__dirname, './src/**/*.{js,ts,jsx,tsx}'),
-    path.resolve(__dirname, '../../plugins/*/src/**/*.{js,ts,jsx,tsx}'),
+    path.resolve(__dirname, '../../packages/plugins/*/src/**/*.{js,ts,jsx,tsx}'),
     path.resolve(__dirname, '../../apps/*/src/**/*.{js,ts,jsx,tsx}'),
+    path.resolve(__dirname, '../../packages/apps/*/src/**/*.{js,ts,jsx,tsx}'),
   ],
   theme: {
     extend: {

package/templates/app/tsconfig.json.hbs

@@ -1,5 +1,5 @@
 {
-  "extends": "@chatbi-v/config/base.json",
+  "extends": "{{tsconfigPath}}",
   "compilerOptions": {
     "target": "ES2020",
     "useDefineForClassFields": true,
@@ -17,4 +17,4 @@
     "jsx": "react-jsx"
   },
   "include": ["src"]
-}
+}

package/templates/app/vite.config.ts.hbs

@@ -6,6 +6,14 @@ import { defineConfig, loadEnv } from 'vite';
 /**
  * 动态获取 Workspace 中的包，用于 exclude
  */
+function getWorkspaceAppsDir() {
+  const packagesAppsDir = path.resolve(__dirname, '../../packages/apps');
+  if (fs.existsSync(packagesAppsDir)) {
+    return packagesAppsDir;
+  }
+  return path.resolve(__dirname, '../../apps');
+}
+
 function getWorkspacePackages() {
   try {
     const pkgPath = path.resolve(__dirname, 'package.json');
@@ -34,8 +42,8 @@ function manualChunks(id: string) {
   }
 
   // 2. ChatBI 插件 (Workspace)
-  if (id.includes('/plugins/')) {
-    const matches = id.match(/\/plugins\/([^/]+)\//);
+  if (id.includes('/packages/plugins/')) {
+    const matches = id.match(/\/packages\/plugins\/([^/]+)\//);
     if (matches && matches[1]) {
       const pluginName = matches[1];
       // 统一分包名称格式为 plugin-{name}
@@ -86,8 +94,8 @@ export default defineConfig(({ mode }) => {
     resolve: {
       alias: {
         '@': path.resolve(__dirname, './src'),
-        '@chatbi-plugins': path.resolve(__dirname, '../../plugins'),
-        '@chatbi-apps': path.resolve(__dirname, '../../apps'),
+        '@chatbi-plugins': path.resolve(__dirname, '../../packages/plugins'),
+        '@chatbi-apps': getWorkspaceAppsDir(),
       },
       // 强制统一核心依赖实例
       dedupe: ['react', 'react-dom', 'antd', '@ant-design/x', '@chatbi-v/core'],

package/templates/monorepo/README.md.hbs

@@ -4,8 +4,9 @@
 
 ## 项目结构
 
-- `apps/main`: 宿主应用，用于验证插件功能。
-- `plugins/`: 业务插件源码目录。
+- `apps/main`: 默认宿主应用，用于验证插件功能。
+- `packages/apps/*`: 兼容未来扩展的应用工作区目录。
+- `packages/plugins/`: 业务插件源码目录。
 - `.chatbi/`: 离线 SDK 资源（核心包、标准插件、CLI 工具）。
 
 ## 快速开始
@@ -27,4 +28,4 @@
 
 ## 插件开发
 
-参考 `plugins/demo-plugin` 示例。
+参考 `packages/plugins/demo-plugin` 示例。

package/templates/monorepo/package.json.hbs

@@ -11,13 +11,12 @@
   },
   "workspaces": [
     "apps/*",
-    "plugins/*",
+    "packages/apps/*",
+    "packages/plugins/*",
     "packages/*",
     "libs/*"
   ],
   "dependencies": {
-    "@chatbi-v/core": "^3.0.0",
-    "@chatbi-v/mocks": "^3.0.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "antd": "^5.29.3",
@@ -28,8 +27,7 @@
   },
   "devDependencies": {
     "typescript": "^5.0.0",
-    "@chatbi-v/config": "^3.0.0",
-    "@chatbi-v/cli": "^3.0.0",
+    "@chatbi-v/cli": "^{{cliVersion}}",
     "@ant-design/icons": "^5.6.1",
     "@types/react": "^18.3.1",
     "@types/react-dom": "^18.3.1",

package/templates/monorepo/pnpm-workspace.yaml.hbs

@@ -2,8 +2,9 @@
 packages:
   # 宿主应用目录
   - 'apps/*'
+  - 'packages/apps/*'
   # 插件目录
-  - 'plugins/*'
+  - 'packages/plugins/*'
   
   # 增量配置：如果添加了核心库或工具库，可在此处包含
   - 'packages/*'

package/templates/monorepo/tsconfig.json.hbs

@@ -1,5 +1,5 @@
 {
-  "extends": "@chatbi-v/config/base.json",
+  "extends": "{{tsconfigPath}}",
   "compilerOptions": {
     "target": "ESNext",
     "useDefineForClassFields": true,
@@ -18,9 +18,9 @@
     "jsx": "react-jsx",
     "baseUrl": ".",
     "paths": {
-      "@chatbi-plugins/*": ["./plugins/*/src"],
-      "@chatbi-apps/*": ["./apps/*/src"]
+      "@chatbi-plugins/*": ["./packages/plugins/*/src"],
+      "@chatbi-apps/*": ["./apps/*/src", "./packages/apps/*/src"]
     }
   },
-  "include": ["apps/main/src", "plugins/*/src"]
+  "include": ["apps/main/src", "packages/apps/*/src", "packages/plugins/*/src"]
 }

package/templates/plugin/package.json.hbs

@@ -5,14 +5,12 @@
   "files": [
     "dist"
   ],
-  "main": "dist/index.cjs",
+  "main": "dist/index.mjs",
   "module": "dist/index.mjs",
-  "types": "dist/index.d.ts",
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
       "import": "./dist/index.mjs",
-      "require": "./dist/index.cjs"
+      "default": "./dist/index.mjs"
     }
   },
   "scripts": {
@@ -21,14 +19,13 @@
   },
   "plugin": true,
   "peerDependencies": {
-    "@chatbi-v/core": "^3.0.0",
+    "@ant-design/icons": "^5.0.0",
     "antd": "^5.20.0",
     "react": ">=18.0.0",
     "react-dom": ">=18.0.0"
   },
   "devDependencies": {
-      "@chatbi-v/core": "^3.0.0",
-        "@chatbi-v/config": "^3.0.0",
+    "@chatbi-v/cli": "^{{cliVersion}}",
     "tsup": "^8.5.1",
     "vite": "^5.0.0"
   }

package/templates/plugin/src/index.tsx.hbs

@@ -2,8 +2,10 @@ import { RocketOutlined } from '@ant-design/icons';
 import { createLogger, definePlugin, type PluginContext, Slot } from '@chatbi-v/core';
 import React from 'react';
 import pkg from '../package.json';
+import manifest from './plugin.json';
 
 const logger = createLogger('{{pluginName}}');
+const routePath = manifest.routes?.[0]?.path || '/{{pluginPath}}';
 
 /**
  * {{pluginDescription}}
@@ -11,20 +13,21 @@ const logger = createLogger('{{pluginName}}');
 export const {{pluginClassName}} = definePlugin({
   /** 插件元数据 */
   metadata: {
-    id: pkg.name,
-    name: '{{pluginDisplayName}}',
+    id: manifest.id,
+    name: manifest.name,
     version: pkg.version,
-    type: '{{pluginType}}', // business | system | renderer
-    description: '{{pluginDescription}}',
+    type: manifest.type,
+    description: manifest.description,
+    dependencies: manifest.dependencies?.map((dependency) => dependency.id) || [],
     capabilities: {
       configurable: true
     },
     routes: [
       {
-        path: '/{{pluginPath}}',
+        path: routePath,
         component: React.lazy(() => import('./components/MainView')),
         meta: {
-          title: '{{pluginDisplayName}}',
+          title: manifest.name,
           icon: 'RocketOutlined'
         }
       }
@@ -36,8 +39,8 @@ export const {{pluginClassName}} = definePlugin({
         order: 10,
         meta: {
           icon: <RocketOutlined />,
-          label: '{{pluginDisplayName}}',
-          path: '/{{pluginPath}}'
+          label: manifest.name,
+          path: routePath
         }
       }
     ],
@@ -57,11 +60,11 @@ export const {{pluginClassName}} = definePlugin({
   },
 
   async onLoad(context: PluginContext) {
-    logger.info('{{pluginDisplayName}} loaded');
+    logger.info('{{pluginDisplayName}} 已加载');
 
     // [示例] 服务注册 (Service Registry)
     // 推荐模式：通过服务暴露配置或能力，供其他插件消费
-    // context.registerService(`${pkg.name}.service`, {
+    // context.registerService('service', {
     //   getPublicConfig: () => ({
     //     // 仅暴露允许公开的配置
     //     someConfig: context.storage.get('someConfig')
@@ -73,7 +76,7 @@ export const {{pluginClassName}} = definePlugin({
 
     // [示例] 服务消费 (Service Consumption)
     // 注意：需要在 metadata.dependencies 中声明依赖的插件 ID
-    // const otherService = context.getService('com.example.other-plugin.service');
+    // const otherService = context.getService('chatbi-v.plugin-other.service');
     // if (otherService) {
     //   otherService.doSomething();
     // }

package/templates/plugin/src/plugin.json.hbs

@@ -0,0 +1,14 @@
+{
+  "id": "{{pluginId}}",
+  "version": "{{pluginVersion}}",
+  "name": "{{pluginDisplayName}}",
+  "entry": "src/index.tsx",
+  "type": "{{pluginType}}",
+  "description": "{{pluginDescription}}",
+  "dependencies": [],
+  "routes": [
+    {
+      "path": "/{{pluginPath}}"
+    }
+  ]
+}

package/templates/plugin/tsconfig.json.hbs

@@ -1,5 +1,5 @@
 {
-  "extends": "@chatbi-v/config/base.json",
+  "extends": "{{tsconfigPath}}",
   "compilerOptions": {
     "outDir": "./dist",
     "rootDir": "./src",