pindo 5.18.6 → 5.18.9

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

@@ -1,8 +1,96 @@
+require "fileutils"
+require "pathname"
+
 module Pindo
   class AndroidProjectHelper
     class << self
 
 
+      # 确保导出的 Android 工程 `unityLibrary/libs` 里物理存在 Firebase Unity AAR（firebase-*-unity-*.aar）。
+      #
+      # 某些 Unity 工程会通过 EDM4U 将 Firebase Unity AAR 解析到 `Assets/GeneratedLocalRepo/**/m2repository`，
+      # 并在导出工程中使用本地 maven repo 方式引用它们，导致 `unityLibrary/libs` 为空。
+      # 当下游流程只携带“导出目录”时，这会表现为 Firebase AAR “缺失”。
+      #
+      # 本方法会从以下来源收集 firebase-*-unity-*.aar 并复制到导出工程：
+      # - Unity 工程的 `ProjectSettings/AndroidResolverDependencies.xml`（优先）
+      # - `Assets/GeneratedLocalRepo/**/m2repository/com/google/firebase/**/firebase-*-unity-*.aar`（兜底扫描）
+      #
+      # @return [Array<String>] 实际拷贝/确认存在的文件名列表
+      def ensure_export_has_firebase_unity_aars!(unity_root_path:, export_path:)
+        raise ArgumentError, "unity_root_path 不能为空" if unity_root_path.to_s.empty?
+        raise ArgumentError, "export_path 不能为空" if export_path.to_s.empty?
+        raise ArgumentError, "Unity 工程目录不存在: #{unity_root_path}" unless File.directory?(unity_root_path)
+        raise ArgumentError, "导出目录不存在: #{export_path}" unless File.directory?(export_path)
+
+        libs_dir = File.join(export_path, "unityLibrary", "libs")
+        FileUtils.mkdir_p(libs_dir)
+
+        # 若导出工程已包含所需的 firebase-*-unity-*.aar，则无需再从 Unity 工程侧反查来源（含 GeneratedLocalRepo）。
+        already = Dir.glob(File.join(libs_dir, "firebase-*-unity-*.aar")).select { |p| File.file?(p) }
+        return already.map { |p| File.basename(p) }.uniq unless already.empty?
+
+        resolver_xml = File.join(unity_root_path, "ProjectSettings", "AndroidResolverDependencies.xml")
+
+        candidates = []
+        if File.file?(resolver_xml)
+          begin
+            require "rexml/document"
+            doc = REXML::Document.new(File.read(resolver_xml))
+            doc.elements.each("dependencies/files/file") do |e|
+              rel = e.text.to_s.strip
+              next if rel.empty?
+              next unless rel.end_with?(".aar")
+              next unless rel.match?(/firebase-.*-unity-.*\.aar\z/i)
+
+              abs = Pathname.new(rel).absolute? ? rel : File.join(unity_root_path, rel)
+              candidates << abs
+            end
+          rescue StandardError => e
+            raise Informative, "解析 AndroidResolverDependencies.xml 失败: #{e.message}\n请在 Unity 中执行 EDM4U Force Resolve 后重试。"
+          end
+        end
+
+        if candidates.empty?
+          local_repo = File.join(unity_root_path, "Assets", "GeneratedLocalRepo")
+          if File.directory?(local_repo)
+            glob = File.join(local_repo, "**", "m2repository", "com", "google", "firebase", "**", "firebase-*-unity-*.aar")
+            candidates.concat(Dir.glob(glob))
+          end
+        end
+
+        candidates.uniq!
+        existing = candidates.select { |p| File.file?(p) }
+
+        if existing.empty?
+          raise Informative, <<~MSG
+            Firebase Unity AAR 依赖拷贝失败：未找到 firebase-*-unity-*.aar
+            Unity 工程: #{unity_root_path}
+            导出目录: #{export_path}
+            期望来源:
+            - #{resolver_xml}
+            - Assets/GeneratedLocalRepo/**/m2repository/com/google/firebase/**/firebase-*-unity-*.aar
+
+            请在 Unity 中执行：Assets → External Dependency Manager → Android Resolver → Force Resolve
+            然后重新导出再构建。
+          MSG
+        end
+
+        copied = []
+        existing.each do |src|
+          dst = File.join(libs_dir, File.basename(src))
+          if File.file?(dst) && File.size(dst) == File.size(src)
+            copied << File.basename(dst)
+            next
+          end
+
+          FileUtils.cp(src, dst)
+          copied << File.basename(dst)
+        end
+
+        copied.uniq
+      end
+
       def unity_android_project?(project_path)
         # 检查 unityLibrary 模块是否存在
         unity_library_path = File.join(project_path, "unityLibrary")

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

@@ -205,7 +205,9 @@ module Pindo
         end
 
         # 生成 Wrapper
-        generate_gradle_wrapper(gradle_dir, gradle_version)
+        ok = generate_gradle_wrapper(gradle_dir, gradle_version)
+        ensure_gradlew_runnable!(gradle_dir)
+        ok
       end
 
       # 解析gradle版本
@@ -244,7 +246,30 @@ module Pindo
         end
 
         # 生成 Wrapper
-        generate_gradle_wrapper(gradle_dir, gradle_version)
+        ok = generate_gradle_wrapper(gradle_dir, gradle_version)
+        ensure_gradlew_runnable!(gradle_dir)
+        ok
+      end
+
+      # 确保工程根目录下 gradlew 可被当前环境执行：补齐执行位；在 macOS 上尝试移除
+      # com.apple.quarantine（无该属性时 xattr 失败可忽略）。用于避免
+      # 「bad interpreter: Operation not permitted」类错误，无用户交互。
+      def ensure_gradlew_runnable!(gradle_dir)
+        return if gradle_dir.nil? || gradle_dir.to_s.empty?
+
+        gradlew = File.join(gradle_dir, "gradlew")
+        return unless File.file?(gradlew)
+
+        begin
+          st = File.stat(gradlew)
+          File.chmod(st.mode | 0o111, gradlew)
+        rescue StandardError
+          # 只读卷等场景下忽略
+        end
+
+        return unless RUBY_PLATFORM.match?(/darwin/i)
+
+        system("xattr", "-d", "com.apple.quarantine", gradlew, out: File::NULL, err: File::NULL)
       end
 
       # =================== 私有辅助方法 ===================

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

@@ -122,14 +122,34 @@ module Pindo
         @pindo_managed_signing_paths = []
       end
 
+      # 打包结束后恢复本次被修改的 Gradle 签名配置（仅恢复被本次任务改动过的文件）
+      def restore_managed_signing_config!
+        backups = @pindo_managed_gradle_backups || {}
+        backups.each do |path, original_content|
+          next if path.nil? || path.to_s.empty?
+          next unless original_content.is_a?(String)
+          next unless File.exist?(path)
+
+          File.write(path, original_content)
+        end
+      ensure
+        @pindo_managed_gradle_backups = {}
+      end
+
+      # 清理本次写入到进程 ENV 的签名变量（避免后续任务误继承）
+      def cleanup_managed_signing_env!
+        keys = @pindo_managed_env_keys || []
+        keys.each { |k| ENV.delete(k.to_s) if k }
+      ensure
+        @pindo_managed_env_keys = []
+      end
+
       # 将签名配置应用到 Android 工程
       #
       # 默认（与工程手写的 RELEASE_* 约定一致）：只拉取 JPS、拷贝 jks 到项目 signing/，并设置当前进程
       # RELEASE_KEYSTORE_PATH / RELEASE_KEYSTORE_PASSWORD / RELEASE_KEY_ALIAS / RELEASE_KEY_PASSWORD，不修改 build.gradle。
       # RELEASE_KEYSTORE_PATH 使用 jks 的绝对路径，便于 app 子模块内 `file(System.getenv(...))` 引用。
       #
-      # 若需恢复自动改写 signingConfigs，设置环境变量：PINDO_INJECT_ANDROID_SIGNING_GRADLE=1
-      #
       # @param project_dir [String] 项目目录
       # @param build_type [String] 构建类型 "debug" 或 "release"
       # @return [Boolean] 是否成功
@@ -139,6 +159,8 @@ module Pindo
         raise ArgumentError, "bundle_id 不能为空" if bundle_id.blank?
 
         reset_managed_signing_paths!
+        reset_managed_gradle_backups!
+        reset_managed_env_keys!
 
         main_module = Pindo::AndroidProjectHelper.get_main_module(project_dir)
         unless main_module
@@ -170,19 +192,16 @@ module Pindo
           raise "JPS keystore 未拷贝到工程 signing/（无法解析路径），Gradle 将回退到 build.gradle 中的本地 jks；请检查 JPS 证书是否下载成功"
         end
 
-        abs_keystore = File.expand_path(File.join(project_dir, rel_plain))
-
-        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)
-          else
-            ensure_keystore_config_groovy(gradle_file, project_dir, build_type, sign_config, bundle_id: bundle_id)
-          end
-          export_jps_release_signing_env!(cfg, keystore_path_for_env: rel_plain)
+        if gradle_file.end_with?(".kts")
+          ensure_keystore_config_kts(gradle_file, project_dir, build_type, sign_config, bundle_id: bundle_id)
         else
-          export_jps_release_signing_env!(cfg, keystore_path_for_env: abs_keystore)
+          ensure_keystore_config_groovy(gradle_file, project_dir, build_type, sign_config, bundle_id: bundle_id)
         end
+        # 注意：部分 Unity 导出工程/多模块工程的 Gradle rootProject 目录可能不是 project_dir，
+        # 相对路径（如 signing/xxx.jks）会被解析到错误的模块目录下（如 launcher/signing/...）。
+        # 这里改为导出绝对路径，确保与 keystore 创建/拷贝目录保持一致。
+        keystore_abs = File.expand_path(File.join(project_dir, rel_plain))
+        export_jps_release_signing_env!(cfg, keystore_path_for_env: keystore_abs)
         true
       end
 
@@ -244,6 +263,14 @@ module Pindo
         @pindo_managed_signing_paths = []
       end
 
+      def reset_managed_gradle_backups!
+        @pindo_managed_gradle_backups = {}
+      end
+
+      def reset_managed_env_keys!
+        @pindo_managed_env_keys = []
+      end
+
       def register_managed_signing_path!(path)
         return if path.nil? || path.to_s.empty?
 
@@ -251,6 +278,23 @@ module Pindo
         @pindo_managed_signing_paths << path
       end
 
+      def register_managed_gradle_backup!(path, original_content)
+        return if path.nil? || path.to_s.empty?
+        return unless original_content.is_a?(String)
+
+        @pindo_managed_gradle_backups ||= {}
+        # 同一文件只备份一次：第一次写入前的内容即为“原始内容”
+        @pindo_managed_gradle_backups[path] ||= original_content
+      end
+
+      def register_managed_env_key!(key)
+        return if key.nil? || key.to_s.empty?
+
+        @pindo_managed_env_keys ||= []
+        @pindo_managed_env_keys << key.to_s
+        @pindo_managed_env_keys.uniq!
+      end
+
       # 将 JPS 返回的路径/口令/别名写入当前进程环境变量，供 Gradle / bundletool 子进程继承（与 build.gradle 中 RELEASE_* 名称一致）
       def export_jps_release_signing_env!(cfg, keystore_path_for_env:)
         return unless cfg.is_a?(Hash)
@@ -258,6 +302,7 @@ module Pindo
         if keystore_path_for_env && !keystore_path_for_env.to_s.empty?
           ENV[ENV_RELEASE_KEYSTORE_PATH] =
             keystore_path_for_env
+          register_managed_env_key!(ENV_RELEASE_KEYSTORE_PATH)
         end
 
         sp = cfg["storePassword"]
@@ -270,6 +315,10 @@ module Pindo
         ENV[ENV_RELEASE_KEYSTORE_PASSWORD] = sp_plain.to_s if sp_plain && !sp_plain.to_s.empty?
         ENV[ENV_RELEASE_KEY_PASSWORD] = kp_plain.to_s if kp_plain && !kp_plain.to_s.empty?
         ENV[ENV_RELEASE_KEY_ALIAS] = ka.to_s if ka && !ka.to_s.empty?
+
+        register_managed_env_key!(ENV_RELEASE_KEYSTORE_PASSWORD) if sp_plain && !sp_plain.to_s.empty?
+        register_managed_env_key!(ENV_RELEASE_KEY_PASSWORD) if kp_plain && !kp_plain.to_s.empty?
+        register_managed_env_key!(ENV_RELEASE_KEY_ALIAS) if ka && !ka.to_s.empty?
       end
 
       # Groovy：解析 storePassword/keyPassword（支持 System.getenv、可选 ?: 回退、或历史明文）
@@ -517,6 +566,7 @@ module Pindo
         if content == original_content
           puts "  ✓ build.gradle 无需修改"
         else
+          register_managed_gradle_backup!(gradle_file, original_content)
           File.write(gradle_file, content)
           puts "  ✓ build.gradle 已更新"
         end
@@ -571,6 +621,7 @@ module Pindo
         if content == original_content
           puts "  ✓ build.gradle.kts 无需修改"
         else
+          register_managed_gradle_backup!(gradle_file, original_content)
           File.write(gradle_file, content)
           puts "  ✓ build.gradle.kts 已更新"
         end
@@ -1285,34 +1336,52 @@ module Pindo
 
       # =================== 写入 keystore 配置的辅助方法 ===================
 
-      # 生成签名配置代码块（Groovy）——与工程约定：RELEASE_* + ?: 本地回退（明文仅回退串，来自 JPS 的敏感值走本次进程 ENV）
+      # 生成签名配置代码块（Groovy）
+      # 注意：签名信息只允许从环境变量读取，严禁在 build.gradle 中写入任何明文（包括回退密码/alias/路径）。
       def generate_signing_config_groovy(config_name, pindo_config)
-        rel_fb = escape_gradle_double_quoted(signing_keystore_fallback_relative(pindo_config))
-        alias_fb = escape_gradle_double_quoted(pindo_config["keyAlias"])
-
         <<~GROOVY
           #{config_name} {
-                  def keystorePath = System.getenv("#{ENV_RELEASE_KEYSTORE_PATH}") ?: "#{rel_fb}"
-                  storeFile rootProject.file(keystorePath)
-                  storePassword System.getenv("#{ENV_RELEASE_KEYSTORE_PASSWORD}") ?: "123456"
-                  keyAlias System.getenv("#{ENV_RELEASE_KEY_ALIAS}") ?: "#{alias_fb}"
-                  keyPassword System.getenv("#{ENV_RELEASE_KEY_PASSWORD}") ?: "123456"
+                  def signingEnvVars = ["#{ENV_RELEASE_KEYSTORE_PATH}", "#{ENV_RELEASE_KEYSTORE_PASSWORD}", "#{ENV_RELEASE_KEY_ALIAS}", "#{ENV_RELEASE_KEY_PASSWORD}"]
+                  def missing = signingEnvVars.findAll { !System.getenv(it) }
+                  if (!missing.isEmpty()) {
+                      throw new GradleException("Missing required environment variables for release signing: ${missing.join(', ')}")
+                  }
+                  def keystorePath = System.getenv("#{ENV_RELEASE_KEYSTORE_PATH}")
+                  def keystoreFile = rootProject.file(keystorePath)
+                  if (!keystoreFile.exists()) {
+                      throw new GradleException("Keystore file not found: ${keystoreFile.absolutePath}")
+                  }
+                  storeFile keystoreFile
+                  storePassword System.getenv("#{ENV_RELEASE_KEYSTORE_PASSWORD}")
+                  keyAlias System.getenv("#{ENV_RELEASE_KEY_ALIAS}")
+                  keyPassword System.getenv("#{ENV_RELEASE_KEY_PASSWORD}")
               }
         GROOVY
       end
 
       # 生成签名配置代码块（Kotlin DSL）
       def generate_signing_config_kts(config_name, pindo_config)
-        rel_fb = escape_gradle_double_quoted(signing_keystore_fallback_relative(pindo_config))
-        alias_fb = escape_gradle_double_quoted(pindo_config["keyAlias"])
-
         <<~KOTLIN
           create("#{config_name}") {
-                  val keystorePath = System.getenv("#{ENV_RELEASE_KEYSTORE_PATH}") ?: "#{rel_fb}"
-                  storeFile = rootProject.file(keystorePath)
-                  storePassword = System.getenv("#{ENV_RELEASE_KEYSTORE_PASSWORD}") ?: "123456"
-                  keyAlias = System.getenv("#{ENV_RELEASE_KEY_ALIAS}") ?: "#{alias_fb}"
-                  keyPassword = System.getenv("#{ENV_RELEASE_KEY_PASSWORD}") ?: "123456"
+                  val signingEnvVars = listOf(
+                      "#{ENV_RELEASE_KEYSTORE_PATH}",
+                      "#{ENV_RELEASE_KEYSTORE_PASSWORD}",
+                      "#{ENV_RELEASE_KEY_ALIAS}",
+                      "#{ENV_RELEASE_KEY_PASSWORD}",
+                  )
+                  val missing = signingEnvVars.filter { System.getenv(it).isNullOrBlank() }
+                  if (missing.isNotEmpty()) {
+                      throw GradleException("Missing required environment variables for release signing: ${missing.joinToString(\", \")}")
+                  }
+                  val keystorePath = System.getenv("#{ENV_RELEASE_KEYSTORE_PATH}")
+                  val keystoreFile = rootProject.file(keystorePath)
+                  if (!keystoreFile.exists()) {
+                      throw GradleException("Keystore file not found: ${keystoreFile.absolutePath}")
+                  }
+                  storeFile = keystoreFile
+                  storePassword = System.getenv("#{ENV_RELEASE_KEYSTORE_PASSWORD}")
+                  keyAlias = System.getenv("#{ENV_RELEASE_KEY_ALIAS}")
+                  keyPassword = System.getenv("#{ENV_RELEASE_KEY_PASSWORD}")
               }
         KOTLIN
       end

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

@@ -346,13 +346,78 @@ module Pindo
         content = File.read(settings_path)
         includes = []
 
-        content.scan(/include\s+(.*)$/).each do |m|
-          line = m.first.to_s
-          line.scan(/["'](:[^"']+)["']/).each do |mm|
-            includes << mm.first
+        normalize_mod = lambda do |raw_mod|
+          m = raw_mod.to_s.strip
+          return nil if m.empty?
+          return nil unless m.start_with?(":") || m.include?(":")
+
+          m.start_with?(":") ? m : ":#{m}"
+        end
+
+        extract_from_args = lambda do |args|
+          args.to_s.scan(/["']([^"']+)["']/).each do |mm|
+            mod = normalize_mod.call(mm.first)
+            includes << mod if mod
           end
         end
 
+        # 兼容 settings.gradle / settings.gradle.kts 的多种 include 写法：
+        # - Groovy: include ':launcher', ':unityLibrary'
+        # - Groovy: include(':launcher', ':unityLibrary')
+        # - KTS:    include(":launcher", ":unityLibrary")
+        # - 以及跨行/缩进的场景（include(...) 可能换行）
+        #
+        # 注意：KTS 常见多行写法：
+        # include(
+        #   ":launcher",
+        #   ":unityLibrary"
+        # )
+        #
+        # 这里先全局提取 include(...) 块，再逐行兜底提取 include 语句。
+        content.scan(/\binclude\s*\((.*?)\)/m).each do |m|
+          extract_from_args.call(m.first.to_s)
+        end
+
+        # 逐行兜底：适配
+        # - include ':a', ':b'
+        # - include(':a', ':b')
+        # - include ':a',
+        #           ':b'
+        # - include ":a",
+        #           ":b"
+        lines = content.lines
+        i = 0
+        while i < lines.length
+          raw = lines[i].to_s
+          line = raw.strip
+          i += 1
+
+          next if line.empty?
+          next if line.start_with?("//", "#")
+          next unless line.match?(/\binclude\b/)
+
+          # 捕获 include 后的参数区：既支持 `include xxx` 也支持 `include(xxx)`
+          args = line.sub(/\A.*?\binclude\b\s*/, "")
+          args = args.sub(/\A\(\s*/, "")
+
+          # 如果这一行以逗号结尾或括号未闭合，继续吞掉后续的“续行参数”
+          open_parens = args.count("(") - args.count(")")
+          needs_more = args.rstrip.end_with?(",") || open_parens.positive?
+          while needs_more && i < lines.length
+            nxt = lines[i].to_s
+            i += 1
+            nxt_stripped = nxt.strip
+            break if nxt_stripped.empty? || nxt_stripped.start_with?("//", "#")
+
+            args << " " << nxt_stripped
+            open_parens = args.count("(") - args.count(")")
+            needs_more = args.rstrip.end_with?(",") || open_parens.positive?
+          end
+
+          args = args.sub(/\s*\)\s*;?\s*\z/, "")
+          extract_from_args.call(args)
+        end
+
         includes.uniq
       end
 
@@ -377,6 +442,8 @@ module Pindo
         return true if content.include?("com.android.application")
         return true if content.match?(/id\s*\(?\s*["']com\.android\.application["']\s*\)?/)
         return true if content.match?(/alias\(\s*libs\.plugins\.android\.application\s*\)/)
+        return true if content.match?(/apply\s+plugin:\s*["']com\.android\.application["']/)
+        return true if content.match?(/apply\s*\(\s*plugin\s*=\s*["']com\.android\.application["']\s*\)/)
 
         false
       end
@@ -385,18 +452,27 @@ module Pindo
         content = File.read(gradle_path)
         content.include?("com.android.asset-pack") ||
           content.match?(/id\s*\(?\s*["']com\.android\.asset-pack["']\s*\)?/) ||
-          content.match?(/alias\(\s*libs\.plugins\.android\.asset\.pack\s*\)/)
+          content.match?(/alias\(\s*libs\.plugins\.android\.asset\.pack\s*\)/) ||
+          content.match?(/apply\s+plugin:\s*["']com\.android\.asset-pack["']/) ||
+          content.match?(/apply\s*\(\s*plugin\s*=\s*["']com\.android\.asset-pack["']\s*\)/)
       end
 
       def android_module?(gradle_path)
         content = File.read(gradle_path)
         return false if android_asset_pack_module?(gradle_path)
 
+        # 兼容多种 Gradle/AGP 插件写法：
+        # - plugins { id 'com.android.application' } / id("com.android.library")
+        # - apply plugin: 'com.android.application'
+        # - Unity/旧工程常见：apply plugin: 'android-library'
         content.include?("com.android.application") ||
           content.include?("com.android.library") ||
           content.include?("com.android.dynamic-feature") ||
           content.match?(/com\.android\.(application|library|dynamic-feature)/) ||
-          content.match?(/alias\(\s*libs\.plugins\.android\.(application|library|dynamic\.feature)\s*\)/)
+          content.match?(/alias\(\s*libs\.plugins\.android\.(application|library|dynamic\.feature)\s*\)/) ||
+          content.match?(/apply\s+plugin:\s*["']android-library["']/) ||
+          content.match?(/apply\s+plugin:\s*["']com\.android\.(application|library|dynamic-feature)["']/) ||
+          content.match?(/apply\s*\(\s*plugin\s*=\s*["']com\.android\.(application|library|dynamic-feature)["']\s*\)/)
       end
 
       def gradle_dsl(gradle_path)

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

@@ -1,7 +1,6 @@
 require 'pindo/module/task/model/git_task'
 require 'pindo/base/git_handler'
 require 'pindo/module/utils/git_repo_helper'
-require 'pindo/module/utils/git_hook_helper'
 require 'pindo/options/helpers/git_constants'
 
 module Pindo
@@ -87,10 +86,7 @@ module Pindo
         # 2. 检查并修复 .gitignore（可能创建新提交，但 fixed_version 已经确定）
         git_repo_helper.check_gitignore(root_dir)
 
-        # 3. 检查并安装 commit 变更统计 hook（主仓库 + 子模块）
-        Pindo::GitHookHelper.share_instance.install_commit_stats_hook(root_dir)
-
-        # 4. 检查并处理未提交的文件（使用 GitHandler）
+        # 3. 检查并处理未提交的文件（使用 GitHandler）
         # process_type 已经在初始化时确定（由外部传入或默认为 skip）
         begin
             Pindo::GitHandler.process_need_add_files(
@@ -124,7 +120,7 @@ module Pindo
           }
         end
 
-        # 5. Stash 工作目录的残留修改（为分支同步做准备）
+        # 4. Stash 工作目录的残留修改（为分支同步做准备）
         coding_branch = nil
         stash_saved = false
         stash_name = "pindo_stash_#{Time.now.strftime('%Y%m%d%H%M%S')}_#{rand(1000)}"
@@ -136,13 +132,13 @@ module Pindo
         end
 
         begin
-          # 6. 获取当前分支
+          # 5. 获取当前分支
           coding_branch = get_current_branch_name
 
-          # 7. 检查并推送本地提交到远程（确保本地和远程同步）
+          # 6. 检查并推送本地提交到远程（确保本地和远程同步）
           Pindo::GitHandler.check_unpushed_commits(project_dir: root_dir, branch: coding_branch)
 
-          # 8. 分支同步：将 coding_branch 和 release_branch 双向合并（确保两分支在同一节点）
+          # 7. 分支同步：将 coding_branch 和 release_branch 双向合并（确保两分支在同一节点）
           if coding_branch != @release_branch
             Funlog.instance.fancyinfo_start("开始同步 #{coding_branch} 和 #{@release_branch} 分支")
             Pindo::GitHandler.merge_branches(
@@ -154,7 +150,7 @@ module Pindo
             Funlog.instance.fancyinfo_success("分支同步完成，#{coding_branch} 和 #{@release_branch} 现在在同一节点")
           end
 
-          # 9. 计算 build_version
+          # 8. 计算 build_version
           # 优先级 1: 如果指定了 fixed_version（外部传入或从 HEAD tag 获取），使用它
           if @fixed_version && !@fixed_version.empty?
             @build_version = @fixed_version

data/lib/pindo/module/task/model/unity/unity_export_task.rb

@@ -166,6 +166,20 @@ module Pindo
 
         result = execute_unity_build(platform)
 
+        # 确保导出产物中 `unityLibrary/libs` 物理存在 firebase-*-unity-*.aar，
+        # 以便下游仅携带导出目录时仍能正常集成 Firebase。
+        begin
+          copied = Pindo::AndroidProjectHelper.ensure_export_has_firebase_unity_aars!(
+            unity_root_path: @unity_root_path,
+            export_path: @export_path
+          )
+          puts "✓ 已同步 Firebase Unity AAR 到导出工程 unityLibrary/libs: #{copied.join(', ')}" if copied && !copied.empty?
+        rescue Informative
+          raise
+        rescue StandardError => e
+          raise Informative, "同步 Firebase Unity AAR 失败: #{e.message}"
+        end
+
         {
           success: true,
           platform: 'android',