ccman 1.0.1 → 2.0.0

package/scripts/modules/create-tag.sh

@@ -43,12 +43,40 @@ check_tag_exists() {
     fi
 }
 
-# 创建tag
+# 创建tag（静默模式，只返回tag名称）
 create_tag() {
     local version=$1
     local tag_name="v$version"
     local force_flag=""
     
+    # 静默检查tag是否存在
+    if check_tag_exists "$tag_name"; then
+        # 静默删除现有tag
+        git tag -d "$tag_name" >/dev/null 2>&1
+        force_flag="--force"
+    fi
+    
+    # 静默创建tag
+    local tag_message="Release v$version
+
+📦 发布版本 v$version
+⏰ $(date '+%Y-%m-%d %H:%M:%S')
+
+🤖 Generated with [Claude Code](https://claude.ai/code)
+
+Co-Authored-By: Claude <noreply@anthropic.com>"
+    
+    git tag -a "$tag_name" -m "$tag_message" >/dev/null 2>&1
+    
+    # 只输出tag名称
+    echo "$tag_name"
+}
+
+# 创建tag（交互模式，带打印信息）
+create_tag_interactive() {
+    local version=$1
+    local tag_name="v$version"
+    
     print_info "检查tag: $tag_name"
     
     if check_tag_exists "$tag_name"; then
@@ -59,7 +87,6 @@ create_tag() {
         if [[ $REPLY =~ ^[Yy]$ ]]; then
             print_info "删除现有tag: $tag_name"
             git tag -d "$tag_name"
-            force_flag="--force"
         else
             print_info "跳过tag创建，使用现有tag"
             echo "$tag_name"  # 返回tag名称
@@ -121,11 +148,11 @@ push_to_remote_quiet() {
     # 推送提交（如果有）
     if [ "$has_commit" = "true" ]; then
         local current_branch=$(git branch --show-current)
-        git push origin "$current_branch" 2>/dev/null
+        git push origin "$current_branch" >/dev/null 2>&1
     fi
     
     # 推送tag
-    git push origin "$tag_name" 2>/dev/null || git push origin "$tag_name" --force 2>/dev/null
+    git push origin "$tag_name" >/dev/null 2>&1 || git push origin "$tag_name" --force >/dev/null 2>&1
 }
 
 # 推送tag和提交到远程（交互模式）
@@ -158,8 +185,8 @@ create_tag_quietly() {
     # 检查tag是否已存在
     if check_tag_exists "$tag_name"; then
         # 如果tag存在，删除并重新创建
-        git tag -d "$tag_name" 2>/dev/null
-        git push origin --delete "$tag_name" 2>/dev/null
+        git tag -d "$tag_name" >/dev/null 2>&1
+        git push origin --delete "$tag_name" >/dev/null 2>&1
     fi
     
     # 创建tag
@@ -172,10 +199,10 @@ create_tag_quietly() {
 
 Co-Authored-By: Claude <noreply@anthropic.com>"
     
-    git tag -a "$tag_name" -m "$tag_message" 2>/dev/null
+    git tag -a "$tag_name" -m "$tag_message" >/dev/null 2>&1
     
-    # 静默推送
-    push_to_remote_quiet "$tag_name" "false"
+    # 静默推送（始终推送当前分支和tag）
+    push_to_remote_quiet "$tag_name" "true"
     
     # 输出tag名称
     echo "$tag_name"
@@ -199,8 +226,24 @@ create_tag_and_commit() {
         exit 0
     fi
     
-    # 创建tag
+    # 创建tag（显示交互信息）
+    print_info "检查tag: v$version"
+    if check_tag_exists "v$version"; then
+        print_warning "tag v$version 已存在"
+        read -p "是否要重新创建此tag? (y/N): " -n 1 -r
+        echo
+        
+        if [[ $REPLY =~ ^[Yy]$ ]]; then
+            print_info "删除现有tag: v$version"
+            git tag -d "v$version"
+        else
+            print_info "跳过tag创建，使用现有tag"
+        fi
+    fi
+    
+    print_info "创建tag: v$version"
     local tag_name=$(create_tag "$version")
+    print_success "tag $tag_name 创建成功"
     
     # 提交更改（如果有）
     local has_commit="false"

package/scripts/modules/monitor-release.sh

@@ -74,12 +74,13 @@ check_github_actions() {
         # 检查最新的workflow运行状态
         local api_response=$(curl -s "https://api.github.com/repos/${REPO_OWNER}/${REPO_NAME}/actions/runs?per_page=1" 2>/dev/null || echo "")
         
-        if [ -n "$api_response" ]; then
+        if [ -n "$api_response" ] && ! echo "$api_response" | grep -q '"message"'; then
             local run_status=$(echo "$api_response" | grep -o '"status":"[^"]*"' | head -1 | cut -d'"' -f4 2>/dev/null || echo "unknown")
             local run_conclusion=$(echo "$api_response" | grep -o '"conclusion":"[^"]*"' | head -1 | cut -d'"' -f4 2>/dev/null || echo "null")
             
             case "$run_status" in
                 "completed")
+                    echo  # 换行
                     if [ "$run_conclusion" = "success" ]; then
                         print_success "GitHub Actions 构建成功! ✨"
                         return 0
@@ -156,9 +157,13 @@ check_github_release() {
         
         if [ -n "$release_response" ] && ! echo "$release_response" | grep -q '"message":"Not Found"'; then
             # 检查release状态
-            local release_draft=$(echo "$release_response" | grep -o '"draft":[^,}]*' | cut -d':' -f2 2>/dev/null || echo "true")
+            local release_draft=$(echo "$release_response" | grep -o '"draft":[^,}]*' | cut -d':' -f2 | tr -d ' ' 2>/dev/null || echo "true")
+            
+            # 调试输出
+            # echo "[DEBUG] release_draft = '$release_draft'" >&2
             
             if [ "$release_draft" = "false" ]; then
+                echo  # 换行
                 print_success "GitHub Release v$version 创建成功! 🎉"
                 return 0
             else
@@ -220,7 +225,7 @@ generate_summary() {
     fi
 }
 
-# 主函数: 监控发布状态
+# 主函数: 监控发布状态（只监控NPM和Release）
 monitor_release() {
     local version=$(get_version_info)
     local commit_id=$(get_latest_commit)
@@ -232,8 +237,12 @@ monitor_release() {
     print_info "超时: ${MAX_WAIT_MINUTES} 分钟"
     echo ""
     
-    # 显示监控链接
-    show_monitoring_links "$version" "$commit_id"
+    # 显示监控链接（只显示需要的）
+    print_info "📊 监控链接:"
+    echo "   🔗 NPM Package: https://www.npmjs.com/package/${PACKAGE_NAME}"
+    echo "   🔗 NPM Version: https://www.npmjs.com/package/${PACKAGE_NAME}/v/${version}"
+    echo "   🔗 GitHub Release: https://github.com/${REPO_OWNER}/${REPO_NAME}/releases/tag/v${version}"
+    echo ""
     
     # 检查curl是否可用
     if ! command -v curl &> /dev/null; then
@@ -242,16 +251,11 @@ monitor_release() {
         return 1
     fi
     
-    # 并行监控各个状态
     print_info "开始监控发布状态... (最长等待 ${MAX_WAIT_MINUTES} 分钟)"
     echo ""
     
-    # 检查GitHub Actions
-    check_github_actions
-    local actions_status=$?
-    
     # 检查NPM包发布
-    check_npm_package "$version"  
+    check_npm_package "$version"
     local npm_status=$?
     
     # 检查GitHub Release
@@ -259,7 +263,31 @@ monitor_release() {
     local release_status=$?
     
     # 生成总结报告
-    generate_summary "$version" $actions_status $npm_status $release_status
+    echo ""
+    echo "📋 发布监控总结"
+    echo "================"
+    echo "   版本: v$version"
+    echo "   NPM 包发布: $(get_status_icon $npm_status)"
+    echo "   GitHub Release: $(get_status_icon $release_status)"
+    echo ""
+    
+    # 结果判断
+    if [ $npm_status -eq 0 ] && [ $release_status -eq 0 ]; then
+        print_success "🎉 发布完成！NPM包和GitHub Release都已正常发布"
+        return 0
+    elif [ $npm_status -eq 2 ] || [ $release_status -eq 2 ]; then
+        print_warning "⚠️ 发布监控超时 (${MAX_WAIT_MINUTES}分钟)，请手动检查:"
+        if [ $npm_status -eq 2 ]; then
+            echo "   • NPM包状态: https://www.npmjs.com/package/${PACKAGE_NAME}/v/${version}"
+        fi
+        if [ $release_status -eq 2 ]; then
+            echo "   • GitHub Release: https://github.com/${REPO_OWNER}/${REPO_NAME}/releases/tag/v${version}"
+        fi
+        return 2
+    else
+        print_warning "⚠️ 发布部分失败，请手动检查上述链接"
+        return 1
+    fi
 }
 
 # 如果直接运行此脚本

package/scripts/modules/version-bump.sh

@@ -37,8 +37,10 @@ get_current_version() {
 calculate_version_preview() {
     local version_type=$1
     local preview=$(pnpm version $version_type --dry-run 2>/dev/null)
-    if [ $? -eq 0 ] && [ -n "$preview" ]; then
-        echo "$preview" | sed 's/^v//' 2>/dev/null || echo "计算失败"
+    
+    if [ -n "$preview" ]; then
+        # 移除前缀v并返回
+        echo "$preview" | sed 's/^v//'
     else
         echo "计算失败"
     fi
@@ -64,9 +66,9 @@ version_bump() {
     local version_type=${1:-""}
     
     # 安静模式检测：如果被其他脚本调用，则静默运行
-    if [ "$0" != "${BASH_SOURCE[0]}" ] || [ "$version_type" = "test" ]; then
+    if [ "$0" != "${BASH_SOURCE[0]}" ] || [ "$version_type" = "test" ] || [ "$version_type" = "--quiet" ]; then
         # 静默模式：只返回结果，不显示菜单
-        if [ -n "$version_type" ] && [ "$version_type" != "test" ]; then
+        if [ -n "$version_type" ] && [ "$version_type" != "test" ] && [ "$version_type" != "--quiet" ]; then
             execute_version_bump_quiet "$version_type" "$current_version"
             return $?
         else
@@ -94,23 +96,18 @@ version_bump() {
     show_version_menu "$current_version" "$suggested_type"
     
     # 获取用户选择
-    read -p "请选择版本升级类型 (1-5, 回车默认选择推荐): " choice
+    read -p "请选择版本升级类型 (1-4, 回车默认选择推荐): " choice
     
     # 处理用户选择
     case ${choice:-""} in
-        1|"")
-            if [ "$suggested_type" == "patch" ]; then
-                version_type="patch"
-            elif [ "$suggested_type" == "minor" ]; then
-                version_type="minor"  
-            else
-                version_type="major"
-            fi
+        "")
+            # 回车默认选择推荐版本
+            version_type="$suggested_type"
             ;;
-        2) version_type="patch" ;;
-        3) version_type="minor" ;;
-        4) version_type="major" ;;
-        5) handle_custom_version ;;
+        1) version_type="patch" ;;
+        2) version_type="minor" ;;
+        3) version_type="major" ;;
+        4) handle_custom_version ;;
         *) 
             print_error "无效选择"
             exit 1

package/scripts/smart-release-v3.sh

@@ -119,32 +119,26 @@ step_version_bump() {
         print_info "当前版本: v$current_version"
         NEW_VERSION="$current_version"
     else
-        print_info "是否需要版本升级?"
-        echo "1) 是，需要升级版本"
-        echo "2) 否，使用当前版本"
-        echo ""
-        
-        read -p "请选择 (1-2, 默认1): " version_choice
-        
-        case ${version_choice:-1} in
-            1)
-                print_info "启动版本升级流程..."
-                # 静默调用版本升级模块，捕获输出
-                NEW_VERSION=$("$MODULE_DIR/version-bump.sh" "$VERSION_TYPE" 2>/dev/null | tail -1)
-                if [ -z "$NEW_VERSION" ]; then
-                    print_error "版本升级失败"
-                fi
-                print_success "版本升级成功: v$NEW_VERSION"
-                ;;
-            2)
-                local current_version=$(node -p "require('./package.json').version")
-                print_info "使用当前版本: v$current_version"
-                NEW_VERSION="$current_version"
-                ;;
-            *)
-                print_error "无效选择"
-                ;;
-        esac
+        print_info "启动版本升级流程..."
+        # 如果指定了版本类型，静默调用
+        if [ -n "$VERSION_TYPE" ]; then
+            # 使用source方式调用，然后直接调用静默函数
+            source "$MODULE_DIR/version-bump.sh"
+            NEW_VERSION=$(execute_version_bump_quiet "$VERSION_TYPE" "$(get_current_version)")
+            if [ -z "$NEW_VERSION" ]; then
+                print_error "版本升级失败"
+            fi
+        else
+            # 没有指定版本类型，调用交互模式
+            "$MODULE_DIR/version-bump.sh"
+            local version_result=$?
+            if [ $version_result -eq 0 ]; then
+                NEW_VERSION=$(node -p "require('./package.json').version")
+            else
+                print_error "版本升级失败"
+            fi
+        fi
+        print_success "版本升级成功: v$NEW_VERSION"
     fi
     
     echo ""