optikit 1.2.4 → 1.3.0

package/dist/cli.js

@@ -1,251 +1,85 @@
 #!/usr/bin/env node
+// MCP mode: redirect all console output to stderr before any imports
+const isMcpMode = process.argv.includes("mcp");
+if (isMcpMode) {
+    const origLog = console.log;
+    console.log = (...args) => console.error(...args);
+    // Restore for JSON-RPC (SDK uses process.stdout directly)
+    void origLog;
+}
 import chalk from "chalk";
 import boxen from "boxen";
 import yargs from "yargs/yargs";
 import { hideBin } from "yargs/helpers";
-import { generateModule } from "./commands/project/generate.js";
-import { cleanProject } from "./commands/clean/flutter.js";
-import { cleanIosProject } from "./commands/clean/ios.js";
-import { updateFlutterVersion } from "./commands/version/update.js";
-import { buildFlutterApk, buildFlutterBundle, buildFlutterIos, buildFlutterIpa, } from "./commands/build/releases.js";
-import { boxenOptions } from "./styles.js";
-import { openIos, openAndroid, openIpaOutput, openBundleOutput, openApkOutput } from "./commands/project/open.js";
 import { createRequire } from "module";
-import { createVscodeSettings } from "./commands/project/setup.js";
-import { initializeProject } from "./commands/config/init.js";
-import { rollbackFiles, rollbackRestore } from "./commands/config/rollback.js";
-import { bumpVersion, bumpIosBuildOnly, bumpAndroidBuildOnly, showCurrentVersion } from "./commands/version/bump.js";
-import { listDevices, runApp, runAppInteractive } from "./commands/project/devices.js";
+import { bannerBoxOptions, createBanner } from "./styles.js";
+import { loadConfig } from "./utils/services/config.js";
+import { setDryRunMode } from "./utils/helpers/dryRun.js";
+// Command modules
+import { buildCommands } from "./commands/build/commands.js";
+import { cleanCommands } from "./commands/clean/commands.js";
+import { versionCommands } from "./commands/version/commands.js";
+import { projectCommands } from "./commands/project/commands.js";
+import { configCommands } from "./commands/config/commands.js";
+import { mcpCommands } from "./commands/mcp/commands.js";
 const require = createRequire(import.meta.url);
 const packageInfo = require("../package.json");
-const version = packageInfo.version;
-const greeting = chalk.white.bold("Hello ^_^");
-console.log(boxen(greeting, boxenOptions));
-const options = yargs(hideBin(process.argv))
-    .command("generate module <moduleName>", "Generate a module with structure", (yargs) => {
-    return yargs.positional("moduleName", {
-        describe: "The name of the module to generate",
-        type: "string",
-    });
-}, (argv) => {
-    const moduleName = argv.moduleName;
-    generateModule(moduleName);
-})
-    .command("clean-flutter", "Clean the Flutter project", (yargs) => {
-    return yargs.option("disable-fvm", {
-        type: "boolean",
-        default: false,
-        description: "Run without FVM (use --disable-fvm to enable)",
-    });
-}, (argv) => {
-    const noFvm = argv.disableFvm;
-    cleanProject(noFvm);
-})
-    .command("clean-ios", "Clean the iOS project", (yargs) => {
-    return yargs
-        .option("clean-cache", {
-        type: "boolean",
-        default: false,
-        description: "Run with CocoaPods cache cleaning (use --clean-cache to enable)",
-    })
-        .option("repo-update", {
-        type: "boolean",
-        default: false,
-        description: "Run pod install with repository update (use --repo-update to enable)",
-    });
-}, (argv) => {
-    const cleanCache = argv.cleanCache;
-    const repoUpdate = argv.repoUpdate;
-    cleanIosProject(cleanCache, repoUpdate);
-})
-    .command("flutter-build-apk", "Build the Flutter APK with release configuration, obfuscation, and split debug info", (yargs) => {
-    return yargs.option("disable-fvm", {
-        type: "boolean",
-        default: false,
-        description: "Run without FVM (use --disable-fvm to enable)",
-    });
-}, async (argv) => {
-    const noFvm = argv.disableFvm;
-    await buildFlutterApk(noFvm);
-})
-    .command("flutter-build-bundle", "Build the Flutter Bundle with release configuration, obfuscation, and split debug info", (yargs) => {
-    return yargs.option("disable-fvm", {
-        type: "boolean",
-        default: false,
-        description: "Run without FVM (use --disable-fvm to enable)",
-    });
-}, async (argv) => {
-    const noFvm = argv.disableFvm;
-    await buildFlutterBundle(noFvm);
-})
-    .command("flutter-build-ios", "Build the Flutter iOS app with release configuration and increment the build version", (yargs) => {
-    return yargs.option("disable-fvm", {
-        type: "boolean",
-        default: false,
-        description: "Run without FVM (use --disable-fvm to enable)",
-    });
-}, async (argv) => {
-    const noFvm = argv.disableFvm;
-    await buildFlutterIos(noFvm);
-})
-    .command("flutter-build-ipa", "Create a release IPA with an updated build version number", (yargs) => {
-    return yargs.option("disable-fvm", {
-        type: "boolean",
-        default: false,
-        description: "Run without FVM (use --disable-fvm to enable)",
-    });
-}, async (argv) => {
-    const noFvm = argv.disableFvm;
-    await buildFlutterIpa(noFvm);
-})
-    .command("flutter-update-version", "Update version and build numbers for both Android and iOS", (yargs) => {
-    return yargs
-        .option("app-version", {
-        type: "string",
-        description: "The version number to set for both Android and iOS",
-        demandOption: false,
-        default: "",
-    })
-        .option("android-build", {
-        type: "string",
-        description: "The Android build number to set in pubspec.yaml",
-        demandOption: false,
-        default: "",
-    })
-        .option("ios-build", {
-        type: "string",
-        description: "The iOS build number to set using agv-tool and Info.plist",
-        demandOption: false,
-        default: "",
-    });
-}, async (argv) => {
-    const version = argv["app-version"];
-    const androidBuildNumber = argv["android-build"];
-    const iosBuildNumber = argv["ios-build"];
-    await updateFlutterVersion(version, androidBuildNumber, iosBuildNumber);
-})
-    .command("open-ios", "Open the iOS project in Xcode", {}, async () => {
-    await openIos();
-})
-    .command("open-android", "Open the Android project in Android Studio", {}, async () => {
-    await openAndroid();
-})
-    .command("open-ipa", "Open the IPA build output directory", {}, async () => {
-    await openIpaOutput();
-})
-    .command("open-apk", "Open the APK build output directory", {}, async () => {
-    await openApkOutput();
-})
-    .command("open-bundle", "Open the Android Bundle build output directory", {}, async () => {
-    await openBundleOutput();
-})
-    .command("setup-vscode", "Create a .vscode folder with recommended Flutter settings", () => { }, async () => {
-    await createVscodeSettings();
-})
-    .command("init", "Initialize OptiKit configuration in the current project", () => { }, async () => {
-    await initializeProject();
-})
-    .command("rollback", "List and restore files from OptiKit backups", (yargs) => {
-    return yargs.option("restore", {
-        type: "number",
-        description: "Restore backup by index number",
-        demandOption: false,
-    });
-}, async (argv) => {
-    const restoreIndex = argv.restore;
-    if (restoreIndex !== undefined) {
-        await rollbackRestore(restoreIndex);
+// Greeting banner (skip in MCP mode — stdout is reserved for JSON-RPC)
+if (!isMcpMode) {
+    console.log(boxen(createBanner(packageInfo.version), bannerBoxOptions));
+}
+// Load config once
+const config = loadConfig();
+// Collect all commands
+const allCommands = [
+    ...buildCommands,
+    ...cleanCommands,
+    ...versionCommands,
+    ...projectCommands,
+    ...configCommands,
+    ...mcpCommands,
+];
+// Build CLI
+const cli = yargs(hideBin(process.argv))
+    .scriptName("optikit")
+    .option("dry-run", {
+    type: "boolean",
+    default: false,
+    description: "Preview operations without executing them",
+    global: true,
+})
+    .middleware((argv) => {
+    if (argv.dryRun) {
+        setDryRunMode(true);
     }
-    else {
-        await rollbackFiles();
+    if (config.useFvmByDefault === false && !process.argv.includes("--disable-fvm")) {
+        argv.disableFvm = true;
     }
-})
-    .command("bump <type>", "Bump version (major, minor, or patch)", (yargs) => {
-    return yargs.positional("type", {
-        describe: "Version bump type (major, minor, patch)",
-        type: "string",
-        choices: ["major", "minor", "patch"],
-    });
-}, async (argv) => {
-    const type = argv.type;
-    await bumpVersion(type);
-})
-    .command("bump-ios", "Increment iOS build number only (for TestFlight)", () => { }, async () => {
-    await bumpIosBuildOnly();
-})
-    .command("bump-android", "Increment Android build number only", () => { }, async () => {
-    await bumpAndroidBuildOnly();
-})
-    .command("version", "Show current version information", () => { }, async () => {
-    await showCurrentVersion();
-})
-    .command("devices", "List all connected devices", (yargs) => {
-    return yargs.option("disable-fvm", {
-        type: "boolean",
-        default: false,
-        description: "Run without FVM (use --disable-fvm to enable)",
-    });
-}, async (argv) => {
-    const useFvm = !argv.disableFvm;
-    await listDevices(useFvm);
-})
-    .command("run", "Run Flutter app on connected device", (yargs) => {
-    return yargs
-        .option("device", {
-        alias: "d",
-        type: "string",
-        description: "Specific device ID to run on",
-    })
-        .option("release", {
-        alias: "r",
-        type: "boolean",
-        default: false,
-        description: "Run in release mode",
-    })
-        .option("flavor", {
-        alias: "f",
-        type: "string",
-        description: "Build flavor to use",
-    })
-        .option("disable-fvm", {
-        type: "boolean",
-        default: false,
-        description: "Run without FVM (use --disable-fvm to enable)",
-    });
-}, async (argv) => {
-    const useFvm = !argv.disableFvm;
-    await runApp({
-        device: argv.device,
-        release: argv.release,
-        flavor: argv.flavor,
-        useFvm,
-    });
-})
-    .command("run-select", "Interactive device selection and run", (yargs) => {
-    return yargs
-        .option("release", {
-        alias: "r",
-        type: "boolean",
-        default: false,
-        description: "Run in release mode",
-    })
-        .option("flavor", {
-        alias: "f",
-        type: "string",
-        description: "Build flavor to use",
-    })
-        .option("disable-fvm", {
-        type: "boolean",
-        default: false,
-        description: "Run without FVM (use --disable-fvm to enable)",
-    });
-}, async (argv) => {
-    const useFvm = !argv.disableFvm;
-    await runAppInteractive({
-        release: argv.release,
-        flavor: argv.flavor,
-        useFvm,
-    });
-})
-    .version(version)
-    .help(true).argv;
+});
+// Register all commands
+for (const command of allCommands) {
+    cli.command(command);
+}
+cli
+    .completion("completion", "Generate shell completion script")
+    .usage(chalk.white.bold("\nUsage:") + chalk.gray(" optikit <command> [options]"))
+    .epilogue(chalk.cyan.bold("\nQuick Reference") + chalk.gray("  (use ok or optikit — both work)\n") +
+    "\n" +
+    chalk.cyan("  Build     ") + chalk.white.bold("apk  aab  ios  ipa  tf") + chalk.gray(" (testflight)\n") +
+    chalk.cyan("  Clean     ") + chalk.white.bold("c") + chalk.gray(" (flutter)  ") + chalk.white.bold("ci") + chalk.gray(" (iOS)  ") + chalk.white.bold("c -a") + chalk.gray(" (all)\n") +
+    chalk.cyan("  Bump      ") + chalk.white.bold("bump <type>  bi  ba  bb\n") +
+    chalk.cyan("  Version   ") + chalk.white.bold("v") + chalk.gray(" (show)  ") + chalk.white.bold("vset") + chalk.gray(" (set manually)\n") +
+    chalk.cyan("  Generate  ") + chalk.white.bold("gen module <name>  gen repo <name>  route <name>\n") +
+    chalk.cyan("  Run       ") + chalk.white.bold("run  rs") + chalk.gray(" (interactive)  ") + chalk.white.bold("devs") + chalk.gray(" (list devices)\n") +
+    chalk.cyan("  Open      ") + chalk.white.bold("xcode  studio\n") +
+    chalk.cyan("  Config    ") + chalk.white.bold("init  vscode  undo  up\n") +
+    chalk.cyan("  Info      ") + chalk.white.bold("info  dr  aliases\n") +
+    chalk.cyan("  MCP       ") + chalk.white.bold("mcp  setup-claude\n") +
+    "\n" +
+    chalk.cyan("  Combos    ") + chalk.green("ok apk --clean -o") + chalk.gray("  |  ") + chalk.green("ok ipa -b patch -o") + chalk.gray("  |  ") + chalk.green("ok tf -o") +
+    "\n\n" +
+    chalk.gray("  Run ") + chalk.white("optikit <command> --help") + chalk.gray(" for details  |  ") +
+    chalk.white("optikit aliases") + chalk.gray(" for full reference"))
+    .version(packageInfo.version)
+    .help(true)
+    .argv;

package/dist/commands/build/commands.js

@@ -0,0 +1,146 @@
+import { buildFlutterApk, buildFlutterBundle, buildFlutterIos, buildFlutterIpa, } from "./releases.js";
+import { cleanProject } from "../clean/flutter.js";
+import { cleanIosProject } from "../clean/ios.js";
+import { bumpVersion, bumpIosBuildOnly } from "../version/bump.js";
+import { openApkOutput, openBundleOutput, openIpaOutput } from "../project/open.js";
+import { LoggerHelpers } from "../../utils/services/logger.js";
+import { runTestflight } from "./testflight.js";
+const buildOptions = {
+    "disable-fvm": {
+        alias: "f",
+        type: "boolean",
+        default: false,
+        description: "Run without FVM",
+    },
+    clean: {
+        type: "boolean",
+        default: false,
+        description: "Clean before building",
+    },
+    open: {
+        alias: "o",
+        type: "boolean",
+        default: false,
+        description: "Open output directory after build",
+    },
+    bump: {
+        alias: "b",
+        type: "string",
+        choices: ["major", "minor", "patch"],
+        description: "Bump version before building",
+    },
+};
+const ipaOptions = {
+    ...buildOptions,
+    "bump-ios": {
+        alias: "i",
+        type: "boolean",
+        default: false,
+        description: "Bump iOS build number before building",
+    },
+};
+async function runPreBuild(flags, isIosBuild) {
+    // 1. Bump version
+    if (flags.bump) {
+        LoggerHelpers.step(`Bumping ${flags.bump} version...`);
+        await bumpVersion(flags.bump, true);
+    }
+    if (flags.bumpIos) {
+        LoggerHelpers.step("Bumping iOS build number...");
+        await bumpIosBuildOnly(true);
+    }
+    // 2. Clean
+    if (flags.clean) {
+        LoggerHelpers.step("Cleaning project...");
+        await cleanProject(flags.disableFvm);
+        if (isIosBuild) {
+            await cleanIosProject(false, false);
+        }
+    }
+}
+async function runPostBuild(flags, openFn) {
+    // 4. Open output
+    if (flags.open) {
+        await openFn();
+    }
+}
+function parseFlags(argv) {
+    return {
+        disableFvm: argv.disableFvm,
+        clean: argv.clean,
+        open: argv.open,
+        bump: argv.bump,
+        bumpIos: argv.bumpIos,
+    };
+}
+export const buildCommands = [
+    {
+        command: "flutter-build-apk",
+        aliases: ["apk"],
+        describe: "Build the Flutter APK with release configuration, obfuscation, and split debug info",
+        builder: buildOptions,
+        handler: async (argv) => {
+            const flags = parseFlags(argv);
+            await runPreBuild(flags, false);
+            await buildFlutterApk(flags.disableFvm);
+            await runPostBuild(flags, openApkOutput);
+        },
+    },
+    {
+        command: "flutter-build-bundle",
+        aliases: ["aab"],
+        describe: "Build the Flutter Bundle with release configuration, obfuscation, and split debug info",
+        builder: buildOptions,
+        handler: async (argv) => {
+            const flags = parseFlags(argv);
+            await runPreBuild(flags, false);
+            await buildFlutterBundle(flags.disableFvm);
+            await runPostBuild(flags, openBundleOutput);
+        },
+    },
+    {
+        command: "flutter-build-ios",
+        aliases: ["ios"],
+        describe: "Build the Flutter iOS app with release configuration and increment the build version",
+        builder: buildOptions,
+        handler: async (argv) => {
+            const flags = parseFlags(argv);
+            await runPreBuild(flags, true);
+            await buildFlutterIos(flags.disableFvm);
+        },
+    },
+    {
+        command: "flutter-build-ipa",
+        aliases: ["ipa"],
+        describe: "Create a release IPA with an updated build version number",
+        builder: ipaOptions,
+        handler: async (argv) => {
+            const flags = parseFlags(argv);
+            await runPreBuild(flags, true);
+            await buildFlutterIpa(flags.disableFvm);
+            await runPostBuild(flags, openIpaOutput);
+        },
+    },
+    {
+        command: "testflight",
+        aliases: ["tf"],
+        describe: "Bump iOS build number and build IPA (TestFlight workflow)",
+        builder: {
+            "disable-fvm": {
+                alias: "f",
+                type: "boolean",
+                default: false,
+                description: "Run without FVM",
+            },
+            open: {
+                alias: "o",
+                type: "boolean",
+                default: false,
+                description: "Open IPA output directory after build",
+            },
+        },
+        handler: async (argv) => {
+            await runTestflight(argv.disableFvm, argv.open);
+        },
+    },
+];

package/dist/commands/build/testflight.js

@@ -0,0 +1,14 @@
+import { bumpIosBuildOnly } from "../version/bump.js";
+import { buildFlutterIpa } from "./releases.js";
+import { openIpaOutput } from "../project/open.js";
+import { LoggerHelpers } from "../../utils/services/logger.js";
+export { runTestflight };
+async function runTestflight(disableFvm, open) {
+    LoggerHelpers.step("Bumping iOS build number...");
+    await bumpIosBuildOnly(true);
+    LoggerHelpers.step("Building IPA...");
+    await buildFlutterIpa(disableFvm);
+    if (open) {
+        await openIpaOutput();
+    }
+}

package/dist/commands/clean/commands.js

@@ -0,0 +1,41 @@
+import { cleanProject } from "./flutter.js";
+import { cleanIosProject } from "./ios.js";
+export const cleanCommands = [
+    {
+        command: "clean",
+        aliases: ["c"],
+        describe: "Clean Flutter project (add --ios or --all for iOS)",
+        builder: {
+            ios: { alias: "i", type: "boolean", default: false, description: "Also clean iOS project (pods)" },
+            all: { alias: "a", type: "boolean", default: false, description: "Clean both Flutter and iOS" },
+            "disable-fvm": { alias: "f", type: "boolean", default: false, description: "Run without FVM" },
+            "clean-cache": { alias: "c", type: "boolean", default: false, description: "Clean CocoaPods cache (iOS only)" },
+            "repo-update": { alias: "u", type: "boolean", default: false, description: "Update CocoaPods repo (iOS only)" },
+        },
+        handler: async (argv) => {
+            await cleanProject(argv.disableFvm);
+            if (argv.ios || argv.all) {
+                await cleanIosProject(argv.cleanCache, argv.repoUpdate);
+            }
+        },
+    },
+    {
+        command: "clean-flutter",
+        aliases: ["cf"],
+        describe: "Clean the Flutter project",
+        builder: {
+            "disable-fvm": { alias: "f", type: "boolean", default: false, description: "Run without FVM" },
+        },
+        handler: (argv) => { cleanProject(argv.disableFvm); },
+    },
+    {
+        command: "clean-ios",
+        aliases: ["ci"],
+        describe: "Clean the iOS project",
+        builder: {
+            "clean-cache": { alias: "c", type: "boolean", default: false, description: "Clean CocoaPods cache" },
+            "repo-update": { alias: "u", type: "boolean", default: false, description: "Update CocoaPods repo" },
+        },
+        handler: (argv) => { cleanIosProject(argv.cleanCache, argv.repoUpdate); },
+    },
+];

package/dist/commands/clean/flutter.js

@@ -3,7 +3,9 @@ import path from "path";
 import { execCommand } from "../../utils/services/exec.js";
 import { LoggerHelpers } from "../../utils/services/logger.js";
 import { validateFlutterProject, validateFlutterSdk } from "../../utils/validators/validation.js";
-import { createBackup } from "../../utils/services/backup.js";
+import { createBackupWithCleanup } from "../../utils/services/backup.js";
+import { handleCommandError } from "../../utils/helpers/error.js";
+import { getFlutterCommand } from "../../utils/services/command.js";
 export { cleanProject };
 async function cleanProject(noFvm) {
     LoggerHelpers.info(noFvm ? "Running clean without FVM..." : "Running clean with FVM...");
@@ -15,17 +17,16 @@ async function cleanProject(noFvm) {
         process.exit(1);
     }
     try {
+        const useFvm = !noFvm;
         // Step 1: Run flutter clean
-        const flutterCommand = noFvm ? "flutter clean" : "fvm flutter clean";
         LoggerHelpers.info("Running Flutter clean...");
-        await execCommand(flutterCommand);
+        await execCommand(getFlutterCommand("flutter clean", useFvm));
         LoggerHelpers.success("Flutter clean completed.");
         // Step 2: Remove pubspec.lock using Node.js fs (cross-platform)
         const pubspecLockPath = path.join(process.cwd(), "pubspec.lock");
         if (fs.existsSync(pubspecLockPath)) {
             LoggerHelpers.info("Removing pubspec.lock...");
-            // Create backup before deletion
-            createBackup(pubspecLockPath);
+            createBackupWithCleanup(pubspecLockPath);
             fs.unlinkSync(pubspecLockPath);
             LoggerHelpers.success("pubspec.lock removed.");
         }
@@ -33,19 +34,12 @@ async function cleanProject(noFvm) {
             LoggerHelpers.info("pubspec.lock does not exist, skipping removal.");
         }
         // Step 3: Run flutter pub get
-        const pubGetCommand = noFvm ? "flutter pub get" : "fvm flutter pub get";
         LoggerHelpers.info("Running Flutter pub get...");
-        await execCommand(pubGetCommand);
+        await execCommand(getFlutterCommand("flutter pub get", useFvm));
         LoggerHelpers.success("Flutter pub get completed.");
         LoggerHelpers.success("Project cleaned successfully.");
     }
     catch (error) {
-        if (error instanceof Error) {
-            LoggerHelpers.error(`Error during clean: ${error.message}`);
-        }
-        else {
-            LoggerHelpers.error(`Error during clean: ${error}`);
-        }
-        process.exit(1);
+        handleCommandError(error, "Error during clean");
     }
 }

package/dist/commands/clean/ios.js

@@ -3,6 +3,8 @@ import * as path from "path";
 import { LoggerHelpers } from "../../utils/services/logger.js";
 import { execInIos, execCommand, iosDirectory, execInIosWithRetry } from "../../utils/services/exec.js";
 import { validateFlutterProject, validateIosProject } from "../../utils/validators/validation.js";
+import { FLUTTER_COMMANDS, FVM_COMMANDS, RETRY_CONFIG } from "../../constants.js";
+import { handleCommandError } from "../../utils/helpers/error.js";
 export { cleanIosProject };
 async function getFlutterSdkPath() {
     const fvmDir = path.join(process.cwd(), ".fvm", "flutter_sdk");
@@ -29,9 +31,13 @@ async function ensureFlutterArtifactsExist() {
     const flutterXcframeworkPath = await getFlutterXcframeworkPath();
     if (!fs.existsSync(flutterXcframeworkPath)) {
         LoggerHelpers.warning("Flutter.xcframework not found.");
+        const useFvm = fs.existsSync(path.join(process.cwd(), ".fvm", "flutter_sdk"));
+        const precacheCommand = useFvm
+            ? FVM_COMMANDS.PRECACHE_IOS
+            : FLUTTER_COMMANDS.PRECACHE_IOS;
         try {
             LoggerHelpers.info("Downloading Flutter.xcframework...");
-            await execCommand("fvm flutter precache --ios");
+            await execCommand(precacheCommand);
             LoggerHelpers.success("Flutter.xcframework has been downloaded successfully.");
         }
         catch (error) {
@@ -39,7 +45,7 @@ async function ensureFlutterArtifactsExist() {
         }
     }
     else {
-        LoggerHelpers.success("Flutter.xcframework exists. No need to run 'fvm flutter precache --ios'.");
+        LoggerHelpers.success("Flutter.xcframework exists. No need to run precache.");
     }
 }
 async function cleanIosProject(cleanCache, repoUpdate) {
@@ -73,7 +79,7 @@ async function cleanIosProject(cleanCache, repoUpdate) {
         if (repoUpdate) {
             LoggerHelpers.info("Updating CocoaPods repositories...");
             try {
-                await execInIosWithRetry("pod repo update", 3, 10000);
+                await execInIosWithRetry("pod repo update", RETRY_CONFIG.DEFAULT_ATTEMPTS, RETRY_CONFIG.DEFAULT_DELAY_MS);
                 LoggerHelpers.success("Updated CocoaPods repositories.");
             }
             catch (error) {
@@ -81,7 +87,7 @@ async function cleanIosProject(cleanCache, repoUpdate) {
             }
             LoggerHelpers.info("Installing pods with repo update...");
             try {
-                await execInIosWithRetry("pod update", 3, 10000);
+                await execInIosWithRetry("pod update", RETRY_CONFIG.DEFAULT_ATTEMPTS, RETRY_CONFIG.DEFAULT_DELAY_MS);
                 LoggerHelpers.success("Installed pods with repo update.");
             }
             catch (error) {
@@ -90,20 +96,11 @@ async function cleanIosProject(cleanCache, repoUpdate) {
         }
         else {
             LoggerHelpers.info("Installing pods without repo update...");
-            await execInIosWithRetry("pod install", 3, 10000);
+            await execInIosWithRetry("pod install", RETRY_CONFIG.DEFAULT_ATTEMPTS, RETRY_CONFIG.DEFAULT_DELAY_MS);
             LoggerHelpers.success("Installed pods without repo update.");
         }
     }
     catch (error) {
-        if (error instanceof Error) {
-            LoggerHelpers.error(`Error: ${error.message}`);
-        }
-        else if (typeof error === "string") {
-            LoggerHelpers.error(`Error: ${error}`);
-        }
-        else {
-            LoggerHelpers.error(`Unknown error: ${JSON.stringify(error)}`);
-        }
-        process.exit(1);
+        handleCommandError(error, "Error cleaning iOS project");
     }
 }