flu-cli 2.0.2 → 2.0.4

package/locales/en-US.json

@@ -0,0 +1,59 @@
+{
+  "cli.description": "🚀 Flutter MVVM Scaffolding Tool",
+  "cmd.new.desc": "Create Flutter project with real-time template preview",
+  "cmd.new.opt.template": "Template type: lite, modular, clean",
+  "cmd.new.opt.state": "State manager: default, provider, getx",
+  "cmd.new.opt.dir": "Project storage directory",
+  "cmd.new.opt.no_cache": "Do not use cache, force pull from Git",
+  "cmd.new.opt.remote": "Use remote Gitee templates (default uses local)",
+  "cmd.sync.desc": "Sync the latest standard code snippets to the current project",
+  "cmd.add.desc": "Add Flutter code component (page/p, widget/w, component/c, ...)",
+  "cmd.add.opt.feature": "Target feature module (modular/clean mode only)",
+  "cmd.add.opt.stateful": "Create StatefulWidget (StatelessWidget by default)",
+  "cmd.add.opt.stateless": "Force create StatelessWidget (even if with ViewModel, not recommended)",
+  "cmd.add.opt.list_page": "Create list page (BaseListPage)",
+  "cmd.add.opt.no_vm": "Do not generate ViewModel (page type only)",
+  "cmd.add.opt.json": "Generate from JSON file (model type only)",
+  "cmd.add.opt.list": "View supported types list",
+  "cmd.templates.desc": "View all templates or specific template details",
+  "cmd.update.desc": "Update template cache",
+  "cmd.update.opt.force": "Force refresh and clean untracked files",
+  "cmd.cache.desc": "Cache management (action: clean)",
+  "cmd.assets.desc": "Configure app icon and splash screen",
+  "cmd.template.desc": "Manage custom project templates",
+  "cmd.template.list.desc": "List all templates",
+  "cmd.template.add.desc": "Add custom template (id: unique ID, source: Git URL or local path)",
+  "cmd.template.add.opt.local": "Add local template (source is a path)",
+  "cmd.template.add.opt.name": "Display name",
+  "cmd.template.add.opt.branch": "Git branch (default is main)",
+  "cmd.template.add.opt.desc": "Description information",
+  "cmd.template.add.opt.force": "Overwrite existing template",
+  "cmd.template.remove.desc": "Delete custom template",
+  "cmd.completion.desc": "Generate Shell auto-completion script (bash/zsh)",
+  "cmd.config.desc": "Manage project generation config (.flu-cli.json)",
+  "cmd.config.init.desc": "Initialize config file (based on current project structure)",
+  "assets.intro": "🎨 Configure App Assets (Icon & Splash)",
+  "assets.setup_icon": "Do you want to set up an App Icon?",
+  "assets.icon_path": "Enter icon path (suggested 1024x1024 PNG)",
+  "assets.setup_splash": "Do you want to set up a Splash Screen?",
+  "assets.splash_logo": "Enter Splash Logo path",
+  "assets.bg_color": "Enter Splash background color (Hex)",
+  "assets.use_bg_image": "Use a background image for Splash?",
+  "assets.bg_image_path": "Enter background image path",
+  "assets.setup_dark": "Configure Splash for Dark Mode?",
+  "assets.dark_bg_color": "Enter Dark Mode background color (Hex)",
+  "assets.use_dark_logo": "Use a separate Logo for Dark Mode?",
+  "assets.dark_logo_path": "Enter Dark Mode Logo path",
+  "assets.no_assets": "No assets selected, operation ended",
+  "assets.configuring": "Configuring assets...",
+  "assets.success": "✓ Assets configured successfully",
+  "assets.done": "✨ App assets mapping completed!",
+  "assets.failed": "Failed to configure assets",
+  "assets.error_outro": "❌ Error occurred during configuration, please check logs",
+  "assets.not_flutter": "pubspec.yaml not found. Please run this command in a Flutter project root.",
+  "common.cancel": "Operation cancelled",
+  "common.bye": "Goodbye",
+  "snippets.sync_success": "✅ Code snippets synced successfully!",
+  "snippets.detect_config": "ℹ️  Project config detected, filtering snippets...",
+  "snippets.applied_filter": "Architecture-aware filtering applied (BasePage: {basePage}, ViewModel: {viewModel})"
+}

package/locales/zh-CN.json

@@ -0,0 +1,59 @@
+{
+  "cli.description": "🚀 Flutter MVVM 脚手架工具",
+  "cmd.new.desc": "创建 Flutter 项目（实时模板预览）",
+  "cmd.new.opt.template": "模板类型: lite, modular, clean",
+  "cmd.new.opt.state": "状态管理器: default, provider, getx",
+  "cmd.new.opt.dir": "项目存放目录",
+  "cmd.new.opt.no_cache": "不使用缓存，强制从 Git 拉取",
+  "cmd.new.opt.remote": "使用远程 Gitee 模板（默认使用本地模板）",
+  "cmd.sync.desc": "同步最新版本的标准代码片段到当前项目",
+  "cmd.add.desc": "添加 Flutter 代码组件 (page/p, widget/w, component/c, ...)",
+  "cmd.add.opt.feature": "所属功能模块（仅 modular/clean 模式）",
+  "cmd.add.opt.stateful": "创建 StatefulWidget（默认 StatelessWidget）",
+  "cmd.add.opt.stateless": "强制创建 StatelessWidget（即使有 ViewModel，不推荐）",
+  "cmd.add.opt.list_page": "创建列表页 (BaseListPage)",
+  "cmd.add.opt.no_vm": "不生成 ViewModel（仅 page 类型）",
+  "cmd.add.opt.json": "从 JSON 文件生成（仅 model 类型）",
+  "cmd.add.opt.list": "查看支持的类型列表",
+  "cmd.templates.desc": "查看所有模板或指定模板详情",
+  "cmd.update.desc": "更新模板缓存",
+  "cmd.update.opt.force": "强制刷新并清理未跟踪文件",
+  "cmd.cache.desc": "缓存管理 (action: clean)",
+  "cmd.assets.desc": "配置应用图标和启动图",
+  "cmd.template.desc": "管理自定义项目模板",
+  "cmd.template.list.desc": "列出所有模板",
+  "cmd.template.add.desc": "添加自定义模板 (id: 唯一标识, source: Git URL 或本地路径)",
+  "cmd.template.add.opt.local": "添加本地模板 (source 为路径)",
+  "cmd.template.add.opt.name": "显示名称",
+  "cmd.template.add.opt.branch": "Git 分支 (默认 main)",
+  "cmd.template.add.opt.desc": "描述信息",
+  "cmd.template.add.opt.force": "覆盖已存在的模板",
+  "cmd.template.remove.desc": "删除自定义模板",
+  "cmd.completion.desc": "生成 Shell 自动补全脚本 (bash/zsh)",
+  "cmd.config.desc": "管理项目生成配置 (.flu-cli.json)",
+  "cmd.config.init.desc": "初始化配置文件 (基于当前项目结构)",
+  "assets.intro": "🎨 配置应用资源 (图标 & 启动图)",
+  "assets.setup_icon": "是否要设置应用图标 (App Icon)?",
+  "assets.icon_path": "请输入图标路径 (建议 1024x1024 PNG)",
+  "assets.setup_splash": "是否要设置启动图 (Splash Screen)?",
+  "assets.splash_logo": "请输入启动页 Logo 路径",
+  "assets.bg_color": "请输入启动页背景颜色 (Hex)",
+  "assets.use_bg_image": "是否使用启动页背景图?",
+  "assets.bg_image_path": "请输入背景图路径",
+  "assets.setup_dark": "是否配置暗黑模式下的启动页?",
+  "assets.dark_bg_color": "请输入暗黑模式背景颜色 (Hex)",
+  "assets.use_dark_logo": "是否使用独立的暗黑模式 Logo?",
+  "assets.dark_logo_path": "请输入暗黑模式 Logo 路径",
+  "assets.no_assets": "未选择任何资源，操作结束",
+  "assets.configuring": "正在配置资源...",
+  "assets.success": "✓ 资源配置成功",
+  "assets.done": "✨ 应用资源映射完成！",
+  "assets.failed": "资源配置失败",
+  "assets.error_outro": "❌ 配置过程中出现错误，请检查日志",
+  "assets.not_flutter": "未检测到 pubspec.yaml，请在 Flutter 项目根目录下运行此命令",
+  "common.cancel": "操作已取消",
+  "common.bye": "再见",
+  "snippets.sync_success": "✅ 代码片段同步成功！",
+  "snippets.detect_config": "ℹ️  检测到项目配置，正在按需过滤代码片段...",
+  "snippets.applied_filter": "已应用架构感知过滤 (BasePage: {basePage}, ViewModel: {viewModel})"
+}

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "flu-cli",
-    "version": "2.0.2",
-    "description": "Flutter MVVM 脚手架工具 - V2",
+    "version": "2.0.4",
+    "description": "Flutter MVVM 脚手架工具",
     "main": "index.js",
     "type": "module",
     "bin": {
@@ -11,7 +11,6 @@
         "tag": "latest"
     },
     "scripts": {
-        "test": "echo \"Error: no test specified\" && exit 1",
         "start": "node ./index.js",
         "dev": "NODE_ENV=development node ./index.js --",
         "prod": "NODE_ENV=production node ./index.js",

package/release.sh

@@ -12,6 +12,7 @@ echo "===================="
 GREEN='\033[0;32m'
 YELLOW='\033[1;33m'
 RED='\033[0;31m'
+BLUE='\033[0;34m'
 NC='\033[0m' # No Color
 
 # 检查当前目录
@@ -20,9 +21,300 @@ if [ ! -f "package.json" ]; then
     exit 1
 fi
 
+# 检查当前分支
+CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+echo -e "当前分支: ${BLUE}${CURRENT_BRANCH}${NC}"
+
+if [ "$CURRENT_BRANCH" != "main" ]; then
+    echo -e "${YELLOW}⚠️  警告: 当前不在 main 分支${NC}"
+    echo -e "${YELLOW}非 main 分支只能打包测试，不能发布到 NPM${NC}"
+    echo ""
+fi
+
 # 获取当前版本
 CURRENT_VERSION=$(node -p "require('./package.json').version")
 echo -e "当前版本: ${GREEN}v${CURRENT_VERSION}${NC}"
+PREV_VERSION_TAG="cli-v${CURRENT_VERSION}"
+
+# 同步远端 tags
+git fetch --tags >/dev/null 2>&1 || true
+
+# 确保工作区干净
+if [ -n "$(git status --porcelain)" ]; then
+    echo -e "${RED}错误: Git 工作区不干净，请先提交或清理变更后再发布${NC}"
+    git status --porcelain
+    exit 1
+fi
+
+PRE_RELEASE_HEAD=$(git rev-parse HEAD)
+ROLLBACK_ENABLED=0
+TAG_CREATED=0
+PUBLISH_SUCCEEDED=0
+NEW_VERSION=""
+
+rollback_release() {
+    if [ "$ROLLBACK_ENABLED" != "1" ]; then
+        return
+    fi
+
+    echo -e "${YELLOW}正在回滚版本变更...${NC}"
+
+    if [ "$TAG_CREATED" = "1" ] && [ -n "$NEW_VERSION" ]; then
+        if git rev-parse "cli-v${NEW_VERSION}" >/dev/null 2>&1; then
+            git tag -d "cli-v${NEW_VERSION}" >/dev/null 2>&1 || true
+        fi
+    fi
+
+    git reset --hard "$PRE_RELEASE_HEAD" >/dev/null 2>&1 || true
+}
+
+open_entry_in_editor() {
+    local file="$1"
+    if command -v code >/dev/null 2>&1; then
+        code --wait "$file"
+        return
+    fi
+    if [ -n "$EDITOR" ]; then
+        "$EDITOR" "$file"
+        return
+    fi
+    vi "$file"
+}
+
+on_exit() {
+    local code="$1"
+    if [ "$code" -ne 0 ]; then
+        if [ "$PUBLISH_SUCCEEDED" = "1" ]; then
+            echo -e "${YELLOW}检测到脚本中断或失败，但发布已完成，跳过自动回滚${NC}"
+            return
+        fi
+        echo -e "${YELLOW}检测到脚本中断或失败，正在回滚版本变更...${NC}"
+        rollback_release
+    fi
+}
+
+trap 'on_exit $?' EXIT
+trap 'exit 130' INT TERM
+
+get_prev_tag() {
+    if git rev-parse "$PREV_VERSION_TAG" >/dev/null 2>&1; then
+        echo "$PREV_VERSION_TAG"
+        return
+    fi
+    # 尝试查找最近的 cli-v* tag
+    git describe --tags --match "cli-v*" --abbrev=0 2>/dev/null || true
+}
+
+format_commit_subject() {
+    local subject="$1"
+    local lower
+    lower=$(echo "$subject" | tr '[:upper:]' '[:lower:]')
+
+    if echo "$lower" | grep -qE '^feat(\([^)]+\))?:'; then
+        echo "✨ $(echo "$subject" | sed -E 's/^[Ff][Ee][Aa][Tt](\([^)]+\))?:[[:space:]]*//')"
+        return
+    fi
+    if echo "$lower" | grep -qE '^fix(\([^)]+\))?:'; then
+        echo "🐛 $(echo "$subject" | sed -E 's/^[Ff][Ii][Xx](\([^)]+\))?:[[:space:]]*//')"
+        return
+    fi
+    if echo "$lower" | grep -qE '^perf(\([^)]+\))?:'; then
+        echo "⚡️ $(echo "$subject" | sed -E 's/^[Pp][Ee][Rr][Ff](\([^)]+\))?:[[:space:]]*//')"
+        return
+    fi
+    if echo "$lower" | grep -qE '^refactor(\([^)]+\))?:'; then
+        echo "♻️ $(echo "$subject" | sed -E 's/^[Rr][Ee][Ff][Aa][Cc][Tt][Oo][Rr](\([^)]+\))?:[[:space:]]*//')"
+        return
+    fi
+    if echo "$lower" | grep -qE '^docs(\([^)]+\))?:'; then
+        echo "📝 $(echo "$subject" | sed -E 's/^[Dd][Oo][Cc][Ss](\([^)]+\))?:[[:space:]]*//')"
+        return
+    fi
+    if echo "$lower" | grep -qE '^test(\([^)]+\))?:'; then
+        echo "✅ $(echo "$subject" | sed -E 's/^[Tt][Ee][Ss][Tt](\([^)]+\))?:[[:space:]]*//')"
+        return
+    fi
+    if echo "$lower" | grep -qE '^build(\([^)]+\))?:'; then
+        echo "📦 $(echo "$subject" | sed -E 's/^[Bb][Uu][Ii][Ll][Dd](\([^)]+\))?:[[:space:]]*//')"
+        return
+    fi
+    if echo "$lower" | grep -qE '^ci(\([^)]+\))?:'; then
+        echo "👷 $(echo "$subject" | sed -E 's/^[Cc][Ii](\([^)]+\))?:[[:space:]]*//')"
+        return
+    fi
+    if echo "$lower" | grep -qE '^chore(\([^)]+\))?:'; then
+        echo "🧹 $(echo "$subject" | sed -E 's/^[Cc][Hh][Oo][Rr][Ee](\([^)]+\))?:[[:space:]]*//')"
+        return
+    fi
+
+    echo "$subject"
+}
+
+is_user_facing_subject() {
+    local subject="$1"
+    local lower
+    lower=$(echo "$subject" | tr '[:upper:]' '[:lower:]')
+
+    if echo "$lower" | grep -qE '^feat(\([^)]+\))?:'; then
+        return 0
+    fi
+    if echo "$lower" | grep -qE '^fix(\([^)]+\))?:'; then
+        return 0
+    fi
+    if echo "$lower" | grep -qE '^perf(\([^)]+\))?:'; then
+        return 0
+    fi
+    if echo "$lower" | grep -qE '^refactor(\([^)]+\))?:'; then
+        return 0
+    fi
+
+    return 1
+}
+
+# 检查提交是否影响 packages/v2
+commit_affects_v2() {
+    local sha="$1"
+
+    local files
+    files=$(git show --name-only --pretty=format: "$sha" 2>/dev/null || true)
+    if [ -z "$files" ]; then
+        return 1
+    fi
+
+    local relevant=1
+    local non_ignored_seen=1
+
+    while IFS= read -r file; do
+        if [ -z "$file" ]; then
+            continue
+        fi
+
+        # 忽略自身脚本和 CHANGELOG
+        if echo "$file" | grep -qE '^packages/v2/(release\.sh|CHANGELOG\.md)$'; then
+            continue
+        fi
+        
+        non_ignored_seen=0
+
+        # 只关注 packages/v2 目录下的变更，或者 packages/core (核心库变更也视为 CLI 变更)
+        if echo "$file" | grep -qE '^packages/v2/'; then
+            relevant=0
+            break
+        fi
+        if echo "$file" | grep -qE '^packages/core/'; then
+            relevant=0
+            break
+        fi
+    done <<< "$files"
+
+    if [ "$relevant" -eq 0 ]; then
+        return 0
+    fi
+
+    if [ "$non_ignored_seen" -ne 0 ]; then
+        return 1
+    fi
+
+    return 1
+}
+
+is_changelog_noise_subject() {
+    local subject="$1"
+    local lower
+    lower=$(echo "$subject" | tr '[:upper:]' '[:lower:]')
+
+    if echo "$lower" | grep -qE '^chore\(release\):'; then
+        return 0
+    fi
+    if echo "$lower" | grep -qE '(回退|回滚).*(版本号|版本)'; then
+        return 0
+    fi
+    if echo "$lower" | grep -qE '(revert|rollback).*(version)'; then
+        return 0
+    fi
+    if echo "$lower" | grep -qE 'bump(ing)? version'; then
+        return 0
+    fi
+    if echo "$lower" | grep -qE 'chore\(cli\): release'; then
+        return 0
+    fi
+    if echo "$lower" | grep -qE '^release v[0-9]+'; then
+        return 0
+    fi
+    if echo "$lower" | grep -qE '^更新 flu-cli 版本号'; then
+        return 0
+    fi
+    if echo "$lower" | grep -qE '^优化.*(发布流程|配置)'; then
+        # 这种比较宽泛，但也可能是噪音，视情况而定
+        # 暂时保留，由用户手动剔除
+        return 1
+    fi
+
+    return 1
+}
+
+build_changelog_bullets_from_git() {
+    local max_count="$1"
+    local prev_tag
+    prev_tag=$(get_prev_tag)
+
+    local range
+    if [ -n "$prev_tag" ]; then
+        range="${prev_tag}..HEAD"
+    else
+        # range="HEAD"
+        # 如果找不到上一版本 tag，说明可能是首次使用此脚本或 tag 丢失
+        # 此时只取最近的 commit，避免列出整个历史
+        echo -e "${YELLOW}提示: 未找到上一版本 tag (cli-v*)，将从最近提交中提取日志${NC}" >&2
+        range="HEAD"
+    fi
+
+    local output=""
+    local count=0
+    local commits
+    if [ -n "$prev_tag" ]; then
+        commits=$(git rev-list --no-merges "$range" 2>/dev/null || true)
+    else
+        # 无 tag 时，限制最大扫描深度，避免噪音过多
+        # 默认扫描最近 50 条，再由 max_count 截断
+        commits=$(git rev-list --no-merges -n 50 HEAD 2>/dev/null || true)
+    fi
+
+    while IFS= read -r sha; do
+        if [ -z "$sha" ]; then
+            continue
+        fi
+
+        local subject
+        subject=$(git log -1 --pretty=format:%s "$sha" 2>/dev/null || true)
+        if [ -z "$subject" ]; then
+            continue
+        fi
+        if is_changelog_noise_subject "$subject"; then
+            continue
+        fi
+
+        # 检查是否影响 v2
+        if ! commit_affects_v2 "$sha"; then
+            continue
+        fi
+
+        # 默认包含所有变更，但可以通过 is_user_facing_subject 过滤非用户关注的
+        # 这里为了更全面的日志，暂时放宽，只要影响 v2 且不是 noise 就展示
+        # 但为了美观，如果是 feat/fix/perf/refactor 等，会优先展示
+
+        local formatted
+        formatted=$(format_commit_subject "$subject")
+        output="${output}-   ${formatted}"$'\n'
+        count=$((count + 1))
+        if [ "$count" -ge "$max_count" ]; then
+            break
+        fi
+    done <<< "$commits"
+
+    echo "$output"
+}
+
 
 # 询问发布类型
 echo ""
@@ -31,7 +323,7 @@ echo "  1) patch (bug 修复, 1.0.0 -> 1.0.1)"
 echo "  2) minor (新功能, 1.0.0 -> 1.1.0)"
 echo "  3) major (重大变更, 1.0.0 -> 2.0.0)"
 echo "  4) 跳过版本更新"
-read -p "选择 [1-4]: " version_choice
+read -r -p "选择 [1-4]: " version_choice
 
 case $version_choice in
     1) VERSION_TYPE="patch" ;;
@@ -44,11 +336,14 @@ case $version_choice in
         ;;
 esac
 
+# 开启回滚保护
+ROLLBACK_ENABLED=1
+
 # 更新版本号
 if [ -n "$VERSION_TYPE" ]; then
     echo ""
     echo -e "${YELLOW}更新版本号...${NC}"
-    npm version $VERSION_TYPE --no-git-tag-version
+    npm version "$VERSION_TYPE" --no-git-tag-version
     NEW_VERSION=$(node -p "require('./package.json').version")
     echo -e "新版本: ${GREEN}v${NEW_VERSION}${NC}"
 else
@@ -60,10 +355,126 @@ echo ""
 echo -e "${YELLOW}运行测试...${NC}"
 npm test || echo -e "${YELLOW}警告: 测试未通过或未配置${NC}"
 
-# 确认发布
+# 更新 CHANGELOG
+if [ -n "$VERSION_TYPE" ]; then
+    echo ""
+    echo -e "${BLUE}更新内容来源:${NC}"
+    echo -e "  1) 自动生成（基于 git 提交日志）"
+    echo -e "  2) 手动输入（多条请用分号分隔）"
+    echo -e "  3) 跳过（不更新 CHANGELOG）"
+    read -r -p "请选择 (1/2/3，默认 1): " changelog_mode
+    if [ -z "$changelog_mode" ]; then
+        changelog_mode="1"
+    fi
+
+    RELEASE_DATE=$(date +"%Y-%m-%d")
+    NEW_ENTRY=$(printf "## [%s] - %s\n\n### 更新内容" "$NEW_VERSION" "$RELEASE_DATE")
+    
+    changelog_bullets=""
+
+    if [ "$changelog_mode" = "1" ]; then
+        read -r -p "最多取多少条提交（默认 30）: " max_commits
+        if [ -z "$max_commits" ]; then
+            max_commits="30"
+        fi
+        changelog_bullets=$(build_changelog_bullets_from_git "$max_commits")
+        
+        if [ -n "$changelog_bullets" ]; then
+            echo ""
+            echo -e "${BLUE}自动生成的更新内容预览:${NC}"
+            echo -e "$changelog_bullets"
+            echo ""
+            read -r -p "是否使用该内容写入 CHANGELOG? (y/n): " use_auto
+            if [ "$use_auto" != "y" ]; then
+                changelog_bullets=""
+            fi
+        fi
+    fi
+
+    if [ "$changelog_mode" != "3" ] && ([ "$changelog_mode" = "2" ] || [ -z "$changelog_bullets" ]); then
+        echo ""
+        echo -e "${BLUE}请输入本次更新的主要内容（多条请用分号分隔）:${NC}"
+        read -r -p "更新内容: " changelog_content
+        if [ -n "$changelog_content" ]; then
+            IFS=';' read -ra CHANGES <<< "$changelog_content"
+            for change in "${CHANGES[@]}"; do
+                change=$(echo "$change" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
+                if [ -n "$change" ]; then
+                    changelog_bullets="${changelog_bullets}-   ${change}"$'\n'
+                fi
+            done
+        fi
+    fi
+
+    # 确保末尾有换行
+    if [ -n "$changelog_bullets" ] && [ "${changelog_bullets: -1}" != $'\n' ]; then
+        changelog_bullets="${changelog_bullets}"$'\n'
+    fi
+
+    if [ "$changelog_mode" != "3" ] && [ -n "$changelog_bullets" ]; then
+        ENTRY_FILE=$(mktemp)
+        printf "%s\n\n" "$NEW_ENTRY" > "$ENTRY_FILE"
+        printf "%s" "$changelog_bullets" >> "$ENTRY_FILE"
+        printf "\n" >> "$ENTRY_FILE"
+
+        echo ""
+        read -r -p "是否打开编辑器检查/编辑后再写入 CHANGELOG? (y/n，默认 y): " edit_entry
+        if [ -z "$edit_entry" ]; then
+            edit_entry="y"
+        fi
+        if [ "$edit_entry" = "y" ]; then
+            open_entry_in_editor "$ENTRY_FILE"
+        fi
+
+        echo ""
+        echo -e "${BLUE}最终将写入 CHANGELOG 的内容预览:${NC}"
+        cat "$ENTRY_FILE"
+        echo ""
+        
+        # 写入 CHANGELOG.md
+        if [ -f "CHANGELOG.md" ]; then
+            TEMP_FILE=$(mktemp)
+            awk -v entryFile="$ENTRY_FILE" '
+                /^## / && !inserted {
+                    while ((getline line < entryFile) > 0) {
+                        print line
+                    }
+                    close(entryFile)
+                    inserted=1
+                }
+                {print}
+            ' CHANGELOG.md > "$TEMP_FILE"
+            mv "$TEMP_FILE" CHANGELOG.md
+            rm -f "$ENTRY_FILE"
+            echo -e "${GREEN}✓ CHANGELOG.md 已更新${NC}"
+        else
+            echo -e "${YELLOW}警告: CHANGELOG.md 不存在，创建新文件${NC}"
+            cat "$ENTRY_FILE" > CHANGELOG.md
+            rm -f "$ENTRY_FILE"
+        fi
+    fi
+fi
+
+# 询问是否发布到 NPM
 echo ""
+if [ "$CURRENT_BRANCH" != "main" ]; then
+    echo -e "${RED}===========================================${NC}"
+    echo -e "${RED}❌ 错误: 当前分支为 ${CURRENT_BRANCH}${NC}"
+    echo -e "${RED}只有 main 分支可以发布到 NPM${NC}"
+    echo -e "${RED}===========================================${NC}"
+    echo ""
+    echo -e "${YELLOW}如需发布，请切换到 main 分支:${NC}"
+    echo "  git checkout main"
+    echo "  git merge ${CURRENT_BRANCH}"
+    echo "  ./release.sh"
+    echo ""
+    echo -e "${GREEN}✓ 当前分支已完成打包测试准备${NC}"
+    exit 0
+fi
+
+# 确认发布
 echo -e "${YELLOW}准备发布 v${NEW_VERSION} 到 NPM${NC}"
-read -p "是否继续? (y/n): " confirm
+read -r -p "是否继续? (y/n): " confirm
 
 if [ "$confirm" != "y" ]; then
     echo -e "${RED}发布已取消${NC}"
@@ -74,23 +485,33 @@ fi
 echo ""
 echo -e "${YELLOW}发布到 NPM...${NC}"
 npm publish
+PUBLISH_SUCCEEDED=1
 
 # 提交代码并打标签
 if [ -n "$VERSION_TYPE" ]; then
     echo ""
     echo -e "${YELLOW}提交代码并打标签...${NC}"
     
-    cd ../..
-    git add .
-    git commit -m "chore: release v${NEW_VERSION}"
-    git tag "v${NEW_VERSION}"
+    # 提交 package.json 和 CHANGELOG.md
+    git add package.json CHANGELOG.md
+    git commit -m "chore(cli): release v${NEW_VERSION}"
+    
+    # 打 Tag (使用 cli-v 前缀)
+    TAG_NAME="cli-v${NEW_VERSION}"
+    if git rev-parse "$TAG_NAME" >/dev/null 2>&1; then
+        echo -e "${YELLOW}警告: Tag $TAG_NAME 已存在，跳过创建${NC}"
+    else
+        git tag -a "$TAG_NAME" -m "chore(release): v${NEW_VERSION}"
+        TAG_CREATED=1
+    fi
+    ROLLBACK_ENABLED=0
     
     echo -e "${GREEN}✓ 代码已提交并打标签${NC}"
     
-    read -p "是否推送到远程仓库? (y/n): " push_confirm
+    read -r -p "是否推送到远程仓库? (y/n): " push_confirm
     if [ "$push_confirm" = "y" ]; then
         git push origin main
-        git push origin "v${NEW_VERSION}"
+        git push origin "$TAG_NAME"
         echo -e "${GREEN}✓ 已推送到远程仓库${NC}"
     fi
 fi
@@ -98,7 +519,8 @@ fi
 echo ""
 echo -e "${GREEN}===================="
 echo "✅ 发布完成!"
-echo "===================="${NC}
+echo "===================="
+
 echo ""
 echo "下一步:"
 echo "  1. 部署文档: cd ../../docs && ./deploy-docs.sh"

package/scripts/sync-base-to-templates.js

@@ -20,16 +20,16 @@ const sourceDir = join(rootDir, 'templates', 'base_files');
 // 目标模板配置
 const templates = [
   {
-    name: 'template-lite',
-    basePath: join(rootDir, '..', 'template-lite', 'lib', 'base')
+    name: 'template_lite',
+    basePath: join(rootDir, '..', 'template_lite', 'lib', 'base')
   },
   {
-    name: 'template-modular',
-    basePath: join(rootDir, '..', 'template-modular', 'lib', 'core', 'base')
+    name: 'template_modular',
+    basePath: join(rootDir, '..', 'template_modular', 'lib', 'core', 'base')
   },
   {
-    name: 'template-clean',
-    basePath: join(rootDir, '..', 'template-clean', 'lib', 'core', 'base')
+    name: 'template_clean',
+    basePath: join(rootDir, '..', 'template_clean', 'lib', 'core', 'base')
   }
 ];