@onexapis/cli 1.1.38 → 1.1.40

package/dist/cli.mjs

@@ -2,8 +2,8 @@
 import chalk4 from 'chalk';
 import ora from 'ora';
 import * as esbuild from 'esbuild';
-import path10 from 'path';
-import fs9 from 'fs/promises';
+import path9 from 'path';
+import fs8 from 'fs/promises';
 import crypto from 'crypto';
 import { glob } from 'glob';
 import { createRequire } from 'module';
@@ -11,9 +11,9 @@ import os from 'os';
 import dotenv from 'dotenv';
 import fs from 'fs-extra';
 import ejs from 'ejs';
-import spawn2 from 'cross-spawn';
+import { execSync, spawn } from 'child_process';
 import { Command } from 'commander';
-import fs4 from 'fs';
+import fs3 from 'fs';
 import inquirer from 'inquirer';
 import archiver from 'archiver';
 import FormData from 'form-data';
@@ -105,8 +105,8 @@ async function generateThemeCSS(themePath, outDir) {
     const tailwindcss = (await import('tailwindcss')).default;
     const tailwindConfig = {
       content: [
-        path10.join(themePath, "sections/**/*.{ts,tsx}"),
-        path10.join(themePath, "components/**/*.{ts,tsx}")
+        path9.join(themePath, "sections/**/*.{ts,tsx}"),
+        path9.join(themePath, "components/**/*.{ts,tsx}")
       ],
       theme: { extend: {} },
       plugins: []
@@ -116,7 +116,7 @@ async function generateThemeCSS(themePath, outDir) {
       inputCSS,
       { from: void 0 }
     );
-    await fs9.writeFile(path10.join(outDir, "bundle.css"), result.css);
+    await fs8.writeFile(path9.join(outDir, "bundle.css"), result.css);
     logger.info("Generated bundle.css");
   } catch (err) {
     logger.warning(
@@ -127,12 +127,12 @@ async function generateThemeCSS(themePath, outDir) {
 async function resolveNodeModulesFile(startDir, relativePath) {
   let dir = startDir;
   while (true) {
-    const candidate = path10.join(dir, "node_modules", relativePath);
+    const candidate = path9.join(dir, "node_modules", relativePath);
     try {
-      await fs9.access(candidate);
+      await fs8.access(candidate);
       return candidate;
     } catch {
-      const parent = path10.dirname(dir);
+      const parent = path9.dirname(dir);
       if (parent === dir) break;
       dir = parent;
     }
@@ -156,7 +156,7 @@ async function scanImportsFromPackage(sourceDir, packageName) {
   });
   for (const file of sourceFiles) {
     try {
-      const content = await fs9.readFile(path10.join(sourceDir, file), "utf-8");
+      const content = await fs8.readFile(path9.join(sourceDir, file), "utf-8");
       for (const match of content.matchAll(namespaceImportRegex)) {
         const subpath = match[1] ? match[1].slice(1) : "";
         if (!result[subpath]) result[subpath] = /* @__PURE__ */ new Set();
@@ -210,17 +210,17 @@ function createCoreGlobalPlugin(themePath) {
           const distFileName = subpath ? `${subpath}.mjs` : "index.mjs";
           let distPath = await resolveNodeModulesFile(
             themePath,
-            path10.join("@onexapis", "core", "dist", distFileName)
+            path9.join("@onexapis", "core", "dist", distFileName)
           );
           if (!distPath) {
             distPath = await resolveNodeModulesFile(
               __dirname,
-              path10.join("@onexapis", "core", "dist", distFileName)
+              path9.join("@onexapis", "core", "dist", distFileName)
             );
           }
           try {
             if (!distPath) throw new Error("not found");
-            const distContent = await fs9.readFile(distPath, "utf-8");
+            const distContent = await fs8.readFile(distPath, "utf-8");
             const exportMatches = distContent.matchAll(/export\s*\{([^}]+)\}/g);
             for (const m of exportMatches) {
               const names = m[1].split(",").map((n) => {
@@ -449,7 +449,7 @@ async function generateThemeData(themePath, outputDir, themeId) {
   const pages = {};
   for (const ext of [".ts", ".js"]) {
     try {
-      const mod = await jiti.import(path10.join(themePath, `theme.config${ext}`));
+      const mod = await jiti.import(path9.join(themePath, `theme.config${ext}`));
       themeConfig = mod.default || mod;
       break;
     } catch {
@@ -457,20 +457,20 @@ async function generateThemeData(themePath, outputDir, themeId) {
   }
   for (const ext of [".ts", ".js"]) {
     try {
-      const mod = await jiti.import(path10.join(themePath, `theme.layout${ext}`));
+      const mod = await jiti.import(path9.join(themePath, `theme.layout${ext}`));
       layoutConfig = mod.default || mod;
       break;
     } catch {
     }
   }
   const schemas = {};
-  const sectionsDir = path10.join(themePath, "sections");
+  const sectionsDir = path9.join(themePath, "sections");
   try {
-    const sectionDirs = await fs9.readdir(sectionsDir);
+    const sectionDirs = await fs8.readdir(sectionsDir);
     for (const dir of sectionDirs) {
-      const schemaFile = path10.join(sectionsDir, dir, `${dir}.schema.ts`);
+      const schemaFile = path9.join(sectionsDir, dir, `${dir}.schema.ts`);
       try {
-        await fs9.access(schemaFile);
+        await fs8.access(schemaFile);
         const mod = await jiti.import(schemaFile);
         for (const [key, value] of Object.entries(mod)) {
           if (key.endsWith("Schema") && value && typeof value === "object" && value.type) {
@@ -482,14 +482,14 @@ async function generateThemeData(themePath, outputDir, themeId) {
     }
   } catch {
   }
-  const pagesDir = path10.join(themePath, "pages");
+  const pagesDir = path9.join(themePath, "pages");
   try {
-    const files = await fs9.readdir(pagesDir);
+    const files = await fs8.readdir(pagesDir);
     for (const file of files) {
       if (!file.match(/\.(ts|js)$/)) continue;
       const name = file.replace(/\.(ts|js)$/, "");
       try {
-        const mod = await jiti.import(path10.join(pagesDir, file));
+        const mod = await jiti.import(path9.join(pagesDir, file));
         const config = mod.default || mod;
         const sections = (config.sections || []).map((section) => {
           const schema = schemas[section.type];
@@ -517,8 +517,8 @@ async function generateThemeData(themePath, outputDir, themeId) {
     }
   } catch {
   }
-  await fs9.writeFile(
-    path10.join(outputDir, "theme-data.json"),
+  await fs8.writeFile(
+    path9.join(outputDir, "theme-data.json"),
     JSON.stringify(
       {
         themeId,
@@ -541,36 +541,36 @@ async function generateThemeData(themePath, outputDir, themeId) {
   logger.info(`Generated theme-data.json (${Object.keys(pages).length} pages)`);
 }
 async function contentHashEntry(outputDir) {
-  const entryPath = path10.join(outputDir, "bundle-entry.js");
-  const mapPath = path10.join(outputDir, "bundle-entry.js.map");
+  const entryPath = path9.join(outputDir, "bundle-entry.js");
+  const mapPath = path9.join(outputDir, "bundle-entry.js.map");
   const oldFiles = await glob("bundle-entry-*.js*", { cwd: outputDir });
   for (const f of oldFiles) {
-    await fs9.unlink(path10.join(outputDir, f));
+    await fs8.unlink(path9.join(outputDir, f));
   }
   let entryContent;
   try {
-    entryContent = await fs9.readFile(entryPath, "utf-8");
+    entryContent = await fs8.readFile(entryPath, "utf-8");
   } catch {
-    const indexPath = path10.join(outputDir, "index.js");
+    const indexPath = path9.join(outputDir, "index.js");
     try {
-      entryContent = await fs9.readFile(indexPath, "utf-8");
+      entryContent = await fs8.readFile(indexPath, "utf-8");
     } catch {
       logger.warning("No entry file found in output, skipping content hash");
       return;
     }
     const hash2 = crypto.createHash("sha256").update(entryContent).digest("hex").slice(0, 8);
     const hashedName2 = `bundle-entry-${hash2}.js`;
-    const indexMapPath = path10.join(outputDir, "index.js.map");
+    const indexMapPath = path9.join(outputDir, "index.js.map");
     const hashedMapName2 = `bundle-entry-${hash2}.js.map`;
     entryContent = entryContent.replace(
       /\/\/# sourceMappingURL=index\.js\.map/,
       `//# sourceMappingURL=${hashedMapName2}`
     );
-    await fs9.writeFile(path10.join(outputDir, hashedName2), entryContent);
-    await fs9.unlink(indexPath);
+    await fs8.writeFile(path9.join(outputDir, hashedName2), entryContent);
+    await fs8.unlink(indexPath);
     try {
-      await fs9.access(indexMapPath);
-      await fs9.rename(indexMapPath, path10.join(outputDir, hashedMapName2));
+      await fs8.access(indexMapPath);
+      await fs8.rename(indexMapPath, path9.join(outputDir, hashedMapName2));
     } catch {
     }
     logger.info(`Entry hashed: ${hashedName2}`);
@@ -583,11 +583,11 @@ async function contentHashEntry(outputDir) {
     /\/\/# sourceMappingURL=bundle-entry\.js\.map/,
     `//# sourceMappingURL=${hashedMapName}`
   );
-  await fs9.writeFile(path10.join(outputDir, hashedName), entryContent);
-  await fs9.unlink(entryPath);
+  await fs8.writeFile(path9.join(outputDir, hashedName), entryContent);
+  await fs8.unlink(entryPath);
   try {
-    await fs9.access(mapPath);
-    await fs9.rename(mapPath, path10.join(outputDir, hashedMapName));
+    await fs8.access(mapPath);
+    await fs8.rename(mapPath, path9.join(outputDir, hashedMapName));
   } catch {
   }
   logger.info(`Entry hashed: ${hashedName}`);
@@ -599,7 +599,7 @@ async function extractDataRequirements(themePath) {
   const requirements = {};
   for (const file of schemaFiles) {
     try {
-      const mod = await jiti.import(path10.join(themePath, file));
+      const mod = await jiti.import(path9.join(themePath, file));
       const exports$1 = mod;
       for (const value of Object.values(exports$1)) {
         if (value && typeof value === "object" && typeof value.type === "string" && value.dataRequirements && typeof value.dataRequirements === "object") {
@@ -618,8 +618,8 @@ async function generateManifest(themeName, themePath, outputDir) {
   let version2 = "1.0.0";
   let themeId = themeName;
   try {
-    const pkgContent = await fs9.readFile(
-      path10.join(themePath, "package.json"),
+    const pkgContent = await fs8.readFile(
+      path9.join(themePath, "package.json"),
       "utf-8"
     );
     const pkg = JSON.parse(pkgContent);
@@ -637,7 +637,7 @@ async function generateManifest(themeName, themePath, outputDir) {
   const dataRequirements = await extractDataRequirements(themePath);
   let hasThemeConfig = false;
   try {
-    await fs9.access(path10.join(themePath, "theme.config.ts"));
+    await fs8.access(path9.join(themePath, "theme.config.ts"));
     hasThemeConfig = true;
   } catch {
   }
@@ -678,24 +678,24 @@ async function generateManifest(themeName, themePath, outputDir) {
     // Section data requirements for server-side prefetching (keyed by section type)
     dataRequirements
   };
-  await fs9.writeFile(
-    path10.join(outputDir, "manifest.json"),
+  await fs8.writeFile(
+    path9.join(outputDir, "manifest.json"),
     JSON.stringify(manifest, null, 2)
   );
 }
 async function compileStandaloneTheme(themePath, themeName) {
-  const outputDir = path10.join(themePath, "dist");
-  const bundleEntry = path10.join(themePath, "bundle-entry.ts");
-  const indexEntry = path10.join(themePath, "index.ts");
+  const outputDir = path9.join(themePath, "dist");
+  const bundleEntry = path9.join(themePath, "bundle-entry.ts");
+  const indexEntry = path9.join(themePath, "index.ts");
   let entryPoint = indexEntry;
   try {
-    await fs9.access(bundleEntry);
+    await fs8.access(bundleEntry);
     entryPoint = bundleEntry;
   } catch {
   }
-  const shimPath = path10.join(outputDir, ".process-shim.js");
-  await fs9.mkdir(outputDir, { recursive: true });
-  await fs9.writeFile(shimPath, PROCESS_SHIM);
+  const shimPath = path9.join(outputDir, ".process-shim.js");
+  await fs8.mkdir(outputDir, { recursive: true });
+  await fs8.writeFile(shimPath, PROCESS_SHIM);
   const buildOptions = {
     entryPoints: [entryPoint],
     bundle: true,
@@ -745,7 +745,7 @@ async function compileStandaloneTheme(themePath, themeName) {
   try {
     const result = await esbuild.build(buildOptions);
     try {
-      await fs9.unlink(shimPath);
+      await fs8.unlink(shimPath);
     } catch {
     }
     await contentHashEntry(outputDir);
@@ -764,7 +764,7 @@ async function compileStandaloneTheme(themePath, themeName) {
     return true;
   } catch (error) {
     try {
-      await fs9.unlink(shimPath);
+      await fs8.unlink(shimPath);
     } catch {
     }
     logger.error(`esbuild compilation failed: ${error}`);
@@ -772,18 +772,18 @@ async function compileStandaloneTheme(themePath, themeName) {
   }
 }
 async function compileStandaloneThemeDev(themePath, themeName) {
-  const outputDir = path10.join(themePath, "dist");
-  const bundleEntry = path10.join(themePath, "bundle-entry.ts");
-  const indexEntry = path10.join(themePath, "index.ts");
+  const outputDir = path9.join(themePath, "dist");
+  const bundleEntry = path9.join(themePath, "bundle-entry.ts");
+  const indexEntry = path9.join(themePath, "index.ts");
   let entryPoint = indexEntry;
   try {
-    await fs9.access(bundleEntry);
+    await fs8.access(bundleEntry);
     entryPoint = bundleEntry;
   } catch {
   }
-  const shimPath = path10.join(outputDir, ".process-shim.js");
-  await fs9.mkdir(outputDir, { recursive: true });
-  await fs9.writeFile(shimPath, PROCESS_SHIM);
+  const shimPath = path9.join(outputDir, ".process-shim.js");
+  await fs8.mkdir(outputDir, { recursive: true });
+  await fs8.writeFile(shimPath, PROCESS_SHIM);
   const buildOptions = {
     entryPoints: [entryPoint],
     bundle: true,
@@ -836,18 +836,18 @@ async function compileStandaloneThemeDev(themePath, themeName) {
   return { context: context2, outputDir };
 }
 async function compilePreviewRuntime(themePath) {
-  const outputDir = path10.join(themePath, "dist");
-  await fs9.mkdir(outputDir, { recursive: true });
-  const outputPath = path10.join(outputDir, "preview-runtime.js");
+  const outputDir = path9.join(themePath, "dist");
+  await fs8.mkdir(outputDir, { recursive: true });
+  const outputPath = path9.join(outputDir, "preview-runtime.js");
   const locations = [
-    path10.join(__dirname, "..", "preview", "preview-app.tsx"),
-    path10.join(__dirname, "preview", "preview-app.tsx"),
-    path10.join(__dirname, "..", "..", "src", "preview", "preview-app.tsx")
+    path9.join(__dirname, "..", "preview", "preview-app.tsx"),
+    path9.join(__dirname, "preview", "preview-app.tsx"),
+    path9.join(__dirname, "..", "..", "src", "preview", "preview-app.tsx")
   ];
   let previewEntryPath = null;
   for (const loc of locations) {
     try {
-      await fs9.access(loc);
+      await fs8.access(loc);
       previewEntryPath = loc;
       break;
     } catch {
@@ -930,10 +930,10 @@ ${locations.join("\n")}`
         if (!lucideScanned) {
           lucideScanned = true;
           const coreSrcCandidates = [
-            path10.join(themePath, "node_modules", "@onexapis", "core", "src"),
-            path10.join(themePath, "..", "..", "packages", "core", "src"),
+            path9.join(themePath, "node_modules", "@onexapis", "core", "src"),
+            path9.join(themePath, "..", "..", "packages", "core", "src"),
             // monorepo sibling
-            path10.join(
+            path9.join(
               __dirname,
               "..",
               "..",
@@ -948,7 +948,7 @@ ${locations.join("\n")}`
           let coreSourceDir = null;
           for (const candidate of coreSrcCandidates) {
             try {
-              await fs9.access(candidate);
+              await fs8.access(candidate);
               coreSourceDir = candidate;
               break;
             } catch {
@@ -967,21 +967,21 @@ ${locations.join("\n")}`
             }
           } else {
             const coreDistCandidates = [
-              path10.join(themePath, "node_modules", "@onexapis", "core", "dist")
+              path9.join(themePath, "node_modules", "@onexapis", "core", "dist")
             ];
             const resolvedDist = await resolveNodeModulesFile(
               __dirname,
-              path10.join("@onexapis", "core", "dist")
+              path9.join("@onexapis", "core", "dist")
             );
             if (resolvedDist) coreDistCandidates.push(resolvedDist);
             for (const candidate of coreDistCandidates) {
               try {
-                await fs9.access(candidate);
+                await fs8.access(candidate);
                 const mjsFiles = await glob("*.mjs", { cwd: candidate });
                 const importRegex = /import\s*\{([^}]+)\}\s*from\s*["']lucide-react["']/g;
                 for (const file of mjsFiles) {
-                  const content = await fs9.readFile(
-                    path10.join(candidate, file),
+                  const content = await fs8.readFile(
+                    path9.join(candidate, file),
                     "utf-8"
                   );
                   for (const match of content.matchAll(importRegex)) {
@@ -1036,7 +1036,7 @@ export default new Proxy({}, { get: (_, name) => name === '__esModule' ? true :
           const req = createRequire(import.meta.url || __filename);
           const cjsPath = req.resolve("framer-motion");
           const pkgDir = cjsPath.replace(/[/\\]dist[/\\].*$/, "");
-          const esmEntry = path10.join(pkgDir, "dist", "es", "index.mjs");
+          const esmEntry = path9.join(pkgDir, "dist", "es", "index.mjs");
           const { existsSync } = await import('fs');
           if (existsSync(esmEntry)) {
             return { path: esmEntry, namespace: "file" };
@@ -1135,8 +1135,8 @@ export function headers() { return new Headers(); }
       });
     }
   };
-  const shimPath = path10.join(outputDir, ".process-shim-preview.js");
-  await fs9.writeFile(shimPath, PROCESS_SHIM);
+  const shimPath = path9.join(outputDir, ".process-shim-preview.js");
+  await fs8.writeFile(shimPath, PROCESS_SHIM);
   await esbuild.build({
     entryPoints: [previewEntryPath],
     bundle: true,
@@ -1171,7 +1171,7 @@ export function headers() { return new Headers(); }
     }
   });
   try {
-    await fs9.unlink(shimPath);
+    await fs8.unlink(shimPath);
   } catch {
   }
   return outputPath;
@@ -1304,18 +1304,18 @@ async function renderTemplate(templatePath, data) {
   return ejs.render(template, data);
 }
 async function writeFile(filePath, content) {
-  await fs.ensureDir(path10.dirname(filePath));
+  await fs.ensureDir(path9.dirname(filePath));
   await fs.writeFile(filePath, content, "utf-8");
 }
 function getTemplatesDir() {
   const locations = [
-    path10.join(__dirname, "../../templates"),
+    path9.join(__dirname, "../../templates"),
     // Development
-    path10.join(__dirname, "../templates"),
+    path9.join(__dirname, "../templates"),
     // Production (dist/)
-    path10.join(process.cwd(), "templates"),
+    path9.join(process.cwd(), "templates"),
     // Fallback
-    path10.join(process.cwd(), "packages/cli/templates")
+    path9.join(process.cwd(), "packages/cli/templates")
     // Monorepo
   ];
   for (const location of locations) {
@@ -1327,7 +1327,7 @@ function getTemplatesDir() {
 }
 async function copyTemplate(templateName, targetDir, data) {
   const templatesDir = getTemplatesDir();
-  const templateDir = path10.join(templatesDir, templateName);
+  const templateDir = path9.join(templatesDir, templateName);
   if (!fs.existsSync(templateDir)) {
     throw new Error(
       `Template "${templateName}" not found at ${templateDir}. Available templates: ${fs.readdirSync(templatesDir).join(", ")}`
@@ -1336,8 +1336,8 @@ async function copyTemplate(templateName, targetDir, data) {
   await fs.ensureDir(targetDir);
   const files = await fs.readdir(templateDir);
   for (const file of files) {
-    const templatePath = path10.join(templateDir, file);
-    const targetPath = path10.join(targetDir, file);
+    const templatePath = path9.join(templateDir, file);
+    const targetPath = path9.join(targetDir, file);
     const stat = await fs.stat(templatePath);
     if (stat.isDirectory()) {
       await copyTemplateDir(templatePath, targetPath, data);
@@ -1354,8 +1354,8 @@ async function copyTemplateDir(templateDir, targetDir, data) {
   await fs.ensureDir(targetDir);
   const files = await fs.readdir(templateDir);
   for (const file of files) {
-    const templatePath = path10.join(templateDir, file);
-    const targetPath = path10.join(targetDir, file);
+    const templatePath = path9.join(templateDir, file);
+    const targetPath = path9.join(targetDir, file);
     const stat = await fs.stat(templatePath);
     if (stat.isDirectory()) {
       await copyTemplateDir(templatePath, targetPath, data);
@@ -1370,32 +1370,32 @@ async function copyTemplateDir(templateDir, targetDir, data) {
 }
 function getProjectRoot() {
   let currentDir = process.cwd();
-  while (currentDir !== path10.parse(currentDir).root) {
-    const packageJsonPath = path10.join(currentDir, "package.json");
+  while (currentDir !== path9.parse(currentDir).root) {
+    const packageJsonPath = path9.join(currentDir, "package.json");
     if (fs.existsSync(packageJsonPath)) {
       const packageJson = fs.readJsonSync(packageJsonPath);
-      if (packageJson.workspaces || fs.existsSync(path10.join(currentDir, "src/themes")) || fs.existsSync(path10.join(currentDir, "themes"))) {
+      if (packageJson.workspaces || fs.existsSync(path9.join(currentDir, "src/themes")) || fs.existsSync(path9.join(currentDir, "themes"))) {
         return currentDir;
       }
     }
-    currentDir = path10.dirname(currentDir);
+    currentDir = path9.dirname(currentDir);
   }
   return process.cwd();
 }
 function getThemesDir() {
   const root = getProjectRoot();
-  if (fs.existsSync(path10.join(root, "themes")))
-    return path10.join(root, "themes");
-  if (fs.existsSync(path10.join(root, "src/themes")))
-    return path10.join(root, "src/themes");
-  return path10.dirname(root);
+  if (fs.existsSync(path9.join(root, "themes")))
+    return path9.join(root, "themes");
+  if (fs.existsSync(path9.join(root, "src/themes")))
+    return path9.join(root, "src/themes");
+  return path9.dirname(root);
 }
 function getFeaturesDir() {
-  return path10.join(getProjectRoot(), "src/features");
+  return path9.join(getProjectRoot(), "src/features");
 }
 function isOneXProject() {
   const root = getProjectRoot();
-  return fs.existsSync(path10.join(root, "themes")) || fs.existsSync(path10.join(root, "src/themes")) || fs.existsSync(path10.join(root, "theme.config.ts")) || fs.existsSync(path10.join(root, "bundle-entry.ts"));
+  return fs.existsSync(path9.join(root, "themes")) || fs.existsSync(path9.join(root, "src/themes")) || fs.existsSync(path9.join(root, "theme.config.ts")) || fs.existsSync(path9.join(root, "bundle-entry.ts"));
 }
 function ensureOneXProject() {
   if (!isOneXProject()) {
@@ -1411,13 +1411,13 @@ function listThemes() {
     return [];
   }
   return fs.readdirSync(themesDir).filter((name) => {
-    const themePath = path10.join(themesDir, name);
-    return fs.statSync(themePath).isDirectory() && (fs.existsSync(path10.join(themePath, "theme.config.ts")) || fs.existsSync(path10.join(themePath, "bundle-entry.ts")) || fs.existsSync(path10.join(themePath, "manifest.ts")));
+    const themePath = path9.join(themesDir, name);
+    return fs.statSync(themePath).isDirectory() && (fs.existsSync(path9.join(themePath, "theme.config.ts")) || fs.existsSync(path9.join(themePath, "bundle-entry.ts")) || fs.existsSync(path9.join(themePath, "manifest.ts")));
   });
 }
 function themeExists(themeName) {
-  const themePath = path10.join(getThemesDir(), themeName);
-  return fs.existsSync(themePath) && (fs.existsSync(path10.join(themePath, "theme.config.ts")) || fs.existsSync(path10.join(themePath, "bundle-entry.ts")) || fs.existsSync(path10.join(themePath, "manifest.ts")));
+  const themePath = path9.join(getThemesDir(), themeName);
+  return fs.existsSync(themePath) && (fs.existsSync(path9.join(themePath, "theme.config.ts")) || fs.existsSync(path9.join(themePath, "bundle-entry.ts")) || fs.existsSync(path9.join(themePath, "manifest.ts")));
 }
 function detectPackageManager() {
   const userAgent = process.env.npm_config_user_agent || "";
@@ -1425,22 +1425,24 @@ function detectPackageManager() {
   if (userAgent.includes("yarn")) return "yarn";
   if (userAgent.includes("bun")) return "bun";
   const cwd = process.cwd();
-  if (fs.existsSync(path10.join(cwd, "pnpm-lock.yaml"))) return "pnpm";
-  if (fs.existsSync(path10.join(cwd, "yarn.lock"))) return "yarn";
-  if (fs.existsSync(path10.join(cwd, "bun.lockb"))) return "bun";
+  if (fs.existsSync(path9.join(cwd, "pnpm-lock.yaml"))) return "pnpm";
+  if (fs.existsSync(path9.join(cwd, "yarn.lock"))) return "yarn";
+  if (fs.existsSync(path9.join(cwd, "bun.lockb"))) return "bun";
   return "npm";
 }
 async function installDependencies(projectPath, packageManager = "npm") {
-  const args = packageManager === "yarn" ? [] : ["install"];
-  const result = spawn2.sync(packageManager, args, {
-    cwd: projectPath,
-    stdio: "inherit"
+  return new Promise((resolve, reject) => {
+    try {
+      const installCmd = packageManager === "yarn" ? "yarn" : `${packageManager} install`;
+      execSync(installCmd, {
+        cwd: projectPath,
+        stdio: "inherit"
+      });
+      resolve();
+    } catch (error) {
+      reject(error);
+    }
   });
-  if (result.status !== 0) {
-    throw new Error(
-      `${packageManager} install failed with exit code ${result.status}`
-    );
-  }
 }
 
 // src/commands/init.ts
@@ -1474,8 +1476,8 @@ function getValidCategories() {
     "contact"
   ];
 }
-var AUTH_DIR = path10.join(os.homedir(), ".onexthm");
-var AUTH_FILE = path10.join(AUTH_DIR, "auth.json");
+var AUTH_DIR = path9.join(os.homedir(), ".onexthm");
+var AUTH_FILE = path9.join(AUTH_DIR, "auth.json");
 function getApiUrl() {
   return process.env.ONEXTHM_API_URL || process.env.NEXT_PUBLIC_API_URL || "https://platform-dev.onexeos.com";
 }
@@ -1588,70 +1590,6 @@ function parseJwtClaims(idToken) {
     return {};
   }
 }
-function getNpxCommand() {
-  return process.platform === "win32" ? "npx.cmd" : "npx";
-}
-function getDefaultMcpConfig() {
-  return {
-    mcpServers: {
-      onexthm: {
-        command: getNpxCommand(),
-        args: ["-y", "@onexapis/theme-mcp"]
-      }
-    }
-  };
-}
-function ensureMcpJson(projectPath, figmaApiKey) {
-  const mcpJsonPath = path10.join(projectPath, ".mcp.json");
-  const npx = getNpxCommand();
-  let mcpConfig;
-  if (fs4.existsSync(mcpJsonPath)) {
-    try {
-      mcpConfig = JSON.parse(fs4.readFileSync(mcpJsonPath, "utf-8"));
-      if (!mcpConfig.mcpServers) {
-        mcpConfig.mcpServers = {};
-      }
-    } catch {
-      mcpConfig = getDefaultMcpConfig();
-    }
-  } else {
-    mcpConfig = getDefaultMcpConfig();
-  }
-  mcpConfig.mcpServers.onexthm = {
-    command: npx,
-    args: ["-y", "@onexapis/theme-mcp"]
-  };
-  if (figmaApiKey) {
-    mcpConfig.mcpServers.figma = {
-      command: npx,
-      args: [
-        "-y",
-        "figma-developer-mcp",
-        `--figma-api-key=${figmaApiKey}`,
-        "--stdio"
-      ]
-    };
-  } else {
-    delete mcpConfig.mcpServers.figma;
-  }
-  fs4.writeFileSync(mcpJsonPath, JSON.stringify(mcpConfig, null, 2) + "\n");
-  ensureThemeMcpDependency(projectPath);
-}
-function ensureThemeMcpDependency(projectPath) {
-  const pkgJsonPath = path10.join(projectPath, "package.json");
-  if (!fs4.existsSync(pkgJsonPath)) return;
-  try {
-    const pkg = JSON.parse(fs4.readFileSync(pkgJsonPath, "utf-8"));
-    if (!pkg.devDependencies) {
-      pkg.devDependencies = {};
-    }
-    if (!pkg.devDependencies["@onexapis/theme-mcp"]) {
-      pkg.devDependencies["@onexapis/theme-mcp"] = "^0.1.0";
-      fs4.writeFileSync(pkgJsonPath, JSON.stringify(pkg, null, 2) + "\n");
-    }
-  } catch {
-  }
-}
 
 // src/commands/init.ts
 async function initCommand(projectName, options = {}) {
@@ -1669,7 +1607,7 @@ async function initCommand(projectName, options = {}) {
           if (!validateThemeName(kebabName)) {
             return "Invalid project name. Use lowercase letters, numbers, and hyphens only.";
           }
-          if (fs4.existsSync(path10.join(process.cwd(), kebabName))) {
+          if (fs3.existsSync(path9.join(process.cwd(), kebabName))) {
             return `Directory "${kebabName}" already exists`;
           }
           return true;
@@ -1680,8 +1618,8 @@ async function initCommand(projectName, options = {}) {
   } else {
     name = toKebabCase(projectName);
   }
-  const projectPath = path10.join(process.cwd(), name);
-  if (fs4.existsSync(projectPath)) {
+  const projectPath = path9.join(process.cwd(), name);
+  if (fs3.existsSync(projectPath)) {
     logger.error(`Directory "${name}" already exists.`);
     process.exit(1);
   }
@@ -1787,7 +1725,7 @@ async function initCommand(projectName, options = {}) {
   }
   logger.startSpinner("Creating project structure...");
   try {
-    fs4.mkdirSync(projectPath, { recursive: true });
+    fs3.mkdirSync(projectPath, { recursive: true });
     await copyTemplate(template, projectPath, data);
     await renameThemeInFiles(
       projectPath,
@@ -1796,14 +1734,28 @@ async function initCommand(projectName, options = {}) {
       description,
       author
     );
-    ensureMcpJson(projectPath, figmaApiKey || void 0);
+    const mcpJsonPath = path9.join(projectPath, ".mcp.json");
+    if (fs3.existsSync(mcpJsonPath)) {
+      let mcpContent = fs3.readFileSync(mcpJsonPath, "utf-8");
+      if (figmaApiKey) {
+        mcpContent = mcpContent.replace("__FIGMA_API_KEY__", figmaApiKey);
+      } else {
+        try {
+          const mcpJson = JSON.parse(mcpContent);
+          delete mcpJson.mcpServers.figma;
+          mcpContent = JSON.stringify(mcpJson, null, 2) + "\n";
+        } catch {
+        }
+      }
+      fs3.writeFileSync(mcpJsonPath, mcpContent, "utf-8");
+    }
     logger.stopSpinner(true, "Project structure created!");
     if (options.git) {
       logger.startSpinner("Initializing git repository...");
       try {
-        spawn2.sync("git", ["init"], { cwd: projectPath, stdio: "ignore" });
-        spawn2.sync("git", ["add", "."], { cwd: projectPath, stdio: "ignore" });
-        spawn2.sync("git", ["commit", "-m", "Initial commit from onexthm init"], {
+        execSync("git init", { cwd: projectPath, stdio: "ignore" });
+        execSync("git add .", { cwd: projectPath, stdio: "ignore" });
+        execSync('git commit -m "Initial commit from onexthm init"', {
           cwd: projectPath,
           stdio: "ignore"
         });
@@ -1855,16 +1807,16 @@ async function initCommand(projectName, options = {}) {
     logger.error(
       error instanceof Error ? error.message : "Unknown error occurred"
     );
-    if (fs4.existsSync(projectPath)) {
-      fs4.rmSync(projectPath, { recursive: true, force: true });
+    if (fs3.existsSync(projectPath)) {
+      fs3.rmSync(projectPath, { recursive: true, force: true });
     }
     process.exit(1);
   }
 }
 async function renameThemeInFiles(projectPath, themeName, displayName, description, author) {
-  const configPath = path10.join(projectPath, "theme.config.ts");
-  if (fs4.existsSync(configPath)) {
-    let content = fs4.readFileSync(configPath, "utf-8");
+  const configPath = path9.join(projectPath, "theme.config.ts");
+  if (fs3.existsSync(configPath)) {
+    let content = fs3.readFileSync(configPath, "utf-8");
     content = content.replace(
       /name: "My Simple Theme"/,
       `name: "${displayName}"`
@@ -1873,11 +1825,11 @@ async function renameThemeInFiles(projectPath, themeName, displayName, descripti
       /description: ".*?"/,
       `description: "${description}"`
     );
-    fs4.writeFileSync(configPath, content, "utf-8");
+    fs3.writeFileSync(configPath, content, "utf-8");
   }
-  const pkgPath = path10.join(projectPath, "package.json");
-  if (fs4.existsSync(pkgPath)) {
-    let content = fs4.readFileSync(pkgPath, "utf-8");
+  const pkgPath = path9.join(projectPath, "package.json");
+  if (fs3.existsSync(pkgPath)) {
+    let content = fs3.readFileSync(pkgPath, "utf-8");
     content = content.replace(
       /@onex-themes\/my-simple/g,
       `@onex-themes/${themeName}`
@@ -1886,7 +1838,7 @@ async function renameThemeInFiles(projectPath, themeName, displayName, descripti
       /"description": ".*?"/,
       `"description": "${description}"`
     );
-    fs4.writeFileSync(pkgPath, content, "utf-8");
+    fs3.writeFileSync(pkgPath, content, "utf-8");
   }
 }
 
@@ -1897,10 +1849,10 @@ async function createSectionCommand(name, options) {
   ensureOneXProject();
   if (!options.theme) {
     const isStandaloneTheme = ["theme.config.ts", "bundle-entry.ts"].some(
-      (f) => fs.existsSync(path10.join(process.cwd(), f))
+      (f) => fs.existsSync(path9.join(process.cwd(), f))
     );
     if (isStandaloneTheme) {
-      options.theme = path10.basename(process.cwd());
+      options.theme = path9.basename(process.cwd());
     }
   }
   const sectionName = toKebabCase(name);
@@ -1963,35 +1915,35 @@ async function createSectionCommand(name, options) {
   };
   logger.startSpinner("Creating section files...");
   try {
-    const themePath = path10.join(getThemesDir(), themeName);
-    const sectionPath = path10.join(themePath, "sections", sectionName);
+    const themePath = path9.join(getThemesDir(), themeName);
+    const sectionPath = path9.join(themePath, "sections", sectionName);
     const schemaContent = generateSectionSchema(data);
     await writeFile(
-      path10.join(sectionPath, `${sectionName}.schema.ts`),
+      path9.join(sectionPath, `${sectionName}.schema.ts`),
       schemaContent
     );
     if (createTemplate) {
       const templateContent = generateSectionTemplate(data);
       await writeFile(
-        path10.join(sectionPath, `${sectionName}-default.tsx`),
+        path9.join(sectionPath, `${sectionName}-default.tsx`),
         templateContent
       );
     }
     const indexContent = generateSectionIndex(data, createTemplate);
-    await writeFile(path10.join(sectionPath, "index.ts"), indexContent);
+    await writeFile(path9.join(sectionPath, "index.ts"), indexContent);
     logger.stopSpinner(true, "Section files created successfully!");
     logger.newLine();
     logger.section("Next steps:");
     logger.log(
-      `  1. Edit schema: ${path10.relative(process.cwd(), path10.join(sectionPath, `${sectionName}.schema.ts`))}`
+      `  1. Edit schema: ${path9.relative(process.cwd(), path9.join(sectionPath, `${sectionName}.schema.ts`))}`
     );
     if (createTemplate) {
       logger.log(
-        `  2. Edit template: ${path10.relative(process.cwd(), path10.join(sectionPath, `${sectionName}-default.tsx`))}`
+        `  2. Edit template: ${path9.relative(process.cwd(), path9.join(sectionPath, `${sectionName}-default.tsx`))}`
       );
     }
     logger.log(
-      `  3. Add to theme manifest: ${path10.relative(process.cwd(), path10.join(themePath, "manifest.ts"))}`
+      `  3. Add to theme manifest: ${path9.relative(process.cwd(), path9.join(themePath, "manifest.ts"))}`
     );
     logger.newLine();
     logger.success("Section created successfully!");
@@ -2139,10 +2091,10 @@ async function createBlockCommand(name, options) {
   ensureOneXProject();
   if (!options.theme) {
     const isStandaloneTheme = ["theme.config.ts", "bundle-entry.ts"].some(
-      (f) => fs.existsSync(path10.join(process.cwd(), f))
+      (f) => fs.existsSync(path9.join(process.cwd(), f))
     );
     if (isStandaloneTheme) {
-      options.theme = path10.basename(process.cwd());
+      options.theme = path9.basename(process.cwd());
     }
   }
   const blockName = toKebabCase(name);
@@ -2217,24 +2169,24 @@ async function createBlockCommand(name, options) {
   };
   logger.startSpinner("Creating block files...");
   try {
-    const blockPath = scope === "shared" ? path10.join(getFeaturesDir(), "blocks", blockName) : path10.join(getThemesDir(), themeName, "blocks", blockName);
+    const blockPath = scope === "shared" ? path9.join(getFeaturesDir(), "blocks", blockName) : path9.join(getThemesDir(), themeName, "blocks", blockName);
     const schemaContent = generateBlockSchema(data);
     await writeFile(
-      path10.join(blockPath, `${blockName}.schema.ts`),
+      path9.join(blockPath, `${blockName}.schema.ts`),
       schemaContent
     );
     const componentContent = generateBlockComponent(data);
-    await writeFile(path10.join(blockPath, `${blockName}.tsx`), componentContent);
+    await writeFile(path9.join(blockPath, `${blockName}.tsx`), componentContent);
     const indexContent = generateBlockIndex(data);
-    await writeFile(path10.join(blockPath, "index.ts"), indexContent);
+    await writeFile(path9.join(blockPath, "index.ts"), indexContent);
     logger.stopSpinner(true, "Block files created successfully!");
     logger.newLine();
     logger.section("Next steps:");
     logger.log(
-      `  1. Edit schema: ${path10.relative(process.cwd(), path10.join(blockPath, `${blockName}.schema.ts`))}`
+      `  1. Edit schema: ${path9.relative(process.cwd(), path9.join(blockPath, `${blockName}.schema.ts`))}`
     );
     logger.log(
-      `  2. Edit component: ${path10.relative(process.cwd(), path10.join(blockPath, `${blockName}.tsx`))}`
+      `  2. Edit component: ${path9.relative(process.cwd(), path9.join(blockPath, `${blockName}.tsx`))}`
     );
     logger.log(
       `  3. Register in block registry: src/lib/registry/block-registry.ts`
@@ -2412,31 +2364,31 @@ async function createComponentCommand(name, options) {
   };
   logger.startSpinner("Creating component files...");
   try {
-    const componentPath = path10.join(
+    const componentPath = path9.join(
       getFeaturesDir(),
       "components",
       componentName
     );
     const schemaContent = generateComponentSchema(data);
     await writeFile(
-      path10.join(componentPath, `${componentName}.schema.ts`),
+      path9.join(componentPath, `${componentName}.schema.ts`),
       schemaContent
     );
     const componentContent = generateComponent(data);
     await writeFile(
-      path10.join(componentPath, `${componentName}.tsx`),
+      path9.join(componentPath, `${componentName}.tsx`),
       componentContent
     );
     const indexContent = generateComponentIndex(data);
-    await writeFile(path10.join(componentPath, "index.ts"), indexContent);
+    await writeFile(path9.join(componentPath, "index.ts"), indexContent);
     logger.stopSpinner(true, "Component files created successfully!");
     logger.newLine();
     logger.section("Next steps:");
     logger.log(
-      `  1. Edit schema: ${path10.relative(process.cwd(), path10.join(componentPath, `${componentName}.schema.ts`))}`
+      `  1. Edit schema: ${path9.relative(process.cwd(), path9.join(componentPath, `${componentName}.schema.ts`))}`
     );
     logger.log(
-      `  2. Edit component: ${path10.relative(process.cwd(), path10.join(componentPath, `${componentName}.tsx`))}`
+      `  2. Edit component: ${path9.relative(process.cwd(), path9.join(componentPath, `${componentName}.tsx`))}`
     );
     logger.log(
       `  3. Register in component registry: src/lib/registry/component-registry.ts`
@@ -2593,13 +2545,13 @@ async function listSections(themeFilter) {
     return;
   }
   for (const theme of themes) {
-    const sectionsDir = path10.join(getThemesDir(), theme, "sections");
+    const sectionsDir = path9.join(getThemesDir(), theme, "sections");
     if (!fs.existsSync(sectionsDir)) {
       continue;
     }
     const sections = fs.readdirSync(sectionsDir).filter((name) => {
-      const sectionPath = path10.join(sectionsDir, name);
-      return fs.statSync(sectionPath).isDirectory() && fs.existsSync(path10.join(sectionPath, "index.ts"));
+      const sectionPath = path9.join(sectionsDir, name);
+      return fs.statSync(sectionPath).isDirectory() && fs.existsSync(path9.join(sectionPath, "index.ts"));
     });
     if (sections.length > 0) {
       logger.log(chalk4.cyan(`
@@ -2613,11 +2565,11 @@ async function listSections(themeFilter) {
 }
 async function listBlocks(themeFilter) {
   logger.section("\u{1F9F1} Blocks");
-  const sharedBlocksDir = path10.join(getFeaturesDir(), "blocks");
+  const sharedBlocksDir = path9.join(getFeaturesDir(), "blocks");
   if (fs.existsSync(sharedBlocksDir)) {
     const sharedBlocks = fs.readdirSync(sharedBlocksDir).filter((name) => {
-      const blockPath = path10.join(sharedBlocksDir, name);
-      return fs.statSync(blockPath).isDirectory() && fs.existsSync(path10.join(blockPath, "index.ts"));
+      const blockPath = path9.join(sharedBlocksDir, name);
+      return fs.statSync(blockPath).isDirectory() && fs.existsSync(path9.join(blockPath, "index.ts"));
     });
     if (sharedBlocks.length > 0) {
       logger.log(chalk4.cyan("\n  Shared:"));
@@ -2628,13 +2580,13 @@ async function listBlocks(themeFilter) {
   }
   const themes = themeFilter ? [themeFilter] : listThemes();
   for (const theme of themes) {
-    const blocksDir = path10.join(getThemesDir(), theme, "blocks");
+    const blocksDir = path9.join(getThemesDir(), theme, "blocks");
     if (!fs.existsSync(blocksDir)) {
       continue;
     }
     const blocks = fs.readdirSync(blocksDir).filter((name) => {
-      const blockPath = path10.join(blocksDir, name);
-      return fs.statSync(blockPath).isDirectory() && fs.existsSync(path10.join(blockPath, "index.ts"));
+      const blockPath = path9.join(blocksDir, name);
+      return fs.statSync(blockPath).isDirectory() && fs.existsSync(path9.join(blockPath, "index.ts"));
     });
     if (blocks.length > 0) {
       logger.log(chalk4.cyan(`
@@ -2648,14 +2600,14 @@ async function listBlocks(themeFilter) {
 }
 async function listComponents() {
   logger.section("\u2699\uFE0F  Components");
-  const componentsDir = path10.join(getFeaturesDir(), "components");
+  const componentsDir = path9.join(getFeaturesDir(), "components");
   if (!fs.existsSync(componentsDir)) {
     logger.warning("No components directory found");
     return;
   }
   const components = fs.readdirSync(componentsDir).filter((name) => {
-    const componentPath = path10.join(componentsDir, name);
-    return fs.statSync(componentPath).isDirectory() && fs.existsSync(path10.join(componentPath, "index.ts"));
+    const componentPath = path9.join(componentsDir, name);
+    return fs.statSync(componentPath).isDirectory() && fs.existsSync(path9.join(componentPath, "index.ts"));
   });
   if (components.length === 0) {
     logger.warning("No components found");
@@ -2676,11 +2628,11 @@ async function listThemesInfo() {
   }
   logger.log("");
   for (const theme of themes) {
-    const themeDir = path10.join(getThemesDir(), theme);
+    const themeDir = path9.join(getThemesDir(), theme);
     const candidates = ["theme.config.ts", "bundle-entry.ts", "manifest.ts"];
     let manifestContent = "";
     for (const candidate of candidates) {
-      const candidatePath = path10.join(themeDir, candidate);
+      const candidatePath = path9.join(themeDir, candidate);
       if (fs.existsSync(candidatePath)) {
         manifestContent = fs.readFileSync(candidatePath, "utf-8");
         break;
@@ -2718,9 +2670,9 @@ async function validateCommand(options) {
       "theme.config.ts",
       "bundle-entry.ts",
       "manifest.ts"
-    ].some((f) => fs.existsSync(path10.join(process.cwd(), f)));
+    ].some((f) => fs.existsSync(path9.join(process.cwd(), f)));
     if (isThemeDir) {
-      themeToValidate = path10.basename(process.cwd());
+      themeToValidate = path9.basename(process.cwd());
       logger.info(`Validating current theme: ${themeToValidate}`);
     } else {
       logger.error(
@@ -2729,11 +2681,11 @@ async function validateCommand(options) {
       process.exit(1);
     }
   }
-  const themePath = path10.join(getThemesDir(), themeToValidate);
+  const themePath = path9.join(getThemesDir(), themeToValidate);
   logger.startSpinner("Running validation checks...");
   const entryFiles = ["manifest.ts", "theme.config.ts", "bundle-entry.ts"];
   const foundEntry = entryFiles.find(
-    (f) => fs.existsSync(path10.join(themePath, f))
+    (f) => fs.existsSync(path9.join(themePath, f))
   );
   if (!foundEntry) {
     issues.push({
@@ -2743,7 +2695,7 @@ async function validateCommand(options) {
     });
   } else if (foundEntry === "manifest.ts") {
     const manifestContent = fs.readFileSync(
-      path10.join(themePath, foundEntry),
+      path9.join(themePath, foundEntry),
       "utf-8"
     );
     if (!manifestContent.includes("export const") && !manifestContent.includes("export default") && !manifestContent.includes("export interface")) {
@@ -2754,7 +2706,7 @@ async function validateCommand(options) {
       });
     }
   }
-  const configPath = path10.join(themePath, "theme.config.ts");
+  const configPath = path9.join(themePath, "theme.config.ts");
   if (!fs.existsSync(configPath)) {
     issues.push({
       type: "warning",
@@ -2762,7 +2714,7 @@ async function validateCommand(options) {
       message: "Theme config file not found (recommended)"
     });
   }
-  const indexPath = path10.join(themePath, "index.ts");
+  const indexPath = path9.join(themePath, "index.ts");
   if (!fs.existsSync(indexPath)) {
     issues.push({
       type: "warning",
@@ -2770,7 +2722,7 @@ async function validateCommand(options) {
       message: "Index file not found (recommended)"
     });
   }
-  const sectionsDir = path10.join(themePath, "sections");
+  const sectionsDir = path9.join(themePath, "sections");
   if (!fs.existsSync(sectionsDir)) {
     issues.push({
       type: "warning",
@@ -2779,16 +2731,16 @@ async function validateCommand(options) {
     });
   } else {
     const sections = fs.readdirSync(sectionsDir).filter(
-      (name) => fs.statSync(path10.join(sectionsDir, name)).isDirectory()
+      (name) => fs.statSync(path9.join(sectionsDir, name)).isDirectory()
     );
     for (const sectionName of sections) {
-      const sectionPath = path10.join(sectionsDir, sectionName);
-      const schemaFile = path10.join(sectionPath, `${sectionName}.schema.ts`);
-      const defaultTemplate = path10.join(
+      const sectionPath = path9.join(sectionsDir, sectionName);
+      const schemaFile = path9.join(sectionPath, `${sectionName}.schema.ts`);
+      const defaultTemplate = path9.join(
         sectionPath,
         `${sectionName}-default.tsx`
       );
-      const indexFile = path10.join(sectionPath, "index.ts");
+      const indexFile = path9.join(sectionPath, "index.ts");
       if (!fs.existsSync(schemaFile)) {
         issues.push({
           type: "error",
@@ -2812,14 +2764,14 @@ async function validateCommand(options) {
       }
     }
   }
-  const blocksDir = path10.join(themePath, "blocks");
+  const blocksDir = path9.join(themePath, "blocks");
   if (fs.existsSync(blocksDir)) {
-    const blocks = fs.readdirSync(blocksDir).filter((name) => fs.statSync(path10.join(blocksDir, name)).isDirectory());
+    const blocks = fs.readdirSync(blocksDir).filter((name) => fs.statSync(path9.join(blocksDir, name)).isDirectory());
     for (const blockName of blocks) {
-      const blockPath = path10.join(blocksDir, blockName);
-      const schemaFile = path10.join(blockPath, `${blockName}.schema.ts`);
-      const componentFile = path10.join(blockPath, `${blockName}.tsx`);
-      const indexFile = path10.join(blockPath, "index.ts");
+      const blockPath = path9.join(blocksDir, blockName);
+      const schemaFile = path9.join(blockPath, `${blockName}.schema.ts`);
+      const componentFile = path9.join(blockPath, `${blockName}.tsx`);
+      const indexFile = path9.join(blockPath, "index.ts");
       if (!fs.existsSync(schemaFile)) {
         issues.push({
           type: "error",
@@ -2845,13 +2797,13 @@ async function validateCommand(options) {
   }
   if (fs.existsSync(sectionsDir)) {
     const sections = fs.readdirSync(sectionsDir).filter(
-      (name) => fs.statSync(path10.join(sectionsDir, name)).isDirectory()
+      (name) => fs.statSync(path9.join(sectionsDir, name)).isDirectory()
     );
     for (const sectionName of sections) {
-      const sectionPath = path10.join(sectionsDir, sectionName);
+      const sectionPath = path9.join(sectionsDir, sectionName);
       const tsxFiles = fs.readdirSync(sectionPath).filter((f) => f.endsWith(".tsx") && !f.endsWith(".schema.ts"));
       for (const tsxFile of tsxFiles) {
-        const filePath = path10.join(sectionPath, tsxFile);
+        const filePath = path9.join(sectionPath, tsxFile);
         const content = fs.readFileSync(filePath, "utf-8");
         const relPath = `sections/${sectionName}/${tsxFile}`;
         if (!content.includes('"use client"') && !content.includes("'use client'")) {
@@ -2899,12 +2851,12 @@ async function validateCommand(options) {
       }
     }
   }
-  const registryPath = path10.join(themePath, "sections-registry.ts");
-  const bundleEntryPath = path10.join(themePath, "bundle-entry.ts");
+  const registryPath = path9.join(themePath, "sections-registry.ts");
+  const bundleEntryPath = path9.join(themePath, "bundle-entry.ts");
   const registryContent = fs.existsSync(registryPath) ? fs.readFileSync(registryPath, "utf-8") : fs.existsSync(bundleEntryPath) ? fs.readFileSync(bundleEntryPath, "utf-8") : "";
   if (fs.existsSync(sectionsDir) && registryContent) {
     const sections = fs.readdirSync(sectionsDir).filter(
-      (name) => fs.statSync(path10.join(sectionsDir, name)).isDirectory()
+      (name) => fs.statSync(path9.join(sectionsDir, name)).isDirectory()
     );
     for (const sectionName of sections) {
       if (!registryContent.includes(`sections/${sectionName}`) && !registryContent.includes(`"${sectionName}"`)) {
@@ -2927,7 +2879,7 @@ async function validateCommand(options) {
         });
       }
     }
-    const pagesDir = path10.join(themePath, "pages");
+    const pagesDir = path9.join(themePath, "pages");
     if (fs.existsSync(pagesDir)) {
       const allSchemaTypeSet = new Set(
         schemaTypes.map((s) => s.schemaType || s.folderName)
@@ -2979,9 +2931,9 @@ async function validateCommand(options) {
 }
 async function loadSchemaTypes(themePath, sectionsDir) {
   const results = [];
-  const sections = fs.readdirSync(sectionsDir).filter((name) => fs.statSync(path10.join(sectionsDir, name)).isDirectory());
+  const sections = fs.readdirSync(sectionsDir).filter((name) => fs.statSync(path9.join(sectionsDir, name)).isDirectory());
   for (const sectionName of sections) {
-    const schemaFile = path10.join(
+    const schemaFile = path9.join(
       sectionsDir,
       sectionName,
       `${sectionName}.schema.ts`
@@ -2991,10 +2943,26 @@ async function loadSchemaTypes(themePath, sectionsDir) {
       continue;
     }
     const content = fs.readFileSync(schemaFile, "utf-8");
-    const typeMatch = content.match(/\btype:\s*["']([^"']+)["']/);
+    let schemaType = null;
+    const schemaExportMatch = content.match(
+      /:\s*SectionSchema\s*=\s*\{[\s\S]*?\btype:\s*["']([^"']+)["']/
+    );
+    if (schemaExportMatch) {
+      schemaType = schemaExportMatch[1];
+    } else {
+      const allTypeMatches = [
+        ...content.matchAll(/\btype:\s*["']([^"']+)["']/g)
+      ];
+      for (const m of allTypeMatches) {
+        if (!FIELD_TYPES.has(m[1])) {
+          schemaType = m[1];
+          break;
+        }
+      }
+    }
     results.push({
       folderName: sectionName,
-      schemaType: typeMatch ? typeMatch[1] : null
+      schemaType
     });
   }
   return results;
@@ -3003,12 +2971,22 @@ async function validatePageSectionTypes(pagesDir, validTypes) {
   const issues = [];
   const files = fs.readdirSync(pagesDir).filter((f) => f.match(/\.(ts|js)$/));
   for (const file of files) {
-    const content = fs.readFileSync(path10.join(pagesDir, file), "utf-8");
+    const content = fs.readFileSync(path9.join(pagesDir, file), "utf-8");
     const pageName = file.replace(/\.(ts|js)$/, "");
-    const typeMatches = content.matchAll(/\btype:\s*["']([^"']+)["']/g);
+    const sectionsMatch = content.match(/\bsections:\s*\[/);
+    if (!sectionsMatch || sectionsMatch.index === void 0) continue;
+    const startIdx = sectionsMatch.index + sectionsMatch[0].length;
+    let depth = 1;
+    let endIdx = startIdx;
+    for (let i = startIdx; i < content.length && depth > 0; i++) {
+      if (content[i] === "[") depth++;
+      else if (content[i] === "]") depth--;
+      endIdx = i;
+    }
+    const sectionsBlock = content.slice(startIdx, endIdx);
+    const typeMatches = sectionsBlock.matchAll(/\btype:\s*["']([^"']+)["']/g);
     for (const match of typeMatches) {
       const sectionType = match[1];
-      if (isFieldType(sectionType)) continue;
       if (!validTypes.has(sectionType)) {
         issues.push({
           type: "error",
@@ -3049,11 +3027,18 @@ var FIELD_TYPES = /* @__PURE__ */ new Set([
   "array",
   "object",
   "group",
-  "section"
+  "section",
+  "boolean",
+  "color_token",
+  "color_background",
+  "image_picker",
+  "video_url",
+  "font",
+  "font_picker",
+  "text_alignment",
+  "inline_richtext",
+  "repeater"
 ]);
-function isFieldType(type) {
-  return FIELD_TYPES.has(type);
-}
 
 // src/commands/build.ts
 init_logger();
@@ -3064,14 +3049,14 @@ async function buildCommand(options) {
   if (options.theme) {
     themeName = options.theme;
     try {
-      const workspaceThemePath = path10.join(getThemesDir(), themeName);
+      const workspaceThemePath = path9.join(getThemesDir(), themeName);
       if (fs.existsSync(workspaceThemePath)) {
         themePath = workspaceThemePath;
       } else {
-        themePath = path10.join(process.cwd(), themeName);
+        themePath = path9.join(process.cwd(), themeName);
       }
     } catch {
-      themePath = path10.join(process.cwd(), themeName);
+      themePath = path9.join(process.cwd(), themeName);
     }
     if (!fs.existsSync(themePath)) {
       logger.error(`Theme "${themeName}" not found.`);
@@ -3082,10 +3067,10 @@ async function buildCommand(options) {
       "theme.config.ts",
       "bundle-entry.ts",
       "manifest.ts"
-    ].some((f) => fs.existsSync(path10.join(process.cwd(), f)));
+    ].some((f) => fs.existsSync(path9.join(process.cwd(), f)));
     if (isThemeDir) {
       themePath = process.cwd();
-      themeName = path10.basename(themePath);
+      themeName = path9.basename(themePath);
       logger.info(`Building current theme: ${themeName}`);
     } else {
       logger.error(
@@ -3094,7 +3079,7 @@ async function buildCommand(options) {
       process.exit(1);
     }
   }
-  const packageJsonPath = path10.join(themePath, "package.json");
+  const packageJsonPath = path9.join(themePath, "package.json");
   const hasPkgJson = fs.existsSync(packageJsonPath);
   if (!hasPkgJson) {
     logger.warning(
@@ -3150,9 +3135,9 @@ async function buildCommand(options) {
     logger.success("\u2713 Theme built successfully!");
     logger.newLine();
     logger.info(`Theme: ${themeName}`);
-    const distPath = path10.join(themePath, "dist");
+    const distPath = path9.join(themePath, "dist");
     if (fs.existsSync(distPath)) {
-      logger.log(`Output: ${path10.relative(process.cwd(), distPath)}`);
+      logger.log(`Output: ${path9.relative(process.cwd(), distPath)}`);
       const files = fs.readdirSync(distPath);
       logger.log(`Files: ${files.length}`);
     }
@@ -3160,17 +3145,17 @@ async function buildCommand(options) {
 }
 function runCommand(command, args, cwd) {
   return new Promise((resolve) => {
-    const proc = spawn2(command, args, {
+    const proc = spawn(command, args, {
       cwd,
       stdio: ["pipe", "pipe", "pipe"],
       shell: true
     });
     let stdout = "";
     let stderr = "";
-    proc.stdout?.on("data", (data) => {
+    proc.stdout.on("data", (data) => {
       stdout += data.toString();
     });
-    proc.stderr?.on("data", (data) => {
+    proc.stderr.on("data", (data) => {
       stderr += data.toString();
     });
     proc.on("close", (code) => {
@@ -3208,7 +3193,7 @@ async function packageCommand(options) {
   let themeName;
   if (options.theme) {
     themeName = options.theme;
-    themePath = path10.join(getThemesDir(), themeName);
+    themePath = path9.join(getThemesDir(), themeName);
     if (!fs.existsSync(themePath)) {
       logger.error(`Theme "${themeName}" not found.`);
       process.exit(1);
@@ -3218,10 +3203,10 @@ async function packageCommand(options) {
       "theme.config.ts",
       "bundle-entry.ts",
       "manifest.ts"
-    ].some((f) => fs.existsSync(path10.join(process.cwd(), f)));
+    ].some((f) => fs.existsSync(path9.join(process.cwd(), f)));
     if (isThemeDir) {
       themePath = process.cwd();
-      themeName = path10.basename(themePath);
+      themeName = path9.basename(themePath);
       logger.info(`Packaging current theme: ${themeName}`);
     } else {
       logger.error(
@@ -3230,7 +3215,7 @@ async function packageCommand(options) {
       process.exit(1);
     }
   }
-  const packageJsonPath = path10.join(themePath, "package.json");
+  const packageJsonPath = path9.join(themePath, "package.json");
   let version2 = "1.0.0";
   if (fs.existsSync(packageJsonPath)) {
     const packageJson = await fs.readJson(packageJsonPath);
@@ -3240,7 +3225,7 @@ async function packageCommand(options) {
   logger.info(`Theme: ${themeName}`);
   logger.info(`Version: ${version2}`);
   logger.newLine();
-  const compiledThemePath = path10.join(
+  const compiledThemePath = path9.join(
     process.cwd(),
     "themes",
     themeName,
@@ -3274,8 +3259,8 @@ async function packageCommand(options) {
   logger.newLine();
   logger.section("Step 2: Create Package");
   const packageName = options.name || `${themeName}-${version2}`;
-  const outputDir = options.output || path10.join(process.cwd(), "dist");
-  const outputPath = path10.join(outputDir, `${packageName}.zip`);
+  const outputDir = options.output || path9.join(process.cwd(), "dist");
+  const outputPath = path9.join(outputDir, `${packageName}.zip`);
   await fs.ensureDir(outputDir);
   logger.startSpinner("Creating zip archive...");
   try {
@@ -3288,11 +3273,11 @@ async function packageCommand(options) {
     logger.newLine();
     logger.info(`Package: ${packageName}.zip`);
     logger.log(`Size: ${sizeMB} MB`);
-    logger.log(`Location: ${path10.relative(process.cwd(), outputPath)}`);
+    logger.log(`Location: ${path9.relative(process.cwd(), outputPath)}`);
     logger.newLine();
     logger.section("Next steps:");
     logger.log(
-      `  onexthm deploy --package ${path10.relative(process.cwd(), outputPath)}`
+      `  onexthm deploy --package ${path9.relative(process.cwd(), outputPath)}`
     );
   } catch (error) {
     logger.stopSpinner(false, "Failed to create package");
@@ -3304,13 +3289,13 @@ async function packageCommand(options) {
 }
 function runCommand2(command, args) {
   return new Promise((resolve) => {
-    const proc = spawn2(command, args, {
+    const proc = spawn(command, args, {
       cwd: process.cwd(),
       stdio: "pipe",
       shell: true
     });
     let hasError = false;
-    proc.stderr?.on("data", (data) => {
+    proc.stderr.on("data", (data) => {
       const message = data.toString();
       if (message.includes("error") || message.includes("Error") || message.includes("ERROR")) {
         hasError = true;
@@ -3350,9 +3335,9 @@ async function deployCommand(options) {
   ensureOneXProject();
   let packagePath;
   if (options.package) {
-    packagePath = path10.resolve(options.package);
+    packagePath = path9.resolve(options.package);
   } else if (options.theme) {
-    const distDir = path10.join(process.cwd(), "dist");
+    const distDir = path9.join(process.cwd(), "dist");
     if (!fs.existsSync(distDir)) {
       logger.error("No dist/ directory found. Run 'onexthm package' first.");
       process.exit(1);
@@ -3367,7 +3352,7 @@ async function deployCommand(options) {
       process.exit(1);
     }
     packageFiles.sort().reverse();
-    packagePath = path10.join(distDir, packageFiles[0]);
+    packagePath = path9.join(distDir, packageFiles[0]);
   } else {
     logger.error("Either --package or --theme must be specified.");
     logger.info("Examples:");
@@ -3381,11 +3366,11 @@ async function deployCommand(options) {
   }
   const stats = await fs.stat(packagePath);
   const sizeMB = (stats.size / 1024 / 1024).toFixed(2);
-  const fileName = path10.basename(packagePath);
+  const fileName = path9.basename(packagePath);
   logger.newLine();
   logger.info(`Package: ${fileName}`);
   logger.log(`Size: ${sizeMB} MB`);
-  logger.log(`Path: ${path10.relative(process.cwd(), packagePath)}`);
+  logger.log(`Path: ${path9.relative(process.cwd(), packagePath)}`);
   logger.newLine();
   const apiUrl = options.apiUrl || process.env.ONEX_API_URL || "http://localhost:3001";
   const uploadEndpoint = `${apiUrl}/website-api/themes/upload`;
@@ -3489,11 +3474,11 @@ function getBucketName(env) {
   return environment === "production" ? "theme-s3-bucket" : "theme-s3-bucket";
 }
 async function findCompiledThemeDir(themeId, version2) {
-  const searchPaths = [path10.resolve(process.cwd(), "dist")];
+  const searchPaths = [path9.resolve(process.cwd(), "dist")];
   for (const dir of searchPaths) {
     if (await fs.pathExists(dir)) {
-      const hasManifest = await fs.pathExists(path10.join(dir, "manifest.json"));
-      const hasThemeEntry = await fs.pathExists(path10.join(dir, "bundle-entry.js")) || await fs.pathExists(path10.join(dir, "theme.config.js")) || await fs.pathExists(path10.join(dir, "index.js"));
+      const hasManifest = await fs.pathExists(path9.join(dir, "manifest.json"));
+      const hasThemeEntry = await fs.pathExists(path9.join(dir, "bundle-entry.js")) || await fs.pathExists(path9.join(dir, "theme.config.js")) || await fs.pathExists(path9.join(dir, "index.js"));
       if (hasManifest || hasThemeEntry) {
         return dir;
       }
@@ -3502,7 +3487,7 @@ async function findCompiledThemeDir(themeId, version2) {
   return null;
 }
 async function readManifest() {
-  const manifestTsPath = path10.resolve(process.cwd(), "manifest.ts");
+  const manifestTsPath = path9.resolve(process.cwd(), "manifest.ts");
   if (await fs.pathExists(manifestTsPath)) {
     try {
       const module = await import(manifestTsPath);
@@ -3511,7 +3496,7 @@ async function readManifest() {
       logger.warning("Failed to import manifest.ts, trying package.json");
     }
   }
-  const packageJsonPath = path10.resolve(process.cwd(), "package.json");
+  const packageJsonPath = path9.resolve(process.cwd(), "package.json");
   if (await fs.pathExists(packageJsonPath)) {
     const pkg = await fs.readJson(packageJsonPath);
     return {
@@ -3545,13 +3530,13 @@ async function findSourceDir(themeId, explicitDir) {
   }
   const searchPaths = [
     process.cwd(),
-    path10.resolve(process.cwd(), `../../themes/${themeId}`),
-    path10.resolve(process.cwd(), `../themes/${themeId}`)
+    path9.resolve(process.cwd(), `../../themes/${themeId}`),
+    path9.resolve(process.cwd(), `../themes/${themeId}`)
   ];
   const markers = ["theme.config.ts", "bundle-entry.ts"];
   for (const dir of searchPaths) {
     for (const marker of markers) {
-      if (await fs.pathExists(path10.join(dir, marker))) {
+      if (await fs.pathExists(path9.join(dir, marker))) {
         return dir;
       }
     }
@@ -3603,7 +3588,7 @@ async function uploadCommand(options) {
     spinner.succeed(`Found compiled theme at: ${compiledDir}`);
     spinner.start("Creating bundle.zip...");
     const tmpDir = os.tmpdir();
-    const bundleZipPath = path10.join(tmpDir, `${themeId}-${version2}-bundle.zip`);
+    const bundleZipPath = path9.join(tmpDir, `${themeId}-${version2}-bundle.zip`);
     await createZipFromDir(compiledDir, bundleZipPath);
     const bundleZipBuffer = await fs.readFile(bundleZipPath);
     const bundleSizeMB = (bundleZipBuffer.length / 1024 / 1024).toFixed(2);
@@ -3657,7 +3642,7 @@ async function uploadCommand(options) {
       if (sourceDir) {
         spinner.succeed(`Found source at: ${sourceDir}`);
         spinner.start("Creating source.zip...");
-        const sourceZipPath = path10.join(
+        const sourceZipPath = path9.join(
           tmpDir,
           `${themeId}-${version2}-source.zip`
         );
@@ -3791,8 +3776,8 @@ async function resolveLatestVersion(s3Client, bucket, themeId) {
 async function createCompatibilityFiles(outputDir, manifest) {
   const entryFile = manifest.output?.entry || "bundle-entry.js";
   if (entryFile !== "bundle-entry.js" && entryFile.startsWith("bundle-entry-")) {
-    const hashedPath = path10.join(outputDir, entryFile);
-    const stablePath = path10.join(outputDir, "bundle-entry.js");
+    const hashedPath = path9.join(outputDir, entryFile);
+    const stablePath = path9.join(outputDir, "bundle-entry.js");
     if (await fs.pathExists(hashedPath)) {
       await fs.copy(hashedPath, stablePath);
       const mapPath = hashedPath + ".map";
@@ -3801,13 +3786,13 @@ async function createCompatibilityFiles(outputDir, manifest) {
       }
     }
   }
-  const sectionsRegistryPath = path10.join(outputDir, "sections-registry.js");
+  const sectionsRegistryPath = path9.join(outputDir, "sections-registry.js");
   const content = `// Re-export all sections from bundle-entry
 // This file exists to maintain compatibility with the import path
 export * from './bundle-entry.js';
 `;
   await fs.writeFile(sectionsRegistryPath, content, "utf-8");
-  const pkgJsonPath = path10.join(outputDir, "package.json");
+  const pkgJsonPath = path9.join(outputDir, "package.json");
   await fs.writeFile(pkgJsonPath, '{\n  "type": "module"\n}\n', "utf-8");
 }
 function showDownloadFailureHelp(themeId, bucket) {
@@ -3902,7 +3887,7 @@ async function downloadCommand(options) {
     zip.extractAllTo(outputDir, true);
     const entries = zip.getEntries().filter((e) => !e.isDirectory);
     spinner.succeed(`Extracted ${entries.length} files to ${outputDir}`);
-    const manifestPath = path10.join(outputDir, "manifest.json");
+    const manifestPath = path9.join(outputDir, "manifest.json");
     const manifest = await fs.readJson(manifestPath);
     await createCompatibilityFiles(outputDir, manifest);
     console.log();
@@ -4002,9 +3987,10 @@ async function resolveLatestVersion2(s3Client, bucket, themeId) {
 }
 function runInstall(cwd) {
   return new Promise((resolve) => {
-    const proc = spawn2("pnpm", ["install"], {
+    const proc = spawn("pnpm", ["install"], {
       cwd,
-      stdio: "inherit"
+      stdio: "inherit",
+      shell: true
     });
     proc.on("close", (code) => resolve(code === 0));
     proc.on("error", () => resolve(false));
@@ -4035,7 +4021,7 @@ async function renameTheme(themeDir, oldName, newName) {
   const oldPrefix = `${oldName}-`;
   const newPrefix = `${newName}-`;
   const newDisplayName = newName.split("-").map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join(" ");
-  const pkgPath = path10.join(themeDir, "package.json");
+  const pkgPath = path9.join(themeDir, "package.json");
   if (await fs.pathExists(pkgPath)) {
     const pkg = await fs.readJson(pkgPath);
     pkg.name = `@onex-themes/${newName}`;
@@ -4051,7 +4037,7 @@ async function renameTheme(themeDir, oldName, newName) {
     }
     await fs.writeJson(pkgPath, pkg, { spaces: 2 });
   }
-  const configPath = path10.join(themeDir, "theme.config.ts");
+  const configPath = path9.join(themeDir, "theme.config.ts");
   if (await fs.pathExists(configPath)) {
     let content = await fs.readFile(configPath, "utf-8");
     content = content.replace(/id:\s*"[^"]*"/, `id: "${newName}"`);
@@ -4061,7 +4047,7 @@ async function renameTheme(themeDir, oldName, newName) {
     );
     await fs.writeFile(configPath, content);
   }
-  const layoutPath = path10.join(themeDir, "theme.layout.ts");
+  const layoutPath = path9.join(themeDir, "theme.layout.ts");
   if (await fs.pathExists(layoutPath)) {
     let content = await fs.readFile(layoutPath, "utf-8");
     content = content.replace(/id:\s*"[^"]*"/, `id: "${newName}"`);
@@ -4074,7 +4060,7 @@ async function renameTheme(themeDir, oldName, newName) {
   const oldDisplayName = oldName.split("-").map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join(" ");
   const tsFiles = await glob("**/*.ts", { cwd: themeDir, nodir: true });
   for (const file of tsFiles) {
-    const filePath = path10.join(themeDir, file);
+    const filePath = path9.join(themeDir, file);
     let content = await fs.readFile(filePath, "utf-8");
     const original = content;
     content = content.replace(
@@ -4103,7 +4089,7 @@ async function cloneCommand(themeName, options) {
   const spinner = ora("Initializing clone...").start();
   try {
     const bucket = options.bucket || getBucketName3(options.environment);
-    const outputDir = options.output || path10.resolve(process.cwd(), newName);
+    const outputDir = options.output || path9.resolve(process.cwd(), newName);
     const s3Client = getS3Client3();
     if (await fs.pathExists(outputDir)) {
       spinner.fail(chalk4.red(`Directory already exists: ${outputDir}`));
@@ -4158,7 +4144,7 @@ async function cloneCommand(themeName, options) {
     spinner.succeed(
       `Renamed theme: ${chalk4.gray(themeName)} \u2192 ${chalk4.cyan(newName)}`
     );
-    const envExamplePath = path10.join(outputDir, ".env.example");
+    const envExamplePath = path9.join(outputDir, ".env.example");
     if (!await fs.pathExists(envExamplePath)) {
       await fs.writeFile(
         envExamplePath,
@@ -4171,18 +4157,32 @@ async function cloneCommand(themeName, options) {
         ].join("\n")
       );
     }
-    const { default: inquirerMod } = await import('inquirer');
-    const { figmaApiKey } = await inquirerMod.prompt([
-      {
-        type: "password",
-        name: "figmaApiKey",
-        message: "Figma API Key (optional, for Figma-to-code MCP \u2014 press Enter to skip):"
+    const mcpJsonPath = path9.join(outputDir, ".mcp.json");
+    if (await fs.pathExists(mcpJsonPath)) {
+      const { default: inquirerMod } = await import('inquirer');
+      const { figmaApiKey } = await inquirerMod.prompt([
+        {
+          type: "password",
+          name: "figmaApiKey",
+          message: "Figma API Key (optional, for Figma-to-code MCP \u2014 press Enter to skip):"
+        }
+      ]);
+      let mcpContent = await fs.readFile(mcpJsonPath, "utf-8");
+      if (figmaApiKey) {
+        mcpContent = mcpContent.replace("__FIGMA_API_KEY__", figmaApiKey);
+      } else {
+        try {
+          const mcpJson = JSON.parse(mcpContent);
+          delete mcpJson.mcpServers?.figma;
+          mcpContent = JSON.stringify(mcpJson, null, 2) + "\n";
+        } catch {
+        }
       }
-    ]);
-    ensureMcpJson(outputDir, figmaApiKey || void 0);
+      await fs.writeFile(mcpJsonPath, mcpContent, "utf-8");
+    }
     if (options.install !== false) {
       const hasPkgJson = await fs.pathExists(
-        path10.join(outputDir, "package.json")
+        path9.join(outputDir, "package.json")
       );
       if (hasPkgJson) {
         spinner.start("Installing dependencies...");
@@ -4209,10 +4209,9 @@ async function cloneCommand(themeName, options) {
     console.log(chalk4.cyan("   Files:    ") + chalk4.white(entries.length));
     console.log();
     console.log(chalk4.cyan("Next steps:"));
-    console.log(chalk4.gray(`   cd ${path10.relative(process.cwd(), outputDir)}`));
-    const copyCmd = process.platform === "win32" ? "copy .env.example .env" : "cp .env.example .env";
+    console.log(chalk4.gray(`   cd ${path9.relative(process.cwd(), outputDir)}`));
     console.log(
-      chalk4.gray(`   ${copyCmd}  # then add your Company ID`)
+      chalk4.gray("   cp .env.example .env  # then add your Company ID")
     );
     if (options.install === false) {
       console.log(chalk4.gray("   pnpm install"));
@@ -4245,7 +4244,7 @@ var MIME_TYPES = {
 };
 function createDevServer(options) {
   const clients = /* @__PURE__ */ new Set();
-  const themeDataPath = path10.join(options.distDir, "theme-data.json");
+  const themeDataPath = path9.join(options.distDir, "theme-data.json");
   const server = http.createServer((req, res) => {
     res.setHeader("Access-Control-Allow-Origin", "*");
     res.setHeader("Access-Control-Allow-Methods", "GET, OPTIONS");
@@ -4271,8 +4270,8 @@ function createDevServer(options) {
     if (pathname.startsWith("/_assets/")) {
       const parts = pathname.replace(/^\/_assets\//, "").split("/");
       const assetSubpath = parts.slice(1).join("/");
-      const assetPath = path10.join(options.themePath, "assets", assetSubpath);
-      if (!assetPath.startsWith(path10.join(options.themePath, "assets"))) {
+      const assetPath = path9.join(options.themePath, "assets", assetSubpath);
+      if (!assetPath.startsWith(path9.join(options.themePath, "assets"))) {
         res.writeHead(403);
         res.end("Forbidden");
         return;
@@ -4283,8 +4282,8 @@ function createDevServer(options) {
     if (pathname.startsWith("/themes/")) {
       const match = pathname.match(/^\/themes\/[^/]+\/assets\/(.+)/);
       if (match) {
-        const assetPath = path10.join(options.themePath, "assets", match[1]);
-        if (!assetPath.startsWith(path10.join(options.themePath, "assets"))) {
+        const assetPath = path9.join(options.themePath, "assets", match[1]);
+        if (!assetPath.startsWith(path9.join(options.themePath, "assets"))) {
           res.writeHead(403);
           res.end("Forbidden");
           return;
@@ -4298,26 +4297,26 @@ function createDevServer(options) {
       const segments = subpath.split("/");
       let assetPath;
       if (segments[0] === options.themeName || segments[0] === options.themeName.replace(/^my-/, "")) {
-        assetPath = path10.join(
+        assetPath = path9.join(
           options.themePath,
           "assets",
           segments.slice(1).join("/")
         );
       } else {
-        assetPath = path10.join(options.themePath, "assets", subpath);
+        assetPath = path9.join(options.themePath, "assets", subpath);
       }
-      if (assetPath.startsWith(path10.join(options.themePath, "assets")) && fs4.existsSync(assetPath)) {
+      if (assetPath.startsWith(path9.join(options.themePath, "assets")) && fs3.existsSync(assetPath)) {
         serveFile(res, assetPath);
         return;
       }
     }
-    const filePath = path10.join(options.distDir, pathname);
+    const filePath = path9.join(options.distDir, pathname);
     if (!filePath.startsWith(options.distDir)) {
       res.writeHead(403);
       res.end("Forbidden");
       return;
     }
-    if (fs4.existsSync(filePath) && fs4.statSync(filePath).isFile()) {
+    if (fs3.existsSync(filePath) && fs3.statSync(filePath).isFile()) {
       serveFile(res, filePath);
     } else {
       res.writeHead(200, { "Content-Type": "text/html" });
@@ -4349,14 +4348,14 @@ function createDevServer(options) {
 }
 function serveFile(res, filePath) {
   try {
-    if (!fs4.existsSync(filePath)) {
+    if (!fs3.existsSync(filePath)) {
       res.writeHead(404);
       res.end("Not Found");
       return;
     }
-    const ext = path10.extname(filePath);
+    const ext = path9.extname(filePath);
     const contentType = MIME_TYPES[ext] || "application/octet-stream";
-    const content = fs4.readFileSync(filePath);
+    const content = fs3.readFileSync(filePath);
     res.writeHead(200, { "Content-Type": contentType });
     res.end(content);
   } catch {
@@ -4369,7 +4368,7 @@ function generatePreviewHTML(themeName, port, themeDataPath) {
   let fontVarsCSS = "";
   if (themeDataPath) {
     try {
-      const themeData = JSON.parse(fs4.readFileSync(themeDataPath, "utf-8"));
+      const themeData = JSON.parse(fs3.readFileSync(themeDataPath, "utf-8"));
       const typography = (themeData?.themeConfig || themeData?.theme?.config)?.typography?.fontFamily;
       if (typography) {
         const fontFamilies = /* @__PURE__ */ new Set();
@@ -4457,14 +4456,14 @@ async function devCommand(options) {
   if (options.theme) {
     themeName = options.theme;
     try {
-      const workspaceThemePath = path10.join(getThemesDir(), themeName);
+      const workspaceThemePath = path9.join(getThemesDir(), themeName);
       if (fs.existsSync(workspaceThemePath)) {
         themePath = workspaceThemePath;
       } else {
-        themePath = path10.join(process.cwd(), themeName);
+        themePath = path9.join(process.cwd(), themeName);
       }
     } catch {
-      themePath = path10.join(process.cwd(), themeName);
+      themePath = path9.join(process.cwd(), themeName);
     }
     if (!fs.existsSync(themePath)) {
       logger.error(`Theme "${themeName}" not found.`);
@@ -4475,10 +4474,10 @@ async function devCommand(options) {
       "theme.config.ts",
       "bundle-entry.ts",
       "manifest.ts"
-    ].some((f) => fs.existsSync(path10.join(process.cwd(), f)));
+    ].some((f) => fs.existsSync(path9.join(process.cwd(), f)));
     if (isThemeDir) {
       themePath = process.cwd();
-      themeName = path10.basename(themePath);
+      themeName = path9.basename(themePath);
     } else {
       logger.error(
         "Not in a theme directory and no --theme specified. Run from theme root or use --theme flag."
@@ -4547,9 +4546,9 @@ async function devCommand(options) {
     watcher.close();
     await context2.dispose();
     server.close();
-    const shimPath = path10.join(outputDir, ".process-shim.js");
+    const shimPath = path9.join(outputDir, ".process-shim.js");
     try {
-      await fs9.unlink(shimPath);
+      await fs8.unlink(shimPath);
     } catch {
     }
     process.exit(0);
@@ -4558,8 +4557,8 @@ async function devCommand(options) {
 
 // src/commands/config.ts
 init_logger();
-var CONFIG_DIR = path10.join(os.homedir(), ".onexthm");
-var CONFIG_FILE = path10.join(CONFIG_DIR, ".env");
+var CONFIG_DIR = path9.join(os.homedir(), ".onexthm");
+var CONFIG_FILE = path9.join(CONFIG_DIR, ".env");
 var CONFIG_ENTRIES = [
   {
     key: "AWS_ACCESS_KEY_ID",
@@ -4826,13 +4825,13 @@ async function publishCommand(options) {
   logger.info(`Logged in as: ${tokens.user.email}`);
   let themePath;
   if (options.theme) {
-    themePath = path10.resolve(options.theme);
+    themePath = path9.resolve(options.theme);
   } else {
     const isThemeDir = [
       "theme.config.ts",
       "bundle-entry.ts",
       "manifest.ts"
-    ].some((f) => fs.existsSync(path10.join(process.cwd(), f)));
+    ].some((f) => fs.existsSync(path9.join(process.cwd(), f)));
     if (isThemeDir) {
       themePath = process.cwd();
     } else {
@@ -4842,13 +4841,13 @@ async function publishCommand(options) {
       process.exit(1);
     }
   }
-  const pkgPath = path10.join(themePath, "package.json");
+  const pkgPath = path9.join(themePath, "package.json");
   if (!fs.existsSync(pkgPath)) {
     logger.error("No package.json found in theme directory");
     process.exit(1);
   }
   const pkg = fs.readJsonSync(pkgPath);
-  const themeId = pkg.name?.replace("@onex-themes/", "") || path10.basename(themePath);
+  const themeId = pkg.name?.replace("@onex-themes/", "") || path9.basename(themePath);
   if (options.bump) {
     const currentVersion = pkg.version || "1.0.0";
     const newVersion = semver.inc(currentVersion, options.bump);
@@ -4980,13 +4979,13 @@ Or use the --bump flag:
   try {
     const archiver3 = await import('archiver');
     const { createWriteStream } = await import('fs');
-    const distDir = path10.join(themePath, "dist");
+    const distDir = path9.join(themePath, "dist");
     if (!fs.existsSync(distDir)) {
       logger.stopSpinner(false, "No dist/ directory");
       logger.error("Build the theme first: onexthm build");
       process.exit(1);
     }
-    const bundleZipPath = path10.join(themePath, "dist", "bundle.zip");
+    const bundleZipPath = path9.join(themePath, "dist", "bundle.zip");
     await createZip(distDir, bundleZipPath, [
       "bundle.zip",
       "source.zip",
@@ -5011,7 +5010,7 @@ Or use the --bump flag:
   }
   logger.startSpinner("Uploading source...");
   try {
-    const sourceZipPath = path10.join(themePath, "dist", "source.zip");
+    const sourceZipPath = path9.join(themePath, "dist", "source.zip");
     await createZip(themePath, sourceZipPath, [
       "node_modules",
       "dist",
@@ -5096,17 +5095,23 @@ async function createZip(sourceDir, outputPath, exclude) {
 }
 
 // src/cli.ts
+dotenv.config({
+  path: path9.join(process.cwd(), ".env.local"),
+  override: true
+});
+dotenv.config({ path: path9.join(process.cwd(), ".env") });
 try {
   const projectRoot = getProjectRoot();
-  dotenv.config({
-    path: path10.join(projectRoot, ".env.local"),
-    quiet: true
-  });
-  dotenv.config({ path: path10.join(projectRoot, ".env"), quiet: true });
+  if (path9.resolve(projectRoot) !== path9.resolve(process.cwd())) {
+    dotenv.config({
+      path: path9.join(projectRoot, ".env.local")
+    });
+    dotenv.config({ path: path9.join(projectRoot, ".env") });
+  }
 } catch {
 }
 dotenv.config({
-  path: path10.join(os.homedir(), ".onexthm", ".env"),
+  path: path9.join(os.homedir(), ".onexthm", ".env"),
   quiet: true
 });
 var require2 = createRequire(import.meta.url);