pindo 5.18.3 → 5.18.5

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

@@ -92,30 +92,27 @@ module Pindo
                 # 定义此命令使用的参数项
                 def self.option_items
                     @option_items ||= Pindo::Options::OptionGroup.merge(
-                        Pindo::Options::BuildOptions.select(:bundleid),  # 添加 bundleid 参数
+                        Pindo::Options::BuildOptions.select(:bundleid),
                         Pindo::Options::JPSOptions.select(:conf, :upload, :send, :media, :bind),
                         Pindo::Options::UnityOptions.select(:skiplib, :skipyoo),
-                        Pindo::Options::UnityOptions.select_with_defaults(skipconfig: true),
+                        Pindo::Options::UnityOptions.select_with_defaults(skipmacro: true),
                         Pindo::Options::TaskOptions.select(:multi),
+                        Pindo::Options::UtilsOptions.select(:run),
                         Pindo::Options::GitOptions.all
                     )
                 end
 
                 # 命令的选项列表
                 def self.options
-                    [
-                        ['--run',   '编译完成后再本地打开webgl包']
-                    ].concat(option_items.map(&:to_claide_option)).concat(super)
+                    option_items.map(&:to_claide_option).concat(super)
                 end
 
                 def initialize(argv)
                     @options = initialize_options(argv)
 
-                    @args_deploy_flag = argv.flag?('deploy', false)
-                    @args_adhoc_flag = argv.flag?('adhoc', false)
                     @args_conf = @options[:conf]
-                    @args_bundle_id = @options[:bundleid]  # 从 @options 获取，确保能被缓存
-                    @args_run_flag = argv.flag?('run', false)
+                    @args_bundle_id = @options[:bundleid]
+                    @args_run_flag = @options[:run] || false
 
                     # send、media 或 bind 都依赖 upload：如果指定了任一参数，自动启用 upload
                     @args_upload_flag = @options[:send] || @options[:bind] || @options[:media] || @options[:upload]
@@ -154,31 +151,35 @@ module Pindo
                 def run
                     pindo_project_dir = Dir.pwd
 
-                    # 加载 JPS 配置（如果存在）
-                    Pindo::BuildHelper.share_instance.load_jps_build_config(pindo_project_dir, conf: @args_conf)
+                    begin
+                        # 加载 JPS 配置（如果存在）
+                        Pindo::BuildHelper.share_instance.load_jps_build_config(pindo_project_dir, conf: @args_conf)
 
-                    # 准备配置
-                    config = prepare_web_config(pindo_project_dir)
+                        # 准备配置
+                        config = prepare_web_config(pindo_project_dir)
 
-                    # 创建并执行任务
-                    tasks = make_build_task(config)
+                        # 创建并执行任务
+                        tasks = make_build_task(config)
 
-                    # 添加到任务管理器并执行
-                    task_manager = Pindo::TaskSystem::TaskManager.instance
-                    task_manager.clear_all
-                    tasks.each { |task| task_manager.add_task(task) }
+                        # 添加到任务管理器并执行
+                        task_manager = Pindo::TaskSystem::TaskManager.instance
+                        task_manager.clear_all
+                        tasks.each { |task| task_manager.add_task(task) }
 
-                    # 执行任务（根据 --multi 参数决定模式）
-                    if @args_multi_flag
-                        task_manager.start(mode: :concurrent, max_workers: 3)
-                    else
-                        task_manager.start
-                    end
+                        # 执行任务（根据 --multi 参数决定模式）
+                        if @args_multi_flag
+                            task_manager.start(mode: :concurrent, max_workers: 3)
+                        else
+                            task_manager.start
+                        end
 
-                    system "open #{pindo_project_dir}"
+                        system "open #{pindo_project_dir}"
 
-                    # 可选运行 WebGL
-                    Pindo::Command::Web::Run.run([]) if @args_run_flag
+                        # 可选运行 WebGL
+                        Pindo::Command::Web::Run.run([]) if @args_run_flag
+                    ensure
+                        Pindo::Options::GlobalOptionsState.instance.clear
+                    end
                 end
 
                 private

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

@@ -34,19 +34,20 @@ module Pindo
                     # 暂无参数
                 ]
 
+                def self.option_items
+                    @option_items ||= Pindo::Options::UtilsOptions.select(:port, :debug)
+                end
+
                 # 命令的选项列表
                 def self.options
-                    [
-                        # 添加HTTP服务器端口选项
-                        ['--port',   '指定HTTP服务器的端口，默认为8000'],
-                        # 添加调试选项
-                        ['--debug',  '显示详细的调试信息']
-                    ].concat(super)
+                    option_items.map(&:to_claide_option).concat(super)
                 end
 
                 def initialize(argv)
-                    @args_port = argv.option('port', '8000').to_i  # 添加端口参数，默认8000
-                    @args_debug = argv.flag?('debug', false)  # 是否显示调试信息
+                    @options = initialize_options(argv)
+
+                    @args_port = (@options[:port] || '8000').to_i
+                    @args_debug = @options[:debug] || false
 
                     super
                     @additional_args = argv.remainder!

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

@@ -314,10 +314,10 @@ module Pindo
                   end
 
       bundle_task = "#{prefix}#{task_name}"
-      skip_clean = ENV['PINDO_SKIP_GRADLE_CLEAN'] == '1'
-      # 任意 bundle 变体（含 debug）均先 clean，避免 aabresguard 等任务因残留输出报「文件已存在」；本地加速可设 PINDO_SKIP_GRADLE_CLEAN=1
-      puts '  AAB 构建前先执行 Gradle clean（环境变量 PINDO_SKIP_GRADLE_CLEAN=1 可跳过）' unless skip_clean
-      puts '  已跳过 Gradle clean（PINDO_SKIP_GRADLE_CLEAN=1）' if skip_clean
+      skip_clean = Pindo::Options::GlobalOptionsState.instance[:skipclean]
+      # 任意 bundle 变体（含 debug）均先 clean，避免 aabresguard 等任务因残留输出报「文件已存在」；可通过 --skipclean 或 PINDO_SKIP_GRADLE_CLEAN=1 跳过
+      puts '  AAB 构建前先执行 Gradle clean（--skipclean 可跳过）' unless skip_clean
+      puts '  已跳过 Gradle clean（--skipclean）' if skip_clean
 
       gradle_clean_resilient!(project_path) unless skip_clean
 
@@ -440,8 +440,8 @@ module Pindo
     def validate_unity_libs_state!(android_root, stage:)
       # 某些项目会将 unityLibrary 作为缓存/中间产物纳入仓库，但 libs 下的 .aar -> .srcaar
       # 符号链接目标是由 EDM4U/导出过程生成，初次拉取代码时可能为断链。
-      # 默认仍严格失败；如确有需要，可通过环境变量临时跳过此校验继续构建。
-      return if ENV["PINDO_SKIP_UNITY_LIBS_VALIDATE"] == "1"
+      # 默认仍严格失败；可通过 --skipvalidate 或 PINDO_SKIP_UNITY_LIBS_VALIDATE=1 跳过
+      return if Pindo::Options::GlobalOptionsState.instance[:skipvalidate]
 
       libs_dir = File.join(android_root, "unityLibrary", "libs")
       return unless File.directory?(libs_dir)

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

@@ -172,7 +172,7 @@ module Pindo
 
         abs_keystore = File.expand_path(File.join(project_dir, rel_plain))
 
-        inject_gradle = ENV["PINDO_INJECT_ANDROID_SIGNING_GRADLE"] == "1"
+        inject_gradle = Pindo::Options::GlobalOptionsState.instance[:injectsigning]
         if inject_gradle
           if gradle_file.end_with?(".kts")
             ensure_keystore_config_kts(gradle_file, project_dir, build_type, sign_config, bundle_id: bundle_id)

data/lib/pindo/module/build/build_helper.rb

@@ -237,20 +237,44 @@ module Pindo
             # 检查 wildcard_bundle_group_name 和 bundle_group_name（兼容旧字段名）
             wildcard_bundle_group_name = config['wildcard_bundle_group_name'] || config['wildcardBundleId']
             bundle_group_name = config['bundle_group_name'] || config['bundleId']
+            project_id = config['project_id']
 
             # 如果缺失，通过 JPS 请求获取并回写
             if (wildcard_bundle_group_name.nil? || wildcard_bundle_group_name.empty?) ||
                (bundle_group_name.nil? || bundle_group_name.empty?)
-              project_id = config['project_id']
+
+              if ENV['PINDO_DEBUG']
+                puts "[PINDO_DEBUG] load_jps_build_config: wildcard_bundle_group_name 或 bundle_group_name 缺失，尝试自动修复"
+                puts "[PINDO_DEBUG]   wildcard_bundle_group_name=#{wildcard_bundle_group_name.inspect}"
+                puts "[PINDO_DEBUG]   bundle_group_name=#{bundle_group_name.inspect}"
+                puts "[PINDO_DEBUG]   project_id=#{project_id.inspect}, project_name=#{project_name.inspect}"
+              end
+
               app_info_data = nil
 
+              # 确保 PgyerHelper 已登录，否则 API 调用会因 @pgyer_client 为 nil 而失败
+              pgyer_helper = PgyerHelper.share_instace
+              pgyer_helper.login
+
               if project_id && !project_id.to_s.empty?
-                app_info_data = PgyerHelper.share_instace.get_project_detail(project_id: project_id)
+                puts "[PINDO_DEBUG] 使用 project_id=#{project_id} 调用 get_project_detail" if ENV['PINDO_DEBUG']
+                app_info_data = pgyer_helper.get_project_detail(project_id: project_id)
+                puts "[PINDO_DEBUG] get_project_detail 返回: #{app_info_data.nil? ? 'nil' : '有数据'}" if ENV['PINDO_DEBUG']
               elsif project_name && !project_name.empty?
-                app_info_data = PgyerHelper.share_instace.find_app_info_with_obj_list(proj_name: project_name)
+                puts "[PINDO_DEBUG] 使用 project_name=#{project_name} 调用 find_app_info_with_obj_list" if ENV['PINDO_DEBUG']
+                app_info_data = pgyer_helper.find_app_info_with_obj_list(proj_name: project_name)
+                puts "[PINDO_DEBUG] find_app_info_with_obj_list 返回: #{app_info_data.nil? ? 'nil' : '有数据'}" if ENV['PINDO_DEBUG']
+              else
+                puts "[PINDO_DEBUG] project_id 和 project_name 均为空，跳过自动修复" if ENV['PINDO_DEBUG']
               end
 
               if app_info_data
+                if ENV['PINDO_DEBUG']
+                  puts "[PINDO_DEBUG] app_info_data 字段列表: #{app_info_data.keys.join(', ')}"
+                  puts "[PINDO_DEBUG]   wildcardBundleId=#{app_info_data['wildcardBundleId'].inspect}"
+                  puts "[PINDO_DEBUG]   bundleId=#{app_info_data['bundleId'].inspect}"
+                end
+
                 wildcard_bundle_group_name = app_info_data["wildcardBundleId"]
                 bundle_group_name = app_info_data["bundleId"]
 
@@ -259,8 +283,14 @@ module Pindo
                   config['bundle_group_name'] = bundle_group_name
                   File.write(config_file, JSON.pretty_generate(config) + "\n")
                   puts "已从 JPS 获取并保存: wildcard_bundle_group_name=#{wildcard_bundle_group_name}, bundle_group_name=#{bundle_group_name}"
+                else
+                  puts "[PINDO_DEBUG] wildcardBundleId 为空，无法自动修复" if ENV['PINDO_DEBUG']
                 end
+              else
+                puts "[PINDO_DEBUG] 未获取到 app_info_data，自动修复失败" if ENV['PINDO_DEBUG']
               end
+            else
+              puts "[PINDO_DEBUG] load_jps_build_config: wildcard_bundle_group_name 和 bundle_group_name 已存在，跳过自动修复" if ENV['PINDO_DEBUG']
             end
 
             # 设置全局状态
@@ -281,6 +311,10 @@ module Pindo
             return config
           rescue => e
             puts "加载 JPSBuildConfig.json 失败: #{e.message}" if ENV['PINDO_VERBOSE'] == '1'
+            if ENV['PINDO_DEBUG']
+              puts "[PINDO_DEBUG] load_jps_build_config 异常: #{e.class}: #{e.message}"
+              puts "[PINDO_DEBUG]   #{e.backtrace&.first(5)&.join("\n[PINDO_DEBUG]   ")}"
+            end
           end
           nil
         end

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

@@ -199,7 +199,7 @@ module Pindo
 
       def install_and_config_certs(build_type:, platform_type: 'ios', project_dir: Dir.pwd)
         # 标准化构建类型
-        cert_type = Pindo::Options::CertOptions.normalize_build_type(build_type)
+        cert_type = Pindo::Options::BuildOptions.normalize_build_type(build_type)
 
         # 使用 IosConfigParser 单例
         require 'pindo/config/ios_config_parser'

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

@@ -56,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}"
@@ -485,7 +485,7 @@ module Pindo
 
             # 尝试从配置文件加载
             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

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/task_manager.rb

@@ -117,6 +117,14 @@ module Pindo
 
         # 输出执行摘要
         @reporter.print_execution_summary
+
+        # 检查失败任务，有失败则抛出异常（确保进程返回非零退出码）
+        report = execution_report
+        if report[:failed] > 0
+          failed_tasks = @queue.completed_snapshot.select { |t| t.status == TaskStatus::FAILED }
+          failed_names = failed_tasks.map(&:name).join(', ')
+          raise Informative, "#{report[:failed]} 个任务执行失败: #{failed_names}"
+        end
       end
 
       # 获取执行报告

data/lib/pindo/options/core/global_options_state.rb

@@ -109,7 +109,7 @@ module Pindo
         # 3. JPS 相关
         :conf, :upload, :send, :desc,
         # 4. Unity 相关
-        :skipconfig, :skiplib, :skipyoo,
+        :skipmacro, :skiplib, :skipyoo,
         # 5. Git 相关
         :ver_inc, :tag_type, :tag_pre, :release_branch
       ].freeze

data/lib/pindo/options/core/option_item.rb

@@ -114,7 +114,7 @@ module Pindo
       # @param overrides [Hash] 要覆盖的属性
       # @return [OptionItem] 新的 OptionItem 实例
       # @example
-      #   UnityOptions.select(:skipconfig).first.with(default_value: true)
+      #   UnityOptions.select(:skipmacro).first.with(default_value: true)
       def with(**overrides)
         OptionItem.new(
           key: overrides[:key] || @key,

data/lib/pindo/options/groups/appstore_options.rb

@@ -0,0 +1,114 @@
+require 'pindo/options/core/option_item'
+require 'pindo/options/groups/option_group'
+
+module Pindo
+  module Options
+    # App Store / Google Play 商店操作参数组
+    # 定义 ITC 信息管理、内购、截图、元数据等商店相关参数
+    module AppStoreOptions
+      extend OptionGroup
+
+      def self.all_options
+        @all_options ||= {
+          metadata: OptionItem.new(
+            key: :metadata,
+            name: '元数据',
+            description: '上传或下载应用元数据',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_APPSTORE_METADATA',
+            default_value: false,
+            optional: true,
+            example: 'pindo appstore itcinfo --metadata'
+          ),
+
+          screenshots: OptionItem.new(
+            key: :screenshots,
+            name: '截图',
+            description: '上传或下载应用截图',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_APPSTORE_SCREENSHOTS',
+            default_value: false,
+            optional: true,
+            example: 'pindo appstore itcinfo --screenshots'
+          ),
+
+          overwrite: OptionItem.new(
+            key: :overwrite,
+            name: '覆盖',
+            description: '覆盖已有的数据或文件',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_APPSTORE_OVERWRITE',
+            default_value: false,
+            optional: true,
+            example: 'pindo appstore itcinfo --overwrite'
+          ),
+
+          sync: OptionItem.new(
+            key: :sync,
+            name: '同步模式',
+            description: '同步截图到 iTunes Connect',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_APPSTORE_SYNC',
+            default_value: false,
+            optional: true,
+            example: 'pindo appstore itcinfo --sync'
+          ),
+
+          ipa: OptionItem.new(
+            key: :ipa,
+            name: '上传 IPA',
+            description: '上传 IPA 到 iTunes Connect',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_APPSTORE_IPA',
+            default_value: false,
+            optional: true,
+            example: 'pindo appstore itcinfo --ipa'
+          ),
+
+          check: OptionItem.new(
+            key: :check,
+            name: '检查',
+            description: '检查内购配置信息',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_APPSTORE_CHECK',
+            default_value: false,
+            optional: true,
+            example: 'pindo appstore iap --check'
+          ),
+
+          boss: OptionItem.new(
+            key: :boss,
+            name: 'Boss 模式',
+            description: '生成 Boss 平台的内购信息',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_APPSTORE_BOSS',
+            default_value: false,
+            optional: true,
+            example: 'pindo appstore iap --boss'
+          ),
+
+          download: OptionItem.new(
+            key: :download,
+            name: '下载',
+            description: '从 App Store 下载应用的内购信息',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_APPSTORE_DOWNLOAD',
+            default_value: false,
+            optional: true,
+            example: 'pindo appstore iap --download'
+          ),
+
+          delete: OptionItem.new(
+            key: :delete,
+            name: '删除 Tag',
+            description: '删除指定的 Git Tag（同时删除代码仓库和配置仓库）',
+            type: String,
+            env_name: 'PINDO_DELETE_TAG',
+            optional: true,
+            example: 'pindo appstore tag --delete=tag_name'
+          )
+        }
+      end
+    end
+  end
+end

data/lib/pindo/options/groups/build_options.rb

@@ -48,16 +48,17 @@ module Pindo
           build_type: OptionItem.new(
             key: :build_type,
             name: '构建类型',
-            description: '指定构建类型（dev/adhoc/appstore/developer_id）',
+            description: '构建类型: dev(开发), adhoc(测试), release/appstore(发布), developer_id(macOS)',
             type: String,
             env_name: 'PINDO_BUILD_TYPE',
             default_value: nil,
             optional: true,
+            cacheable: true,
             verify_block: proc do |value|
-              next if value.nil?  # 允许 nil 值
-              valid_types = ['dev', 'adhoc', 'appstore', 'developer_id']
+              next if value.nil?
+              valid_types = %w[dev development adhoc release appstore developer_id develop_id]
               unless valid_types.include?(value.to_s.downcase)
-                raise "构建类型错误: #{value}，必须是 #{valid_types.join('、')} 之一"
+                raise "构建类型错误: #{value}，必须是 #{valid_types.join(', ')} 之一"
               end
             end,
             example: 'pindo ios autobuild --build_type=appstore'
@@ -71,6 +72,94 @@ module Pindo
             env_name: 'PINDO_SCHEME',
             optional: true,
             example: 'pindo ios autobuild --scheme=MyAppScheme'
+          ),
+
+          types: OptionItem.new(
+            key: :types,
+            name: '包类型',
+            description: '指定包类型，逗号分隔（ipa,apk,html,mac,exe）',
+            type: String,
+            env_name: 'PINDO_BUILD_TYPES',
+            optional: true,
+            cacheable: false,
+            example: 'pindo unity autobuild --types=ipa,apk'
+          ),
+
+          dev: OptionItem.new(
+            key: :dev,
+            name: '开发模式',
+            description: '使用开发证书构建（等价于 --build_type=dev）',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_BUILD_DEV',
+            default_value: false,
+            optional: true,
+            example: 'pindo appstore cert --dev'
+          ),
+
+          adhoc: OptionItem.new(
+            key: :adhoc,
+            name: 'AdHoc 模式',
+            description: '使用 AdHoc 证书构建 iOS（等价于 --build_type=adhoc）',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_BUILD_ADHOC',
+            default_value: false,
+            optional: true,
+            example: 'pindo unity autobuild --adhoc'
+          ),
+
+          release: OptionItem.new(
+            key: :release,
+            name: 'Release 模式',
+            description: '使用 Release/发布模式构建（等价于 --build_type=release）',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_BUILD_RELEASE',
+            default_value: false,
+            optional: true,
+            example: 'pindo android autobuild --release'
+          ),
+
+          develop_id: OptionItem.new(
+            key: :develop_id,
+            name: 'Developer ID 模式',
+            description: '使用 macOS Developer ID 证书（等价于 --build_type=developer_id，仅 macOS）',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_BUILD_DEVELOP_ID',
+            default_value: false,
+            optional: true,
+            example: 'pindo appstore cert --develop_id --platform=macos'
+          ),
+
+          skipclean: OptionItem.new(
+            key: :skipclean,
+            name: '跳过 Gradle Clean',
+            description: '跳过 Android AAB 构建前的 Gradle clean 步骤（加速本地开发）',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_SKIP_GRADLE_CLEAN',
+            default_value: false,
+            optional: true,
+            example: 'pindo android autobuild --skipclean'
+          ),
+
+          skipvalidate: OptionItem.new(
+            key: :skipvalidate,
+            name: '跳过 Unity 库校验',
+            description: '跳过 Unity unityLibrary/libs 符号链接有效性校验',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_SKIP_UNITY_LIBS_VALIDATE',
+            default_value: false,
+            optional: true,
+            example: 'pindo android autobuild --skipvalidate'
+          ),
+
+          injectsigning: OptionItem.new(
+            key: :injectsigning,
+            name: '注入签名配置',
+            description: '注入签名配置到 Android build.gradle（自动改写 signingConfigs）',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_INJECT_ANDROID_SIGNING_GRADLE',
+            default_value: false,
+            optional: true,
+            example: 'pindo android autobuild --injectsigning'
           )
         }
       end

data/lib/pindo/options/groups/cert_options.rb

@@ -32,58 +32,6 @@ module Pindo
             example: 'pindo appstore cert --config=/path/config.json'
           ),
 
-          build_type: OptionItem.new(
-            key: :build_type,
-            name: '构建类型',
-            description: '构建类型: dev/development(开发), adhoc(测试), release/appstore(发布), developer_id/develop_id(macOS)',
-            type: String,
-            env_name: 'PINDO_BUILD_TYPE',
-            default_value: nil,
-            optional: true,
-            cacheable: true,
-            verify_block: proc do |value|
-              next if value.nil?  # 允许 nil 值
-              unless BUILD_TYPES.include?(value.to_s.downcase)
-                raise "构建类型错误: #{value}，必须是 #{BUILD_TYPES.join(', ')} 之一"
-              end
-            end,
-            example: 'pindo appstore cert --build_type=dev'
-          ),
-
-          # 证书类型快捷方式（等价于 --build_type）
-          dev: OptionItem.new(
-            key: :dev,
-            name: '使用开发证书',
-            description: '使用开发证书（等价于 --build_type=dev）',
-            type: OptionItem::Boolean,
-            env_name: 'PINDO_CERT_DEV',
-            optional: true,
-            default_value: false,
-            example: 'pindo appstore cert --dev'
-          ),
-
-          adhoc: OptionItem.new(
-            key: :adhoc,
-            name: '使用 AdHoc 证书',
-            description: '使用 AdHoc 证书（等价于 --build_type=adhoc）',
-            type: OptionItem::Boolean,
-            env_name: 'PINDO_CERT_ADHOC',
-            optional: true,
-            default_value: false,
-            example: 'pindo appstore cert --adhoc'
-          ),
-
-          develop_id: OptionItem.new(
-            key: :develop_id,
-            name: '使用 Developer ID 证书',
-            description: '使用 macOS Developer ID Application 证书（等价于 --build_type=developer_id，仅 macOS）',
-            type: OptionItem::Boolean,
-            env_name: 'PINDO_CERT_DEVELOP_ID',
-            optional: true,
-            default_value: false,
-            example: 'pindo appstore cert --develop_id --platform=macos'
-          ),
-
           renew: OptionItem.new(
             key: :renew,
             name: '重新生成证书',

data/lib/pindo/options/groups/common_options.rb

@@ -0,0 +1,27 @@
+require 'pindo/options/core/option_item'
+require 'pindo/options/groups/option_group'
+
+module Pindo
+  module Options
+    # 通用参数组
+    # 定义跨命令共享的通用参数（如 login、force、auto 等常见操作参数）
+    module CommonOptions
+      extend OptionGroup
+
+      def self.all_options
+        @all_options ||= {
+          force: OptionItem.new(
+            key: :force,
+            name: '强制执行',
+            description: '强制执行操作，跳过确认或验证',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_FORCE',
+            default_value: false,
+            optional: true,
+            example: 'pindo unity packpush --force'
+          )
+        }
+      end
+    end
+  end
+end

data/lib/pindo/options/groups/global_options.rb

@@ -0,0 +1,18 @@
+require 'pindo/options/core/option_item'
+require 'pindo/options/groups/option_group'
+
+module Pindo
+  module Options
+    # 全局行为参数组
+    # 控制 pindo 运行时的全局行为（调试、缓存、UI、版本检查等）
+    # 与 CommonOptions（命令级共享参数）不同，GlobalOptions 影响所有命令的运行环境
+    module GlobalOptions
+      extend OptionGroup
+
+      def self.all_options
+        @all_options ||= {
+        }
+      end
+    end
+  end
+end