@coze-arch/cli 0.0.1-alpha.de5a13 → 0.0.1-alpha.deaedf

package/lib/__templates__/vite/scripts/build.sh

@@ -8,7 +8,10 @@ cd "${COZE_WORKSPACE_PATH}"
 echo "Installing dependencies..."
 pnpm install --prefer-frozen-lockfile --prefer-offline --loglevel debug --reporter=append-only
 
-echo "Building the project..."
+echo "Building frontend with Vite..."
 npx vite build
 
+echo "Bundling server with tsup..."
+npx tsup server/server.ts --format cjs --platform node --target node20 --outDir dist-server --no-splitting --no-minify --external vite
+
 echo "Build completed successfully!"

package/lib/__templates__/vite/scripts/dev.sh

@@ -1,9 +1,16 @@
 #!/bin/bash
 set -Eeuo pipefail
 
+<% if (process.env.NODE_ENV === 'test') { %>
+# 测试环境：支持环境变量覆盖端口
+PORT="${PORT:-<%= port %>}"
+COZE_WORKSPACE_PATH="${COZE_WORKSPACE_PATH:-$(pwd)}"
+DEPLOY_RUN_PORT="${DEPLOY_RUN_PORT:-${PORT}}"
+<% } else { %>
 PORT=<%= port %>
 COZE_WORKSPACE_PATH="${COZE_WORKSPACE_PATH:-$(pwd)}"
 DEPLOY_RUN_PORT=<%= port %>
+<% } %>
 
 cd "${COZE_WORKSPACE_PATH}"
 
@@ -27,6 +34,6 @@ kill_port_if_listening() {
 
 echo "Clearing port ${PORT} before start."
 kill_port_if_listening
-echo "Starting HTTP service on port ${PORT} for dev..."
+echo "Starting express + Vite dev server on port ${PORT}..."
 
-npx vite --port $PORT
+PORT=$PORT npx tsx watch server/server.ts

package/lib/__templates__/vite/scripts/start.sh

@@ -2,14 +2,20 @@
 set -Eeuo pipefail
 
 COZE_WORKSPACE_PATH="${COZE_WORKSPACE_PATH:-$(pwd)}"
+<% if (process.env.NODE_ENV === 'test') { %>
+# 测试环境：支持环境变量覆盖端口
+PORT="${PORT:-<%= port %>}"
+DEPLOY_RUN_PORT="${DEPLOY_RUN_PORT:-${PORT}}"
+<% } else { %>
 PORT=<%= port %>
 DEPLOY_RUN_PORT="${DEPLOY_RUN_PORT:-$PORT}"
+<% } %>
 
 start_service() {
     cd "${COZE_WORKSPACE_PATH}"
-    echo "Starting HTTP service on port ${DEPLOY_RUN_PORT} for deploy..."
-    npx vite preview --port $DEPLOY_RUN_PORT
+    echo "Starting express production server on port ${DEPLOY_RUN_PORT}..."
+    PORT=$DEPLOY_RUN_PORT node dist-server/server.js
 }
 
-echo "Starting HTTP service on port ${DEPLOY_RUN_PORT} for deploy..."
+echo "Starting express production server on port ${DEPLOY_RUN_PORT}..."
 start_service

package/lib/__templates__/vite/server/routes/index.ts

@@ -0,0 +1,31 @@
+import { Router } from 'express';
+
+const router = Router();
+
+// API 路由示例
+router.get('/api/hello', (req, res) => {
+  res.json({
+    message: 'Hello from Express + Vite!',
+    timestamp: new Date().toISOString(),
+  });
+});
+
+router.post('/api/data', (req, res) => {
+  const requestData = req.body;
+  res.json({
+    success: true,
+    data: requestData,
+    receivedAt: new Date().toISOString(),
+  });
+});
+
+// 健康检查接口
+router.get('/api/health', (req, res) => {
+  res.json({
+    status: 'ok',
+    env: process.env.COZE_PROJECT_ENV,
+    timestamp: new Date().toISOString(),
+  });
+});
+
+export default router;

package/lib/__templates__/vite/server/server.ts

@@ -0,0 +1,65 @@
+// ABOUTME: Express server with Vite integration
+// ABOUTME: Handles API routes and serves frontend in dev/prod modes
+
+import { createServer, type Server } from 'http';
+import express from 'express';
+import router from './routes/index';
+import { setupVite } from './vite';
+
+const isDev = process.env.COZE_PROJECT_ENV !== 'PROD';
+const port = parseInt(process.env.PORT || '<%= port %>', 10);
+const hostname = process.env.HOSTNAME || 'localhost';
+const app = express();
+// 使用 http.createServer 包装 Express app，以便支持 WebSocket 等协议升级
+const server = createServer(app);
+
+async function startServer(): Promise<Server> {
+  // 请求日志（仅开发环境）
+  if (isDev) {
+    app.use((req, res, next) => {
+      const start = Date.now();
+      res.on('finish', () => {
+        const ms = Date.now() - start;
+        console.log(`${req.method} ${req.url} - ${ms}ms`);
+      });
+      next();
+    });
+  }
+
+  // 添加请求体解析
+  app.use(express.json());
+  app.use(express.urlencoded({ extended: true }));
+
+  // 注册 API 路由
+  app.use(router);
+
+  // 集成 Vite（开发模式）或静态文件服务（生产模式）
+  await setupVite(app);
+
+  // 全局错误处理
+  app.use((err: Error, req: express.Request, res: express.Response) => {
+    console.error('Server error:', err);
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const status = 'status' in err ? (err as any).status || 500 : 500;
+    res.status(status).json({
+      error: err.message || 'Internal server error',
+    });
+  });
+
+  server.once('error', err => {
+    console.error('Server error:', err);
+    process.exit(1);
+  });
+
+  server.listen(port, () => {
+    console.log(`\n✨ Server running at http://${hostname}:${port}`);
+    console.log(`📝 Environment: ${isDev ? 'development' : 'production'}\n`);
+  });
+
+  return server;
+}
+
+startServer().catch(err => {
+  console.error('Failed to start server:', err);
+  process.exit(1);
+});

package/lib/__templates__/vite/server/vite.ts

@@ -0,0 +1,67 @@
+// ABOUTME: Vite integration for Express server
+// ABOUTME: Handles dev middleware and production static file serving
+
+import type { Application, Request, Response } from 'express';
+import express from 'express';
+import path from 'path';
+import fs from 'fs';
+import { createServer as createViteServer } from 'vite';
+import viteConfig from '../vite.config';
+
+const isDev = process.env.COZE_PROJECT_ENV !== 'PROD';
+
+/**
+ * 集成 Vite 开发服务器（中间件模式）
+ */
+export async function setupViteMiddleware(app: Application) {
+  const vite = await createViteServer({
+    ...viteConfig,
+    server: {
+      ...viteConfig.server,
+      middlewareMode: true,
+    },
+    appType: 'spa',
+  });
+
+  // 使用 Vite middleware
+  app.use(vite.middlewares);
+
+  console.log('🚀 Vite dev server initialized');
+}
+
+/**
+ * 设置生产环境静态文件服务
+ */
+export function setupStaticServer(app: Application) {
+  const distPath = path.resolve(process.cwd(), 'dist');
+
+  if (!fs.existsSync(distPath)) {
+    console.error('❌ dist folder not found. Please run "pnpm build" first.');
+    process.exit(1);
+  }
+
+  // 1. 服务静态文件（如果存在对应文件则直接返回）
+  app.use(express.static(distPath));
+
+  // 2. SPA fallback - 所有未处理的请求返回 index.html
+  // 到达这里的请求说明：
+  //   - 不是 API 请求（已被前面注册的路由处理）
+  //   - 不是静态文件（express.static 未找到对应文件）
+  //   - 需要返回 index.html 让前端路由处理
+  app.use((_req: Request, res: Response) => {
+    res.sendFile(path.join(distPath, 'index.html'));
+  });
+
+  console.log('📦 Serving static files from dist/');
+}
+
+/**
+ * 根据环境设置 Vite
+ */
+export async function setupVite(app: Application) {
+  if (isDev) {
+    await setupViteMiddleware(app);
+  } else {
+    setupStaticServer(app);
+  }
+}

package/lib/__templates__/vite/tsconfig.json

@@ -3,14 +3,15 @@
     "target": "ES2020",
     "lib": ["ES2020", "DOM", "DOM.Iterable"],
     "module": "ESNext",
-    "moduleResolution": "bundler",
+    "moduleResolution": "node",
     "strict": true,
     "esModuleInterop": true,
     "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true,
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "noEmit": true
+    "noEmit": true,
+    "types": ["node"]
   },
-  "include": ["src"]
+  "include": ["src", "server"]
 }

package/lib/__templates__/vite/vite.config.ts

@@ -4,6 +4,7 @@ export default defineConfig({
   server: {
     port: <%= port %>,
     host: '0.0.0.0',
+    allowedHosts: true,
     hmr: {
       overlay: true,
       path: '/hot/vite-hmr',
@@ -11,5 +12,9 @@ export default defineConfig({
       clientPort: 443,
       timeout: 30000,
     },
+    watch: {
+      usePolling: true,
+      interval: 100,
+    }
   },
 });

package/lib/cli.js

@@ -4,6 +4,8 @@
 var commander = require('commander');
 var path = require('path');
 var fs = require('fs');
+var node_path = require('node:path');
+var node_fs = require('node:fs');
 var shelljs = require('shelljs');
 var perf_hooks = require('perf_hooks');
 var fs$1 = require('fs/promises');
@@ -481,6 +483,14 @@ const warmupTemplate = (templatePath, templateName) => {
   logger.info(`\nWarming up template: ${templateName}`);
   logger.info(`  Path: ${templatePath}`);
 
+  // 检查是否存在 package.json
+  const packageJsonPath = node_path.join(templatePath, 'package.json');
+  // eslint-disable-next-line security/detect-non-literal-fs-filename
+  if (!node_fs.existsSync(packageJsonPath)) {
+    logger.info(`  ⊘ Skipping ${templateName} (no package.json found)`);
+    return;
+  }
+
   const result = shelljs.exec('pnpm install', {
     cwd: templatePath,
     silent: true,
@@ -514,13 +524,7 @@ const warmupTemplate = (templatePath, templateName) => {
 /**
  * 执行 warmup 命令的内部实现
  */
-const executeWarmup = async (
-  options
-
-,
-
-  command,
-) => {
+const executeWarmup = async (options) => {
   const timer = new TimeTracker();
 
   try {
@@ -590,7 +594,7 @@ const registerCommand$4 = program => {
     .command('warmup')
     .description('Pre-install dependencies for templates to speed up init')
     .option('-t, --template <name>', 'Warmup a specific template only')
-    .action(async (options, command) => {
+    .action(async options => {
       await executeWarmup(options);
     });
 };
@@ -1718,38 +1722,6 @@ const collectFilesToRender = async (options
 
   return filesToWrite;
 };
-
-/**
- * 检测文件冲突
- *
- * @param outputPath - 输出目录路径
- * @param filesToWrite - 将要写入的文件路径列表
- * @returns 冲突的文件路径列表
- */
-const detectFileConflicts = (
-  outputPath,
-  filesToWrite,
-) => {
-  logger.verbose('\nChecking for file conflicts...');
-
-  const conflicts = [];
-
-  for (const file of filesToWrite) {
-    const fullPath = path.join(outputPath, file);
-    if (fs.existsSync(fullPath)) {
-      conflicts.push(file);
-      logger.verbose(`  ⚠ Conflict detected: ${file}`);
-    }
-  }
-
-  if (conflicts.length === 0) {
-    logger.verbose('  ✓ No conflicts detected');
-  } else {
-    logger.verbose(`  ⚠ ${conflicts.length} conflicts detected`);
-  }
-
-  return conflicts;
-};
 // end_aigc
 
 // ABOUTME: Main file processing orchestration for template rendering
@@ -1805,7 +1777,7 @@ const processSingleFile = async (options
  * 1. 验证模板目录
  * 2. 扫描所有模板文件
  * 3. Dry-run：收集将要写入的文件列表（考虑 hooks 影响）
- * 4. 冲突检测：检查是否有文件会被覆盖
+ * 4. 冲突检测：检查是否有文件会被覆盖（可通过 force 跳过）
  * 5. 实际写入：渲染并写入所有文件
  * 6. 复制 node_modules（如果存在）
  *
@@ -1816,8 +1788,9 @@ const processTemplateFiles = async (options
 
 
 
+
 ) => {
-  const { templatePath, outputPath, context, templateConfig } = options;
+  const { templatePath, outputPath, context, templateConfig} = options;
   logger.verbose('Processing template files:');
   logger.verbose(`  - Template path: ${templatePath}`);
   logger.verbose(`  - Output path: ${outputPath}`);
@@ -1849,23 +1822,17 @@ const processTemplateFiles = async (options
   }
 
   // 阶段 2: Dry-run - 收集所有将要写入的文件
-  const filesToWrite = await collectFilesToRender({
+  await collectFilesToRender({
     files,
     templatePath,
     context,
     templateConfig,
   });
 
-  // 阶段 3: 冲突检测
-  const conflicts = detectFileConflicts(outputPath, filesToWrite);
-
-  if (conflicts.length > 0) {
-    // 有冲突，抛出详细的错误信息
-    const conflictList = conflicts.map(f => `  - ${f}`).join('\n');
-    throw new Error(
-      `File conflicts detected in output directory: ${outputPath}\n\n` +
-        `The following files already exist and would be overwritten:\n${conflictList}\n\n` +
-        'Please remove these files or use a different output directory.',
+  // 阶段 3: 冲突检测（force 为 true 时跳过）
+  {
+    logger.verbose(
+      '  - Force mode enabled, skipping conflict detection. Existing files will be overwritten.',
     );
   }
 
@@ -1898,6 +1865,7 @@ const processTemplateFiles = async (options
 
 
 
+
 /**
  * 加载模板元数据和路径
  */
@@ -2007,7 +1975,7 @@ const prepareOutputDirectory = (outputPath) => {
 const execute = async (
   options,
 ) => {
-  const { templateName, outputPath, command } = options;
+  const { templateName, outputPath, command} = options;
 
   // 1. 加载模板
   const { templatePath } = await loadTemplateMetadata(templateName);
@@ -2031,8 +1999,7 @@ const execute = async (
     templatePath,
     outputPath: absoluteOutputPath,
     context,
-    templateConfig,
-  });
+    templateConfig});
 
   // 7. 执行 onAfterRender 钩子
   await executeAfterRenderHook(templateConfig, context, absoluteOutputPath);
@@ -2083,7 +2050,40 @@ const runPnpmInstall = (projectPath) => {
 };
 
 /**
- * 初始化 git 仓库并创建初始提交
+ * 运行 git 命令的辅助函数
+ */
+const runGitCommand = (command, projectPath) => {
+  logger.info(`Executing: ${command}`);
+
+  const result = shelljs.exec(command, {
+    cwd: projectPath,
+    silent: true,
+  });
+
+  // 输出命令的结果
+  if (result.stdout) {
+    process.stdout.write(result.stdout);
+  }
+
+  if (result.stderr) {
+    process.stderr.write(result.stderr);
+  }
+
+  if (result.code !== 0) {
+    const errorMessage = [
+      `${command} failed with exit code ${result.code}`,
+      result.stderr ? `\nStderr:\n${result.stderr}` : '',
+      result.stdout ? `\nStdout:\n${result.stdout}` : '',
+    ]
+      .filter(Boolean)
+      .join('');
+
+    throw new Error(errorMessage);
+  }
+};
+
+/**
+ * 初始化 git 仓库
  * 如果目录中已存在 .git,则跳过初始化
  */
 const runGitInit = (projectPath) => {
@@ -2096,46 +2096,9 @@ const runGitInit = (projectPath) => {
     return;
   }
 
-  const runGitCommand = (command) => {
-    logger.info(`Executing: ${command}`);
-
-    const result = shelljs.exec(command, {
-      cwd: projectPath,
-      silent: true,
-    });
-
-    // 输出命令的结果
-    if (result.stdout) {
-      process.stdout.write(result.stdout);
-    }
-
-    if (result.stderr) {
-      process.stderr.write(result.stderr);
-    }
-
-    if (result.code !== 0) {
-      const errorMessage = [
-        `${command} failed with exit code ${result.code}`,
-        result.stderr ? `\nStderr:\n${result.stderr}` : '',
-        result.stdout ? `\nStdout:\n${result.stdout}` : '',
-      ]
-        .filter(Boolean)
-        .join('');
-
-      throw new Error(errorMessage);
-    }
-  };
-
   try {
     logger.info('\nInitializing git repository...');
-    runGitCommand('git init');
-
-    logger.info('Adding files to git...');
-    runGitCommand('git add .');
-
-    logger.info('Creating initial commit...');
-    runGitCommand('git commit -m "chore: initial commit"');
-
+    runGitCommand('git init', projectPath);
     logger.success('Git repository initialized successfully!');
   } catch (error) {
     // Git 初始化失败不应该导致整个流程失败
@@ -2146,6 +2109,35 @@ const runGitInit = (projectPath) => {
   }
 };
 
+/**
+ * 提交初始化生成的所有文件
+ */
+const commitChanges = (projectPath) => {
+  // 检查是否存在 .git 目录
+  const gitDir = path.join(projectPath, '.git');
+  if (!fs.existsSync(gitDir)) {
+    logger.warn(
+      '\n⚠️  Git repository does not exist, skipping commit. Run git init first.',
+    );
+    return;
+  }
+
+  try {
+    logger.info('\nCommitting initialized files...');
+    runGitCommand('git add --all', projectPath);
+    runGitCommand('git commit -m "chore: init env"', projectPath);
+    logger.success('Changes committed successfully!');
+  } catch (error) {
+    // Commit 失败不应该导致整个流程失败
+    logger.warn(
+      `Git commit failed: ${error instanceof Error ? error.message : String(error)}`,
+    );
+    logger.info(
+      'You can manually commit later with: git add --all && git commit -m "chore: init env"',
+    );
+  }
+};
+
 /**
  * 运行开发服务器(后台模式)
  * 启动后台子进程运行开发服务器，父进程可以直接退出
@@ -2187,6 +2179,8 @@ const executeInit = async (
 
 
 
+
+
 ,
   command,
 ) => {
@@ -2198,7 +2192,9 @@ const executeInit = async (
       output: outputPath,
       skipInstall,
       skipGit,
+      skipCommit,
       skipDev,
+      force,
     } = options;
 
     logger.info(`Initializing project with template: ${templateName}`);
@@ -2209,16 +2205,27 @@ const executeInit = async (
       templateName,
       outputPath,
       command,
+      force,
     });
     const { outputPath: absoluteOutputPath, templateConfig, context } = result;
 
     timer.logPhase('Template engine execution');
     logger.success('Project created successfully!');
 
+    // 检查是否存在 package.json
+    const packageJsonPath = path.join(absoluteOutputPath, 'package.json');
+    const hasPackageJson = fs.existsSync(packageJsonPath);
+
     // 安装依赖（始终使用 pnpm install，利用缓存机制）
     if (!skipInstall) {
-      runPnpmInstall(absoluteOutputPath);
-      timer.logPhase('Dependencies installation');
+      if (hasPackageJson) {
+        runPnpmInstall(absoluteOutputPath);
+        timer.logPhase('Dependencies installation');
+      } else {
+        logger.info(
+          '\n💡 No package.json found, skipping dependency installation',
+        );
+      }
     }
 
     // 执行 onComplete 钩子（在 pnpm install 之后）
@@ -2231,6 +2238,12 @@ const executeInit = async (
       timer.logPhase('Git initialization');
     }
 
+    // 如果没有跳过 commit，则提交初始化生成的文件
+    if (!skipCommit) {
+      commitChanges(absoluteOutputPath);
+      timer.logPhase('Git commit');
+    }
+
     // 如果没有跳过 dev，则启动开发服务器
     if (!skipDev) {
       runDev(absoluteOutputPath);
@@ -2239,13 +2252,14 @@ const executeInit = async (
       // 只有跳过 dev 时才显示 Next steps
       logger.info('\nNext steps:');
       logger.info(`  cd ${outputPath}`);
-      if (skipInstall) {
+      if (skipInstall && hasPackageJson) {
         logger.info('  pnpm install');
       }
       if (skipGit) {
-        logger.info(
-          '  git init && git add . && git commit -m "initial commit"',
-        );
+        logger.info('  git init');
+      }
+      if (skipCommit) {
+        logger.info('  git add --all && git commit -m "chore: init env"');
       }
       logger.info('  coze dev');
     }
@@ -2272,12 +2286,19 @@ const registerCommand$1 = program => {
     .option('-o, --output <path>', 'Output directory', process.cwd())
     .option('--skip-install', 'Skip automatic pnpm install', false)
     .option('--skip-git', 'Skip automatic git initialization', false)
+    .option(
+      '--skip-commit',
+      'Skip automatic git commit after initialization',
+      false,
+    )
     .option('--skip-dev', 'Skip automatic dev server start', false)
     .allowUnknownOption() // 允许透传参数
     .action(async (directory, options, command) => {
       // 位置参数优先级高于 --output 选项
       const outputPath = _nullishCoalesce(directory, () => ( options.output));
-      await executeInit({ ...options, output: outputPath }, command);
+      // Always use force mode - overwrite existing files without conflict check
+      const force = true;
+      await executeInit({ ...options, output: outputPath, force }, command);
     });
 };
 
@@ -2577,7 +2598,7 @@ const registerCommand = program => {
     });
 };
 
-var version = "0.0.1-alpha.de5a13";
+var version = "0.0.1-alpha.deaedf";
 var packageJson = {
 	version: version};
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coze-arch/cli",
-  "version": "0.0.1-alpha.de5a13",
+  "version": "0.0.1-alpha.deaedf",
   "private": false,
   "description": "coze coding devtools cli",
   "license": "MIT",
@@ -50,6 +50,7 @@
     "@coze-arch/vitest-config": "workspace:*",
     "@coze-coding/lambda": "workspace:*",
     "@inquirer/prompts": "^3.2.0",
+    "@playwright/test": "~1.55.0",
     "@types/ejs": "^3.1.5",
     "@types/iarna__toml": "^2.0.5",
     "@types/js-yaml": "^4.0.9",
@@ -57,13 +58,16 @@
     "@types/minimist": "^1.2.5",
     "@types/node": "^24",
     "@types/shelljs": "^0.10.0",
-    "@vitest/coverage-v8": "~4.0.16",
+    "@vitest/coverage-v8": "~4.0.18",
     "json-schema-to-typescript": "^15.0.3",
     "minimatch": "^10.0.1",
+    "playwright": "~1.55.0",
     "rollup": "^4.41.1",
     "sucrase": "^3.35.0",
+    "tree-kill": "^1.2.2",
     "tsx": "^4.20.6",
-    "vitest": "~4.0.16"
+    "vite-tsconfig-paths": "^4.2.1",
+    "vitest": "~4.0.18"
   },
   "publishConfig": {
     "access": "public",