pindo 5.13.9 → 5.13.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1f5b841b91a7c9548ae422e6b7c73db4104f9d55c1266937c2ca23e1480c30a
-  data.tar.gz: 42e0235ff47d8f1a4a6d3d461a47a2ab30a3b6e0666e2d9dac24811b72cc50c9
+  metadata.gz: dd43527c8c17eb024c8a5954a09dcec961cb9888e94311a3e88ede69ac11d1d1
+  data.tar.gz: 850a430465fb9b7b8c801c30f2f8c2684a738fe63a078adf7f1c067619a7e324
 SHA512:
-  metadata.gz: '085884e89d114f0499c38d1c8b879452330023dac6bed14e89d4d5882c866729ea6efa6bef6318d12fea4d72d7626a5f47b41c6a6f5faa03ca06d8c4daa89426'
-  data.tar.gz: be7b3c4603946b117d1d6051556b92870a834cb57f71cbf1a3857b37f97791274e75b2a7bb98258a26a44d60d96b88dc44369397130dc8f290b81264708e262b
+  metadata.gz: 2cc3f43c90b1ecec85020ba6e9d52a0c4b67978c054b5139cb263e4640e4e19ade1e523c9c799d502f52b3f0f9bd9f7cfd7ff20488ef40fb3934af64a0208c29
+  data.tar.gz: 911a6c7c912e5e077ed00eae5dc9a2f9c0935b080362d2f841d22dfba6b2f8975e75338ec423f0ea05d1965472e5d1866928199b75d8586a4b9507d06741020f

data/lib/pindo/base/funlog.rb

@@ -49,6 +49,15 @@ module Pindo
          @spinner_log =nil
       end
 
+      # 输出警告信息（使用spinner，黄色警告标记）
+      # @param args [Array] 要输出的消息
+      def fancyinfo_warning(*args)
+         message = args.join(" ")
+         spinner_log_handle.update(title:message)
+         spinner_log_handle.stop("\e[33m⚠\e[0m")
+         @spinner_log = nil
+      end
+
       # 输出静态成功信息（不使用spinner，对应 fancyinfo_success）
       # @param args [Array] 要输出的消息
       def info(*args)
@@ -113,6 +122,10 @@ module Pindo
         instance.fancyinfo_error(*args)
       end
 
+      def fancyinfo_warning(*args)
+        instance.fancyinfo_warning(*args)
+      end
+
       def info(*args)
         instance.info(*args)
       end

data/lib/pindo/base/git_handler.rb

@@ -2,6 +2,7 @@ require 'fileutils'
 require 'pindo/base/executable'
 require 'etc'
 require 'claide'
+require 'highline/import'
 
 module Pindo
   # Git 操作处理类
@@ -452,11 +453,40 @@ module Pindo
 
 
 
+        # 获取未提交的文件列表
+        # @param project_dir [String] 项目目录路径
+        # @return [Array<String>, nil] 返回未提交的文件列表，如果没有则返回 nil
+        def get_uncommitted_files(project_dir:)
+            raise ArgumentError, "项目目录不能为空" if project_dir.nil?
+
+            begin
+                # 重置暂存区
+                git!(%W(-C #{project_dir} restore --staged #{project_dir}))
+
+                # 获取未跟踪和已修改的文件
+                files_list = git!(%W(-C #{project_dir} ls-files --other --modified --exclude-standard)) || []
+
+                # 返回文件列表（如果为空则返回 nil）
+                if files_list.nil? || files_list.empty?
+                    return nil
+                end
+
+                # 将字符串转换为数组
+                files_list.is_a?(String) ? files_list.split("\n").reject(&:empty?) : files_list
+            rescue => e
+                Funlog.instance.fancyinfo_error("获取未提交文件列表失败: #{e.message}")
+                nil
+            end
+        end
+
         # 处理未提交的文件
         # @param project_dir [String] 项目目录路径
+        # @param process_type [String] 处理方式: 'commit'(全部提交), 'delete'(全部删除), 'stash'(保存到stash), 'exit'(退出)
+        # @param commit_message [String] 提交信息（仅在 process_type 为 'commit' 时使用）
         # @raise [Informative] 当用户选择退出或需要手动处理文件时抛出
-        def process_need_add_files(project_dir:nil)
+        def process_need_add_files(project_dir:, process_type:, commit_message: nil)
             raise ArgumentError, "项目目录不能为空" if project_dir.nil?
+            raise ArgumentError, "处理方式不能为空" if process_type.nil?
 
             current_project_dir = project_dir
             origin_path = Dir.pwd
@@ -466,29 +496,29 @@ module Pindo
 
                 # 获取当前分支信息
                 coding_branch = git!(%W(-C #{current_project_dir} rev-parse --abbrev-ref HEAD)).strip
-                # 重置暂存区
-                git!(%W(-C #{current_project_dir} restore --staged #{current_project_dir}))
-
-                # 获取未跟踪和已修改的文件
-                files_list = git!(%W(-C #{current_project_dir} ls-files --other --modified --exclude-standard)) || []
 
-                if files_list.nil? || files_list.empty?
-                    return
+                # 根据 process_type 执行对应操作
+                case process_type
+                when 'commit', '全部提交'
+                    handle_commit_all(current_project_dir, coding_branch, commit_message)
+                when 'reset', '全部丢弃更改，回滚代码', 'delete', '全部删除'
+                    handle_delete_all(current_project_dir, coding_branch)
+                when 'stash', '保存到stash区域', '保存到stash区域（改代码本次不生效）'
+                    handle_stash(current_project_dir, coding_branch)
+                when 'exit', '先退出，手动来处理退出'
+                    raise Informative, "请手动处理未提交的文件！！！"
+                else
+                    raise ArgumentError, "不支持的处理方式: #{process_type}"
                 end
 
-                # 显示文件状态
-                display_file_status(coding_branch, files_list)
-
-                # 处理用户选择
-                process_user_choice(current_project_dir, coding_branch)
-
             ensure
                 Dir.chdir(origin_path)
             end
         end
 
-        private
-
+        # 显示未提交的文件状态
+        # @param branch [String] 当前分支名
+        # @param files [Array<String>, String] 文件列表
         def display_file_status(branch, files)
             puts "═" * 60
             puts "⚠️  警告：检测到未提交的文件".red
@@ -513,33 +543,11 @@ module Pindo
             puts "═" * 60
         end
 
-        def process_user_choice(project_dir, branch)
-            process_types = ["全部提交", "全部删除", "先退出，手动来处理退出"]
-            cli = HighLine.new
-            menu_choice = "None"
-
-            cli.choose do |menu|
-                menu.header = "对以上未提交的文件, 有下列处理方式".red
-                menu.prompt = "请选择如何处理(1/2/3...):".yellow
-                process_types.each do |item|
-                    menu.choice(item) { |choice| menu_choice = choice }
-                end
-            end
-
-            puts "选择的处理方式为: #{menu_choice}"
-
-            case menu_choice
-            when "全部提交"
-                handle_commit_all(project_dir, branch)
-            when "全部删除"
-                handle_delete_all(project_dir, branch)
-            else
-                raise Informative, "请手动处理未提交的文件！！！"
-            end
-        end
+        private
 
-        def handle_commit_all(project_dir, branch)
-            message = ask('请输入提交的备注信息: ') || "release code"
+        def handle_commit_all(project_dir, branch, commit_message = nil)
+            # 使用传入的 commit_message，如果没有则使用默认值
+            message = commit_message || "release code"
 
             Funlog.instance.fancyinfo_start("开始提交文件...")
             git! ['add', '-A']
@@ -563,10 +571,33 @@ module Pindo
                 raise Informative, "请手动处理未提交的文件！！！"
             end
 
+            Funlog.instance.fancyinfo_start("开始删除未提交的文件...")
             git!(%W(-C #{project_dir} reset --hard))
             git!(%W(-C #{project_dir} clean -df))
             git!(%W(-C #{project_dir} branch --set-upstream-to=origin/#{branch} #{branch}))
             git!(%W(-C #{project_dir} pull))
+            Funlog.instance.fancyinfo_success("未提交的文件已删除!")
+        end
+
+        def handle_stash(project_dir, branch)
+            Funlog.instance.fancyinfo_start("开始保存文件到 stash 区域...")
+
+            # 生成 stash 信息，包含分支名和时间戳
+            timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
+            stash_message = "pindo on #{branch} - #{timestamp}"
+
+            # 保存到 stash（包含未追踪的文件）
+            git!(%W(-C #{project_dir} stash push -u -m #{stash_message}))
+
+            Funlog.instance.fancyinfo_success("文件已保存到 stash 区域!")
+            Funlog.instance.fancyinfo_success("stash 信息: #{stash_message}")
+
+            # 显示当前 stash 列表
+            stash_list = git!(%W(-C #{project_dir} stash list))
+            unless stash_list.nil? || stash_list.empty?
+                puts "\n当前 stash 列表:"
+                puts stash_list
+            end
         end
 
         public
@@ -687,6 +718,180 @@ module Pindo
           end
       end
 
+      # 检查并处理未提交的文件（交互式）
+      # @param project_dir [String] 项目目录路径
+      # @return [void]
+      def check_uncommitted_files(project_dir:)
+        # 1. 检查是否有未提交的文件
+        uncommitted_files = get_uncommitted_files(project_dir: project_dir)
+
+        # 2. 如果没有未提交的文件，直接返回
+        return if uncommitted_files.nil? || uncommitted_files.empty?
+
+        # 3. 获取当前分支名
+        current_branch = git!(%W(-C #{project_dir} rev-parse --abbrev-ref HEAD)).strip
+
+        # 4. 显示文件状态
+        display_file_status(current_branch, uncommitted_files)
+
+        # 5. 让用户选择处理方式
+        cli = HighLine.new
+        process_type = cli.choose do |menu|
+          menu.header = "仓库有未提交的修改，请选择处理方式"
+          menu.prompt = "请输入选项(1/2/3/4/5):"
+          menu.choice("(commit) 全部提交") { 'commit' }
+          menu.choice("(skip) 跳过并且不作任何修改，继续执行") { 'skip' }
+          menu.choice("(reset) 全部丢弃更改，回滚代码") { 'reset' }
+          menu.choice("(stash) 保存到stash区域（该部分代码本次不生效）") { 'stash' }
+          menu.choice("(exit) 先退出，手动来处理退出") { 'exit' }
+        end
+
+        # 6. 如果用户选择跳过，输出警告信息并返回
+        if process_type == 'skip'
+          Funlog.instance.warning("跳过提交，可能导致 build number 与代码仓库不一致")
+          return
+        end
+
+        # 7. 处理未提交的文件
+        process_need_add_files(
+          project_dir: project_dir,
+          process_type: process_type
+        )
+      end
+
+      # 合并到发布分支
+      # @param project_dir [String] 项目目录
+      # @param release_branch [String] 发布分支名称
+      # @param coding_branch [String] 当前开发分支名称
+      def merge_to_release_branch(project_dir:, release_branch:, coding_branch:)
+        current_project_dir = project_dir
+        Funlog.instance.fancyinfo_start("开始合并到#{release_branch}分支")
+        if !coding_branch.eql?(release_branch)
+          coding_branch_commit_id = git!(%W(-C #{current_project_dir} rev-parse #{coding_branch})).strip
+          release_branch_commit_id = nil
+
+          if remote_branch_exists?(local_repo_dir: current_project_dir, branch: release_branch)
+            Funlog.instance.fancyinfo_update("存在#{release_branch}远程分支")
+            if local_branch_exists?(local_repo_dir: current_project_dir, branch: release_branch)
+              Funlog.instance.fancyinfo_update("存在#{release_branch}本地分支")
+              git!(%W(-C #{current_project_dir} checkout #{release_branch}))
+            else
+              Funlog.instance.fancyinfo_update("不存在#{release_branch}本地分支")
+              git!(%W(-C #{current_project_dir} checkout -b #{release_branch} origin/#{release_branch}))
+            end
+
+            git!(%W(-C #{current_project_dir} branch --set-upstream-to=origin/#{release_branch} #{release_branch}))
+            git!(%W(-C #{current_project_dir} fetch origin #{release_branch}))
+            git!(%W(-C #{current_project_dir} merge origin/#{release_branch}))
+
+            # 执行合并操作
+            Executable.capture_command('git', %W(-C #{current_project_dir} merge #{coding_branch}), :capture => :out)
+
+            # 检查是否有冲突
+            conflict_filelist = git!(%W(-C #{current_project_dir} diff --name-only --diff-filter=U --relative))
+            if !conflict_filelist.nil? && !conflict_filelist.strip.empty?
+              raise Informative, "合并#{coding_branch}到#{release_branch}时产生冲突，请手动处理！"
+            else
+              git!(%W(-C #{current_project_dir} push))
+              Funlog.instance.fancyinfo_success("代码已经合并到#{release_branch}分支")
+              # 获取 release_branch 的 commit ID（处理空分支情况）
+              begin
+                release_branch_commit_id = git!(%W(-C #{current_project_dir} rev-parse #{release_branch})).strip
+              rescue => e
+                # 分支可能存在但没有提交（空分支），此时使用 coding_branch 的 commit
+                Funlog.instance.fancyinfo_update("#{release_branch}分支为空或获取commit失败，将使用当前分支commit")
+                release_branch_commit_id = coding_branch_commit_id
+              end
+            end
+
+          else
+            if local_branch_exists?(local_repo_dir: current_project_dir, branch: release_branch)
+              Funlog.instance.fancyinfo_update("不存在#{release_branch}远程分支")
+              Funlog.instance.fancyinfo_update("存在#{release_branch}本地分支")
+              git!(%W(-C #{current_project_dir} checkout #{release_branch}))
+              # 使用带时间戳的备份分支名，避免重复操作时冲突
+              backup_branch = "#{release_branch}_backup_#{Time.now.strftime('%Y%m%d%H%M%S')}"
+              Funlog.instance.fancyinfo_update("备份本地分支到: #{backup_branch}")
+              git!(%W(-C #{current_project_dir} checkout -b #{backup_branch}))
+              git!(%W(-C #{current_project_dir} checkout #{coding_branch}))
+              git!(%W(-C #{current_project_dir} branch -D #{release_branch}))
+            else
+              Funlog.instance.fancyinfo_update("不存在#{release_branch}远程分支")
+              Funlog.instance.fancyinfo_update("不存在#{release_branch}本地分支")
+            end
+
+            git!(%W(-C #{current_project_dir} checkout -b #{release_branch}))
+            git!(%W(-C #{current_project_dir} push origin #{release_branch}))
+            git!(%W(-C #{current_project_dir} branch --set-upstream-to=origin/#{release_branch} #{release_branch}))
+
+            Funlog.instance.fancyinfo_success("代码已经合并到#{release_branch}分支")
+            # 获取 release_branch 的 commit ID（处理空分支情况）
+            begin
+              release_branch_commit_id = git!(%W(-C #{current_project_dir} rev-parse #{release_branch})).strip
+            rescue => e
+              # 新创建的分支，commit ID 应该与 coding_branch 相同
+              release_branch_commit_id = coding_branch_commit_id
+            end
+          end
+
+          git!(%W(-C #{current_project_dir} checkout #{coding_branch}))
+          if release_branch_commit_id && !release_branch_commit_id.eql?(coding_branch_commit_id)
+            Executable.capture_command('git', %W(-C #{current_project_dir} merge #{release_branch}), :capture => :out)
+            conflict_filelist = git!(%W(-C #{current_project_dir} diff --name-only --diff-filter=U --relative))
+            if !conflict_filelist.nil? && !conflict_filelist.strip.empty?
+              raise Informative, "合并#{release_branch}到#{coding_branch}时产生冲突，请手动处理！"
+            end
+            Funlog.instance.fancyinfo_success("已将#{release_branch}合并到#{coding_branch}")
+          end
+          git!(%W(-C #{current_project_dir} push origin #{coding_branch}))
+          Funlog.instance.fancyinfo_success("已推送#{coding_branch}分支到远程")
+        else
+          Funlog.instance.fancyinfo_success("代码处于#{coding_branch}分支,无需合并")
+        end
+      end
+
+      # 检查并推送未推送的本地提交
+      # @param project_dir [String] 项目目录路径
+      # @param branch [String] 分支名称
+      # @return [void]
+      def check_unpushed_commits(project_dir:, branch:)
+        remote_branch = "origin/#{branch}"
+
+        # 1. 检查远程分支是否存在
+        remote_exists = false
+        begin
+          git!(%W(-C #{project_dir} rev-parse --verify #{remote_branch}))
+          remote_exists = true
+        rescue => e
+          # 远程分支不存在
+          remote_exists = false
+        end
+
+        # 2. 如果远程分支不存在，直接推送创建远程分支
+        unless remote_exists
+          Funlog.instance.fancyinfo_warning("远程分支 #{remote_branch} 不存在，需要创建")
+          Funlog.instance.fancyinfo_start("正在推送并创建远程分支...")
+          git!(%W(-C #{project_dir} push -u origin #{branch}))
+          Funlog.instance.fancyinfo_success("远程分支创建成功!")
+          return
+        end
+
+        # 3. 检查本地分支是否领先远程分支
+        ahead_count = git!(%W(-C #{project_dir} rev-list --count #{remote_branch}..#{branch})).strip.to_i
+
+        # 4. 如果没有未推送的提交，直接返回
+        if ahead_count == 0
+          Funlog.instance.fancyinfo_success("本地分支 #{branch} 与远程分支同步，无需推送")
+          return
+        end
+
+        # 5. 有未推送的提交，直接推送（不显示内容，不询问用户）
+        Funlog.instance.fancyinfo_warning("检测到 #{ahead_count} 个本地提交尚未推送")
+        Funlog.instance.fancyinfo_start("正在推送到远程分支 #{remote_branch}...")
+        git!(%W(-C #{project_dir} push origin #{branch}))
+        Funlog.instance.fancyinfo_success("推送成功!")
+      end
+
     end
   end
 end

data/lib/pindo/command/android/autobuild.rb

@@ -2,23 +2,25 @@ require 'highline/import'
 require 'fileutils'
 require 'pindo/base/executable'
 require 'pindo/module/build/build_helper'
-require 'pindo/module/build/version_helper'
+require 'pindo/module/build/git_repo_helper'
 require 'pindo/module/android/android_build_helper'
 require 'pindo/module/android/android_config_helper'
 require 'pindo/module/task/task_manager'
-require 'pindo/module/task/model/git_tag_task'
+require 'pindo/module/task/model/git/git_commit_task'
+require 'pindo/module/task/model/git/git_tag_task'
 require 'pindo/module/task/model/unity/unity_update_task'
 require 'pindo/module/task/model/unity/unity_yoo_asset_task'
 require 'pindo/module/task/model/unity/unity_export_task'
 require 'pindo/module/task/model/build_task'
 require 'pindo/module/task/model/jps/jps_upload_task'
+require 'pindo/module/task/model/jps/jps_message_task'
+require 'pindo/options/options'
 
 module Pindo
   class Command
     class Android < Command
       class Autobuild < Android
         include Appselect
-        include Pindo::Githelper
 
         self.summary = '编译APK,自动修改工程配置,支持上传到JPS测试平台'
 
@@ -57,27 +59,39 @@ module Pindo
                 $ pindo android autobuild --proj="My App"    # 指定项目名称
         DESC
 
+        # 定义此命令使用的参数项
+        def self.option_items
+          @option_items ||= Pindo::Options::OptionGroup.merge(
+            Pindo::Options::JPSOptions.select(:proj, :upload, :send),
+            Pindo::Options::UnityOptions.select(:skiplib, :skipyoo),
+            Pindo::Options::UnityOptions.select_with_defaults(skipconfig: true),
+            Pindo::Options::GitOptions.all
+          )
+        end
+
         def self.options
           [
             ['--release',     '使用Release模式构建'],
-            ['--proj=NAME',   '指定上传到测试平台的项目名称'],
-            ['--bundle_name=NAME', '指定Android Package Name（如com.example.app，会拉取对应配置）'],
-            ['--upload',      '编译后上传到测试平台（自动发送给自己）'],
-            ['--send',        '发送通知到测试群组（同时发送给自己）'],
-            ['--skiplib', '跳过Unity必备库更新（加快构建速度）'],
-            ['--skipyoo', '跳过YooAsset资源打包（加快构建速度）']
-          ].concat(super)
+            ['--bundle_name=NAME', '指定Android Package Name（如com.example.app，会拉取对应配置）']
+          ].concat(option_items.map(&:to_claide_option)).concat(super)
         end
 
         def initialize(argv)
+          @options = initialize_options(argv)
+
           @args_release_flag = argv.flag?('release', false)
-          @args_upload_flag = argv.flag?('upload', false)
-          @args_send_flag = argv.flag?('send', false)
-          @args_proj_name = argv.option('proj')
+          @args_upload_flag = @options[:upload] || false
+          @args_send_flag = @options[:send] || false
+          @args_proj_name = @options[:proj]
           @args_bundle_name = argv.option('bundle_name')
-          @args_skip_lib = argv.flag?('skiplib', false)
-          @args_skip_yoo = argv.flag?('skipyoo', false)
+          @args_skip_lib = @options[:skiplib] || false
+          @args_skip_yoo = @options[:skipyoo] || false
 
+          # Git 参数
+          @args_release_branch = @options[:release_branch] || 'master'
+          @args_ver_inc = Pindo::Options::GitOptions.parse_version_increase_type(@options[:ver_inc] || 'mini')
+          @args_tag_type = Pindo::Options::GitOptions.parse_create_tag_type(@options[:tag_type] || 'new')
+          @args_tag_pre = @options[:tag_pre] || 'v'
 
           if @args_send_flag
             @args_upload_flag = true
@@ -91,10 +105,7 @@ module Pindo
           pindo_project_dir = Dir.pwd
 
           # 加载 JPS 配置（如果存在）
-          context = Pindo::PindoContext.instance
-          context.load_and_apply_jps_config(pindo_project_dir)
-          # 确认并应用缓存（如果有）
-          context.confirm_and_apply_cache
+          Pindo::BuildHelper.share_instance.load_jps_build_config(pindo_project_dir)
 
           # 准备配置
           config = prepare_android_config(pindo_project_dir)
@@ -148,9 +159,15 @@ module Pindo
 
             tasks = []
 
-            # 1. Git 标签任务（所有编译场景都需要打 Tag）
-            git_tag_task = Pindo::TaskSystem::GitTagTask.new(config[:project_path])
-            tasks << git_tag_task
+            # 1. Git 提交任务
+            git_commit_task = Pindo::TaskSystem::GitCommitTask.new(
+              config[:project_path],
+              release_branch: @args_release_branch,
+              ver_inc: @args_ver_inc,
+              tag_type: @args_tag_type,
+              tag_pre: @args_tag_pre
+            )
+            tasks << git_commit_task
 
             # 2. Unity 任务链（仅 Unity 工程）
             if is_unity
@@ -160,7 +177,7 @@ module Pindo
               android_export_path = File.exist?(base_android_path) ? base_android_path : android_path
 
               # 记录上一个任务，用于依赖链
-              last_task = git_tag_task
+              last_task = git_commit_task
 
               # 2.1 Unity 更新必备库任务（可选）
               unless @args_skip_lib
@@ -214,7 +231,11 @@ module Pindo
               upload: @args_upload_flag,
               send: @args_send_flag,
               app_info_obj: config[:app_info_obj],
-              workflow_info: config[:workflow_info]
+              workflow_info: config[:workflow_info],
+              # Git 版本参数
+              ver_inc: @args_ver_inc,
+              tag_type: @args_tag_type,
+              tag_pre: @args_tag_pre
             }
             build_options[:unity_root_path] = config[:project_path] if is_unity
 
@@ -226,21 +247,42 @@ module Pindo
             build_task.dependencies << tasks.last.id if tasks.any?
             tasks << build_task
 
-            # 4. 上传任务（如果需要）
+            # 4. Git 标签任务（依赖第一个编译任务）
+            git_tag_task = Pindo::TaskSystem::GitTagTask.new(
+              config[:project_path],
+              release_branch: @args_release_branch,
+              ver_inc: @args_ver_inc,
+              tag_type: @args_tag_type,
+              tag_pre: @args_tag_pre
+            )
+            git_tag_task.dependencies << build_task.id
+            tasks << git_tag_task
+
+            # 5. 上传和消息发送任务（如果需要）
             if @args_upload_flag
+              # 4.1 创建上传任务
               upload_task = Pindo::TaskSystem::JPSUploadTask.new(
                 'apk',
                 File.join(android_project_path, 'build'),
                 nil,
                 app_info_obj: config[:app_info_obj],
                 workflow_info: config[:workflow_info],
-                project_name: @args_proj_name,
-                context: {
-                  send_to_chat: @args_send_flag
-                },
-                dependencies: [build_task.id]
+                project_name: @args_proj_name
               )
+              upload_task.dependencies << build_task.id
               tasks << upload_task
+
+              # 4.2 创建消息发送任务（依赖上传任务）
+              # app_version_info 将从 upload_task 的数据参数中获取
+              message_task = Pindo::TaskSystem::JPSMessageTask.new(
+                nil,  # app_version_info 为 nil，从依赖任务获取
+                app_info_obj: config[:app_info_obj],
+                project_name: @args_proj_name,
+                send_message_type: @args_send_flag ? 'group' : 'self',
+                data_dependencies: [upload_task.id]  # 从 upload_task 获取数据
+              )
+              message_task.dependencies << upload_task.id  # 执行顺序依赖
+              tasks << message_task
             end
 
             tasks