catalyst-core 1.0.2-canary.1 → 1.0.2

package/dist/native/buildAndroid/index.js

@@ -1,11 +1,17 @@
 "use strict";
 
 const path = require("path");
+const {
+  displayPath
+} = require("../../cli/theme.js");
 const fs = require("fs");
 const {
   runCommand,
   runInteractiveCommand
 } = require("../utils.js");
+const {
+  buildFailure
+} = require("../../cli/diagnostic.js");
 const TerminalProgress = require("../terminalProgress.js").default;
 const {
   composeAndroidPlugins
@@ -21,20 +27,12 @@ const catalystCorePath = path.dirname(require.resolve("catalyst-core/package.jso
 const pwd = path.join(catalystCorePath, "dist/native");
 const ANDROID_PACKAGE = "io.yourname.androidproject";
 const steps = {
-  config: "Initialize Configuration",
-  tools: "Validate Android Tools",
-  emulator: "Check and Start Emulator",
-  copyAssets: "Copy Build Assets",
-  build: "Build and Install Application",
-  aab: "Build Signed AAB"
-};
-const progressConfig = {
-  titlePaddingTop: 2,
-  titlePaddingBottom: 1,
-  stepPaddingLeft: 4,
-  stepSpacing: 1,
-  errorPaddingLeft: 6,
-  bottomMargin: 2
+  config: "Initialize configuration",
+  tools: "Validate Android tools",
+  emulator: "Check and start emulator",
+  copyAssets: "Copy build assets",
+  build: "Build and install application",
+  aab: "Build signed AAB"
 };
 function createAndroidBuild(config) {
   const {
@@ -43,7 +41,9 @@ function createAndroidBuild(config) {
   } = config;
   const configPath = `${process.cwd()}/config/config.json`;
   const publicPath = `${process.cwd()}/public`;
-  const progress = new TerminalProgress(steps, "Catalyst Android Build", progressConfig);
+  const progress = new TerminalProgress(steps, "catalyst buildApp", {
+    subject: "android"
+  });
   const ctx = {
     WEBVIEW_CONFIG,
     BUILD_OUTPUT_PATH,
@@ -63,6 +63,7 @@ function createAndroidBuild(config) {
     copyBuildAssets,
     copySplashscreenAssets,
     copyOfflinePage,
+    copySplashHtml,
     copyIconAssets,
     configureAppName,
     processNotifications
@@ -152,6 +153,7 @@ function createAndroidBuild(config) {
       await copyBuildAssets(androidConfig, buildOptimisation);
       await copySplashscreenAssets();
       await copyOfflinePage();
+      await copySplashHtml();
       await copyIconAssets();
       await configureAppName(androidConfig);
       const pluginConfig = resolvePluginConfig(wvConfig);
@@ -178,188 +180,43 @@ function createAndroidBuild(config) {
         progress.complete("build");
         movedApkPath = await moveApkToOutputPath(buildType, bop, androidConfig.appName);
       }
-      const summaryItems = ["Build completed successfully:", {
-        text: `Build Type: ${buildType}`,
-        indent: 1,
-        prefix: "├─ ",
-        color: "gray"
-      }, {
-        text: `SDK Path: ${androidConfig.sdkPath}`,
-        indent: 1,
-        prefix: "├─ ",
-        color: "gray"
-      }, {
-        text: `Build Optimization: ${buildOptimisation ? "Enabled" : "Disabled"}`,
-        indent: 1,
-        prefix: "├─ ",
+
+      // Aligned key/value rows, matching the Config tree the setup
+      // commands print. printTreeContent draws the branch glyphs.
+      const deviceName = targetDevice?.type === "physical" ? targetDevice.model : `${androidConfig.emulatorName} emulator`;
+      const summaryItems = [{
+        text: `device     ${deviceName}`,
         color: "gray"
       }];
+      if (movedApkPath) {
+        summaryItems.push({
+          text: `artifact   ${displayPath(movedApkPath, process.cwd())}`,
+          color: "gray"
+        });
+      }
       if (buildType === "release") {
-        if (movedApkPath) {
-          summaryItems.push({
-            text: `APK Build Location: ${movedApkPath}`,
-            indent: 1,
-            prefix: "├─ ",
-            color: "green"
-          });
-        }
         summaryItems.push({
-          text: `Output: Signed AAB generated in build-output/`,
-          indent: 1,
-          prefix: "└─ ",
-          color: "green"
+          text: `output     Signed AAB in build-output/`,
+          color: "gray"
         });
-      } else {
-        if (movedApkPath) {
-          summaryItems.push({
-            text: `APK Build Location: ${movedApkPath}`,
-            indent: 1,
-            prefix: "├─ ",
-            color: "green"
-          });
-        }
-        if (targetDevice && targetDevice.type === "physical") {
-          summaryItems.push({
-            text: `Target Device: ${targetDevice.model} (Physical)`,
-            indent: 1,
-            prefix: "└─ ",
-            color: "green"
-          });
-        } else {
-          summaryItems.push({
-            text: `Target Device: ${androidConfig.emulatorName} (Emulator)`,
-            indent: 1,
-            prefix: "└─ ",
-            color: "gray"
-          });
-        }
       }
-      progress.printTreeContent("Build Summary", summaryItems);
+      summaryItems.push({
+        text: `build      ${buildType}${buildOptimisation ? ", optimised" : ""}`,
+        color: "gray"
+      });
+      progress.printTreeContent("Build", summaryItems);
+      progress.summary(`Installed on ${deviceName}`, "Run catalyst start to serve the app");
     } catch (error) {
-      if (progress.currentStep) {
-        progress.fail(progress.currentStep.id, error.message);
-        const troubleshootingItems = ["Build failed. Please try the following steps:", {
-          text: "Check if Android SDK is properly configured",
-          indent: 1,
-          prefix: "├─ ",
-          color: "yellow"
-        }, {
-          text: "Verify build assets exist in the source directory",
-          indent: 1,
-          prefix: "├─ ",
-          color: "yellow"
-        }];
-        const buildType = androidConfig?.buildType || "debug";
-        if (buildType !== "release") {
-          if (error.message.includes("physical device") || error.message.includes("installation test")) {
-            troubleshootingItems.push("\nPhysical Device Issues:", {
-              text: "Enable Developer Options on your device",
-              indent: 1,
-              prefix: "├─ ",
-              color: "yellow"
-            }, {
-              text: "Enable USB Debugging in Developer Options",
-              indent: 1,
-              prefix: "├─ ",
-              color: "yellow"
-            }, {
-              text: 'Accept the "Allow USB Debugging" prompt on your device',
-              indent: 1,
-              prefix: "├─ ",
-              color: "yellow"
-            }, {
-              text: "Try disconnecting and reconnecting your device",
-              indent: 1,
-              prefix: "├─ ",
-              color: "yellow"
-            }, {
-              text: 'Check if "adb devices" shows your device as authorized',
-              indent: 1,
-              prefix: "├─ ",
-              color: "yellow"
-            });
-          }
-          troubleshootingItems.push({
-            text: "Verify that the emulator exists and is working",
-            indent: 1,
-            prefix: "├─ ",
-            color: "yellow"
-          }, {
-            text: "If using physical device, ensure it stays connected",
-            indent: 1,
-            prefix: "├─ ",
-            color: "yellow"
-          });
-        } else {
-          troubleshootingItems.push({
-            text: "Verify keystore configuration for release builds",
-            indent: 1,
-            prefix: "├─ ",
-            color: "yellow"
-          }, {
-            text: "Check that keystore passwords are properly set",
-            indent: 1,
-            prefix: "├─ ",
-            color: "yellow"
-          });
-        }
-        troubleshootingItems.push({
-          text: 'Run "npm run setupEmulator:android" to reconfigure Android settings',
-          indent: 1,
-          prefix: "└─ ",
-          color: "yellow"
-        }, "\nVerify Configuration:");
-        if (androidConfig) {
-          troubleshootingItems.push({
-            text: `Build Type: ${buildType}`,
-            indent: 1,
-            prefix: "├─ ",
-            color: "gray"
-          }, {
-            text: `Android SDK Path: ${androidConfig.sdkPath || "Not configured"}`,
-            indent: 1,
-            prefix: "├─ ",
-            color: "gray"
-          });
-          if (buildType !== "release") {
-            if (targetDevice) {
-              troubleshootingItems.push({
-                text: `Target Device: ${targetDevice.type === "physical" ? `${targetDevice.model} (Physical)` : `${androidConfig.emulatorName} (Emulator)`}`,
-                indent: 1,
-                prefix: "└─ ",
-                color: "gray"
-              });
-            } else {
-              troubleshootingItems.push({
-                text: `Selected Emulator: ${androidConfig.emulatorName || "Not configured"}`,
-                indent: 1,
-                prefix: "└─ ",
-                color: "gray"
-              });
-            }
-          } else {
-            troubleshootingItems.push({
-              text: `Output Path: ${androidConfig.outputPath || "build-output/"}`,
-              indent: 1,
-              prefix: "└─ ",
-              color: "gray"
-            });
-          }
-        } else {
-          troubleshootingItems.push({
-            text: "Configuration could not be loaded",
-            indent: 1,
-            prefix: "├─ ",
-            color: "red"
-          }, {
-            text: "Check if config/config.json exists and has valid Android configuration",
-            indent: 1,
-            prefix: "└─ ",
-            color: "red"
-          });
-        }
-        progress.printTreeContent("Troubleshooting Guide", troubleshootingItems);
-      }
+      // Mark the step, then show what actually broke. The old handler
+      // printed a generic "check your SDK" checklist here, which is
+      // noise when the real Kotlin error is sitting in the output.
+      // The ✗ line carries no message: the diagnostic below is the message.
+      if (progress.currentStep) progress.fail(progress.currentStep.id);
+      process.stderr.write(buildFailure({
+        error,
+        stage: error.stage || "Android build",
+        code: "ANDROID-000"
+      }));
       throw error;
     }
   }
@@ -373,6 +230,7 @@ function createAndroidBuild(config) {
       await copyBuildAssets(androidConfig, buildOptimisation);
       await copySplashscreenAssets();
       await copyOfflinePage();
+      await copySplashHtml();
       await copyIconAssets();
       await configureAppName(androidConfig);
       const pluginConfig = resolvePluginConfig(wvConfig);
@@ -384,7 +242,7 @@ function createAndroidBuild(config) {
       });
       await processNotifications(wvConfig);
       syncAIPackageIfEnabled(wvConfig, progress);
-      progress.log("✅ buildAndroidForTesting complete — project ready for gradlew test", "success");
+      progress.log("buildAndroidForTesting complete — project ready for gradlew test", "success");
       return {
         success: true
       };

package/dist/native/buildAppAndroid.js

@@ -5,12 +5,16 @@ const {
   pwd
 } = require("./buildAndroid/index.js");
 const {
-  formatBuildError
+  formatBuildError,
+  resolveOutputMode
 } = require("./buildErrorFormat.js");
+const {
+  loadAppConfig
+} = require("../cli/appConfig.js");
 const {
   WEBVIEW_CONFIG,
   BUILD_OUTPUT_PATH
-} = require(`${process.cwd()}/config/config.json`);
+} = loadAppConfig();
 async function main() {
   const build = createAndroidBuild({
     WEBVIEW_CONFIG,
@@ -22,12 +26,19 @@ async function main() {
   try {
     await buildAndroidApp();
   } catch (error) {
-    console.error(formatBuildError({
-      code: "ANDROID-000",
-      category: "ANDROID",
-      upstreamName: "Gradle",
-      error
-    }));
+    // buildAndroidApp already reported this through the progress tree and
+    // the troubleshooting guide, so the default mode does not repeat it.
+    // --verbose/--debug add the registry's boxed report on top.
+    if (resolveOutputMode() !== "default") {
+      console.error(formatBuildError({
+        code: "ANDROID-000",
+        category: "ANDROID",
+        upstreamName: "Gradle",
+        error
+      }));
+    } else if (process.env.CATALYST_DEBUG && error.stack) {
+      console.error(error.stack);
+    }
     process.exit(1);
   }
   process.exit(0);

package/dist/native/buildAppIos.js

@@ -14,13 +14,20 @@ const {
   resolveAIPluginSource
 } = require("./internalPluginUtils.js");
 const {
-  formatBuildError
+  formatBuildError,
+  resolveOutputMode
 } = require("./buildErrorFormat.js");
+const {
+  buildFailure
+} = require("../cli/diagnostic.js");
+const {
+  loadAppConfig
+} = require("../cli/appConfig.js");
 const catalystCorePath = path.dirname(require.resolve("catalyst-core/package.json"));
 const {
   WEBVIEW_CONFIG,
   BUILD_OUTPUT_PATH
-} = require(`${process.cwd()}/config/config.json`);
+} = loadAppConfig();
 async function main() {
   const build = createIosBuild({
     WEBVIEW_CONFIG,
@@ -35,8 +42,8 @@ async function main() {
     buildForIOS,
     PROJECT_DIR
   } = build;
+  let building = false;
   try {
-    progress.log("Starting build process...", "info");
     const aiPlugin = resolveAIPluginSource(WEBVIEW_CONFIG, process.cwd(), (message, status = "info") => progress.log(message, status));
     const pluginConfig = {
       ...resolvePluginConfig(WEBVIEW_CONFIG),
@@ -53,21 +60,33 @@ async function main() {
     await updateInfoPlist(pluginComposition);
     await updateEntitlements(pluginComposition);
     await syncPluginResources(pluginComposition);
+    building = true;
     await buildForIOS(pluginComposition);
   } catch (error) {
-    // progress.log() prefixes every call with an icon/color and does a
-    // single console.log per invocation — it's built for single-line
-    // status messages, not our multi-line boxed verbose/debug output
-    // (piping a box through it would prefix an icon onto every border
-    // line and break the box shape). Bypass it here and use plain
-    // console.error instead, matching buildAppAndroid.js; progress.log
-    // is unaffected everywhere else in this build.
-    console.error(formatBuildError({
-      code: "IOS-000",
-      category: "IOS",
-      upstreamName: "Xcode/CocoaPods",
-      error
-    }));
+    // buildForIOS already reported this through the progress tree, so the
+    // default mode does not repeat it. The steps before it report nothing
+    // themselves; without this their failure exited 1 with no output.
+    if (!building) {
+      if (progress.currentStep) progress.fail(progress.currentStep.id);
+      process.stderr.write(buildFailure({
+        error,
+        stage: error?.stage || "iOS build",
+        code: "IOS-000"
+      }));
+    }
+    // --verbose/--debug add the registry's boxed report, printed with
+    // console.error rather than progress.log, which would prefix every
+    // border line and break the box.
+    if (resolveOutputMode() !== "default") {
+      console.error(formatBuildError({
+        code: "IOS-000",
+        category: "IOS",
+        upstreamName: "Xcode/CocoaPods",
+        error
+      }));
+    } else if (process.env.CATALYST_DEBUG && error.stack) {
+      console.error(error.stack);
+    }
     process.exit(1);
   }
   process.exit(0);

package/dist/native/buildIos/assets.js

@@ -305,7 +305,7 @@ module.exports = function createAssetsPhase(ctx) {
         if (groupPattern.test(projectContent)) projectContent = projectContent.replace(groupPattern, `$1\n\t\t\t\t${fileRefId} /* ${soundFile.filename} */,`);
         const resourcesPattern = /(\/\* Resources \*\/ = \{[^}]*files = \([^)]*)/;
         if (resourcesPattern.test(projectContent)) projectContent = projectContent.replace(resourcesPattern, `$1\n\t\t\t\t${buildFileId} /* ${soundFile.filename} in Resources */,`);
-        progress.log(`✅ Added ${soundFile.filename} to Xcode project`, "success");
+        progress.log(`Added ${soundFile.filename} to Xcode project`, "success");
       }
       fs.writeFileSync(projectFilePath, projectContent, "utf8");
       progress.log(`Registered ${soundFiles.length} sound file(s) in Xcode project`, "success");
@@ -347,7 +347,6 @@ module.exports = function createAssetsPhase(ctx) {
         }
         await removeGoogleServicesPlistFromXcodeProject();
       }
-      progress.log("Cleaned up notification assets", "success");
     } catch (error) {
       progress.log(`Warning: Error cleaning notification assets: ${error.message}`, "warning");
     }
@@ -357,7 +356,6 @@ module.exports = function createAssetsPhase(ctx) {
     try {
       await cleanupNotificationAssets(!hasNotificationConfig);
       if (!hasNotificationConfig) {
-        progress.log("Notifications disabled - skipped asset processing", "info");
         return;
       }
       const hasGoogleServices = await handleGoogleServicesPlist();
@@ -401,7 +399,6 @@ module.exports = function createAssetsPhase(ctx) {
       const resourcesPattern = /(\/\* Resources \*\/ = \{[^}]*files = \([^)]*)/;
       if (resourcesPattern.test(projectContent)) projectContent = projectContent.replace(resourcesPattern, `$1\n\t\t\t\t${buildFileId} /* ${offlineFileName} in Resources */,`);
       fs.writeFileSync(projectFilePath, projectContent, "utf8");
-      progress.log("Registered offline.html with Xcode project", "success");
     } catch (error) {
       progress.log(`Warning: Failed to register offline.html in Xcode project: ${error.message}`, "warning");
     }
@@ -418,7 +415,6 @@ module.exports = function createAssetsPhase(ctx) {
         recursive: true
       });
       fs.copyFileSync(sourcePath, `${destDir}/offline.html`);
-      progress.log("offline.html copied to iOS bundle", "success");
       await addOfflinePageToXcodeProject();
       return true;
     } catch (error) {
@@ -478,7 +474,6 @@ module.exports = function createAssetsPhase(ctx) {
       const assetsDir = `${PROJECT_DIR}/${PROJECT_NAME}/Assets.xcassets`;
       const iconSetDir = `${assetsDir}/AppIcon.appiconset`;
       if (!fs.existsSync(publicDir)) {
-        progress.log("Public directory not found, skipping app icon copy", "info");
         return;
       }
       const iconSizes = [{