catalyst-core 1.0.2-canary.1 → 1.0.2

package/dist/native/buildIos/build.js

@@ -4,7 +4,8 @@ const fs = require("fs");
 const os = require("os");
 const path = require("path");
 const {
-  execSync
+  execSync,
+  execFileSync
 } = require("child_process");
 const {
   runInteractiveCommand
@@ -16,9 +17,9 @@ module.exports = function createBuildPhase(ctx) {
     SCHEME_NAME,
     APP_BUNDLE_ID,
     IPHONE_MODEL,
-    url,
     progress,
-    runCommand
+    runCommand,
+    runCommandStreaming
   } = ctx;
 
   // ─── Simulator helpers ────────────────────────────────────────────────────
@@ -32,24 +33,21 @@ module.exports = function createBuildPhase(ctx) {
         if (line.includes(modelName) && line.includes("Booted")) {
           const m = line.match(UUID_RE);
           if (m) {
-            console.log(`Found booted simulator of model ${modelName}`);
             return m[0];
           }
         }
       }
-      console.log(`No booted simulator of model ${modelName} found, checking for any booted simulator...`);
+      progress.status("looking for any booted simulator");
       for (const line of lines) {
         if (line.includes("Booted")) {
           const m = line.match(UUID_RE);
           if (m) {
-            console.log("Found another booted simulator, will use it instead");
             return m[0];
           }
         }
       }
       return null;
     } catch (error) {
-      console.log("No booted simulators found");
       return null;
     }
   }
@@ -67,7 +65,6 @@ module.exports = function createBuildPhase(ctx) {
       }
       return null;
     } catch (error) {
-      console.log("Failed to get booted simulator info:", error.message);
       return null;
     }
   }
@@ -143,32 +140,30 @@ module.exports = function createBuildPhase(ctx) {
   async function buildProject(scheme, sdk, destination, bundleId, derivedDataPath, projectName) {
     const bootedInfo = await getBootedSimulatorInfo();
     if (!bootedInfo) throw new Error("No booted simulator found");
-    console.log(`Building with destination: platform=iOS Simulator,id=${bootedInfo.udid}`);
+    progress.status(`simulator ${bootedInfo.udid.slice(0, 8)}`);
     const isNotificationsEnabled = WEBVIEW_CONFIG.notifications?.enabled ?? false;
     progress.log(isNotificationsEnabled ? "Building with notifications enabled (CatalystNotifications module included)" : "Building without notifications (Firebase excluded)", "info");
-    return runCommand(makeBuildCommand(scheme, sdk, bundleId, derivedDataPath, projectName, bootedInfo.udid, "build"), {
-      maxBuffer: 1024 * 1024 * 10
-    });
+    // Streamed: xcodebuild runs for minutes, and buffered output made that
+    // look like a hang with nothing on screen until it finished.
+    return runCommandStreaming(makeBuildCommand(scheme, sdk, bundleId, derivedDataPath, projectName, bootedInfo.udid, "build"));
   }
   async function buildProjectForTesting(scheme, sdk, destination, bundleId, derivedDataPath, projectName) {
     const bootedInfo = await getBootedSimulatorInfo();
     if (!bootedInfo) throw new Error("No booted simulator found");
-    console.log(`Building for testing with destination: platform=iOS Simulator,id=${bootedInfo.udid}`);
+    progress.status(`simulator ${bootedInfo.udid.slice(0, 8)}`);
     const isNotificationsEnabled = WEBVIEW_CONFIG.notifications?.enabled ?? false;
     progress.log(isNotificationsEnabled ? "Building for testing with notifications enabled" : "Building for testing without notifications", "info");
-    return runCommand(makeBuildCommand(scheme, sdk, bundleId, derivedDataPath, projectName, bootedInfo.udid, "build-for-testing"), {
-      maxBuffer: 1024 * 1024 * 10
-    });
+    return runCommandStreaming(makeBuildCommand(scheme, sdk, bundleId, derivedDataPath, projectName, bootedInfo.udid, "build-for-testing"));
   }
   async function buildXcodeProject() {
     progress.start("build");
     try {
       const derivedDataPath = path.join(os.homedir(), "Library/Developer/Xcode/DerivedData");
       try {
-        progress.log("Building for specified simulator...", "info");
+        progress.status("building for specified simulator");
         await buildProject(SCHEME_NAME, "iphonesimulator", `platform=iOS Simulator,name=${IPHONE_MODEL}`, APP_BUNDLE_ID, derivedDataPath, PROJECT_NAME);
       } catch (buildError) {
-        progress.log("Initial build failed, attempting fallback...", "warning");
+        progress.log("Initial build failed, attempting fallback...", "info");
         const bootedUUID = await getBootedSimulatorUUID(IPHONE_MODEL);
         if (bootedUUID) {
           progress.log(`Found booted simulator, retrying build...`, "info");
@@ -180,32 +175,6 @@ module.exports = function createBuildPhase(ctx) {
       progress.complete("build");
     } catch (error) {
       progress.fail("build", error.message);
-      progress.printTreeContent("Troubleshooting Guide", ["Build failed. Please try the following steps:", {
-        text: 'Run "npm run setupEmulator:ios" to reconfigure iOS settings',
-        indent: 1,
-        prefix: "├─ ",
-        color: "yellow"
-      }, {
-        text: "Check if Xcode is properly installed and updated",
-        indent: 1,
-        prefix: "├─ ",
-        color: "yellow"
-      }, {
-        text: "Verify selected simulator exists",
-        indent: 1,
-        prefix: "└─ ",
-        color: "yellow"
-      }, "\nVerify Configuration:", {
-        text: `Selected Simulator: ${IPHONE_MODEL}`,
-        indent: 1,
-        prefix: "├─ ",
-        color: "gray"
-      }, {
-        text: `Server URL: ${url}`,
-        indent: 1,
-        prefix: "└─ ",
-        color: "gray"
-      }]);
       throw error;
     }
   }
@@ -221,7 +190,7 @@ module.exports = function createBuildPhase(ctx) {
         APP_PATH = execSync(`find "${DERIVED_DATA_DIR}" -path "*${PROJECT_NAME}-*" -prune -not -path "*/Index.noindex*" -path "*/Build/Products/Debug-iphonesimulator/${PROJECT_NAME}.app" -type d | head -n 1` // nosemgrep: javascript.lang.security.detect-child-process.detect-child-process - DERIVED_DATA_DIR and PROJECT_NAME are internal iOS build paths.
         ).toString().trim();
       } catch (error) {
-        progress.log("Primary app path search failed, trying fallback...", "warning");
+        progress.log("Primary app path search failed, trying fallback...", "info");
       }
       if (!APP_PATH) {
         try {
@@ -248,13 +217,15 @@ module.exports = function createBuildPhase(ctx) {
       const buildType = iosConfig.buildType || "debug";
       const appName = iosConfig.appName || "app";
       const currentDate = new Date().toLocaleDateString("en-GB").replace(/\//g, "-");
-      const currentTime = new Date().toLocaleTimeString("en-US", {
-        hour12: true,
-        hour: "2-digit",
-        minute: "2-digit",
-        second: "2-digit"
-      }).replace(/:/g, "-");
-      const destinationDir = path.join(process.cwd(), BUILD_OUTPUT_PATH,
+      // 24-hour and locale-free: "02-05-09 PM" put a space in every
+      // artifact name, which breaks unquoted shell use of the path.
+      const currentTime = new Date().toTimeString().slice(0, 8).replace(/:/g, "-");
+      // The app root, not process.cwd(): the iOS build chdirs into the
+      // Xcode project inside node_modules, so the artifact landed there
+      // and was wiped by the next npm install.
+      const destinationDir = path.join(
+      // nosemgrep: javascript.lang.security.audit.path-traversal.path-join-resolve-traversal.path-join-resolve-traversal - appRoot is the local project root from the CLI context.
+      ctx.appRoot || process.cwd(), BUILD_OUTPUT_PATH,
       // nosemgrep: javascript.lang.security.audit.path-traversal.path-join-resolve-traversal.path-join-resolve-traversal - BUILD_OUTPUT_PATH is trusted application config.
       "native", "ios", currentDate, buildType // nosemgrep: javascript.lang.security.audit.path-traversal.path-join-resolve-traversal.path-join-resolve-traversal - buildType is "debug" or "release" from config.
       );
@@ -270,24 +241,21 @@ module.exports = function createBuildPhase(ctx) {
     }
   }
   async function uninstallExistingApp() {
-    console.log("Uninstalling the app if it exists...");
+    progress.status("uninstalling previous build");
     await runCommand(`xcrun simctl uninstall booted "${APP_BUNDLE_ID}"`);
   }
   async function installApp(APP_PATH) {
-    console.log("Installing the app...");
-    try {
-      await runCommand(`xcrun simctl install booted "${APP_PATH}"`);
-    } catch (error) {
-      console.error("Error installing the app:", error);
-      throw error;
-    }
+    progress.status("installing");
+    await runCommand(`xcrun simctl install booted "${APP_PATH}"`);
   }
   async function waitForInstallation() {
-    console.log("Waiting for the app to be fully installed...");
+    progress.status("waiting for install");
     for (let i = 0; i < 30; i++) {
       try {
-        execSync(`xcrun simctl get_app_container booted "${APP_BUNDLE_ID}"`); // nosemgrep: javascript.lang.security.detect-child-process.detect-child-process - APP_BUNDLE_ID is generated from trusted native config.
-        console.log("App installed successfully.");
+        // No shell: the bundle id is passed as an argv entry, never interpolated.
+        execFileSync("xcrun", ["simctl", "get_app_container", "booted", APP_BUNDLE_ID], {
+          stdio: ["ignore", "pipe", "ignore"]
+        });
         break;
       } catch (error) {
         if (i === 29) throw new Error("Timeout: App installation took too long.");
@@ -296,32 +264,32 @@ module.exports = function createBuildPhase(ctx) {
     }
   }
   async function handleLaunchError(error) {
-    console.error("Error launching the app:", error);
-    console.log("Checking app container...");
+    progress.status("checking app container");
     try {
       await runCommand(`xcrun simctl get_app_container booted "${APP_BUNDLE_ID}"`);
     } catch {
-      console.log("App container not found");
+      progress.log("App container not found", "warning");
     }
     throw error;
   }
   async function verifyAppLaunch() {
-    console.log("Waiting for the app to launch...");
+    progress.status("waiting for launch");
     for (let i = 0; i < 10; i++) {
       try {
-        const launchResult = execSync(`xcrun simctl launch booted "${APP_BUNDLE_ID}"`).toString(); // nosemgrep: javascript.lang.security.detect-child-process.detect-child-process
+        const launchResult = execFileSync("xcrun", ["simctl", "launch", "booted", APP_BUNDLE_ID], {
+          stdio: ["ignore", "pipe", "ignore"]
+        }).toString();
         if (launchResult.includes("already launched")) {
-          console.log("App launched successfully.");
           break;
         }
       } catch (error) {
-        if (i === 9) console.log("Warning: App launch might have failed or taken too long.");
+        if (i === 9) progress.log("App launch may have failed or timed out", "warning");
       }
       await new Promise(resolve => setTimeout(resolve, 1000));
     }
   }
   async function launchAndVerifyApp() {
-    console.log("Launching the app...");
+    progress.status("launching");
     try {
       await runCommand(`xcrun simctl launch booted "${APP_BUNDLE_ID}"`);
       await verifyAppLaunch();
@@ -330,7 +298,7 @@ module.exports = function createBuildPhase(ctx) {
     }
   }
   async function focusSimulator() {
-    console.log("Focusing on Simulator...");
+    progress.status("focusing simulator");
     const simulatorAppBundleId = resolveSimulatorAppBundleId();
     if (!simulatorAppBundleId) {
       progress.log(SIMULATOR_APP_NOT_FOUND_WARNING, "warning");
@@ -384,7 +352,10 @@ module.exports = function createBuildPhase(ctx) {
   function tryDevicectl() {
     const tmpPath = path.join(os.tmpdir(), `catalyst-devicectl-${process.pid}-${Date.now()}.json`);
     try {
-      execSync(`xcrun devicectl list devices --json-output "${tmpPath}"`); // nosemgrep: javascript.lang.security.audit.dangerous-spawn-shell-command.dangerous-spawn-shell-command - tmpPath is built from os.tmpdir()/process.pid/Date.now(), not user input.
+      execSync(`xcrun devicectl list devices --json-output "${tmpPath}"`, {
+        stdio: ["ignore", "ignore", "ignore"],
+        timeout: 30000
+      }); // nosemgrep: javascript.lang.security.audit.dangerous-spawn-shell-command.dangerous-spawn-shell-command - tmpPath is built from os.tmpdir()/process.pid/Date.now(), not user input.
       const raw = fs.readFileSync(tmpPath, "utf8");
       const parsed = JSON.parse(raw);
       const devices = parsed?.result?.devices ?? [];
@@ -402,7 +373,8 @@ module.exports = function createBuildPhase(ctx) {
         type: "physical"
       })).filter(d => typeof d.udid === "string" && VALID_UDID_RE.test(d.udid));
     } catch (error) {
-      progress.log(`devicectl detection failed (${error.message}); falling back to xcodebuild destinations`, "warning");
+      // A fallback is not a failure the user can act on; keep it for --verbose.
+      progress.log(`devicectl detection failed (${error.message}); falling back to xcodebuild destinations`, "info");
       return [];
     } finally {
       try {
@@ -418,21 +390,21 @@ module.exports = function createBuildPhase(ctx) {
       iosConfig
     } = ctx;
     try {
-      progress.log("Scanning for connected physical devices...", "info");
+      progress.status("scanning for connected physical devices");
       let physicalDevices = [];
       const configuredUDID = iosConfig.deviceUDID;
       if (configuredUDID) {
         progress.log(`Using configured device UDID: ${configuredUDID}`, "info");
         const configuredDevice = tryDevicectl().find(d => d.udid === configuredUDID);
         if (configuredDevice) {
-          progress.log(`✅ Found configured physical device: ${configuredDevice.name} (${configuredDevice.version})`, "success");
+          progress.log(`Found configured physical device: ${configuredDevice.name} (${configuredDevice.version})`, "success");
           progress.complete("deviceDetection");
           return configuredDevice;
         }
-        progress.log(`⚠️  Configured device UDID not found in connected devices`, "warning");
+        progress.log(`Configured device UDID not found in connected devices`, "warning");
         progress.log("Falling back to auto-detection...", "info");
       } else {
-        progress.log("No device UDID configured, using auto-detection", "info");
+        progress.status("no device udid configured, using auto-detection");
       }
       physicalDevices = tryDevicectl();
       if (physicalDevices.length > 0) progress.log(`Found ${physicalDevices.length} physical device(s) via devicectl`, "success");
@@ -440,14 +412,14 @@ module.exports = function createBuildPhase(ctx) {
         try {
           const xcodebuildOutput = execSync(`xcodebuild -scheme "${SCHEME_NAME}" -showdestinations` // nosemgrep: javascript.lang.security.detect-child-process.detect-child-process - SCHEME_NAME is generated from trusted iOS project config.
           ).toString();
-          progress.log("Scanning xcodebuild destinations for physical devices...", "info");
+          progress.status("scanning xcodebuild destinations for physical devices");
           for (const line of xcodebuildOutput.split("\n")) {
             const m = line.match(/\{\s*platform:iOS,\s*arch:(\w+),\s*id:([A-F0-9-]+),\s*name:(.+?)\s*\}/);
             if (m) {
               const [, arch, udid, name] = m;
               progress.log(`Found device candidate: ${name.trim()} - ${udid}`, "info");
               if (!udid.includes("placeholder") && udid.length > 20) {
-                progress.log(`✅ Valid physical device: ${name.trim()}`, "success");
+                progress.log(`Valid physical device: ${name.trim()}`, "success");
                 physicalDevices.push({
                   name: name.trim(),
                   version: "Unknown",
@@ -456,22 +428,23 @@ module.exports = function createBuildPhase(ctx) {
                   type: "physical"
                 });
               } else {
-                progress.log(`❌ Skipping placeholder: ${name.trim()}`, "warning");
+                progress.log(`Skipping placeholder: ${name.trim()}`, "info");
               }
             }
           }
         } catch (error) {
-          progress.log("xcodebuild destinations failed", "warning");
+          progress.log("xcodebuild destinations failed", "info");
           progress.log(`Error: ${error.message}`, "error");
         }
       }
       if (physicalDevices.length > 0) {
         progress.log(`Found ${physicalDevices.length} physical device(s):`, "success");
-        physicalDevices.forEach(d => progress.log(`  📱 ${d.name} (${d.version || "Unknown iOS"}) - ${d.udid}`, "info"));
+        physicalDevices.forEach(d => progress.log(`  ${d.name} (${d.version || "Unknown iOS"}) - ${d.udid}`, "info"));
         progress.complete("deviceDetection");
         return physicalDevices[0];
       } else {
-        progress.log("No physical devices detected", "warning");
+        // The normal case when building for the simulator, not a warning.
+        progress.log("No physical devices detected", "info");
         progress.complete("deviceDetection");
         return null;
       }
@@ -494,10 +467,9 @@ module.exports = function createBuildPhase(ctx) {
         PRODUCT_BUNDLE_IDENTIFIER=${bundleId} \
         ONLY_ACTIVE_ARCH=YES \
         build`;
-    progress.log(`Executing command: ${buildCommand}`, "info");
-    return runCommand(buildCommand, {
-      maxBuffer: 1024 * 1024 * 10
-    });
+    // The full command is a dozen wrapped lines of build settings; the
+    // streamed output below is what actually tells you how it is going.
+    return runCommandStreaming(buildCommand);
   }
   async function findPhysicalDeviceAppPath() {
     const DERIVED_DATA_DIR = path.join(os.homedir(), "Library/Developer/Xcode/DerivedData");
@@ -506,7 +478,7 @@ module.exports = function createBuildPhase(ctx) {
       APP_PATH = execSync(`find "${DERIVED_DATA_DIR}" -name "${PROJECT_NAME}.app" -path "*/Build/Products/Debug-iphoneos/*" -not -path "*/Index.noindex/*" -type d | head -n 1` // nosemgrep: javascript.lang.security.detect-child-process.detect-child-process - DERIVED_DATA_DIR and PROJECT_NAME are internal iOS build paths.
       ).toString().trim();
     } catch {
-      progress.log("Primary app path search failed for physical device, trying fallback...", "warning");
+      progress.log("Primary app path search failed for physical device, trying fallback...", "info");
     }
     if (!APP_PATH) {
       try {
@@ -537,7 +509,7 @@ module.exports = function createBuildPhase(ctx) {
         progress.log("App launched successfully using devicectl", "success");
       } catch (launchError) {
         progress.log("App installation completed, but launch failed. You can manually launch the app on your device.", "warning");
-        progress.log(`To launch manually, look for the app with bundle ID: ${APP_BUNDLE_ID}`, "info");
+        progress.log(`To launch manually, look for the app with bundle ID: ${APP_BUNDLE_ID}`, "note");
       }
       progress.complete("launch");
     } catch (error) {
@@ -588,7 +560,7 @@ module.exports = function createBuildPhase(ctx) {
   async function launchIOSSimulator(simulatorName) {
     progress.start("launchSimulator");
     try {
-      progress.log("Launching iOS Simulator...");
+      progress.status("launching simulator");
       const simulatorsJson = JSON.parse(execSync("xcrun simctl list devices -j").toString());
       // Multiple devices can share a name across runtimes (e.g. leftover devices
       // from an old Xcode install after an upgrade) — simctl marks the ones whose
@@ -614,11 +586,11 @@ module.exports = function createBuildPhase(ctx) {
         });
       });
       if (!foundSimulator) {
-        console.log(`Configured simulator "${simulatorName}" not found.`);
+        progress.log(`Configured simulator "${simulatorName}" not found`, "warning");
         return;
       }
       if (!isBooted) {
-        progress.log(`Attempting to boot simulator: ${simulatorName} (${foundSimulatorId})`, "warning");
+        progress.log(`Attempting to boot simulator: ${simulatorName} (${foundSimulatorId})`, "info");
         if (foundSimulator.state === "Shutdown") {
           progress.log(`Simulator is shutdown, attempting to boot...`, "info");
           try {
@@ -642,14 +614,13 @@ module.exports = function createBuildPhase(ctx) {
       }
       const simulatorAppBundleId = resolveSimulatorAppBundleId();
       if (simulatorAppBundleId) {
-        progress.log("Opening simulator UI...");
+        progress.status("opening simulator");
         await runCommand(`open -b ${simulatorAppBundleId}`);
         await new Promise(resolve => setTimeout(resolve, 1000));
         await runCommand(`osascript -e 'tell application id "${simulatorAppBundleId}" to activate'`);
       } else {
         progress.log(SIMULATOR_APP_NOT_FOUND_WARNING, "warning");
       }
-      progress.log("iOS Simulator launched successfully.", "success");
       progress.complete("launchSimulator");
     } catch (error) {
       progress.fail("launchSimulator", error.message);

package/dist/native/buildIos/config.js

@@ -82,6 +82,7 @@ module.exports = function createConfigPhase(ctx) {
     WEBVIEW_CONFIG,
     iosConfig,
     PROJECT_DIR,
+    PUBLIC_PATH,
     url,
     progress,
     restoreManagedFileFromBaseline,
@@ -185,18 +186,35 @@ public enum ConfigConstants {
         configContent += `\n    public static let splashScreenImageWidth: CGFloat = ${splashConfig.imageWidth || 120}`;
         configContent += `\n    public static let splashScreenImageHeight: CGFloat = ${splashConfig.imageHeight || 120}`;
         configContent += `\n    public static let splashScreenCornerRadius: CGFloat = ${splashConfig.cornerRadius || 20}`;
+
+        // Optional HTML splash: public/splashscreen.html is embedded as base64 so no
+        // bundle resource or Xcode project registration is needed.
+        const splashHtmlPath = path.join(PUBLIC_PATH, "splashscreen.html"); // nosemgrep: javascript.lang.security.audit.path-traversal.path-join-resolve-traversal.path-join-resolve-traversal - PUBLIC_PATH is the app's fixed public directory.
+        if (fs.existsSync(splashHtmlPath)) {
+          const splashHtml = fs.readFileSync(splashHtmlPath);
+          if (splashHtml.length > 1024 * 1024) {
+            progress.log(`splashscreen.html is ${(splashHtml.length / (1024 * 1024)).toFixed(1)} MB; it is embedded in the app binary, keep it small`, "warning");
+          }
+          configContent += `\n    public static let splashScreenHtml: String? = "${splashHtml.toString("base64")}"`;
+        } else {
+          configContent += `\n    public static let splashScreenHtml: String? = nil`;
+        }
+        const minDuration = splashConfig.minDuration;
+        const validMinDuration = typeof minDuration === "number" && Number.isFinite(minDuration) && minDuration >= 0;
+        if (minDuration !== undefined && !validMinDuration) {
+          progress.log(`Ignoring invalid splashScreen.minDuration: ${JSON.stringify(minDuration)}`, "warning");
+        }
+        configContent += `\n    public static let splashScreenMinDuration: TimeInterval = ${validMinDuration ? minDuration / 1000.0 : 0}`;
       } else {
-        configContent += `\n\n    // Splash Screen Configuration\n    public static let splashScreenEnabled = false\n    public static let splashScreenDuration: TimeInterval? = nil\n    public static let splashScreenBackgroundColor = "#ffffff"\n    public static let splashScreenImageWidth: CGFloat = 120\n    public static let splashScreenImageHeight: CGFloat = 120\n    public static let splashScreenCornerRadius: CGFloat = 20`;
+        configContent += `\n\n    // Splash Screen Configuration\n    public static let splashScreenEnabled = false\n    public static let splashScreenDuration: TimeInterval? = nil\n    public static let splashScreenBackgroundColor = "#ffffff"\n    public static let splashScreenImageWidth: CGFloat = 120\n    public static let splashScreenImageHeight: CGFloat = 120\n    public static let splashScreenCornerRadius: CGFloat = 20\n    public static let splashScreenHtml: String? = nil\n    public static let splashScreenMinDuration: TimeInterval = 0`;
       }
       if (!addedKeys.has("notifications")) {
-        progress.log("Notifications not found in config, adding default (false)", "info");
         configContent += "\n    public enum Notifications {\n        public static let enabled = false\n    }";
         addedKeys.add("notifications");
       } else {
         progress.log("Notifications config was processed from WEBVIEW_CONFIG", "info");
       }
       if (!addedKeys.has("googleSignIn")) {
-        progress.log("Google Sign-In not found in config, adding defaults (disabled)", "info");
         configContent += '\n    public enum GoogleSignIn {\n        public static let enabled = false\n        public static let clientId = ""\n        public static let iosClientId = ""\n    }';
         addedKeys.add("googleSignIn");
       }
@@ -208,8 +226,6 @@ public enum ConfigConstants {
         progress.log("EdgeToEdge not found in config, adding default (false)", "info");
         configContent += "\n    public enum EdgeToEdge {\n        public static let enabled = false\n    }";
         addedKeys.add("edgeToEdge");
-      } else {
-        progress.log("EdgeToEdge config was processed from WEBVIEW_CONFIG", "info");
       }
       if (!addedKeys.has("initial_url")) {
         configContent += '\n    public static let initial_url = ""';
@@ -233,7 +249,6 @@ public enum ConfigConstants {
       }
       configContent += `\n}`;
       fs.writeFileSync(appConfigPath, configContent, "utf8");
-      progress.log("Configuration constants generated successfully (SPM Package)", "success");
       progress.complete("config");
     } catch (error) {
       progress.fail("config", error.message);
@@ -314,9 +329,12 @@ INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = UIInterfaceOrientationPort
 INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight
 `;
       fs.writeFileSync(xconfigPath, xconfigContent, "utf8");
-      console.log(`✅ Generated Shared.xcconfig with Swift ${swiftVersion}, iOS ${deploymentTarget}, Bundle ID: ${bundleId}`);
+      // Detail the step's own check line already covers, so it rides the
+      // spinner row rather than escaping the gutter at column 0.
+      progress.status(`xcconfig · Swift ${swiftVersion} · iOS ${deploymentTarget}`);
     } catch (error) {
-      console.error(`❌ Failed to generate Shared.xcconfig: ${error.message}`);
+      // Keep the original error (its code and stack); only say which file.
+      error.message = `Failed to generate Shared.xcconfig: ${error.message}`;
       throw error;
     }
   }