pindo 5.17.5 → 5.18.4

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

@@ -9,6 +9,7 @@ require 'pindo/config/pindoconfig'
 require 'pindo/config/pindouserlocalconfig'
 require 'pindo/base/funlog'
 require 'pindo/base/git_handler'
+require 'pindo/module/build/build_helper'
 
 
 module Pindo
@@ -55,9 +56,9 @@ module Pindo
         #   - project_name [String] 项目名称
         #   - project_id [String] 项目ID
         #   - workflow_info [Hash] 工作流信息（如果有效）
-        def try_load_jps_build_config(config_file:, package_type:, manage_type: "")
+        def parse_jps_build_config(config_file:, package_type:, manage_type: "")
           if ENV['PINDO_DEBUG']
-            puts "\n[PINDO_DEBUG] try_load_jps_build_config 调用:"
+            puts "\n[PINDO_DEBUG] parse_jps_build_config 调用:"
             puts "  config_file: #{config_file}"
             puts "  package_type: #{package_type.inspect}"
             puts "  manage_type: #{manage_type.inspect}"
@@ -394,7 +395,7 @@ module Pindo
           config_path = if conf && !conf.empty?
             File.expand_path(conf)
           else
-            determine_config_file_path(working_directory)
+            Pindo::BuildHelper.share_instance.determine_jps_config_path(working_directory)
           end
 
           upload_proj_name = nil
@@ -462,7 +463,7 @@ module Pindo
           return app_info_obj, workflow_info
         end
 
-        def prepare_upload(working_directory:nil, conf:nil, package_type:nil, manage_type: "")
+        def prepare_upload(working_directory:nil, conf:nil, package_type:nil, manage_type: "", bundle_name: nil)
             working_directory ||= Dir.pwd
 
             if ENV['PINDO_DEBUG']
@@ -477,14 +478,14 @@ module Pindo
             config_path = if conf && !conf.empty?
               File.expand_path(conf)
             else
-              determine_config_file_path(working_directory)
+              Pindo::BuildHelper.share_instance.determine_jps_config_path(working_directory)
             end
 
             puts "[PINDO_DEBUG] 使用配置文件: #{config_path}" if ENV['PINDO_DEBUG']
 
             # 尝试从配置文件加载
             if package_type || manage_type
-              config_result = try_load_jps_build_config(
+              config_result = parse_jps_build_config(
                 config_file: config_path,
                 package_type: package_type,
                 manage_type: manage_type
@@ -509,8 +510,14 @@ module Pindo
                 end
 
                 puts "[PINDO_DEBUG] 正在查找项目: #{config_result[:project_name]}" if ENV['PINDO_DEBUG']
+                lookup_bundle_id = resolve_lookup_bundle_id(
+                  bundle_name: bundle_name,
+                  workflow_info: config_result[:workflow_info]
+                )
+                puts "[PINDO_DEBUG] bundle_id 查找键: #{lookup_bundle_id.inspect}" if ENV['PINDO_DEBUG']
                 app_info_obj = find_app_info_with_obj_list(
-                  proj_name: config_result[:project_name]
+                  proj_name: config_result[:project_name],
+                  bundle_id: lookup_bundle_id
                 )
 
                 if app_info_obj
@@ -1343,9 +1350,19 @@ module Pindo
 
         end
 
-        def find_app_info_with_obj_list(proj_name:nil)
+        # 通过 project_id 获取项目详情（轻量接口，比 find_app_info_with_obj_list 更快）
+        # @param project_id [String] 项目ID
+        # @return [Hash, nil] 项目信息对象
+        def get_project_detail(project_id:)
+          return nil if project_id.nil? || project_id.to_s.empty?
+
+          result = @pgyer_client.get_project_detail(project_id: project_id)
+          result&.dig("data")
+        end
+
+        def find_app_info_with_obj_list(proj_name:nil, bundle_id:nil)
 
-            if proj_name.nil?
+            if proj_name.nil? && bundle_id.nil?
                 return nil
             end
 
@@ -1353,13 +1370,24 @@ module Pindo
 
             get_app_list_in_pgyer()
 
-            key_proj_name = proj_name.downcase.strip.gsub(/[\s\-_]/, '')
+            key_proj_name = proj_name&.downcase&.strip&.gsub(/[\s\-_]/, '')
+            key_bundle_id = bundle_id&.downcase&.strip
 
             app_info_list = Pindoconfig.instance.get_pgyerapps_info_list()
-            app_info_obj = app_info_list&.find do |app_info_item|
+            app_info_obj = nil
+            if key_bundle_id && !key_bundle_id.empty?
+              app_info_obj = app_info_list&.find do |app_info_item|
+                app_info_bundle_id = app_info_item["bundleId"].to_s.downcase.strip
+                app_info_bundle_id.eql?(key_bundle_id)
+              end
+            end
+
+            if app_info_obj.nil? && key_proj_name && !key_proj_name.empty?
+              app_info_obj = app_info_list&.find do |app_info_item|
                 # 新 API 使用 projectName 字段
                 app_info_item_name = app_info_item["projectName"].to_s.downcase.strip.gsub(/[\s\-_]/, '')
                 app_info_item_name.eql?(key_proj_name)
+              end
             end
 
             Funlog.instance.fancyinfo_success("拉取app信息列表完成，app信息获取成功！")
@@ -1367,6 +1395,31 @@ module Pindo
             app_info_obj
         end
 
+        def wildcard_android_bundle_name?(bundle_name)
+          return false if bundle_name.nil? || bundle_name.empty?
+
+          bundle_name.include?('*') ||
+            bundle_name.end_with?('.') ||
+            ['com.test', 'com.example', 'com.demo', 'com.heroneverdie101'].include?(bundle_name)
+        end
+
+        def resolve_lookup_bundle_id(bundle_name:, workflow_info:)
+          return nil if bundle_name.nil? || bundle_name.empty?
+
+          if wildcard_android_bundle_name?(bundle_name)
+            package_name = workflow_info && workflow_info[:package_name]
+            return nil if package_name.nil? || package_name.empty?
+
+            prefix = bundle_name.sub(/\.\*$/, '').sub(/\.$/, '')
+            return nil if prefix.empty?
+
+            package_suffix = package_name.to_s.gsub(/[^a-zA-Z0-9]/, '').downcase
+            return "#{prefix}.#{package_suffix}"
+          end
+
+          bundle_name
+        end
+
         def get_app_version(projectId:nil, app_version_index:nil, latest_version:true, package_type:nil)
 
             params = {}
@@ -1891,28 +1944,6 @@ module Pindo
 
         private
 
-        # 确定 JPSBuildConfig.json 文件路径
-        # Unity 工程：仓库根目录/ProjectSettings/JPSBuildConfig.json
-        # iOS/Android 工程：仓库根目录/JPSBuildConfig.json
-        #
-        # @param working_directory [String] 工作目录
-        # @return [String] 配置文件完整路径
-        def determine_config_file_path(working_directory)
-          # 获取 Git 仓库根目录
-          repo_root_dir = nil
-          if Pindo::GitHandler.is_git_directory?(local_repo_dir: working_directory)
-            repo_root_dir = Pindo::GitHandler.git_root_directory(local_repo_dir: working_directory)
-          end
-          repo_root_dir ||= working_directory
-
-          # 判断工程类型
-          if File.directory?(File.join(repo_root_dir, 'ProjectSettings'))
-            File.join(repo_root_dir, 'ProjectSettings', 'JPSBuildConfig.json')
-          else
-            File.join(repo_root_dir, 'JPSBuildConfig.json')
-          end
-        end
-
         # 验证工作流配置是否有效
         #
         # @param workflow [Hash] 工作流配置对象
@@ -1947,13 +1978,17 @@ module Pindo
         # @param project_id [String] 项目ID
         # @param project_name [String] 项目名称
         # @param project_scheme [String] 项目scheme
+        # @param bundle_group_name [String, nil] 非通配符组名（来自 API bundleId）
+        # @param wildcard_bundle_group_name [String, nil] 通配符组名（来自 API wildcardBundleId）
         # @param workflow_key [String] 工作流键名
         # @param workflow_data [Hash] 工作流数据
-        def create_new_config(config_file, project_id, project_name, project_scheme, workflow_key, workflow_data)
+        def create_new_config(config_file:, project_id:, project_name:, project_scheme:, bundle_group_name: nil, wildcard_bundle_group_name: nil, workflow_key:, workflow_data:)
           new_config = {
             "project_name" => project_name,
             "project_scheme" => project_scheme,
             "project_id" => project_id,
+            "bundle_group_name" => bundle_group_name,
+            "wildcard_bundle_group_name" => wildcard_bundle_group_name,
             workflow_key => workflow_data
           }
 
@@ -1976,7 +2011,7 @@ module Pindo
           return if working_directory.nil? || app_info_obj.nil? || workflow_info.nil?
 
           # 1. 确定配置文件路径
-          config_file = determine_config_file_path(working_directory)
+          config_file = Pindo::BuildHelper.share_instance.determine_jps_config_path(working_directory)
 
           # 2. 根据 manage_type 或 package_type 确定 workflow_key
           workflow_key = nil
@@ -1998,6 +2033,8 @@ module Pindo
           # 3. 准备新的项目基础信息
           new_project_id = app_info_obj["id"]
           new_project_name = app_info_obj["projectName"]
+          new_bundle_group_name = app_info_obj["bundleId"]
+          new_wildcard_bundle_group_name = app_info_obj["wildcardBundleId"]
           new_project_scheme = app_info_obj["scheme"] ||
                                app_info_obj["projectName"].to_s.downcase.strip.gsub(/[\s\-_]/, '')
 
@@ -2012,8 +2049,16 @@ module Pindo
 
           # 5. 配置文件不存在 → 创建新配置
           if !File.exist?(config_file)
-            create_new_config(config_file, new_project_id, new_project_name,
-                              new_project_scheme, workflow_key, new_workflow_data)
+            create_new_config(
+              config_file: config_file,
+              project_id: new_project_id,
+              project_name: new_project_name,
+              project_scheme: new_project_scheme,
+              bundle_group_name: new_bundle_group_name,
+              wildcard_bundle_group_name: new_wildcard_bundle_group_name,
+              workflow_key: workflow_key,
+              workflow_data: new_workflow_data
+            )
             return
           end
 
@@ -2022,8 +2067,16 @@ module Pindo
             existing_config = JSON.parse(File.read(config_file))
           rescue => e
             puts "[PgyerHelper] 读取配置文件失败: #{e.message}，将创建新配置"
-            create_new_config(config_file, new_project_id, new_project_name,
-                              new_project_scheme, workflow_key, new_workflow_data)
+            create_new_config(
+              config_file: config_file,
+              project_id: new_project_id,
+              project_name: new_project_name,
+              project_scheme: new_project_scheme,
+              bundle_group_name: new_bundle_group_name,
+              wildcard_bundle_group_name: new_wildcard_bundle_group_name,
+              workflow_key: workflow_key,
+              workflow_data: new_workflow_data
+            )
             return
           end
 
@@ -2033,8 +2086,16 @@ module Pindo
              existing_config['project_id'] != new_project_id
 
             puts "项目ID变更，重新写入完整配置"
-            create_new_config(config_file, new_project_id, new_project_name,
-                              new_project_scheme, workflow_key, new_workflow_data)
+            create_new_config(
+              config_file: config_file,
+              project_id: new_project_id,
+              project_name: new_project_name,
+              project_scheme: new_project_scheme,
+              bundle_group_name: new_bundle_group_name,
+              wildcard_bundle_group_name: new_wildcard_bundle_group_name,
+              workflow_key: workflow_key,
+              workflow_data: new_workflow_data
+            )
             return
           end
 
@@ -2046,9 +2107,11 @@ module Pindo
              existing_workflow_id.to_s.empty? ||
              existing_workflow_id != workflow_info[:workflow_id]
 
-            # Workflow ID 变更 → 仅更新对应的 workflow
+            # Workflow ID 变更 → 更新对应的 workflow 和项目信息
             puts "#{workflow_key} 变更，更新工作流配置"
             existing_config[workflow_key] = new_workflow_data
+            existing_config["bundle_group_name"] = new_bundle_group_name
+            existing_config["wildcard_bundle_group_name"] = new_wildcard_bundle_group_name
             File.write(config_file, JSON.pretty_generate(existing_config))
             puts "已更新 #{workflow_key}"
             return

data/lib/pindo/module/task/core/task_executor.rb

@@ -120,6 +120,8 @@ module Pindo
 
         rescue => e
           # 任务失败
+          task.status = TaskStatus::FAILED
+          task.error = e
           @reporter.print_task_failure(task, e)
         end
       end

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

@@ -44,6 +44,13 @@ module Pindo
         update_project_config
         update_version_info
         handle_bundle_name_config if @bundle_name
+        if @bundle_name.nil?
+          # 当用户不选择 bundle_name 时，仍在 google-services.json 中合并工作流 applicationId（追加 client，不覆盖旧包名）
+          Pindo::AndroidConfigHelper.update_google_services_package_name(
+            project_dir: @project_path,
+            package_name: expected_android_package_name_from_workflow
+          )
+        end
         add_application_id_scheme
       end
 
@@ -177,13 +184,30 @@ module Pindo
         puts "\n正在处理指定的 Bundle Name: #{@bundle_name}..."
 
         # 检查是否为通配符
-        is_wildcard = @bundle_name.include?('*') ||
-                      @bundle_name.end_with?('.') ||
-                      ['com.test', 'com.example', 'com.demo'].include?(@bundle_name)
+        is_wildcard = wildcard_bundle_name?(@bundle_name)
 
         if is_wildcard
           puts "  ⚠️  检测到通配符或通用 Bundle Name: #{@bundle_name}"
-          puts "  ⚠️  跳过 google-services.json 和 Application ID 更新"
+          # 通配符模式下，applicationId 与 google-services.json 需与工作流的 package_name（当前项目名）一致；json 侧为合并追加 client。
+          expected_package_name = expected_android_package_name_from_workflow
+          Pindo::AndroidConfigHelper.update_application_id(
+            project_dir: @project_path,
+            application_id: expected_package_name
+          )
+          gs_paths = Pindo::AndroidConfigHelper.existing_google_services_json_paths(@project_path)
+          if gs_paths.any?
+            merged = Pindo::AndroidConfigHelper.update_google_services_package_name(
+              project_dir: @project_path,
+              package_name: expected_package_name
+            )
+            if merged
+              puts "  ✓ 通配符模式已更新 applicationId 并已合并 google-services client: #{expected_package_name}"
+            else
+              puts "  ✓ 通配符模式已更新 applicationId: #{expected_package_name}（google-services 无需追加新 client）"
+            end
+          else
+            puts "  ✓ 通配符模式已更新 applicationId: #{expected_package_name}（项目内无 google-services.json，跳过 client 合并）"
+          end
         else
           # 拉取配置仓库
           config_repo_dir = Pindo::GitHandler.clong_buildconfig_repo(repo_name: @bundle_name)
@@ -201,6 +225,12 @@ module Pindo
               application_id: @bundle_name
             )
 
+              # 合并 google-services.json：追加与 applicationId 一致的 client，不删除历史 package_name
+              Pindo::AndroidConfigHelper.update_google_services_package_name(
+                project_dir: @project_path,
+                package_name: @bundle_name
+              )
+
             puts "  ✓ Bundle Name 配置处理完成"
           else
             raise Informative, "无法获取配置仓库"
@@ -215,11 +245,39 @@ module Pindo
         )
       end
 
+      # 从 workflow_packname 生成符合 Android applicationId/google-services.json 的包名后缀
+      def expected_android_package_name_from_workflow
+        workflow_packname = @workflow_info[:package_name]
+        app_id_suffix = workflow_packname.gsub(/[^a-zA-Z0-9]/, '').downcase
+        "com.heroneverdie101.#{app_id_suffix}"
+      end
+
       # 构建 Android 工程
       def build_android_project
         android_build_helper = Pindo::AndroidBuildHelper.share_instance
-        # 第二个参数 true 表示 debug 模式
-        android_build_helper.auto_build_apk(@project_path, true)
+        # 第二个参数 true 表示 debug 模式，bundle_name 会用于 JPS JKS 查询和签名
+        resolved_bundle_id = signing_bundle_id
+        puts "  使用签名 Bundle ID: #{resolved_bundle_id}"
+        android_build_helper.auto_build_apk(
+          @project_path,
+          true,
+          bundle_name: resolved_bundle_id,
+          workflow_name: @workflow_info[:package_name]
+        )
+      end
+
+      def wildcard_bundle_name?(bundle_name)
+        return false if bundle_name.nil? || bundle_name.empty?
+
+        bundle_name.include?('*') ||
+          bundle_name.end_with?('.') ||
+          ['com.test', 'com.example', 'com.demo', 'com.heroneverdie101'].include?(bundle_name)
+      end
+
+      def signing_bundle_id
+        return @bundle_name if @bundle_name && !wildcard_bundle_name?(@bundle_name)
+
+        expected_android_package_name_from_workflow
       end
     end
   end

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

@@ -37,7 +37,7 @@ module Pindo
       def initialize(project_path, options = {})
         # GitCommitTask 特有的属性
         @fixed_version = options[:fixed_version]  # 外部指定的固定版本号
-        @process_type = options[:process_type] || Pindo::UncommittedFilesProcessType::SKIP # 默认跳过
+        @process_type = options[:process_type] || Pindo::UncommittedFilesProcessType::SKIP_WITH_TAG # 默认跳过但打tag
         @commit_message = options[:commit_message] || 'build: 构建产生提交' # 默认提交消息
 
         options[:project_path] = project_path
@@ -103,7 +103,25 @@ module Pindo
           raise e
         end
 
+        # skip_without_tag 模式：跳过所有 git 同步操作，直接返回
+        if @process_type == Pindo::UncommittedFilesProcessType::SKIP_WITHOUT_TAG
+          coding_branch = get_current_branch_name
+          @build_number, @commit_hash = git_repo_helper.get_build_number_from_commit(project_dir: root_dir)
+          @build_version = "0.0.0"
+          Funlog.instance.fancyinfo_warning("skip_without_tag 模式：跳过分支合并和 tag 创建")
+
+          # 显示 commit 信息后直接返回
+          display_all_repos_commit_info(root_dir)
+          return {
+            success: true,
+            root_dir: root_dir,
+            current_branch: coding_branch,
+            message: "skip_without_tag: 跳过 Git 同步操作"
+          }
+        end
+
         # 4. Stash 工作目录的残留修改（为分支同步做准备）
+        coding_branch = nil
         stash_saved = false
         stash_name = "pindo_stash_#{Time.now.strftime('%Y%m%d%H%M%S')}_#{rand(1000)}"
         status = Pindo::GitHandler.git!(%W(-C #{root_dir} status --porcelain)).strip
@@ -113,66 +131,64 @@ module Pindo
           stash_saved = true
         end
 
-        # 5. 获取当前分支
-        coding_branch = get_current_branch_name
-
-        # 6. 检查并推送本地提交到远程（确保本地和远程同步）
-        Pindo::GitHandler.check_unpushed_commits(project_dir: root_dir, branch: coding_branch)
+        begin
+          # 5. 获取当前分支
+          coding_branch = get_current_branch_name
 
-        # 7. 分支同步：将 coding_branch 和 release_branch 双向合并（确保两分支在同一节点）
-        if coding_branch != @release_branch
-          Funlog.instance.fancyinfo_start("开始同步 #{coding_branch} 和 #{@release_branch} 分支")
-          Pindo::GitHandler.merge_branches(
-            project_dir: root_dir,
-            source_branch: coding_branch,
-            target_branch: @release_branch,
-            sync_branches: true  # 双向合并，确保两分支完全同步
-          )
-          Funlog.instance.fancyinfo_success("分支同步完成，#{coding_branch} 和 #{@release_branch} 现在在同一节点")
-        end
+          # 6. 检查并推送本地提交到远程（确保本地和远程同步）
+          Pindo::GitHandler.check_unpushed_commits(project_dir: root_dir, branch: coding_branch)
 
-        # 8. 计算 build_version
-        # 优先级 1: 如果指定了 fixed_version（外部传入或从 HEAD tag 获取），使用它
-        if @fixed_version && !@fixed_version.empty?
-          @build_version = @fixed_version
-          @build_number, @commit_hash = git_repo_helper.get_build_number_from_commit(project_dir: root_dir)
-          commit_short = @commit_hash ? @commit_hash[0..7] : "unknown"
-          Funlog.instance.fancyinfo_success("Version: #{@build_version}, Build: #{@build_number}, Commit: #{commit_short}")
+          # 7. 分支同步：将 coding_branch 和 release_branch 双向合并（确保两分支在同一节点）
+          if coding_branch != @release_branch
+            Funlog.instance.fancyinfo_start("开始同步 #{coding_branch} 和 #{@release_branch} 分支")
+            Pindo::GitHandler.merge_branches(
+              project_dir: root_dir,
+              source_branch: coding_branch,
+              target_branch: @release_branch,
+              sync_branches: true  # 双向合并，确保两分支完全同步
+            )
+            Funlog.instance.fancyinfo_success("分支同步完成，#{coding_branch} 和 #{@release_branch} 现在在同一节点")
+          end
 
-        # 优先级 2: 计算新版本号
-        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_success("Version: #{@build_version}, Build: #{@build_number}, Commit: #{commit_short}")
-        end
+          # 8. 计算 build_version
+          # 优先级 1: 如果指定了 fixed_version（外部传入或从 HEAD tag 获取），使用它
+          if @fixed_version && !@fixed_version.empty?
+            @build_version = @fixed_version
+            @build_number, @commit_hash = git_repo_helper.get_build_number_from_commit(project_dir: root_dir)
+            commit_short = @commit_hash ? @commit_hash[0..7] : "unknown"
+            Funlog.instance.fancyinfo_success("Version: #{@build_version}, Build: #{@build_number}, Commit: #{commit_short}")
 
+          # 优先级 2: 计算新版本号
+          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_success("Version: #{@build_version}, Build: #{@build_number}, Commit: #{commit_short}")
+          end
 
-        # 9. 还原 stash（如果之前有 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) }
+        ensure
+          # 9. 还原 stash（无论成功或失败都执行）
+          if stash_saved
+            begin
+              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，请手动检查")
+              if matched_line && (stash_id = matched_line.match(/(stash@\{\d+\})/)&.[](1))
+                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
-          rescue => e
-            Funlog.instance.fancyinfo_warning("stash 还原时发生冲突: #{e.message}")
-            Funlog.instance.fancyinfo_warning("stash 已保留，请手动执行 'git stash pop' 处理冲突")
-            # 不抛出异常，任务继续（版本号已计算成功，stash 冲突不影响构建）
           end
         end
 

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

@@ -64,7 +64,17 @@ module Pindo
             stash_saved = true
           end
 
-          # 2. 合并到发布分支（双向同步，确保 coding_branch 和 release_branch 保持一致）
+          # 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,
@@ -74,20 +84,14 @@ module Pindo
             )
           end
 
-          # 3. 获取版本信息
-          # 优先级 1: 从 GitCommitTask 获取所有版本相关参数（标准方式）
-          git_commit_data = get_data_param_by_key(:git_commit)
+          # 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]
-            @tag_pre = git_commit_data[:task_param][:tag_pre] if git_commit_data[:task_param][:tag_pre]
-            @release_branch = git_commit_data[:task_param][:release_branch] if git_commit_data[:task_param][:release_branch]
-            @tag_type = git_commit_data[:task_param][:tag_type] if git_commit_data[:task_param][:tag_type]
-            @ver_inc = git_commit_data[:task_param][:ver_inc] if git_commit_data[:task_param][:ver_inc]
             Funlog.instance.fancyinfo_success("使用 GitCommitTask 的版本号: #{@build_version}, Build: #{@build_number}, Tag前缀: #{@tag_pre}, Tag类型: #{@tag_type}")
 
-          # 优先级 2: 自己计算（降级方案，用于向后兼容或 GitCommitTask 无有效数据）
+          # 降级：自己计算（向后兼容或 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(