@coze-arch/cli 0.0.1-alpha.e665f4 → 0.0.1-alpha.e70f72

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);
     });
 };
@@ -1511,46 +1515,6 @@ const convertDotfileName = (filePath) => {
 
   return filePath;
 };
-
-/**
- * 复制 node_modules 目录（如果存在）
- *
- * @param sourceNodeModules - 源 node_modules 路径
- * @param targetNodeModules - 目标 node_modules 路径
- */
-const copyNodeModules = (
-  sourceNodeModules,
-  targetNodeModules,
-) => {
-  if (!fs.existsSync(sourceNodeModules)) {
-    return;
-  }
-
-  logger.info('\nCopying node_modules from pre-warmed template...');
-  logger.verbose(`  From: ${sourceNodeModules}`);
-  logger.verbose(`  To: ${targetNodeModules}`);
-
-  const result = shelljs.exec(`cp -R "${sourceNodeModules}" "${targetNodeModules}"`, {
-    silent: true,
-  });
-
-  if (result.stdout) {
-    process.stdout.write(result.stdout);
-  }
-
-  if (result.stderr) {
-    process.stderr.write(result.stderr);
-  }
-
-  if (result.code === 0) {
-    logger.success('✓ node_modules copied successfully');
-  } else {
-    logger.warn(
-      `Failed to copy node_modules: ${result.stderr || 'unknown error'}`,
-    );
-    logger.info('Will need to run pnpm install manually');
-  }
-};
 // end_aigc
 
 // ABOUTME: File rendering utilities for template processing
@@ -1758,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
@@ -1845,7 +1777,7 @@ const processSingleFile = async (options
  * 1. 验证模板目录
  * 2. 扫描所有模板文件
  * 3. Dry-run：收集将要写入的文件列表（考虑 hooks 影响）
- * 4. 冲突检测：检查是否有文件会被覆盖
+ * 4. 冲突检测：检查是否有文件会被覆盖（可通过 force 跳过）
  * 5. 实际写入：渲染并写入所有文件
  * 6. 复制 node_modules（如果存在）
  *
@@ -1856,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}`);
@@ -1889,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.',
     );
   }
 
@@ -1925,11 +1852,7 @@ const processTemplateFiles = async (options
 
   logger.verbose('✓ All files processed successfully');
 
-  // 阶段 5: 单独处理 node_modules 目录（如果存在）
-  const sourceNodeModules = path.join(templatePath, 'node_modules');
-  const targetNodeModules = path.join(outputPath, 'node_modules');
-
-  copyNodeModules(sourceNodeModules, targetNodeModules);
+  // node_modules 将由 pnpm install 处理（利用缓存和硬链接机制）
 };
 // end_aigc
 
@@ -1942,6 +1865,7 @@ const processTemplateFiles = async (options
 
 
 
+
 /**
  * 加载模板元数据和路径
  */
@@ -2051,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);
@@ -2075,8 +1999,7 @@ const execute = async (
     templatePath,
     outputPath: absoluteOutputPath,
     context,
-    templateConfig,
-  });
+    templateConfig});
 
   // 7. 执行 onAfterRender 钩子
   await executeAfterRenderHook(templateConfig, context, absoluteOutputPath);
@@ -2127,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) => {
@@ -2140,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 初始化失败不应该导致整个流程失败
@@ -2190,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"',
+    );
+  }
+};
+
 /**
  * 运行开发服务器(后台模式)
  * 启动后台子进程运行开发服务器，父进程可以直接退出
@@ -2231,6 +2179,8 @@ const executeInit = async (
 
 
 
+
+
 ,
   command,
 ) => {
@@ -2242,7 +2192,9 @@ const executeInit = async (
       output: outputPath,
       skipInstall,
       skipGit,
+      skipCommit,
       skipDev,
+      force,
     } = options;
 
     logger.info(`Initializing project with template: ${templateName}`);
@@ -2253,25 +2205,26 @@ const executeInit = async (
       templateName,
       outputPath,
       command,
+      force,
     });
     const { outputPath: absoluteOutputPath, templateConfig, context } = result;
 
     timer.logPhase('Template engine execution');
     logger.success('Project created successfully!');
 
-    // 如果没有跳过安装，检查是否需要运行 pnpm install
-    if (!skipInstall) {
-      const nodeModulesPath = path.join(absoluteOutputPath, 'node_modules');
-      const hasNodeModules = fs.existsSync(nodeModulesPath);
+    // 检查是否存在 package.json
+    const packageJsonPath = path.join(absoluteOutputPath, 'package.json');
+    const hasPackageJson = fs.existsSync(packageJsonPath);
 
-      if (hasNodeModules) {
-        logger.info(
-          '\n💡 Using pre-warmed node_modules, skipping pnpm install',
-        );
-        timer.logPhase('Node modules (pre-warmed)');
-      } else {
+    // 安装依赖（始终使用 pnpm install，利用缓存机制）
+    if (!skipInstall) {
+      if (hasPackageJson) {
         runPnpmInstall(absoluteOutputPath);
         timer.logPhase('Dependencies installation');
+      } else {
+        logger.info(
+          '\n💡 No package.json found, skipping dependency installation',
+        );
       }
     }
 
@@ -2285,6 +2238,12 @@ const executeInit = async (
       timer.logPhase('Git initialization');
     }
 
+    // 如果没有跳过 commit，则提交初始化生成的文件
+    if (!skipCommit) {
+      commitChanges(absoluteOutputPath);
+      timer.logPhase('Git commit');
+    }
+
     // 如果没有跳过 dev，则启动开发服务器
     if (!skipDev) {
       runDev(absoluteOutputPath);
@@ -2293,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');
     }
@@ -2326,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);
     });
 };
 
@@ -2631,7 +2598,7 @@ const registerCommand = program => {
     });
 };
 
-var version = "0.0.1-alpha.e665f4";
+var version = "0.0.1-alpha.e70f72";
 var packageJson = {
 	version: version};
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coze-arch/cli",
-  "version": "0.0.1-alpha.e665f4",
+  "version": "0.0.1-alpha.e70f72",
   "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",

package/lib/__templates__/taro/src/app.ts

@@ -1,14 +0,0 @@
-import { PropsWithChildren } from 'react';
-import { useLaunch } from '@tarojs/taro';
-import { injectH5Styles } from '@/utils/h5-styles';
-import { enableWxDebugIfNeeded } from '@/utils/wx-debug';
-import '@/app.css';
-
-export default ({ children }: PropsWithChildren<any>) => {
-  useLaunch(() => {
-    enableWxDebugIfNeeded();
-    injectH5Styles();
-  });
-
-  return children;
-};

package/lib/__templates__/taro/src/utils/h5-styles.ts

@@ -1,22 +0,0 @@
-/**
- * H5 端特殊样式注入
- * 如无必要，请勿修改本文件
- */
-export function injectH5Styles() {
-  if (TARO_ENV !== 'h5') return
-
-  const style = document.createElement('style')
-  style.innerHTML = `
-/* H5 端隐藏 TabBar 空图标（只隐藏没有 src 的图标） */
-.weui-tabbar__icon:not([src]),
-.weui-tabbar__icon[src=''] {
-  display: none !important;
-}
-
-.weui-tabbar__item:has(.weui-tabbar__icon:not([src])) .weui-tabbar__label,
-.weui-tabbar__item:has(.weui-tabbar__icon[src='']) .weui-tabbar__label {
-  margin-top: 0 !important;
-}
-  `
-  document.head.appendChild(style)
-}

package/lib/__templates__/taro/src/utils/wx-debug.ts

@@ -1,23 +0,0 @@
-import Taro from '@tarojs/taro'
-
-/**
- * 微信小程序调试工具
- * 在开发版/体验版自动开启调试模式
- */
-export function enableWxDebugIfNeeded() {
-  // 仅在微信小程序环境执行
-  if (Taro.getEnv() === Taro.ENV_TYPE.WEAPP) {
-    try {
-      const accountInfo = Taro.getAccountInfoSync()
-      const envVersion = accountInfo.miniProgram.envVersion
-      console.log('[Debug] envVersion:', envVersion)
-
-      // 开发版/体验版自动开启调试
-      if (envVersion !== 'release') {
-        Taro.setEnableDebug({ enableDebug: true })
-      }
-    } catch (error) {
-      console.error('[Debug] 开启调试模式失败:', error)
-    }
-  }
-}