@onexapis/cli 1.1.64 → 1.1.66

package/dist/index.mjs

@@ -1,15 +1,15 @@
 import chalk4 from 'chalk';
 import ora from 'ora';
-import * as esbuild from 'esbuild';
-import path8 from 'path';
-import fs7 from 'fs/promises';
-import crypto from 'crypto';
+import path10 from 'path';
 import { glob } from 'glob';
+import fs from 'fs-extra';
+import crypto from 'crypto';
+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 fs from 'fs-extra';
 import ejs from 'ejs';
 import os from 'os';
 import AdmZip from 'adm-zip';
@@ -85,6 +85,187 @@ var init_logger = __esm({
     logger = new Logger();
   }
 });
+function sortedCopy(value) {
+  if (Array.isArray(value)) {
+    return value.map((v) => sortedCopy(v));
+  }
+  if (value && typeof value === "object") {
+    const sorted = {};
+    for (const key of Object.keys(value).sort()) {
+      sorted[key] = sortedCopy(value[key]);
+    }
+    return sorted;
+  }
+  return value;
+}
+function normalizeField(raw) {
+  const out = {
+    id: String(raw.id),
+    type: String(raw.type)
+  };
+  if (raw.required === true) out.required = true;
+  if (raw.default !== void 0) out.default = raw.default;
+  if (Array.isArray(raw.aliases) && raw.aliases.length > 0) {
+    out.aliases = [...raw.aliases].map(String).sort();
+  }
+  if (typeof raw.maxLength === "number") out.maxLength = raw.maxLength;
+  if (typeof raw.min === "number") out.min = raw.min;
+  if (typeof raw.max === "number") out.max = raw.max;
+  if (typeof raw.step === "number") out.step = raw.step;
+  if (Array.isArray(raw.accept)) {
+    out.accept = [...raw.accept].map(String).sort();
+  }
+  if (Array.isArray(raw.options)) {
+    out.options = raw.options.map((o) => String(o?.value ?? o)).sort();
+  }
+  return out;
+}
+function normalizeBlock(raw) {
+  return {
+    type: String(raw.type),
+    settings: Array.isArray(raw.settings) ? raw.settings.map(normalizeField).sort(sortFieldsById) : [],
+    defaults: raw.defaults && typeof raw.defaults === "object" ? sortedCopy(raw.defaults) : {},
+    ...typeof raw.limit === "number" ? { limit: raw.limit } : {},
+    ...typeof raw.min === "number" ? { min: raw.min } : {},
+    ...raw.sortable === true ? { sortable: true } : {},
+    ...raw.baseType ? { baseType: String(raw.baseType) } : {}
+  };
+}
+function normalizeTemplate(raw) {
+  const out = { id: String(raw.id) };
+  if (raw.isDefault === true) out.isDefault = true;
+  if (Array.isArray(raw.settings)) {
+    out.settings = raw.settings.map(normalizeField).sort(sortFieldsById);
+  }
+  if (raw.defaults && typeof raw.defaults === "object") {
+    out.defaults = sortedCopy(raw.defaults);
+  }
+  return out;
+}
+function sortFieldsById(a, b) {
+  return a.id.localeCompare(b.id);
+}
+function sortByType(a, b) {
+  return a.type.localeCompare(b.type);
+}
+function normalizeSection(raw) {
+  return {
+    type: String(raw.type),
+    settings: Array.isArray(raw.settings) ? raw.settings.map(normalizeField).sort(sortFieldsById) : [],
+    defaults: raw.defaults && typeof raw.defaults === "object" ? sortedCopy(raw.defaults) : {},
+    blocks: Array.isArray(raw.blocks) ? raw.blocks.map(normalizeBlock).sort(sortByType) : [],
+    templates: Array.isArray(raw.templates) ? raw.templates.map(normalizeTemplate).sort(sortFieldsById) : [],
+    dataRequirements: raw.dataRequirements && typeof raw.dataRequirements === "object" ? sortedCopy(raw.dataRequirements) : null,
+    ...raw.global === true ? { global: true } : {},
+    ...typeof raw.maxBlocks === "number" ? { maxBlocks: raw.maxBlocks } : {}
+  };
+}
+async function extractSchemas(themePath) {
+  const { createJiti } = await import('jiti');
+  const jiti = createJiti(import.meta.url);
+  const schemaFiles = await glob("sections/**/*.schema.ts", { cwd: themePath });
+  const sections = {};
+  for (const file of schemaFiles) {
+    try {
+      const mod = await jiti.import(path10.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)) {
+          const section = normalizeSection(value);
+          sections[section.type] = section;
+        }
+      }
+    } catch {
+    }
+  }
+  const manifest = {
+    manifestVersion: 1,
+    sections: {}
+  };
+  for (const type of Object.keys(sections).sort()) {
+    manifest.sections[type] = sections[type];
+  }
+  return manifest;
+}
+function serializeManifest(manifest) {
+  return JSON.stringify(sortedCopy(manifest), null, 2);
+}
+var init_extract_schemas = __esm({
+  "src/utils/extract-schemas.ts"() {
+  }
+});
+function mimeFor(filename) {
+  const ext = path10.extname(filename).toLowerCase();
+  return MIME_MAP[ext] || "application/octet-stream";
+}
+async function sha256Prefix(absPath, len) {
+  const buf = await fs.readFile(absPath);
+  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 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");
+  if (!await fs.pathExists(assetsDir)) return [];
+  const files = await glob("**/*", {
+    cwd: assetsDir,
+    nodir: true,
+    dot: false
+  });
+  const results = [];
+  for (const rel of files) {
+    const absPath = path10.join(assetsDir, rel);
+    const stat = await fs.stat(absPath);
+    if (!stat.isFile()) continue;
+    const originalPath = rel.split(path10.sep).join("/");
+    const hash = await sha256Prefix(absPath, HASH_LEN);
+    const hashedPath = insertHashIntoName(originalPath, hash);
+    const contentType = mimeFor(rel);
+    results.push({
+      originalPath,
+      hashedPath,
+      hash,
+      size: stat.size,
+      contentType,
+      absPath
+    });
+  }
+  results.sort((a, b) => a.originalPath.localeCompare(b.originalPath));
+  return results;
+}
+var MIME_MAP, HASH_LEN;
+var init_scan_theme_assets = __esm({
+  "src/utils/scan-theme-assets.ts"() {
+    MIME_MAP = {
+      ".png": "image/png",
+      ".jpg": "image/jpeg",
+      ".jpeg": "image/jpeg",
+      ".gif": "image/gif",
+      ".webp": "image/webp",
+      ".avif": "image/avif",
+      ".svg": "image/svg+xml",
+      ".ico": "image/x-icon",
+      ".bmp": "image/bmp",
+      ".woff": "font/woff",
+      ".woff2": "font/woff2",
+      ".ttf": "font/ttf",
+      ".otf": "font/otf",
+      ".eot": "application/vnd.ms-fontobject",
+      ".mp4": "video/mp4",
+      ".webm": "video/webm",
+      ".mov": "video/quicktime",
+      ".ogg": "video/ogg",
+      ".json": "application/json"
+    };
+    HASH_LEN = 8;
+  }
+});
 
 // src/utils/compile-theme.ts
 var compile_theme_exports = {};
@@ -100,8 +281,8 @@ async function generateThemeCSS(themePath, outDir) {
     const tailwindcss = (await import('tailwindcss')).default;
     const tailwindConfig = {
       content: [
-        path8.join(themePath, "sections/**/*.{ts,tsx}"),
-        path8.join(themePath, "components/**/*.{ts,tsx}")
+        path10.join(themePath, "sections/**/*.{ts,tsx}"),
+        path10.join(themePath, "components/**/*.{ts,tsx}")
       ],
       theme: { extend: {} },
       plugins: []
@@ -111,7 +292,7 @@ async function generateThemeCSS(themePath, outDir) {
       inputCSS,
       { from: void 0 }
     );
-    await fs7.writeFile(path8.join(outDir, "bundle.css"), result.css);
+    await fs8.writeFile(path10.join(outDir, "bundle.css"), result.css);
     logger.info("Generated bundle.css");
   } catch (err) {
     logger.warning(
@@ -122,12 +303,12 @@ async function generateThemeCSS(themePath, outDir) {
 async function resolveNodeModulesFile(startDir, relativePath) {
   let dir = startDir;
   while (true) {
-    const candidate = path8.join(dir, "node_modules", relativePath);
+    const candidate = path10.join(dir, "node_modules", relativePath);
     try {
-      await fs7.access(candidate);
+      await fs8.access(candidate);
       return candidate;
     } catch {
-      const parent = path8.dirname(dir);
+      const parent = path10.dirname(dir);
       if (parent === dir) break;
       dir = parent;
     }
@@ -151,7 +332,7 @@ async function scanImportsFromPackage(sourceDir, packageName) {
   });
   for (const file of sourceFiles) {
     try {
-      const content = await fs7.readFile(path8.join(sourceDir, file), "utf-8");
+      const content = await fs8.readFile(path10.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();
@@ -205,17 +386,17 @@ function createCoreGlobalPlugin(themePath) {
           const distFileName = subpath ? `${subpath}.mjs` : "index.mjs";
           let distPath = await resolveNodeModulesFile(
             themePath,
-            path8.join("@onexapis", "core", "dist", distFileName)
+            path10.join("@onexapis", "core", "dist", distFileName)
           );
           if (!distPath) {
             distPath = await resolveNodeModulesFile(
               __dirname,
-              path8.join("@onexapis", "core", "dist", distFileName)
+              path10.join("@onexapis", "core", "dist", distFileName)
             );
           }
           try {
             if (!distPath) throw new Error("not found");
-            const distContent = await fs7.readFile(distPath, "utf-8");
+            const distContent = await fs8.readFile(distPath, "utf-8");
             const exportMatches = distContent.matchAll(/export\s*\{([^}]+)\}/g);
             for (const m of exportMatches) {
               const names = m[1].split(",").map((n) => {
@@ -444,7 +625,7 @@ async function generateThemeData(themePath, outputDir, themeId) {
   const pages = {};
   for (const ext of [".ts", ".js"]) {
     try {
-      const mod = await jiti.import(path8.join(themePath, `theme.config${ext}`));
+      const mod = await jiti.import(path10.join(themePath, `theme.config${ext}`));
       themeConfig = mod.default || mod;
       break;
     } catch {
@@ -452,20 +633,20 @@ async function generateThemeData(themePath, outputDir, themeId) {
   }
   for (const ext of [".ts", ".js"]) {
     try {
-      const mod = await jiti.import(path8.join(themePath, `theme.layout${ext}`));
+      const mod = await jiti.import(path10.join(themePath, `theme.layout${ext}`));
       layoutConfig = mod.default || mod;
       break;
     } catch {
     }
   }
   const schemas = {};
-  const sectionsDir = path8.join(themePath, "sections");
+  const sectionsDir = path10.join(themePath, "sections");
   try {
-    const sectionDirs = await fs7.readdir(sectionsDir);
+    const sectionDirs = await fs8.readdir(sectionsDir);
     for (const dir of sectionDirs) {
-      const schemaFile = path8.join(sectionsDir, dir, `${dir}.schema.ts`);
+      const schemaFile = path10.join(sectionsDir, dir, `${dir}.schema.ts`);
       try {
-        await fs7.access(schemaFile);
+        await fs8.access(schemaFile);
         const mod = await jiti.import(schemaFile);
         for (const [key, value] of Object.entries(mod)) {
           if (key.endsWith("Schema") && value && typeof value === "object" && value.type) {
@@ -477,14 +658,14 @@ async function generateThemeData(themePath, outputDir, themeId) {
     }
   } catch {
   }
-  const pagesDir = path8.join(themePath, "pages");
+  const pagesDir = path10.join(themePath, "pages");
   try {
-    const files = await fs7.readdir(pagesDir);
+    const files = await fs8.readdir(pagesDir);
     for (const file of files) {
       if (!file.match(/\.(ts|js)$/)) continue;
       const name = file.replace(/\.(ts|js)$/, "");
       try {
-        const mod = await jiti.import(path8.join(pagesDir, file));
+        const mod = await jiti.import(path10.join(pagesDir, file));
         const config = mod.default || mod;
         const sections = (config.sections || []).map((section) => {
           const schema = schemas[section.type];
@@ -512,8 +693,8 @@ async function generateThemeData(themePath, outputDir, themeId) {
     }
   } catch {
   }
-  await fs7.writeFile(
-    path8.join(outputDir, "theme-data.json"),
+  await fs8.writeFile(
+    path10.join(outputDir, "theme-data.json"),
     JSON.stringify(
       {
         themeId,
@@ -536,22 +717,22 @@ async function generateThemeData(themePath, outputDir, themeId) {
   logger.info(`Generated theme-data.json (${Object.keys(pages).length} pages)`);
 }
 async function contentHashEntry(outputDir) {
-  const entryPath = path8.join(outputDir, "bundle-entry.js");
-  const mapPath = path8.join(outputDir, "bundle-entry.js.map");
+  const entryPath = path10.join(outputDir, "bundle-entry.js");
+  const mapPath = path10.join(outputDir, "bundle-entry.js.map");
   let entryContent;
   try {
-    entryContent = await fs7.readFile(entryPath, "utf-8");
+    entryContent = await fs8.readFile(entryPath, "utf-8");
   } catch {
-    const indexPath = path8.join(outputDir, "index.js");
+    const indexPath = path10.join(outputDir, "index.js");
     try {
-      entryContent = await fs7.readFile(indexPath, "utf-8");
+      entryContent = await fs8.readFile(indexPath, "utf-8");
     } catch {
       logger.warning("No entry file found in output, skipping content hash");
       return;
     }
     const hash2 = crypto.createHash("sha256").update(entryContent).digest("hex").slice(0, 8);
     const hashedName2 = `bundle-entry-${hash2}.js`;
-    const indexMapPath = path8.join(outputDir, "index.js.map");
+    const indexMapPath = path10.join(outputDir, "index.js.map");
     const hashedMapName2 = `bundle-entry-${hash2}.js.map`;
     entryContent = entryContent.replace(
       /\/\/# sourceMappingURL=index\.js\.map/,
@@ -559,18 +740,18 @@ async function contentHashEntry(outputDir) {
     );
     const oldFiles2 = await glob("bundle-entry-*.js*", { cwd: outputDir });
     for (const f of oldFiles2) {
-      await fs7.unlink(path8.join(outputDir, f));
+      await fs8.unlink(path10.join(outputDir, f));
     }
-    await fs7.writeFile(path8.join(outputDir, hashedName2), entryContent);
-    await fs7.unlink(indexPath);
+    await fs8.writeFile(path10.join(outputDir, hashedName2), entryContent);
+    await fs8.unlink(indexPath);
     try {
-      await fs7.unlink(entryPath);
+      await fs8.unlink(entryPath);
     } catch {
     }
-    await fs7.writeFile(entryPath, entryContent);
+    await fs8.writeFile(entryPath, entryContent);
     try {
-      await fs7.access(indexMapPath);
-      await fs7.rename(indexMapPath, path8.join(outputDir, hashedMapName2));
+      await fs8.access(indexMapPath);
+      await fs8.rename(indexMapPath, path10.join(outputDir, hashedMapName2));
     } catch {
     }
     logger.info(`Entry hashed: ${hashedName2}`);
@@ -585,17 +766,17 @@ async function contentHashEntry(outputDir) {
   );
   const oldFiles = await glob("bundle-entry-*.js*", { cwd: outputDir });
   for (const f of oldFiles) {
-    await fs7.unlink(path8.join(outputDir, f));
+    await fs8.unlink(path10.join(outputDir, f));
   }
-  await fs7.writeFile(path8.join(outputDir, hashedName), entryContent);
+  await fs8.writeFile(path10.join(outputDir, hashedName), entryContent);
   try {
-    await fs7.unlink(entryPath);
+    await fs8.unlink(entryPath);
   } catch {
   }
-  await fs7.writeFile(entryPath, entryContent);
+  await fs8.writeFile(entryPath, entryContent);
   try {
-    await fs7.access(mapPath);
-    await fs7.rename(mapPath, path8.join(outputDir, hashedMapName));
+    await fs8.access(mapPath);
+    await fs8.rename(mapPath, path10.join(outputDir, hashedMapName));
   } catch {
   }
   logger.info(`Entry hashed: ${hashedName}`);
@@ -607,7 +788,7 @@ async function extractDataRequirements(themePath) {
   const requirements = {};
   for (const file of schemaFiles) {
     try {
-      const mod = await jiti.import(path8.join(themePath, file));
+      const mod = await jiti.import(path10.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") {
@@ -622,12 +803,46 @@ async function extractDataRequirements(themePath) {
   }
   return requirements;
 }
+async function writeGateManifests(themePath, outputDir) {
+  try {
+    const schemas = await extractSchemas(themePath);
+    await fs8.writeFile(
+      path10.join(outputDir, "schemas.json"),
+      serializeManifest(schemas)
+    );
+    logger.info(
+      `Generated schemas.json (${Object.keys(schemas.sections).length} sections)`
+    );
+  } catch (err) {
+    logger.warning(
+      `schemas.json not written: ${err instanceof Error ? err.message : String(err)}`
+    );
+  }
+  try {
+    const entries = await scanThemeAssets(outputDir);
+    const assets = entries.map((e) => ({
+      path: e.originalPath,
+      hash: e.hash,
+      size: e.size,
+      contentType: e.contentType
+    }));
+    await fs8.writeFile(
+      path10.join(outputDir, "asset-manifest.json"),
+      JSON.stringify({ manifestVersion: 1, assets }, null, 2)
+    );
+    logger.info(`Generated asset-manifest.json (${assets.length} assets)`);
+  } catch (err) {
+    logger.warning(
+      `asset-manifest.json not written: ${err instanceof Error ? err.message : String(err)}`
+    );
+  }
+}
 async function generateManifest(themeName, themePath, outputDir) {
   let version = "1.0.0";
   let themeId = themeName;
   try {
-    const pkgContent = await fs7.readFile(
-      path8.join(themePath, "package.json"),
+    const pkgContent = await fs8.readFile(
+      path10.join(themePath, "package.json"),
       "utf-8"
     );
     const pkg = JSON.parse(pkgContent);
@@ -645,7 +860,7 @@ async function generateManifest(themeName, themePath, outputDir) {
   const dataRequirements = await extractDataRequirements(themePath);
   let hasThemeConfig = false;
   try {
-    await fs7.access(path8.join(themePath, "theme.config.ts"));
+    await fs8.access(path10.join(themePath, "theme.config.ts"));
     hasThemeConfig = true;
   } catch {
   }
@@ -686,24 +901,24 @@ async function generateManifest(themeName, themePath, outputDir) {
     // Section data requirements for server-side prefetching (keyed by section type)
     dataRequirements
   };
-  await fs7.writeFile(
-    path8.join(outputDir, "manifest.json"),
+  await fs8.writeFile(
+    path10.join(outputDir, "manifest.json"),
     JSON.stringify(manifest, null, 2)
   );
 }
 async function compileStandaloneTheme(themePath, themeName) {
-  const outputDir = path8.join(themePath, "dist");
-  const bundleEntry = path8.join(themePath, "bundle-entry.ts");
-  const indexEntry = path8.join(themePath, "index.ts");
+  const outputDir = path10.join(themePath, "dist");
+  const bundleEntry = path10.join(themePath, "bundle-entry.ts");
+  const indexEntry = path10.join(themePath, "index.ts");
   let entryPoint = indexEntry;
   try {
-    await fs7.access(bundleEntry);
+    await fs8.access(bundleEntry);
     entryPoint = bundleEntry;
   } catch {
   }
-  const shimPath = path8.join(outputDir, ".process-shim.js");
-  await fs7.mkdir(outputDir, { recursive: true });
-  await fs7.writeFile(shimPath, PROCESS_SHIM);
+  const shimPath = path10.join(outputDir, ".process-shim.js");
+  await fs8.mkdir(outputDir, { recursive: true });
+  await fs8.writeFile(shimPath, PROCESS_SHIM);
   const buildOptions = {
     entryPoints: [entryPoint],
     bundle: true,
@@ -754,19 +969,20 @@ async function compileStandaloneTheme(themePath, themeName) {
   try {
     const result = await esbuild.build(buildOptions);
     try {
-      await fs7.unlink(shimPath);
+      await fs8.unlink(shimPath);
     } catch {
     }
     await contentHashEntry(outputDir);
-    const themeAssetsDir = path8.join(themePath, "assets");
-    const distThemeAssets = path8.join(outputDir, "theme-assets");
+    const themeAssetsDir = path10.join(themePath, "assets");
+    const distThemeAssets = path10.join(outputDir, "theme-assets");
     try {
-      await fs7.access(themeAssetsDir);
-      await fs7.cp(themeAssetsDir, distThemeAssets, { recursive: true });
+      await fs8.access(themeAssetsDir);
+      await fs8.cp(themeAssetsDir, distThemeAssets, { recursive: true });
       logger.info("Copied static assets to dist/theme-assets/");
     } catch {
     }
     await generateManifest(themeName, themePath, outputDir);
+    await writeGateManifests(themePath, outputDir);
     await generateThemeData(themePath, outputDir, themeName);
     await generateThemeCSS(themePath, outputDir);
     if (result.metafile) {
@@ -781,7 +997,7 @@ async function compileStandaloneTheme(themePath, themeName) {
     return true;
   } catch (error) {
     try {
-      await fs7.unlink(shimPath);
+      await fs8.unlink(shimPath);
     } catch {
     }
     logger.error(`esbuild compilation failed: ${error}`);
@@ -789,18 +1005,18 @@ async function compileStandaloneTheme(themePath, themeName) {
   }
 }
 async function compileStandaloneThemeDev(themePath, themeName) {
-  const outputDir = path8.join(themePath, "dist");
-  const bundleEntry = path8.join(themePath, "bundle-entry.ts");
-  const indexEntry = path8.join(themePath, "index.ts");
+  const outputDir = path10.join(themePath, "dist");
+  const bundleEntry = path10.join(themePath, "bundle-entry.ts");
+  const indexEntry = path10.join(themePath, "index.ts");
   let entryPoint = indexEntry;
   try {
-    await fs7.access(bundleEntry);
+    await fs8.access(bundleEntry);
     entryPoint = bundleEntry;
   } catch {
   }
-  const shimPath = path8.join(outputDir, ".process-shim.js");
-  await fs7.mkdir(outputDir, { recursive: true });
-  await fs7.writeFile(shimPath, PROCESS_SHIM);
+  const shimPath = path10.join(outputDir, ".process-shim.js");
+  await fs8.mkdir(outputDir, { recursive: true });
+  await fs8.writeFile(shimPath, PROCESS_SHIM);
   const buildOptions = {
     entryPoints: [entryPoint],
     bundle: true,
@@ -854,18 +1070,18 @@ async function compileStandaloneThemeDev(themePath, themeName) {
   return { context: context2, outputDir };
 }
 async function compilePreviewRuntime(themePath) {
-  const outputDir = path8.join(themePath, "dist");
-  await fs7.mkdir(outputDir, { recursive: true });
-  const outputPath = path8.join(outputDir, "preview-runtime.js");
+  const outputDir = path10.join(themePath, "dist");
+  await fs8.mkdir(outputDir, { recursive: true });
+  const outputPath = path10.join(outputDir, "preview-runtime.js");
   const locations = [
-    path8.join(__dirname, "..", "preview", "preview-app.tsx"),
-    path8.join(__dirname, "preview", "preview-app.tsx"),
-    path8.join(__dirname, "..", "..", "src", "preview", "preview-app.tsx")
+    path10.join(__dirname, "..", "preview", "preview-app.tsx"),
+    path10.join(__dirname, "preview", "preview-app.tsx"),
+    path10.join(__dirname, "..", "..", "src", "preview", "preview-app.tsx")
   ];
   let previewEntryPath = null;
   for (const loc of locations) {
     try {
-      await fs7.access(loc);
+      await fs8.access(loc);
       previewEntryPath = loc;
       break;
     } catch {
@@ -948,10 +1164,10 @@ ${locations.join("\n")}`
         if (!lucideScanned) {
           lucideScanned = true;
           const coreSrcCandidates = [
-            path8.join(themePath, "node_modules", "@onexapis", "core", "src"),
-            path8.join(themePath, "..", "..", "packages", "core", "src"),
+            path10.join(themePath, "node_modules", "@onexapis", "core", "src"),
+            path10.join(themePath, "..", "..", "packages", "core", "src"),
             // monorepo sibling
-            path8.join(
+            path10.join(
               __dirname,
               "..",
               "..",
@@ -966,7 +1182,7 @@ ${locations.join("\n")}`
           let coreSourceDir = null;
           for (const candidate of coreSrcCandidates) {
             try {
-              await fs7.access(candidate);
+              await fs8.access(candidate);
               coreSourceDir = candidate;
               break;
             } catch {
@@ -985,21 +1201,21 @@ ${locations.join("\n")}`
             }
           } else {
             const coreDistCandidates = [
-              path8.join(themePath, "node_modules", "@onexapis", "core", "dist")
+              path10.join(themePath, "node_modules", "@onexapis", "core", "dist")
             ];
             const resolvedDist = await resolveNodeModulesFile(
               __dirname,
-              path8.join("@onexapis", "core", "dist")
+              path10.join("@onexapis", "core", "dist")
             );
             if (resolvedDist) coreDistCandidates.push(resolvedDist);
             for (const candidate of coreDistCandidates) {
               try {
-                await fs7.access(candidate);
+                await fs8.access(candidate);
                 const mjsFiles = await glob("*.mjs", { cwd: candidate });
                 const importRegex = /import\s*\{([^}]+)\}\s*from\s*["']lucide-react["']/g;
                 for (const file of mjsFiles) {
-                  const content = await fs7.readFile(
-                    path8.join(candidate, file),
+                  const content = await fs8.readFile(
+                    path10.join(candidate, file),
                     "utf-8"
                   );
                   for (const match of content.matchAll(importRegex)) {
@@ -1054,7 +1270,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 = path8.join(pkgDir, "dist", "es", "index.mjs");
+          const esmEntry = path10.join(pkgDir, "dist", "es", "index.mjs");
           const { existsSync } = await import('fs');
           if (existsSync(esmEntry)) {
             return { path: esmEntry, namespace: "file" };
@@ -1153,8 +1369,8 @@ export function headers() { return new Headers(); }
       });
     }
   };
-  const shimPath = path8.join(outputDir, ".process-shim-preview.js");
-  await fs7.writeFile(shimPath, PROCESS_SHIM);
+  const shimPath = path10.join(outputDir, ".process-shim-preview.js");
+  await fs8.writeFile(shimPath, PROCESS_SHIM);
   await esbuild.build({
     entryPoints: [previewEntryPath],
     bundle: true,
@@ -1189,7 +1405,7 @@ export function headers() { return new Headers(); }
     }
   });
   try {
-    await fs7.unlink(shimPath);
+    await fs8.unlink(shimPath);
   } catch {
   }
   return outputPath;
@@ -1198,6 +1414,8 @@ var PROCESS_SHIM, reactGlobalPlugin, reactQueryGlobalPlugin;
 var init_compile_theme = __esm({
   "src/utils/compile-theme.ts"() {
     init_logger();
+    init_extract_schemas();
+    init_scan_theme_assets();
     PROCESS_SHIM = `
 if (typeof process === "undefined") {
   globalThis.process = {
@@ -1367,8 +1585,8 @@ function validateThemeName(name) {
   return /^[a-z][a-z0-9-]*$/.test(name);
 }
 function pathExists(filePath) {
-  const fs11 = __require("fs-extra");
-  return fs11.existsSync(filePath);
+  const fs12 = __require("fs-extra");
+  return fs12.existsSync(filePath);
 }
 function validateCategory(category) {
   const validCategories = [
@@ -1409,18 +1627,18 @@ async function renderTemplate(templatePath, data) {
   return ejs.render(template, data);
 }
 async function writeFile(filePath, content) {
-  await fs.ensureDir(path8.dirname(filePath));
+  await fs.ensureDir(path10.dirname(filePath));
   await fs.writeFile(filePath, content, "utf-8");
 }
 function getTemplatesDir() {
   const locations = [
-    path8.join(__dirname, "../../templates"),
+    path10.join(__dirname, "../../templates"),
     // Development
-    path8.join(__dirname, "../templates"),
+    path10.join(__dirname, "../templates"),
     // Production (dist/)
-    path8.join(process.cwd(), "templates"),
+    path10.join(process.cwd(), "templates"),
     // Fallback
-    path8.join(process.cwd(), "packages/cli/templates")
+    path10.join(process.cwd(), "packages/cli/templates")
     // Monorepo
   ];
   for (const location of locations) {
@@ -1432,7 +1650,7 @@ function getTemplatesDir() {
 }
 async function copyTemplate(templateName, targetDir, data) {
   const templatesDir = getTemplatesDir();
-  const templateDir = path8.join(templatesDir, templateName);
+  const templateDir = path10.join(templatesDir, templateName);
   if (!fs.existsSync(templateDir)) {
     throw new Error(
       `Template "${templateName}" not found at ${templateDir}. Available templates: ${fs.readdirSync(templatesDir).join(", ")}`
@@ -1441,8 +1659,8 @@ async function copyTemplate(templateName, targetDir, data) {
   await fs.ensureDir(targetDir);
   const files = await fs.readdir(templateDir);
   for (const file of files) {
-    const templatePath = path8.join(templateDir, file);
-    const targetPath = path8.join(targetDir, file);
+    const templatePath = path10.join(templateDir, file);
+    const targetPath = path10.join(targetDir, file);
     const stat = await fs.stat(templatePath);
     if (stat.isDirectory()) {
       await copyTemplateDir(templatePath, targetPath, data);
@@ -1459,8 +1677,8 @@ async function copyTemplateDir(templateDir, targetDir, data) {
   await fs.ensureDir(targetDir);
   const files = await fs.readdir(templateDir);
   for (const file of files) {
-    const templatePath = path8.join(templateDir, file);
-    const targetPath = path8.join(targetDir, file);
+    const templatePath = path10.join(templateDir, file);
+    const targetPath = path10.join(targetDir, file);
     const stat = await fs.stat(templatePath);
     if (stat.isDirectory()) {
       await copyTemplateDir(templatePath, targetPath, data);
@@ -1475,32 +1693,32 @@ async function copyTemplateDir(templateDir, targetDir, data) {
 }
 function getProjectRoot() {
   let currentDir = process.cwd();
-  while (currentDir !== path8.parse(currentDir).root) {
-    const packageJsonPath = path8.join(currentDir, "package.json");
+  while (currentDir !== path10.parse(currentDir).root) {
+    const packageJsonPath = path10.join(currentDir, "package.json");
     if (fs.existsSync(packageJsonPath)) {
       const packageJson = fs.readJsonSync(packageJsonPath);
-      if (packageJson.workspaces || fs.existsSync(path8.join(currentDir, "src/themes")) || fs.existsSync(path8.join(currentDir, "themes"))) {
+      if (packageJson.workspaces || fs.existsSync(path10.join(currentDir, "src/themes")) || fs.existsSync(path10.join(currentDir, "themes"))) {
         return currentDir;
       }
     }
-    currentDir = path8.dirname(currentDir);
+    currentDir = path10.dirname(currentDir);
   }
   return process.cwd();
 }
 function getThemesDir() {
   const root = getProjectRoot();
-  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);
+  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);
 }
 function getFeaturesDir() {
-  return path8.join(getProjectRoot(), "src/features");
+  return path10.join(getProjectRoot(), "src/features");
 }
 function isOneXProject() {
   const root = getProjectRoot();
-  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"));
+  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"));
 }
 function ensureOneXProject() {
   if (!isOneXProject()) {
@@ -1516,13 +1734,13 @@ function listThemes() {
     return [];
   }
   return fs.readdirSync(themesDir).filter((name) => {
-    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")));
+    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")));
   });
 }
 function themeExists(themeName) {
-  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")));
+  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")));
 }
 function detectPackageManager() {
   const userAgent = process.env.npm_config_user_agent || "";
@@ -1530,9 +1748,9 @@ function detectPackageManager() {
   if (userAgent.includes("yarn")) return "yarn";
   if (userAgent.includes("bun")) return "bun";
   const cwd = process.cwd();
-  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";
+  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";
   return "npm";
 }
 async function installDependencies(projectPath, packageManager = "npm") {
@@ -1549,22 +1767,45 @@ async function installDependencies(projectPath, packageManager = "npm") {
     }
   });
 }
-var AUTH_DIR = path8.join(os.homedir(), ".onexthm");
-var AUTH_FILE = path8.join(AUTH_DIR, "auth.json");
-function getApiUrl() {
-  return process.env.ONEXTHM_API_URL || "https://platform-dev.onexeos.com";
+var AUTH_DIR = path10.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`);
+  if (env === "dev") {
+    const legacyFile = path10.join(AUTH_DIR, "auth.json");
+    if (fs.existsSync(legacyFile) && !fs.existsSync(newFile)) {
+      try {
+        fs.moveSync(legacyFile, newFile);
+      } catch {
+        try {
+          fs.copySync(legacyFile, newFile);
+          fs.removeSync(legacyFile);
+        } catch {
+        }
+      }
+    }
+  }
+  return newFile;
+}
+function getApiUrl(env = "dev") {
+  return process.env.ONEXTHM_API_URL || ENV_URLS[env];
 }
-async function saveAuthTokens(tokens) {
+async function saveAuthTokens(tokens, env = "dev") {
   await fs.ensureDir(AUTH_DIR);
   const key = getMachineKey();
   const data = JSON.stringify(tokens);
   const encrypted = encrypt(data, key);
-  await fs.writeFile(AUTH_FILE, encrypted, "utf-8");
+  await fs.writeFile(getAuthFile(env), encrypted, "utf-8");
 }
-function loadAuthTokens() {
+function loadAuthTokens(env = "dev") {
   try {
-    if (!fs.existsSync(AUTH_FILE)) return null;
-    const encrypted = fs.readFileSync(AUTH_FILE, "utf-8");
+    const file = getAuthFile(env);
+    if (!fs.existsSync(file)) return null;
+    const encrypted = fs.readFileSync(file, "utf-8");
     const key = getMachineKey();
     const data = decrypt(encrypted, key);
     return JSON.parse(data);
@@ -1572,34 +1813,34 @@ function loadAuthTokens() {
     return null;
   }
 }
-async function clearAuthTokens() {
+async function clearAuthTokens(env = "dev") {
   try {
-    await fs.remove(AUTH_FILE);
+    await fs.remove(getAuthFile(env));
   } catch {
   }
 }
 function isTokenExpired(tokens) {
   return Date.now() / 1e3 > tokens.expiresAt - 300;
 }
-async function getValidTokens() {
-  const tokens = loadAuthTokens();
+async function getValidTokens(env = "dev") {
+  const tokens = loadAuthTokens(env);
   if (!tokens) return null;
   if (!isTokenExpired(tokens)) return tokens;
   try {
-    const apiUrl = getApiUrl();
+    const apiUrl = getApiUrl(env);
     const response = await fetch(`${apiUrl}/auth/refresh`, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify({ refresh_token: tokens.refreshToken })
     });
     if (!response.ok) {
-      await clearAuthTokens();
+      await clearAuthTokens(env);
       return null;
     }
     const data = await response.json();
     const body = data.statusCode ? data.body : data;
     if (!body.IdToken) {
-      await clearAuthTokens();
+      await clearAuthTokens(env);
       return null;
     }
     const refreshed = {
@@ -1608,17 +1849,19 @@ async function getValidTokens() {
       idToken: body.IdToken,
       expiresAt: Math.floor(Date.now() / 1e3) + (body.ExpiresIn || 3600)
     };
-    await saveAuthTokens(refreshed);
+    await saveAuthTokens(refreshed, env);
     return refreshed;
   } catch {
-    await clearAuthTokens();
+    await clearAuthTokens(env);
     return null;
   }
 }
-async function authenticatedFetch(url, init) {
-  const tokens = await getValidTokens();
+async function authenticatedFetch(url, init, env = "dev") {
+  const tokens = await getValidTokens(env);
   if (!tokens) {
-    throw new Error("Not logged in. Run: onexthm login");
+    throw new Error(
+      `Not logged in to ${env} environment. Run: onexthm login --env ${env}`
+    );
   }
   const headers = new Headers(init?.headers);
   headers.set("Authorization", `Bearer ${tokens.idToken}`);
@@ -1675,7 +1918,7 @@ async function initCommand(projectName, options = {}) {
           if (!validateThemeName(kebabName)) {
             return "Invalid project name. Use lowercase letters, numbers, and hyphens only.";
           }
-          if (fs3.existsSync(path8.join(process.cwd(), kebabName))) {
+          if (fs3.existsSync(path10.join(process.cwd(), kebabName))) {
             return `Directory "${kebabName}" already exists`;
           }
           return true;
@@ -1686,14 +1929,14 @@ async function initCommand(projectName, options = {}) {
   } else {
     name = toKebabCase(projectName);
   }
-  const projectPath = path8.join(process.cwd(), name);
+  const projectPath = path10.join(process.cwd(), name);
   if (fs3.existsSync(projectPath)) {
     logger.error(`Directory "${name}" already exists.`);
     process.exit(1);
   }
   if (!options.yes) {
     try {
-      const apiUrl = getApiUrl();
+      const apiUrl = getApiUrl(options.env ?? "dev");
       const controller = new AbortController();
       const timeout = setTimeout(() => controller.abort(), 3e3);
       const response = await fetch(
@@ -1802,7 +2045,7 @@ async function initCommand(projectName, options = {}) {
       description,
       author
     );
-    const mcpJsonPath = path8.join(projectPath, ".mcp.json");
+    const mcpJsonPath = path10.join(projectPath, ".mcp.json");
     if (fs3.existsSync(mcpJsonPath)) {
       let mcpContent = fs3.readFileSync(mcpJsonPath, "utf-8");
       if (figmaApiKey) {
@@ -1882,7 +2125,7 @@ async function initCommand(projectName, options = {}) {
   }
 }
 async function renameThemeInFiles(projectPath, themeName, displayName, description, author) {
-  const configPath = path8.join(projectPath, "theme.config.ts");
+  const configPath = path10.join(projectPath, "theme.config.ts");
   if (fs3.existsSync(configPath)) {
     let content = fs3.readFileSync(configPath, "utf-8");
     content = content.replace(
@@ -1895,7 +2138,7 @@ async function renameThemeInFiles(projectPath, themeName, displayName, descripti
     );
     fs3.writeFileSync(configPath, content, "utf-8");
   }
-  const pkgPath = path8.join(projectPath, "package.json");
+  const pkgPath = path10.join(projectPath, "package.json");
   if (fs3.existsSync(pkgPath)) {
     let content = fs3.readFileSync(pkgPath, "utf-8");
     content = content.replace(
@@ -1917,10 +2160,10 @@ async function createSectionCommand(name, options) {
   ensureOneXProject();
   if (!options.theme) {
     const isStandaloneTheme = ["theme.config.ts", "bundle-entry.ts"].some(
-      (f) => fs.existsSync(path8.join(process.cwd(), f))
+      (f) => fs.existsSync(path10.join(process.cwd(), f))
     );
     if (isStandaloneTheme) {
-      options.theme = path8.basename(process.cwd());
+      options.theme = path10.basename(process.cwd());
     }
   }
   const sectionName = toKebabCase(name);
@@ -1983,35 +2226,35 @@ async function createSectionCommand(name, options) {
   };
   logger.startSpinner("Creating section files...");
   try {
-    const themePath = path8.join(getThemesDir(), themeName);
-    const sectionPath = path8.join(themePath, "sections", sectionName);
+    const themePath = path10.join(getThemesDir(), themeName);
+    const sectionPath = path10.join(themePath, "sections", sectionName);
     const schemaContent = generateSectionSchema(data);
     await writeFile(
-      path8.join(sectionPath, `${sectionName}.schema.ts`),
+      path10.join(sectionPath, `${sectionName}.schema.ts`),
       schemaContent
     );
     if (createTemplate) {
       const templateContent = generateSectionTemplate(data);
       await writeFile(
-        path8.join(sectionPath, `${sectionName}-default.tsx`),
+        path10.join(sectionPath, `${sectionName}-default.tsx`),
         templateContent
       );
     }
     const indexContent = generateSectionIndex(data, createTemplate);
-    await writeFile(path8.join(sectionPath, "index.ts"), indexContent);
+    await writeFile(path10.join(sectionPath, "index.ts"), indexContent);
     logger.stopSpinner(true, "Section files created successfully!");
     logger.newLine();
     logger.section("Next steps:");
     logger.log(
-      `  1. Edit schema: ${path8.relative(process.cwd(), path8.join(sectionPath, `${sectionName}.schema.ts`))}`
+      `  1. Edit schema: ${path10.relative(process.cwd(), path10.join(sectionPath, `${sectionName}.schema.ts`))}`
     );
     if (createTemplate) {
       logger.log(
-        `  2. Edit template: ${path8.relative(process.cwd(), path8.join(sectionPath, `${sectionName}-default.tsx`))}`
+        `  2. Edit template: ${path10.relative(process.cwd(), path10.join(sectionPath, `${sectionName}-default.tsx`))}`
       );
     }
     logger.log(
-      `  3. Add to theme manifest: ${path8.relative(process.cwd(), path8.join(themePath, "manifest.ts"))}`
+      `  3. Add to theme manifest: ${path10.relative(process.cwd(), path10.join(themePath, "manifest.ts"))}`
     );
     logger.newLine();
     logger.success("Section created successfully!");
@@ -2159,10 +2402,10 @@ async function createBlockCommand(name, options) {
   ensureOneXProject();
   if (!options.theme) {
     const isStandaloneTheme = ["theme.config.ts", "bundle-entry.ts"].some(
-      (f) => fs.existsSync(path8.join(process.cwd(), f))
+      (f) => fs.existsSync(path10.join(process.cwd(), f))
     );
     if (isStandaloneTheme) {
-      options.theme = path8.basename(process.cwd());
+      options.theme = path10.basename(process.cwd());
     }
   }
   const blockName = toKebabCase(name);
@@ -2237,24 +2480,24 @@ async function createBlockCommand(name, options) {
   };
   logger.startSpinner("Creating block files...");
   try {
-    const blockPath = scope === "shared" ? path8.join(getFeaturesDir(), "blocks", blockName) : path8.join(getThemesDir(), themeName, "blocks", blockName);
+    const blockPath = scope === "shared" ? path10.join(getFeaturesDir(), "blocks", blockName) : path10.join(getThemesDir(), themeName, "blocks", blockName);
     const schemaContent = generateBlockSchema(data);
     await writeFile(
-      path8.join(blockPath, `${blockName}.schema.ts`),
+      path10.join(blockPath, `${blockName}.schema.ts`),
       schemaContent
     );
     const componentContent = generateBlockComponent(data);
-    await writeFile(path8.join(blockPath, `${blockName}.tsx`), componentContent);
+    await writeFile(path10.join(blockPath, `${blockName}.tsx`), componentContent);
     const indexContent = generateBlockIndex(data);
-    await writeFile(path8.join(blockPath, "index.ts"), indexContent);
+    await writeFile(path10.join(blockPath, "index.ts"), indexContent);
     logger.stopSpinner(true, "Block files created successfully!");
     logger.newLine();
     logger.section("Next steps:");
     logger.log(
-      `  1. Edit schema: ${path8.relative(process.cwd(), path8.join(blockPath, `${blockName}.schema.ts`))}`
+      `  1. Edit schema: ${path10.relative(process.cwd(), path10.join(blockPath, `${blockName}.schema.ts`))}`
     );
     logger.log(
-      `  2. Edit component: ${path8.relative(process.cwd(), path8.join(blockPath, `${blockName}.tsx`))}`
+      `  2. Edit component: ${path10.relative(process.cwd(), path10.join(blockPath, `${blockName}.tsx`))}`
     );
     logger.log(
       `  3. Register in block registry: src/lib/registry/block-registry.ts`
@@ -2432,31 +2675,31 @@ async function createComponentCommand(name, options) {
   };
   logger.startSpinner("Creating component files...");
   try {
-    const componentPath = path8.join(
+    const componentPath = path10.join(
       getFeaturesDir(),
       "components",
       componentName
     );
     const schemaContent = generateComponentSchema(data);
     await writeFile(
-      path8.join(componentPath, `${componentName}.schema.ts`),
+      path10.join(componentPath, `${componentName}.schema.ts`),
       schemaContent
     );
     const componentContent = generateComponent(data);
     await writeFile(
-      path8.join(componentPath, `${componentName}.tsx`),
+      path10.join(componentPath, `${componentName}.tsx`),
       componentContent
     );
     const indexContent = generateComponentIndex(data);
-    await writeFile(path8.join(componentPath, "index.ts"), indexContent);
+    await writeFile(path10.join(componentPath, "index.ts"), indexContent);
     logger.stopSpinner(true, "Component files created successfully!");
     logger.newLine();
     logger.section("Next steps:");
     logger.log(
-      `  1. Edit schema: ${path8.relative(process.cwd(), path8.join(componentPath, `${componentName}.schema.ts`))}`
+      `  1. Edit schema: ${path10.relative(process.cwd(), path10.join(componentPath, `${componentName}.schema.ts`))}`
     );
     logger.log(
-      `  2. Edit component: ${path8.relative(process.cwd(), path8.join(componentPath, `${componentName}.tsx`))}`
+      `  2. Edit component: ${path10.relative(process.cwd(), path10.join(componentPath, `${componentName}.tsx`))}`
     );
     logger.log(
       `  3. Register in component registry: src/lib/registry/component-registry.ts`
@@ -2613,13 +2856,13 @@ async function listSections(themeFilter) {
     return;
   }
   for (const theme of themes) {
-    const sectionsDir = path8.join(getThemesDir(), theme, "sections");
+    const sectionsDir = path10.join(getThemesDir(), theme, "sections");
     if (!fs.existsSync(sectionsDir)) {
       continue;
     }
     const sections = fs.readdirSync(sectionsDir).filter((name) => {
-      const sectionPath = path8.join(sectionsDir, name);
-      return fs.statSync(sectionPath).isDirectory() && fs.existsSync(path8.join(sectionPath, "index.ts"));
+      const sectionPath = path10.join(sectionsDir, name);
+      return fs.statSync(sectionPath).isDirectory() && fs.existsSync(path10.join(sectionPath, "index.ts"));
     });
     if (sections.length > 0) {
       logger.log(chalk4.cyan(`
@@ -2633,11 +2876,11 @@ async function listSections(themeFilter) {
 }
 async function listBlocks(themeFilter) {
   logger.section("\u{1F9F1} Blocks");
-  const sharedBlocksDir = path8.join(getFeaturesDir(), "blocks");
+  const sharedBlocksDir = path10.join(getFeaturesDir(), "blocks");
   if (fs.existsSync(sharedBlocksDir)) {
     const sharedBlocks = fs.readdirSync(sharedBlocksDir).filter((name) => {
-      const blockPath = path8.join(sharedBlocksDir, name);
-      return fs.statSync(blockPath).isDirectory() && fs.existsSync(path8.join(blockPath, "index.ts"));
+      const blockPath = path10.join(sharedBlocksDir, name);
+      return fs.statSync(blockPath).isDirectory() && fs.existsSync(path10.join(blockPath, "index.ts"));
     });
     if (sharedBlocks.length > 0) {
       logger.log(chalk4.cyan("\n  Shared:"));
@@ -2648,13 +2891,13 @@ async function listBlocks(themeFilter) {
   }
   const themes = themeFilter ? [themeFilter] : listThemes();
   for (const theme of themes) {
-    const blocksDir = path8.join(getThemesDir(), theme, "blocks");
+    const blocksDir = path10.join(getThemesDir(), theme, "blocks");
     if (!fs.existsSync(blocksDir)) {
       continue;
     }
     const blocks = fs.readdirSync(blocksDir).filter((name) => {
-      const blockPath = path8.join(blocksDir, name);
-      return fs.statSync(blockPath).isDirectory() && fs.existsSync(path8.join(blockPath, "index.ts"));
+      const blockPath = path10.join(blocksDir, name);
+      return fs.statSync(blockPath).isDirectory() && fs.existsSync(path10.join(blockPath, "index.ts"));
     });
     if (blocks.length > 0) {
       logger.log(chalk4.cyan(`
@@ -2668,14 +2911,14 @@ async function listBlocks(themeFilter) {
 }
 async function listComponents() {
   logger.section("\u2699\uFE0F  Components");
-  const componentsDir = path8.join(getFeaturesDir(), "components");
+  const componentsDir = path10.join(getFeaturesDir(), "components");
   if (!fs.existsSync(componentsDir)) {
     logger.warning("No components directory found");
     return;
   }
   const components = fs.readdirSync(componentsDir).filter((name) => {
-    const componentPath = path8.join(componentsDir, name);
-    return fs.statSync(componentPath).isDirectory() && fs.existsSync(path8.join(componentPath, "index.ts"));
+    const componentPath = path10.join(componentsDir, name);
+    return fs.statSync(componentPath).isDirectory() && fs.existsSync(path10.join(componentPath, "index.ts"));
   });
   if (components.length === 0) {
     logger.warning("No components found");
@@ -2696,11 +2939,11 @@ async function listThemesInfo() {
   }
   logger.log("");
   for (const theme of themes) {
-    const themeDir = path8.join(getThemesDir(), theme);
+    const themeDir = path10.join(getThemesDir(), theme);
     const candidates = ["theme.config.ts", "bundle-entry.ts", "manifest.ts"];
     let manifestContent = "";
     for (const candidate of candidates) {
-      const candidatePath = path8.join(themeDir, candidate);
+      const candidatePath = path10.join(themeDir, candidate);
       if (fs.existsSync(candidatePath)) {
         manifestContent = fs.readFileSync(candidatePath, "utf-8");
         break;
@@ -2729,14 +2972,14 @@ async function buildCommand(options) {
   if (options.theme) {
     themeName = options.theme;
     try {
-      const workspaceThemePath = path8.join(getThemesDir(), themeName);
+      const workspaceThemePath = path10.join(getThemesDir(), themeName);
       if (fs.existsSync(workspaceThemePath)) {
         themePath = workspaceThemePath;
       } else {
-        themePath = path8.join(process.cwd(), themeName);
+        themePath = path10.join(process.cwd(), themeName);
       }
     } catch {
-      themePath = path8.join(process.cwd(), themeName);
+      themePath = path10.join(process.cwd(), themeName);
     }
     if (!fs.existsSync(themePath)) {
       logger.error(`Theme "${themeName}" not found.`);
@@ -2747,10 +2990,10 @@ async function buildCommand(options) {
       "theme.config.ts",
       "bundle-entry.ts",
       "manifest.ts"
-    ].some((f) => fs.existsSync(path8.join(process.cwd(), f)));
+    ].some((f) => fs.existsSync(path10.join(process.cwd(), f)));
     if (isThemeDir) {
       themePath = process.cwd();
-      themeName = path8.basename(themePath);
+      themeName = path10.basename(themePath);
       logger.info(`Building current theme: ${themeName}`);
     } else {
       logger.error(
@@ -2759,7 +3002,7 @@ async function buildCommand(options) {
       process.exit(1);
     }
   }
-  const packageJsonPath = path8.join(themePath, "package.json");
+  const packageJsonPath = path10.join(themePath, "package.json");
   const hasPkgJson = fs.existsSync(packageJsonPath);
   if (!hasPkgJson) {
     logger.warning(
@@ -2815,9 +3058,9 @@ async function buildCommand(options) {
     logger.success("\u2713 Theme built successfully!");
     logger.newLine();
     logger.info(`Theme: ${themeName}`);
-    const distPath = path8.join(themePath, "dist");
+    const distPath = path10.join(themePath, "dist");
     if (fs.existsSync(distPath)) {
-      logger.log(`Output: ${path8.relative(process.cwd(), distPath)}`);
+      logger.log(`Output: ${path10.relative(process.cwd(), distPath)}`);
       const files = fs.readdirSync(distPath);
       logger.log(`Files: ${files.length}`);
     }
@@ -2958,8 +3201,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 = path8.join(outputDir, entryFile);
-    const stablePath = path8.join(outputDir, "bundle-entry.js");
+    const hashedPath = path10.join(outputDir, entryFile);
+    const stablePath = path10.join(outputDir, "bundle-entry.js");
     if (await fs.pathExists(hashedPath)) {
       await fs.copy(hashedPath, stablePath);
       const mapPath = hashedPath + ".map";
@@ -2968,13 +3211,13 @@ async function createCompatibilityFiles(outputDir, manifest) {
       }
     }
   }
-  const sectionsRegistryPath = path8.join(outputDir, "sections-registry.js");
+  const sectionsRegistryPath = path10.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 = path8.join(outputDir, "package.json");
+  const pkgJsonPath = path10.join(outputDir, "package.json");
   await fs.writeFile(pkgJsonPath, '{\n  "type": "module"\n}\n', "utf-8");
 }
 function showDownloadFailureHelp(themeId, apiUrl) {
@@ -3005,9 +3248,7 @@ function showDownloadFailureHelp(themeId, apiUrl) {
   console.log();
   console.log(chalk4.white("2. Check API URL configuration:"));
   console.log(chalk4.gray(`   Current API URL: ${apiUrl}`));
-  console.log(
-    chalk4.gray("   Override with NEXT_PUBLIC_API_URL or ONEXTHM_API_URL")
-  );
+  console.log(chalk4.gray("   Override with ONEXTHM_API_URL env var if needed"));
   console.log();
   console.log(chalk4.white("3. Pin a specific version (CI/production):"));
   console.log(
@@ -3017,15 +3258,17 @@ function showDownloadFailureHelp(themeId, apiUrl) {
 }
 async function downloadCommand(options) {
   logger.header("Download Theme");
+  const env = options.env ?? "dev";
+  const apiUrl = getApiUrl(env);
+  logger.info(`Environment: ${env}  (${apiUrl})`);
   const spinner = ora("Initializing download...").start();
-  if (options.bucket || options.environment) {
+  if (options.bucket) {
     spinner.stop();
     logger.warning(
-      "--bucket and --environment are deprecated and ignored. Themes are now served via HTTP from the website-api Lambda."
+      "--bucket is deprecated and ignored. Themes are now served via HTTP from the website-api Lambda."
     );
     spinner.start();
   }
-  const apiUrl = getApiUrl();
   try {
     const themeId = options.themeId || process.env.NEXT_PUBLIC_THEME_ID || process.env.THEME_ID;
     const requestedVersion = options.version || process.env.THEME_VERSION || "latest";
@@ -3073,7 +3316,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 = path8.join(outputDir, "manifest.json");
+    const manifestPath = path10.join(outputDir, "manifest.json");
     const manifest = await fs.readJson(manifestPath);
     await createCompatibilityFiles(outputDir, manifest);
     console.log();
@@ -3082,6 +3325,7 @@ async function downloadCommand(options) {
     console.log(
       chalk4.cyan("   Theme:   ") + chalk4.white(`${themeId}@${resolvedVersion}`)
     );
+    console.log(chalk4.cyan("   Env:     ") + chalk4.white(env));
     console.log(chalk4.cyan("   Source:  ") + chalk4.white(apiUrl));
     console.log(chalk4.cyan("   Output:  ") + chalk4.white(outputDir));
     console.log(chalk4.cyan("   Files:   ") + chalk4.white(entries.length));
@@ -3124,11 +3368,9 @@ async function resolveLatestVersion2(apiUrl, themeId) {
   }
   return latest;
 }
-async function fetchSourceZip(apiUrl, themeId, version) {
+async function fetchSourceZip(apiUrl, themeId, version, env) {
   const url = `${apiUrl}/website-api/themes/${encodeURIComponent(themeId)}/source?version=${encodeURIComponent(version)}`;
-  const response = await authenticatedFetch(url, {
-    method: "GET"
-  });
+  const response = await authenticatedFetch(url, { method: "GET" }, env);
   if (!response.ok) {
     if (response.status === 404) {
       throw new Error(
@@ -3137,7 +3379,7 @@ async function fetchSourceZip(apiUrl, themeId, version) {
     }
     if (response.status === 401 || response.status === 403) {
       throw new Error(
-        `Not authorized to download source for "${themeId}". Run \`onexthm login\` first.`
+        `Not authorized to download source for "${themeId}". Run \`onexthm login --env ${env}\` first.`
       );
     }
     throw new Error(
@@ -3195,7 +3437,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 = path8.join(themeDir, "package.json");
+  const pkgPath = path10.join(themeDir, "package.json");
   if (await fs.pathExists(pkgPath)) {
     const pkg = await fs.readJson(pkgPath);
     pkg.name = `@onex-themes/${newName}`;
@@ -3211,7 +3453,7 @@ async function renameTheme(themeDir, oldName, newName) {
     }
     await fs.writeJson(pkgPath, pkg, { spaces: 2 });
   }
-  const configPath = path8.join(themeDir, "theme.config.ts");
+  const configPath = path10.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}"`);
@@ -3221,7 +3463,7 @@ async function renameTheme(themeDir, oldName, newName) {
     );
     await fs.writeFile(configPath, content);
   }
-  const layoutPath = path8.join(themeDir, "theme.layout.ts");
+  const layoutPath = path10.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}"`);
@@ -3234,7 +3476,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 = path8.join(themeDir, file);
+    const filePath = path10.join(themeDir, file);
     let content = await fs.readFile(filePath, "utf-8");
     const original = content;
     content = content.replace(
@@ -3256,14 +3498,19 @@ async function renameTheme(themeDir, oldName, newName) {
 }
 async function cloneCommand(themeName, options) {
   logger.header("Clone Theme Source");
-  if (options.bucket || options.environment) {
+  const env = options.env ?? "dev";
+  const apiUrl = getApiUrl(env);
+  logger.info(`Environment: ${env}  (${apiUrl})`);
+  if (options.bucket) {
     logger.warning(
-      "--bucket and --environment are deprecated and ignored. Source is now fetched via HTTP from the website-api Lambda."
+      "--bucket is deprecated and ignored. Source is now fetched via HTTP from the website-api Lambda."
     );
   }
-  const tokens = await getValidTokens();
+  const tokens = await getValidTokens(env);
   if (!tokens) {
-    logger.error("Not logged in. Run: onexthm login");
+    logger.error(
+      `Not logged in to ${env} environment. Run: onexthm login --env ${env}`
+    );
     process.exit(1);
   }
   let newName = options.name;
@@ -3272,8 +3519,7 @@ async function cloneCommand(themeName, options) {
   }
   const spinner = ora("Initializing clone...").start();
   try {
-    const apiUrl = getApiUrl();
-    const outputDir = options.output || path8.resolve(process.cwd(), newName);
+    const outputDir = options.output || path10.resolve(process.cwd(), newName);
     if (await fs.pathExists(outputDir)) {
       spinner.fail(chalk4.red(`Directory already exists: ${outputDir}`));
       logger.info(
@@ -3292,7 +3538,7 @@ async function cloneCommand(themeName, options) {
     spinner.start(`Downloading source.zip for ${themeName}@${version}...`);
     let zipBuffer;
     try {
-      zipBuffer = await fetchSourceZip(apiUrl, themeName, version);
+      zipBuffer = await fetchSourceZip(apiUrl, themeName, version, env);
     } catch (error) {
       spinner.fail(chalk4.red(error.message));
       console.log();
@@ -3319,20 +3565,20 @@ async function cloneCommand(themeName, options) {
     spinner.succeed(
       `Renamed theme: ${chalk4.gray(themeName)} \u2192 ${chalk4.cyan(newName)}`
     );
-    const envExamplePath = path8.join(outputDir, ".env.example");
+    const envExamplePath = path10.join(outputDir, ".env.example");
     if (!await fs.pathExists(envExamplePath)) {
       await fs.writeFile(
         envExamplePath,
         [
           "# API Configuration (enables real data in preview)",
           "# Get your Company ID from the OneX dashboard",
-          "NEXT_PUBLIC_API_URL=https://platform-dev.onexeos.com",
+          `NEXT_PUBLIC_API_URL=${apiUrl}`,
           "NEXT_PUBLIC_COMPANY_ID=",
           ""
         ].join("\n")
       );
     }
-    const mcpJsonPath = path8.join(outputDir, ".mcp.json");
+    const mcpJsonPath = path10.join(outputDir, ".mcp.json");
     if (await fs.pathExists(mcpJsonPath)) {
       const { default: inquirerMod } = await import('inquirer');
       const { figmaApiKey } = await inquirerMod.prompt([
@@ -3357,7 +3603,7 @@ async function cloneCommand(themeName, options) {
     }
     if (options.install !== false) {
       const hasPkgJson = await fs.pathExists(
-        path8.join(outputDir, "package.json")
+        path10.join(outputDir, "package.json")
       );
       if (hasPkgJson) {
         spinner.start("Installing dependencies...");
@@ -3379,12 +3625,13 @@ async function cloneCommand(themeName, options) {
     console.log(
       chalk4.cyan("   Source:   ") + chalk4.gray(`${themeName}@${version}`)
     );
+    console.log(chalk4.cyan("   Env:      ") + chalk4.white(env));
     console.log(chalk4.cyan("   Theme:    ") + chalk4.white(newName));
     console.log(chalk4.cyan("   Location: ") + chalk4.white(outputDir));
     console.log(chalk4.cyan("   Files:    ") + chalk4.white(entries.length));
     console.log();
     console.log(chalk4.cyan("Next steps:"));
-    console.log(chalk4.gray(`   cd ${path8.relative(process.cwd(), outputDir)}`));
+    console.log(chalk4.gray(`   cd ${path10.relative(process.cwd(), outputDir)}`));
     console.log(
       chalk4.gray("   cp .env.example .env  # then add your Company ID")
     );