@onexapis/cli 1.1.66 → 1.1.70

package/dist/index.mjs

@@ -1,13 +1,13 @@
 import chalk4 from 'chalk';
 import ora from 'ora';
-import path10 from 'path';
+import fs3 from 'fs';
+import path12 from 'path';
 import { glob } from 'glob';
 import fs from 'fs-extra';
 import crypto from 'crypto';
+import fs10 from 'fs/promises';
 import * as esbuild from 'esbuild';
-import fs8 from 'fs/promises';
 import { createRequire } from 'module';
-import fs3 from 'fs';
 import { execSync, spawn } from 'child_process';
 import inquirer from 'inquirer';
 import ejs from 'ejs';
@@ -85,6 +85,13 @@ var init_logger = __esm({
     logger = new Logger();
   }
 });
+function isNextjsProject(dir) {
+  return fs3.existsSync(path12.join(dir, "next.config.ts")) || fs3.existsSync(path12.join(dir, "next.config.js")) || fs3.existsSync(path12.join(dir, "next.config.mjs"));
+}
+var init_detect_nextjs = __esm({
+  "src/utils/detect-nextjs.ts"() {
+  }
+});
 function sortedCopy(value) {
   if (Array.isArray(value)) {
     return value.map((v) => sortedCopy(v));
@@ -167,7 +174,7 @@ async function extractSchemas(themePath) {
   const sections = {};
   for (const file of schemaFiles) {
     try {
-      const mod = await jiti.import(path10.join(themePath, file));
+      const mod = await jiti.import(path12.join(themePath, file));
       const exports$1 = mod;
       for (const value of Object.values(exports$1)) {
         if (value && typeof value === "object" && typeof value.type === "string" && Array.isArray(value.settings)) {
@@ -195,7 +202,7 @@ var init_extract_schemas = __esm({
   }
 });
 function mimeFor(filename) {
-  const ext = path10.extname(filename).toLowerCase();
+  const ext = path12.extname(filename).toLowerCase();
   return MIME_MAP[ext] || "application/octet-stream";
 }
 async function sha256Prefix(absPath, len) {
@@ -203,15 +210,15 @@ async function sha256Prefix(absPath, len) {
   return crypto.createHash("sha256").update(buf).digest("hex").slice(0, len);
 }
 function insertHashIntoName(relPath, hash) {
-  const dir = path10.posix.dirname(relPath);
-  const base = path10.posix.basename(relPath);
-  const ext = path10.posix.extname(base);
+  const dir = path12.posix.dirname(relPath);
+  const base = path12.posix.basename(relPath);
+  const ext = path12.posix.extname(base);
   const stem = ext ? base.slice(0, -ext.length) : base;
   const hashed = `${stem}-${hash}${ext}`;
   return dir === "." ? hashed : `${dir}/${hashed}`;
 }
 async function scanThemeAssets(distDir) {
-  const assetsDir = path10.join(distDir, "theme-assets");
+  const assetsDir = path12.join(distDir, "theme-assets");
   if (!await fs.pathExists(assetsDir)) return [];
   const files = await glob("**/*", {
     cwd: assetsDir,
@@ -220,10 +227,10 @@ async function scanThemeAssets(distDir) {
   });
   const results = [];
   for (const rel of files) {
-    const absPath = path10.join(assetsDir, rel);
+    const absPath = path12.join(assetsDir, rel);
     const stat = await fs.stat(absPath);
     if (!stat.isFile()) continue;
-    const originalPath = rel.split(path10.sep).join("/");
+    const originalPath = rel.split(path12.sep).join("/");
     const hash = await sha256Prefix(absPath, HASH_LEN);
     const hashedPath = insertHashIntoName(originalPath, hash);
     const contentType = mimeFor(rel);
@@ -266,6 +273,101 @@ var init_scan_theme_assets = __esm({
     HASH_LEN = 8;
   }
 });
+async function scanAppDirectory(themePath) {
+  const appDir = path12.join(themePath, "app");
+  let pageFiles;
+  try {
+    pageFiles = await glob("**/page.{tsx,ts,jsx,js}", { cwd: appDir });
+  } catch {
+    return [];
+  }
+  if (pageFiles.length === 0) return [];
+  const pages = [];
+  for (const pageFile of pageFiles) {
+    const routePath = deriveRoutePath(pageFile);
+    const absPageFile = path12.join(appDir, pageFile);
+    let source;
+    try {
+      source = await fs10.readFile(absPageFile, "utf-8");
+    } catch {
+      continue;
+    }
+    const sections = await extractSectionsFromPage(source, themePath);
+    pages.push({
+      routePath,
+      sourceFile: path12.join("app", pageFile),
+      sections
+    });
+  }
+  return pages;
+}
+function deriveRoutePath(pageFile) {
+  const dir = path12.dirname(pageFile);
+  if (dir === ".") return "/";
+  return "/" + dir;
+}
+async function extractSectionsFromPage(source, themePath) {
+  const importRegex = /import\s+\w+\s+from\s+["'](@\/|\.\.?\/)(components\/[^"']+)["']/g;
+  const sections = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const match of source.matchAll(importRegex)) {
+    const rawImportPath = match[2];
+    const componentDir = path12.dirname(rawImportPath);
+    const absComponentDir = path12.join(themePath, componentDir);
+    if (seen.has(componentDir)) continue;
+    seen.add(componentDir);
+    const sectionJsonPath = path12.join(absComponentDir, "section.json");
+    let sectionJson;
+    try {
+      const raw = await fs10.readFile(sectionJsonPath, "utf-8");
+      sectionJson = JSON.parse(raw);
+    } catch {
+      continue;
+    }
+    if (sectionJson.type !== "opaque-react") continue;
+    if (!sectionJson.entry) continue;
+    sections.push({
+      type: "opaque-react",
+      name: sectionJson.name ?? path12.basename(componentDir),
+      entry: path12.join(componentDir, sectionJson.entry),
+      componentDir
+    });
+  }
+  return sections;
+}
+function buildNextjsPagesMap(pages, themeId) {
+  const result = {};
+  for (const page of pages) {
+    const id = page.routePath === "/" ? "home" : page.routePath.replace(/\//g, "-").replace(/^-/, "");
+    const makeSectionType = (name) => `${themeId}-${name.toLowerCase().replace(/\s+/g, "-")}`;
+    result[id] = {
+      id,
+      name: id.charAt(0).toUpperCase() + id.slice(1),
+      path: page.routePath,
+      config: {
+        id,
+        path: page.routePath,
+        sections: page.sections.map((s, i) => ({
+          id: `${id}-section-${i}`,
+          type: makeSectionType(s.name),
+          sectionType: "opaque-react",
+          settings: {}
+        }))
+      },
+      sections: page.sections.map((s, i) => ({
+        id: `${id}-section-${i}`,
+        type: makeSectionType(s.name),
+        sectionType: "opaque-react",
+        settings: {}
+      }))
+    };
+  }
+  return result;
+}
+var init_nextjs_page_scanner = __esm({
+  "src/utils/nextjs-page-scanner.ts"() {
+  }
+});
 
 // src/utils/compile-theme.ts
 var compile_theme_exports = {};
@@ -281,8 +383,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}")
+        path12.join(themePath, "sections/**/*.{ts,tsx}"),
+        path12.join(themePath, "components/**/*.{ts,tsx}")
       ],
       theme: { extend: {} },
       plugins: []
@@ -292,7 +394,7 @@ async function generateThemeCSS(themePath, outDir) {
       inputCSS,
       { from: void 0 }
     );
-    await fs8.writeFile(path10.join(outDir, "bundle.css"), result.css);
+    await fs10.writeFile(path12.join(outDir, "bundle.css"), result.css);
     logger.info("Generated bundle.css");
   } catch (err) {
     logger.warning(
@@ -303,12 +405,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 = path12.join(dir, "node_modules", relativePath);
     try {
-      await fs8.access(candidate);
+      await fs10.access(candidate);
       return candidate;
     } catch {
-      const parent = path10.dirname(dir);
+      const parent = path12.dirname(dir);
       if (parent === dir) break;
       dir = parent;
     }
@@ -332,7 +434,7 @@ async function scanImportsFromPackage(sourceDir, packageName) {
   });
   for (const file of sourceFiles) {
     try {
-      const content = await fs8.readFile(path10.join(sourceDir, file), "utf-8");
+      const content = await fs10.readFile(path12.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();
@@ -386,17 +488,17 @@ function createCoreGlobalPlugin(themePath) {
           const distFileName = subpath ? `${subpath}.mjs` : "index.mjs";
           let distPath = await resolveNodeModulesFile(
             themePath,
-            path10.join("@onexapis", "core", "dist", distFileName)
+            path12.join("@onexapis", "core", "dist", distFileName)
           );
           if (!distPath) {
             distPath = await resolveNodeModulesFile(
               __dirname,
-              path10.join("@onexapis", "core", "dist", distFileName)
+              path12.join("@onexapis", "core", "dist", distFileName)
             );
           }
           try {
             if (!distPath) throw new Error("not found");
-            const distContent = await fs8.readFile(distPath, "utf-8");
+            const distContent = await fs10.readFile(distPath, "utf-8");
             const exportMatches = distContent.matchAll(/export\s*\{([^}]+)\}/g);
             for (const m of exportMatches) {
               const names = m[1].split(",").map((n) => {
@@ -443,180 +545,6 @@ ${namedExportLines}
     }
   };
 }
-function createThemeDepsStubPlugin(themePath) {
-  return {
-    name: "theme-deps-stub",
-    setup(build2) {
-      const tryResolveOrStub = (filter, namespace) => {
-        build2.onResolve({ filter }, async (args) => {
-          if (args.pluginData?.skipStub) return void 0;
-          try {
-            const result = await build2.resolve(args.path, {
-              kind: args.kind,
-              resolveDir: args.resolveDir || themePath,
-              importer: args.importer,
-              namespace: "file",
-              pluginData: { skipStub: true }
-            });
-            if (!result.errors.length) return result;
-          } catch {
-          }
-          try {
-            const req = createRequire(import.meta.url || __filename);
-            const resolved = req.resolve(args.path);
-            if (resolved) return { path: resolved, namespace: "file" };
-          } catch {
-          }
-          return { path: args.path, namespace };
-        });
-      };
-      tryResolveOrStub(/^next\//, "next-stub");
-      build2.onLoad({ filter: /.*/, namespace: "next-stub" }, (args) => {
-        const stubs = {
-          "next/image": `
-import React from 'react';
-const Image = React.forwardRef((props, ref) => {
-  const { src, alt, width, height, fill, priority, sizes, quality, placeholder, blurDataURL, onLoad, onError, style, className, ...rest } = props;
-  const imgSrc = typeof src === 'object' ? src.src : src;
-  const fillStyle = fill ? { position: 'absolute', inset: 0, width: '100%', height: '100%', objectFit: style?.objectFit || 'cover', display: 'block' } : {};
-  const mergedStyle = { ...fillStyle, ...style };
-  return React.createElement('img', {
-    ref, src: imgSrc, alt,
-    width: fill ? undefined : width, height: fill ? undefined : height,
-    loading: priority ? 'eager' : 'lazy',
-    style: Object.keys(mergedStyle).length > 0 ? mergedStyle : undefined,
-    className, onLoad, onError, ...rest,
-  });
-});
-export default Image;
-          `,
-          "next/link": `
-import React from 'react';
-const Link = ({ href, children, ...rest }) => React.createElement('a', { href, ...rest }, children);
-export default Link;
-          `,
-          "next/navigation": `
-export function useRouter() { return { push(u){window.location.href=u}, replace(u){window.location.href=u}, back(){window.history.back()}, forward(){window.history.forward()}, refresh(){window.location.reload()}, prefetch(){} }; }
-export function usePathname() { return window.location.pathname; }
-export function useSearchParams() { return new URLSearchParams(window.location.search); }
-export function useParams() { return {}; }
-export function redirect(url) { window.location.href = url; }
-export function notFound() { throw new Error('Not Found'); }
-          `,
-          "next/headers": `
-export function cookies() { return { get(){}, getAll(){ return []; }, set(){}, delete(){}, has(){ return false; } }; }
-export function headers() { return new Headers(); }
-          `
-        };
-        return {
-          contents: stubs[args.path] || "export default {};",
-          loader: "jsx",
-          resolveDir: themePath
-        };
-      });
-      const lucideImports = /* @__PURE__ */ new Set();
-      let lucideThemeScanned = false;
-      tryResolveOrStub(/^lucide-react/, "lucide-stub");
-      build2.onLoad({ filter: /.*/, namespace: "lucide-stub" }, async () => {
-        if (!lucideThemeScanned) {
-          lucideThemeScanned = true;
-          try {
-            const scanned = await scanImportsFromPackage(
-              themePath,
-              "lucide-react"
-            );
-            for (const names of Object.values(scanned)) {
-              for (const name of names) lucideImports.add(name);
-            }
-          } catch {
-          }
-        }
-        const iconNames = [...lucideImports];
-        const exports$1 = iconNames.map((n) => `icon as ${n}`).join(", ");
-        return {
-          contents: `
-const icon = (props) => null;
-export { ${exports$1} };
-export default new Proxy({}, { get: (_, name) => name === '__esModule' ? true : icon });
-          `.trim(),
-          loader: "jsx"
-        };
-      });
-      tryResolveOrStub(/^framer-motion/, "motion-stub");
-      build2.onLoad({ filter: /.*/, namespace: "motion-stub" }, () => ({
-        contents: `
-import React from 'react';
-const handler = { get: (_, name) => {
-  if (name === '__esModule') return true;
-  return React.forwardRef((props, ref) => React.createElement(name, { ...props, ref }));
-}};
-export const motion = new Proxy({}, handler);
-export const AnimatePresence = ({ children }) => children || null;
-export function useInView() { return true; }
-export default { motion, AnimatePresence, useInView };
-        `.trim(),
-        loader: "jsx",
-        resolveDir: themePath
-      }));
-      tryResolveOrStub(/^sonner$/, "sonner-stub");
-      build2.onLoad({ filter: /.*/, namespace: "sonner-stub" }, () => ({
-        contents: `
-export const toast = new Proxy(() => {}, { get: () => () => {} });
-export const Toaster = () => null;
-export default { toast, Toaster };
-        `.trim(),
-        loader: "jsx"
-      }));
-      tryResolveOrStub(/^react-hook-form$/, "rhf-stub");
-      build2.onLoad({ filter: /.*/, namespace: "rhf-stub" }, () => ({
-        contents: `
-export function useForm() {
-  return {
-    register: () => ({}),
-    handleSubmit: (fn) => (e) => { e?.preventDefault?.(); fn({}); },
-    formState: { errors: {}, isSubmitting: false, isValid: true },
-    watch: () => undefined,
-    setValue: () => {},
-    reset: () => {},
-    control: {},
-  };
-}
-export function useController() { return { field: {}, fieldState: {} }; }
-export function useFormContext() { return useForm(); }
-        `.trim(),
-        loader: "js"
-      }));
-      tryResolveOrStub(/^@hookform\/resolvers/, "hookform-resolvers-stub");
-      build2.onLoad(
-        { filter: /.*/, namespace: "hookform-resolvers-stub" },
-        () => ({
-          contents: `export function zodResolver() { return () => ({ values: {}, errors: {} }); }`,
-          loader: "js"
-        })
-      );
-      tryResolveOrStub(/^next-intl$/, "next-intl-stub");
-      build2.onLoad({ filter: /.*/, namespace: "next-intl-stub" }, () => ({
-        contents: `
-export function useTranslations(ns) {
-  return (key) => ns ? ns + '.' + key : key;
-}
-export function useLocale() { return 'en'; }
-export function useMessages() { return {}; }
-        `.trim(),
-        loader: "js"
-      }));
-      tryResolveOrStub(/^zod$/, "zod-stub");
-      build2.onLoad({ filter: /.*/, namespace: "zod-stub" }, () => ({
-        contents: `
-const schema = () => ({ parse: (v) => v, safeParse: (v) => ({ success: true, data: v }), optional: schema, min: schema, max: schema, email: schema, url: schema, regex: schema, refine: schema, transform: schema });
-export const z = { string: schema, number: schema, boolean: schema, object: (s) => ({ ...schema(), shape: s }), array: schema, enum: schema, union: schema, literal: schema, infer: undefined };
-export default z;
-        `.trim(),
-        loader: "js"
-      }));
-    }
-  };
-}
 async function generateThemeData(themePath, outputDir, themeId) {
   const { createJiti } = await import('jiti');
   const jiti = createJiti(import.meta.url);
@@ -625,7 +553,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(path12.join(themePath, `theme.config${ext}`));
       themeConfig = mod.default || mod;
       break;
     } catch {
@@ -633,20 +561,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(path12.join(themePath, `theme.layout${ext}`));
       layoutConfig = mod.default || mod;
       break;
     } catch {
     }
   }
   const schemas = {};
-  const sectionsDir = path10.join(themePath, "sections");
+  const sectionsDir = path12.join(themePath, "sections");
   try {
-    const sectionDirs = await fs8.readdir(sectionsDir);
+    const sectionDirs = await fs10.readdir(sectionsDir);
     for (const dir of sectionDirs) {
-      const schemaFile = path10.join(sectionsDir, dir, `${dir}.schema.ts`);
+      const schemaFile = path12.join(sectionsDir, dir, `${dir}.schema.ts`);
       try {
-        await fs8.access(schemaFile);
+        await fs10.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) {
@@ -658,14 +586,14 @@ async function generateThemeData(themePath, outputDir, themeId) {
     }
   } catch {
   }
-  const pagesDir = path10.join(themePath, "pages");
+  const pagesDir = path12.join(themePath, "pages");
   try {
-    const files = await fs8.readdir(pagesDir);
+    const files = await fs10.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(path12.join(pagesDir, file));
         const config = mod.default || mod;
         const sections = (config.sections || []).map((section) => {
           const schema = schemas[section.type];
@@ -693,8 +621,16 @@ async function generateThemeData(themePath, outputDir, themeId) {
     }
   } catch {
   }
-  await fs8.writeFile(
-    path10.join(outputDir, "theme-data.json"),
+  if (isNextjsProject(themePath)) {
+    const nextjsPages = await scanAppDirectory(themePath);
+    if (nextjsPages.length > 0) {
+      const nextjsPagesMap = buildNextjsPagesMap(nextjsPages, themeId);
+      Object.assign(pages, nextjsPagesMap);
+      logger.info(`Scanned ${nextjsPages.length} Next.js app/ pages`);
+    }
+  }
+  await fs10.writeFile(
+    path12.join(outputDir, "theme-data.json"),
     JSON.stringify(
       {
         themeId,
@@ -717,22 +653,22 @@ 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 = path12.join(outputDir, "bundle-entry.js");
+  const mapPath = path12.join(outputDir, "bundle-entry.js.map");
   let entryContent;
   try {
-    entryContent = await fs8.readFile(entryPath, "utf-8");
+    entryContent = await fs10.readFile(entryPath, "utf-8");
   } catch {
-    const indexPath = path10.join(outputDir, "index.js");
+    const indexPath = path12.join(outputDir, "index.js");
     try {
-      entryContent = await fs8.readFile(indexPath, "utf-8");
+      entryContent = await fs10.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 = path12.join(outputDir, "index.js.map");
     const hashedMapName2 = `bundle-entry-${hash2}.js.map`;
     entryContent = entryContent.replace(
       /\/\/# sourceMappingURL=index\.js\.map/,
@@ -740,18 +676,18 @@ async function contentHashEntry(outputDir) {
     );
     const oldFiles2 = await glob("bundle-entry-*.js*", { cwd: outputDir });
     for (const f of oldFiles2) {
-      await fs8.unlink(path10.join(outputDir, f));
+      await fs10.unlink(path12.join(outputDir, f));
     }
-    await fs8.writeFile(path10.join(outputDir, hashedName2), entryContent);
-    await fs8.unlink(indexPath);
+    await fs10.writeFile(path12.join(outputDir, hashedName2), entryContent);
+    await fs10.unlink(indexPath);
     try {
-      await fs8.unlink(entryPath);
+      await fs10.unlink(entryPath);
     } catch {
     }
-    await fs8.writeFile(entryPath, entryContent);
+    await fs10.writeFile(entryPath, entryContent);
     try {
-      await fs8.access(indexMapPath);
-      await fs8.rename(indexMapPath, path10.join(outputDir, hashedMapName2));
+      await fs10.access(indexMapPath);
+      await fs10.rename(indexMapPath, path12.join(outputDir, hashedMapName2));
     } catch {
     }
     logger.info(`Entry hashed: ${hashedName2}`);
@@ -766,17 +702,17 @@ async function contentHashEntry(outputDir) {
   );
   const oldFiles = await glob("bundle-entry-*.js*", { cwd: outputDir });
   for (const f of oldFiles) {
-    await fs8.unlink(path10.join(outputDir, f));
+    await fs10.unlink(path12.join(outputDir, f));
   }
-  await fs8.writeFile(path10.join(outputDir, hashedName), entryContent);
+  await fs10.writeFile(path12.join(outputDir, hashedName), entryContent);
   try {
-    await fs8.unlink(entryPath);
+    await fs10.unlink(entryPath);
   } catch {
   }
-  await fs8.writeFile(entryPath, entryContent);
+  await fs10.writeFile(entryPath, entryContent);
   try {
-    await fs8.access(mapPath);
-    await fs8.rename(mapPath, path10.join(outputDir, hashedMapName));
+    await fs10.access(mapPath);
+    await fs10.rename(mapPath, path12.join(outputDir, hashedMapName));
   } catch {
   }
   logger.info(`Entry hashed: ${hashedName}`);
@@ -788,7 +724,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(path12.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") {
@@ -806,8 +742,8 @@ async function extractDataRequirements(themePath) {
 async function writeGateManifests(themePath, outputDir) {
   try {
     const schemas = await extractSchemas(themePath);
-    await fs8.writeFile(
-      path10.join(outputDir, "schemas.json"),
+    await fs10.writeFile(
+      path12.join(outputDir, "schemas.json"),
       serializeManifest(schemas)
     );
     logger.info(
@@ -826,8 +762,8 @@ async function writeGateManifests(themePath, outputDir) {
       size: e.size,
       contentType: e.contentType
     }));
-    await fs8.writeFile(
-      path10.join(outputDir, "asset-manifest.json"),
+    await fs10.writeFile(
+      path12.join(outputDir, "asset-manifest.json"),
       JSON.stringify({ manifestVersion: 1, assets }, null, 2)
     );
     logger.info(`Generated asset-manifest.json (${assets.length} assets)`);
@@ -837,12 +773,71 @@ async function writeGateManifests(themePath, outputDir) {
     );
   }
 }
+async function compileSections(themePath, outputDir) {
+  const sectionsDir = path12.join(themePath, "sections");
+  let sectionDirs;
+  try {
+    sectionDirs = await fs10.readdir(sectionsDir);
+  } catch {
+    return;
+  }
+  for (const dirName of sectionDirs) {
+    const sectionSrc = path12.join(sectionsDir, dirName);
+    const sectionOut = path12.join(outputDir, "sections", dirName);
+    let section = null;
+    try {
+      const raw = await fs10.readFile(
+        path12.join(sectionSrc, "section.manifest.json"),
+        "utf-8"
+      );
+      section = JSON.parse(raw);
+    } catch {
+      continue;
+    }
+    switch (section.type) {
+      case "editable":
+      case "opaque-react":
+        break;
+      case "html": {
+        await fs10.mkdir(sectionOut, { recursive: true });
+        const htmlSrc = path12.join(sectionSrc, section.html);
+        let htmlContent = await fs10.readFile(htmlSrc, "utf-8");
+        htmlContent = htmlContent.replace(
+          /<script[^>]+src=["']https?:\/\/[^"']*["'][^>]*><\/script>/gi,
+          ""
+        );
+        await fs10.writeFile(path12.join(sectionOut, path12.basename(section.html)), htmlContent);
+        if (section.css) {
+          await fs10.copyFile(
+            path12.join(sectionSrc, section.css),
+            path12.join(sectionOut, path12.basename(section.css))
+          );
+        }
+        break;
+      }
+      case "iframe":
+        break;
+      case "webcomponent": {
+        await fs10.mkdir(sectionOut, { recursive: true });
+        await fs10.copyFile(
+          path12.join(sectionSrc, section.bundle),
+          path12.join(sectionOut, path12.basename(section.bundle))
+        );
+        break;
+      }
+      default:
+        throw new Error(
+          `Unknown section type. Valid types: editable, opaque-react, html, iframe, webcomponent`
+        );
+    }
+  }
+}
 async function generateManifest(themeName, themePath, outputDir) {
   let version = "1.0.0";
   let themeId = themeName;
   try {
-    const pkgContent = await fs8.readFile(
-      path10.join(themePath, "package.json"),
+    const pkgContent = await fs10.readFile(
+      path12.join(themePath, "package.json"),
       "utf-8"
     );
     const pkg = JSON.parse(pkgContent);
@@ -860,7 +855,7 @@ async function generateManifest(themeName, themePath, outputDir) {
   const dataRequirements = await extractDataRequirements(themePath);
   let hasThemeConfig = false;
   try {
-    await fs8.access(path10.join(themePath, "theme.config.ts"));
+    await fs10.access(path12.join(themePath, "theme.config.ts"));
     hasThemeConfig = true;
   } catch {
   }
@@ -901,24 +896,34 @@ async function generateManifest(themeName, themePath, outputDir) {
     // Section data requirements for server-side prefetching (keyed by section type)
     dataRequirements
   };
-  await fs8.writeFile(
-    path10.join(outputDir, "manifest.json"),
+  await fs10.writeFile(
+    path12.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 = path12.join(themePath, "dist");
+  const isNextjs = isNextjsProject(themePath);
+  if (isNextjs) {
+    logger.info("Detected Next.js project \u2014 using next/* shims");
+  }
+  const bundleEntry = path12.join(themePath, "bundle-entry.ts");
+  const indexEntry = path12.join(themePath, "index.ts");
   let entryPoint = indexEntry;
   try {
-    await fs8.access(bundleEntry);
+    await fs10.access(bundleEntry);
     entryPoint = bundleEntry;
   } catch {
   }
-  const shimPath = path10.join(outputDir, ".process-shim.js");
-  await fs8.mkdir(outputDir, { recursive: true });
-  await fs8.writeFile(shimPath, PROCESS_SHIM);
+  const shimPath = path12.join(outputDir, ".process-shim.js");
+  await fs10.mkdir(outputDir, { recursive: true });
+  await fs10.writeFile(shimPath, PROCESS_SHIM);
+  const plugins = [
+    reactGlobalPlugin,
+    reactQueryGlobalPlugin,
+    createCoreGlobalPlugin(themePath)
+  ];
+  if (isNextjs) plugins.unshift(nextShimPlugin);
   const buildOptions = {
     entryPoints: [entryPoint],
     bundle: true,
@@ -930,12 +935,7 @@ async function compileStandaloneTheme(themePath, themeName) {
     banner: {
       js: '"use client";'
     },
-    plugins: [
-      reactGlobalPlugin,
-      reactQueryGlobalPlugin,
-      createCoreGlobalPlugin(themePath),
-      createThemeDepsStubPlugin(themePath)
-    ],
+    plugins,
     external: [],
     alias: {
       events: "events/",
@@ -969,15 +969,16 @@ async function compileStandaloneTheme(themePath, themeName) {
   try {
     const result = await esbuild.build(buildOptions);
     try {
-      await fs8.unlink(shimPath);
+      await fs10.unlink(shimPath);
     } catch {
     }
+    await compileSections(themePath, outputDir);
     await contentHashEntry(outputDir);
-    const themeAssetsDir = path10.join(themePath, "assets");
-    const distThemeAssets = path10.join(outputDir, "theme-assets");
+    const themeAssetsDir = path12.join(themePath, "assets");
+    const distThemeAssets = path12.join(outputDir, "theme-assets");
     try {
-      await fs8.access(themeAssetsDir);
-      await fs8.cp(themeAssetsDir, distThemeAssets, { recursive: true });
+      await fs10.access(themeAssetsDir);
+      await fs10.cp(themeAssetsDir, distThemeAssets, { recursive: true });
       logger.info("Copied static assets to dist/theme-assets/");
     } catch {
     }
@@ -997,7 +998,7 @@ async function compileStandaloneTheme(themePath, themeName) {
     return true;
   } catch (error) {
     try {
-      await fs8.unlink(shimPath);
+      await fs10.unlink(shimPath);
     } catch {
     }
     logger.error(`esbuild compilation failed: ${error}`);
@@ -1005,18 +1006,25 @@ 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 = path12.join(themePath, "dist");
+  const isNextjs = isNextjsProject(themePath);
+  const bundleEntry = path12.join(themePath, "bundle-entry.ts");
+  const indexEntry = path12.join(themePath, "index.ts");
   let entryPoint = indexEntry;
   try {
-    await fs8.access(bundleEntry);
+    await fs10.access(bundleEntry);
     entryPoint = bundleEntry;
   } catch {
   }
-  const shimPath = path10.join(outputDir, ".process-shim.js");
-  await fs8.mkdir(outputDir, { recursive: true });
-  await fs8.writeFile(shimPath, PROCESS_SHIM);
+  const shimPath = path12.join(outputDir, ".process-shim.js");
+  await fs10.mkdir(outputDir, { recursive: true });
+  await fs10.writeFile(shimPath, PROCESS_SHIM);
+  const devPlugins = [
+    reactGlobalPlugin,
+    reactQueryGlobalPlugin,
+    createCoreGlobalPlugin(themePath)
+  ];
+  if (isNextjs) devPlugins.unshift(nextShimPlugin);
   const buildOptions = {
     entryPoints: [entryPoint],
     bundle: true,
@@ -1027,12 +1035,7 @@ async function compileStandaloneThemeDev(themePath, themeName) {
     banner: {
       js: '"use client";'
     },
-    plugins: [
-      reactGlobalPlugin,
-      reactQueryGlobalPlugin,
-      createCoreGlobalPlugin(themePath),
-      createThemeDepsStubPlugin(themePath)
-    ],
+    plugins: devPlugins,
     external: [],
     alias: {
       events: "events/",
@@ -1070,18 +1073,18 @@ async function compileStandaloneThemeDev(themePath, themeName) {
   return { context: context2, outputDir };
 }
 async function compilePreviewRuntime(themePath) {
-  const outputDir = path10.join(themePath, "dist");
-  await fs8.mkdir(outputDir, { recursive: true });
-  const outputPath = path10.join(outputDir, "preview-runtime.js");
+  const outputDir = path12.join(themePath, "dist");
+  await fs10.mkdir(outputDir, { recursive: true });
+  const outputPath = path12.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")
+    path12.join(__dirname, "..", "preview", "preview-app.tsx"),
+    path12.join(__dirname, "preview", "preview-app.tsx"),
+    path12.join(__dirname, "..", "..", "src", "preview", "preview-app.tsx")
   ];
   let previewEntryPath = null;
   for (const loc of locations) {
     try {
-      await fs8.access(loc);
+      await fs10.access(loc);
       previewEntryPath = loc;
       break;
     } catch {
@@ -1164,10 +1167,10 @@ ${locations.join("\n")}`
         if (!lucideScanned) {
           lucideScanned = true;
           const coreSrcCandidates = [
-            path10.join(themePath, "node_modules", "@onexapis", "core", "src"),
-            path10.join(themePath, "..", "..", "packages", "core", "src"),
+            path12.join(themePath, "node_modules", "@onexapis", "core", "src"),
+            path12.join(themePath, "..", "..", "packages", "core", "src"),
             // monorepo sibling
-            path10.join(
+            path12.join(
               __dirname,
               "..",
               "..",
@@ -1182,7 +1185,7 @@ ${locations.join("\n")}`
           let coreSourceDir = null;
           for (const candidate of coreSrcCandidates) {
             try {
-              await fs8.access(candidate);
+              await fs10.access(candidate);
               coreSourceDir = candidate;
               break;
             } catch {
@@ -1201,21 +1204,21 @@ ${locations.join("\n")}`
             }
           } else {
             const coreDistCandidates = [
-              path10.join(themePath, "node_modules", "@onexapis", "core", "dist")
+              path12.join(themePath, "node_modules", "@onexapis", "core", "dist")
             ];
             const resolvedDist = await resolveNodeModulesFile(
               __dirname,
-              path10.join("@onexapis", "core", "dist")
+              path12.join("@onexapis", "core", "dist")
             );
             if (resolvedDist) coreDistCandidates.push(resolvedDist);
             for (const candidate of coreDistCandidates) {
               try {
-                await fs8.access(candidate);
+                await fs10.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(
-                    path10.join(candidate, file),
+                  const content = await fs10.readFile(
+                    path12.join(candidate, file),
                     "utf-8"
                   );
                   for (const match of content.matchAll(importRegex)) {
@@ -1270,7 +1273,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 = path12.join(pkgDir, "dist", "es", "index.mjs");
           const { existsSync } = await import('fs');
           if (existsSync(esmEntry)) {
             return { path: esmEntry, namespace: "file" };
@@ -1369,8 +1372,8 @@ export function headers() { return new Headers(); }
       });
     }
   };
-  const shimPath = path10.join(outputDir, ".process-shim-preview.js");
-  await fs8.writeFile(shimPath, PROCESS_SHIM);
+  const shimPath = path12.join(outputDir, ".process-shim-preview.js");
+  await fs10.writeFile(shimPath, PROCESS_SHIM);
   await esbuild.build({
     entryPoints: [previewEntryPath],
     bundle: true,
@@ -1405,17 +1408,19 @@ export function headers() { return new Headers(); }
     }
   });
   try {
-    await fs8.unlink(shimPath);
+    await fs10.unlink(shimPath);
   } catch {
   }
   return outputPath;
 }
-var PROCESS_SHIM, reactGlobalPlugin, reactQueryGlobalPlugin;
+var PROCESS_SHIM, reactGlobalPlugin, reactQueryGlobalPlugin, nextShimPlugin;
 var init_compile_theme = __esm({
   "src/utils/compile-theme.ts"() {
     init_logger();
     init_extract_schemas();
     init_scan_theme_assets();
+    init_detect_nextjs();
+    init_nextjs_page_scanner();
     PROCESS_SHIM = `
 if (typeof process === "undefined") {
   globalThis.process = {
@@ -1561,6 +1566,145 @@ export const {
         }));
       }
     };
+    nextShimPlugin = {
+      name: "next-shim",
+      setup(build2) {
+        for (const serverModule of ["next/headers", "next/server", "next/cache"]) {
+          build2.onResolve({ filter: new RegExp(`^${serverModule.replace("/", "\\/")}`) }, (args) => ({
+            path: args.path,
+            namespace: "next-server-error"
+          }));
+        }
+        build2.onLoad({ filter: /.*/, namespace: "next-server-error" }, (args) => ({
+          errors: [
+            {
+              text: `"${args.path}" is server-only and cannot be used in a OneX theme bundle. Use client-side equivalents or remove the import.`
+            }
+          ]
+        }));
+        build2.onResolve({ filter: /^next\/navigation$/ }, () => ({
+          path: "next-navigation-shim",
+          namespace: "next-shim"
+        }));
+        build2.onLoad({ filter: /^next-navigation-shim$/, namespace: "next-shim" }, () => ({
+          contents: `
+export function usePathname() {
+  if (typeof window === 'undefined') return '/';
+  return window.location.pathname;
+}
+export function useSearchParams() {
+  if (typeof window === 'undefined') return new URLSearchParams();
+  return new URLSearchParams(window.location.search);
+}
+export function useParams() {
+  if (typeof window === 'undefined') return {};
+  return (globalThis.__ONEX_ROUTE_PARAMS__) ?? {};
+}
+export function useRouter() {
+  return {
+    push(url) { if (typeof window !== 'undefined') window.location.href = url; },
+    replace(url) { if (typeof window !== 'undefined') window.location.replace(url); },
+    back() { if (typeof window !== 'undefined') window.history.back(); },
+    forward() { if (typeof window !== 'undefined') window.history.forward(); },
+    refresh() { if (typeof window !== 'undefined') window.location.reload(); },
+    prefetch() {},
+  };
+}
+export function redirect(url) {
+  if (typeof window !== 'undefined') window.location.href = url;
+  throw new Error('redirect');
+}
+export function notFound() { throw new Error('not-found'); }
+      `.trim(),
+          loader: "js"
+        }));
+        build2.onResolve({ filter: /^next\/font\// }, () => ({
+          path: "next-font-shim",
+          namespace: "next-shim"
+        }));
+        build2.onLoad({ filter: /^next-font-shim$/, namespace: "next-shim" }, () => ({
+          contents: `
+function makeFont(family) {
+  return function(_opts) {
+    return {
+      className: '',
+      style: { fontFamily: family + ', system-ui, sans-serif' },
+      variable: '--font-' + family.toLowerCase().replace(/\\s+/g, '-'),
+    };
+  };
+}
+export const Inter = makeFont('Inter');
+export const Roboto = makeFont('Roboto');
+export const Open_Sans = makeFont('Open Sans');
+export const Lato = makeFont('Lato');
+export const Montserrat = makeFont('Montserrat');
+export const Poppins = makeFont('Poppins');
+export const Raleway = makeFont('Raleway');
+export const Nunito = makeFont('Nunito');
+export const Geist = makeFont('Geist');
+export const Geist_Mono = makeFont('Geist Mono');
+export const DM_Sans = makeFont('DM Sans');
+export const Plus_Jakarta_Sans = makeFont('Plus Jakarta Sans');
+export function localFont(_opts) {
+  return { className: '', style: { fontFamily: 'system-ui, sans-serif' }, variable: '--font-local' };
+}
+      `.trim(),
+          loader: "js"
+        }));
+        build2.onResolve({ filter: /^next\/dynamic$/ }, () => ({
+          path: "next-dynamic-shim",
+          namespace: "next-shim"
+        }));
+        build2.onLoad({ filter: /^next-dynamic-shim$/, namespace: "next-shim" }, () => ({
+          contents: `
+import { lazy, Suspense, createElement } from 'react';
+export default function dynamic(loader, opts) {
+  const Lazy = lazy(loader);
+  return function DynamicComponent(props) {
+    return createElement(Suspense, { fallback: opts?.loading ? createElement(opts.loading) : null },
+      createElement(Lazy, props));
+  };
+}
+      `.trim(),
+          loader: "js"
+        }));
+        build2.onResolve({ filter: /^next\/image$/ }, () => ({
+          path: "next-image-shim",
+          namespace: "next-shim"
+        }));
+        build2.onLoad({ filter: /^next-image-shim$/, namespace: "next-shim" }, () => ({
+          contents: `
+import { createElement } from 'react';
+export default function Image({ src, alt, width, height, style, className, ...rest }) {
+  return createElement('img', { src, alt, width, height, style, className, ...rest });
+}
+      `.trim(),
+          loader: "js"
+        }));
+        build2.onResolve({ filter: /^next\/link$/ }, () => ({
+          path: "next-link-shim",
+          namespace: "next-shim"
+        }));
+        build2.onLoad({ filter: /^next-link-shim$/, namespace: "next-shim" }, () => ({
+          contents: `
+import { createElement } from 'react';
+export default function Link({ href, children, className, style, ...rest }) {
+  return createElement('a', { href, className, style, ...rest }, children);
+}
+      `.trim(),
+          loader: "js"
+        }));
+        build2.onResolve({ filter: /^next\// }, () => ({
+          path: "next-noop-shim",
+          namespace: "next-shim"
+        }));
+        build2.onLoad({ filter: /^next-noop-shim$/, namespace: "next-shim" }, () => ({
+          contents: `export default {};
+`,
+          loader: "js"
+        }));
+      }
+    };
   }
 });
 
@@ -1585,8 +1729,8 @@ function validateThemeName(name) {
   return /^[a-z][a-z0-9-]*$/.test(name);
 }
 function pathExists(filePath) {
-  const fs12 = __require("fs-extra");
-  return fs12.existsSync(filePath);
+  const fs14 = __require("fs-extra");
+  return fs14.existsSync(filePath);
 }
 function validateCategory(category) {
   const validCategories = [
@@ -1627,18 +1771,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(path12.dirname(filePath));
   await fs.writeFile(filePath, content, "utf-8");
 }
 function getTemplatesDir() {
   const locations = [
-    path10.join(__dirname, "../../templates"),
+    path12.join(__dirname, "../../templates"),
     // Development
-    path10.join(__dirname, "../templates"),
+    path12.join(__dirname, "../templates"),
     // Production (dist/)
-    path10.join(process.cwd(), "templates"),
+    path12.join(process.cwd(), "templates"),
     // Fallback
-    path10.join(process.cwd(), "packages/cli/templates")
+    path12.join(process.cwd(), "packages/cli/templates")
     // Monorepo
   ];
   for (const location of locations) {
@@ -1650,7 +1794,7 @@ function getTemplatesDir() {
 }
 async function copyTemplate(templateName, targetDir, data) {
   const templatesDir = getTemplatesDir();
-  const templateDir = path10.join(templatesDir, templateName);
+  const templateDir = path12.join(templatesDir, templateName);
   if (!fs.existsSync(templateDir)) {
     throw new Error(
       `Template "${templateName}" not found at ${templateDir}. Available templates: ${fs.readdirSync(templatesDir).join(", ")}`
@@ -1659,8 +1803,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 = path12.join(templateDir, file);
+    const targetPath = path12.join(targetDir, file);
     const stat = await fs.stat(templatePath);
     if (stat.isDirectory()) {
       await copyTemplateDir(templatePath, targetPath, data);
@@ -1677,8 +1821,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 = path12.join(templateDir, file);
+    const targetPath = path12.join(targetDir, file);
     const stat = await fs.stat(templatePath);
     if (stat.isDirectory()) {
       await copyTemplateDir(templatePath, targetPath, data);
@@ -1693,32 +1837,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 !== path12.parse(currentDir).root) {
+    const packageJsonPath = path12.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(path12.join(currentDir, "src/themes")) || fs.existsSync(path12.join(currentDir, "themes"))) {
         return currentDir;
       }
     }
-    currentDir = path10.dirname(currentDir);
+    currentDir = path12.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(path12.join(root, "themes")))
+    return path12.join(root, "themes");
+  if (fs.existsSync(path12.join(root, "src/themes")))
+    return path12.join(root, "src/themes");
+  return path12.dirname(root);
 }
 function getFeaturesDir() {
-  return path10.join(getProjectRoot(), "src/features");
+  return path12.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(path12.join(root, "themes")) || fs.existsSync(path12.join(root, "src/themes")) || fs.existsSync(path12.join(root, "theme.config.ts")) || fs.existsSync(path12.join(root, "bundle-entry.ts"));
 }
 function ensureOneXProject() {
   if (!isOneXProject()) {
@@ -1734,13 +1878,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 = path12.join(themesDir, name);
+    return fs.statSync(themePath).isDirectory() && (fs.existsSync(path12.join(themePath, "theme.config.ts")) || fs.existsSync(path12.join(themePath, "bundle-entry.ts")) || fs.existsSync(path12.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 = path12.join(getThemesDir(), themeName);
+  return fs.existsSync(themePath) && (fs.existsSync(path12.join(themePath, "theme.config.ts")) || fs.existsSync(path12.join(themePath, "bundle-entry.ts")) || fs.existsSync(path12.join(themePath, "manifest.ts")));
 }
 function detectPackageManager() {
   const userAgent = process.env.npm_config_user_agent || "";
@@ -1748,9 +1892,9 @@ 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(path12.join(cwd, "pnpm-lock.yaml"))) return "pnpm";
+  if (fs.existsSync(path12.join(cwd, "yarn.lock"))) return "yarn";
+  if (fs.existsSync(path12.join(cwd, "bun.lockb"))) return "bun";
   return "npm";
 }
 async function installDependencies(projectPath, packageManager = "npm") {
@@ -1767,16 +1911,16 @@ async function installDependencies(projectPath, packageManager = "npm") {
     }
   });
 }
-var AUTH_DIR = path10.join(os.homedir(), ".onexthm");
+var AUTH_DIR = path12.join(os.homedir(), ".onexthm");
 var ENV_URLS = {
   dev: "https://platform-dev.onexeos.com",
   staging: "https://platform-staging.onexeos.com",
   prod: "https://platform-apis.onexeos.com"
 };
 function getAuthFile(env = "dev") {
-  const newFile = path10.join(AUTH_DIR, `auth-${env}.json`);
+  const newFile = path12.join(AUTH_DIR, `auth-${env}.json`);
   if (env === "dev") {
-    const legacyFile = path10.join(AUTH_DIR, "auth.json");
+    const legacyFile = path12.join(AUTH_DIR, "auth.json");
     if (fs.existsSync(legacyFile) && !fs.existsSync(newFile)) {
       try {
         fs.moveSync(legacyFile, newFile);
@@ -1903,7 +2047,7 @@ function decrypt(text, key) {
 }
 
 // src/commands/init.ts
-async function initCommand(projectName, options = {}) {
+async function initCommand(projectName, options) {
   logger.header("Create New OneX Theme Project");
   let name;
   if (!projectName) {
@@ -1918,7 +2062,7 @@ async function initCommand(projectName, options = {}) {
           if (!validateThemeName(kebabName)) {
             return "Invalid project name. Use lowercase letters, numbers, and hyphens only.";
           }
-          if (fs3.existsSync(path10.join(process.cwd(), kebabName))) {
+          if (fs3.existsSync(path12.join(process.cwd(), kebabName))) {
             return `Directory "${kebabName}" already exists`;
           }
           return true;
@@ -1929,14 +2073,14 @@ async function initCommand(projectName, options = {}) {
   } else {
     name = toKebabCase(projectName);
   }
-  const projectPath = path10.join(process.cwd(), name);
+  const projectPath = path12.join(process.cwd(), name);
   if (fs3.existsSync(projectPath)) {
     logger.error(`Directory "${name}" already exists.`);
     process.exit(1);
   }
   if (!options.yes) {
     try {
-      const apiUrl = getApiUrl(options.env ?? "dev");
+      const apiUrl = getApiUrl(options.env);
       const controller = new AbortController();
       const timeout = setTimeout(() => controller.abort(), 3e3);
       const response = await fetch(
@@ -2045,7 +2189,7 @@ async function initCommand(projectName, options = {}) {
       description,
       author
     );
-    const mcpJsonPath = path10.join(projectPath, ".mcp.json");
+    const mcpJsonPath = path12.join(projectPath, ".mcp.json");
     if (fs3.existsSync(mcpJsonPath)) {
       let mcpContent = fs3.readFileSync(mcpJsonPath, "utf-8");
       if (figmaApiKey) {
@@ -2125,7 +2269,7 @@ async function initCommand(projectName, options = {}) {
   }
 }
 async function renameThemeInFiles(projectPath, themeName, displayName, description, author) {
-  const configPath = path10.join(projectPath, "theme.config.ts");
+  const configPath = path12.join(projectPath, "theme.config.ts");
   if (fs3.existsSync(configPath)) {
     let content = fs3.readFileSync(configPath, "utf-8");
     content = content.replace(
@@ -2138,7 +2282,7 @@ async function renameThemeInFiles(projectPath, themeName, displayName, descripti
     );
     fs3.writeFileSync(configPath, content, "utf-8");
   }
-  const pkgPath = path10.join(projectPath, "package.json");
+  const pkgPath = path12.join(projectPath, "package.json");
   if (fs3.existsSync(pkgPath)) {
     let content = fs3.readFileSync(pkgPath, "utf-8");
     content = content.replace(
@@ -2160,10 +2304,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(path12.join(process.cwd(), f))
     );
     if (isStandaloneTheme) {
-      options.theme = path10.basename(process.cwd());
+      options.theme = path12.basename(process.cwd());
     }
   }
   const sectionName = toKebabCase(name);
@@ -2226,35 +2370,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 = path12.join(getThemesDir(), themeName);
+    const sectionPath = path12.join(themePath, "sections", sectionName);
     const schemaContent = generateSectionSchema(data);
     await writeFile(
-      path10.join(sectionPath, `${sectionName}.schema.ts`),
+      path12.join(sectionPath, `${sectionName}.schema.ts`),
       schemaContent
     );
     if (createTemplate) {
       const templateContent = generateSectionTemplate(data);
       await writeFile(
-        path10.join(sectionPath, `${sectionName}-default.tsx`),
+        path12.join(sectionPath, `${sectionName}-default.tsx`),
         templateContent
       );
     }
     const indexContent = generateSectionIndex(data, createTemplate);
-    await writeFile(path10.join(sectionPath, "index.ts"), indexContent);
+    await writeFile(path12.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: ${path12.relative(process.cwd(), path12.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: ${path12.relative(process.cwd(), path12.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: ${path12.relative(process.cwd(), path12.join(themePath, "manifest.ts"))}`
     );
     logger.newLine();
     logger.success("Section created successfully!");
@@ -2402,10 +2546,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(path12.join(process.cwd(), f))
     );
     if (isStandaloneTheme) {
-      options.theme = path10.basename(process.cwd());
+      options.theme = path12.basename(process.cwd());
     }
   }
   const blockName = toKebabCase(name);
@@ -2480,24 +2624,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" ? path12.join(getFeaturesDir(), "blocks", blockName) : path12.join(getThemesDir(), themeName, "blocks", blockName);
     const schemaContent = generateBlockSchema(data);
     await writeFile(
-      path10.join(blockPath, `${blockName}.schema.ts`),
+      path12.join(blockPath, `${blockName}.schema.ts`),
       schemaContent
     );
     const componentContent = generateBlockComponent(data);
-    await writeFile(path10.join(blockPath, `${blockName}.tsx`), componentContent);
+    await writeFile(path12.join(blockPath, `${blockName}.tsx`), componentContent);
     const indexContent = generateBlockIndex(data);
-    await writeFile(path10.join(blockPath, "index.ts"), indexContent);
+    await writeFile(path12.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: ${path12.relative(process.cwd(), path12.join(blockPath, `${blockName}.schema.ts`))}`
     );
     logger.log(
-      `  2. Edit component: ${path10.relative(process.cwd(), path10.join(blockPath, `${blockName}.tsx`))}`
+      `  2. Edit component: ${path12.relative(process.cwd(), path12.join(blockPath, `${blockName}.tsx`))}`
     );
     logger.log(
       `  3. Register in block registry: src/lib/registry/block-registry.ts`
@@ -2675,31 +2819,31 @@ async function createComponentCommand(name, options) {
   };
   logger.startSpinner("Creating component files...");
   try {
-    const componentPath = path10.join(
+    const componentPath = path12.join(
       getFeaturesDir(),
       "components",
       componentName
     );
     const schemaContent = generateComponentSchema(data);
     await writeFile(
-      path10.join(componentPath, `${componentName}.schema.ts`),
+      path12.join(componentPath, `${componentName}.schema.ts`),
       schemaContent
     );
     const componentContent = generateComponent(data);
     await writeFile(
-      path10.join(componentPath, `${componentName}.tsx`),
+      path12.join(componentPath, `${componentName}.tsx`),
       componentContent
     );
     const indexContent = generateComponentIndex(data);
-    await writeFile(path10.join(componentPath, "index.ts"), indexContent);
+    await writeFile(path12.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: ${path12.relative(process.cwd(), path12.join(componentPath, `${componentName}.schema.ts`))}`
     );
     logger.log(
-      `  2. Edit component: ${path10.relative(process.cwd(), path10.join(componentPath, `${componentName}.tsx`))}`
+      `  2. Edit component: ${path12.relative(process.cwd(), path12.join(componentPath, `${componentName}.tsx`))}`
     );
     logger.log(
       `  3. Register in component registry: src/lib/registry/component-registry.ts`
@@ -2856,13 +3000,13 @@ async function listSections(themeFilter) {
     return;
   }
   for (const theme of themes) {
-    const sectionsDir = path10.join(getThemesDir(), theme, "sections");
+    const sectionsDir = path12.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 = path12.join(sectionsDir, name);
+      return fs.statSync(sectionPath).isDirectory() && fs.existsSync(path12.join(sectionPath, "index.ts"));
     });
     if (sections.length > 0) {
       logger.log(chalk4.cyan(`
@@ -2876,11 +3020,11 @@ async function listSections(themeFilter) {
 }
 async function listBlocks(themeFilter) {
   logger.section("\u{1F9F1} Blocks");
-  const sharedBlocksDir = path10.join(getFeaturesDir(), "blocks");
+  const sharedBlocksDir = path12.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 = path12.join(sharedBlocksDir, name);
+      return fs.statSync(blockPath).isDirectory() && fs.existsSync(path12.join(blockPath, "index.ts"));
     });
     if (sharedBlocks.length > 0) {
       logger.log(chalk4.cyan("\n  Shared:"));
@@ -2891,13 +3035,13 @@ async function listBlocks(themeFilter) {
   }
   const themes = themeFilter ? [themeFilter] : listThemes();
   for (const theme of themes) {
-    const blocksDir = path10.join(getThemesDir(), theme, "blocks");
+    const blocksDir = path12.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 = path12.join(blocksDir, name);
+      return fs.statSync(blockPath).isDirectory() && fs.existsSync(path12.join(blockPath, "index.ts"));
     });
     if (blocks.length > 0) {
       logger.log(chalk4.cyan(`
@@ -2911,14 +3055,14 @@ async function listBlocks(themeFilter) {
 }
 async function listComponents() {
   logger.section("\u2699\uFE0F  Components");
-  const componentsDir = path10.join(getFeaturesDir(), "components");
+  const componentsDir = path12.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 = path12.join(componentsDir, name);
+    return fs.statSync(componentPath).isDirectory() && fs.existsSync(path12.join(componentPath, "index.ts"));
   });
   if (components.length === 0) {
     logger.warning("No components found");
@@ -2939,11 +3083,11 @@ async function listThemesInfo() {
   }
   logger.log("");
   for (const theme of themes) {
-    const themeDir = path10.join(getThemesDir(), theme);
+    const themeDir = path12.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 = path12.join(themeDir, candidate);
       if (fs.existsSync(candidatePath)) {
         manifestContent = fs.readFileSync(candidatePath, "utf-8");
         break;
@@ -2965,6 +3109,7 @@ async function listThemesInfo() {
 
 // src/commands/build.ts
 init_logger();
+init_detect_nextjs();
 async function buildCommand(options) {
   logger.header("Build Theme");
   let themePath;
@@ -2972,14 +3117,14 @@ async function buildCommand(options) {
   if (options.theme) {
     themeName = options.theme;
     try {
-      const workspaceThemePath = path10.join(getThemesDir(), themeName);
+      const workspaceThemePath = path12.join(getThemesDir(), themeName);
       if (fs.existsSync(workspaceThemePath)) {
         themePath = workspaceThemePath;
       } else {
-        themePath = path10.join(process.cwd(), themeName);
+        themePath = path12.join(process.cwd(), themeName);
       }
     } catch {
-      themePath = path10.join(process.cwd(), themeName);
+      themePath = path12.join(process.cwd(), themeName);
     }
     if (!fs.existsSync(themePath)) {
       logger.error(`Theme "${themeName}" not found.`);
@@ -2989,11 +3134,14 @@ async function buildCommand(options) {
     const isThemeDir = [
       "theme.config.ts",
       "bundle-entry.ts",
-      "manifest.ts"
-    ].some((f) => fs.existsSync(path10.join(process.cwd(), f)));
+      "manifest.ts",
+      "next.config.ts",
+      "next.config.js",
+      "next.config.mjs"
+    ].some((f) => fs.existsSync(path12.join(process.cwd(), f)));
     if (isThemeDir) {
       themePath = process.cwd();
-      themeName = path10.basename(themePath);
+      themeName = path12.basename(themePath);
       logger.info(`Building current theme: ${themeName}`);
     } else {
       logger.error(
@@ -3002,7 +3150,7 @@ async function buildCommand(options) {
       process.exit(1);
     }
   }
-  const packageJsonPath = path10.join(themePath, "package.json");
+  const packageJsonPath = path12.join(themePath, "package.json");
   const hasPkgJson = fs.existsSync(packageJsonPath);
   if (!hasPkgJson) {
     logger.warning(
@@ -3018,30 +3166,42 @@ async function buildCommand(options) {
   }
   logger.newLine();
   logger.section("Build Steps");
-  logger.startSpinner("Running type check...");
-  const typeCheckSuccess = await runCommand("pnpm", ["type-check"], themePath);
-  if (!typeCheckSuccess) {
-    logger.stopSpinner(false, "Type check failed");
-    logger.error("Fix type errors before building.");
-    process.exit(1);
-  }
-  logger.stopSpinner(true, "Type check passed");
-  logger.startSpinner("Running linter...");
-  const lintSuccess = await runCommand("pnpm", ["lint"], themePath);
-  if (!lintSuccess) {
-    logger.stopSpinner(false, "Lint failed");
-    logger.error("Fix lint errors before building.");
-    process.exit(1);
-  }
-  logger.stopSpinner(true, "Lint passed");
   const pkgJson = fs.readJsonSync(packageJsonPath);
+  if (pkgJson.scripts?.["type-check"]) {
+    logger.startSpinner("Running type check...");
+    const typeCheckSuccess = await runCommand("pnpm", ["type-check"], themePath);
+    if (!typeCheckSuccess) {
+      logger.stopSpinner(false, "Type check failed");
+      logger.error("Fix type errors before building.");
+      process.exit(1);
+    }
+    logger.stopSpinner(true, "Type check passed");
+  } else {
+    logger.info("Skipping type check (no type-check script in package.json)");
+  }
+  const isNextjsForLint = isNextjsProject(themePath);
+  if (!isNextjsForLint && pkgJson.scripts?.lint) {
+    logger.startSpinner("Running linter...");
+    const lintSuccess = await runCommand("pnpm", ["lint"], themePath);
+    if (!lintSuccess) {
+      logger.stopSpinner(false, "Lint failed");
+      logger.error("Fix lint errors before building.");
+      process.exit(1);
+    }
+    logger.stopSpinner(true, "Lint passed");
+  } else if (isNextjsForLint) {
+    logger.info("Skipping lint (Next.js project compiled via esbuild)");
+  } else {
+    logger.info("Skipping lint (no lint script in package.json)");
+  }
   const buildScript = pkgJson.scripts?.build || "";
   const isRecursive = buildScript.includes("onexthm build") || buildScript.includes("onex build") || buildScript.includes("onex-cli build");
+  const isNextjs = isNextjsProject(themePath);
   logger.startSpinner(
     options.watch ? "Building (watch mode)..." : "Building..."
   );
   let buildSuccess;
-  if (isRecursive) {
+  if (isRecursive || isNextjs) {
     const { compileStandaloneTheme: compileStandaloneTheme2 } = await Promise.resolve().then(() => (init_compile_theme(), compile_theme_exports));
     buildSuccess = await compileStandaloneTheme2(themePath, themeName);
   } else {
@@ -3058,9 +3218,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 = path12.join(themePath, "dist");
     if (fs.existsSync(distPath)) {
-      logger.log(`Output: ${path10.relative(process.cwd(), distPath)}`);
+      logger.log(`Output: ${path12.relative(process.cwd(), distPath)}`);
       const files = fs.readdirSync(distPath);
       logger.log(`Files: ${files.length}`);
     }
@@ -3201,8 +3361,8 @@ async function downloadBundleZip(apiUrl, themeId, version) {
 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 = path12.join(outputDir, entryFile);
+    const stablePath = path12.join(outputDir, "bundle-entry.js");
     if (await fs.pathExists(hashedPath)) {
       await fs.copy(hashedPath, stablePath);
       const mapPath = hashedPath + ".map";
@@ -3211,13 +3371,13 @@ async function createCompatibilityFiles(outputDir, manifest) {
       }
     }
   }
-  const sectionsRegistryPath = path10.join(outputDir, "sections-registry.js");
+  const sectionsRegistryPath = path12.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 = path12.join(outputDir, "package.json");
   await fs.writeFile(pkgJsonPath, '{\n  "type": "module"\n}\n', "utf-8");
 }
 function showDownloadFailureHelp(themeId, apiUrl) {
@@ -3258,7 +3418,7 @@ function showDownloadFailureHelp(themeId, apiUrl) {
 }
 async function downloadCommand(options) {
   logger.header("Download Theme");
-  const env = options.env ?? "dev";
+  const env = options.env;
   const apiUrl = getApiUrl(env);
   logger.info(`Environment: ${env}  (${apiUrl})`);
   const spinner = ora("Initializing download...").start();
@@ -3316,7 +3476,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 = path12.join(outputDir, "manifest.json");
     const manifest = await fs.readJson(manifestPath);
     await createCompatibilityFiles(outputDir, manifest);
     console.log();
@@ -3437,7 +3597,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 = path12.join(themeDir, "package.json");
   if (await fs.pathExists(pkgPath)) {
     const pkg = await fs.readJson(pkgPath);
     pkg.name = `@onex-themes/${newName}`;
@@ -3453,7 +3613,7 @@ async function renameTheme(themeDir, oldName, newName) {
     }
     await fs.writeJson(pkgPath, pkg, { spaces: 2 });
   }
-  const configPath = path10.join(themeDir, "theme.config.ts");
+  const configPath = path12.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}"`);
@@ -3463,7 +3623,7 @@ async function renameTheme(themeDir, oldName, newName) {
     );
     await fs.writeFile(configPath, content);
   }
-  const layoutPath = path10.join(themeDir, "theme.layout.ts");
+  const layoutPath = path12.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}"`);
@@ -3476,7 +3636,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 = path12.join(themeDir, file);
     let content = await fs.readFile(filePath, "utf-8");
     const original = content;
     content = content.replace(
@@ -3498,7 +3658,7 @@ async function renameTheme(themeDir, oldName, newName) {
 }
 async function cloneCommand(themeName, options) {
   logger.header("Clone Theme Source");
-  const env = options.env ?? "dev";
+  const env = options.env;
   const apiUrl = getApiUrl(env);
   logger.info(`Environment: ${env}  (${apiUrl})`);
   if (options.bucket) {
@@ -3519,7 +3679,7 @@ async function cloneCommand(themeName, options) {
   }
   const spinner = ora("Initializing clone...").start();
   try {
-    const outputDir = options.output || path10.resolve(process.cwd(), newName);
+    const outputDir = options.output || path12.resolve(process.cwd(), newName);
     if (await fs.pathExists(outputDir)) {
       spinner.fail(chalk4.red(`Directory already exists: ${outputDir}`));
       logger.info(
@@ -3565,7 +3725,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 = path12.join(outputDir, ".env.example");
     if (!await fs.pathExists(envExamplePath)) {
       await fs.writeFile(
         envExamplePath,
@@ -3578,7 +3738,7 @@ async function cloneCommand(themeName, options) {
         ].join("\n")
       );
     }
-    const mcpJsonPath = path10.join(outputDir, ".mcp.json");
+    const mcpJsonPath = path12.join(outputDir, ".mcp.json");
     if (await fs.pathExists(mcpJsonPath)) {
       const { default: inquirerMod } = await import('inquirer');
       const { figmaApiKey } = await inquirerMod.prompt([
@@ -3603,7 +3763,7 @@ async function cloneCommand(themeName, options) {
     }
     if (options.install !== false) {
       const hasPkgJson = await fs.pathExists(
-        path10.join(outputDir, "package.json")
+        path12.join(outputDir, "package.json")
       );
       if (hasPkgJson) {
         spinner.start("Installing dependencies...");
@@ -3631,7 +3791,7 @@ 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)}`));
+    console.log(chalk4.gray(`   cd ${path12.relative(process.cwd(), outputDir)}`));
     console.log(
       chalk4.gray("   cp .env.example .env  # then add your Company ID")
     );