pindo 5.18.17 → 5.18.20

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/task/model/build/ios_build_adhoc_task.rb

@@ -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

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
+
+        puts "  警告: 未找到 IPA / APP / 可执行文件"
+        nil
       end
 
       # 处理 CocoaPods 依赖（Dev 构建）

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

@@ -51,93 +51,108 @@ module Pindo
 
         root_dir = @git_root_path
         git_repo_helper = Pindo::GitRepoHelper.share_instance
-        stash_saved = false
         stash_name = "pindo_stash_#{Time.now.strftime('%Y%m%d%H%M%S')}_#{rand(1000)}"
         coding_branch = Pindo::GitHandler.git!(%W(-C #{root_dir} rev-parse --abbrev-ref HEAD)).strip
+        git_commit_data = get_data_param_by_key(:git_commit)
+        stash_saved = false
 
         begin
-          # 1. 检查工作目录，不干净则 stash
-          status = Pindo::GitHandler.git!(%W(-C #{root_dir} status --porcelain)).strip
-          unless status.empty?
-            Funlog.instance.fancyinfo_update("工作目录有未提交更改，暂存到 stash: #{stash_name}")
-            Pindo::GitHandler.git!(%W(-C #{root_dir} stash push -u -m #{stash_name}))
-            stash_saved = true
-          end
-
-          # 2. 从 GitCommitTask 获取参数（必须在合并之前，确保 release_branch 等参数正确）
-          git_commit_data = get_data_param_by_key(:git_commit)
-          if git_commit_data && git_commit_data[:task_param]
-            param = git_commit_data[:task_param]
-            @release_branch = param[:release_branch] if param[:release_branch]
-            @tag_pre = param[:tag_pre] if param[:tag_pre]
-            @tag_type = param[:tag_type] if param[:tag_type]
-            @ver_inc = param[:ver_inc] if param[:ver_inc]
-          end
-
-          # 3. 合并到发布分支（使用已回填的 @release_branch）
-          if coding_branch != @release_branch
-            Pindo::GitHandler.merge_branches(
-              project_dir: root_dir,
-              source_branch: coding_branch,
-              target_branch: @release_branch,
-              sync_branches: true  # 双向合并，确保两分支完全同步
-            )
-          end
-
-          # 4. 获取版本信息
-          if git_commit_data && git_commit_data[:task_param] &&
-             git_commit_data[:task_param][:build_version] && git_commit_data[:task_param][:build_number]
-            @build_version = git_commit_data[:task_param][:build_version]
-            @build_number = git_commit_data[:task_param][:build_number]
-            Funlog.instance.fancyinfo_success("使用 GitCommitTask 的版本号: #{@build_version}, Build: #{@build_number}, Tag前缀: #{@tag_pre}, Tag类型: #{@tag_type}")
-
-          # 降级：自己计算（向后兼容或 GitCommitTask 无有效数据）
-          else
-            @build_number, @commit_hash = git_repo_helper.get_build_number_from_commit(project_dir: root_dir)
-            @build_version = git_repo_helper.calculate_build_version(
-              project_dir: root_dir,
-              tag_prefix: @tag_pre,
-              create_tag_type: @tag_type,
-              version_increase_type: @ver_inc
-            )
-            commit_short = @commit_hash ? @commit_hash[0..7] : "unknown"
-            Funlog.instance.fancyinfo_warning("未找到 GitCommitTask 依赖，降级为自己计算版本号: #{@build_version}, Build: #{@build_number}, Commit: #{commit_short}")
-          end
-
-          # 4. 创建并推送 Tag
+          # 1. 工作目录不干净则暂存
+          stash_saved = stash_if_dirty(root_dir, stash_name)
+
+          # 2. 从 GitCommitTask 回填参数（须在合并之前，确保 release_branch 等正确）
+          backfill_params_from_commit_task(git_commit_data)
+
+          # 3. 合并到发布分支
+          merge_to_release_branch(root_dir, coding_branch)
+
+          # 4. 解析版本号
+          resolve_build_version(root_dir, git_commit_data, git_repo_helper)
+
+          # 5. 创建并推送 Tag
           tag_name = "#{@tag_pre}#{@build_version}"
           git_repo_helper.create_and_push_tag(
             project_dir: root_dir,
             tag_name: tag_name,
             tag_type: @tag_type
           )
-
         ensure
-          # 5. 还原 stash
-
-          if stash_saved
-            begin
-              # 查找指定名字的 stash
-              stash_list = Pindo::GitHandler.git!(%W(-C #{root_dir} stash list)).strip
-              matched_line = stash_list.lines.find { |l| l.include?(stash_name) }
-
-              if matched_line && (stash_id = matched_line.match(/(stash@\{\d+\})/)&.[](1))
-                # 先应用 stash（不删除）
-                Pindo::GitHandler.git!(%W(-C #{root_dir} stash apply #{stash_id}))
-                # 应用成功后再删除 stash
-                Pindo::GitHandler.git!(%W(-C #{root_dir} stash drop #{stash_id}))
-                Funlog.instance.fancyinfo_success("已还原 stash: #{stash_name} (#{stash_id})")
-              else
-                Funlog.instance.fancyinfo_warning("未找到名为 #{stash_name} 的 stash，请手动检查")
-              end
-            rescue => e
-              # 如果应用失败（通常是有冲突），stash 仍然保留，用户可以手动处理
-              Funlog.instance.fancyinfo_warning("stash 还原时发生冲突: #{e.message}")
-              Funlog.instance.fancyinfo_warning("stash 已保留，请手动执行 'git stash pop' 处理冲突")
-              # 不抛出异常，任务仍然标记为成功（因为 tag 已经创建成功）
-            end
-          end
+          # 6. 还原 stash
+          restore_stash(root_dir, stash_name) if stash_saved
+        end
+      end
+
+      private
+
+      # 工作目录有未提交更改则暂存，返回是否已暂存
+      def stash_if_dirty(root_dir, stash_name)
+        status = Pindo::GitHandler.git!(%W(-C #{root_dir} status --porcelain)).strip
+        return false if status.empty?
+
+        Funlog.instance.fancyinfo_update("工作目录有未提交更改，暂存到 stash: #{stash_name}")
+        Pindo::GitHandler.git!(%W(-C #{root_dir} stash push -u -m #{stash_name}))
+        true
+      end
+
+      # 从 GitCommitTask 回填 release_branch / tag_pre / tag_type / ver_inc
+      def backfill_params_from_commit_task(git_commit_data)
+        return unless git_commit_data && git_commit_data[:task_param]
+
+        param = git_commit_data[:task_param]
+        @release_branch = param[:release_branch] if param[:release_branch]
+        @tag_pre = param[:tag_pre] if param[:tag_pre]
+        @tag_type = param[:tag_type] if param[:tag_type]
+        @ver_inc = param[:ver_inc] if param[:ver_inc]
+      end
+
+      # 将编码分支双向合并到发布分支，确保两分支同步到同一节点
+      def merge_to_release_branch(root_dir, coding_branch)
+        return if coding_branch == @release_branch
+
+        Pindo::GitHandler.merge_branches(
+          project_dir: root_dir,
+          source_branch: coding_branch,
+          target_branch: @release_branch,
+          sync_branches: true  # 双向合并，确保两分支完全同步
+        )
+      end
+
+      # 解析构建版本号：优先用 GitCommitTask 的，否则自己计算（向后兼容）
+      def resolve_build_version(root_dir, git_commit_data, git_repo_helper)
+        if git_commit_data && git_commit_data[:task_param] &&
+           git_commit_data[:task_param][:build_version] && git_commit_data[:task_param][:build_number]
+          @build_version = git_commit_data[:task_param][:build_version]
+          @build_number = git_commit_data[:task_param][:build_number]
+          Funlog.instance.fancyinfo_success("使用 GitCommitTask 的版本号: #{@build_version}, Build: #{@build_number}, Tag前缀: #{@tag_pre}, Tag类型: #{@tag_type}")
+        else
+          @build_number, @commit_hash = git_repo_helper.get_build_number_from_commit(project_dir: root_dir)
+          @build_version = git_repo_helper.calculate_build_version(
+            project_dir: root_dir,
+            tag_prefix: @tag_pre,
+            create_tag_type: @tag_type,
+            version_increase_type: @ver_inc
+          )
+          commit_short = @commit_hash ? @commit_hash[0..7] : "unknown"
+          Funlog.instance.fancyinfo_warning("未找到 GitCommitTask 依赖，降级为自己计算版本号: #{@build_version}, Build: #{@build_number}, Commit: #{commit_short}")
+        end
+      end
+
+      # 还原之前暂存的 stash；冲突时保留 stash 并告警，不抛异常（tag 已创建成功）
+      def restore_stash(root_dir, stash_name)
+        stash_list = Pindo::GitHandler.git!(%W(-C #{root_dir} stash list)).strip
+        matched_line = stash_list.lines.find { |l| l.include?(stash_name) }
+
+        if matched_line && (stash_id = matched_line.match(/(stash@\{\d+\})/)&.[](1))
+          # 先应用 stash（不删除），成功后再删除
+          Pindo::GitHandler.git!(%W(-C #{root_dir} stash apply #{stash_id}))
+          Pindo::GitHandler.git!(%W(-C #{root_dir} stash drop #{stash_id}))
+          Funlog.instance.fancyinfo_success("已还原 stash: #{stash_name} (#{stash_id})")
+        else
+          Funlog.instance.fancyinfo_warning("未找到名为 #{stash_name} 的 stash，请手动检查")
         end
+      rescue => e
+        Funlog.instance.fancyinfo_warning("stash 还原时发生冲突: #{e.message}")
+        Funlog.instance.fancyinfo_warning("stash 已保留，请手动执行 'git stash pop' 处理冲突")
       end
 
     end

data/lib/pindo/module/task/model/unity/unity_export_task.rb

@@ -1,5 +1,6 @@
 require 'pindo/module/task/model/unity_task'
 require 'pindo/base/funlog'
+require 'json'
 
 module Pindo
   module TaskSystem
@@ -18,6 +19,7 @@ module Pindo
       #   - :project_path [String] Unity 项目路径（默认当前目录）
       #   - :export_path [String] 导出路径（nil 表示自动检测）
       #   - :deploy_mode [String] 部署模式 ('dev', 'adhoc', 'release')，默认 'dev'
+      #   - :app_config [Hash] 需写入工程 AppConfig 的键值（传入则在导出前先改写 AppConfig）
       #   - :context [Hash] 上下文信息（如 index_count）
       def initialize(platform, options = {})
         @platform = platform
@@ -26,6 +28,7 @@ module Pindo
         @index_count = options[:context] ? options[:context][:index_count] : nil
         @export_path = options[:export_path]  # 可由参数传入，nil 表示自动检测
         @deploy_mode = options[:deploy_mode] || 'dev'  # 部署模式：dev/adhoc/release，默认 dev
+        @app_config = options[:app_config]  # 需写入 AppConfig 的键值，nil/空表示跳过
 
         name = case platform
                when 'ios', 'ipa'
@@ -57,6 +60,9 @@ module Pindo
       protected
 
       def do_work
+        # 若传入了配置参数，先改写工程内的 AppConfig
+        update_app_config_file if @app_config && !@app_config.empty?
+
         # 获取 Unity 版本
         project_unity_version = get_unity_version
 
@@ -106,6 +112,44 @@ module Pindo
 
       private
 
+      # 使用传入的配置改写 Unity 工程内的 AppConfig（TextAsset JSON）
+      # 仅覆盖 @app_config 中提供的键，其余键保持原值
+      def update_app_config_file
+        app_config_file = File.join(@unity_root_path, "Assets", "Resources", "AppConfig", "AppConfig.json")
+        unless File.exist?(app_config_file)
+          Funlog.warning("未找到 AppConfig 文件，跳过 AppConfig 更新：#{app_config_file}")
+          return
+        end
+
+        puts "更新 AppConfig: #{app_config_file}"
+
+        begin
+          app_config_json = JSON.parse(File.read(app_config_file))
+        rescue JSON::ParserError => e
+          Funlog.warning("AppConfig 不是合法 JSON，跳过更新：#{e.message}")
+          return
+        end
+
+        changed = false
+        @app_config.each do |key, value|
+          next if value.nil? || value.to_s.strip.empty?
+          new_value = value.to_s.strip
+          old_value = app_config_json[key]
+          next if old_value.to_s == new_value
+
+          app_config_json[key] = new_value
+          puts "  ✓ #{key}: #{old_value} → #{new_value}"
+          changed = true
+        end
+
+        if changed
+          File.open(app_config_file, "w") { |f| f.write(JSON.pretty_generate(app_config_json)) }
+          puts "✅ AppConfig 更新完成\n"
+        else
+          puts "AppConfig 无需更新（值一致）\n"
+        end
+      end
+
       # 导出 iOS
       def export_ios
         platform = 'iOS'

data/lib/pindo/module/task/task_reporter.rb

@@ -41,12 +41,57 @@ module Pindo
           end
         end
 
+        # 按依赖拓扑排序展示真实执行顺序
+        ordered = topological_execution_order(@queue.pending_snapshot)
+        is_serial = strategy.respond_to?(:name) && strategy.name.include?("串行")
+        puts "\e[34m"
+        if is_serial
+          puts "\e[34m" + "  实际执行顺序:"
+        else
+          puts "\e[34m" + "  执行顺序预览（并发模式下实际顺序受运行时调度影响）:"
+        end
+        ordered.each_with_index do |task, index|
+          puts "\e[34m" + "    #{index + 1}. #{task.name}"
+        end
+
         puts "\e[34m"
         puts "\e[34m" + "  总计: #{@queue.pending_count} 个任务"
         puts "\e[34m" + "=" * 60 + "\e[0m"
         puts "\n"
       end
 
+      # 按依赖关系生成执行顺序（贪心拓扑排序，模拟串行调度：
+      # 每轮取「入队顺序中第一个依赖已满足」的任务），与串行实际执行顺序一致
+      # @param tasks [Array<PindoTask>] 待排序任务（入队顺序）
+      # @return [Array<PindoTask>] 按执行顺序排列的任务
+      def topological_execution_order(tasks)
+        all_ids = tasks.map(&:id)
+        remaining = tasks.dup
+        completed_ids = []
+        ordered = []
+
+        until remaining.empty?
+          index = remaining.index do |task|
+            task.dependencies.all? do |dep_id|
+              # 依赖已完成，或依赖不在本批任务中（视为已提前完成）
+              completed_ids.include?(dep_id) || !all_ids.include?(dep_id)
+            end
+          end
+
+          # 存在循环依赖或依赖缺失，剩余任务按原顺序追加并结束
+          if index.nil?
+            ordered.concat(remaining)
+            break
+          end
+
+          task = remaining.delete_at(index)
+          completed_ids << task.id
+          ordered << task
+        end
+
+        ordered
+      end
+
       # 输出任务执行标题
       # @param task [PindoTask] 任务对象
       def print_task_title(task)