pindo 5.18.17 → 5.19.1

data/lib/pindo/module/appstore/appstore_in_app_purchase.rb

@@ -186,9 +186,9 @@ module Pindo
                 begin
                     response = appstore_client.create_in_app_purchase(
                     name:purchase_item["reference_name"],
-                    product_id:purchase_item["product_id"],
-                    in_app_purchase_type:purchase_item["in_app_purchase_type"],
-                    review_note:purchase_item["review_note"],
+                    productId:purchase_item["product_id"],
+                    inAppPurchaseType:purchase_item["in_app_purchase_type"],
+                    reviewNote:purchase_item["review_note"],
                     relationships: {
                         app:{
                             data:{
@@ -228,7 +228,7 @@ module Pindo
             begin
                 response = appstore_client.update_in_app_purchase(
                     name:purchase_item["reference_name"],
-                    review_note:purchase_item["review_note"],
+                    reviewNote:purchase_item["review_note"],
                     id:in_app_purchase_id
                 )
             rescue => err
@@ -255,22 +255,34 @@ module Pindo
                 end
             end
 
-            response = appstore_client.modify_in_app_purchase_territory_availablity(
-                            available_in_new_territories:true,
-                            relationships: {
-                                inAppPurchase:{
-                                    data:{
-                                        id: in_app_purchase_id,
-                                        type: 'inAppPurchases'
-                                    }
-                                },
-                                availableTerritories:{
-                                    data:availableTerritories_data
-                                }
+            body = {
+                data: {
+                    type: "inAppPurchaseAvailabilities",
+                    attributes: {
+                        availableInNewTerritories: true
+                    },
+                    relationships: {
+                        inAppPurchase: {
+                            data: {
+                                id: in_app_purchase_id,
+                                type: 'inAppPurchases'
                             }
-                        )
+                        },
+                        availableTerritories: {
+                            data: availableTerritories_data
+                        }
+                    }
+                }
+            }
 
-           # puts JSON.pretty_generate(response)
+            begin
+                client = Spaceship::ConnectAPI
+                client.tunes_request_client.post("#{Spaceship::ConnectAPI::Tunes::API::Version::V1}/inAppPurchaseAvailabilities", body)
+                puts "          Territory Availability 设置成功"
+            rescue => err
+                puts err
+                puts "      设置Territory Availability失败！！！"
+            end
 
         end
 
@@ -396,7 +408,7 @@ module Pindo
                 if !price_id.nil?
                    purchase_response = appstore_client.create_in_app_purchase_price_schedule(
                         relationships: {
-                            manual_prices: {
+                            manualPrices: {
                                 data: [
                                     {
                                         type: 'inAppPurchasePrices',
@@ -404,7 +416,7 @@ module Pindo
                                     }
                                 ]
                             },
-                            in_app_purchase: {
+                            inAppPurchase: {
                                 data: {
                                     type: 'inAppPurchases',
                                     id: in_app_purchase_id
@@ -488,8 +500,8 @@ module Pindo
 
                             puts "          正在上传...."
                             response_iap_screenshot = appstore_client.create_in_app_purchase_review_screenshot(
-                                file_name:filename,
-                                file_size: filesize,
+                                fileName:filename,
+                                fileSize: filesize,
                                 relationships: {
                                     inAppPurchaseV2:{
                                         data:{
@@ -519,7 +531,7 @@ module Pindo
                             in_app_purchase = appstore_client.update_in_app_purchase_app_store_review_screenshot(
                                 id:upload_id,
                                 uploaded: true,
-                                source_file_checksum:checksum
+                                sourceFileChecksum:checksum
                             )
                             puts "          上传完成！！"
 
@@ -632,7 +644,7 @@ module Pindo
 
             begin
                 group_response = appstore_client.create_subscription_group(
-                    reference_name:subscription_group_item["group_reference_name"],
+                    referenceName:subscription_group_item["group_reference_name"],
                      relationships: {
                                     app:{
                                         data:{
@@ -684,7 +696,7 @@ module Pindo
                                         response = appstore_client.update_subscription_group_localization(
                                             id:locale_item["locale_id"],
                                             name:locale_item["group_display_name"],
-                                            custom_app_name:locale_item["custom_app_name"]
+                                            customAppName:locale_item["custom_app_name"]
                                         )
                                         # puts JSON.pretty_generate(response)
 
@@ -693,7 +705,7 @@ module Pindo
                             response = appstore_client.create_subscription_group_localization(
                                     name:locale_item["group_display_name"],
                                     locale:locale,
-                                    custom_app_name:locale_item["custom_app_name"],
+                                    customAppName:locale_item["custom_app_name"],
                                     relationships: {
                                                 subscriptionGroup:{
                                                     data:{
@@ -881,11 +893,11 @@ module Pindo
                 begin
                     response = appstore_client.create_subscription(
                         name:subscription_item["reference_name"],
-                        product_id:subscription_item["product_id"],
-                        family_sharable:false,
-                        review_note:subscription_item["review_note"],
-                        subscription_period:subscription_item["subscription_duration"],
-                        group_level:1,
+                        productId:subscription_item["product_id"],
+                        familySharable:false,
+                        reviewNote:subscription_item["review_note"],
+                        subscriptionPeriod:subscription_item["subscription_duration"],
+                        groupLevel:1,
                         relationships: {
                             group:{
                                 data:{
@@ -928,9 +940,9 @@ module Pindo
                 response = appstore_client.update_subscription(
                         id:subscription_id,
                         name:subscription_item["reference_name"],
-                        family_sharable:false,
-                        review_note:subscription_item["review_note"],
-                        group_level:1
+                        familySharable:false,
+                        reviewNote:subscription_item["review_note"],
+                        groupLevel:1
                 )
                 # puts JSON.pretty_generate(response)
 
@@ -962,7 +974,7 @@ module Pindo
                 puts "      设置订阅的周期: #{subscription_item["subscription_duration"]}"
                 response = appstore_client.update_subscription(
                         id:subscription_id,
-                        subscription_period:subscription_item["subscription_duration"]
+                        subscriptionPeriod:subscription_item["subscription_duration"]
                 )
                 # puts JSON.pretty_generate(response)
 
@@ -998,22 +1010,34 @@ module Pindo
                     availableTerritories_data << new_territory_item
                 end
             end
-           response = appstore_client.modify_subscription_territory_availability(
-                            available_in_new_territories:true,
-                            relationships: {
-                                subscription:{
-                                    data:{
-                                        id: subscription_id,
-                                        type: 'subscriptions'
-                                    }
-                                },
-                                availableTerritories:{
-                                    data:availableTerritories_data
-                                }
+            body = {
+                data: {
+                    type: "subscriptionAvailabilities",
+                    attributes: {
+                        availableInNewTerritories: true
+                    },
+                    relationships: {
+                        subscription: {
+                            data: {
+                                id: subscription_id,
+                                type: 'subscriptions'
                             }
-                        )
+                        },
+                        availableTerritories: {
+                            data: availableTerritories_data
+                        }
+                    }
+                }
+            }
 
-           # puts JSON.pretty_generate(response)
+            begin
+                client = Spaceship::ConnectAPI
+                client.tunes_request_client.post("#{Spaceship::ConnectAPI::Tunes::API::Version::V1}/subscriptionAvailabilities", body)
+                puts "          Territory Availability 设置成功"
+            rescue => err
+                puts err
+                puts "      设置订阅的Territory Availability失败！！！"
+            end
         end
 
 
@@ -1624,8 +1648,8 @@ module Pindo
 
                     response = appstore_client.create_subscription_introductory_offer(
                         duration:"THREE_DAYS",
-                        number_of_periods:1,
-                        offer_mode:'FREE_TRIAL',
+                        numberOfPeriods:1,
+                        offerMode:'FREE_TRIAL',
                         relationships: {
                                 subscription: {
                                     data: {
@@ -1688,7 +1712,7 @@ module Pindo
                 if !price_point_id.nil?
 
                         respose_price = appstore_client.create_subscription_price(
-                            preserve_current_price:true,
+                            preserveCurrentPrice:true,
                             relationships: {
                                 subscription: {
                                     data: {
@@ -1733,7 +1757,7 @@ module Pindo
                                     puts "          " + index_item.to_s + ".更新价格 地区:" + territory_id+ "  价格:" + price_local_item[:attributes][:customer_price]
 
                                     respose_price = appstore_client.create_subscription_price(
-                                        preserve_current_price:true,
+                                        preserveCurrentPrice:true,
                                         relationships: {
                                             subscription: {
                                                 data: {
@@ -1814,8 +1838,8 @@ module Pindo
 
                         puts "          正在上传...."
                         response_iap_screenshot = appstore_client.create_subscription_review_screenshot(
-                            file_name:filename,
-                            file_size: filesize,
+                            fileName:filename,
+                            fileSize: filesize,
                             relationships: {
                                 subscription:{
                                     data:{
@@ -1848,7 +1872,7 @@ module Pindo
                             in_app_purchase = appstore_client.update_subscription_review_screenshot(
                                 id:upload_id,
                                 uploaded: true,
-                                source_file_checksum:checksum
+                                sourceFileChecksum:checksum
                             )
                             puts "          上传完成！！"
                             # puts JSON.pretty_generate(in_app_purchase)

data/lib/pindo/module/cert/cert_helper.rb

@@ -165,9 +165,9 @@ module Pindo
         puts "找到 #{identity_ids.size} 个证书:"
         puts identity_ids
 
-        # 删除证书
+        # 删除证书（数组参数形式，避免 identity_id 拼接进 shell）
         identity_ids.each do |identity_id|
-          system "security delete-certificate -Z #{identity_id}"
+          system("security", "delete-certificate", "-Z", identity_id)
         end
 
         # 清理 Provisioning Profiles

data/lib/pindo/module/pgyer/pgyerhelper.rb

@@ -710,14 +710,10 @@ module Pindo
                         FileUtils.rm_rf(ipa_file_upload)
                     end
 
-                    current_dir = Dir.pwd
                     if File.exist?(ipa_base_dir)
-                        Dir.chdir(ipa_base_dir)
                         base_name = File.basename(mac_app_path)
-                        command = "zip -qry \"#{ipa_file_upload}\" \"#{base_name}\""
-                        puts command
-                        system command
-                        Dir.chdir(current_dir)
+                        # 数组参数 + chdir，避免 shell 注入与 cwd 污染
+                        system("zip", "-qry", ipa_file_upload, base_name, chdir: ipa_base_dir)
                     end
                 end
                 if !ipa_file_upload.nil? &&
@@ -738,19 +734,18 @@ module Pindo
                     rescue StandardError => e
 
                     end
-                    current_project_dir = Dir.pwd
                     web_build_name = web_build_name.downcase.strip.gsub(/[\s\-_]/, '')
                     web_res_zip_fullname = File.join(web_zip_dir, web_build_name + "_" + web_build_version + ".zip")
                     if File.exist?(web_res_zip_fullname)
                         FileUtils.rm_rf(web_res_zip_fullname)
                     end
                     Zip::File.open(web_res_zip_fullname, Zip::File::CREATE) do |zipfile|
-                        Dir.chdir web_res_path
-                        Dir.glob("**/*").reject {|fn| File.directory?(fn) }.each do |file|
-                            zipfile.add(file.sub(web_res_path + '/', ''), file)
+                        Dir.chdir(web_res_path) do
+                            Dir.glob("**/*").reject {|fn| File.directory?(fn) }.each do |file|
+                                zipfile.add(file.sub(web_res_path + '/', ''), file)
+                            end
                         end
                     end
-                    Dir.chdir(current_project_dir)
                     ipa_file_upload = web_res_zip_fullname
                 end
                 if !ipa_file_upload.nil? &&
@@ -767,12 +762,11 @@ module Pindo
                         FileUtils.rm_rf(windows_zip_fullname)
                     end
 
-                    current_project_dir = Dir.pwd
                     Zip::File.open(windows_zip_fullname, Zip::File::CREATE) do |zipfile|
-                        Dir.chdir windows_build_dir
-                        zipfile.add(windows_exe_name, windows_exe_name)
+                        Dir.chdir(windows_build_dir) do
+                            zipfile.add(windows_exe_name, windows_exe_name)
+                        end
                     end
-                    Dir.chdir(current_project_dir)
                     ipa_file_upload = windows_zip_fullname
                 end
                 unless !ipa_file_upload.nil? && File.exist?(ipa_file_upload)
@@ -800,14 +794,14 @@ module Pindo
                     end
 
                     Zip::File.open(server_zipfile_name, Zip::File::CREATE) do |zipfile|
-                        Dir.chdir server_file_directory
-                        Dir.glob("**/*").reject {|fn| File.directory?(fn) }.each do |file|
-                            zipfile.add(file.sub(server_file_directory + '/', ''), file)
+                        Dir.chdir(server_file_directory) do
+                            Dir.glob("**/*").reject {|fn| File.directory?(fn) }.each do |file|
+                                zipfile.add(file.sub(server_file_directory + '/', ''), file)
+                            end
                         end
                     end
 
                     addtach_file = server_zipfile_name
-                    Dir.chdir current_project_dir
                 end
 
                 puts
@@ -1539,6 +1533,7 @@ module Pindo
                 if git_cliff_installed
                     temp_dir = Dir.pwd
                     Dir.chdir(current_git_root_path)
+                    begin
 
                     # 检查 HEAD 是否有 tag
                     head_tag = `git describe --exact-match --tags HEAD 2>/dev/null`.strip
@@ -1605,7 +1600,10 @@ module Pindo
                         description = "版本更新"
                     end
 
-                    Dir.chdir(temp_dir)
+                    ensure
+                        # ensure 保证异常路径也还原 cwd，避免污染全局工作目录
+                        Dir.chdir(temp_dir)
+                    end
                 else
                     # git-cliff 未安装，提示用户并退出
                     puts "\n\e[31m错误: git-cliff 未安装\e[0m"

data/lib/pindo/module/task/model/build/android_build_dev_task.rb

@@ -58,43 +58,7 @@ module Pindo
         build_android_project
       end
 
-      def find_output
-        # 搜索 APK 和 AAB 文件
-        search_paths = []
-        search_paths.concat(TaskConfig::BUILD_OUTPUT_PATTERNS[:apk].map { |p| File.join(@project_path, p) })
-        search_paths.concat(TaskConfig::BUILD_OUTPUT_PATTERNS[:aab].map { |p| File.join(@project_path, p) })
-
-        package_files = []
-        search_paths.each do |pattern|
-          package_files.concat(Dir.glob(pattern))
-        end
-
-        # 过滤测试包和未签名包
-        package_files.reject! do |f|
-          basename = File.basename(f).downcase
-          TaskConfig::EXCLUDED_PATTERNS.any? { |pattern| basename.include?(pattern) }
-        end
-
-        if package_files.any?
-          # 优先返回 AAB，其次 APK
-          aab_files = package_files.select { |f| f.end_with?(".aab") }
-          apk_files = package_files.select { |f| f.end_with?(".apk") }
-
-          latest_package = if aab_files.any?
-                            aab_files.max_by { |f| File.mtime(f) }
-                          elsif apk_files.any?
-                            apk_files.max_by { |f| File.mtime(f) }
-                          else
-                            package_files.max_by { |f| File.mtime(f) }
-                          end
-
-          puts "  找到 Android 包文件: #{latest_package}"
-          latest_package
-        else
-          puts "  警告: 未找到 APK/AAB 文件"
-          nil
-        end
-      end
+      # find_output 已上移到 AndroidBuildTask 基类（dev/adhoc/gplay 共用）
 
       private
 

data/lib/pindo/module/task/model/build/android_build_task.rb

@@ -1,4 +1,5 @@
 require_relative '../build_task'
+require_relative '../../task_config'
 
 module Pindo
   module TaskSystem
@@ -12,6 +13,45 @@ module Pindo
       def required_resources
         (super || []) + [{ type: :gradle, directory: @project_path }]
       end
+
+      # 查找构建产物（APK/AAB），三个子类（dev/adhoc/gplay）共用同一套 glob 逻辑
+      # 搜索路径与过滤规则与 pindo jps upload 查找 Android 包保持一致；优先 AAB，其次 APK
+      def find_output
+        search_paths = []
+        search_paths.concat(TaskConfig::BUILD_OUTPUT_PATTERNS[:apk].map { |p| File.join(@project_path, p) })
+        search_paths.concat(TaskConfig::BUILD_OUTPUT_PATTERNS[:aab].map { |p| File.join(@project_path, p) })
+
+        package_files = []
+        search_paths.each do |pattern|
+          package_files.concat(Dir.glob(pattern))
+        end
+
+        # 过滤测试包和未签名包
+        package_files.reject! do |f|
+          basename = File.basename(f).downcase
+          TaskConfig::EXCLUDED_PATTERNS.any? { |pattern| basename.include?(pattern) }
+        end
+
+        if package_files.any?
+          # 优先返回 AAB，其次 APK
+          aab_files = package_files.select { |f| f.end_with?(".aab") }
+          apk_files = package_files.select { |f| f.end_with?(".apk") }
+
+          latest_package = if aab_files.any?
+                            aab_files.max_by { |f| File.mtime(f) }
+                          elsif apk_files.any?
+                            apk_files.max_by { |f| File.mtime(f) }
+                          else
+                            package_files.max_by { |f| File.mtime(f) }
+                          end
+
+          puts "  找到 Android 包文件: #{latest_package}"
+          latest_package
+        else
+          # 构建已执行但产物缺失，视为失败，不静默返回 nil
+          raise Informative, "构建完成但未找到 APK/AAB 文件"
+        end
+      end
     end
   end
 end

data/lib/pindo/module/task/model/build/ios_build_adhoc_task.rb

@@ -41,7 +41,7 @@ module Pindo
 
       #准备构建
       def prepare_build
-        Dir.chdir(@project_path)
+        # Dir.chdir(@project_path) # Removed for thread safety（下游均传入绝对路径）
 
         # 0. 清理 Firebase Shell Script
         cleanup_firebase_shell
@@ -50,36 +50,10 @@ module Pindo
         load_ios_config
 
         # 1.5 获取 AdHoc 配置目录并合并配置
-        adhoc_config_dir = nil
-        begin
-          config_parser = Pindo::IosConfigParser.instance
-          config_json = config_parser.config_json
-
-          # 根据 app_type 获取 AdHoc 配置仓库
-          if config_json && config_json['project_info'] && config_json['project_info']['app_type']
-            require 'pindo/config/build_info_manager'
-
-            build_info_manager = Pindo::BuildInfoManager.share_instance
-            adhoc_repo_name = build_info_manager.get_deploy_repo_with_modul_name(
-              module_name: config_json['project_info']['app_type']
-            )
-
-            if adhoc_repo_name.nil? || adhoc_repo_name.empty?
-              raise Informative, "config.json app_type is error!!!"
-            end
-
-            # 克隆 AdHoc 配置仓库
-            adhoc_config_dir = Pindo::GitHandler.clong_buildconfig_repo(repo_name: adhoc_repo_name)
-
-            # 合并 AdHoc 配置
-            config_parser.modify_config_with_adhoc(adhoc_config_dir: adhoc_config_dir)
-          else
-            puts "配置中缺少 app_type，跳过 AdHoc 配置合并"
-          end
-        rescue => e
-          puts "获取 AdHoc 配置失败: #{e.message}"
-          adhoc_config_dir = nil
-        end
+        # 复用 BuildInfoManager（命令层在导出前可能已合并过，幂等短路直接返回缓存目录）
+        # 合并失败 fail-fast：抛 Informative 由 TaskManager 标记任务失败
+        require 'pindo/config/build_info_manager'
+        adhoc_config_dir = Pindo::BuildInfoManager.share_instance.merge_adhoc_config_into_parser
 
         # 2. 自动增加版本号
         auto_increase_buildnumber
@@ -124,8 +98,8 @@ module Pindo
           puts "  找到 IPA 文件: #{latest_ipa}"
           latest_ipa
         else
-          puts "  警告: 未找到 IPA 文件"
-          nil
+          # 构建已执行但产物缺失，视为失败，不静默返回 nil
+          raise Informative, "构建完成但未找到 IPA 文件 (#{build_path})"
         end
       end
 
@@ -315,7 +289,7 @@ module Pindo
         puts "  处理 Quark/Swark..."
 
         require 'pindo/module/xcode/xcode_swark_helper'
-        Dir.chdir(@project_path)
+        # Dir.chdir(@project_path) # Removed for thread safety（下游均传入绝对路径）
 
         if xcode_build_type.include?("quark")
           Pindo::XcodeSwarkHelper.quark_run(
@@ -403,7 +377,7 @@ module Pindo
 
       # 编译 iOS 工程
       def build_ios_project
-        Dir.chdir(@project_path)
+        # Dir.chdir(@project_path) # Removed for thread safety（下游均传入绝对路径）
 
         # 使用 XcodeBuildHelper 进行构建
         ipa_file = Pindo::XcodeBuildHelper.build_project(

data/lib/pindo/module/task/model/build/ios_build_appstore_task.rb

@@ -40,7 +40,7 @@ module Pindo
 
       #准备构建
       def prepare_build
-        Dir.chdir(@project_path)
+        # Dir.chdir(@project_path) # Removed for thread safety（下游均传入绝对路径）
 
         # 0. 清理 Firebase Shell Script
         cleanup_firebase_shell
@@ -81,8 +81,8 @@ module Pindo
           puts "  找到 IPA 文件: #{latest_ipa}"
           latest_ipa
         else
-          puts "  警告: 未找到 IPA 文件"
-          nil
+          # 构建已执行但产物缺失，视为失败，不静默返回 nil
+          raise Informative, "构建完成但未找到 IPA 文件 (#{build_path})"
         end
       end
 
@@ -262,7 +262,7 @@ module Pindo
         puts "  处理 Quark/Swark..."
 
         require 'pindo/module/xcode/xcode_swark_helper'
-        Dir.chdir(@project_path)
+        # Dir.chdir(@project_path) # Removed for thread safety（下游均传入绝对路径）
 
         if xcode_build_type.include?("quark")
           Pindo::XcodeSwarkHelper.quark_run(
@@ -350,7 +350,7 @@ module Pindo
 
       # 编译 iOS 工程
       def build_ios_project
-        Dir.chdir(@project_path)
+        # Dir.chdir(@project_path) # Removed for thread safety（下游均传入绝对路径）
 
         # 使用 XcodeBuildHelper 进行构建
         ipa_file = Pindo::XcodeBuildHelper.build_project(

data/lib/pindo/module/task/model/build/ios_build_dev_task.rb

@@ -78,11 +78,21 @@ module Pindo
           latest_output = all_outputs.max_by { |f| File.mtime(f) }
           output_type = latest_output.end_with?('.ipa') ? 'IPA' : 'APP'
           puts "  找到 #{output_type} 文件: #{latest_output}"
-          latest_output
-        else
-          puts "  警告: 未找到 IPA 或 APP 文件"
-          nil
+          return latest_output
+        end
+
+        # 命令行工具产物为裸可执行文件（build 根目录下无扩展名的普通文件）
+        tool_outputs = Dir.glob(File.join(build_dir, "*")).select do |f|
+          File.file?(f) && File.extname(f).empty?
         end
+        if tool_outputs.any?
+          latest_output = tool_outputs.max_by { |f| File.mtime(f) }
+          puts "  找到命令行工具可执行文件: #{latest_output}"
+          return latest_output
+        end
+
+        # 构建已执行但产物缺失，视为失败，不静默返回 nil
+        raise Informative, "构建完成但未找到 IPA / APP / 可执行文件 (#{build_dir})"
       end
 
       # 处理 CocoaPods 依赖（Dev 构建）

data/lib/pindo/module/task/model/build_task.rb

@@ -180,6 +180,8 @@ module Pindo
         execute_build
 
         # 查找输出文件
+        # 注意：是否「找不到产物即失败」由各子类 find_output 自行决定（已实现的子类会 raise；
+        # 未实现的 TODO 桩 AndroidBuildAdhocTask/AndroidBuildGPlayTask 仍返回 nil，保持原行为）
         @output_path = find_output
 
         {

data/lib/pindo/module/task/model/git/git_commit_task.rb

@@ -13,7 +13,7 @@ module Pindo
         :git_commit
       end
 
-      # 重试配置：失败后重试 1 次
+      # 重试配置：失败后重试 2 次（共 3 次尝试）
       def self.default_retry_count
         2
       end
@@ -69,6 +69,16 @@ module Pindo
         root_dir = @git_root_path
         git_repo_helper = Pindo::GitRepoHelper.share_instance
 
+        # 0. 先拉取远程 tag，确保本地 tag 列表是最新的
+        # 否则本地 tag 落后于远程时（如远程被 CI/其他机器打了更高 tag），
+        # 后续基于本地 tag 计算的版本会偏低，导致本该新建的版本 tag 与远程已有 tag 冲突而被漏打。
+        # 尽力而为：网络不可达时仅告警，用本地 tag 降级计算，不阻断构建。
+        begin
+          Pindo::GitHandler.git_remote!(root_dir, %W(-C #{root_dir} fetch --tags --force origin))
+        rescue => e
+          Funlog.instance.fancyinfo_warning("拉取远程 tag 失败，将使用本地 tag 计算版本: #{e.message.lines.first&.strip}")
+        end
+
         # 1. 如果 fixed_version 为 nil，尝试从 HEAD 的 tag 获取版本
         # 必须在 check_gitignore 之前检查，因为 check_gitignore 可能创建提交导致 HEAD 移动
         if (@fixed_version.nil? || @fixed_version.empty?) &&