pindo 5.13.12 → 5.13.13

data/lib/pindo/command/jps/media.rb

@@ -2,6 +2,7 @@ require 'pindo/module/pgyer/pgyerhelper'
 require 'pindo/module/task/task_manager'
 require 'pindo/module/task/model/jps/jps_upload_media_task'
 require 'pindo/options/options'
+require 'pindo/options/groups/task_options'
 
 module Pindo
     class Command
@@ -20,6 +21,7 @@ module Pindo
                         * 自动关联到当前 HEAD commit 记录
                         * 支持追加模式（保留已有附件）
                         * 自动模式：从项目 JPSMedia/ 目录查找 3 小时内的文件
+                        * 支持选择历史 commit（使用 --select 参数）
 
                     使用示例:
 
@@ -29,6 +31,10 @@ module Pindo
 
                         $ pindo jps media --proj=demo                  # 指定项目
 
+                        $ pindo jps media --select                     # 交互式选择历史 commit
+
+                        $ pindo jps media --select path/to/file.png    # 选择 commit 并上传指定文件
+
                 DESC
 
                 self.arguments = [
@@ -38,7 +44,8 @@ module Pindo
                 # 定义此命令使用的参数项
                 def self.option_items
                   @option_items ||= Pindo::Options::OptionGroup.merge(
-                    Pindo::Options::JPSOptions.only(:proj),
+                    Pindo::Options::JPSOptions.select(:proj),
+                    Pindo::Options::TaskOptions.select(:select),
                     Pindo::Options::GitOptions.all
                   )
                 end
@@ -60,11 +67,8 @@ module Pindo
                     # JPS 参数
                     @args_proj_name = @options[:proj]
 
-                    # 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'
+                    # Task 参数
+                    @args_select_flag = @options[:select] || false
 
                     super(argv)
                 end
@@ -76,11 +80,30 @@ module Pindo
                 def run
                     project_path = Dir.pwd
 
+                    # 如果启用 --select 参数，获取用户选择的 commit
+                    selected_commit_info = nil
+                    if @args_select_flag
+                        selected_commit_info = select_git_commit(project_path)
+
+                        if selected_commit_info.nil?
+                            puts "未选择任何提交，已取消操作"
+                            return
+                        end
+
+                        puts "\n已选择提交:"
+                        puts "  Commit ID: #{selected_commit_info[:commit_id][0..7]}"
+                        puts "  时间: #{selected_commit_info[:commit_time]}"
+                        puts "  描述: #{selected_commit_info[:commit_desc]}"
+                        puts ""
+                    end
+
                     # 获取 JPS 配置（app_info_obj 和 workflow_info）
+                    # 使用 manage_type: "git" 来获取 git 管理类型的工作流
                     app_info_obj, workflow_info = PgyerHelper.share_instace.prepare_upload(
                         working_directory: project_path,
                         proj_name: @args_proj_name,
-                        package_type: 'ipa'  # 任意类型，只是为了获取 workflow_id
+                        package_type: "",  # package_type 在 manage_type=git 时会被忽略
+                        manage_type: "git"
                     )
 
                     if app_info_obj.nil?
@@ -88,23 +111,51 @@ module Pindo
                     end
 
                     # 获取 workflow_id
-                    workflow_id = workflow_info&.dig('id')
+                    workflow_id = workflow_info&.dig(:workflow_id) || workflow_info&.dig('id')
+
+                    # 创建任务链
+                    tasks = []
 
-                    # 创建并执行任务
+                    # 1. 提前询问用户如何处理未提交的文件
+                    process_type = Pindo::GitHandler.get_uncommitted_files_process_type(
+                        project_dir: project_path,
+                        interactive: true
+                    )
+
+                    # 2. 创建 Git 提交任务
+                    git_commit_task = Pindo::TaskSystem::GitCommitTask.new(
+                        project_path,
+                        {
+                            process_type: process_type,
+                            commit_message: "feat: jps media 上传前提交"
+                        }
+                    )
+                    tasks << git_commit_task
+
+                    # 3. 创建 JPS Media 上传任务
                     # 所有逻辑都在 Task 中处理：
                     # - 自动查找 git 仓库和 HEAD 信息
                     # - 展开文件路径（通配符、目录）
                     # - 自动查找 JPSMedia/ 目录
                     # - 匹配 git_commit_id 到 JPS commit_log
-                    task = Pindo::TaskSystem::JPSUploadMediaTask.new(
+                    media_upload_task = Pindo::TaskSystem::JPSUploadMediaTask.new(
                         @file_paths,
-                        workflow_id: workflow_id,
-                        project_path: project_path
+                        project_path,  # upload_path
+                        app_info_obj: app_info_obj,
+                        workflow_info: workflow_info,
+                        project_name: @args_proj_name,
+                        git_commit_id: selected_commit_info&.dig(:commit_id),
+                        git_commit_time: selected_commit_info&.dig(:commit_time),
+                        git_commit_desc: selected_commit_info&.dig(:commit_desc)
                     )
+                    # Media 上传任务依赖 Git 提交任务
+                    media_upload_task.dependencies << git_commit_task.id
+                    tasks << media_upload_task
 
+                    # 执行任务链
                     task_manager = Pindo::TaskSystem::TaskManager.instance
                     task_manager.clear_all
-                    task_manager.add_task(task)
+                    tasks.each { |task| task_manager.add_task(task) }
                     task_manager.start
 
                     # 输出结果
@@ -116,6 +167,106 @@ module Pindo
                     end
                 end
 
+                private
+
+                # 交互式选择 git commit
+                # @param project_path [String] 项目路径
+                # @return [Hash, nil] 包含 :commit_id, :commit_time, :commit_desc，或 nil（取消）
+                def select_git_commit(project_path)
+                    # 1. 查找 git 根目录
+                    git_root = find_git_root(project_path)
+                    unless git_root
+                        raise Informative, "当前目录不是 git 仓库"
+                    end
+
+                    # 2. 获取最近 15 条 commit 历史
+                    all_commits = get_recent_commits(git_root, limit: 15)
+
+                    if all_commits.empty?
+                        raise Informative, "未找到 git commit 历史"
+                    end
+
+                    # 3. 筛选符合规范的提交（以 feat:, fix: 等开头）
+                    valid_prefixes = ['feat:', 'fix:', 'docs:', 'style:', 'refactor:', 'perf:', 'test:', 'build:', 'ci:', 'chore:', 'revert:']
+                    commits = all_commits.select do |commit|
+                        desc = commit[:commit_desc].to_s.strip
+                        valid_prefixes.any? { |prefix| desc.downcase.start_with?(prefix) }
+                    end
+
+                    # 如果没有符合规范的提交，提示用户并使用全部提交
+                    if commits.empty?
+                        puts "\n警告：在最近15个提交中未找到符合规范的提交（feat:, fix: 等开头）"
+                        puts "显示所有提交供您选择："
+                        commits = all_commits
+                    else
+                        puts "\n从最近15个提交中筛选出 #{commits.size} 个符合规范的提交："
+                    end
+
+                    # 4. 显示 commit 列表
+                    puts "\n请选择要上传 media 的 git 提交:"
+                    puts "━" * 80
+                    commits.each_with_index do |commit, index|
+                        puts "#{index + 1}. [#{commit[:commit_id][0..7]}] #{commit[:commit_time]} - #{commit[:commit_desc]}"
+                    end
+                    puts "0. 取消操作"
+                    puts "━" * 80
+
+                    # 5. 获取用户选择
+                    choice = nil
+                    loop do
+                        print "\n请输入序号 (0-#{commits.size}): "
+                        input = $stdin.gets.strip
+
+                        choice = input.to_i
+                        break if choice >= 0 && choice <= commits.size
+
+                        puts "无效输入，请输入 0-#{commits.size} 之间的数字"
+                    end
+
+                    # 6. 返回选择的 commit（0 表示取消）
+                    choice == 0 ? nil : commits[choice - 1]
+                end
+
+                # 查找 git 根目录
+                # @param path [String] 起始路径
+                # @return [String, nil] git 根目录，未找到返回 nil
+                def find_git_root(path)
+                    current = File.expand_path(path)
+                    while current != '/'
+                        if File.exist?(File.join(current, '.git'))
+                            return current
+                        end
+                        current = File.dirname(current)
+                    end
+                    nil
+                end
+
+                # 获取最近的 git commits
+                # @param git_root [String] git 根目录
+                # @param limit [Integer] 获取的 commit 数量
+                # @return [Array<Hash>] commit 列表，每个元素包含 :commit_id, :commit_time, :commit_desc
+                def get_recent_commits(git_root, limit: 20)
+                    Dir.chdir(git_root) do
+                        # 使用 git log 获取 commit 历史
+                        # 格式：commit_id|commit_time|commit_desc
+                        output = `git log -#{limit} --format="%H|%ci|%s" 2>/dev/null`.strip
+
+                        return [] if output.empty?
+
+                        output.split("\n").map do |line|
+                            parts = line.split('|', 3)
+                            {
+                                commit_id: parts[0],
+                                commit_time: parts[1],
+                                commit_desc: parts[2]
+                            }
+                        end
+                    end
+                rescue => e
+                    Funlog.instance.fancyinfo_error("获取 git commit 历史失败: #{e.message}")
+                    []
+                end
+
             end
         end
     end

data/lib/pindo/command/jps/upload.rb

@@ -8,7 +8,6 @@ require 'pindo/module/build/build_helper'
 require 'pindo/module/task/task_manager'
 require 'pindo/module/task/model/jps/jps_upload_task'
 require 'pindo/module/task/model/git/git_commit_task'
-require 'pindo/module/task/model/git/git_tag_task'
 require 'pindo/options/options'
 
 module Pindo
@@ -164,20 +163,26 @@ module Pindo
                     }
 
                     # 1. Git 提交和标签任务
+                    # 1.0 提前询问用户如何处理未提交的文件
+                    process_type = Pindo::GitHandler.get_uncommitted_files_process_type(
+                        project_dir: project_dir,
+                        interactive: true
+                    )
+                    
+                    git_options_with_process = git_options.merge({
+                        process_type: process_type,
+                        commit_message: "feat: jps upload 构建前提交"
+                    })
+
                     # 1.1 Git 提交任务
-                    git_commit_task = Pindo::TaskSystem::GitCommitTask.new(project_dir, git_options)
+                    git_commit_task = Pindo::TaskSystem::GitCommitTask.new(project_dir, git_options_with_process)
                     tasks << git_commit_task
 
-                    # 1.2 Git 标签任务（依赖提交任务）
-                    git_tag_task = Pindo::TaskSystem::GitTagTask.new(project_dir, git_options)
-                    git_tag_task.dependencies << git_commit_task.id
-                    tasks << git_tag_task
-
                     # 2. 查找并创建上传任务
                     upload_tasks = find_and_create_upload_tasks(project_dir)
-                    # 让所有上传任务依赖 Git Tag 任务
+                    # 让所有上传任务依赖 Git 提交任务
                     upload_tasks.each do |upload_task|
-                        upload_task.dependencies << git_tag_task.id
+                        upload_task.dependencies << git_commit_task.id
                     end
                     tasks.concat(upload_tasks)
 

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

@@ -13,12 +13,14 @@ 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/jps/jps_upload_task'
+require 'pindo/module/task/model/jps/jps_upload_media_task'
 require 'pindo/module/task/model/jps/jps_message_task'
 require 'pindo/module/task/model/git/git_commit_task'
 require 'pindo/module/task/model/git/git_tag_task'
 require 'pindo/config/build_info_manager'
 require 'pindo/config/ios_config_parser'
 require 'pindo/options/options'
+require 'pindo/options/groups/task_options'
 
 module Pindo
     class Command
@@ -50,9 +52,13 @@ module Pindo
 
                         * 支持发送测试通知
 
+                        * 支持并发任务执行（使用 --multi 参数）
+
                     使用示例:
 
-                        $ pindo unity autobuild                        # 编译所有类型（默认）
+                        $ pindo unity autobuild                        # 编译所有类型（默认串行执行）
+
+                        $ pindo unity autobuild --multi                # 使用并发模式执行（速度更快）
 
                         $ pindo unity autobuild --types=ipa            # 仅编译IPA
 
@@ -63,6 +69,10 @@ module Pindo
                         $ pindo unity autobuild --upload               # 编译所有类型并上传到JPS
 
                         $ pindo unity autobuild --proj="My App"        # 指定项目名称
+
+                        $ pindo unity autobuild --media                # 编译并上传媒体附件
+
+                        $ pindo unity autobuild --multi --upload       # 并发执行并上传
                 DESC
 
                 # 命令参数
@@ -73,9 +83,10 @@ module Pindo
                 # 定义此命令使用的参数项
                 def self.option_items
                     @option_items ||= Pindo::Options::OptionGroup.merge(
-                        Pindo::Options::JPSOptions.select(:proj, :upload, :send),
+                        Pindo::Options::JPSOptions.select(:proj, :upload, :send, :media),
                         Pindo::Options::UnityOptions.select(:skiplib, :skipyoo),
                         Pindo::Options::UnityOptions.select_with_defaults(skipconfig: true),
+                        Pindo::Options::TaskOptions.select(:multi),
                         Pindo::Options::GitOptions.all
                     )
                 end
@@ -99,6 +110,7 @@ module Pindo
                     @args_proj_name = @options[:proj]
                     @args_upload_flag = @options[:upload] || false
                     @args_send_flag = @options[:send] || false
+                    @args_media_flag = @options[:media] || false
                     @args_adhoc_flag = argv.flag?('adhoc', false)
                     @args_deploy_flag = argv.flag?('deploy', false)
                     @args_release_flag = argv.flag?('release', false)
@@ -108,14 +120,17 @@ module Pindo
                     @args_skip_lib = @options[:skiplib] || false
                     @args_skip_yoo = @options[:skipyoo] || false
 
+                    # Task 参数
+                    @args_multi_flag = @options[:multi] || 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'
 
-                    # 如果开启 send，自动开启 upload
-                    if @args_send_flag
+                    # 如果开启 send 或 media，自动开启 upload
+                    if @args_send_flag || @args_media_flag
                         @args_upload_flag = true
                     end
 
@@ -180,8 +195,18 @@ module Pindo
                         task_manager.add_task(task)
                     end
 
-                    # 执行任务
-                    task_manager.start
+                    # # 启用输出管理（自动处理多线程日志隔离）
+                    # task_manager.enable_output_management(
+                    #     log_dir: File.join(pindo_project_dir, 'pindo_logs'),
+                    #     max_lines_per_task: 0
+                    # )
+
+                    # 执行任务（根据 --multi 参数决定模式）
+                    if @args_multi_flag
+                        task_manager.start(mode: :concurrent, max_workers: 3)
+                    else
+                        task_manager.start(mode: :serial)
+                    end
                 end
 
                 # 按平台顺序创建所有任务
@@ -194,12 +219,20 @@ module Pindo
                     selected_platforms = selected_platforms.sort_by { |p| platform_order.index(p) || 999 }
 
                     # 第零步：创建 Git 提交任务
+                    # 提前询问用户如何处理未提交的文件
+                    process_type = Pindo::GitHandler.get_uncommitted_files_process_type(
+                        project_dir: Dir.pwd,
+                        interactive: true # 允许交互，因为这是在任务执行前的主线程中
+                    )
+
                     git_commit_task = Pindo::TaskSystem::GitCommitTask.new(
                         Dir.pwd,
                         release_branch: @args_release_branch,
                         ver_inc: @args_ver_inc,
                         tag_type: @args_tag_type,
-                        tag_pre: @args_tag_pre
+                        tag_pre: @args_tag_pre,
+                        process_type: process_type,
+                        commit_message: "feat: unity autobuild 构建前提交"
                     )
                     all_tasks << git_commit_task
 
@@ -293,19 +326,40 @@ module Pindo
                             upload_task = create_upload_task(platform, all_platform_configs, build_task)
                             all_tasks << upload_task
 
-                            # 创建消息发送任务（依赖上传任务）
+                            # 创建消息发送任务（只依赖上传任务）
                             message_task = Pindo::TaskSystem::JPSMessageTask.new(
                                 nil,  # app_version_info 为 nil，从依赖任务获取
                                 app_info_obj: all_platform_configs["app_info_obj"],
                                 project_name: all_platform_configs["project_name"],
                                 send_message_type: @args_send_flag ? 'group' : 'self',
-                                data_dependencies: [upload_task.id]  # 从 upload_task 获取数据
+                                dependencies: [upload_task.id]  # 从 upload_task 获取数据
                             )
-                            message_task.dependencies << upload_task.id  # 执行顺序依赖
                             all_tasks << message_task
                         end
                     end
 
+                    # 第五步：创建媒体附件上传任务（如果需要，只依赖 Git 提交任务）
+                    if @args_media_flag
+                        # 获取 Git 管理类型的工作流（不同于包上传的工作流）
+                        git_app_info_obj, git_workflow_info = PgyerHelper.share_instace.prepare_upload(
+                            working_directory: Dir.pwd,
+                            proj_name: all_platform_configs["project_name"],
+                            package_type: "",  # package_type 在 manage_type=git 时会被忽略
+                            manage_type: "git"
+                        )
+
+                        media_upload_task = Pindo::TaskSystem::JPSUploadMediaTask.new(
+                            [],  # 空数组，自动从 JPSMedia/ 目录查找
+                            Dir.pwd,  # upload_path
+                            app_info_obj: git_app_info_obj,
+                            workflow_info: git_workflow_info,
+                            project_name: all_platform_configs["project_name"]
+                        )
+                        # 只依赖 Git 提交任务
+                        media_upload_task.dependencies << git_commit_task.id
+                        all_tasks << media_upload_task
+                    end
+
                     # 返回所有任务
                     all_tasks
                 end

data/lib/pindo/command/utils/tag.rb

@@ -76,13 +76,21 @@ module Pindo
           # 创建任务列表
           tasks = []
 
+          # 0. 提前询问用户如何处理未提交的文件
+          process_type = Pindo::GitHandler.get_uncommitted_files_process_type(
+              project_dir: pindo_project_dir,
+              interactive: true
+          )
+
           # 1. Git 提交任务
           git_commit_task = Pindo::TaskSystem::GitCommitTask.new(
             pindo_project_dir,
             release_branch: @args_release_branch,
             ver_inc: @args_ver_inc,
             tag_type: @args_tag_type,
-            tag_pre: @args_tag_pre
+            tag_pre: @args_tag_pre,
+            process_type: process_type,
+            commit_message: "feat: tag 操作前提交"
           )
           tasks << git_commit_task
 

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

@@ -13,6 +13,7 @@ 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_upload_media_task'
 require 'pindo/module/task/model/jps/jps_message_task'
 require 'pindo/options/options'
 
@@ -33,15 +34,17 @@ module Pindo
                 # 命令的详细说明,包含用法示例
                 self.description = <<-DESC
                     编译WebGL包并支持上传到测试平台。
-                    
+
                     支持功能:
 
                         * 编译Debug包
 
-                        * 上传到测试平台  
+                        * 上传到测试平台
 
                         * 发送测试通知
 
+                        * 支持并发任务执行（使用 --multi 参数）
+
                     使用示例:
 
                         $ pindo web autobuild                    # 编译Debug包
@@ -50,7 +53,13 @@ module Pindo
 
                         $ pindo web autobuild --proj=myapp       # 指定项目名称
 
-                        $ pindo web autobuild --run            # 编译完成后再本地打开webgl包
+                        $ pindo web autobuild --media            # 编译、上传并上传媒体附件
+
+                        $ pindo web autobuild --run              # 编译完成后再本地打开webgl包
+
+                        $ pindo web autobuild --multi            # 使用并发模式执行（速度更快）
+
+                        $ pindo web autobuild --multi --upload   # 并发执行并上传
                 DESC
 
                 # 命令的参数列表
@@ -61,9 +70,10 @@ module Pindo
                 # 定义此命令使用的参数项
                 def self.option_items
                     @option_items ||= Pindo::Options::OptionGroup.merge(
-                        Pindo::Options::JPSOptions.select(:proj, :upload, :send),
+                        Pindo::Options::JPSOptions.select(:proj, :upload, :send, :media),
                         Pindo::Options::UnityOptions.select(:skiplib, :skipyoo),
                         Pindo::Options::UnityOptions.select_with_defaults(skipconfig: true),
+                        Pindo::Options::TaskOptions.select(:multi),
                         Pindo::Options::GitOptions.all
                     )
                 end
@@ -83,19 +93,23 @@ module Pindo
                     @args_adhoc_flag = argv.flag?('adhoc', false)
                     @args_upload_flag = @options[:upload] || false
                     @args_send_flag = @options[:send] || false
+                    @args_media_flag = @options[:media] || false
                     @args_proj_name = @options[:proj]
                     @args_bundle_id = argv.option('bundleid')
                     @args_run_flag = argv.flag?('run', false)
                     @args_skip_lib = @options[:skiplib] || false
                     @args_skip_yoo = @options[:skipyoo] || false
 
+                    # Task 参数
+                    @args_multi_flag = @options[:multi] || 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
+                    if @args_send_flag || @args_media_flag
                         @args_upload_flag = true
                     end
 
@@ -124,7 +138,13 @@ module Pindo
                     task_manager = Pindo::TaskSystem::TaskManager.instance
                     task_manager.clear_all
                     tasks.each { |task| task_manager.add_task(task) }
-                    task_manager.start
+
+                    # 执行任务（根据 --multi 参数决定模式）
+                    if @args_multi_flag
+                        task_manager.start(mode: :concurrent, max_workers: 3)
+                    else
+                        task_manager.start
+                    end
 
                     system "open #{pindo_project_dir}"
 
@@ -204,12 +224,20 @@ module Pindo
 
                     # 1. Git 提交任务（如果需要上传）
                     if @args_upload_flag
+                      # 提前询问用户如何处理未提交的文件
+                      process_type = Pindo::GitHandler.get_uncommitted_files_process_type(
+                          project_dir: config[:project_path],
+                          interactive: true
+                      )
+
                       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
+                        tag_pre: @args_tag_pre,
+                        process_type: process_type,
+                        commit_message: "feat: web autobuild 构建前提交"
                       )
                       tasks << git_commit_task
                       last_task = git_commit_task
@@ -300,19 +328,40 @@ module Pindo
                       upload_task.dependencies << build_task.id
                       tasks << upload_task
 
-                      # 7.2 创建消息发送任务（依赖上传任务）
+                      # 7.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 获取数据
+                        dependencies: [upload_task.id]  # 从 upload_task 获取数据
                       )
-                      message_task.dependencies << upload_task.id  # 执行顺序依赖
                       tasks << message_task
                     end
 
+                    # 8. 创建媒体附件上传任务（如果需要，只依赖 Git 提交任务）
+                    if @args_media_flag
+                      # 获取 Git 管理类型的工作流（不同于 HTML 上传的工作流）
+                      git_app_info_obj, git_workflow_info = PgyerHelper.share_instace.prepare_upload(
+                        working_directory: config[:project_path],
+                        proj_name: @args_proj_name,
+                        package_type: "",  # package_type 在 manage_type=git 时会被忽略
+                        manage_type: "git"
+                      )
+
+                      media_upload_task = Pindo::TaskSystem::JPSUploadMediaTask.new(
+                        [],  # 空数组，自动从 JPSMedia/ 目录查找
+                        config[:project_path],  # upload_path
+                        app_info_obj: git_app_info_obj,
+                        workflow_info: git_workflow_info,
+                        project_name: @args_proj_name
+                      )
+                      # 只依赖 Git 提交任务
+                      media_upload_task.dependencies << git_commit_task.id
+                      tasks << media_upload_task
+                    end
+
                     tasks
                   else
                     raise Informative, "Web 编译只支持 Unity 工程"

data/lib/pindo/module/android/android_build_helper.rb

@@ -239,16 +239,15 @@ module Pindo
     end
 
     def build_aab(project_path, debug)
-      Dir.chdir(project_path) do
-        system("./gradlew bundle#{debug ? 'Debug' : 'Release'}")
-      end
+      # 使用子 Shell 切换目录执行，避免影响主进程当前目录 (Thread Safe)
+      cmd = "cd \"#{project_path}\" && ./gradlew bundle#{debug ? 'Debug' : 'Release'}"
+      system(cmd)
     end
 
     def build_so_library(project_path)
-      # 编译so库
-      Dir.chdir(project_path) do
-        system("./gradlew unityLibrary:BuildIl2CppTask")
-      end
+      # 编译so库 (Thread Safe)
+      cmd = "cd \"#{project_path}\" && ./gradlew unityLibrary:BuildIl2CppTask"
+      system(cmd)
     end
 
     def copy_so_files(source_path, target_path)