catalyst-core 1.0.2-canary.1 → 1.0.2

package/dist/native/renameAndroidProject.js

@@ -4,6 +4,7 @@
 var _fs = _interopRequireDefault(require("fs"));
 var _path = _interopRequireDefault(require("path"));
 var _utils = require("./utils.js");
+var _theme = require("../cli/theme.js");
 function _interopRequireDefault(e) {
   return e && e.__esModule ? e : {
     default: e
@@ -15,27 +16,45 @@ class SimpleProgress {
   constructor(title) {
     this.title = title;
     this.currentStep = null;
-    console.log(`\n=== ${title} ===\n`);
+    this.startedAt = 0;
+    // Deferred: this module is imported by the Android build, which prints
+    // its own header. Printing here on import produced two headers, the
+    // first of them for work that had not started and often never runs.
+    this.headerShown = false;
+  }
+  ensureHeader() {
+    if (this.headerShown) return;
+    this.headerShown = true;
+    console.log(_theme.header(this.title));
   }
   start(stepId) {
+    this.ensureHeader();
     this.currentStep = {
       id: stepId
     };
-    console.log(`⏳ Starting: ${stepId}`);
+    this.startedAt = Date.now();
+    console.log(`${_theme.GUTTER}${_theme.t.accent(_theme.glyph.running)} ${stepId}`);
   }
   complete(stepId) {
-    console.log(`✅ Completed: ${stepId}`);
+    this.ensureHeader();
+    console.log(_theme.step(stepId, this.startedAt ? Date.now() - this.startedAt : null));
     this.currentStep = null;
   }
   fail(stepId, message) {
-    console.log(`❌ Failed: ${stepId} - ${message}`);
+    this.ensureHeader();
+    console.log(_theme.step(stepId, null, "fail"));
+    // Backstop: runCommand already scrubs its errors, but this is where any
+    // failure in the signing flow ends up on screen.
+    if (message) console.log(`${_theme.GUTTER}${_theme.t.dim(_theme.glyph.last)} ${_theme.t.bad((0, _utils.redactSecrets)(message))}`);
   }
   log(message, type = "info") {
-    const prefix = type === "error" ? "❌" : type === "warning" ? "⚠️ " : type === "success" ? "✅" : "ℹ️ ";
-    console.log(`  ${prefix} ${message}`);
+    this.ensureHeader();
+    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}`);
   }
   printTreeContent(title, items) {
-    console.log(`\n📋 ${title}:`);
+    this.ensureHeader();
+    console.log(`\n${_theme.GUTTER}${_theme.t.bold(title)}`);
     items.forEach(item => {
       if (typeof item === "string") {
         console.log(item);
@@ -142,7 +161,7 @@ async function createKeystore(projectPaths, androidConfig) {
     } catch (testError) {
       throw new Error(`Created keystore failed verification: ${testError.message}`);
     }
-    progress.log(`Keystore created successfully at: ${keystorePath}`, "success");
+    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");
@@ -220,8 +239,11 @@ async function createSignedAAB(projectPaths, androidConfig, keystorePath) {
 
       // For PKCS12 keystores, use store password for both store and key
       const effectiveKeyPassword = keystoreConfig.storePassword;
-      const bundleCommand = ["./gradlew bundleRelease --quiet --console=rich", `-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(" ");
-      progress.log(`Executing: ${bundleCommand}`, "info");
+      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");
 
@@ -404,10 +426,10 @@ async function diagnoseAndroidProject(projectPath) {
         ...pattern,
         foundFile
       });
-      progress.log(`✅ Found: ${pattern.description}${foundFile ? ` (${foundFile})` : ""}`, "success");
+      progress.log(`Found: ${pattern.description}${foundFile ? ` (${foundFile})` : ""}`, "success");
     } else {
       diagnostics.missingFiles.push(pattern);
-      progress.log(`❌ Missing: ${pattern.description}`, "warning");
+      progress.log(`Missing: ${pattern.description}`, "warning");
     }
   }
 
@@ -585,7 +607,7 @@ async function createTempDeploymentProject(projectPaths, androidConfig) {
     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"}`, exists ? "info" : "warning");
     });
 
     // List all files in temp directory for debugging
@@ -647,7 +669,7 @@ async function finalizeAABAndCleanup(projectPaths, androidConfig, aabResult, tem
     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 final location: ${finalAabPath}`, "success");
+    progress.log(`AAB saved to: ${finalAabPath}`, "note");
 
     // Copy keystore to output directory for future use
     const keystorePath = _path.default.join(tempDeploymentPath, "app", "keystore.jks");
@@ -704,7 +726,7 @@ async function updateFileContents(projectPaths, androidConfig) {
         content = content.replace(/namespace = "io\.yourname\.androidproject"/g, `namespace = "${packageName}"`);
         content = content.replace(/applicationId = "io\.yourname\.androidproject"/g, `applicationId = "${packageName}"`);
         _fs.default.writeFileSync(buildGradlePath, content, "utf8");
-        progress.log(`✅ Updated build.gradle.kts with package: ${packageName}`, "success");
+        progress.log(`Updated build.gradle.kts with package: ${packageName}`, "success");
       }
 
       // Update source directory structure for all source sets
@@ -726,7 +748,7 @@ async function updateFileContents(projectPaths, androidConfig) {
             // Move source files
 ;
             (0, _utils.runCommand)(`mv "${oldPackagePath}" "${newPackagePath}"`);
-            progress.log(`✅ Moved ${sourceSet} source files to: ${newPackagePath}`, "success");
+            progress.log(`Moved ${sourceSet} source files to: ${newPackagePath}`, "success");
           } else {
             progress.log(`Package path unchanged for ${sourceSet}; skipping source directory move`, "info");
           }
@@ -744,7 +766,7 @@ async function updateFileContents(projectPaths, androidConfig) {
             }
           }
           totalUpdatedFiles += updatedCount;
-          progress.log(`✅ Updated package declarations in ${updatedCount} ${sourceSet} files`, "success");
+          progress.log(`Updated package declarations in ${updatedCount} ${sourceSet} files`, "success");
 
           // Clean up old empty directories
           try {
@@ -756,7 +778,7 @@ async function updateFileContents(projectPaths, androidConfig) {
         }
       }
       if (totalUpdatedFiles > 0) {
-        progress.log(`✅ Total package declarations updated: ${totalUpdatedFiles} files`, "success");
+        progress.log(`Total package declarations updated: ${totalUpdatedFiles} files`, "success");
       }
 
       // Update AndroidManifest.xml
@@ -766,7 +788,7 @@ async function updateFileContents(projectPaths, androidConfig) {
         if (content.includes(OLD_PACKAGE)) {
           content = content.replace(new RegExp(OLD_PACKAGE, "g"), packageName);
           _fs.default.writeFileSync(manifestPath, content, "utf8");
-          progress.log(`✅ Updated AndroidManifest.xml with package: ${packageName}`, "success");
+          progress.log(`Updated AndroidManifest.xml with package: ${packageName}`, "success");
         }
       }
 
@@ -777,7 +799,7 @@ async function updateFileContents(projectPaths, androidConfig) {
         if (content.includes(OLD_PACKAGE)) {
           content = content.replace(new RegExp(OLD_PACKAGE.replace(/\./g, "\\."), "g"), packageName);
           _fs.default.writeFileSync(proguardPath, content, "utf8");
-          progress.log(`✅ Updated proguard-rules.pro with package: ${packageName}`, "success");
+          progress.log(`Updated proguard-rules.pro with package: ${packageName}`, "success");
         }
       }
     }

package/dist/native/setupEmulatorIos.js

@@ -11,22 +11,16 @@ const {
 } = require("./setupServer.js");
 const ITEMS_PER_PAGE = 10;
 const steps = {
-  platform: "Check Platform Compatibility",
-  config: "Initialize Configuration",
-  simulator: "Configure iOS Simulator",
-  launch: "Launch iOS Simulator",
-  saveConfig: "Saving configuration",
-  setupServer: "Setup Server"
+  platform: "Check platform compatibility",
+  config: "Initialize configuration",
+  simulator: "Configure iOS simulator",
+  launch: "Launch iOS simulator",
+  saveConfig: "Save configuration",
+  setupServer: "Set up server"
 };
-const progressPaddingConfig = {
-  titlePaddingTop: 2,
-  titlePaddingBottom: 1,
-  stepPaddingLeft: 4,
-  stepSpacing: 1,
-  errorPaddingLeft: 6,
-  bottomMargin: 2
-};
-const progress = new _terminalProgress.default(steps, "Catalyst Universal Ios Setup", progressPaddingConfig);
+const progress = new _terminalProgress.default(steps, "catalyst setupEmulator", {
+  subject: "ios"
+});
 async function initializeConfig() {
   const configFile = _fs.default.readFileSync(configPath, "utf8");
   const config = JSON.parse(configFile);
@@ -72,7 +66,7 @@ async function setupIOSEnvironment() {
   try {
     progress.start("platform");
     if (process.platform !== "darwin") {
-      progress.log("iOS Simulator is only available on macOS.");
+      progress.log("iOS Simulator is only available on macOS.", "error");
       process.exit(1);
     }
     progress.complete("platform");
@@ -91,40 +85,26 @@ async function setupIOSEnvironment() {
     const config = await (0, _utils.validateAndCompleteConfig)("ios", configPath);
     progress.complete("saveConfig");
     progress.start("setupServer");
-    await setupServer(configPath);
-    progress.start("setupServer");
-    progress.printTreeContent("Configuration Explanation", ["WEBVIEW_CONFIG: Main configuration object for the WebView setup", {
-      text: "port: Port number for the WebView server",
-      indent: 1,
-      prefix: "├─ ",
-      color: "gray"
-    }, {
-      text: "ios: iOS-specific configuration",
-      indent: 1,
-      prefix: "└─ ",
-      color: "gray"
-    }, {
-      text: "buildType: Build type (debug/release)",
-      indent: 2,
-      prefix: "├─ ",
+    await setupServer(configPath, message => progress.log(message, "info"));
+    progress.complete("setupServer");
+    const iosCfg = config.ios || {};
+    progress.printTreeContent("Config  config/config.json", [{
+      text: `port            ${config.port ?? ""}`,
       color: "gray"
     }, {
-      text: "appBundleId: iOS application bundle identifier",
-      indent: 2,
-      prefix: "├─ ",
+      text: `appBundleId     ${iosCfg.appBundleId ?? ""}`,
       color: "gray"
     }, {
-      text: "simulatorName: Selected iOS simulator name",
-      indent: 2,
-      prefix: "└─ ",
+      text: `simulatorName   ${iosCfg.simulatorName ?? ""}`,
       color: "gray"
     }]);
-    progress.printTreeContent("Final Configuration", [JSON.stringify(config, null, 2)]);
+    progress.summary("Ready", "Run catalyst buildApp:ios to install the app");
     process.exit(0);
   } catch (error) {
     if (progress.currentStep) {
       progress.fail(progress.currentStep.id, error.message);
     }
+    progress.hint(error.hint);
     process.exit(1);
   }
 }
@@ -147,13 +127,13 @@ async function getRuntime() {
   if (!availableRuntime) {
     const runningSimulators = (0, _child_process.execSync)("xcrun simctl list devices booted").toString();
     if (runningSimulators.includes("(Booted)") && parsedRuntimes.length > 0) {
-      console.log(`Using runtime: ${parsedRuntimes[0].name}`);
+      progress.status(`runtime ${parsedRuntimes[0].name}`);
       return parsedRuntimes[0];
     }
-    console.error("No available iOS runtime found. Please install one through Xcode.");
+    progress.log("No available iOS runtime found. Install one through Xcode.", "error");
     process.exit(1);
   }
-  console.log(`Using runtime: ${availableRuntime.name}`);
+  progress.status(`runtime ${availableRuntime.name}`);
   return availableRuntime;
 }
 async function configureSimulator(config) {
@@ -269,7 +249,7 @@ function resolveSimulatorAppBundleId() {
 // instead of throwing.
 const SIMULATOR_APP_NOT_FOUND_WARNING = "[IOS-001] Could not find an installed iOS Simulator app (checked DeviceHub.app and the legacy Simulator.app). " + "The simulator is booted but its window may not be visible. Suggested action: confirm a full Xcode.app is installed and selected via xcode-select -p, then open it once from Spotlight.";
 async function launchIOSSimulator(simulatorName) {
-  progress.log("Launching iOS Simulator...");
+  progress.status("launching simulator");
   try {
     // Get all simulators including both available and booted ones
     const allSimulatorInfo = (0, _child_process.execSync)("xcrun simctl list devices -j").toString();
@@ -301,20 +281,20 @@ async function launchIOSSimulator(simulatorName) {
       });
     });
     if (!foundSimulator) {
-      console.log(`Configured simulator "${simulatorName}" not found.`);
+      progress.log(`Configured simulator "${simulatorName}" not found`, "warning");
       return;
     }
     if (!isBooted) {
-      console.log(`Booting simulator: ${simulatorName}`);
+      progress.status(`booting ${simulatorName}`);
       (0, _utils.runCommand)(`xcrun simctl boot ${foundSimulatorId}`);
     } else {
-      console.log(`Simulator ${simulatorName} is already booted`);
+      progress.status("already booted");
     }
 
     // Open the simulator UI (DeviceHub on Xcode 27+, Simulator.app on older Xcode) and focus it
     const simulatorAppBundleId = resolveSimulatorAppBundleId();
     if (simulatorAppBundleId) {
-      progress.log("Opening simulator UI...");
+      progress.status("opening simulator");
       (0, _utils.runCommand)(`open -b ${simulatorAppBundleId}`);
 
       // Give the simulator a moment to open/focus
@@ -325,9 +305,8 @@ async function launchIOSSimulator(simulatorName) {
     } else {
       progress.log(SIMULATOR_APP_NOT_FOUND_WARNING, "warning");
     }
-    console.log("iOS Simulator launched successfully.");
   } catch (error) {
-    console.error("Failed to launch iOS Simulator. Error:", error.message);
+    progress.log(`Failed to launch iOS Simulator: ${error.message}`, "error");
   }
   // process.exit(0);
 }

package/dist/native/setupServer.js

@@ -44,14 +44,12 @@ async function isServerRunning(port) {
  * Start server in background using npm start
  */
 function startServerBackground() {
-  console.log("Starting server in background...");
   const serverProcess = exec("npm start", {
     detached: true,
     stdio: "ignore"
   });
   if (serverProcess.pid) {
     serverProcess.unref(); // Allow parent to exit
-    console.log("Server started in background");
   }
 }
 
@@ -90,7 +88,6 @@ function replaceIPInObject(obj, localIP, path = "") {
         shouldUpdate = true;
       }
       if (shouldUpdate && newValue !== value) {
-        console.log(`Updating ${currentPath}: ${value} -> ${newValue}`);
         obj[key] = newValue;
         updated = true;
       }
@@ -106,7 +103,7 @@ function replaceIPInObject(obj, localIP, path = "") {
 /**
  * Update config.json with current local IP address
  */
-function updateConfigWithLocalIP(configPath, localIP) {
+function updateConfigWithLocalIP(configPath, localIP, log = () => {}) {
   try {
     const config = JSON.parse(fs.readFileSync(configPath, "utf8"));
 
@@ -116,9 +113,7 @@ function updateConfigWithLocalIP(configPath, localIP) {
     // Write back if updated
     if (updated) {
       fs.writeFileSync(configPath, JSON.stringify(config, null, 2), "utf8");
-      console.log("Configuration updated with current IP address");
-    } else {
-      console.log("No IP addresses needed updating in configuration");
+      log(`Updated config addresses to ${localIP}`);
     }
     return config;
   } catch (error) {
@@ -132,15 +127,18 @@ function updateConfigWithLocalIP(configPath, localIP) {
  * @param {string} configPath - Path to config.json file
  * @returns {Promise<{serverURL: string, localIP: string, port: number}>}
  */
-async function setupServer(configPath) {
-  console.log("Setting up server...");
-
+/**
+ * @param {string} configPath
+ * @param {(message: string, type?: string) => void} [log] - progress sink.
+ *   Defaults to silence: this runs inside a progress sequence, where a stray
+ *   console.log lands at column 0 and collides with the live spinner row.
+ */
+async function setupServer(configPath, log = () => {}) {
   // Get local IP
   const localIP = getLocalIPAddress();
-  console.log(`Local IP: ${localIP}`);
 
   // Update config with current IP
-  const config = updateConfigWithLocalIP(configPath, localIP);
+  const config = updateConfigWithLocalIP(configPath, localIP, log);
 
   // Get port from config
   const port = config.WEBVIEW_CONFIG?.port || 3005;
@@ -149,14 +147,13 @@ async function setupServer(configPath) {
   // Check if server is running
   const running = await isServerRunning(port);
   if (!running) {
-    console.log(`Server not running on ${serverURL}, starting...`);
+    log(`Starting server at ${serverURL}`);
     startServerBackground();
     // Give it a moment to start
     await new Promise(resolve => setTimeout(resolve, 3000));
   } else {
-    console.log(`Server already running on ${serverURL}`);
+    log(`Server already running at ${serverURL}`);
   }
-  console.log(`Server setup complete: ${serverURL}`);
   return {
     serverURL,
     localIP,