pindo 5.20.0 → 5.20.1

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

@@ -28,6 +28,9 @@ module Pindo
         def initialize(config_file: nil)
             @force_login = false
             @has_login = false
+            # 项目列表分页进度：下一个待拉取的页码、是否已拉完所有页
+            @projects_next_page = 1
+            @projects_fully_loaded = false
             # PgyerHelper 提供默认配置路径
             @config_file = config_file || File.join(File::expand_path(Pindoconfig.instance.pindo_common_configdir), "jps_client_config.json")
         end
@@ -177,7 +180,7 @@ module Pindo
         # @param working_directory [String] 工作目录
         # @param manage_type [String] 管理类型（默认为空，"git" 时筛选 git 工作流）
         # @return [Hash] 选择的工作流信息
-        def select_workflow_for_project(project_id:, package_type:, working_directory:, manage_type: "")
+        def select_workflow_for_project(project_id:, package_type:, working_directory:, manage_type: "", workflow_name: nil)
           # 1. 从 JPS API 获取可用工作流列表
           Funlog.instance.fancyinfo_start("正在获取可用工作流...")
 
@@ -241,8 +244,23 @@ module Pindo
               else package_type
             end
 
-            # 非 git 模式下，如果过滤后没有结果，使用所有工作流
-            display_workflows = filtered_workflows.empty? ? workflows : filtered_workflows
+            # 非 git 模式：过滤结果即为候选。若为空则交由下方“没有找到匹配工作流”报错，
+            # 不再回退到全部工作流——否则会把其它类型的工作流误当作请求类型（写错 workflow_key）
+            display_workflows = filtered_workflows
+          end
+
+          # 2.5 若指定了 workflow_name，按名称精确匹配（忽略大小写与首尾空格）确定性选择。
+          # 只接受完整精确匹配，不做子串模糊匹配，避免 "Production" 误命中 "Legacy Production Upload"。
+          if workflow_name && !workflow_name.to_s.strip.empty? && !display_workflows.empty?
+            key_name = workflow_name.to_s.strip.downcase
+            name_matched = display_workflows.select do |w|
+              (w['tabName'] || w['tab_name']).to_s.strip.downcase == key_name
+            end
+            if name_matched.empty?
+              available = display_workflows.map { |w| w['tabName'] || w['tab_name'] }.join('、')
+              raise Informative, "未找到名称精确匹配 \"#{workflow_name}\" 的 #{type_desc} 工作流（需与 tab 名完全一致），可选: #{available}"
+            end
+            display_workflows = name_matched
           end
 
           # 3. 根据匹配数量决定选择方式
@@ -463,7 +481,7 @@ module Pindo
           return app_info_obj, workflow_info
         end
 
-        def prepare_upload(working_directory:nil, conf:nil, package_type:nil, manage_type: "", bundle_name: nil)
+        def prepare_upload(working_directory:nil, conf:nil, package_type:nil, manage_type: "", bundle_name: nil, proj_name: nil, workflow_name: nil)
             working_directory ||= Dir.pwd
 
             if ENV['PINDO_DEBUG']
@@ -474,6 +492,12 @@ module Pindo
               puts "  manage_type: #{manage_type.inspect}"
             end
 
+            # 是否需要选择/保存工作流：空串 package_type/manage_type 视为“无工作流需求”（如 download 仅要项目）
+            wants_workflow = !package_type.to_s.strip.empty? || !manage_type.to_s.strip.empty?
+            # 是否显式指定了项目名（--proj）/工作流名（--workflow_name）：命令行参数优先于已有配置
+            has_explicit_proj = !proj_name.to_s.strip.empty?
+            has_explicit_workflow_name = !workflow_name.to_s.strip.empty?
+
             # 确定配置文件路径：显式指定 > 工作目录自动检测 > 工程目录自动检测
             config_path = if conf && !conf.empty?
               File.expand_path(conf)
@@ -483,8 +507,19 @@ module Pindo
 
             puts "[PINDO_DEBUG] 使用配置文件: #{config_path}" if ENV['PINDO_DEBUG']
 
-            # 尝试从配置文件加载
-            if package_type || manage_type
+            # 显式 --workflow_name 但未给 --proj 时，从已有配置回填项目名，
+            # 使 --workflow_name 能在正确项目内按名重选工作流，而不是被旧配置里的工作流静默覆盖
+            if wants_workflow && has_explicit_workflow_name && !has_explicit_proj && File.exist?(config_path)
+              existing_cfg = (JSON.parse(File.read(config_path)) rescue nil)
+              existing_proj = existing_cfg && existing_cfg['project_name']
+              if existing_proj && !existing_proj.to_s.strip.empty?
+                proj_name = existing_proj
+                has_explicit_proj = true
+              end
+            end
+
+            # 尝试从配置文件加载（显式 --proj/--workflow_name 时跳过，保证命令行参数优先于已有配置）
+            if wants_workflow && !has_explicit_proj && !has_explicit_workflow_name
               config_result = parse_jps_build_config(
                 config_file: config_path,
                 package_type: package_type,
@@ -539,29 +574,35 @@ module Pindo
             app_info_obj = nil
             if login
 
-                if !app_info_obj.nil?
-                    # 如果提供了 package_type 或 manage_type，选择工作流并保存配置
-                    if package_type || manage_type
-                      workflow_info = select_workflow_for_project(
-                        project_id: app_info_obj["id"],
-                        package_type: package_type,
-                        working_directory: working_directory,
-                        manage_type: manage_type
-                      )
-
-                      save_jps_build_config(
-                        working_directory: working_directory,
-                        app_info_obj: app_info_obj,
-                        workflow_info: workflow_info,
-                        package_type: package_type,
-                        manage_type: manage_type
-                      )
-
-                      @proj_name = upload_proj_name
-                      return app_info_obj, workflow_info
+                # 非交互：显式指定项目名（--proj）时直接解析，跳过项目选择菜单
+                if proj_name && !proj_name.to_s.strip.empty?
+                    resolved_proj_name = proj_name.to_s.strip
+                    app_info_obj = find_app_info_with_obj_list(proj_name: resolved_proj_name, strict: true)
+                    if app_info_obj.nil?
+                        raise Informative, "JPS 上未找到项目: #{resolved_proj_name}，请检查项目名称"
+                    end
+                    PindoUserLocalConfig.instance.write_last_work_project(proj_name: app_info_obj["projectName"])
+                    @proj_name = resolved_proj_name
+
+                    if wants_workflow
+                        workflow_info = select_workflow_for_project(
+                            project_id: app_info_obj["id"],
+                            package_type: package_type,
+                            working_directory: working_directory,
+                            manage_type: manage_type,
+                            workflow_name: workflow_name
+                        )
+                        save_jps_build_config(
+                            working_directory: working_directory,
+                            app_info_obj: app_info_obj,
+                            workflow_info: workflow_info,
+                            package_type: package_type,
+                            manage_type: manage_type,
+                            conf: conf
+                        )
+                        return app_info_obj, workflow_info
                     else
-                      @proj_name = upload_proj_name
-                      return app_info_obj
+                        return app_info_obj
                     end
                 end
 
@@ -662,13 +703,14 @@ module Pindo
                     # 记录上次上传的项目
                     PindoUserLocalConfig.instance.write_last_work_project(proj_name:app_info_obj["projectName"])
 
-                    # 如果提供了 package_type 或 manage_type，选择工作流并保存配置
-                    if package_type || manage_type
+                    # 如果需要工作流，选择工作流并保存配置
+                    if wants_workflow
                       workflow_info = select_workflow_for_project(
                         project_id: app_info_obj["id"],
                         package_type: package_type,
                         working_directory: working_directory,
-                        manage_type: manage_type
+                        manage_type: manage_type,
+                        workflow_name: workflow_name
                       )
 
                       save_jps_build_config(
@@ -676,7 +718,8 @@ module Pindo
                         app_info_obj: app_info_obj,
                         workflow_info: workflow_info,
                         package_type: package_type,
-                        manage_type: manage_type
+                        manage_type: manage_type,
+                        conf: conf
                       )
 
                       @proj_name = upload_proj_name
@@ -1357,41 +1400,108 @@ module Pindo
           result&.dig("data")
         end
 
-        def find_app_info_with_obj_list(proj_name:nil, bundle_id:nil)
+        PROJECT_PAGE_SIZE = 100
+        # 安全上限：最多翻 200 页（约 2 万项目），防止服务端异常（如忽略 pageNo 恒返满页）导致死循环
+        MAX_PROJECT_PAGES = 200
+
+        def find_app_info_with_obj_list(proj_name:nil, bundle_id:nil, strict: false)
 
             if proj_name.nil? && bundle_id.nil?
                 return nil
             end
 
-            Funlog.instance.fancyinfo_start("正在拉取app信息列表,查找app信息...")
-
-            get_app_list_in_pgyer()
+            Funlog.instance.fancyinfo_start("正在查找 JPS 项目...")
 
             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 = 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)
+            # 在给定列表中查找匹配对象：bundle_id 精确优先，其次项目名归一化匹配。
+            # strict 且归一化撞到多个时优先完整精确匹配，仍多个则报错要求精确名。
+            matcher = lambda do |list|
+              obj = nil
+              if key_bundle_id && !key_bundle_id.empty?
+                obj = list.find { |it| it["bundleId"].to_s.downcase.strip.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)
+              if obj.nil? && key_proj_name && !key_proj_name.empty?
+                matches = list.select do |it|
+                  it["projectName"].to_s.downcase.strip.gsub(/[\s\-_]/, '').eql?(key_proj_name)
+                end
+                if strict && matches.size > 1
+                  key_exact = proj_name.to_s.downcase.strip
+                  exact = matches.select { |it| it["projectName"].to_s.downcase.strip.eql?(key_exact) }
+                  if exact.size == 1
+                    obj = exact.first
+                  else
+                    names = matches.map { |it| it["projectName"] }.join('、')
+                    raise Informative, "项目名 \"#{proj_name}\" 匹配到多个 JPS 项目: #{names}，请使用精确名称"
+                  end
+                else
+                  obj = matches.first
+                end
               end
+              obj
             end
 
-            Funlog.instance.fancyinfo_success("拉取app信息列表完成，app信息获取成功！")
+            # strict 需完整列表才能判定唯一；其余边拉边找、命中即早停
+            list = ensure_projects_loaded(require_full: strict) { |acc| !matcher.call(acc).nil? }
+            app_info_obj = matcher.call(list)
+
+            Funlog.instance.fancyinfo_success("JPS 项目查找完成")
 
             app_info_obj
         end
 
+        # 逐页（每页 PROJECT_PAGE_SIZE=100）拉取 JPS 项目列表并累积到进程缓存。
+        # - require_full=false：每拉一页调用 stop_when(累积列表)，命中即停止继续拉取（早停）
+        # - require_full=true ：拉完所有页（strict 判唯一等需要完整列表的场景）
+        # 已缓存的页会复用并从上次进度续拉；全部页拉完仍未命中即返回完整列表，由调用方判定“不存在”。
+        #
+        # @param require_full [Boolean] 是否必须拉完所有页
+        # @yield [Array] 当前累积的项目列表；返回真值表示已命中，可停止续拉
+        # @return [Array] 累积到的项目列表
+        def ensure_projects_loaded(require_full: false, &stop_when)
+            accumulated = Pindoconfig.instance.get_pgyerapps_info_list() || []
+            return accumulated if @projects_fully_loaded
+            if !require_full && stop_when && stop_when.call(accumulated)
+              return accumulated
+            end
+
+            page_no = @projects_next_page ||= 1
+            loop do
+              if page_no > MAX_PROJECT_PAGES
+                Funlog.instance.fancyinfo_warning("项目分页已达安全上限 #{MAX_PROJECT_PAGES} 页，停止继续拉取")
+                @projects_fully_loaded = true
+                break
+              end
+
+              res = @pgyer_client.get_project_list(params: { pageNo: page_no, pageSize: PROJECT_PAGE_SIZE })
+              data = res && res["data"]
+
+              if data.nil?
+                # 首页即无数据 → 网络/登录异常；非首页则视为已到末尾
+                if page_no == 1 && accumulated.empty?
+                  err = res && (res["msg"] || res["code"])
+                  raise Informative, "JPS网络数据异常或未登录，请检查网络或重新登录(pindo jps login)#{err ? "：#{err}" : ""}"
+                end
+                @projects_fully_loaded = true
+                break
+              end
+
+              accumulated += data
+              Pindoconfig.instance.set_pgyerapps_info_list(app_info_list: accumulated)
+              @projects_next_page = (page_no += 1)
+
+              if data.size < PROJECT_PAGE_SIZE
+                # 不足一页 → 已是最后一页
+                @projects_fully_loaded = true
+                break
+              end
+              break if !require_full && stop_when && stop_when.call(accumulated)
+            end
+
+            accumulated
+        end
+
         def wildcard_android_bundle_name?(bundle_name)
           return false if bundle_name.nil? || bundle_name.empty?
 
@@ -1438,27 +1548,11 @@ module Pindo
             return version_item_obj
         end
 
+        # 拉取（累积缓存中的）全部 JPS 项目列表——分页拉完所有页，去除旧的单页 1000 上限。
         def get_app_list_in_pgyer()
+            app_info_list = ensure_projects_loaded(require_full: true)
 
-            params = {
-                pageNo:1,
-                pageSize:1000
-            }
-
-            app_info_list = Pindoconfig.instance.get_pgyerapps_info_list()
-            if app_info_list.nil?
-                res_data = @pgyer_client.get_project_list(params:params)
-                if res_data && !res_data["data"].nil? && res_data["data"].size > 0
-                    app_info_list = res_data["data"]
-                    Pindoconfig.instance.set_pgyerapps_info_list(app_info_list:app_info_list)
-                elsif res_data
-                    error_msg = res_data["msg"] || "未知错误"
-                    error_code = res_data["code"]
-                    Funlog.instance.fancyinfo_error("拉取项目列表失败: [#{error_code}] #{error_msg}")
-                end
-            end
-
-            if app_info_list.nil?
+            if app_info_list.nil? || app_info_list.empty?
                 Funlog.instance.fancyinfo_error("拉取app信息列表失败!")
                 raise Informative, "JPS网络数据异常，请检查网络连接或重新登录(pindo jps login)"
             end
@@ -1935,8 +2029,97 @@ module Pindo
             end
         end
 
+        # 一次性把多个工作流写入 JPSBuildConfig.json（单次原子写盘），供 pindo jps config 多类型配置使用。
+        # 同一项目下已有的其它工作流键会保留；项目变更则整份重建。写入是原子的，
+        # 中途不会留下半成品配置。
+        #
+        # @param working_directory [String] 工作目录
+        # @param app_info_obj [Hash] 已选定的 JPS 项目信息对象
+        # @param entries [Array<Hash>] 形如 [{ package_type:, manage_type:, workflow_info: }]
+        # @param conf [String, nil] 显式配置文件路径（--conf），优先于自动定位
+        # @return [Hash, nil] 写入后的完整配置
+        def save_jps_workflows(working_directory:, app_info_obj:, entries:, conf: nil)
+          return if working_directory.nil? || app_info_obj.nil? || entries.nil? || entries.empty?
+
+          config_file = resolve_jps_config_file(working_directory: working_directory, conf: conf)
+          new_project_id = app_info_obj["id"]
+
+          # 仅当项目 ID 相同才保留已有其它工作流键；否则整份重建
+          config = {}
+          if File.exist?(config_file)
+            existing = (JSON.parse(File.read(config_file)) rescue nil)
+            config = existing if existing.is_a?(Hash) && existing['project_id'] == new_project_id
+          end
+
+          config['project_name'] = app_info_obj["projectName"]
+          config['project_scheme'] = app_info_obj["scheme"] ||
+                                     app_info_obj["projectName"].to_s.downcase.strip.gsub(/[\s\-_]/, '')
+          config['project_id'] = new_project_id
+          config['bundle_group_name'] = app_info_obj["bundleId"]
+          config['wildcard_bundle_group_name'] = app_info_obj["wildcardBundleId"]
+
+          entries.each do |entry|
+            workflow_key = jps_workflow_key(package_type: entry[:package_type], manage_type: entry[:manage_type].to_s)
+            config[workflow_key] = build_workflow_data(
+              workflow_info: entry[:workflow_info],
+              package_type: entry[:package_type]
+            )
+          end
+
+          atomic_write(config_file, JSON.pretty_generate(config) + "\n")
+          puts "已写入 JPSBuildConfig.json（#{entries.size} 个工作流）"
+          config
+        end
+
         private
 
+        # 原子写文件：写同目录临时文件再 rename，避免半写状态。
+        # rename 会以普通文件替换符号链接（不写穿其目标），符合“不跟随符号链接”的预期。
+        def atomic_write(path, content)
+          dir = File.dirname(path)
+          FileUtils.mkdir_p(dir) unless File.directory?(dir)
+          tmp = File.join(dir, ".#{File.basename(path)}.#{Process.pid}.tmp")
+          begin
+            File.write(tmp, content)
+            File.rename(tmp, path)
+          ensure
+            File.delete(tmp) if File.exist?(tmp)
+          end
+        end
+
+        # 定位 JPSBuildConfig.json：显式 --conf 优先，否则按工作目录自动定位
+        def resolve_jps_config_file(working_directory:, conf: nil)
+          if conf && !conf.to_s.strip.empty?
+            File.expand_path(conf)
+          else
+            Pindo::BuildHelper.share_instance.determine_jps_config_path(working_directory)
+          end
+        end
+
+        # package_type/manage_type → JPSBuildConfig.json 中的 workflow_key
+        def jps_workflow_key(package_type:, manage_type: "")
+          return 'git_workflow' if manage_type == 'git'
+          case package_type
+          when 'ipa' then 'ipa_workflow'
+          when 'apk' then 'apk_workflow'
+          when 'zip' then 'webgl_workflow'
+          when 'mac' then 'macos_workflow'
+          when 'exe' then 'win_workflow'
+          else raise Informative, "不支持的 package_type: #{package_type}"
+          end
+        end
+
+        # 构建单个工作流的写入结构
+        def build_workflow_data(workflow_info:, package_type:)
+          {
+            "workflow_id" => workflow_info[:workflow_id],
+            "tab_name" => workflow_info[:tab_name],
+            "package_type" => package_type,
+            "package_name" => workflow_info[:package_name],
+            "manage_type" => workflow_info[:manage_type] || ""
+          }
+        end
+
         # 验证工作流配置是否有效
         #
         # @param workflow [Hash] 工作流配置对象
@@ -1985,11 +2168,7 @@ module Pindo
             workflow_key => workflow_data
           }
 
-          # 确保目录存在
-          config_dir = File.dirname(config_file)
-          FileUtils.mkdir_p(config_dir) unless File.directory?(config_dir)
-
-          File.write(config_file, JSON.pretty_generate(new_config))
+          atomic_write(config_file, JSON.pretty_generate(new_config))
           puts "已创建 JPSBuildConfig.json"
         end
 
@@ -2000,28 +2179,14 @@ module Pindo
         # @param app_info_obj [Hash] 项目信息对象
         # @param workflow_info [Hash] 工作流信息
         # @param package_type [String] 包类型 ("ipa" | "apk" | "zip")
-        def save_jps_build_config(working_directory:, app_info_obj:, workflow_info:, package_type:, manage_type: "")
+        def save_jps_build_config(working_directory:, app_info_obj:, workflow_info:, package_type:, manage_type: "", conf: nil)
           return if working_directory.nil? || app_info_obj.nil? || workflow_info.nil?
 
-          # 1. 确定配置文件路径
-          config_file = Pindo::BuildHelper.share_instance.determine_jps_config_path(working_directory)
+          # 1. 确定配置文件路径：显式 --conf 优先，否则按工作目录自动定位
+          config_file = resolve_jps_config_file(working_directory: working_directory, conf: conf)
 
           # 2. 根据 manage_type 或 package_type 确定 workflow_key
-          workflow_key = nil
-          if manage_type == "git"
-            # manage_type 为 git 时，使用 git_workflow
-            workflow_key = 'git_workflow'
-          else
-            # 按 package_type 确定 workflow_key
-            workflow_key = case package_type
-              when 'ipa' then 'ipa_workflow'
-              when 'apk' then 'apk_workflow'
-              when 'zip' then 'webgl_workflow'
-              when 'mac' then 'macos_workflow'
-              when 'exe' then 'win_workflow'
-              else raise Informative, "不支持的 package_type: #{package_type}"
-            end
-          end
+          workflow_key = jps_workflow_key(package_type: package_type, manage_type: manage_type.to_s)
 
           # 3. 准备新的项目基础信息
           new_project_id = app_info_obj["id"]
@@ -2032,13 +2197,7 @@ module Pindo
                                app_info_obj["projectName"].to_s.downcase.strip.gsub(/[\s\-_]/, '')
 
           # 4. 准备新的工作流信息
-          new_workflow_data = {
-            "workflow_id" => workflow_info[:workflow_id],
-            "tab_name" => workflow_info[:tab_name],
-            "package_type" => package_type,
-            "package_name" => workflow_info[:package_name],
-            "manage_type" => workflow_info[:manage_type] || ""
-          }
+          new_workflow_data = build_workflow_data(workflow_info: workflow_info, package_type: package_type)
 
           # 5. 配置文件不存在 → 创建新配置
           if !File.exist?(config_file)
@@ -2105,7 +2264,7 @@ module Pindo
             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))
+            atomic_write(config_file, JSON.pretty_generate(existing_config))
             puts "已更新 #{workflow_key}"
             return
           end

data/lib/pindo/module/source_files_guard.rb

@@ -0,0 +1,83 @@
+require 'pindo/module/build/build_helper'
+
+module Pindo
+  # autobuild 会注入配置的固定源码清单。路径中的工程名、Target 名和 Module 名用 glob 匹配。
+  module BuildSourceFilesGuard
+    IOS_PATTERNS = [
+      'config.json',
+      'Podfile.lock',
+      '**/*.xcodeproj/project.pbxproj',
+      '**/Info.plist',
+      '**/*.entitlements',
+      '**/AppIcon.appiconset',
+      '**/iMessage App Icon.stickersiconset'
+    ].freeze
+
+    ANDROID_PATTERNS = [
+      'build.gradle',
+      'build.gradle.kts',
+      'settings.gradle',
+      'settings.gradle.kts',
+      'google-services.json',
+      '**/build.gradle',
+      '**/build.gradle.kts',
+      '**/google-services.json',
+      '**/src/main/AndroidManifest.xml',
+      '**/src/main/res'
+    ].freeze
+
+    EXCLUDED_PATH_COMPONENTS = %w[
+      .git
+      .gradle
+      .build
+      Pods
+      build
+      DerivedData
+      GoodPlatform
+    ].freeze
+
+    class << self
+      def for_project(project_path)
+        case Pindo::BuildHelper.share_instance.project_type(project_path)
+        when :ios
+          ios(project_path)
+        when :android
+          android(project_path)
+        else
+          unity(project_path)
+        end
+      end
+
+      def ios(project_path)
+        source_paths(project_path, IOS_PATTERNS)
+      end
+
+      def android(project_path)
+        source_paths(project_path, ANDROID_PATTERNS)
+      end
+
+      # Unity 平台工程导出到已忽略的 GoodPlatform，不提交 Unity 源码配置。
+      def unity(_project_path)
+        []
+      end
+
+      private
+
+      def source_paths(project_path, patterns)
+        project_dir = File.expand_path(project_path)
+        project_prefix = "#{project_dir}#{File::SEPARATOR}"
+        candidates = patterns.flat_map { |pattern| Dir.glob(File.join(project_dir, pattern)) }
+
+        candidates
+          .select { |path| path.start_with?(project_prefix) }
+          .reject { |path| excluded_source_path?(project_dir, path) }
+          .uniq
+      end
+
+      def excluded_source_path?(project_dir, path)
+        relative_path = path.delete_prefix("#{project_dir}#{File::SEPARATOR}")
+        !(relative_path.split(File::SEPARATOR) & EXCLUDED_PATH_COMPONENTS).empty?
+      end
+    end
+  end
+end

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

@@ -143,14 +143,14 @@ module Pindo
         )
 
         # 下载并替换 Icon
-        if @app_info_obj && @app_info_obj["projectIcon"] && !@app_info_obj["projectIcon"].empty?
+        if @app_info_obj && @app_info_obj["packageProjectIcon"] && !@app_info_obj["packageProjectIcon"].empty?
           icon_replace_success = Pindo::XcodeBuildConfig.download_and_replace_icon_from_url(
             project_dir: @project_path,
-            icon_url: @app_info_obj["projectIcon"]
+            icon_url: @app_info_obj["packageProjectIcon"]
           )
 
           unless icon_replace_success
-            raise Informative, "Icon 下载或替换失败，请检查 Icon URL 是否有效: #{@app_info_obj["projectIcon"]}"
+            raise Informative, "Icon 下载或替换失败，请检查 Icon URL 是否有效: #{@app_info_obj["packageProjectIcon"]}"
           end
         else
           Funlog.warning("未配置 Icon URL，跳过 Icon 替换")

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

@@ -40,9 +40,8 @@ module Pindo
         @process_type = options[:process_type] || Pindo::UncommittedFilesProcessType::SKIP_WITH_TAG # 默认跳过但打tag
         @commit_message = options[:commit_message] || 'chore(build): pindo 构建产生提交' # 默认提交消息
 
-        options[:project_path] = project_path
         # 调用基类初始化（基类会设置 release_branch, ver_inc, tag_type, tag_pre 等通用属性）
-        super("Git仓库文件提交检查", options)
+        super("Git仓库文件提交检查", options.merge(project_path: project_path))
       end
 
       def validate
@@ -54,6 +53,13 @@ module Pindo
 
       protected
 
+      def build_task_param
+        param = super
+        return param if param.empty?
+
+        param.merge(process_type: @process_type)
+      end
+
       def do_work
         # 检查是否为 Git 仓库，如果不是则直接成功返回
         unless valid_git_repository?
@@ -159,6 +165,10 @@ module Pindo
           # 5. 获取当前分支
           coding_branch = get_current_branch_name
 
+          # 5.1 解析发布分支：仓库无 master 时按 master>main>唯一远程分支>当前分支 探测，
+          #     避免默认 'master' 与实际主分支（如 main）不一致导致同步/checkout 失败
+          @release_branch = Pindo::GitHandler.resolve_release_branch(local_repo_dir: root_dir, preferred: @release_branch)
+
           # 6. 检查并推送本地提交到远程（确保本地和远程同步）
           Pindo::GitHandler.check_unpushed_commits(project_dir: root_dir, branch: coding_branch)