catalyst-core 1.1.0 → 1.2.0-canary.2

package/dist/native/renameAndroidProject.js

@@ -52,6 +52,9 @@ class SimpleProgress {
     const mark = type === "error" ? _theme.t.bad(_theme.glyph.fail) : type === "warning" ? _theme.t.warn(_theme.glyph.warn) : type === "success" ? _theme.t.ok(_theme.glyph.done) : _theme.t.dim(_theme.glyph.info);
     console.log(`${_theme.GUTTER}${_theme.t.dim(_theme.glyph.pipe)} ${mark} ${message}`);
   }
+
+  // Gradle's current task; buildApp:android shows it on the spinner's row.
+  status() {}
   printTreeContent(title, items) {
     this.ensureHeader();
     console.log(`\n${_theme.GUTTER}${_theme.t.bold(title)}`);
@@ -67,238 +70,109 @@ class SimpleProgress {
     console.log("");
   }
 }
-const progress = new SimpleProgress("Android AAB Builder");
-async function createKeystore(projectPaths, androidConfig) {
-  const {
-    newProjectPath
-  } = projectPaths;
-  const {
-    keystoreConfig
-  } = androidConfig;
-  if (!keystoreConfig) {
-    progress.log("Keystore configuration not found, skipping keystore creation", "info");
-    return null;
-  }
-  progress.log("Checking keystore configuration...", "info");
-
-  // Validate keystore passwords are not placeholder values
-  if (keystoreConfig.storePassword === "your_store_password" || keystoreConfig.keyPassword === "your_key_password" || keystoreConfig.storePassword === "your_password" || keystoreConfig.keyPassword === "your_password") {
-    throw new Error('Please update keystore passwords in config file. Do not use placeholder values like "your_store_password" or "your_key_password".');
-  }
-
-  // Define keystore path
-  const keystorePath = _path.default.join(newProjectPath, "app", "keystore.jks");
-
-  // Check if keystore already exists
-  if (_fs.default.existsSync(keystorePath)) {
-    progress.log("Keystore already exists, verifying accessibility...", "info");
-
-    // Test keystore accessibility
-    try {
-      const testCommand = `keytool -list -keystore "${keystorePath}" -storepass "${keystoreConfig.storePassword}" -alias "${keystoreConfig.keyAlias}"`;
-      (0, _utils.runCommand)(testCommand);
-      progress.log("Existing keystore verified successfully", "success");
-      return keystorePath;
-    } catch (testError) {
-      progress.log("Existing keystore verification failed, creating new one...", "warning");
-      // Remove the faulty keystore
-      _fs.default.unlinkSync(keystorePath);
-    }
-  }
-  progress.log("Creating new keystore...", "info");
-  try {
-    // Validate required keystore configuration
-    const requiredFields = ["keyAlias", "storePassword", "keyPassword", "organizationInfo"];
-    for (const field of requiredFields) {
-      if (!keystoreConfig[field]) {
-        throw new Error(`Missing required keystore config field: ${field}`);
-      }
-    }
-    const {
-      organizationInfo
-    } = keystoreConfig;
-    const requiredOrgFields = ["companyName", "city", "state", "countryCode"];
-    for (const field of requiredOrgFields) {
-      if (!organizationInfo[field]) {
-        throw new Error(`Missing required organization info field: ${field}`);
-      }
-    }
-
-    // Create keystore directory if it doesn't exist
-    const keystoreDir = _path.default.dirname(keystorePath);
-    if (!_fs.default.existsSync(keystoreDir)) {
-      _fs.default.mkdirSync(keystoreDir, {
-        recursive: true
-      });
-    }
 
-    // Build the distinguished name (DN) for the certificate
-    const dn = [`CN=${organizationInfo.companyName}`, `OU=${organizationInfo.department || organizationInfo.companyName}`, `O=${organizationInfo.organization || organizationInfo.companyName}`, `L=${organizationInfo.city}`, `ST=${organizationInfo.state}`, `C=${organizationInfo.countryCode}`].join(", ");
-
-    // For PKCS12 keystores (default), store and key passwords must be the same
-    // Use store password for both to avoid PKCS12 compatibility issues
-    const effectiveKeyPassword = keystoreConfig.storePassword;
-    if (keystoreConfig.keyPassword !== keystoreConfig.storePassword) {
-      progress.log("Note: Using store password for key password (PKCS12 requirement)", "info");
-    }
-
-    // Generate keystore using keytool with PKCS12 format explicitly
-    const validityDays = (keystoreConfig.validityYears || 25) * 365;
-    const keystoreCommand = ["keytool", "-genkeypair", "-v", `-storetype PKCS12`, `-keystore "${keystorePath}"`, `-alias "${keystoreConfig.keyAlias}"`, `-keyalg RSA`, `-keysize 2048`, `-validity ${validityDays}`, `-storepass "${keystoreConfig.storePassword}"`, `-keypass "${effectiveKeyPassword}"`, `-dname "${dn}"`].join(" ");
-    progress.log("Executing keytool command...", "info");
-    (0, _utils.runCommand)(keystoreCommand);
-
-    // Verify keystore was created
-    if (!_fs.default.existsSync(keystorePath)) {
-      throw new Error("Keystore file was not created successfully");
-    }
+// Run on its own, this script prints every step and detail line itself.
+// buildApp:android passes its progress instead (buildAndroidAAB's `progress`
+// option): the steps and details then ride on its "Build signed AAB" spinner
+// like the rest of buildApp, printed as lines only with --verbose/--debug,
+// while warnings and errors still print.
+let progress = new SimpleProgress("Android AAB Builder");
+const STEP_DETAILS = {
+  config: "reading the configuration",
+  validation: "checking the Android project",
+  backup: "backing up the project",
+  createTempDeployment: "copying the project to a build folder",
+  updateFileContents: "applying the app id and name",
+  createSignedAAB: "running Gradle",
+  finalizeAAB: "saving the AAB"
+};
+
+/**
+ * This script's progress calls, reported through a TerminalProgress that
+ * already has a step running. `info` and `success` become spinner detail
+ * (lines under --verbose), warnings and errors print. No summary box and no
+ * failure line: the caller prints its own summary and diagnostic.
+ */
+function nestedProgress(outer) {
+  return {
+    currentStep: null,
+    start(stepId) {
+      this.currentStep = {
+        id: stepId
+      };
+      outer.log(STEP_DETAILS[stepId] || stepId, "info");
+    },
+    complete() {
+      this.currentStep = null;
+    },
+    fail() {
+      this.currentStep = null;
+    },
+    log(message, type = "info") {
+      outer.log(message, type);
+    },
+    status(detail) {
+      outer.status(detail);
+    },
+    printTreeContent() {}
+  };
+}
 
-    // Test the newly created keystore
-    try {
-      const testCommand = `keytool -list -keystore "${keystorePath}" -storepass "${keystoreConfig.storePassword}" -alias "${keystoreConfig.keyAlias}"`;
-      (0, _utils.runCommand)(testCommand);
-      progress.log("New keystore verified successfully", "success");
-    } catch (testError) {
-      throw new Error(`Created keystore failed verification: ${testError.message}`);
-    }
-    progress.log(`Keystore created at: ${keystorePath}`, "note");
-    progress.log(`Key alias: ${keystoreConfig.keyAlias}`, "info");
-    progress.log(`Validity: ${keystoreConfig.validityYears || 25} years`, "info");
-    progress.log(`Store type: PKCS12`, "info");
-    return keystorePath;
-  } catch (error) {
-    throw new Error(`Failed to create keystore: ${error.message}`);
-  }
+/** "> Task :app:bundleRelease" becomes "app:bundleRelease"; null otherwise. */
+function gradleTask(line) {
+  const match = /^>\s*Task\s+:(\S+)/.exec(String(line).trim());
+  return match ? match[1] : null;
 }
-async function createSignedAAB(projectPaths, androidConfig, keystorePath) {
+
+/**
+ * Generate the release webview config and build the signed bundle inside the
+ * temp copy. Two Gradle runs: the manifest's allowBackup placeholder is read
+ * from webview_config.properties while Gradle configures the project, so the
+ * file must exist before bundleRelease is configured.
+ *
+ * Signing and version values arrive in `gradle.env` as ORG_GRADLE_PROJECT_*
+ * variables; nothing secret is put on the command line.
+ */
+async function createSignedAAB(projectPaths, androidConfig) {
   const {
     newProjectPath
   } = projectPaths;
   const {
-    keystoreConfig
+    gradle
   } = androidConfig;
-  if (!keystoreConfig || !keystorePath) {
-    throw new Error("Keystore configuration and keystore path are required for signed AAB creation");
+  if (!gradle || !gradle.configPath || !gradle.env) {
+    throw new Error("A resolved config and upload key are required to build the signed AAB");
   }
   progress.log("Building signed Android App Bundle (AAB)...", "info");
-  try {
-    // Verify keystore exists
-    if (!_fs.default.existsSync(keystorePath)) {
-      throw new Error(`Keystore not found at: ${keystorePath}`);
-    }
-
-    // Get absolute path for the project directory
-    const absoluteProjectPath = _path.default.resolve(newProjectPath);
-
-    // Change to project directory
-    const originalCwd = process.cwd();
-    process.chdir(absoluteProjectPath);
-    progress.log(`Changed to project directory: ${absoluteProjectPath}`, "info");
-
-    // Verify gradlew exists using absolute path
-    const gradlewPath = _path.default.join(absoluteProjectPath, "gradlew");
-    progress.log(`Looking for gradlew at: ${gradlewPath}`, "info");
-    if (!_fs.default.existsSync(gradlewPath)) {
-      // List files in the project directory for debugging
-      try {
-        const files = _fs.default.readdirSync(absoluteProjectPath);
-        progress.log(`Files in project directory: ${files.join(", ")}`, "info");
-
-        // Check if there's a gradlew file with different permissions or name
-        const gradlewFiles = files.filter(file => file.toLowerCase().includes("gradle"));
-        if (gradlewFiles.length > 0) {
-          progress.log(`Found gradle-related files: ${gradlewFiles.join(", ")}`, "info");
-        }
-      } catch (listError) {
-        progress.log(`Could not list directory contents: ${listError.message}`, "warning");
-      }
-      throw new Error(`gradlew not found at: ${gradlewPath}. Ensure this is a valid Android project.`);
-    }
-
-    // Make gradlew executable
-    try {
-      ;
-      (0, _utils.runCommand)(`chmod +x ./gradlew`);
-    } catch (chmodError) {
-      progress.log(`Warning: Could not make gradlew executable: ${chmodError.message}`, "warning");
-    }
-    try {
-      // Clean previous builds
-      progress.log("Cleaning previous builds...", "info");
-      try {
-        ;
-        (0, _utils.runCommand)("./gradlew clean");
-        progress.log("Clean completed successfully", "success");
-      } catch (cleanError) {
-        progress.log(`Warning: Clean failed: ${cleanError.message}`, "warning");
-        // Continue anyway as this might not be critical
-      }
-
-      // Build signed AAB with PKCS12-compatible parameters
-      progress.log("Building signed AAB...", "info");
-
-      // For PKCS12 keystores, use store password for both store and key
-      const effectiveKeyPassword = keystoreConfig.storePassword;
-      const bundleCommand = ["./gradlew bundleRelease --console=plain", `-Pandroid.injected.signing.store.file="${keystorePath}"`, `-Pandroid.injected.signing.store.password="${keystoreConfig.storePassword}"`, `-Pandroid.injected.signing.key.alias="${keystoreConfig.keyAlias}"`, `-Pandroid.injected.signing.key.password="${effectiveKeyPassword}"`].join(" ");
-
-      // Never log this command as-is: it carries the keystore and key
-      // passwords, which would put them in the terminal and in CI logs.
-      progress.log("Executing: ./gradlew bundleRelease (signing args redacted)", "info");
-      (0, _utils.runCommand)(bundleCommand);
-      progress.log("Bundle build completed", "success");
-
-      // Find the generated AAB file
-      const aabPath = _path.default.join(newProjectPath, "app", "build", "outputs", "bundle", "release", "app-release.aab");
-      progress.log(`Looking for AAB file at: ${aabPath}`, "info");
-      if (!_fs.default.existsSync(aabPath)) {
-        // Try to find AAB files in the build output directory
-        const bundleDir = _path.default.join(newProjectPath, "app", "build", "outputs", "bundle");
-        progress.log(`AAB not found at expected location. Checking bundle directory: ${bundleDir}`, "warning");
-        if (_fs.default.existsSync(bundleDir)) {
-          try {
-            const findAabCommand = `find "${bundleDir}" -name "*.aab" -type f`;
-            const foundAabs = (0, _utils.runCommand)(findAabCommand);
-            if (foundAabs.trim()) {
-              progress.log(`Found AAB files: ${foundAabs.trim()}`, "info");
-            } else {
-              progress.log("No AAB files found in bundle directory", "warning");
-            }
-          } catch (findError) {
-            progress.log(`Error searching for AAB files: ${findError.message}`, "warning");
-          }
-        }
-        throw new Error("Signed AAB file was not generated successfully");
-      }
-
-      // Get file size
-      const stats = _fs.default.statSync(aabPath);
-      const fileSizeMB = (stats.size / (1024 * 1024)).toFixed(2);
-      progress.log(`Signed AAB created successfully!`, "success");
-      progress.log(`AAB location: ${aabPath}`, "info");
-      progress.log(`AAB size: ${fileSizeMB} MB`, "info");
-
-      // Optionally copy AAB to a more accessible location
-      const outputDir = _path.default.join(newProjectPath, "release");
-      if (!_fs.default.existsSync(outputDir)) {
-        _fs.default.mkdirSync(outputDir, {
-          recursive: true
-        });
-      }
-      const outputAabPath = _path.default.join(outputDir, `${androidConfig.newProjectName}-release.aab`);
-      _fs.default.copyFileSync(aabPath, outputAabPath);
-      progress.log(`AAB copied to: ${outputAabPath}`, "success");
-      return {
-        aabPath,
-        outputAabPath,
-        fileSize: fileSizeMB
-      };
-    } finally {
-      // Restore original working directory
-      process.chdir(originalCwd);
-    }
-  } catch (error) {
-    throw new Error(`Failed to create signed AAB: ${error.message}`);
-  }
+  const absoluteProjectPath = _path.default.resolve(newProjectPath);
+  const gradlewPath = _path.default.join(absoluteProjectPath, "gradlew");
+  if (!_fs.default.existsSync(gradlewPath)) {
+    throw new Error(`gradlew not found at: ${gradlewPath}. Ensure this is a valid Android project.`);
+  }
+  _fs.default.chmodSync(gradlewPath, 0o755);
+  const common = [`-PconfigPath=${gradle.configPath}`, "-PcatalystBuildType=release", "--console=plain"];
+  const run = args => (0, _utils.runInteractiveCommand)(gradlewPath, args, {}, {
+    env: gradle.env,
+    cwd: absoluteProjectPath,
+    onLine: line => progress.status(gradleTask(line))
+  });
+  progress.log("Generating the release webview configuration...", "info");
+  await run(["generateWebViewConfig", `-PbuildOptimisation=${Boolean(gradle.buildOptimisation)}`, ...common]);
+  progress.log("Building signed AAB (clean bundleRelease)...", "info");
+  await run(["clean", "bundleRelease", ...common]);
+  progress.log("Bundle build completed", "success");
+  const aabPath = _path.default.join(newProjectPath, "app", "build", "outputs", "bundle", "release", "app-release.aab");
+  if (!_fs.default.existsSync(aabPath)) {
+    throw new Error(`Signed AAB file was not generated at ${aabPath}`);
+  }
+  const stats = _fs.default.statSync(aabPath);
+  const fileSizeMB = (stats.size / (1024 * 1024)).toFixed(2);
+  progress.log(`Signed AAB created (${fileSizeMB} MB)`, "success");
+  return {
+    aabPath,
+    outputAabPath: aabPath,
+    fileSize: fileSizeMB
+  };
 }
 async function initializeConfig(configPath) {
   if (!configPath) {
@@ -539,7 +413,8 @@ async function createTempDeploymentProject(projectPaths, androidConfig) {
   progress.log("Creating temporary deployment project...", "info");
 
   // Create a temporary directory based on package name (if available) or timestamp
-  const tempDirSuffix = packageName ? packageName.replace(/\./g, "_") : Date.now().toString();
+  // Only [A-Za-z0-9_] in the name: the path reaches shell commands below.
+  const tempDirSuffix = packageName ? packageName.replace(/[^A-Za-z0-9_]/g, "_") : Date.now().toString();
   const tempDir = _path.default.join(_path.default.dirname(oldProjectPath), `temp_build_${tempDirSuffix}`);
 
   // Remove existing temp directory with same name if it exists
@@ -604,10 +479,13 @@ async function createTempDeploymentProject(projectPaths, androidConfig) {
       path: "app/src/main/AndroidManifest.xml",
       desc: "Android manifest"
     }];
+
+    // Both the Groovy and the Kotlin DSL names are listed, so one of each
+    // pair is always absent: info, not a warning.
     filesToCheck.forEach(file => {
       const fullPath = _path.default.join(tempDir, file.path);
       const exists = _fs.default.existsSync(fullPath);
-      progress.log(`  ${file.desc}: ${exists ? "found" : "not found"}`, exists ? "info" : "warning");
+      progress.log(`  ${file.desc}: ${exists ? "found" : "not found"}`, "info");
     });
 
     // List all files in temp directory for debugging
@@ -637,8 +515,8 @@ async function createTempDeploymentProject(projectPaths, androidConfig) {
       for (const dir of dirsToRename) {
         const newDirName = dir.split(oldProjectName).join(newProjectName);
         if (dir !== newDirName) {
-          ;
-          (0, _utils.runCommand)(`mv "${dir}" "${newDirName}"`);
+          // fs, not a shell: newProjectName comes from the app's config.
+          _fs.default.renameSync(dir, newDirName);
           progress.log(`Renamed subdirectory: ${_path.default.basename(dir)} → ${_path.default.basename(newDirName)}`, "success");
         }
       }
@@ -655,29 +533,21 @@ async function finalizeAABAndCleanup(projectPaths, androidConfig, aabResult, tem
   } = projectPaths;
   progress.log("Finalizing AAB and cleaning up temporary files...", "info");
   try {
-    // Create final output directory next to original project
-    const outputDir = androidConfig.outputPath || _path.default.join(_path.default.dirname(oldProjectPath), "build-output");
+    // buildApp:android passes the exact destination
+    // (build-output/android/<version>-<build>/<name>.aab). Run on its
+    // own, this script keeps its dated name in the output folder.
+    const timestamp = new Date().toISOString().replace(/[:.]/g, "-").split("T")[0];
+    const finalAabPath = androidConfig.finalAabPath || _path.default.join(androidConfig.outputPath || _path.default.join(_path.default.dirname(oldProjectPath), "build-output"), `${androidConfig.newProjectName}-release-${timestamp}.aab`);
+    const outputDir = _path.default.dirname(finalAabPath);
+    const finalAabName = _path.default.basename(finalAabPath);
     if (!_fs.default.existsSync(outputDir)) {
       _fs.default.mkdirSync(outputDir, {
         recursive: true
       });
       progress.log(`Created output directory: ${outputDir}`, "success");
     }
-
-    // Copy AAB to final location with descriptive name
-    const timestamp = new Date().toISOString().replace(/[:.]/g, "-").split("T")[0];
-    const finalAabName = `${androidConfig.newProjectName}-release-${timestamp}.aab`;
-    const finalAabPath = _path.default.join(outputDir, finalAabName);
     _fs.default.copyFileSync(aabResult.outputAabPath, finalAabPath);
-    progress.log(`AAB saved to: ${finalAabPath}`, "note");
-
-    // Copy keystore to output directory for future use
-    const keystorePath = _path.default.join(tempDeploymentPath, "app", "keystore.jks");
-    if (_fs.default.existsSync(keystorePath)) {
-      const finalKeystorePath = _path.default.join(outputDir, `${androidConfig.newProjectName}-keystore.jks`);
-      _fs.default.copyFileSync(keystorePath, finalKeystorePath);
-      progress.log(`Keystore copied to: ${finalKeystorePath}`, "success");
-    }
+    progress.log(`AAB saved to: ${finalAabPath}`, "success");
 
     // Clean up temporary deployment directory
     await cleanupTempDeployment(tempDeploymentPath);
@@ -743,19 +613,21 @@ async function updateFileContents(projectPaths, androidConfig) {
             const newPackageDir = _path.default.dirname(newPackagePath);
             _fs.default.mkdirSync(newPackageDir, {
               recursive: true
-            })
+            });
 
             // Move source files
-;
-            (0, _utils.runCommand)(`mv "${oldPackagePath}" "${newPackagePath}"`);
+            // fs, not a shell: the path is built from the app id.
+            _fs.default.renameSync(oldPackagePath, newPackagePath);
             progress.log(`Moved ${sourceSet} source files to: ${newPackagePath}`, "success");
           } else {
             progress.log(`Package path unchanged for ${sourceSet}; skipping source directory move`, "info");
           }
 
           // Update package declarations in source files
-          const findCommand = `find "${newPackagePath}" -type f \\( -name "*.kt" -o -name "*.java" \\)`;
-          const sourceFiles = (0, _utils.runCommand)(findCommand).trim().split("\n").filter(f => f.trim());
+          const sourceFiles = _fs.default.readdirSync(newPackagePath, {
+            recursive: true,
+            withFileTypes: true
+          }).filter(entry => entry.isFile() && /\.(kt|java)$/.test(entry.name)).map(entry => _path.default.join(entry.parentPath || entry.path, entry.name));
           let updatedCount = 0;
           for (const file of sourceFiles) {
             let content = _fs.default.readFileSync(file, "utf8");
@@ -812,8 +684,7 @@ async function updateFileContents(projectPaths, androidConfig) {
       for (const file of filesToRename) {
         const newFileName = file.split(oldProjectName).join(newProjectName);
         if (file !== newFileName) {
-          ;
-          (0, _utils.runCommand)(`mv "${file}" "${newFileName}"`);
+          _fs.default.renameSync(file, newFileName);
           progress.log(`Renamed file: ${_path.default.basename(file)} → ${_path.default.basename(newFileName)}`, "success");
         }
       }
@@ -850,7 +721,26 @@ async function updateFileContents(projectPaths, androidConfig) {
     throw new Error(`Error updating file contents: ${error.message}`);
   }
 }
-async function buildAndroidAAB(configPathOrConfig) {
+
+/**
+ * Build the signed AAB in a renamed temp copy of the Android project.
+ *
+ * @param {string | object} configPathOrConfig - a config.json path, or the config object buildApp:android builds
+ * @param {object} [options]
+ * @param {object} [options.progress] - the caller's TerminalProgress, with a step running; see nestedProgress
+ */
+async function buildAndroidAAB(configPathOrConfig, {
+  progress: outer
+} = {}) {
+  const previous = progress;
+  if (outer) progress = nestedProgress(outer);
+  try {
+    return await runAABBuild(configPathOrConfig);
+  } finally {
+    progress = previous;
+  }
+}
+async function runAABBuild(configPathOrConfig) {
   let androidConfig;
   let projectPaths;
   let backupPath;
@@ -909,44 +799,19 @@ async function buildAndroidAAB(configPathOrConfig) {
       newProjectPath: tempDeploymentPath
     }, androidConfig);
     progress.complete("updateFileContents");
-
-    // Create keystore if needed
-    progress.start("createKeystore");
-    const keystorePath = await createKeystore({
+    progress.start("createSignedAAB");
+    let aabResult = await createSignedAAB({
       ...projectPaths,
       newProjectPath: tempDeploymentPath
     }, androidConfig);
-    progress.complete("createKeystore");
-
-    // Create signed AAB if keystore was created/found and enabled in config
-    let aabResult = null;
-    if (keystorePath && androidConfig.createSignedAAB) {
-      progress.start("createSignedAAB");
-      aabResult = await createSignedAAB({
-        ...projectPaths,
-        newProjectPath: tempDeploymentPath
-      }, androidConfig, keystorePath);
-      progress.complete("createSignedAAB");
+    progress.complete("createSignedAAB");
 
-      // Copy AAB to final location and cleanup temp deployment
-      if (aabResult) {
-        progress.start("finalizeAAB");
-        aabResult = await finalizeAABAndCleanup(projectPaths, androidConfig, aabResult, tempDeploymentPath);
-        progress.complete("finalizeAAB");
-      }
-    } else if (!androidConfig.createSignedAAB) {
-      progress.log("Signed AAB creation skipped (not enabled in config)", "info");
-      // DON'T Clean up temp deployment - keep it for verification
-      progress.log(`Temp renamed project kept at: ${tempDeploymentPath}`, "info");
-      // await cleanupTempDeployment(tempDeploymentPath)
-    } else if (!keystorePath) {
-      progress.log("Signed AAB creation skipped (no keystore available)", "warning");
-      // DON'T Clean up temp deployment - keep it for verification
-      progress.log(`Temp renamed project kept at: ${tempDeploymentPath}`, "info");
-      // await cleanupTempDeployment(tempDeploymentPath)
-    }
+    // Copy AAB to final location and cleanup temp deployment
+    progress.start("finalizeAAB");
+    aabResult = await finalizeAABAndCleanup(projectPaths, androidConfig, aabResult, tempDeploymentPath);
+    progress.complete("finalizeAAB");
 
-    // Print completion summary
+    // Completion summary, standalone only: buildApp:android prints its own.
     progress.printTreeContent("Build Summary", ["Android AAB build completed successfully:", {
       text: `Original project: ${projectPaths.oldProjectPath}`,
       indent: 1,
@@ -972,11 +837,6 @@ async function buildAndroidAAB(configPathOrConfig) {
       indent: 1,
       prefix: "├─ ",
       color: "gray"
-    }, {
-      text: `Keystore: ${keystorePath ? "Created/Verified" : "Skipped"}`,
-      indent: 1,
-      prefix: "├─ ",
-      color: "gray"
     }, {
       text: `Signed AAB: ${aabResult ? "Created" : "Skipped"}`,
       indent: 1,
@@ -1008,92 +868,17 @@ async function buildAndroidAAB(configPathOrConfig) {
       prefix: "└─ ",
       color: "gray"
     }])]);
-    process.exit(0);
+    return aabResult;
   } catch (error) {
     // Clean up temp deployment on error
     if (tempDeploymentPath) {
       await cleanupTempDeployment(tempDeploymentPath);
     }
-    if (progress.currentStep) {
-      progress.fail(progress.currentStep.id, error.message);
-      progress.printTreeContent("Troubleshooting Guide", ["Build operation failed. Please check the following:", {
-        text: "Verify config file exists and contains required android configuration",
-        indent: 1,
-        prefix: "├─ ",
-        color: "yellow"
-      }, {
-        text: "Ensure project path exists and is accessible",
-        indent: 1,
-        prefix: "├─ ",
-        color: "yellow"
-      }, {
-        text: "Check file/directory permissions",
-        indent: 1,
-        prefix: "├─ ",
-        color: "yellow"
-      }, {
-        text: "Verify no processes are using the project directory",
-        indent: 1,
-        prefix: "├─ ",
-        color: "yellow"
-      }, {
-        text: "Ensure sufficient disk space for project copy",
-        indent: 1,
-        prefix: "├─ ",
-        color: "yellow"
-      }, {
-        text: 'Update keystore passwords (do not use "your_store_password")',
-        indent: 1,
-        prefix: "└─ ",
-        color: "yellow"
-      }, "\nConfiguration Details:", {
-        text: `Config: ${typeof configPathOrConfig === "string" ? configPathOrConfig : "Direct object from buildAppAndroid.js"}`,
-        indent: 1,
-        prefix: "├─ ",
-        color: "gray"
-      }, {
-        text: `Project path: ${androidConfig?.projectPath || "Not loaded"}`,
-        indent: 1,
-        prefix: "├─ ",
-        color: "gray"
-      }, {
-        text: `Deployment path: ${androidConfig?.deploymentPath || "Not loaded"}`,
-        indent: 1,
-        prefix: "├─ ",
-        color: "gray"
-      }, {
-        text: `Old project name: ${androidConfig?.oldProjectName || "Not loaded"}`,
-        indent: 1,
-        prefix: "├─ ",
-        color: "gray"
-      }, {
-        text: `New project name: ${androidConfig?.newProjectName || "Not loaded"}`,
-        indent: 1,
-        prefix: "├─ ",
-        color: "gray"
-      }, {
-        text: `Overwrite existing: ${androidConfig?.overwriteExisting !== undefined ? androidConfig.overwriteExisting : "Not loaded"}`,
-        indent: 1,
-        prefix: "└─ ",
-        color: "gray"
-      }, "\nFor keystore issues, ensure your config has:", {
-        text: "Real passwords (not placeholder values)",
-        indent: 1,
-        prefix: "├─ ",
-        color: "cyan"
-      }, {
-        text: "Valid organization information",
-        indent: 1,
-        prefix: "├─ ",
-        color: "cyan"
-      }, {
-        text: "Consistent store and key passwords for PKCS12",
-        indent: 1,
-        prefix: "└─ ",
-        color: "cyan"
-      }]);
-    }
-    process.exit(1);
+
+    // The caller (buildApp:android) prints the full diagnostic, including
+    // Gradle's own error, from `error.output`.
+    if (progress.currentStep) progress.fail(progress.currentStep.id, error.message);
+    throw error;
   }
 }