@onexapis/cli 1.1.38 → 1.1.39

package/dist/index.mjs

@@ -1,13 +1,13 @@
 import chalk4 from 'chalk';
 import ora from 'ora';
 import * as esbuild from 'esbuild';
-import path9 from 'path';
-import fs8 from 'fs/promises';
+import path8 from 'path';
+import fs7 from 'fs/promises';
 import crypto from 'crypto';
 import { glob } from 'glob';
 import { createRequire } from 'module';
-import fs4 from 'fs';
-import spawn2 from 'cross-spawn';
+import fs3 from 'fs';
+import { execSync, spawn } from 'child_process';
 import inquirer from 'inquirer';
 import fs from 'fs-extra';
 import ejs from 'ejs';
@@ -102,8 +102,8 @@ async function generateThemeCSS(themePath, outDir) {
     const tailwindcss = (await import('tailwindcss')).default;
     const tailwindConfig = {
       content: [
-        path9.join(themePath, "sections/**/*.{ts,tsx}"),
-        path9.join(themePath, "components/**/*.{ts,tsx}")
+        path8.join(themePath, "sections/**/*.{ts,tsx}"),
+        path8.join(themePath, "components/**/*.{ts,tsx}")
       ],
       theme: { extend: {} },
       plugins: []
@@ -113,7 +113,7 @@ async function generateThemeCSS(themePath, outDir) {
       inputCSS,
       { from: void 0 }
     );
-    await fs8.writeFile(path9.join(outDir, "bundle.css"), result.css);
+    await fs7.writeFile(path8.join(outDir, "bundle.css"), result.css);
     logger.info("Generated bundle.css");
   } catch (err) {
     logger.warning(
@@ -124,12 +124,12 @@ async function generateThemeCSS(themePath, outDir) {
 async function resolveNodeModulesFile(startDir, relativePath) {
   let dir = startDir;
   while (true) {
-    const candidate = path9.join(dir, "node_modules", relativePath);
+    const candidate = path8.join(dir, "node_modules", relativePath);
     try {
-      await fs8.access(candidate);
+      await fs7.access(candidate);
       return candidate;
     } catch {
-      const parent = path9.dirname(dir);
+      const parent = path8.dirname(dir);
       if (parent === dir) break;
       dir = parent;
     }
@@ -153,7 +153,7 @@ async function scanImportsFromPackage(sourceDir, packageName) {
   });
   for (const file of sourceFiles) {
     try {
-      const content = await fs8.readFile(path9.join(sourceDir, file), "utf-8");
+      const content = await fs7.readFile(path8.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();
@@ -207,17 +207,17 @@ function createCoreGlobalPlugin(themePath) {
           const distFileName = subpath ? `${subpath}.mjs` : "index.mjs";
           let distPath = await resolveNodeModulesFile(
             themePath,
-            path9.join("@onexapis", "core", "dist", distFileName)
+            path8.join("@onexapis", "core", "dist", distFileName)
           );
           if (!distPath) {
             distPath = await resolveNodeModulesFile(
               __dirname,
-              path9.join("@onexapis", "core", "dist", distFileName)
+              path8.join("@onexapis", "core", "dist", distFileName)
             );
           }
           try {
             if (!distPath) throw new Error("not found");
-            const distContent = await fs8.readFile(distPath, "utf-8");
+            const distContent = await fs7.readFile(distPath, "utf-8");
             const exportMatches = distContent.matchAll(/export\s*\{([^}]+)\}/g);
             for (const m of exportMatches) {
               const names = m[1].split(",").map((n) => {
@@ -446,7 +446,7 @@ async function generateThemeData(themePath, outputDir, themeId) {
   const pages = {};
   for (const ext of [".ts", ".js"]) {
     try {
-      const mod = await jiti.import(path9.join(themePath, `theme.config${ext}`));
+      const mod = await jiti.import(path8.join(themePath, `theme.config${ext}`));
       themeConfig = mod.default || mod;
       break;
     } catch {
@@ -454,20 +454,20 @@ async function generateThemeData(themePath, outputDir, themeId) {
   }
   for (const ext of [".ts", ".js"]) {
     try {
-      const mod = await jiti.import(path9.join(themePath, `theme.layout${ext}`));
+      const mod = await jiti.import(path8.join(themePath, `theme.layout${ext}`));
       layoutConfig = mod.default || mod;
       break;
     } catch {
     }
   }
   const schemas = {};
-  const sectionsDir = path9.join(themePath, "sections");
+  const sectionsDir = path8.join(themePath, "sections");
   try {
-    const sectionDirs = await fs8.readdir(sectionsDir);
+    const sectionDirs = await fs7.readdir(sectionsDir);
     for (const dir of sectionDirs) {
-      const schemaFile = path9.join(sectionsDir, dir, `${dir}.schema.ts`);
+      const schemaFile = path8.join(sectionsDir, dir, `${dir}.schema.ts`);
       try {
-        await fs8.access(schemaFile);
+        await fs7.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) {
@@ -479,14 +479,14 @@ async function generateThemeData(themePath, outputDir, themeId) {
     }
   } catch {
   }
-  const pagesDir = path9.join(themePath, "pages");
+  const pagesDir = path8.join(themePath, "pages");
   try {
-    const files = await fs8.readdir(pagesDir);
+    const files = await fs7.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(path9.join(pagesDir, file));
+        const mod = await jiti.import(path8.join(pagesDir, file));
         const config = mod.default || mod;
         const sections = (config.sections || []).map((section) => {
           const schema = schemas[section.type];
@@ -514,8 +514,8 @@ async function generateThemeData(themePath, outputDir, themeId) {
     }
   } catch {
   }
-  await fs8.writeFile(
-    path9.join(outputDir, "theme-data.json"),
+  await fs7.writeFile(
+    path8.join(outputDir, "theme-data.json"),
     JSON.stringify(
       {
         themeId,
@@ -538,36 +538,36 @@ async function generateThemeData(themePath, outputDir, themeId) {
   logger.info(`Generated theme-data.json (${Object.keys(pages).length} pages)`);
 }
 async function contentHashEntry(outputDir) {
-  const entryPath = path9.join(outputDir, "bundle-entry.js");
-  const mapPath = path9.join(outputDir, "bundle-entry.js.map");
+  const entryPath = path8.join(outputDir, "bundle-entry.js");
+  const mapPath = path8.join(outputDir, "bundle-entry.js.map");
   const oldFiles = await glob("bundle-entry-*.js*", { cwd: outputDir });
   for (const f of oldFiles) {
-    await fs8.unlink(path9.join(outputDir, f));
+    await fs7.unlink(path8.join(outputDir, f));
   }
   let entryContent;
   try {
-    entryContent = await fs8.readFile(entryPath, "utf-8");
+    entryContent = await fs7.readFile(entryPath, "utf-8");
   } catch {
-    const indexPath = path9.join(outputDir, "index.js");
+    const indexPath = path8.join(outputDir, "index.js");
     try {
-      entryContent = await fs8.readFile(indexPath, "utf-8");
+      entryContent = await fs7.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 = path9.join(outputDir, "index.js.map");
+    const indexMapPath = path8.join(outputDir, "index.js.map");
     const hashedMapName2 = `bundle-entry-${hash2}.js.map`;
     entryContent = entryContent.replace(
       /\/\/# sourceMappingURL=index\.js\.map/,
       `//# sourceMappingURL=${hashedMapName2}`
     );
-    await fs8.writeFile(path9.join(outputDir, hashedName2), entryContent);
-    await fs8.unlink(indexPath);
+    await fs7.writeFile(path8.join(outputDir, hashedName2), entryContent);
+    await fs7.unlink(indexPath);
     try {
-      await fs8.access(indexMapPath);
-      await fs8.rename(indexMapPath, path9.join(outputDir, hashedMapName2));
+      await fs7.access(indexMapPath);
+      await fs7.rename(indexMapPath, path8.join(outputDir, hashedMapName2));
     } catch {
     }
     logger.info(`Entry hashed: ${hashedName2}`);
@@ -580,11 +580,11 @@ async function contentHashEntry(outputDir) {
     /\/\/# sourceMappingURL=bundle-entry\.js\.map/,
     `//# sourceMappingURL=${hashedMapName}`
   );
-  await fs8.writeFile(path9.join(outputDir, hashedName), entryContent);
-  await fs8.unlink(entryPath);
+  await fs7.writeFile(path8.join(outputDir, hashedName), entryContent);
+  await fs7.unlink(entryPath);
   try {
-    await fs8.access(mapPath);
-    await fs8.rename(mapPath, path9.join(outputDir, hashedMapName));
+    await fs7.access(mapPath);
+    await fs7.rename(mapPath, path8.join(outputDir, hashedMapName));
   } catch {
   }
   logger.info(`Entry hashed: ${hashedName}`);
@@ -596,7 +596,7 @@ async function extractDataRequirements(themePath) {
   const requirements = {};
   for (const file of schemaFiles) {
     try {
-      const mod = await jiti.import(path9.join(themePath, file));
+      const mod = await jiti.import(path8.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") {
@@ -615,8 +615,8 @@ async function generateManifest(themeName, themePath, outputDir) {
   let version = "1.0.0";
   let themeId = themeName;
   try {
-    const pkgContent = await fs8.readFile(
-      path9.join(themePath, "package.json"),
+    const pkgContent = await fs7.readFile(
+      path8.join(themePath, "package.json"),
       "utf-8"
     );
     const pkg = JSON.parse(pkgContent);
@@ -634,7 +634,7 @@ async function generateManifest(themeName, themePath, outputDir) {
   const dataRequirements = await extractDataRequirements(themePath);
   let hasThemeConfig = false;
   try {
-    await fs8.access(path9.join(themePath, "theme.config.ts"));
+    await fs7.access(path8.join(themePath, "theme.config.ts"));
     hasThemeConfig = true;
   } catch {
   }
@@ -675,24 +675,24 @@ async function generateManifest(themeName, themePath, outputDir) {
     // Section data requirements for server-side prefetching (keyed by section type)
     dataRequirements
   };
-  await fs8.writeFile(
-    path9.join(outputDir, "manifest.json"),
+  await fs7.writeFile(
+    path8.join(outputDir, "manifest.json"),
     JSON.stringify(manifest, null, 2)
   );
 }
 async function compileStandaloneTheme(themePath, themeName) {
-  const outputDir = path9.join(themePath, "dist");
-  const bundleEntry = path9.join(themePath, "bundle-entry.ts");
-  const indexEntry = path9.join(themePath, "index.ts");
+  const outputDir = path8.join(themePath, "dist");
+  const bundleEntry = path8.join(themePath, "bundle-entry.ts");
+  const indexEntry = path8.join(themePath, "index.ts");
   let entryPoint = indexEntry;
   try {
-    await fs8.access(bundleEntry);
+    await fs7.access(bundleEntry);
     entryPoint = bundleEntry;
   } catch {
   }
-  const shimPath = path9.join(outputDir, ".process-shim.js");
-  await fs8.mkdir(outputDir, { recursive: true });
-  await fs8.writeFile(shimPath, PROCESS_SHIM);
+  const shimPath = path8.join(outputDir, ".process-shim.js");
+  await fs7.mkdir(outputDir, { recursive: true });
+  await fs7.writeFile(shimPath, PROCESS_SHIM);
   const buildOptions = {
     entryPoints: [entryPoint],
     bundle: true,
@@ -742,7 +742,7 @@ async function compileStandaloneTheme(themePath, themeName) {
   try {
     const result = await esbuild.build(buildOptions);
     try {
-      await fs8.unlink(shimPath);
+      await fs7.unlink(shimPath);
     } catch {
     }
     await contentHashEntry(outputDir);
@@ -761,7 +761,7 @@ async function compileStandaloneTheme(themePath, themeName) {
     return true;
   } catch (error) {
     try {
-      await fs8.unlink(shimPath);
+      await fs7.unlink(shimPath);
     } catch {
     }
     logger.error(`esbuild compilation failed: ${error}`);
@@ -769,18 +769,18 @@ async function compileStandaloneTheme(themePath, themeName) {
   }
 }
 async function compileStandaloneThemeDev(themePath, themeName) {
-  const outputDir = path9.join(themePath, "dist");
-  const bundleEntry = path9.join(themePath, "bundle-entry.ts");
-  const indexEntry = path9.join(themePath, "index.ts");
+  const outputDir = path8.join(themePath, "dist");
+  const bundleEntry = path8.join(themePath, "bundle-entry.ts");
+  const indexEntry = path8.join(themePath, "index.ts");
   let entryPoint = indexEntry;
   try {
-    await fs8.access(bundleEntry);
+    await fs7.access(bundleEntry);
     entryPoint = bundleEntry;
   } catch {
   }
-  const shimPath = path9.join(outputDir, ".process-shim.js");
-  await fs8.mkdir(outputDir, { recursive: true });
-  await fs8.writeFile(shimPath, PROCESS_SHIM);
+  const shimPath = path8.join(outputDir, ".process-shim.js");
+  await fs7.mkdir(outputDir, { recursive: true });
+  await fs7.writeFile(shimPath, PROCESS_SHIM);
   const buildOptions = {
     entryPoints: [entryPoint],
     bundle: true,
@@ -833,18 +833,18 @@ async function compileStandaloneThemeDev(themePath, themeName) {
   return { context: context2, outputDir };
 }
 async function compilePreviewRuntime(themePath) {
-  const outputDir = path9.join(themePath, "dist");
-  await fs8.mkdir(outputDir, { recursive: true });
-  const outputPath = path9.join(outputDir, "preview-runtime.js");
+  const outputDir = path8.join(themePath, "dist");
+  await fs7.mkdir(outputDir, { recursive: true });
+  const outputPath = path8.join(outputDir, "preview-runtime.js");
   const locations = [
-    path9.join(__dirname, "..", "preview", "preview-app.tsx"),
-    path9.join(__dirname, "preview", "preview-app.tsx"),
-    path9.join(__dirname, "..", "..", "src", "preview", "preview-app.tsx")
+    path8.join(__dirname, "..", "preview", "preview-app.tsx"),
+    path8.join(__dirname, "preview", "preview-app.tsx"),
+    path8.join(__dirname, "..", "..", "src", "preview", "preview-app.tsx")
   ];
   let previewEntryPath = null;
   for (const loc of locations) {
     try {
-      await fs8.access(loc);
+      await fs7.access(loc);
       previewEntryPath = loc;
       break;
     } catch {
@@ -927,10 +927,10 @@ ${locations.join("\n")}`
         if (!lucideScanned) {
           lucideScanned = true;
           const coreSrcCandidates = [
-            path9.join(themePath, "node_modules", "@onexapis", "core", "src"),
-            path9.join(themePath, "..", "..", "packages", "core", "src"),
+            path8.join(themePath, "node_modules", "@onexapis", "core", "src"),
+            path8.join(themePath, "..", "..", "packages", "core", "src"),
             // monorepo sibling
-            path9.join(
+            path8.join(
               __dirname,
               "..",
               "..",
@@ -945,7 +945,7 @@ ${locations.join("\n")}`
           let coreSourceDir = null;
           for (const candidate of coreSrcCandidates) {
             try {
-              await fs8.access(candidate);
+              await fs7.access(candidate);
               coreSourceDir = candidate;
               break;
             } catch {
@@ -964,21 +964,21 @@ ${locations.join("\n")}`
             }
           } else {
             const coreDistCandidates = [
-              path9.join(themePath, "node_modules", "@onexapis", "core", "dist")
+              path8.join(themePath, "node_modules", "@onexapis", "core", "dist")
             ];
             const resolvedDist = await resolveNodeModulesFile(
               __dirname,
-              path9.join("@onexapis", "core", "dist")
+              path8.join("@onexapis", "core", "dist")
             );
             if (resolvedDist) coreDistCandidates.push(resolvedDist);
             for (const candidate of coreDistCandidates) {
               try {
-                await fs8.access(candidate);
+                await fs7.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 fs8.readFile(
-                    path9.join(candidate, file),
+                  const content = await fs7.readFile(
+                    path8.join(candidate, file),
                     "utf-8"
                   );
                   for (const match of content.matchAll(importRegex)) {
@@ -1033,7 +1033,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 = path9.join(pkgDir, "dist", "es", "index.mjs");
+          const esmEntry = path8.join(pkgDir, "dist", "es", "index.mjs");
           const { existsSync } = await import('fs');
           if (existsSync(esmEntry)) {
             return { path: esmEntry, namespace: "file" };
@@ -1132,8 +1132,8 @@ export function headers() { return new Headers(); }
       });
     }
   };
-  const shimPath = path9.join(outputDir, ".process-shim-preview.js");
-  await fs8.writeFile(shimPath, PROCESS_SHIM);
+  const shimPath = path8.join(outputDir, ".process-shim-preview.js");
+  await fs7.writeFile(shimPath, PROCESS_SHIM);
   await esbuild.build({
     entryPoints: [previewEntryPath],
     bundle: true,
@@ -1168,7 +1168,7 @@ export function headers() { return new Headers(); }
     }
   });
   try {
-    await fs8.unlink(shimPath);
+    await fs7.unlink(shimPath);
   } catch {
   }
   return outputPath;
@@ -1315,8 +1315,8 @@ function validateThemeName(name) {
   return /^[a-z][a-z0-9-]*$/.test(name);
 }
 function pathExists(filePath) {
-  const fs13 = __require("fs-extra");
-  return fs13.existsSync(filePath);
+  const fs12 = __require("fs-extra");
+  return fs12.existsSync(filePath);
 }
 function validateCategory(category) {
   const validCategories = [
@@ -1357,18 +1357,18 @@ async function renderTemplate(templatePath, data) {
   return ejs.render(template, data);
 }
 async function writeFile(filePath, content) {
-  await fs.ensureDir(path9.dirname(filePath));
+  await fs.ensureDir(path8.dirname(filePath));
   await fs.writeFile(filePath, content, "utf-8");
 }
 function getTemplatesDir() {
   const locations = [
-    path9.join(__dirname, "../../templates"),
+    path8.join(__dirname, "../../templates"),
     // Development
-    path9.join(__dirname, "../templates"),
+    path8.join(__dirname, "../templates"),
     // Production (dist/)
-    path9.join(process.cwd(), "templates"),
+    path8.join(process.cwd(), "templates"),
     // Fallback
-    path9.join(process.cwd(), "packages/cli/templates")
+    path8.join(process.cwd(), "packages/cli/templates")
     // Monorepo
   ];
   for (const location of locations) {
@@ -1380,7 +1380,7 @@ function getTemplatesDir() {
 }
 async function copyTemplate(templateName, targetDir, data) {
   const templatesDir = getTemplatesDir();
-  const templateDir = path9.join(templatesDir, templateName);
+  const templateDir = path8.join(templatesDir, templateName);
   if (!fs.existsSync(templateDir)) {
     throw new Error(
       `Template "${templateName}" not found at ${templateDir}. Available templates: ${fs.readdirSync(templatesDir).join(", ")}`
@@ -1389,8 +1389,8 @@ async function copyTemplate(templateName, targetDir, data) {
   await fs.ensureDir(targetDir);
   const files = await fs.readdir(templateDir);
   for (const file of files) {
-    const templatePath = path9.join(templateDir, file);
-    const targetPath = path9.join(targetDir, file);
+    const templatePath = path8.join(templateDir, file);
+    const targetPath = path8.join(targetDir, file);
     const stat = await fs.stat(templatePath);
     if (stat.isDirectory()) {
       await copyTemplateDir(templatePath, targetPath, data);
@@ -1407,8 +1407,8 @@ async function copyTemplateDir(templateDir, targetDir, data) {
   await fs.ensureDir(targetDir);
   const files = await fs.readdir(templateDir);
   for (const file of files) {
-    const templatePath = path9.join(templateDir, file);
-    const targetPath = path9.join(targetDir, file);
+    const templatePath = path8.join(templateDir, file);
+    const targetPath = path8.join(targetDir, file);
     const stat = await fs.stat(templatePath);
     if (stat.isDirectory()) {
       await copyTemplateDir(templatePath, targetPath, data);
@@ -1423,32 +1423,32 @@ async function copyTemplateDir(templateDir, targetDir, data) {
 }
 function getProjectRoot() {
   let currentDir = process.cwd();
-  while (currentDir !== path9.parse(currentDir).root) {
-    const packageJsonPath = path9.join(currentDir, "package.json");
+  while (currentDir !== path8.parse(currentDir).root) {
+    const packageJsonPath = path8.join(currentDir, "package.json");
     if (fs.existsSync(packageJsonPath)) {
       const packageJson = fs.readJsonSync(packageJsonPath);
-      if (packageJson.workspaces || fs.existsSync(path9.join(currentDir, "src/themes")) || fs.existsSync(path9.join(currentDir, "themes"))) {
+      if (packageJson.workspaces || fs.existsSync(path8.join(currentDir, "src/themes")) || fs.existsSync(path8.join(currentDir, "themes"))) {
         return currentDir;
       }
     }
-    currentDir = path9.dirname(currentDir);
+    currentDir = path8.dirname(currentDir);
   }
   return process.cwd();
 }
 function getThemesDir() {
   const root = getProjectRoot();
-  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);
+  if (fs.existsSync(path8.join(root, "themes")))
+    return path8.join(root, "themes");
+  if (fs.existsSync(path8.join(root, "src/themes")))
+    return path8.join(root, "src/themes");
+  return path8.dirname(root);
 }
 function getFeaturesDir() {
-  return path9.join(getProjectRoot(), "src/features");
+  return path8.join(getProjectRoot(), "src/features");
 }
 function isOneXProject() {
   const root = getProjectRoot();
-  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"));
+  return fs.existsSync(path8.join(root, "themes")) || fs.existsSync(path8.join(root, "src/themes")) || fs.existsSync(path8.join(root, "theme.config.ts")) || fs.existsSync(path8.join(root, "bundle-entry.ts"));
 }
 function ensureOneXProject() {
   if (!isOneXProject()) {
@@ -1464,13 +1464,13 @@ function listThemes() {
     return [];
   }
   return fs.readdirSync(themesDir).filter((name) => {
-    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")));
+    const themePath = path8.join(themesDir, name);
+    return fs.statSync(themePath).isDirectory() && (fs.existsSync(path8.join(themePath, "theme.config.ts")) || fs.existsSync(path8.join(themePath, "bundle-entry.ts")) || fs.existsSync(path8.join(themePath, "manifest.ts")));
   });
 }
 function themeExists(themeName) {
-  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")));
+  const themePath = path8.join(getThemesDir(), themeName);
+  return fs.existsSync(themePath) && (fs.existsSync(path8.join(themePath, "theme.config.ts")) || fs.existsSync(path8.join(themePath, "bundle-entry.ts")) || fs.existsSync(path8.join(themePath, "manifest.ts")));
 }
 function detectPackageManager() {
   const userAgent = process.env.npm_config_user_agent || "";
@@ -1478,92 +1478,30 @@ function detectPackageManager() {
   if (userAgent.includes("yarn")) return "yarn";
   if (userAgent.includes("bun")) return "bun";
   const cwd = process.cwd();
-  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";
+  if (fs.existsSync(path8.join(cwd, "pnpm-lock.yaml"))) return "pnpm";
+  if (fs.existsSync(path8.join(cwd, "yarn.lock"))) return "yarn";
+  if (fs.existsSync(path8.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}`
-    );
-  }
 }
-var AUTH_DIR = path9.join(os.homedir(), ".onexthm");
-path9.join(AUTH_DIR, "auth.json");
+var AUTH_DIR = path8.join(os.homedir(), ".onexthm");
+path8.join(AUTH_DIR, "auth.json");
 function getApiUrl() {
   return process.env.ONEXTHM_API_URL || process.env.NEXT_PUBLIC_API_URL || "https://platform-dev.onexeos.com";
 }
-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 = path9.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 = path9.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 = {}) {
@@ -1581,7 +1519,7 @@ async function initCommand(projectName, options = {}) {
           if (!validateThemeName(kebabName)) {
             return "Invalid project name. Use lowercase letters, numbers, and hyphens only.";
           }
-          if (fs4.existsSync(path9.join(process.cwd(), kebabName))) {
+          if (fs3.existsSync(path8.join(process.cwd(), kebabName))) {
             return `Directory "${kebabName}" already exists`;
           }
           return true;
@@ -1592,8 +1530,8 @@ async function initCommand(projectName, options = {}) {
   } else {
     name = toKebabCase(projectName);
   }
-  const projectPath = path9.join(process.cwd(), name);
-  if (fs4.existsSync(projectPath)) {
+  const projectPath = path8.join(process.cwd(), name);
+  if (fs3.existsSync(projectPath)) {
     logger.error(`Directory "${name}" already exists.`);
     process.exit(1);
   }
@@ -1699,7 +1637,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,
@@ -1708,14 +1646,28 @@ async function initCommand(projectName, options = {}) {
       description,
       author
     );
-    ensureMcpJson(projectPath, figmaApiKey || void 0);
+    const mcpJsonPath = path8.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"
         });
@@ -1767,16 +1719,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 = path9.join(projectPath, "theme.config.ts");
-  if (fs4.existsSync(configPath)) {
-    let content = fs4.readFileSync(configPath, "utf-8");
+  const configPath = path8.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}"`
@@ -1785,11 +1737,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 = path9.join(projectPath, "package.json");
-  if (fs4.existsSync(pkgPath)) {
-    let content = fs4.readFileSync(pkgPath, "utf-8");
+  const pkgPath = path8.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}`
@@ -1798,7 +1750,7 @@ async function renameThemeInFiles(projectPath, themeName, displayName, descripti
       /"description": ".*?"/,
       `"description": "${description}"`
     );
-    fs4.writeFileSync(pkgPath, content, "utf-8");
+    fs3.writeFileSync(pkgPath, content, "utf-8");
   }
 }
 
@@ -1809,10 +1761,10 @@ async function createSectionCommand(name, options) {
   ensureOneXProject();
   if (!options.theme) {
     const isStandaloneTheme = ["theme.config.ts", "bundle-entry.ts"].some(
-      (f) => fs.existsSync(path9.join(process.cwd(), f))
+      (f) => fs.existsSync(path8.join(process.cwd(), f))
     );
     if (isStandaloneTheme) {
-      options.theme = path9.basename(process.cwd());
+      options.theme = path8.basename(process.cwd());
     }
   }
   const sectionName = toKebabCase(name);
@@ -1875,35 +1827,35 @@ async function createSectionCommand(name, options) {
   };
   logger.startSpinner("Creating section files...");
   try {
-    const themePath = path9.join(getThemesDir(), themeName);
-    const sectionPath = path9.join(themePath, "sections", sectionName);
+    const themePath = path8.join(getThemesDir(), themeName);
+    const sectionPath = path8.join(themePath, "sections", sectionName);
     const schemaContent = generateSectionSchema(data);
     await writeFile(
-      path9.join(sectionPath, `${sectionName}.schema.ts`),
+      path8.join(sectionPath, `${sectionName}.schema.ts`),
       schemaContent
     );
     if (createTemplate) {
       const templateContent = generateSectionTemplate(data);
       await writeFile(
-        path9.join(sectionPath, `${sectionName}-default.tsx`),
+        path8.join(sectionPath, `${sectionName}-default.tsx`),
         templateContent
       );
     }
     const indexContent = generateSectionIndex(data, createTemplate);
-    await writeFile(path9.join(sectionPath, "index.ts"), indexContent);
+    await writeFile(path8.join(sectionPath, "index.ts"), indexContent);
     logger.stopSpinner(true, "Section files created successfully!");
     logger.newLine();
     logger.section("Next steps:");
     logger.log(
-      `  1. Edit schema: ${path9.relative(process.cwd(), path9.join(sectionPath, `${sectionName}.schema.ts`))}`
+      `  1. Edit schema: ${path8.relative(process.cwd(), path8.join(sectionPath, `${sectionName}.schema.ts`))}`
     );
     if (createTemplate) {
       logger.log(
-        `  2. Edit template: ${path9.relative(process.cwd(), path9.join(sectionPath, `${sectionName}-default.tsx`))}`
+        `  2. Edit template: ${path8.relative(process.cwd(), path8.join(sectionPath, `${sectionName}-default.tsx`))}`
       );
     }
     logger.log(
-      `  3. Add to theme manifest: ${path9.relative(process.cwd(), path9.join(themePath, "manifest.ts"))}`
+      `  3. Add to theme manifest: ${path8.relative(process.cwd(), path8.join(themePath, "manifest.ts"))}`
     );
     logger.newLine();
     logger.success("Section created successfully!");
@@ -2051,10 +2003,10 @@ async function createBlockCommand(name, options) {
   ensureOneXProject();
   if (!options.theme) {
     const isStandaloneTheme = ["theme.config.ts", "bundle-entry.ts"].some(
-      (f) => fs.existsSync(path9.join(process.cwd(), f))
+      (f) => fs.existsSync(path8.join(process.cwd(), f))
     );
     if (isStandaloneTheme) {
-      options.theme = path9.basename(process.cwd());
+      options.theme = path8.basename(process.cwd());
     }
   }
   const blockName = toKebabCase(name);
@@ -2129,24 +2081,24 @@ async function createBlockCommand(name, options) {
   };
   logger.startSpinner("Creating block files...");
   try {
-    const blockPath = scope === "shared" ? path9.join(getFeaturesDir(), "blocks", blockName) : path9.join(getThemesDir(), themeName, "blocks", blockName);
+    const blockPath = scope === "shared" ? path8.join(getFeaturesDir(), "blocks", blockName) : path8.join(getThemesDir(), themeName, "blocks", blockName);
     const schemaContent = generateBlockSchema(data);
     await writeFile(
-      path9.join(blockPath, `${blockName}.schema.ts`),
+      path8.join(blockPath, `${blockName}.schema.ts`),
       schemaContent
     );
     const componentContent = generateBlockComponent(data);
-    await writeFile(path9.join(blockPath, `${blockName}.tsx`), componentContent);
+    await writeFile(path8.join(blockPath, `${blockName}.tsx`), componentContent);
     const indexContent = generateBlockIndex(data);
-    await writeFile(path9.join(blockPath, "index.ts"), indexContent);
+    await writeFile(path8.join(blockPath, "index.ts"), indexContent);
     logger.stopSpinner(true, "Block files created successfully!");
     logger.newLine();
     logger.section("Next steps:");
     logger.log(
-      `  1. Edit schema: ${path9.relative(process.cwd(), path9.join(blockPath, `${blockName}.schema.ts`))}`
+      `  1. Edit schema: ${path8.relative(process.cwd(), path8.join(blockPath, `${blockName}.schema.ts`))}`
     );
     logger.log(
-      `  2. Edit component: ${path9.relative(process.cwd(), path9.join(blockPath, `${blockName}.tsx`))}`
+      `  2. Edit component: ${path8.relative(process.cwd(), path8.join(blockPath, `${blockName}.tsx`))}`
     );
     logger.log(
       `  3. Register in block registry: src/lib/registry/block-registry.ts`
@@ -2324,31 +2276,31 @@ async function createComponentCommand(name, options) {
   };
   logger.startSpinner("Creating component files...");
   try {
-    const componentPath = path9.join(
+    const componentPath = path8.join(
       getFeaturesDir(),
       "components",
       componentName
     );
     const schemaContent = generateComponentSchema(data);
     await writeFile(
-      path9.join(componentPath, `${componentName}.schema.ts`),
+      path8.join(componentPath, `${componentName}.schema.ts`),
       schemaContent
     );
     const componentContent = generateComponent(data);
     await writeFile(
-      path9.join(componentPath, `${componentName}.tsx`),
+      path8.join(componentPath, `${componentName}.tsx`),
       componentContent
     );
     const indexContent = generateComponentIndex(data);
-    await writeFile(path9.join(componentPath, "index.ts"), indexContent);
+    await writeFile(path8.join(componentPath, "index.ts"), indexContent);
     logger.stopSpinner(true, "Component files created successfully!");
     logger.newLine();
     logger.section("Next steps:");
     logger.log(
-      `  1. Edit schema: ${path9.relative(process.cwd(), path9.join(componentPath, `${componentName}.schema.ts`))}`
+      `  1. Edit schema: ${path8.relative(process.cwd(), path8.join(componentPath, `${componentName}.schema.ts`))}`
     );
     logger.log(
-      `  2. Edit component: ${path9.relative(process.cwd(), path9.join(componentPath, `${componentName}.tsx`))}`
+      `  2. Edit component: ${path8.relative(process.cwd(), path8.join(componentPath, `${componentName}.tsx`))}`
     );
     logger.log(
       `  3. Register in component registry: src/lib/registry/component-registry.ts`
@@ -2505,13 +2457,13 @@ async function listSections(themeFilter) {
     return;
   }
   for (const theme of themes) {
-    const sectionsDir = path9.join(getThemesDir(), theme, "sections");
+    const sectionsDir = path8.join(getThemesDir(), theme, "sections");
     if (!fs.existsSync(sectionsDir)) {
       continue;
     }
     const sections = fs.readdirSync(sectionsDir).filter((name) => {
-      const sectionPath = path9.join(sectionsDir, name);
-      return fs.statSync(sectionPath).isDirectory() && fs.existsSync(path9.join(sectionPath, "index.ts"));
+      const sectionPath = path8.join(sectionsDir, name);
+      return fs.statSync(sectionPath).isDirectory() && fs.existsSync(path8.join(sectionPath, "index.ts"));
     });
     if (sections.length > 0) {
       logger.log(chalk4.cyan(`
@@ -2525,11 +2477,11 @@ async function listSections(themeFilter) {
 }
 async function listBlocks(themeFilter) {
   logger.section("\u{1F9F1} Blocks");
-  const sharedBlocksDir = path9.join(getFeaturesDir(), "blocks");
+  const sharedBlocksDir = path8.join(getFeaturesDir(), "blocks");
   if (fs.existsSync(sharedBlocksDir)) {
     const sharedBlocks = fs.readdirSync(sharedBlocksDir).filter((name) => {
-      const blockPath = path9.join(sharedBlocksDir, name);
-      return fs.statSync(blockPath).isDirectory() && fs.existsSync(path9.join(blockPath, "index.ts"));
+      const blockPath = path8.join(sharedBlocksDir, name);
+      return fs.statSync(blockPath).isDirectory() && fs.existsSync(path8.join(blockPath, "index.ts"));
     });
     if (sharedBlocks.length > 0) {
       logger.log(chalk4.cyan("\n  Shared:"));
@@ -2540,13 +2492,13 @@ async function listBlocks(themeFilter) {
   }
   const themes = themeFilter ? [themeFilter] : listThemes();
   for (const theme of themes) {
-    const blocksDir = path9.join(getThemesDir(), theme, "blocks");
+    const blocksDir = path8.join(getThemesDir(), theme, "blocks");
     if (!fs.existsSync(blocksDir)) {
       continue;
     }
     const blocks = fs.readdirSync(blocksDir).filter((name) => {
-      const blockPath = path9.join(blocksDir, name);
-      return fs.statSync(blockPath).isDirectory() && fs.existsSync(path9.join(blockPath, "index.ts"));
+      const blockPath = path8.join(blocksDir, name);
+      return fs.statSync(blockPath).isDirectory() && fs.existsSync(path8.join(blockPath, "index.ts"));
     });
     if (blocks.length > 0) {
       logger.log(chalk4.cyan(`
@@ -2560,14 +2512,14 @@ async function listBlocks(themeFilter) {
 }
 async function listComponents() {
   logger.section("\u2699\uFE0F  Components");
-  const componentsDir = path9.join(getFeaturesDir(), "components");
+  const componentsDir = path8.join(getFeaturesDir(), "components");
   if (!fs.existsSync(componentsDir)) {
     logger.warning("No components directory found");
     return;
   }
   const components = fs.readdirSync(componentsDir).filter((name) => {
-    const componentPath = path9.join(componentsDir, name);
-    return fs.statSync(componentPath).isDirectory() && fs.existsSync(path9.join(componentPath, "index.ts"));
+    const componentPath = path8.join(componentsDir, name);
+    return fs.statSync(componentPath).isDirectory() && fs.existsSync(path8.join(componentPath, "index.ts"));
   });
   if (components.length === 0) {
     logger.warning("No components found");
@@ -2588,11 +2540,11 @@ async function listThemesInfo() {
   }
   logger.log("");
   for (const theme of themes) {
-    const themeDir = path9.join(getThemesDir(), theme);
+    const themeDir = path8.join(getThemesDir(), theme);
     const candidates = ["theme.config.ts", "bundle-entry.ts", "manifest.ts"];
     let manifestContent = "";
     for (const candidate of candidates) {
-      const candidatePath = path9.join(themeDir, candidate);
+      const candidatePath = path8.join(themeDir, candidate);
       if (fs.existsSync(candidatePath)) {
         manifestContent = fs.readFileSync(candidatePath, "utf-8");
         break;
@@ -2621,14 +2573,14 @@ async function buildCommand(options) {
   if (options.theme) {
     themeName = options.theme;
     try {
-      const workspaceThemePath = path9.join(getThemesDir(), themeName);
+      const workspaceThemePath = path8.join(getThemesDir(), themeName);
       if (fs.existsSync(workspaceThemePath)) {
         themePath = workspaceThemePath;
       } else {
-        themePath = path9.join(process.cwd(), themeName);
+        themePath = path8.join(process.cwd(), themeName);
       }
     } catch {
-      themePath = path9.join(process.cwd(), themeName);
+      themePath = path8.join(process.cwd(), themeName);
     }
     if (!fs.existsSync(themePath)) {
       logger.error(`Theme "${themeName}" not found.`);
@@ -2639,10 +2591,10 @@ async function buildCommand(options) {
       "theme.config.ts",
       "bundle-entry.ts",
       "manifest.ts"
-    ].some((f) => fs.existsSync(path9.join(process.cwd(), f)));
+    ].some((f) => fs.existsSync(path8.join(process.cwd(), f)));
     if (isThemeDir) {
       themePath = process.cwd();
-      themeName = path9.basename(themePath);
+      themeName = path8.basename(themePath);
       logger.info(`Building current theme: ${themeName}`);
     } else {
       logger.error(
@@ -2651,7 +2603,7 @@ async function buildCommand(options) {
       process.exit(1);
     }
   }
-  const packageJsonPath = path9.join(themePath, "package.json");
+  const packageJsonPath = path8.join(themePath, "package.json");
   const hasPkgJson = fs.existsSync(packageJsonPath);
   if (!hasPkgJson) {
     logger.warning(
@@ -2707,9 +2659,9 @@ async function buildCommand(options) {
     logger.success("\u2713 Theme built successfully!");
     logger.newLine();
     logger.info(`Theme: ${themeName}`);
-    const distPath = path9.join(themePath, "dist");
+    const distPath = path8.join(themePath, "dist");
     if (fs.existsSync(distPath)) {
-      logger.log(`Output: ${path9.relative(process.cwd(), distPath)}`);
+      logger.log(`Output: ${path8.relative(process.cwd(), distPath)}`);
       const files = fs.readdirSync(distPath);
       logger.log(`Files: ${files.length}`);
     }
@@ -2717,17 +2669,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) => {
@@ -2797,11 +2749,11 @@ function getBucketName(env) {
   return environment === "production" ? "theme-s3-bucket" : "theme-s3-bucket";
 }
 async function findCompiledThemeDir(themeId, version) {
-  const searchPaths = [path9.resolve(process.cwd(), "dist")];
+  const searchPaths = [path8.resolve(process.cwd(), "dist")];
   for (const dir of searchPaths) {
     if (await fs.pathExists(dir)) {
-      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"));
+      const hasManifest = await fs.pathExists(path8.join(dir, "manifest.json"));
+      const hasThemeEntry = await fs.pathExists(path8.join(dir, "bundle-entry.js")) || await fs.pathExists(path8.join(dir, "theme.config.js")) || await fs.pathExists(path8.join(dir, "index.js"));
       if (hasManifest || hasThemeEntry) {
         return dir;
       }
@@ -2810,7 +2762,7 @@ async function findCompiledThemeDir(themeId, version) {
   return null;
 }
 async function readManifest() {
-  const manifestTsPath = path9.resolve(process.cwd(), "manifest.ts");
+  const manifestTsPath = path8.resolve(process.cwd(), "manifest.ts");
   if (await fs.pathExists(manifestTsPath)) {
     try {
       const module = await import(manifestTsPath);
@@ -2819,7 +2771,7 @@ async function readManifest() {
       logger.warning("Failed to import manifest.ts, trying package.json");
     }
   }
-  const packageJsonPath = path9.resolve(process.cwd(), "package.json");
+  const packageJsonPath = path8.resolve(process.cwd(), "package.json");
   if (await fs.pathExists(packageJsonPath)) {
     const pkg = await fs.readJson(packageJsonPath);
     return {
@@ -2853,13 +2805,13 @@ async function findSourceDir(themeId, explicitDir) {
   }
   const searchPaths = [
     process.cwd(),
-    path9.resolve(process.cwd(), `../../themes/${themeId}`),
-    path9.resolve(process.cwd(), `../themes/${themeId}`)
+    path8.resolve(process.cwd(), `../../themes/${themeId}`),
+    path8.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(path9.join(dir, marker))) {
+      if (await fs.pathExists(path8.join(dir, marker))) {
         return dir;
       }
     }
@@ -2911,7 +2863,7 @@ async function uploadCommand(options) {
     spinner.succeed(`Found compiled theme at: ${compiledDir}`);
     spinner.start("Creating bundle.zip...");
     const tmpDir = os.tmpdir();
-    const bundleZipPath = path9.join(tmpDir, `${themeId}-${version}-bundle.zip`);
+    const bundleZipPath = path8.join(tmpDir, `${themeId}-${version}-bundle.zip`);
     await createZipFromDir(compiledDir, bundleZipPath);
     const bundleZipBuffer = await fs.readFile(bundleZipPath);
     const bundleSizeMB = (bundleZipBuffer.length / 1024 / 1024).toFixed(2);
@@ -2965,7 +2917,7 @@ async function uploadCommand(options) {
       if (sourceDir) {
         spinner.succeed(`Found source at: ${sourceDir}`);
         spinner.start("Creating source.zip...");
-        const sourceZipPath = path9.join(
+        const sourceZipPath = path8.join(
           tmpDir,
           `${themeId}-${version}-source.zip`
         );
@@ -3099,8 +3051,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 = path9.join(outputDir, entryFile);
-    const stablePath = path9.join(outputDir, "bundle-entry.js");
+    const hashedPath = path8.join(outputDir, entryFile);
+    const stablePath = path8.join(outputDir, "bundle-entry.js");
     if (await fs.pathExists(hashedPath)) {
       await fs.copy(hashedPath, stablePath);
       const mapPath = hashedPath + ".map";
@@ -3109,13 +3061,13 @@ async function createCompatibilityFiles(outputDir, manifest) {
       }
     }
   }
-  const sectionsRegistryPath = path9.join(outputDir, "sections-registry.js");
+  const sectionsRegistryPath = path8.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 = path9.join(outputDir, "package.json");
+  const pkgJsonPath = path8.join(outputDir, "package.json");
   await fs.writeFile(pkgJsonPath, '{\n  "type": "module"\n}\n', "utf-8");
 }
 function showDownloadFailureHelp(themeId, bucket) {
@@ -3210,7 +3162,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 = path9.join(outputDir, "manifest.json");
+    const manifestPath = path8.join(outputDir, "manifest.json");
     const manifest = await fs.readJson(manifestPath);
     await createCompatibilityFiles(outputDir, manifest);
     console.log();
@@ -3310,9 +3262,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));
@@ -3343,7 +3296,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 = path9.join(themeDir, "package.json");
+  const pkgPath = path8.join(themeDir, "package.json");
   if (await fs.pathExists(pkgPath)) {
     const pkg = await fs.readJson(pkgPath);
     pkg.name = `@onex-themes/${newName}`;
@@ -3359,7 +3312,7 @@ async function renameTheme(themeDir, oldName, newName) {
     }
     await fs.writeJson(pkgPath, pkg, { spaces: 2 });
   }
-  const configPath = path9.join(themeDir, "theme.config.ts");
+  const configPath = path8.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}"`);
@@ -3369,7 +3322,7 @@ async function renameTheme(themeDir, oldName, newName) {
     );
     await fs.writeFile(configPath, content);
   }
-  const layoutPath = path9.join(themeDir, "theme.layout.ts");
+  const layoutPath = path8.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}"`);
@@ -3382,7 +3335,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 = path9.join(themeDir, file);
+    const filePath = path8.join(themeDir, file);
     let content = await fs.readFile(filePath, "utf-8");
     const original = content;
     content = content.replace(
@@ -3411,7 +3364,7 @@ async function cloneCommand(themeName, options) {
   const spinner = ora("Initializing clone...").start();
   try {
     const bucket = options.bucket || getBucketName3(options.environment);
-    const outputDir = options.output || path9.resolve(process.cwd(), newName);
+    const outputDir = options.output || path8.resolve(process.cwd(), newName);
     const s3Client = getS3Client3();
     if (await fs.pathExists(outputDir)) {
       spinner.fail(chalk4.red(`Directory already exists: ${outputDir}`));
@@ -3466,7 +3419,7 @@ async function cloneCommand(themeName, options) {
     spinner.succeed(
       `Renamed theme: ${chalk4.gray(themeName)} \u2192 ${chalk4.cyan(newName)}`
     );
-    const envExamplePath = path9.join(outputDir, ".env.example");
+    const envExamplePath = path8.join(outputDir, ".env.example");
     if (!await fs.pathExists(envExamplePath)) {
       await fs.writeFile(
         envExamplePath,
@@ -3479,18 +3432,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 = path8.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(
-        path9.join(outputDir, "package.json")
+        path8.join(outputDir, "package.json")
       );
       if (hasPkgJson) {
         spinner.start("Installing dependencies...");
@@ -3517,10 +3484,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 ${path9.relative(process.cwd(), outputDir)}`));
-    const copyCmd = process.platform === "win32" ? "copy .env.example .env" : "cp .env.example .env";
+    console.log(chalk4.gray(`   cd ${path8.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"));