pindo 5.21.3 → 5.21.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a600e7bb32da7ea1ef2ed73200663b344ad302d9ead4279ed6c5973caa168e4a
-  data.tar.gz: f56d3755cf9844773d98afe6778becf92dc8ea40f7c5fc96a55635ac332a079d
+  metadata.gz: a4ccbec1218f28dfa10b000e89759db3e8167c0ea598637a0f8436a557ab14bc
+  data.tar.gz: 737550673bf62315c4ab30652496a82bcda55001991af18c2c5da1b019b9cf83
 SHA512:
-  metadata.gz: 5bad05ce63824706c5bd0b1b2a2e127d6122e81d2ba60dcb8d56cee2d25787de2359cdc2b3f389ca10255008c0edc30230ccf4fc58aaf4ff09b7329cf2b98a0b
-  data.tar.gz: a7dfdebb7fbc7f0d28de181c4136e30c780da7913c9ed65bfff0bc471d5fd05c6e26f3808fd1238fd36572bd6d73d775599e07f62e46e49b0dfd3b44d93e25ba
+  metadata.gz: 52e831191efa0d0092fdd2333658ece13ff82f004255d5dfe55b5f75a295b5d46356fc56956323b8b526bd6dfdda5fa10b15e5e144e971fb70bd629bb5268e57
+  data.tar.gz: 6fa3ad96ffe7951bcec719e8c9a3ffad2540e807c4d451ba6a3dc16fbe59e85a2520f874d72ae589b72ebd47828df71c0482dfcedbdb310e58d6c99f49e24efb

data/lib/pindo/base/git_handler.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'open3'
 require 'pindo/base/executable'
 require 'pindo/base/informative'
 require 'etc'
@@ -556,6 +557,16 @@ module Pindo
 
 
 
+        # 仓库是否已有提交（git init 后尚未首次提交的仓库没有 HEAD）
+        # @param git_root [String] Git 根目录
+        # @return [Boolean]
+        def head_commit_exists?(git_root:)
+            _stdout, _stderr, status = Open3.capture3('git', '-C', git_root, 'rev-parse', '--verify', '--quiet', 'HEAD')
+            status.success?
+        rescue SystemCallError
+            false
+        end
+
         # 获取未提交的文件列表
         # @param project_dir [String] 项目目录路径
         # @return [Array<String>, nil] 返回未提交的文件列表，如果没有则返回 nil
@@ -970,6 +981,15 @@ module Pindo
       # @param default_process_type [Symbol, nil] 非交互模式下的默认处理方式，默认为 nil
       # @return [Symbol] UncommittedFilesProcessType 枚举常量
       def get_uncommitted_files_process_type(project_dir:, interactive: true, default_process_type: nil)
+        # 0. 空仓库没有 HEAD，后续的暂存区重置、版本计算、分支同步和打 tag 都无法进行
+        git_root = git_root_directory(local_repo_dir: project_dir)
+        if git_root && !head_commit_exists?(git_root: git_root)
+          raise Informative, "当前 Git 仓库还没有任何提交，无法计算版本号和打 tag：#{git_root}\n" \
+                             "请先完成首次提交后重新执行：\n" \
+                             "  git -C \"#{git_root}\" add -A\n" \
+                             "  git -C \"#{git_root}\" commit -m \"chore: 初始化工程\""
+        end
+
         # 1. 检查是否有未提交的文件
         uncommitted_files = get_uncommitted_files(project_dir: project_dir)
 
@@ -986,8 +1006,7 @@ module Pindo
           return default_process_type
         end
 
-        # 4. 获取 Git 根目录并获取当前分支名
-        git_root = git_root_directory(local_repo_dir: project_dir)
+        # 4. 获取当前分支名
         unless git_root
           Funlog.instance.fancyinfo_warning("当前目录不是Git仓库")
           return Pindo::UncommittedFilesProcessType::SKIP_WITH_TAG

data/lib/pindo/base/xcodeproj_compat.rb

@@ -0,0 +1,42 @@
+require 'xcodeproj'
+
+module Pindo
+  # Xcode 26.4+/27 工程格式兼容补丁（xcodeproj 1.28.1 尚未支持，见 CocoaPods/Xcodeproj#1017）
+  #
+  # CocoaPods 与 fastlane gym 在 pindo 进程内运行，共用同一份补丁。
+  module XcodeprojCompat
+    # 新格式把 shellScript 存为按行拆分的数组，合并回字符串
+    module ShellScriptArray
+      def shell_script=(value)
+        super(value.is_a?(Array) ? value.join("\n") : value)
+      end
+    end
+
+    # 保存时保留 xcodeproj 不认识的字段（如 Copy Files 阶段的 dstSubfolder），
+    # 否则这些字段会被丢弃，导致扩展等产物的嵌入位置丢失
+    module UnknownAttributes
+      def configure_with_plist(objects_by_uuid_plist)
+        object_plist = objects_by_uuid_plist[uuid]
+        known_keys = self.class.attributes.map(&:plist_name) << 'isa'
+        @pindo_unknown_attributes = object_plist.reject { |key, _| known_keys.include?(key) }
+
+        # 暂时移除未知字段，避免 xcodeproj 对已保留的字段输出误导性警告
+        @pindo_unknown_attributes.each_key { |key| object_plist.delete(key) }
+        super
+      ensure
+        object_plist&.merge!(@pindo_unknown_attributes || {})
+      end
+
+      private
+
+      def to_hash_as(method = :to_hash)
+        plist = super
+        (@pindo_unknown_attributes || {}).each { |key, value| plist[key] = value unless plist.key?(key) }
+        plist
+      end
+    end
+  end
+end
+
+Xcodeproj::Project::Object::PBXShellScriptBuildPhase.prepend(Pindo::XcodeprojCompat::ShellScriptArray)
+Xcodeproj::Project::Object::AbstractObject.prepend(Pindo::XcodeprojCompat::UnknownAttributes)

data/lib/pindo/module/cert/keychain_helper.rb

@@ -34,7 +34,6 @@ module Pindo
           if thrd.value.success?
             # puts "安装成功!"
             unless skip_set_partition_list
-              keychain_password ||= resolve_keychain_password(keychain_path)
               set_partition_list(path, keychain_path, keychain_password: keychain_password, output: output, strict: strict)
             end
           else
@@ -59,100 +58,56 @@ module Pindo
         return result
       end
 
+      # 与 Match 一致：配置密码优先，否则从钥匙串读取或询问并缓存。
       def set_partition_list(path, keychain_path, keychain_password: nil, output: false, strict: false)
-        # When security supports partition lists, also add the partition IDs
-        # See https://openradar.appspot.com/28524119
-        if help_backticks('security -h | grep set-key-partition-list', print: false).length > 0
-          password_part = " -k #{keychain_password.to_s.shellescape}"
-
-          command = "security set-key-partition-list"
-          command << " -S apple-tool:,apple:,codesign:"
-          command << " -s" # This is a needed in Catalina to prevent "security: SecKeychainItemCopyAccess: A missing value was detected."
-          command << password_part
-          command << " #{keychain_path.shellescape}"
-          command << " 1> /dev/null" # always disable stdout. This can be very verbose, and leak potentially sensitive info
-
-          # Showing loading indicator as this can take some time if a lot of keys installed
-          # Helper.show_loading_indicator("Setting key partition list... (this can take a minute if there are a lot of keys installed)")
-
-          # Strip keychain password from command output
-          # sensitive_command = command.gsub(password_part, " -k ********")
-          # puts command
-          # UI.command(sensitive_command) if output
-          Open3.popen3(command) do |stdin, stdout, stderr, thrd|
-            unless thrd.value.success?
-              err = stderr.read.to_s.strip
-              raise Informative, "钥匙串访问配置失败，请检查 macOS 钥匙串密码", cause: nil if strict
-
-              # Inform user when no/wrong password was used as its needed to prevent UI permission popup from Xcode when signing
-              if err.include?("SecKeychainItemSetAccessWithPassword")
-                keychain_name = File.basename(keychain_path, ".*")
-                # puts "password #{keychain_password}"
-                # puts "keychain #{keychain_name}"
-                # puts "security #{server_name(keychain_name)}"
-                Security::InternetPassword.delete(server: server_name(keychain_name))
-
-                # UI.important("")
-                # UI.important("Could not configure imported keychain item (certificate) to prevent UI permission popup when code signing\n" \
-                #          "Check if you supplied the correct `keychain_password` for keychain: `#{keychain_path}`\n" \
-                #          "#{err}")
-                # UI.important("")
-                # UI.important("Please look at the following docs to see how to set a keychain password:")
-                # UI.important(" - https://docs.fastlane.tools/actions/sync_code_signing")
-                # UI.important(" - https://docs.fastlane.tools/actions/get_certificates")
-                # puts "证书密码错误!"
-              else
-                puts err
-              end
+        warning = '未配置免弹窗签名权限；后续签名时 macOS 可能弹出系统对话框，请按提示授权。'
+        return unless help_backticks('security -h | grep set-key-partition-list', print: false).length > 0
+        keychain_password = resolve_keychain_password(keychain_path) if keychain_password.to_s.empty?
+
+        command = "security set-key-partition-list -S apple-tool:,apple:,codesign: -s"
+        command << " -k #{keychain_password.shellescape} #{keychain_path.shellescape} 1> /dev/null"
+        Open3.popen3(command) do |stdin, stdout, stderr, thread|
+          # 消费错误输出但不打印，避免泄露敏感信息。
+          error = stderr.read
+          next if thread.value.success?
+
+          if error.include?('SecKeychainItemSetAccessWithPassword')
+            # Match 会清除被拒绝的缓存；捕获输出以安静处理条目不存在的情况。
+            _output, _error, status = Open3.capture3('security', 'delete-internet-password', '-s',
+              server_name(keychain_path), '-a', '')
+            unless status.success? || status.exitstatus == 44 # errSecItemNotFound
+              FastlaneCore::UI.important('未能清除失效的钥匙串密码缓存，请检查钥匙串访问权限；下次可能仍读取旧密码。')
             end
           end
-
-          # Hiding after Open3 finishes
-          # Helper.hide_loading_indicator
-
+          FastlaneCore::UI.important(warning)
         end
       end
 
-      # https://github.com/fastlane/fastlane/issues/14196
-      # Keychain password is needed to set the partition list to
-      # prevent Xcode from prompting dialog for keychain password when signing
-      # 1. Uses keychain password from login keychain if found
-      # 2. Prompts user for keychain password and stores it in login keychain for user later
       def resolve_keychain_password(keychain_path)
-        keychain_name = File.basename(keychain_path, ".*")
-        server = server_name(keychain_name)
-
-        # Attempt to find password in keychain for keychain
+        server = server_name(keychain_path)
         item = Security::InternetPassword.find(server: server)
-        if item
-          keychain_password = item.password
-          # UI.important("Using keychain password from keychain item #{server} in #{keychain_path}")
-        end
+        return item.password if item && !item.password.to_s.empty?
 
-        if keychain_password.nil?
-          # if UI.interactive?
-            # UI.important("Enter the password for #{keychain_path}")
-            # UI.important("This passphrase will be stored in your local keychain with the name #{server} and used in future runs")
-            # UI.important("This prompt can be avoided by specifying the 'keychain_password' option or 'MATCH_KEYCHAIN_PASSWORD' environment variable")
-            # 收起 spinner，否则密码提示会被动画行覆盖，终端看起来像卡死
-            keychain_password = Funlog.with_paused_spinner do
-              FastlaneCore::Helper.ask_password(message: "Password for #{keychain_name} keychain: ", confirm: true, confirmation_message: "Type password for #{keychain_name} keychain again: ")
-            end
-            Security::InternetPassword.add(server, "", keychain_password)
-          # else
-            # UI.important("Keychain password for #{keychain_path} was not specified and not found in your keychain. Specify the 'keychain_password' option to prevent the UI permission popup when code signing")
-            # keychain_password = ""
-          # end
+        unless $stdin.tty? && FastlaneCore::UI.interactive?
+          FastlaneCore::UI.important('未配置或缓存 macOS 钥匙串密码；签名时可能需要系统授权。')
+          return ''
         end
 
-        return keychain_password
+        name = File.basename(keychain_path, '.*')
+        password = Funlog.with_paused_spinner do
+          FastlaneCore::Helper.ask_password(
+            message: "请输入 macOS #{name} 钥匙串密码（非证书导出密码，将保存到 #{server}）：",
+            confirm: true, confirmation_message: "请再次输入 #{name} 钥匙串密码：")
+        end
+        unless Security::InternetPassword.add(server, '', password)
+          FastlaneCore::UI.important('未能缓存钥匙串密码，下次运行可能需要重新输入。')
+        end
+        password
       end
 
-      # server name used for accessing the macOS keychain
-      def server_name(keychain_name)
-        ["pindo", "keychain", keychain_name].join("_")
+      def server_name(keychain_path)
+        ['pindo', 'keychain', File.basename(keychain_path, '.*')].join('_')
       end
-
       private :server_name
     end
   end

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

@@ -142,7 +142,8 @@ module Pindo
           project_dir: @project_path,
           workflow_packname: workflow_packname,
           project_id: project_id,
-          bundle_id: @bundle_id
+          bundle_id: @bundle_id,
+          bundle_id_prefix: Pindo::XcodeBuildConfig.bundle_id_prefix_from(config_bundle_id)
         )
 
         # 下载并替换 Icon，优先使用 packageProjectIcon，为空则回退到 projectIcon
@@ -159,7 +160,7 @@ module Pindo
           )
 
           unless icon_replace_success
-            raise Informative, "Icon 下载或替换失败，请检查 Icon URL 是否有效: #{icon_url}"
+            raise Informative, "Icon 下载或替换失败，具体原因见上方日志（Icon URL: #{icon_url}）"
           end
         else
           Funlog.warning("未配置 Icon URL，跳过 Icon 替换")
@@ -196,8 +197,8 @@ module Pindo
             commit_short = commit_hash ? commit_hash[0..7] : "unknown"
             Funlog.instance.fancyinfo_success("自己计算版本号: #{build_version}, Build: #{build_number}, Commit: #{commit_short}")
           else
-            # 不是 Git 仓库且没有从 GitCommitTask 获取到版本号，跳过版本更新
-            Funlog.warning("非Git仓库且未从 GitCommitTask 获取到版本号，保持工程原有版本号")
+            # 不是 Git 仓库且没有从 GitCommitTask 获取到版本号：沿用工程版本号，但补齐为 JPS 要求的 major.minor.patch
+            normalize_project_version
             return
           end
         end
@@ -210,6 +211,35 @@ module Pindo
         )
       end
 
+      # 非 Git 仓库时沿用工程原有版本号，仅补齐格式（如 Xcode 模板默认的 1.0 => 1.0.0），否则 JPS 拒收
+      def normalize_project_version
+        version, build_number = Pindo::XcodeBuildConfig.current_app_version(project_dir: @project_path)
+        normalized = Pindo::XcodeBuildConfig.normalize_marketing_version(version)
+
+        if normalized.nil?
+          Funlog.warning("非Git仓库，保持工程原有版本号 #{version.inspect}；JPS 要求 major.minor.patch 格式，上传可能失败")
+          return
+        end
+
+        if normalized == version.to_s.strip
+          Funlog.warning("非Git仓库且未从 GitCommitTask 获取到版本号，保持工程原有版本号 #{normalized}")
+          return
+        end
+
+        Funlog.warning("非Git仓库，工程版本号 #{version} 补齐为 #{normalized}")
+        Pindo::XcodeBuildConfig.update_ios_project_version(
+          project_dir: @project_path,
+          version: normalized,
+          build_number: build_number.to_s.strip.empty? ? '1' : build_number
+        )
+      end
+
+      # 当前环境配置仓库中的主 Bundle ID（如 workhard 为 com.eyesofstorms.*），与证书使用同一来源
+      def config_bundle_id
+        require 'pindo/config/ios_config_parser'
+        Pindo::IosConfigParser.instance.bundle_id
+      end
+
       # 检查配置
       def pull_config
         # 检查 IosConfigParser 单例中是否已加载配置

data/lib/pindo/module/xcode/res/xcode_res_handler.rb

@@ -12,38 +12,69 @@ module Pindo
             @project_obj = Xcodeproj::Project.open(proj_fullname)
         end
 
-        # 查找工程的 AppIcon.appiconset 目录，找不到返回 nil（不抛异常）
+        DEFAULT_APP_ICON_NAME = "AppIcon".freeze
+        APP_ICON_NAME_SETTING = "ASSETCATALOG_COMPILER_APPICON_NAME".freeze
+
+        # 查找工程的 App 图标集目录（<图标名>.appiconset），找不到返回 nil（不抛异常）
         def find_xcodeproj_icon_path()
-            icon_path = nil
-            select_target = @project_obj.targets.select { |target| target.respond_to?(:product_type) && target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application])  }.first
+            icon_dir_name = "#{app_icon_name}.appiconset"
+
+            # 优先在主 target 自己的 asset catalog 中查找
+            icon_path = main_target_asset_catalogs
+                .map { |catalog| File.join(catalog, icon_dir_name) }
+                .find { |path| File.directory?(path) }
+            return icon_path if icon_path
+
+            icon_path_array = Dir.glob(File.join(@project_obj.project_dir, "**", icon_dir_name))
+            if icon_path_array.size > 1
+                icon_path = icon_path_array.find{ |filename| File.directory?(filename) && filename.include?("Assets.xcassets/#{icon_dir_name}")}
+            elsif icon_path_array.size == 1
+                icon_path = icon_path_array.first
+            end
 
-            project_dir = @project_obj.project_dir
+            return nil if icon_path.nil? || icon_path.empty? || !File.exist?(icon_path)
+            icon_path
+        end
 
-            if !select_target.nil?
-                file_refs = select_target.resources_build_phase.files_references.select { |file| file.display_name.include?("Assets.xcassets") } || []
-                file_refs.each do |file_ref|
-                    icon_path = File.join(file_ref.real_path,"AppIcon.appiconset")
-                    if File.exist?(icon_path)
-                        break
-                    else
-                        next
-                    end
-                end
-            end
-            if icon_path.nil? || icon_path.empty? || !File.exist?(icon_path)
-                icon_path_array = Dir.glob(File.join(project_dir, "**", "AppIcon.appiconset"))
-                if icon_path_array.size > 1
-                    icon_path = icon_path_array.find{ |filename| File.directory?(filename) && filename.include?("Assets.xcassets/AppIcon.appiconset")}
-                elsif icon_path_array.size == 1
-                    icon_path = icon_path_array.first
-                end
+        # 查找 App 图标集目录；工程没有图标集时（如 Xcode 新模板工程），
+        # 在主 target 的 asset catalog 中创建，并设置 ASSETCATALOG_COMPILER_APPICON_NAME
+        def ensure_app_icon_path()
+            icon_path = find_xcodeproj_icon_path()
+            return icon_path if icon_path
+
+            catalog = main_target_asset_catalogs.first
+            if catalog.nil?
+                raise Informative, "没有找到Xcode icon 目录：主 target 中既没有 #{app_icon_name}.appiconset，也没有可存放图标的 .xcassets"
             end
 
-            if icon_path.nil? || icon_path.empty? || !File.exist?(icon_path)
-                return nil
+            icon_path = File.join(catalog, "#{app_icon_name}.appiconset")
+            FileUtils.mkdir_p(icon_path)
+            assign_app_icon_name
+            puts "  ✓ 工程中没有 App 图标集，已创建: #{icon_path}"
+            icon_path
+        end
+
+        # 主 App target 配置的图标名，未配置时为 AppIcon
+        def app_icon_name()
+            names = main_app_target&.build_configurations&.map { |config| config.build_settings[APP_ICON_NAME_SETTING] } || []
+            name = names.compact.map(&:to_s).find { |value| !value.strip.empty? }
+            name || DEFAULT_APP_ICON_NAME
+        end
+
+        # 主 App target 使用的 asset catalog（含文件夹同步方式管理的资源）
+        def main_target_asset_catalogs()
+            target = main_app_target
+            return [] if target.nil?
+
+            referenced = target.resources_build_phase.files_references
+                .select { |file| file.respond_to?(:real_path) && file.real_path.to_s.end_with?(".xcassets") }
+                .map { |file| file.real_path.to_s }
+
+            synchronized = synchronized_group_paths(target).flat_map do |group_path|
+                Dir.glob(File.join(group_path, "**", "*.xcassets")).sort
             end
 
-            return icon_path
+            (referenced + synchronized).uniq.select { |path| File.directory?(path) }
         end
 
         # 工程是否包含 AppIcon 目录（macOS 命令行工具等无 icon 工程返回 false）
@@ -68,7 +99,7 @@ module Pindo
         end
 
         def install_icon_res(new_icon_dir:nil)
-            icon_path = get_xcodeproj_icon_path()
+            icon_path = ensure_app_icon_path()
             begin
                 FileUtils.rm_rf(icon_path)
                 FileUtils.mkdir_p(icon_path)
@@ -265,6 +296,36 @@ module Pindo
 
         end
 
+        private
+
+        def main_app_target()
+            @project_obj.targets.find do |target|
+                target.respond_to?(:product_type) && target.product_type.to_s.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application])
+            end
+        end
+
+        # 文件夹同步（PBXFileSystemSynchronizedRootGroup）方式管理的 target 目录
+        def synchronized_group_paths(target)
+            return [] unless target.respond_to?(:file_system_synchronized_groups)
+
+            target.file_system_synchronized_groups
+                .map { |group| Xcodeproj::Project::Object::GroupableHelper.real_path(group).to_s }
+                .select { |path| File.directory?(path) }
+        end
+
+        # 未配置图标名的 target 补上 ASSETCATALOG_COMPILER_APPICON_NAME，使图标集参与编译
+        def assign_app_icon_name()
+            target = main_app_target
+            return if target.nil?
+
+            name = app_icon_name
+            missing = target.build_configurations.select { |config| config.build_settings[APP_ICON_NAME_SETTING].to_s.strip.empty? }
+            return if missing.empty?
+
+            missing.each { |config| config.build_settings[APP_ICON_NAME_SETTING] = name }
+            @project_obj.save
+        end
+
     end
 
 end

data/lib/pindo/module/xcode/scene_lifecycle_guard.rb

@@ -21,6 +21,11 @@ module Pindo
       /func\s+application\s*\([^)]*configurationForConnecting\b/
     ).freeze
 
+    # SwiftUI App 生命周期（@main 入口遵循 App 协议）本身基于 UIScene
+    SWIFTUI_APP_PATTERN = /^[ \t]*@main\b[^{]*?\b(?:struct|class|enum)\s+\w+\s*:[^{]*\bApp\b/.freeze
+
+    SCENE_ADOPTION_SOURCE_PATTERN = Regexp.union(SCENE_CONFIGURATION_PATTERN, SWIFTUI_APP_PATTERN).freeze
+
     SOURCE_EXTENSIONS = %w[.m .mm .swift].freeze
 
     EXCLUDED_DIRECTORY_NAMES = %w[.git Pods build DerivedData].freeze
@@ -47,7 +52,7 @@ module Pindo
         )
         return if scene_manifest_declared?(info_plist_path)
         return if scene_manifest_generated?(release_config)
-        return if delegate_provides_scene_configuration?(project_dir)
+        return if sources_adopt_scene_lifecycle?(project_dir)
 
         raise Informative, adoption_error_message(sdk_version, info_plist_path)
       end
@@ -91,13 +96,19 @@ module Pindo
       # Xcode 只在 GENERATE_INFOPLIST_FILE = YES 时采用 INFOPLIST_KEY_* 设置
       def scene_manifest_generated?(release_config)
         settings = release_config.build_settings
-        settings['GENERATE_INFOPLIST_FILE'].to_s.casecmp?('YES') &&
-          settings[SCENE_MANIFEST_GENERATION_SETTING].to_s.casecmp?('YES')
+        iphoneos_setting(settings, 'GENERATE_INFOPLIST_FILE').to_s.casecmp?('YES') &&
+          iphoneos_setting(settings, SCENE_MANIFEST_GENERATION_SETTING).to_s.casecmp?('YES')
+      end
+
+      # iOS 真机构建实际生效的值：[sdk=iphoneos*] 条件设置优先于无条件设置（多平台模板只写条件设置）
+      def iphoneos_setting(settings, key)
+        _name, conditional = settings.find { |name, _value| name.start_with?("#{key}[sdk=iphoneos") }
+        conditional.nil? ? settings[key] : conditional
       end
 
-      def delegate_provides_scene_configuration?(project_dir)
+      def sources_adopt_scene_lifecycle?(project_dir)
         each_source_file(project_dir).any? do |path|
-          File.binread(path).match?(SCENE_CONFIGURATION_PATTERN)
+          File.binread(path).match?(SCENE_ADOPTION_SOURCE_PATTERN)
         end
       end
 

data/lib/pindo/module/xcode/xcode_build_config.rb

@@ -11,6 +11,18 @@ module Pindo
 
     class XcodeBuildConfig
 
+        # 未提供任何 Bundle ID 线索时，工作流推导 Bundle ID 使用的前缀
+        DEFAULT_BUNDLE_ID_PREFIX = "com.heroneverdie101".freeze
+
+        # 从 Bundle ID 提取前缀：通配 ID 去掉 ".*"，具体 ID 去掉最后一段
+        # @param bundle_id [String, nil] 如 "com.example.*" 或 "com.example.app"
+        # @return [String, nil] 如 "com.example"；无法提取时返回 nil
+        def self.bundle_id_prefix_from(bundle_id)
+            value = bundle_id.to_s.strip
+            prefix = value.end_with?(".*") ? value.chomp(".*") : value.rpartition(".").first
+            prefix.empty? || prefix.include?("*") ? nil : prefix
+        end
+
         # 使用package_name一次性更新Display Name、Bundle ID和URL Schemes（基于package_name）
         # 优化版本：只读写一次plist文件，提高性能
         # 注意：此函数只添加基于package_name的URL Scheme，基于实际Bundle ID的URL Scheme
@@ -19,8 +31,9 @@ module Pindo
         # @param workflow_packname [String] 工作流的名称（如："Test Demo"）
         # @param project_id [String] JPS项目ID（可选，用于添加快捷操作）
         # @param bundle_id [String] 显式指定的 Bundle ID（可选，来自 --bundleid）
+        # @param bundle_id_prefix [String] 工作流推导 Bundle ID 的前缀（可选，如 "com.example"）
         # @return [Boolean] 是否成功更新
-        def self.update_project_with_workflow(project_dir: nil, workflow_packname: nil, project_id: nil, bundle_id: nil)
+        def self.update_project_with_workflow(project_dir: nil, workflow_packname: nil, project_id: nil, bundle_id: nil, bundle_id_prefix: nil)
             raise ArgumentError, "项目目录不能为空" if project_dir.nil?
             raise ArgumentError, "Workflow Package Name不能为空" if workflow_packname.nil?
 
@@ -30,10 +43,14 @@ module Pindo
 
             # Bundle ID 优先使用显式传入的值（--bundleid），未传时按工作流名推导。
             # 通配符（如 com.example.*）不能作为工程的 PRODUCT_BUNDLE_IDENTIFIER，
-            # 与 BaseCertOperator#configure_target_build_settings 的处理保持一致，退回推导值。
+            # 与 BaseCertOperator#configure_target_build_settings 的处理保持一致，退回推导值，
+            # 推导值的前缀依次取 bundle_id_prefix、通配 ID 的前缀、默认前缀。
             explicit_bundle_id = bundle_id.to_s.strip
             use_explicit_bundle_id = !explicit_bundle_id.empty? && !explicit_bundle_id.include?("*")
-            final_bundle_id = use_explicit_bundle_id ? explicit_bundle_id : "com.heroneverdie101.#{package_scheme}"
+            derived_prefix = bundle_id_prefix.to_s.strip
+            derived_prefix = bundle_id_prefix_from(explicit_bundle_id).to_s if derived_prefix.empty?
+            derived_prefix = DEFAULT_BUNDLE_ID_PREFIX if derived_prefix.empty?
+            final_bundle_id = use_explicit_bundle_id ? explicit_bundle_id : "#{derived_prefix}.#{package_scheme}"
 
             project_fullname = Dir.glob(File.join(project_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
             return false if project_fullname.nil?
@@ -315,6 +332,33 @@ module Pindo
         # @param version [String] 版本号
         # @param build_number [Integer] Build号
         # @return [Boolean] 是否成功更新
+        # 把纯数字版本补齐为 major.minor.patch（JPS 要求的格式），如 "1.0" => "1.0.0"
+        # @param version [String, nil] 工程中的版本号
+        # @return [String, nil] 补齐后的版本号；含变量、后缀或超过三段时返回 nil
+        def self.normalize_marketing_version(version)
+            value = version.to_s.strip
+            return nil unless value.match?(/\A\d+(\.\d+){0,2}\z/)
+
+            segments = value.split(".")
+            (segments + ["0"] * (3 - segments.size)).join(".")
+        end
+
+        # 读取主 App target 当前的版本号与 Build 号（Release 配置优先）
+        # @param project_dir [String] 项目目录
+        # @return [Array(String, String)] [MARKETING_VERSION, CURRENT_PROJECT_VERSION]，取不到时为 nil
+        def self.current_app_version(project_dir:)
+            xcodeproj_path = find_xcodeproj(project_dir)
+            return [nil, nil] if xcodeproj_path.nil?
+
+            target = Xcodeproj::Project.open(xcodeproj_path).targets.find do |t|
+                t.respond_to?(:product_type) && t.product_type.to_s.eql?("com.apple.product-type.application")
+            end
+            return [nil, nil] if target.nil?
+
+            config = target.build_configurations.find { |c| c.name == "Release" } || target.build_configurations.first
+            [config.build_settings['MARKETING_VERSION'], config.build_settings['CURRENT_PROJECT_VERSION']]
+        end
+
         def self.update_ios_project_version(project_dir: nil, version: nil, build_number: nil)
             raise ArgumentError, "项目目录不能为空" if project_dir.nil?
             raise ArgumentError, "版本号不能为空" if version.nil?

data/lib/pindo/version.rb

@@ -6,7 +6,7 @@ require 'time'
 
 module Pindo
 
-  VERSION = "5.21.3"
+  VERSION = "5.21.5"
 
   class VersionCheck
     RUBYGEMS_API = 'https://rubygems.org/api/v1/gems/pindo.json'

data/lib/pindo.rb

@@ -10,6 +10,7 @@ module Pindo
   	autoload :Executable,                'pindo/base/executable'
   	autoload :Plistbuddyexecutable,      'pindo/base/plistbuddyexecutable'
 
+	require 'pindo/base/xcodeproj_compat'
 	require 'pindo/command'
 	require 'pindo/version'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 5.21.3
+  version: 5.21.5
 platform: ruby
 authors:
 - wade
@@ -272,6 +272,7 @@ files:
 - lib/pindo/base/plaininformative.rb
 - lib/pindo/base/plistbuddyexecutable.rb
 - lib/pindo/base/standarderror.rb
+- lib/pindo/base/xcodeproj_compat.rb
 - lib/pindo/client/applovinclient.rb
 - lib/pindo/client/aws3sclient.rb
 - lib/pindo/client/bossclient.rb