@metacells/mcellui-cli 0.1.4 → 0.2.0

package/dist/index.js

@@ -2,10 +2,84 @@
 
 // src/index.ts
 import { Command as Command9 } from "commander";
+import chalk11 from "chalk";
+
+// src/utils/errors.ts
+import chalk from "chalk";
+function handleError(error) {
+  process.stderr.write("\n");
+  process.stderr.write(chalk.red(`Error: ${error.message}
+`));
+  if (error.hint) {
+    process.stderr.write("\n");
+    process.stderr.write(chalk.dim(error.hint + "\n"));
+  }
+  process.stderr.write("\n");
+  process.exit(error.exitCode ?? 1);
+}
+var errors = {
+  /**
+   * Error when no valid project is found
+   */
+  noProject() {
+    return handleError({
+      message: "Could not find a valid Expo/React Native project",
+      hint: "Run this command from a project directory containing package.json",
+      code: "NO_PROJECT",
+      exitCode: 1
+    });
+  },
+  /**
+   * Error when project is not initialized with mcellui
+   */
+  notInitialized() {
+    return handleError({
+      message: "Project not initialized",
+      hint: "Run: npx mcellui init",
+      code: "NOT_INITIALIZED",
+      exitCode: 1
+    });
+  },
+  /**
+   * Error when component registry fetch fails
+   */
+  registryFetch(cause) {
+    return handleError({
+      message: "Failed to fetch component registry",
+      hint: cause ? `${cause}
+
+Check your internet connection and try again` : "Check your internet connection and try again",
+      code: "REGISTRY_FETCH_FAILED",
+      exitCode: 1
+    });
+  },
+  /**
+   * Error when component is not found in registry
+   */
+  componentNotFound(name) {
+    return handleError({
+      message: `Component "${name}" not found in registry`,
+      hint: "Run: npx mcellui list",
+      code: "COMPONENT_NOT_FOUND",
+      exitCode: 1
+    });
+  },
+  /**
+   * Error when configuration is invalid
+   */
+  configInvalid(detail) {
+    return handleError({
+      message: "Invalid configuration",
+      hint: detail || "Check mcellui.config.ts",
+      code: "CONFIG_INVALID",
+      exitCode: 1
+    });
+  }
+};
 
 // src/commands/init.ts
 import { Command } from "commander";
-import chalk2 from "chalk";
+import chalk3 from "chalk";
 import ora from "ora";
 import prompts from "prompts";
 import fs2 from "fs-extra";
@@ -16,7 +90,7 @@ import fs from "fs-extra";
 import path from "path";
 import { fileURLToPath } from "url";
 import createJiti from "jiti";
-import chalk from "chalk";
+import chalk2 from "chalk";
 
 // src/utils/config-schema.ts
 import { z } from "zod";
@@ -115,11 +189,11 @@ function validateConfig(config) {
   if (result.success) {
     return { success: true, data: result.data };
   }
-  const errors = result.error.issues.map((issue) => {
+  const errors2 = result.error.issues.map((issue) => {
     const path12 = issue.path.join(".");
     return path12 ? `${path12}: ${issue.message}` : issue.message;
   });
-  return { success: false, errors };
+  return { success: false, errors: errors2 };
 }
 function validateConfigOrThrow(config, configPath) {
   const result = validateConfig(config);
@@ -129,7 +203,7 @@ function validateConfigOrThrow(config, configPath) {
       `Invalid configuration in ${configPath}:
 ${errorList}
 
-See https://nativeui.dev/docs/config for valid options.`
+See https://mcellui.dev/docs/config for valid options.`
     );
   }
   return result.data;
@@ -212,27 +286,38 @@ async function detectProjectType(projectRoot) {
     return "unknown";
   }
 }
+var CONFIG_FILES = [
+  "mcellui.config.ts",
+  "mcellui.config.js",
+  "mcellui.config.json",
+  "nativeui.config.ts",
+  // Legacy
+  "nativeui.config.js",
+  // Legacy
+  "nativeui.config.json"
+  // Legacy
+];
 async function getConfig(projectRoot) {
-  const tsConfigPath = path.join(projectRoot, "nativeui.config.ts");
-  if (await fs.pathExists(tsConfigPath)) {
-    return loadTsConfig(tsConfigPath);
-  }
-  const jsConfigPath = path.join(projectRoot, "nativeui.config.js");
-  if (await fs.pathExists(jsConfigPath)) {
-    return loadJsConfig(jsConfigPath);
-  }
-  const jsonConfigPath = path.join(projectRoot, "nativeui.config.json");
-  if (await fs.pathExists(jsonConfigPath)) {
-    try {
-      const rawConfig = await fs.readJson(jsonConfigPath);
-      const validatedConfig = validateConfigOrThrow(rawConfig, jsonConfigPath);
-      return resolveConfig(validatedConfig);
-    } catch (error) {
-      if (error instanceof Error && error.message.includes("Invalid configuration")) {
-        console.error(chalk.red(error.message));
-        throw error;
+  for (const fileName of CONFIG_FILES) {
+    const configPath = path.join(projectRoot, fileName);
+    if (await fs.pathExists(configPath)) {
+      if (fileName.endsWith(".ts")) {
+        return loadTsConfig(configPath);
+      } else if (fileName.endsWith(".js")) {
+        return loadJsConfig(configPath);
+      } else if (fileName.endsWith(".json")) {
+        try {
+          const rawConfig = await fs.readJson(configPath);
+          const validatedConfig = validateConfigOrThrow(rawConfig, configPath);
+          return resolveConfig(validatedConfig);
+        } catch (error) {
+          if (error instanceof Error && error.message.includes("Invalid configuration")) {
+            console.error(chalk2.red(error.message));
+            throw error;
+          }
+          throw error;
+        }
       }
-      throw error;
     }
   }
   return null;
@@ -248,10 +333,10 @@ async function loadTsConfig(configPath) {
     return resolveConfig(validatedConfig);
   } catch (error) {
     if (error instanceof Error && error.message.includes("Invalid configuration")) {
-      console.error(chalk.red(error.message));
+      console.error(chalk2.red(error.message));
       throw error;
     }
-    console.error(chalk.red("Failed to load config:"), error);
+    console.error(chalk2.red("Failed to load config:"), error);
     return getDefaultConfig();
   }
 }
@@ -263,10 +348,10 @@ async function loadJsConfig(configPath) {
     return resolveConfig(validatedConfig);
   } catch (error) {
     if (error instanceof Error && error.message.includes("Invalid configuration")) {
-      console.error(chalk.red(error.message));
+      console.error(chalk2.red(error.message));
       throw error;
     }
-    console.error(chalk.red("Failed to load config:"), error);
+    console.error(chalk2.red("Failed to load config:"), error);
     return getDefaultConfig();
   }
 }
@@ -294,26 +379,31 @@ async function detectPackageManager(projectRoot) {
 }
 
 // src/commands/init.ts
-var initCommand = new Command().name("init").description("Initialize nativeui in your project").option("-y, --yes", "Skip prompts and use defaults").option("--cwd <path>", "Working directory", process.cwd()).action(async (options) => {
+var initCommand = new Command().name("init").description("Initialize mcellui in your project").option("-y, --yes", "Skip prompts and use defaults").option("--cwd <path>", "Working directory", process.cwd()).action(async (options) => {
   const spinner = ora();
   try {
     const cwd = path2.resolve(options.cwd);
     const projectRoot = await getProjectRoot(cwd);
     if (!projectRoot) {
-      console.log(chalk2.red("Could not find a valid Expo/React Native project."));
-      console.log(chalk2.dim("Make sure you run this command in a project with package.json"));
-      process.exit(1);
+      errors.noProject();
     }
     console.log();
-    console.log(chalk2.bold("Welcome to nativeui!"));
-    console.log(chalk2.dim("The copy-paste component library for Expo/React Native"));
+    console.log(chalk3.bold("Welcome to mcellui!"));
+    console.log(chalk3.dim("The copy-paste component library for Expo/React Native"));
     console.log();
     const projectType = await detectProjectType(projectRoot);
-    console.log(chalk2.dim(`Detected: ${projectType}`));
-    const configPath = path2.join(projectRoot, "nativeui.config.ts");
+    console.log(chalk3.dim(`Detected: ${projectType}`));
+    const configPath = path2.join(projectRoot, "mcellui.config.ts");
+    const legacyConfigPath = path2.join(projectRoot, "nativeui.config.ts");
     if (await fs2.pathExists(configPath)) {
-      console.log(chalk2.yellow("Project already initialized."));
-      console.log(chalk2.dim(`Config found at: ${configPath}`));
+      console.log(chalk3.yellow("Project already initialized."));
+      console.log(chalk3.dim(`Config found at: ${configPath}`));
+      return;
+    }
+    if (await fs2.pathExists(legacyConfigPath)) {
+      console.log(chalk3.yellow("Project already initialized with legacy config."));
+      console.log(chalk3.dim(`Config found at: ${legacyConfigPath}`));
+      console.log(chalk3.dim("Consider renaming to mcellui.config.ts"));
       return;
     }
     let config = {
@@ -346,6 +436,9 @@ var initCommand = new Command().name("init").description("Initialize nativeui in
           ]
         }
       ]);
+      if (response.componentsPath === void 0) {
+        process.exit(0);
+      }
       config = { ...config, ...response };
     }
     spinner.start("Creating configuration...");
@@ -384,7 +477,7 @@ export default defineConfig({
   // },
 
   // ============================================
-  // CLI Configuration (used by npx nativeui add)
+  // CLI Configuration (used by npx mcellui add)
   // ============================================
 
   // Path where components will be installed
@@ -454,25 +547,27 @@ export function cn(...inputs: StyleInput[]): Style {
     );
     spinner.succeed("Utilities installed");
     console.log();
-    console.log(chalk2.green("Success!") + " nativeui initialized.");
+    console.log(chalk3.green("Success!") + " mcellui initialized.");
     console.log();
     console.log("Next steps:");
-    console.log(chalk2.dim("  1."), "Add your first component:");
-    console.log(chalk2.cyan("     npx nativeui add button"));
+    console.log(chalk3.dim("  1."), "Add your first component:");
+    console.log(chalk3.cyan("     npx mcellui add button"));
     console.log();
-    console.log(chalk2.dim("  2."), "Browse available components:");
-    console.log(chalk2.cyan("     npx nativeui list"));
+    console.log(chalk3.dim("  2."), "Browse available components:");
+    console.log(chalk3.cyan("     npx mcellui list"));
     console.log();
   } catch (error) {
     spinner.fail("Failed to initialize");
-    console.error(error);
-    process.exit(1);
+    handleError({
+      message: "Initialization failed",
+      hint: error instanceof Error ? error.message : "Check file permissions and try again"
+    });
   }
 });
 
 // src/commands/add.ts
 import { Command as Command2 } from "commander";
-import chalk3 from "chalk";
+import chalk4 from "chalk";
 import ora2 from "ora";
 import prompts2 from "prompts";
 import fs5 from "fs-extra";
@@ -485,10 +580,59 @@ import { fileURLToPath as fileURLToPath2 } from "url";
 var __filename3 = fileURLToPath2(import.meta.url);
 var __dirname2 = path3.dirname(__filename3);
 var DEFAULT_REGISTRY_URL = "https://raw.githubusercontent.com/metacells-development/mcellui/main/packages/registry";
-var REGISTRY_URL = process.env.MCELLUI_REGISTRY_URL || process.env.NATIVEUI_REGISTRY_URL || DEFAULT_REGISTRY_URL;
+var hasEnvOverride = "MCELLUI_REGISTRY_URL" in process.env || "NATIVEUI_REGISTRY_URL" in process.env;
+var REGISTRY_URL = hasEnvOverride ? process.env.MCELLUI_REGISTRY_URL || process.env.NATIVEUI_REGISTRY_URL || "" : DEFAULT_REGISTRY_URL;
 function getLocalRegistryPath() {
   return path3.resolve(__dirname2, "..", "..", "registry");
 }
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+function isNetworkError(error) {
+  if (!error) return false;
+  if (error instanceof DOMException && error.name === "AbortError") {
+    return true;
+  }
+  const err = error;
+  const errorCodes = ["ECONNRESET", "ENOTFOUND", "ETIMEDOUT", "ECONNREFUSED", "ECONNABORTED"];
+  if (err.code && errorCodes.includes(err.code)) {
+    return true;
+  }
+  if (err.message && typeof err.message === "string") {
+    const message = err.message.toLowerCase();
+    if (errorCodes.some((code) => message.includes(code.toLowerCase()))) {
+      return true;
+    }
+  }
+  if (err.cause) {
+    return isNetworkError(err.cause);
+  }
+  return false;
+}
+async function fetchWithRetry(url, maxRetries = 3) {
+  let lastError;
+  for (let attempt = 1; attempt <= maxRetries; attempt++) {
+    try {
+      const controller = new AbortController();
+      const timeoutId = setTimeout(() => controller.abort(), 3e4);
+      const response = await fetch(url, {
+        signal: controller.signal
+      });
+      clearTimeout(timeoutId);
+      return response;
+    } catch (error) {
+      lastError = error;
+      if (!isNetworkError(error) || attempt === maxRetries) {
+        throw error;
+      }
+      const baseDelay = Math.min(1e3 * Math.pow(2, attempt - 1), 5e3);
+      const jitter = Math.random() * 200;
+      const delay = baseDelay + jitter;
+      await sleep(delay);
+    }
+  }
+  throw lastError;
+}
 function isLocalMode() {
   if (REGISTRY_URL) return false;
   const localPath = getLocalRegistryPath();
@@ -506,18 +650,23 @@ async function getLocalRegistry() {
     const registry = await fs3.readJson(registryPath);
     return registry.components;
   } catch (error) {
-    console.error("Failed to load local registry:", error);
-    return [];
+    throw new Error(
+      "Failed to load local registry: " + (error instanceof Error ? error.message : String(error))
+    );
   }
 }
 async function getRemoteRegistry() {
   try {
-    const response = await fetch(`${REGISTRY_URL}/registry.json`);
+    const response = await fetchWithRetry(`${REGISTRY_URL}/registry.json`);
+    if (!response.ok) {
+      throw new Error(`HTTP ${response.status}: ${response.statusText}`);
+    }
     const registry = await response.json();
     return registry.components;
   } catch (error) {
-    console.error("Failed to fetch remote registry:", error);
-    return [];
+    throw new Error(
+      "Failed to fetch registry: " + (error instanceof Error ? error.message : String(error))
+    );
   }
 }
 async function fetchComponent(name) {
@@ -552,7 +701,12 @@ async function fetchLocalComponent(item) {
 async function fetchRemoteComponent(item) {
   const files = await Promise.all(
     item.files.map(async (filePath) => {
-      const response = await fetch(`${REGISTRY_URL}/${filePath}`);
+      const response = await fetchWithRetry(`${REGISTRY_URL}/${filePath}`);
+      if (!response.ok) {
+        throw new Error(
+          `Failed to fetch ${filePath}: HTTP ${response.status} ${response.statusText}`
+        );
+      }
       const content = await response.text();
       const name = path3.basename(filePath);
       return { name, content };
@@ -621,6 +775,25 @@ function formatCircularError(chain) {
 // src/utils/installed.ts
 import fs4 from "fs-extra";
 import path4 from "path";
+
+// src/utils/imports.ts
+function transformToInstalled(code, config) {
+  if (!config) return code;
+  let result = code;
+  const utilsAlias = config.aliases?.utils || "@/lib/utils";
+  if (utilsAlias !== "@/lib/utils") {
+    result = result.replace(
+      /from ['"]@\/lib\/utils['"]/g,
+      `from '${utilsAlias}'`
+    );
+  }
+  return result;
+}
+function normalizeForComparison(content) {
+  return content.replace(/\r\n/g, "\n").replace(/\s+$/gm, "").trim();
+}
+
+// src/utils/installed.ts
 async function getInstalledFiles(componentsDir) {
   if (!await fs4.pathExists(componentsDir)) {
     return [];
@@ -637,24 +810,6 @@ async function getInstalledFiles(componentsDir) {
   }
   return componentFiles.sort();
 }
-function normalizeContent(content) {
-  return content.replace(/\r\n/g, "\n").replace(/\s+$/gm, "").trim();
-}
-function transformImports(code, config) {
-  let transformed = code;
-  transformed = transformed.replace(
-    /from ['"]@nativeui\/core['"]/g,
-    `from '@metacells/mcellui-core'`
-  );
-  const utilsAlias = config.aliases?.utils || "@/lib/utils";
-  if (utilsAlias !== "@/lib/utils") {
-    transformed = transformed.replace(
-      /from ['"]@\/lib\/utils['"]/g,
-      `from '${utilsAlias}'`
-    );
-  }
-  return transformed;
-}
 async function getInstallStatus(installedFiles, registry, config) {
   const results = [];
   const registryMap = /* @__PURE__ */ new Map();
@@ -700,10 +855,8 @@ async function getInstallStatus(installedFiles, registry, config) {
         continue;
       }
       const localContent = await fs4.readFile(localFile, "utf-8");
-      const normalizedLocal = normalizeContent(localContent);
-      const normalizedRegistry = normalizeContent(
-        transformImports(registryFile.content, config)
-      );
+      const normalizedLocal = normalizeForComparison(localContent);
+      const normalizedRegistry = normalizeForComparison(registryFile.content);
       results.push({
         name: registryItem.name,
         fileName,
@@ -736,35 +889,36 @@ var addCommand = new Command2().name("add").description("Add a component to your
     const cwd = path5.resolve(options.cwd);
     const projectRoot = await getProjectRoot(cwd);
     if (!projectRoot) {
-      console.log(chalk3.red("Could not find a valid project."));
-      console.log(chalk3.dim("Run `npx nativeui init` first."));
-      process.exit(1);
+      errors.noProject();
     }
     const config = await getConfig(projectRoot);
     if (!config) {
-      console.log(chalk3.red("Project not initialized."));
-      console.log(chalk3.dim("Run `npx nativeui init` first."));
-      process.exit(1);
+      errors.notInitialized();
     }
     if (!components.length) {
       const registry2 = await getRegistry();
       if (!registry2.length) {
-        console.log(chalk3.red("No components found in registry."));
-        process.exit(1);
+        handleError({
+          message: "No components found in registry",
+          hint: "Check your internet connection or try again later"
+        });
       }
       const { selected } = await prompts2({
         type: "multiselect",
         name: "selected",
         message: "Which components would you like to add?",
         choices: registry2.map((item) => ({
-          title: `${item.name} ${chalk3.dim(`(${item.status})`)}`,
+          title: `${item.name} ${chalk4.dim(`(${item.status})`)}`,
           value: item.name,
           description: item.description
         })),
         hint: "- Space to select, Enter to confirm"
       });
+      if (selected === void 0) {
+        process.exit(0);
+      }
       if (!selected?.length) {
-        console.log(chalk3.dim("No components selected."));
+        console.log(chalk4.dim("No components selected."));
         return;
       }
       components = selected;
@@ -774,8 +928,11 @@ var addCommand = new Command2().name("add").description("Add a component to your
     const { resolved, circular } = resolveDependencies(components, registry);
     if (circular) {
       spinner.fail("Circular dependency detected");
-      console.log(chalk3.red(`  ${formatCircularError(circular)}`));
-      process.exit(1);
+      handleError({
+        message: `Circular dependency: ${formatCircularError(circular)}`,
+        hint: "Check component dependencies for cycles",
+        code: "CIRCULAR_DEPENDENCY"
+      });
     }
     spinner.stop();
     const componentsDir = path5.join(projectRoot, config.componentsPath);
@@ -783,19 +940,19 @@ var addCommand = new Command2().name("add").description("Add a component to your
     const installedNames = new Set(getInstalledNames(installedFiles));
     const toInstall = options.overwrite ? resolved : resolved.filter((name) => !installedNames.has(name));
     if (toInstall.length === 0) {
-      console.log(chalk3.yellow("All components are already installed."));
-      console.log(chalk3.dim("Use --overwrite to reinstall."));
+      console.log(chalk4.yellow("All components are already installed."));
+      console.log(chalk4.dim("Use --overwrite to reinstall."));
       return;
     }
     const requested = new Set(components);
     const dependencies = toInstall.filter((name) => !requested.has(name));
     console.log();
-    console.log(chalk3.bold("Adding components:"));
+    console.log(chalk4.bold("Adding components:"));
     for (const name of toInstall) {
       if (requested.has(name)) {
-        console.log(chalk3.dim(`  - ${name}`));
+        console.log(chalk4.dim(`  - ${name}`));
       } else {
-        console.log(chalk3.dim(`  - ${name} ${chalk3.cyan("(dependency)")}`));
+        console.log(chalk4.dim(`  - ${name} ${chalk4.cyan("(dependency)")}`));
       }
     }
     console.log();
@@ -806,19 +963,24 @@ var addCommand = new Command2().name("add").description("Add a component to your
         message: `Add ${dependencies.length} additional dependencies?`,
         initial: true
       });
+      if (confirm === void 0) {
+        process.exit(0);
+      }
       if (!confirm) {
-        console.log(chalk3.dim("Cancelled."));
+        console.log(chalk4.dim("Cancelled."));
         return;
       }
     }
     const allDependencies = [];
     const allDevDependencies = [];
+    let failCount = 0;
     for (const componentName of toInstall) {
       spinner.start(`Fetching ${componentName}...`);
       try {
         const component = await fetchComponent(componentName);
         if (!component) {
           spinner.fail(`Component "${componentName}" not found`);
+          failCount++;
           continue;
         }
         const targetDir = path5.join(projectRoot, config.componentsPath);
@@ -829,7 +991,7 @@ var addCommand = new Command2().name("add").description("Add a component to your
             continue;
           }
           await fs5.ensureDir(targetDir);
-          const transformedContent = transformImports2(file.content, config);
+          const transformedContent = transformToInstalled(file.content, config);
           await fs5.writeFile(targetPath, transformedContent);
         }
         spinner.succeed(`Added ${componentName}`);
@@ -841,48 +1003,42 @@ var addCommand = new Command2().name("add").description("Add a component to your
         }
       } catch (error) {
         spinner.fail(`Failed to add ${componentName}`);
-        console.error(chalk3.dim(String(error)));
+        console.error(chalk4.dim(String(error)));
+        failCount++;
       }
     }
+    if (failCount > 0) {
+      process.exit(1);
+    }
     const uniqueDeps = [...new Set(allDependencies)];
     const uniqueDevDeps = [...new Set(allDevDependencies)];
     if (uniqueDeps.length || uniqueDevDeps.length) {
       console.log();
-      console.log(chalk3.bold("Install dependencies:"));
+      console.log(chalk4.bold("Install dependencies:"));
       if (uniqueDeps.length) {
-        console.log(chalk3.cyan(`  npx expo install ${uniqueDeps.join(" ")}`));
+        console.log(chalk4.cyan(`  npx expo install ${uniqueDeps.join(" ")}`));
       }
       if (uniqueDevDeps.length) {
-        console.log(chalk3.cyan(`  npm install -D ${uniqueDevDeps.join(" ")}`));
+        console.log(chalk4.cyan(`  npm install -D ${uniqueDevDeps.join(" ")}`));
       }
     }
     console.log();
-    console.log(chalk3.green("Done!"));
+    console.log(chalk4.green("Done!"));
   } catch (error) {
     spinner.fail("Failed");
-    console.error(error);
-    process.exit(1);
+    handleError({
+      message: "Failed to add components",
+      hint: error instanceof Error ? error.message : "Check your network connection and try again"
+    });
   }
 });
-function transformImports2(code, config) {
-  let transformed = code;
-  const utilsAlias = config.aliases?.utils || "@/lib/utils";
-  if (utilsAlias === "@/lib/utils") {
-    return transformed;
-  }
-  transformed = transformed.replace(
-    /from ['"]@\/lib\/utils['"]/g,
-    `from '${utilsAlias}'`
-  );
-  return transformed;
-}
 
 // src/commands/list.ts
 import { Command as Command3 } from "commander";
-import chalk4 from "chalk";
+import chalk5 from "chalk";
 import ora3 from "ora";
 import path6 from "path";
-var listCommand = new Command3().name("list").description("List available or installed components").option("-c, --category <category>", "Filter by category").option("-i, --installed", "Show installed components and their sync status").option("--cwd <path>", "Working directory", process.cwd()).action(async (options) => {
+var listCommand = new Command3().name("list").description("List available or installed components").option("-c, --category <category>", "Filter by category").option("-i, --installed", "Show installed components and their sync status").option("--json", "Output as JSON").option("--cwd <path>", "Working directory", process.cwd()).action(async (options) => {
   if (options.installed) {
     await listInstalledComponents(options);
   } else {
@@ -894,8 +1050,13 @@ async function listAvailableComponents(options) {
   try {
     const registry = await getRegistry();
     spinner.stop();
+    if (options.json) {
+      const items = options.category ? registry.filter((item) => (item.category || "Other").toLowerCase() === options.category.toLowerCase()) : registry;
+      console.log(JSON.stringify(items, null, 2));
+      return;
+    }
     console.log();
-    console.log(chalk4.bold("Available Components"));
+    console.log(chalk5.bold("Available Components"));
     console.log();
     const categories = /* @__PURE__ */ new Map();
     for (const item of registry) {
@@ -909,20 +1070,22 @@ async function listAvailableComponents(options) {
       categories.get(category).push(item);
     }
     for (const [category, items] of categories) {
-      console.log(chalk4.cyan.bold(`${category}`));
+      console.log(chalk5.cyan.bold(`${category}`));
       for (const item of items) {
-        const status = item.status === "stable" ? "" : chalk4.yellow(` [${item.status}]`);
-        console.log(`  ${chalk4.white(item.name)}${status}`);
-        console.log(chalk4.dim(`    ${item.description}`));
+        const status = item.status === "stable" ? "" : chalk5.yellow(` [${item.status}]`);
+        console.log(`  ${chalk5.white(item.name)}${status}`);
+        console.log(chalk5.dim(`    ${item.description}`));
       }
       console.log();
     }
-    console.log(chalk4.dim("Add a component: npx mcellui add <component>"));
+    console.log(chalk5.dim("Add a component: npx mcellui add <component>"));
     console.log();
   } catch (error) {
     spinner.fail("Failed to fetch components");
-    console.error(error);
-    process.exit(1);
+    handleError({
+      message: "Failed to fetch components",
+      hint: error instanceof Error ? error.message : "Check your network connection and try again"
+    });
   }
 }
 async function listInstalledComponents(options) {
@@ -931,22 +1094,23 @@ async function listInstalledComponents(options) {
     const cwd = path6.resolve(options.cwd || process.cwd());
     const projectRoot = await getProjectRoot(cwd);
     if (!projectRoot) {
-      console.log(chalk4.red("Could not find a valid project."));
-      console.log(chalk4.dim("Run `npx mcellui init` first."));
-      process.exit(1);
+      errors.noProject();
     }
     const config = await getConfig(projectRoot);
     if (!config) {
-      console.log(chalk4.red("Project not initialized."));
-      console.log(chalk4.dim("Run `npx mcellui init` first."));
-      process.exit(1);
+      errors.notInitialized();
     }
     spinner.start("Scanning installed components...");
     const componentsDir = path6.join(projectRoot, config.componentsPath);
     const installedFiles = await getInstalledFiles(componentsDir);
     if (installedFiles.length === 0) {
+      spinner.stop();
+      if (options.json) {
+        console.log(JSON.stringify([], null, 2));
+        return;
+      }
       spinner.info("No components installed yet.");
-      console.log(chalk4.dim("\nAdd components with: npx mcellui add <component>"));
+      console.log(chalk5.dim("\nAdd components with: npx mcellui add <component>"));
       return;
     }
     spinner.text = "Fetching registry...";
@@ -954,13 +1118,17 @@ async function listInstalledComponents(options) {
     spinner.text = "Comparing components...";
     const installed = await getInstallStatus(installedFiles, registry, config);
     spinner.stop();
+    if (options.json) {
+      console.log(JSON.stringify(installed, null, 2));
+      return;
+    }
     const identical = installed.filter((c) => c.status === "identical");
     const modified = installed.filter((c) => c.status === "modified");
     const localOnly = installed.filter((c) => c.status === "local-only");
     const installedNames = new Set(installed.map((c) => c.name));
     const notInstalled = registry.filter((item) => !installedNames.has(item.name));
     console.log();
-    console.log(chalk4.bold(`Installed Components (${installed.length})`));
+    console.log(chalk5.bold(`Installed Components (${installed.length})`));
     console.log();
     const categories = /* @__PURE__ */ new Map();
     for (const comp of installed) {
@@ -972,56 +1140,58 @@ async function listInstalledComponents(options) {
       categories.get(category).push(comp);
     }
     for (const [category, components] of categories) {
-      console.log(chalk4.cyan.bold(category));
+      console.log(chalk5.cyan.bold(category));
       for (const comp of components) {
         let statusIcon;
         let statusText;
         switch (comp.status) {
           case "identical":
-            statusIcon = chalk4.green("\u2713");
-            statusText = chalk4.dim("(up to date)");
+            statusIcon = chalk5.green("\u2713");
+            statusText = chalk5.dim("(up to date)");
             break;
           case "modified":
-            statusIcon = chalk4.yellow("\u26A0");
-            statusText = chalk4.yellow("(modified locally)");
+            statusIcon = chalk5.yellow("\u26A0");
+            statusText = chalk5.yellow("(modified locally)");
             break;
           case "local-only":
-            statusIcon = chalk4.blue("?");
-            statusText = chalk4.dim("(custom component)");
+            statusIcon = chalk5.blue("?");
+            statusText = chalk5.dim("(custom component)");
             break;
         }
-        console.log(`  ${statusIcon} ${chalk4.white(comp.name)}  ${statusText}`);
+        console.log(`  ${statusIcon} ${chalk5.white(comp.name)}  ${statusText}`);
       }
       console.log();
     }
     if (notInstalled.length > 0) {
-      console.log(chalk4.dim("Not Installed"));
+      console.log(chalk5.dim("Not Installed"));
       const notInstalledNames = notInstalled.map((c) => c.name).slice(0, 10);
       const remaining = notInstalled.length - 10;
-      console.log(chalk4.dim(`  ${notInstalledNames.join(", ")}${remaining > 0 ? `, ... +${remaining} more` : ""}`));
+      console.log(chalk5.dim(`  ${notInstalledNames.join(", ")}${remaining > 0 ? `, ... +${remaining} more` : ""}`));
       console.log();
     }
-    console.log(chalk4.dim("\u2500".repeat(50)));
+    console.log(chalk5.dim("\u2500".repeat(50)));
     const parts = [];
-    if (identical.length > 0) parts.push(chalk4.green(`${identical.length} up to date`));
-    if (modified.length > 0) parts.push(chalk4.yellow(`${modified.length} modified`));
-    if (localOnly.length > 0) parts.push(chalk4.blue(`${localOnly.length} custom`));
+    if (identical.length > 0) parts.push(chalk5.green(`${identical.length} up to date`));
+    if (modified.length > 0) parts.push(chalk5.yellow(`${modified.length} modified`));
+    if (localOnly.length > 0) parts.push(chalk5.blue(`${localOnly.length} custom`));
     console.log(parts.join("  \u2022  "));
     if (modified.length > 0) {
       console.log();
-      console.log(chalk4.dim("Sync modified components:"));
-      console.log(chalk4.cyan(`  npx mcellui diff`));
+      console.log(chalk5.dim("Sync modified components:"));
+      console.log(chalk5.cyan(`  npx mcellui diff`));
     }
   } catch (error) {
     spinner.fail("Failed to list installed components");
-    console.error(error);
-    process.exit(1);
+    handleError({
+      message: "Failed to list installed components",
+      hint: error instanceof Error ? error.message : "Check your network connection and try again"
+    });
   }
 }
 
 // src/commands/doctor.ts
 import { Command as Command4 } from "commander";
-import chalk5 from "chalk";
+import chalk6 from "chalk";
 import fs6 from "fs-extra";
 import path7 from "path";
 var REQUIRED_PEER_DEPS = [
@@ -1030,7 +1200,7 @@ var REQUIRED_PEER_DEPS = [
   { name: "react-native-safe-area-context", minVersion: "4.0.0" }
 ];
 var RECOMMENDED_DEPS = [
-  { name: "@nativeui/core", reason: "Theme system and utilities" }
+  { name: "@metacells/mcellui-core", reason: "Theme system and utilities" }
 ];
 function parseVersion(version) {
   const cleaned = version.replace(/^[\^~>=<]+/, "").replace(/^workspace:\*?/, "");
@@ -1075,7 +1245,7 @@ async function checkProjectType(projectRoot) {
       name: "Project Type",
       status: "fail",
       message: "Not an Expo or React Native project",
-      fix: "nativeui requires Expo or React Native"
+      fix: "mcellui requires Expo or React Native"
     };
   }
   return {
@@ -1086,23 +1256,39 @@ async function checkProjectType(projectRoot) {
 }
 async function checkInitialized(projectRoot) {
   const configFiles = [
+    "mcellui.config.ts",
+    "mcellui.config.js",
+    "mcellui.config.json",
     "nativeui.config.ts",
+    // Legacy
     "nativeui.config.js",
+    // Legacy
     "nativeui.config.json"
+    // Legacy
   ];
   let foundConfig = null;
+  let isLegacy = false;
   for (const file of configFiles) {
     if (await fs6.pathExists(path7.join(projectRoot, file))) {
       foundConfig = file;
+      isLegacy = file.startsWith("nativeui.");
       break;
     }
   }
   if (!foundConfig) {
     return {
-      name: "NativeUI Config",
+      name: "mcellui Config",
       status: "fail",
-      message: "nativeui.config.ts not found",
-      fix: "Run: npx nativeui init"
+      message: "mcellui.config.ts not found",
+      fix: "Run: npx mcellui init"
+    };
+  }
+  if (isLegacy) {
+    return {
+      name: "mcellui Config",
+      status: "warn",
+      message: `Found legacy config: ${foundConfig}`,
+      fix: "Consider renaming to mcellui.config.ts"
     };
   }
   try {
@@ -1113,7 +1299,7 @@ async function checkInitialized(projectRoot) {
       const hasExport = content.includes("export default");
       if (!hasExport) {
         return {
-          name: "NativeUI Config",
+          name: "mcellui Config",
           status: "warn",
           message: "Config file missing default export",
           fix: "Add: export default defineConfig({ ... })"
@@ -1121,7 +1307,7 @@ async function checkInitialized(projectRoot) {
       }
       if (!hasDefineConfig) {
         return {
-          name: "NativeUI Config",
+          name: "mcellui Config",
           status: "warn",
           message: "Config not using defineConfig helper",
           fix: "Wrap config with: defineConfig({ ... })"
@@ -1133,21 +1319,21 @@ async function checkInitialized(projectRoot) {
         JSON.parse(content);
       } catch {
         return {
-          name: "NativeUI Config",
+          name: "mcellui Config",
           status: "fail",
           message: "Invalid JSON in config file",
-          fix: "Check JSON syntax in nativeui.config.json"
+          fix: "Check JSON syntax in mcellui.config.json"
         };
       }
     }
     return {
-      name: "NativeUI Config",
+      name: "mcellui Config",
       status: "pass",
       message: `Found ${foundConfig}`
     };
   } catch (error) {
     return {
-      name: "NativeUI Config",
+      name: "mcellui Config",
       status: "fail",
       message: "Could not read config file",
       fix: error instanceof Error ? error.message : "Check file permissions"
@@ -1159,7 +1345,14 @@ async function checkPaths(projectRoot) {
   const defaultUtilsPath = "./lib/utils";
   let componentsPathValue = defaultComponentsPath;
   let utilsPathValue = defaultUtilsPath;
-  const configFiles = ["nativeui.config.ts", "nativeui.config.js", "nativeui.config.json"];
+  const configFiles = [
+    "mcellui.config.ts",
+    "mcellui.config.js",
+    "mcellui.config.json",
+    "nativeui.config.ts",
+    "nativeui.config.js",
+    "nativeui.config.json"
+  ];
   for (const file of configFiles) {
     const configPath = path7.join(projectRoot, file);
     if (await fs6.pathExists(configPath)) {
@@ -1183,7 +1376,7 @@ async function checkPaths(projectRoot) {
       name: "Component Paths",
       status: "warn",
       message: "Component and utils directories not created yet",
-      fix: `Add a component: npx nativeui add button`
+      fix: `Add a component: npx mcellui add button`
     };
   }
   if (!componentsExist) {
@@ -1191,7 +1384,7 @@ async function checkPaths(projectRoot) {
       name: "Component Paths",
       status: "warn",
       message: `Components directory not found: ${componentsPathValue}`,
-      fix: "Add a component to create it: npx nativeui add button"
+      fix: "Add a component to create it: npx mcellui add button"
     };
   }
   return {
@@ -1379,43 +1572,43 @@ async function checkExpoGo(projectRoot) {
 }
 function printReport(report) {
   console.log();
-  console.log(chalk5.bold("NativeUI Doctor"));
-  console.log(chalk5.dim("Checking your project setup..."));
+  console.log(chalk6.bold("mcellui Doctor"));
+  console.log(chalk6.dim("Checking your project setup..."));
   console.log();
-  console.log(chalk5.dim("Project:"), report.projectRoot);
-  console.log(chalk5.dim("Type:"), report.projectType);
-  console.log(chalk5.dim("Package Manager:"), report.packageManager);
+  console.log(chalk6.dim("Project:"), report.projectRoot);
+  console.log(chalk6.dim("Type:"), report.projectType);
+  console.log(chalk6.dim("Package Manager:"), report.packageManager);
   console.log();
-  console.log(chalk5.bold("Checks"));
+  console.log(chalk6.bold("Checks"));
   console.log();
   for (const check of report.checks) {
-    const icon = check.status === "pass" ? chalk5.green("\u2713") : check.status === "warn" ? chalk5.yellow("!") : chalk5.red("\u2717");
-    const statusColor = check.status === "pass" ? chalk5.green : check.status === "warn" ? chalk5.yellow : chalk5.red;
-    console.log(`  ${icon} ${chalk5.white(check.name)}`);
+    const icon = check.status === "pass" ? chalk6.green("\u2713") : check.status === "warn" ? chalk6.yellow("!") : chalk6.red("\u2717");
+    const statusColor = check.status === "pass" ? chalk6.green : check.status === "warn" ? chalk6.yellow : chalk6.red;
+    console.log(`  ${icon} ${chalk6.white(check.name)}`);
     console.log(`    ${statusColor(check.message)}`);
     if (check.fix && check.status !== "pass") {
-      console.log(chalk5.dim(`    Fix: ${check.fix}`));
+      console.log(chalk6.dim(`    Fix: ${check.fix}`));
     }
   }
   console.log();
   const summaryParts = [];
   if (report.passed > 0) {
-    summaryParts.push(chalk5.green(`${report.passed} passed`));
+    summaryParts.push(chalk6.green(`${report.passed} passed`));
   }
   if (report.warnings > 0) {
-    summaryParts.push(chalk5.yellow(`${report.warnings} warnings`));
+    summaryParts.push(chalk6.yellow(`${report.warnings} warnings`));
   }
   if (report.failed > 0) {
-    summaryParts.push(chalk5.red(`${report.failed} failed`));
+    summaryParts.push(chalk6.red(`${report.failed} failed`));
   }
-  console.log(chalk5.bold("Summary:"), summaryParts.join(", "));
+  console.log(chalk6.bold("Summary:"), summaryParts.join(", "));
   console.log();
   if (report.failed > 0) {
-    console.log(chalk5.red("Some checks failed. Please fix the issues above."));
+    console.log(chalk6.red("Some checks failed. Please fix the issues above."));
   } else if (report.warnings > 0) {
-    console.log(chalk5.yellow("Your project has some warnings but should work."));
+    console.log(chalk6.yellow("Your project has some warnings but should work."));
   } else {
-    console.log(chalk5.green("Your project is properly configured!"));
+    console.log(chalk6.green("Your project is properly configured!"));
   }
   console.log();
 }
@@ -1424,9 +1617,7 @@ var doctorCommand = new Command4().name("doctor").description("Check project set
     const cwd = path7.resolve(options.cwd);
     const projectRoot = await getProjectRoot(cwd);
     if (!projectRoot) {
-      console.log(chalk5.red("Could not find a valid project."));
-      console.log(chalk5.dim("Make sure you run this command in a project directory."));
-      process.exit(1);
+      errors.noProject();
     }
     const projectType = await detectProjectType(projectRoot);
     const packageManager = await detectPackageManager(projectRoot);
@@ -1464,14 +1655,16 @@ var doctorCommand = new Command4().name("doctor").description("Check project set
       process.exit(1);
     }
   } catch (error) {
-    console.error(chalk5.red("Doctor check failed:"), error);
-    process.exit(1);
+    handleError({
+      message: "Doctor check failed",
+      hint: error instanceof Error ? error.message : "Run again with --json for details"
+    });
   }
 });
 
 // src/commands/diff.ts
 import { Command as Command5 } from "commander";
-import chalk6 from "chalk";
+import chalk7 from "chalk";
 import ora4 from "ora";
 import fs7 from "fs-extra";
 import path8 from "path";
@@ -1482,22 +1675,18 @@ var diffCommand = new Command5().name("diff").description("Compare locally insta
     const cwd = path8.resolve(options.cwd);
     const projectRoot = await getProjectRoot(cwd);
     if (!projectRoot) {
-      console.log(chalk6.red("Could not find a valid project."));
-      console.log(chalk6.dim("Run `npx mcellui init` first."));
-      process.exit(1);
+      errors.noProject();
     }
     const config = await getConfig(projectRoot);
     if (!config) {
-      console.log(chalk6.red("Project not initialized."));
-      console.log(chalk6.dim("Run `npx mcellui init` first."));
-      process.exit(1);
+      errors.notInitialized();
     }
     spinner.start("Scanning installed components...");
     const componentsDir = path8.join(projectRoot, config.componentsPath);
     const installedFiles = await getInstalledFiles(componentsDir);
     if (installedFiles.length === 0) {
       spinner.info("No components installed yet.");
-      console.log(chalk6.dim("\nAdd components with: npx mcellui add <component>"));
+      console.log(chalk7.dim("\nAdd components with: npx mcellui add <component>"));
       return;
     }
     spinner.text = "Fetching registry...";
@@ -1519,8 +1708,11 @@ var diffCommand = new Command5().name("diff").description("Compare locally insta
         return componentFileNames.includes(fileName);
       });
       if (filesToCompare.length === 0) {
-        spinner.fail(`None of the specified components found: ${components.join(", ")}`);
-        process.exit(1);
+        spinner.stop();
+        handleError({
+          message: "None of the specified components are installed",
+          hint: "Check component names: npx mcellui list --installed"
+        });
       }
     }
     spinner.text = "Comparing components...";
@@ -1560,10 +1752,8 @@ var diffCommand = new Command5().name("diff").description("Compare locally insta
           continue;
         }
         const localContent = await fs7.readFile(localFile, "utf-8");
-        const normalizedLocal = normalizeContent(localContent);
-        const normalizedRegistry = normalizeContent(
-          transformImports(registryFile.content, config)
-        );
+        const normalizedLocal = normalizeForComparison(localContent);
+        const normalizedRegistry = normalizeForComparison(registryFile.content);
         if (normalizedLocal === normalizedRegistry) {
           results.push({
             name: registryItem.name,
@@ -1606,35 +1796,37 @@ var diffCommand = new Command5().name("diff").description("Compare locally insta
     const hasChanges = results.some((r) => r.status === "modified");
     process.exit(hasChanges ? 1 : 0);
   } catch (error) {
-    spinner.fail("Failed to diff components");
-    console.error(error);
-    process.exit(1);
+    spinner.stop();
+    handleError({
+      message: "Failed to diff components",
+      hint: error instanceof Error ? error.message : "Check your network connection"
+    });
   }
 });
 function printResults(results, listOnly) {
   const identical = results.filter((r) => r.status === "identical");
   const modified = results.filter((r) => r.status === "modified");
   const localOnly = results.filter((r) => r.status === "local-only");
-  const errors = results.filter((r) => r.status === "error");
+  const errors2 = results.filter((r) => r.status === "error");
   console.log();
-  console.log(chalk6.bold("Comparing components..."));
+  console.log(chalk7.bold("Comparing components..."));
   console.log();
   for (const result of results) {
     switch (result.status) {
       case "identical":
-        console.log(`${chalk6.green("\u2713")} ${result.fileName}    ${chalk6.dim("(identical)")}`);
+        console.log(`${chalk7.green("\u2713")} ${result.fileName}    ${chalk7.dim("(identical)")}`);
         break;
       case "modified":
-        console.log(`${chalk6.red("\u2717")} ${result.fileName}      ${chalk6.yellow("(modified)")}`);
+        console.log(`${chalk7.red("\u2717")} ${result.fileName}      ${chalk7.yellow("(modified)")}`);
         if (!listOnly && result.diff) {
           printColoredDiff(result.diff);
         }
         break;
       case "local-only":
-        console.log(`${chalk6.yellow("\u26A0")} ${result.fileName}    ${chalk6.dim("(not in registry)")}`);
+        console.log(`${chalk7.yellow("\u26A0")} ${result.fileName}    ${chalk7.dim("(not in registry)")}`);
         break;
       case "error":
-        console.log(`${chalk6.red("!")} ${result.fileName}    ${chalk6.red(`(error: ${result.error})`)}`);
+        console.log(`${chalk7.red("!")} ${result.fileName}    ${chalk7.red(`(error: ${result.error})`)}`);
         break;
     }
   }
@@ -1643,12 +1835,12 @@ function printResults(results, listOnly) {
   if (identical.length > 0) parts.push(`${identical.length} identical`);
   if (modified.length > 0) parts.push(`${modified.length} modified`);
   if (localOnly.length > 0) parts.push(`${localOnly.length} custom`);
-  if (errors.length > 0) parts.push(`${errors.length} errors`);
-  console.log(chalk6.dim(`Summary: ${parts.join(", ")}`));
+  if (errors2.length > 0) parts.push(`${errors2.length} errors`);
+  console.log(chalk7.dim(`Summary: ${parts.join(", ")}`));
   if (modified.length > 0) {
     console.log();
-    console.log(chalk6.dim("Update modified components with:"));
-    console.log(chalk6.cyan(`  npx mcellui add ${modified.map((m) => m.name).join(" ")} --overwrite`));
+    console.log(chalk7.dim("Update modified components with:"));
+    console.log(chalk7.cyan(`  npx mcellui add ${modified.map((m) => m.name).join(" ")} --overwrite`));
   }
 }
 function printColoredDiff(diffOutput) {
@@ -1656,47 +1848,42 @@ function printColoredDiff(diffOutput) {
   const contentLines = lines.slice(4);
   for (const line of contentLines) {
     if (line.startsWith("+") && !line.startsWith("+++")) {
-      console.log(chalk6.green(`    ${line}`));
+      console.log(chalk7.green(`    ${line}`));
     } else if (line.startsWith("-") && !line.startsWith("---")) {
-      console.log(chalk6.red(`    ${line}`));
+      console.log(chalk7.red(`    ${line}`));
     } else if (line.startsWith("@@")) {
-      console.log(chalk6.cyan(`    ${line}`));
+      console.log(chalk7.cyan(`    ${line}`));
     } else if (line.trim()) {
-      console.log(chalk6.dim(`    ${line}`));
+      console.log(chalk7.dim(`    ${line}`));
     }
   }
 }
 
 // src/commands/update.ts
 import { Command as Command6 } from "commander";
-import chalk7 from "chalk";
+import chalk8 from "chalk";
 import ora5 from "ora";
 import prompts3 from "prompts";
 import fs8 from "fs-extra";
 import path9 from "path";
-import crypto from "crypto";
 var updateCommand = new Command6().name("update").description("Update installed components to latest registry versions").argument("[components...]", "Specific components to update (default: all outdated)").option("-y, --yes", "Skip confirmation prompt").option("--all", "Update all components (including up-to-date)").option("--dry-run", "Show what would be updated without making changes").option("--cwd <path>", "Working directory", process.cwd()).action(async (components, options) => {
   const spinner = ora5();
   try {
     const cwd = path9.resolve(options.cwd);
     const projectRoot = await getProjectRoot(cwd);
     if (!projectRoot) {
-      console.log(chalk7.red("Could not find a valid project."));
-      console.log(chalk7.dim("Run `npx nativeui init` first."));
-      process.exit(1);
+      errors.noProject();
     }
     const config = await getConfig(projectRoot);
     if (!config) {
-      console.log(chalk7.red("Project not initialized."));
-      console.log(chalk7.dim("Run `npx nativeui init` first."));
-      process.exit(1);
+      errors.notInitialized();
     }
     spinner.start("Checking for updates...");
     const componentsDir = path9.join(projectRoot, config.componentsPath);
     const diffs = await getComponentDiffs(componentsDir, config);
     if (diffs.length === 0) {
       spinner.info("No components installed yet.");
-      console.log(chalk7.dim("\nAdd components with: npx nativeui add <component>"));
+      console.log(chalk8.dim("\nAdd components with: npx mcellui add <component>"));
       return;
     }
     spinner.stop();
@@ -1705,7 +1892,7 @@ var updateCommand = new Command6().name("update").description("Update installed
       toUpdate = diffs.filter((d) => components.includes(d.name));
       const notFound = components.filter((c) => !diffs.some((d) => d.name === c));
       if (notFound.length > 0) {
-        console.log(chalk7.yellow(`Components not found: ${notFound.join(", ")}`));
+        console.log(chalk8.yellow(`Components not found: ${notFound.join(", ")}`));
       }
     } else if (options.all) {
       toUpdate = diffs;
@@ -1713,19 +1900,19 @@ var updateCommand = new Command6().name("update").description("Update installed
       toUpdate = diffs.filter((d) => d.hasUpdate);
     }
     if (toUpdate.length === 0) {
-      console.log(chalk7.green("\n\u2713 All components are up to date!"));
+      console.log(chalk8.green("\n\u2713 All components are up to date!"));
       return;
     }
     console.log();
-    console.log(chalk7.bold(`Components to update (${toUpdate.length}):`));
+    console.log(chalk8.bold(`Components to update (${toUpdate.length}):`));
     for (const comp of toUpdate) {
-      const status = comp.hasUpdate ? chalk7.yellow("\u25CF") : chalk7.green("\u25CF");
-      const label = comp.hasUpdate ? chalk7.dim("(update available)") : chalk7.dim("(re-sync)");
+      const status = comp.hasUpdate ? chalk8.yellow("\u25CF") : chalk8.green("\u25CF");
+      const label = comp.hasUpdate ? chalk8.dim("(update available)") : chalk8.dim("(re-sync)");
       console.log(`  ${status} ${comp.name} ${label}`);
     }
     console.log();
     if (options.dryRun) {
-      console.log(chalk7.dim("Dry run mode - no changes made."));
+      console.log(chalk8.dim("Dry run mode - no changes made."));
       return;
     }
     if (!options.yes) {
@@ -1735,8 +1922,11 @@ var updateCommand = new Command6().name("update").description("Update installed
         message: `Update ${toUpdate.length} component${toUpdate.length !== 1 ? "s" : ""}?`,
         initial: true
       });
+      if (confirm === void 0) {
+        process.exit(0);
+      }
       if (!confirm) {
-        console.log(chalk7.dim("Cancelled."));
+        console.log(chalk8.dim("Cancelled."));
         return;
       }
     }
@@ -1758,7 +1948,7 @@ var updateCommand = new Command6().name("update").description("Update installed
         for (const file of component.files) {
           const targetPath = path9.join(targetDir, file.name);
           await fs8.ensureDir(targetDir);
-          const transformedContent = transformImports3(file.content, config);
+          const transformedContent = transformToInstalled(file.content, config);
           await fs8.writeFile(targetPath, transformedContent);
         }
         spinner.succeed(`Updated ${comp.name}`);
@@ -1776,27 +1966,32 @@ var updateCommand = new Command6().name("update").description("Update installed
     }
     console.log();
     if (successCount > 0) {
-      console.log(chalk7.green(`\u2713 Updated ${successCount} component${successCount !== 1 ? "s" : ""}`));
+      console.log(chalk8.green(`\u2713 Updated ${successCount} component${successCount !== 1 ? "s" : ""}`));
     }
     if (failCount > 0) {
-      console.log(chalk7.red(`\u2717 Failed to update ${failCount} component${failCount !== 1 ? "s" : ""}`));
+      console.log(chalk8.red(`\u2717 Failed to update ${failCount} component${failCount !== 1 ? "s" : ""}`));
     }
     const uniqueDeps = [...new Set(allDependencies)];
     const uniqueDevDeps = [...new Set(allDevDependencies)];
     if (uniqueDeps.length || uniqueDevDeps.length) {
       console.log();
-      console.log(chalk7.bold("Install/update dependencies:"));
+      console.log(chalk8.bold("Install/update dependencies:"));
       if (uniqueDeps.length) {
-        console.log(chalk7.cyan(`  npx expo install ${uniqueDeps.join(" ")}`));
+        console.log(chalk8.cyan(`  npx expo install ${uniqueDeps.join(" ")}`));
       }
       if (uniqueDevDeps.length) {
-        console.log(chalk7.cyan(`  npm install -D ${uniqueDevDeps.join(" ")}`));
+        console.log(chalk8.cyan(`  npm install -D ${uniqueDevDeps.join(" ")}`));
       }
     }
+    if (failCount > 0) {
+      process.exit(1);
+    }
   } catch (error) {
     spinner.fail("Failed to update");
-    console.error(error);
-    process.exit(1);
+    handleError({
+      message: "Failed to update components",
+      hint: error instanceof Error ? error.message : "Check your network connection and try again"
+    });
   }
 });
 async function getComponentDiffs(componentsDir, config) {
@@ -1842,34 +2037,17 @@ async function checkForUpdate(localFile, registryItem, config) {
     const registryFile = component.files.find((f) => f.name === fileName);
     if (!registryFile) return false;
     const localContent = await fs8.readFile(localFile, "utf-8");
-    const transformedRegistryContent = transformImports3(registryFile.content, config);
-    const localHash = hashContent(localContent);
-    const registryHash = hashContent(transformedRegistryContent);
-    return localHash !== registryHash;
+    const normalizedLocal = normalizeForComparison(localContent);
+    const normalizedRegistry = normalizeForComparison(registryFile.content);
+    return normalizedLocal !== normalizedRegistry;
   } catch {
     return false;
   }
 }
-function hashContent(content) {
-  const normalized = content.replace(/\r\n/g, "\n").replace(/\s+$/gm, "").trim();
-  return crypto.createHash("md5").update(normalized).digest("hex");
-}
-function transformImports3(code, config) {
-  let transformed = code;
-  const utilsAlias = config.aliases?.utils || "@/lib/utils";
-  if (utilsAlias === "@/lib/utils") {
-    return transformed;
-  }
-  transformed = transformed.replace(
-    /from ['"]@\/lib\/utils['"]/g,
-    `from '${utilsAlias}'`
-  );
-  return transformed;
-}
 
 // src/commands/create.ts
 import { Command as Command7 } from "commander";
-import chalk8 from "chalk";
+import chalk9 from "chalk";
 import ora6 from "ora";
 import prompts4 from "prompts";
 import fs9 from "fs-extra";
@@ -1880,33 +2058,31 @@ var createCommand = new Command7().name("create").description("Scaffold a new cu
     const cwd = path10.resolve(options.cwd);
     const projectRoot = await getProjectRoot(cwd);
     if (!projectRoot) {
-      console.log(chalk8.red("Could not find a valid project."));
-      console.log(chalk8.dim("Run `npx nativeui init` first."));
-      process.exit(1);
+      errors.noProject();
     }
     const config = await getConfig(projectRoot);
     if (!config) {
-      console.log(chalk8.red("Project not initialized."));
-      console.log(chalk8.dim("Run `npx nativeui init` first."));
-      process.exit(1);
+      errors.notInitialized();
     }
     const componentName = toPascalCase(name);
     const fileName = toKebabCase(name) + ".tsx";
     const targetDir = path10.join(projectRoot, config.componentsPath);
     const targetPath = path10.join(targetDir, fileName);
     if (await fs9.pathExists(targetPath)) {
-      console.log(chalk8.red(`Component already exists: ${fileName}`));
-      console.log(chalk8.dim(`Path: ${targetPath}`));
-      process.exit(1);
+      handleError({
+        message: `Component already exists: ${fileName}`,
+        hint: "Choose a different name or delete the existing file",
+        code: "COMPONENT_EXISTS"
+      });
     }
     if (!options.yes) {
       console.log();
-      console.log(chalk8.bold("Create new component:"));
-      console.log(`  Name: ${chalk8.cyan(componentName)}`);
-      console.log(`  File: ${chalk8.dim(fileName)}`);
-      console.log(`  Path: ${chalk8.dim(targetPath)}`);
-      console.log(`  Template: ${chalk8.dim(options.template)}`);
-      console.log(`  ForwardRef: ${chalk8.dim(options.forwardRef ? "Yes" : "No")}`);
+      console.log(chalk9.bold("Create new component:"));
+      console.log(`  Name: ${chalk9.cyan(componentName)}`);
+      console.log(`  File: ${chalk9.dim(fileName)}`);
+      console.log(`  Path: ${chalk9.dim(targetPath)}`);
+      console.log(`  Template: ${chalk9.dim(options.template)}`);
+      console.log(`  ForwardRef: ${chalk9.dim(options.forwardRef ? "Yes" : "No")}`);
       console.log();
       const { confirm } = await prompts4({
         type: "confirm",
@@ -1914,8 +2090,11 @@ var createCommand = new Command7().name("create").description("Scaffold a new cu
         message: "Create this component?",
         initial: true
       });
+      if (confirm === void 0) {
+        process.exit(0);
+      }
       if (!confirm) {
-        console.log(chalk8.dim("Cancelled."));
+        console.log(chalk9.dim("Cancelled."));
         return;
       }
     }
@@ -1925,15 +2104,17 @@ var createCommand = new Command7().name("create").description("Scaffold a new cu
     await fs9.writeFile(targetPath, code);
     spinner.succeed(`Created ${fileName}`);
     console.log();
-    console.log(chalk8.bold("Next steps:"));
-    console.log(`  1. Edit your component: ${chalk8.cyan(targetPath)}`);
+    console.log(chalk9.bold("Next steps:"));
+    console.log(`  1. Edit your component: ${chalk9.cyan(targetPath)}`);
     console.log(`  2. Import it in your app:`);
-    console.log(chalk8.dim(`     import { ${componentName} } from '${config.aliases?.components || "@/components"}/ui/${toKebabCase(name)}';`));
+    console.log(chalk9.dim(`     import { ${componentName} } from '${config.aliases?.components || "@/components"}/ui/${toKebabCase(name)}';`));
     console.log();
   } catch (error) {
     spinner.fail("Failed to create component");
-    console.error(error);
-    process.exit(1);
+    handleError({
+      message: "Failed to create component",
+      hint: error instanceof Error ? error.message : "Check file permissions and try again"
+    });
   }
 });
 function toPascalCase(str) {
@@ -1955,7 +2136,7 @@ function generateBasicComponent(name, forwardRef) {
   if (forwardRef) {
     return `import React, { forwardRef } from 'react';
 import { View, Text, StyleSheet, ViewProps } from 'react-native';
-import { useTheme } from '@nativeui/core';
+import { useTheme } from '@metacells/mcellui-core';
 
 export interface ${name}Props extends ViewProps {
   /**
@@ -1967,7 +2148,7 @@ export interface ${name}Props extends ViewProps {
 /**
  * ${name}
  *
- * A custom component created with nativeui create.
+ * A custom component created with mcellui create.
  *
  * @example
  * \`\`\`tsx
@@ -2015,7 +2196,7 @@ const styles = StyleSheet.create({
   }
   return `import React from 'react';
 import { View, Text, StyleSheet, ViewProps } from 'react-native';
-import { useTheme } from '@nativeui/core';
+import { useTheme } from '@metacells/mcellui-core';
 
 export interface ${name}Props extends ViewProps {
   /**
@@ -2027,7 +2208,7 @@ export interface ${name}Props extends ViewProps {
 /**
  * ${name}
  *
- * A custom component created with nativeui create.
+ * A custom component created with mcellui create.
  *
  * @example
  * \`\`\`tsx
@@ -2082,7 +2263,7 @@ import Animated, {
   useSharedValue,
   withSpring,
 } from 'react-native-reanimated';
-import { useTheme } from '@nativeui/core';
+import { useTheme } from '@metacells/mcellui-core';
 
 export interface ${name}Props extends ViewProps {
   /**
@@ -2094,7 +2275,7 @@ export interface ${name}Props extends ViewProps {
 /**
  * ${name}
  *
- * An animated component created with nativeui create.
+ * An animated component created with mcellui create.
  *
  * @example
  * \`\`\`tsx
@@ -2151,7 +2332,7 @@ import Animated, {
   useSharedValue,
   withTiming,
 } from 'react-native-reanimated';
-import { useTheme } from '@nativeui/core';
+import { useTheme } from '@metacells/mcellui-core';
 
 const AnimatedPressable = Animated.createAnimatedComponent(Pressable);
 
@@ -2169,7 +2350,7 @@ export interface ${name}Props extends Omit<PressableProps, 'style'> {
 /**
  * ${name}
  *
- * A pressable component created with nativeui create.
+ * A pressable component created with mcellui create.
  *
  * @example
  * \`\`\`tsx
@@ -2244,7 +2425,7 @@ import Animated, {
   useSharedValue,
   withTiming,
 } from 'react-native-reanimated';
-import { useTheme } from '@nativeui/core';
+import { useTheme } from '@metacells/mcellui-core';
 
 const AnimatedPressable = Animated.createAnimatedComponent(Pressable);
 
@@ -2262,7 +2443,7 @@ export interface ${name}Props extends Omit<PressableProps, 'style'> {
 /**
  * ${name}
  *
- * A pressable component created with nativeui create.
+ * A pressable component created with mcellui create.
  *
  * @example
  * \`\`\`tsx
@@ -2334,7 +2515,7 @@ import Animated, {
   useSharedValue,
   withTiming,
 } from 'react-native-reanimated';
-import { useTheme } from '@nativeui/core';
+import { useTheme } from '@metacells/mcellui-core';
 
 export interface ${name}Props extends TextInputProps {
   /**
@@ -2350,7 +2531,7 @@ export interface ${name}Props extends TextInputProps {
 /**
  * ${name}
  *
- * A custom input component created with nativeui create.
+ * A custom input component created with mcellui create.
  *
  * @example
  * \`\`\`tsx
@@ -2459,7 +2640,7 @@ import Animated, {
   useSharedValue,
   withTiming,
 } from 'react-native-reanimated';
-import { useTheme } from '@nativeui/core';
+import { useTheme } from '@metacells/mcellui-core';
 
 export interface ${name}Props extends TextInputProps {
   /**
@@ -2475,7 +2656,7 @@ export interface ${name}Props extends TextInputProps {
 /**
  * ${name}
  *
- * A custom input component created with nativeui create.
+ * A custom input component created with mcellui create.
  *
  * @example
  * \`\`\`tsx
@@ -2575,7 +2756,7 @@ const styles = StyleSheet.create({
 
 // src/commands/pick.ts
 import { Command as Command8 } from "commander";
-import chalk9 from "chalk";
+import chalk10 from "chalk";
 import prompts5 from "prompts";
 import ora7 from "ora";
 import fs10 from "fs-extra";
@@ -2627,7 +2808,7 @@ function formatCategoryName(category) {
 }
 function formatComponentChoice(item, installed) {
   const isInstalled = installed.has(item.name);
-  const status = isInstalled ? chalk9.green(" \u2713") : "";
+  const status = isInstalled ? chalk10.green(" \u2713") : "";
   const description = item.description || "";
   return {
     title: `${item.name}${status}`,
@@ -2636,37 +2817,25 @@ function formatComponentChoice(item, installed) {
     disabled: isInstalled
   };
 }
-function transformImports4(code, config) {
-  let transformed = code;
-  const utilsAlias = config.aliases?.utils || "@/lib/utils";
-  if (utilsAlias === "@/lib/utils") {
-    return transformed;
-  }
-  transformed = transformed.replace(
-    /from ['"]@\/lib\/utils['"]/g,
-    `from '${utilsAlias}'`
-  );
-  return transformed;
-}
 var pickCommand = new Command8().name("pick").description("Interactively browse and select components to add").option("--all", "Show all components without category selection").option("-o, --overwrite", "Overwrite existing files").option("--cwd <path>", "Working directory", process.cwd()).action(async (options) => {
-  console.log(chalk9.bold("\n\u{1F3A8} nativeui Component Picker\n"));
+  console.log(chalk10.bold("\n\u{1F3A8} mcellui Component Picker\n"));
   const cwd = path11.resolve(options.cwd);
   const projectRoot = await getProjectRoot(cwd);
   if (!projectRoot) {
-    console.log(chalk9.red("Could not find a valid project."));
-    console.log(chalk9.dim("Run `npx nativeui init` first.\n"));
-    return;
+    errors.noProject();
   }
   const config = await getConfig(projectRoot);
   if (!config) {
-    console.log(chalk9.yellow("No nativeui.config.ts found. Run `npx nativeui init` first.\n"));
-    return;
+    errors.notInitialized();
   }
   const spinner = ora7("Loading component registry...").start();
   const registry = await getRegistry();
   if (!registry.length) {
-    spinner.fail("Could not load registry");
-    return;
+    spinner.stop();
+    handleError({
+      message: "Could not load component registry",
+      hint: "Check your internet connection and try again"
+    });
   }
   spinner.succeed(`Loaded ${registry.length} components`);
   const componentsDir = path11.join(projectRoot, config.componentsPath);
@@ -2696,8 +2865,11 @@ var pickCommand = new Command8().name("pick").description("Interactively browse
       message: "Select a category",
       choices: categoryChoices
     });
+    if (categoryResponse.category === void 0) {
+      process.exit(0);
+    }
     if (!categoryResponse.category) {
-      console.log(chalk9.yellow("\nCancelled.\n"));
+      console.log(chalk10.yellow("\nCancelled.\n"));
       return;
     }
     selectedCategory = categoryResponse.category;
@@ -2710,10 +2882,10 @@ var pickCommand = new Command8().name("pick").description("Interactively browse
   );
   const availableCount = componentChoices.filter((c) => !c.disabled).length;
   if (availableCount === 0) {
-    console.log(chalk9.green("\n\u2713 All components in this category are already installed!\n"));
+    console.log(chalk10.green("\n\u2713 All components in this category are already installed!\n"));
     return;
   }
-  console.log(chalk9.dim(`
+  console.log(chalk10.dim(`
 ${installed.size} already installed, ${availableCount} available
 `));
   const componentResponse = await prompts5({
@@ -2724,14 +2896,17 @@ ${installed.size} already installed, ${availableCount} available
     hint: "- Space to select. Return to submit",
     instructions: false
   });
+  if (componentResponse.components === void 0) {
+    process.exit(0);
+  }
   if (!componentResponse.components || componentResponse.components.length === 0) {
-    console.log(chalk9.yellow("\nNo components selected.\n"));
+    console.log(chalk10.yellow("\nNo components selected.\n"));
     return;
   }
   const selectedComponents = componentResponse.components;
-  console.log(chalk9.bold("\nComponents to install:"));
+  console.log(chalk10.bold("\nComponents to install:"));
   for (const name of selectedComponents) {
-    console.log(chalk9.cyan(`  \u2022 ${name}`));
+    console.log(chalk10.cyan(`  \u2022 ${name}`));
   }
   const confirmResponse = await prompts5({
     type: "confirm",
@@ -2739,12 +2914,16 @@ ${installed.size} already installed, ${availableCount} available
     message: `Install ${selectedComponents.length} component(s)?`,
     initial: true
   });
+  if (confirmResponse.proceed === void 0) {
+    process.exit(0);
+  }
   if (!confirmResponse.proceed) {
-    console.log(chalk9.yellow("\nCancelled.\n"));
+    console.log(chalk10.yellow("\nCancelled.\n"));
     return;
   }
   console.log("");
   let successCount = 0;
+  let failCount = 0;
   const allDependencies = [];
   const allDevDependencies = [];
   for (const name of selectedComponents) {
@@ -2753,6 +2932,7 @@ ${installed.size} already installed, ${availableCount} available
       const component = await fetchComponent(name);
       if (!component) {
         installSpinner.fail(`Component "${name}" not found`);
+        failCount++;
         continue;
       }
       const targetDir = path11.join(projectRoot, config.componentsPath);
@@ -2763,10 +2943,10 @@ ${installed.size} already installed, ${availableCount} available
           continue;
         }
         await fs10.ensureDir(targetDir);
-        const transformedContent = transformImports4(file.content, config);
+        const transformedContent = transformToInstalled(file.content, config);
         await fs10.writeFile(targetPath, transformedContent);
       }
-      installSpinner.succeed(`Installed ${chalk9.green(name)}`);
+      installSpinner.succeed(`Installed ${chalk10.green(name)}`);
       successCount++;
       if (component.dependencies?.length) {
         allDependencies.push(...component.dependencies);
@@ -2775,42 +2955,51 @@ ${installed.size} already installed, ${availableCount} available
         allDevDependencies.push(...component.devDependencies);
       }
       if (component.registryDependencies?.length) {
-        console.log(chalk9.dim(`     Requires: ${component.registryDependencies.join(", ")}`));
+        console.log(chalk10.dim(`     Requires: ${component.registryDependencies.join(", ")}`));
       }
     } catch (error) {
       installSpinner.fail(`Failed to install ${name}: ${error}`);
+      failCount++;
     }
   }
+  if (failCount > 0) {
+    process.exit(1);
+  }
   console.log(
-    chalk9.bold.green(`
+    chalk10.bold.green(`
 \u2713 Successfully installed ${successCount}/${selectedComponents.length} components
 `)
   );
   const uniqueDeps = [...new Set(allDependencies)];
   const uniqueDevDeps = [...new Set(allDevDependencies)];
   if (uniqueDeps.length || uniqueDevDeps.length) {
-    console.log(chalk9.bold("Install dependencies:"));
+    console.log(chalk10.bold("Install dependencies:"));
     if (uniqueDeps.length) {
-      console.log(chalk9.cyan(`  npx expo install ${uniqueDeps.join(" ")}`));
+      console.log(chalk10.cyan(`  npx expo install ${uniqueDeps.join(" ")}`));
     }
     if (uniqueDevDeps.length) {
-      console.log(chalk9.cyan(`  npm install -D ${uniqueDevDeps.join(" ")}`));
+      console.log(chalk10.cyan(`  npm install -D ${uniqueDevDeps.join(" ")}`));
     }
     console.log("");
   }
   if (successCount > 0) {
-    console.log(chalk9.dim("Import example:"));
+    console.log(chalk10.dim("Import example:"));
     const firstComponent = selectedComponents[0];
     const pascalName = firstComponent.split("-").map((s) => s.charAt(0).toUpperCase() + s.slice(1)).join("");
     const alias = config.aliases?.components || "@/components/ui";
-    console.log(chalk9.dim(`  import { ${pascalName} } from '${alias}/${firstComponent}';
+    console.log(chalk10.dim(`  import { ${pascalName} } from '${alias}/${firstComponent}';
 `));
   }
 });
 
 // src/index.ts
 var program = new Command9();
-program.name("nativeui").description("Add beautiful UI components to your Expo/React Native project").version("0.0.1");
+program.name("mcellui").description("Add beautiful UI components to your Expo/React Native project").version("0.1.4");
+program.configureOutput({
+  writeOut: (str) => process.stdout.write(str),
+  writeErr: (str) => process.stderr.write(str),
+  outputError: (str, write) => write(chalk11.red(str))
+});
 program.addCommand(initCommand);
 program.addCommand(addCommand);
 program.addCommand(listCommand);
@@ -2819,4 +3008,14 @@ program.addCommand(diffCommand);
 program.addCommand(updateCommand);
 program.addCommand(createCommand);
 program.addCommand(pickCommand);
-program.parse();
+async function main() {
+  try {
+    await program.parseAsync(process.argv);
+  } catch (error) {
+    handleError({
+      message: error instanceof Error ? error.message : "An unexpected error occurred",
+      hint: "If this persists, run: npx mcellui doctor"
+    });
+  }
+}
+main();