@onexapis/cli 1.1.3 → 1.1.5

package/dist/cli.mjs

@@ -2,7 +2,7 @@
 import chalk4 from 'chalk';
 import ora from 'ora';
 import * as esbuild from 'esbuild';
-import path from 'path';
+import path8 from 'path';
 import fs7 from 'fs/promises';
 import crypto from 'crypto';
 import { glob } from 'glob';
@@ -100,12 +100,12 @@ __export(compile_theme_exports, {
 async function resolveNodeModulesFile(startDir, relativePath) {
   let dir = startDir;
   while (true) {
-    const candidate = path.join(dir, "node_modules", relativePath);
+    const candidate = path8.join(dir, "node_modules", relativePath);
     try {
       await fs7.access(candidate);
       return candidate;
     } catch {
-      const parent = path.dirname(dir);
+      const parent = path8.dirname(dir);
       if (parent === dir) break;
       dir = parent;
     }
@@ -131,10 +131,16 @@ function createCoreGlobalPlugin(themePath) {
           namedExports = exportsBySubpath[cacheKey];
         } else {
           const distFileName = subpath ? `${subpath}.mjs` : "index.mjs";
-          const distPath = await resolveNodeModulesFile(
+          let distPath = await resolveNodeModulesFile(
             themePath,
-            path.join("@onexapis", "core", "dist", distFileName)
+            path8.join("@onexapis", "core", "dist", distFileName)
           );
+          if (!distPath) {
+            distPath = await resolveNodeModulesFile(
+              __dirname,
+              path8.join("@onexapis", "core", "dist", distFileName)
+            );
+          }
           try {
             if (!distPath) throw new Error("not found");
             const distContent = await fs7.readFile(distPath, "utf-8");
@@ -187,7 +193,7 @@ async function generateThemeData(themePath, outputDir, themeId) {
   const pages = {};
   for (const ext of [".ts", ".js"]) {
     try {
-      const mod = await jiti.import(path.join(themePath, `theme.config${ext}`));
+      const mod = await jiti.import(path8.join(themePath, `theme.config${ext}`));
       themeConfig = mod.default || mod;
       break;
     } catch {
@@ -195,20 +201,20 @@ async function generateThemeData(themePath, outputDir, themeId) {
   }
   for (const ext of [".ts", ".js"]) {
     try {
-      const mod = await jiti.import(path.join(themePath, `theme.layout${ext}`));
+      const mod = await jiti.import(path8.join(themePath, `theme.layout${ext}`));
       layoutConfig = mod.default || mod;
       break;
     } catch {
     }
   }
-  const pagesDir = path.join(themePath, "pages");
+  const pagesDir = path8.join(themePath, "pages");
   try {
     const files = await fs7.readdir(pagesDir);
     for (const file of files) {
       if (!file.match(/\.(ts|js)$/)) continue;
       const name = file.replace(/\.(ts|js)$/, "");
       try {
-        const mod = await jiti.import(path.join(pagesDir, file));
+        const mod = await jiti.import(path8.join(pagesDir, file));
         const config = mod.default || mod;
         pages[name] = {
           id: name,
@@ -224,7 +230,7 @@ async function generateThemeData(themePath, outputDir, themeId) {
   } catch {
   }
   await fs7.writeFile(
-    path.join(outputDir, "theme-data.json"),
+    path8.join(outputDir, "theme-data.json"),
     JSON.stringify(
       {
         themeId,
@@ -247,17 +253,17 @@ async function generateThemeData(themePath, outputDir, themeId) {
   logger.info(`Generated theme-data.json (${Object.keys(pages).length} pages)`);
 }
 async function contentHashEntry(outputDir) {
-  const entryPath = path.join(outputDir, "bundle-entry.js");
-  const mapPath = path.join(outputDir, "bundle-entry.js.map");
+  const entryPath = path8.join(outputDir, "bundle-entry.js");
+  const mapPath = path8.join(outputDir, "bundle-entry.js.map");
   const oldFiles = await glob("bundle-entry-*.js*", { cwd: outputDir });
   for (const f of oldFiles) {
-    await fs7.unlink(path.join(outputDir, f));
+    await fs7.unlink(path8.join(outputDir, f));
   }
   let entryContent;
   try {
     entryContent = await fs7.readFile(entryPath, "utf-8");
   } catch {
-    const indexPath = path.join(outputDir, "index.js");
+    const indexPath = path8.join(outputDir, "index.js");
     try {
       entryContent = await fs7.readFile(indexPath, "utf-8");
     } catch {
@@ -266,17 +272,17 @@ async function contentHashEntry(outputDir) {
     }
     const hash2 = crypto.createHash("sha256").update(entryContent).digest("hex").slice(0, 8);
     const hashedName2 = `bundle-entry-${hash2}.js`;
-    const indexMapPath = path.join(outputDir, "index.js.map");
+    const indexMapPath = path8.join(outputDir, "index.js.map");
     const hashedMapName2 = `bundle-entry-${hash2}.js.map`;
     entryContent = entryContent.replace(
       /\/\/# sourceMappingURL=index\.js\.map/,
       `//# sourceMappingURL=${hashedMapName2}`
     );
-    await fs7.writeFile(path.join(outputDir, hashedName2), entryContent);
+    await fs7.writeFile(path8.join(outputDir, hashedName2), entryContent);
     await fs7.unlink(indexPath);
     try {
       await fs7.access(indexMapPath);
-      await fs7.rename(indexMapPath, path.join(outputDir, hashedMapName2));
+      await fs7.rename(indexMapPath, path8.join(outputDir, hashedMapName2));
     } catch {
     }
     logger.info(`Entry hashed: ${hashedName2}`);
@@ -289,11 +295,11 @@ async function contentHashEntry(outputDir) {
     /\/\/# sourceMappingURL=bundle-entry\.js\.map/,
     `//# sourceMappingURL=${hashedMapName}`
   );
-  await fs7.writeFile(path.join(outputDir, hashedName), entryContent);
+  await fs7.writeFile(path8.join(outputDir, hashedName), entryContent);
   await fs7.unlink(entryPath);
   try {
     await fs7.access(mapPath);
-    await fs7.rename(mapPath, path.join(outputDir, hashedMapName));
+    await fs7.rename(mapPath, path8.join(outputDir, hashedMapName));
   } catch {
   }
   logger.info(`Entry hashed: ${hashedName}`);
@@ -305,7 +311,7 @@ async function extractDataRequirements(themePath) {
   const requirements = {};
   for (const file of schemaFiles) {
     try {
-      const mod = await jiti.import(path.join(themePath, file));
+      const mod = await jiti.import(path8.join(themePath, file));
       const exports$1 = mod;
       for (const value of Object.values(exports$1)) {
         if (value && typeof value === "object" && typeof value.type === "string" && value.dataRequirements && typeof value.dataRequirements === "object") {
@@ -325,7 +331,7 @@ async function generateManifest2(themeName, themePath, outputDir) {
   let themeId = themeName;
   try {
     const pkgContent = await fs7.readFile(
-      path.join(themePath, "package.json"),
+      path8.join(themePath, "package.json"),
       "utf-8"
     );
     const pkg = JSON.parse(pkgContent);
@@ -343,7 +349,7 @@ async function generateManifest2(themeName, themePath, outputDir) {
   const dataRequirements = await extractDataRequirements(themePath);
   let hasThemeConfig = false;
   try {
-    await fs7.access(path.join(themePath, "theme.config.ts"));
+    await fs7.access(path8.join(themePath, "theme.config.ts"));
     hasThemeConfig = true;
   } catch {
   }
@@ -385,21 +391,21 @@ async function generateManifest2(themeName, themePath, outputDir) {
     dataRequirements
   };
   await fs7.writeFile(
-    path.join(outputDir, "manifest.json"),
+    path8.join(outputDir, "manifest.json"),
     JSON.stringify(manifest, null, 2)
   );
 }
 async function compileStandaloneTheme(themePath, themeName) {
-  const outputDir = path.join(themePath, "dist");
-  const bundleEntry = path.join(themePath, "bundle-entry.ts");
-  const indexEntry = path.join(themePath, "index.ts");
+  const outputDir = path8.join(themePath, "dist");
+  const bundleEntry = path8.join(themePath, "bundle-entry.ts");
+  const indexEntry = path8.join(themePath, "index.ts");
   let entryPoint = indexEntry;
   try {
     await fs7.access(bundleEntry);
     entryPoint = bundleEntry;
   } catch {
   }
-  const shimPath = path.join(outputDir, ".process-shim.js");
+  const shimPath = path8.join(outputDir, ".process-shim.js");
   await fs7.mkdir(outputDir, { recursive: true });
   await fs7.writeFile(shimPath, PROCESS_SHIM);
   const buildOptions = {
@@ -473,16 +479,16 @@ async function compileStandaloneTheme(themePath, themeName) {
   }
 }
 async function compileStandaloneThemeDev(themePath, themeName) {
-  const outputDir = path.join(themePath, "dist");
-  const bundleEntry = path.join(themePath, "bundle-entry.ts");
-  const indexEntry = path.join(themePath, "index.ts");
+  const outputDir = path8.join(themePath, "dist");
+  const bundleEntry = path8.join(themePath, "bundle-entry.ts");
+  const indexEntry = path8.join(themePath, "index.ts");
   let entryPoint = indexEntry;
   try {
     await fs7.access(bundleEntry);
     entryPoint = bundleEntry;
   } catch {
   }
-  const shimPath = path.join(outputDir, ".process-shim.js");
+  const shimPath = path8.join(outputDir, ".process-shim.js");
   await fs7.mkdir(outputDir, { recursive: true });
   await fs7.writeFile(shimPath, PROCESS_SHIM);
   const buildOptions = {
@@ -533,13 +539,13 @@ async function compileStandaloneThemeDev(themePath, themeName) {
   return { context: context2, outputDir };
 }
 async function compilePreviewRuntime(themePath) {
-  const outputDir = path.join(themePath, "dist");
+  const outputDir = path8.join(themePath, "dist");
   await fs7.mkdir(outputDir, { recursive: true });
-  const outputPath = path.join(outputDir, "preview-runtime.js");
+  const outputPath = path8.join(outputDir, "preview-runtime.js");
   const locations = [
-    path.join(__dirname, "..", "preview", "preview-app.tsx"),
-    path.join(__dirname, "preview", "preview-app.tsx"),
-    path.join(__dirname, "..", "..", "src", "preview", "preview-app.tsx")
+    path8.join(__dirname, "..", "preview", "preview-app.tsx"),
+    path8.join(__dirname, "preview", "preview-app.tsx"),
+    path8.join(__dirname, "..", "..", "src", "preview", "preview-app.tsx")
   ];
   let previewEntryPath = null;
   for (const loc of locations) {
@@ -714,7 +720,7 @@ export function headers() { return new Headers(); }
       });
     }
   };
-  const shimPath = path.join(outputDir, ".process-shim-preview.js");
+  const shimPath = path8.join(outputDir, ".process-shim-preview.js");
   await fs7.writeFile(shimPath, PROCESS_SHIM);
   await esbuild.build({
     entryPoints: [previewEntryPath],
@@ -883,18 +889,18 @@ async function renderTemplate(templatePath, data) {
   return ejs.render(template, data);
 }
 async function writeFile(filePath, content) {
-  await fs.ensureDir(path.dirname(filePath));
+  await fs.ensureDir(path8.dirname(filePath));
   await fs.writeFile(filePath, content, "utf-8");
 }
 function getTemplatesDir() {
   const locations = [
-    path.join(__dirname, "../../templates"),
+    path8.join(__dirname, "../../templates"),
     // Development
-    path.join(__dirname, "../templates"),
+    path8.join(__dirname, "../templates"),
     // Production (dist/)
-    path.join(process.cwd(), "templates"),
+    path8.join(process.cwd(), "templates"),
     // Fallback
-    path.join(process.cwd(), "packages/cli/templates")
+    path8.join(process.cwd(), "packages/cli/templates")
     // Monorepo
   ];
   for (const location of locations) {
@@ -906,7 +912,7 @@ function getTemplatesDir() {
 }
 async function copyTemplate(templateName, targetDir, data) {
   const templatesDir = getTemplatesDir();
-  const templateDir = path.join(templatesDir, templateName);
+  const templateDir = path8.join(templatesDir, templateName);
   if (!fs.existsSync(templateDir)) {
     throw new Error(
       `Template "${templateName}" not found at ${templateDir}. Available templates: ${fs.readdirSync(templatesDir).join(", ")}`
@@ -915,8 +921,8 @@ async function copyTemplate(templateName, targetDir, data) {
   await fs.ensureDir(targetDir);
   const files = await fs.readdir(templateDir);
   for (const file of files) {
-    const templatePath = path.join(templateDir, file);
-    const targetPath = path.join(targetDir, file);
+    const templatePath = path8.join(templateDir, file);
+    const targetPath = path8.join(targetDir, file);
     const stat = await fs.stat(templatePath);
     if (stat.isDirectory()) {
       await copyTemplateDir(templatePath, targetPath, data);
@@ -933,8 +939,8 @@ async function copyTemplateDir(templateDir, targetDir, data) {
   await fs.ensureDir(targetDir);
   const files = await fs.readdir(templateDir);
   for (const file of files) {
-    const templatePath = path.join(templateDir, file);
-    const targetPath = path.join(targetDir, file);
+    const templatePath = path8.join(templateDir, file);
+    const targetPath = path8.join(targetDir, file);
     const stat = await fs.stat(templatePath);
     if (stat.isDirectory()) {
       await copyTemplateDir(templatePath, targetPath, data);
@@ -949,32 +955,32 @@ async function copyTemplateDir(templateDir, targetDir, data) {
 }
 function getProjectRoot() {
   let currentDir = process.cwd();
-  while (currentDir !== path.parse(currentDir).root) {
-    const packageJsonPath = path.join(currentDir, "package.json");
+  while (currentDir !== path8.parse(currentDir).root) {
+    const packageJsonPath = path8.join(currentDir, "package.json");
     if (fs.existsSync(packageJsonPath)) {
       const packageJson = fs.readJsonSync(packageJsonPath);
-      if (packageJson.workspaces || fs.existsSync(path.join(currentDir, "src/themes")) || fs.existsSync(path.join(currentDir, "themes"))) {
+      if (packageJson.workspaces || fs.existsSync(path8.join(currentDir, "src/themes")) || fs.existsSync(path8.join(currentDir, "themes"))) {
         return currentDir;
       }
     }
-    currentDir = path.dirname(currentDir);
+    currentDir = path8.dirname(currentDir);
   }
   return process.cwd();
 }
 function getThemesDir() {
   const root = getProjectRoot();
-  if (fs.existsSync(path.join(root, "themes")))
-    return path.join(root, "themes");
-  if (fs.existsSync(path.join(root, "src/themes")))
-    return path.join(root, "src/themes");
-  return path.dirname(root);
+  if (fs.existsSync(path8.join(root, "themes")))
+    return path8.join(root, "themes");
+  if (fs.existsSync(path8.join(root, "src/themes")))
+    return path8.join(root, "src/themes");
+  return path8.dirname(root);
 }
 function getFeaturesDir() {
-  return path.join(getProjectRoot(), "src/features");
+  return path8.join(getProjectRoot(), "src/features");
 }
 function isOneXProject() {
   const root = getProjectRoot();
-  return fs.existsSync(path.join(root, "themes")) || fs.existsSync(path.join(root, "src/themes")) || fs.existsSync(path.join(root, "theme.config.ts")) || fs.existsSync(path.join(root, "bundle-entry.ts"));
+  return fs.existsSync(path8.join(root, "themes")) || fs.existsSync(path8.join(root, "src/themes")) || fs.existsSync(path8.join(root, "theme.config.ts")) || fs.existsSync(path8.join(root, "bundle-entry.ts"));
 }
 function ensureOneXProject() {
   if (!isOneXProject()) {
@@ -990,13 +996,13 @@ function listThemes() {
     return [];
   }
   return fs.readdirSync(themesDir).filter((name) => {
-    const themePath = path.join(themesDir, name);
-    return fs.statSync(themePath).isDirectory() && (fs.existsSync(path.join(themePath, "theme.config.ts")) || fs.existsSync(path.join(themePath, "bundle-entry.ts")) || fs.existsSync(path.join(themePath, "manifest.ts")));
+    const themePath = path8.join(themesDir, name);
+    return fs.statSync(themePath).isDirectory() && (fs.existsSync(path8.join(themePath, "theme.config.ts")) || fs.existsSync(path8.join(themePath, "bundle-entry.ts")) || fs.existsSync(path8.join(themePath, "manifest.ts")));
   });
 }
 function themeExists(themeName) {
-  const themePath = path.join(getThemesDir(), themeName);
-  return fs.existsSync(themePath) && (fs.existsSync(path.join(themePath, "theme.config.ts")) || fs.existsSync(path.join(themePath, "bundle-entry.ts")) || fs.existsSync(path.join(themePath, "manifest.ts")));
+  const themePath = path8.join(getThemesDir(), themeName);
+  return fs.existsSync(themePath) && (fs.existsSync(path8.join(themePath, "theme.config.ts")) || fs.existsSync(path8.join(themePath, "bundle-entry.ts")) || fs.existsSync(path8.join(themePath, "manifest.ts")));
 }
 function detectPackageManager() {
   const userAgent = process.env.npm_config_user_agent || "";
@@ -1004,9 +1010,9 @@ function detectPackageManager() {
   if (userAgent.includes("yarn")) return "yarn";
   if (userAgent.includes("bun")) return "bun";
   const cwd = process.cwd();
-  if (fs.existsSync(path.join(cwd, "pnpm-lock.yaml"))) return "pnpm";
-  if (fs.existsSync(path.join(cwd, "yarn.lock"))) return "yarn";
-  if (fs.existsSync(path.join(cwd, "bun.lockb"))) return "bun";
+  if (fs.existsSync(path8.join(cwd, "pnpm-lock.yaml"))) return "pnpm";
+  if (fs.existsSync(path8.join(cwd, "yarn.lock"))) return "yarn";
+  if (fs.existsSync(path8.join(cwd, "bun.lockb"))) return "bun";
   return "npm";
 }
 async function installDependencies(projectPath, packageManager = "npm") {
@@ -1072,7 +1078,7 @@ async function initCommand(projectName, options = {}) {
           if (!validateThemeName(kebabName)) {
             return "Invalid project name. Use lowercase letters, numbers, and hyphens only.";
           }
-          if (fs2.existsSync(path.join(process.cwd(), kebabName))) {
+          if (fs2.existsSync(path8.join(process.cwd(), kebabName))) {
             return `Directory "${kebabName}" already exists`;
           }
           return true;
@@ -1083,7 +1089,7 @@ async function initCommand(projectName, options = {}) {
   } else {
     name = toKebabCase(projectName);
   }
-  const projectPath = path.join(process.cwd(), name);
+  const projectPath = path8.join(process.cwd(), name);
   if (fs2.existsSync(projectPath)) {
     logger.error(`Directory "${name}" already exists.`);
     process.exit(1);
@@ -1146,38 +1152,38 @@ async function initCommand(projectName, options = {}) {
   try {
     fs2.mkdirSync(projectPath, { recursive: true });
     await copyTemplate(template, projectPath, data);
-    const srcPath = path.join(projectPath, "src");
+    const srcPath = path8.join(projectPath, "src");
     fs2.mkdirSync(srcPath, { recursive: true });
     const manifestContent = generateManifest(data);
-    await writeFile(path.join(srcPath, "manifest.ts"), manifestContent);
+    await writeFile(path8.join(srcPath, "manifest.ts"), manifestContent);
     const configContent = generateThemeConfig(data);
-    await writeFile(path.join(srcPath, "config.ts"), configContent);
+    await writeFile(path8.join(srcPath, "config.ts"), configContent);
     const layoutContent = generateThemeLayout(data);
-    await writeFile(path.join(srcPath, "layout.ts"), layoutContent);
+    await writeFile(path8.join(srcPath, "layout.ts"), layoutContent);
     const indexContent = generateThemeIndex(data);
-    await writeFile(path.join(srcPath, "index.ts"), indexContent);
-    const sectionsPath = path.join(srcPath, "sections");
+    await writeFile(path8.join(srcPath, "index.ts"), indexContent);
+    const sectionsPath = path8.join(srcPath, "sections");
     fs2.mkdirSync(sectionsPath, { recursive: true });
     await writeFile(
-      path.join(sectionsPath, "README.md"),
+      path8.join(sectionsPath, "README.md"),
       `# ${displayName} Sections
 
 Add your theme-specific sections here.
 `
     );
-    const blocksPath = path.join(srcPath, "blocks");
+    const blocksPath = path8.join(srcPath, "blocks");
     fs2.mkdirSync(blocksPath, { recursive: true });
     await writeFile(
-      path.join(blocksPath, "README.md"),
+      path8.join(blocksPath, "README.md"),
       `# ${displayName} Blocks
 
 Add your theme-specific blocks here.
 `
     );
-    const pagesPath = path.join(srcPath, "pages");
+    const pagesPath = path8.join(srcPath, "pages");
     fs2.mkdirSync(pagesPath, { recursive: true });
     const homePageContent = generateHomePage(data);
-    await writeFile(path.join(pagesPath, "home.ts"), homePageContent);
+    await writeFile(path8.join(pagesPath, "home.ts"), homePageContent);
     logger.stopSpinner(true, "Project structure created!");
     if (options.git) {
       logger.startSpinner("Initializing git repository...");
@@ -1476,10 +1482,10 @@ async function createSectionCommand(name, options) {
   ensureOneXProject();
   if (!options.theme) {
     const isStandaloneTheme = ["theme.config.ts", "bundle-entry.ts"].some(
-      (f) => fs.existsSync(path.join(process.cwd(), f))
+      (f) => fs.existsSync(path8.join(process.cwd(), f))
     );
     if (isStandaloneTheme) {
-      options.theme = path.basename(process.cwd());
+      options.theme = path8.basename(process.cwd());
     }
   }
   const sectionName = toKebabCase(name);
@@ -1542,35 +1548,35 @@ async function createSectionCommand(name, options) {
   };
   logger.startSpinner("Creating section files...");
   try {
-    const themePath = path.join(getThemesDir(), themeName);
-    const sectionPath = path.join(themePath, "sections", sectionName);
+    const themePath = path8.join(getThemesDir(), themeName);
+    const sectionPath = path8.join(themePath, "sections", sectionName);
     const schemaContent = generateSectionSchema(data);
     await writeFile(
-      path.join(sectionPath, `${sectionName}.schema.ts`),
+      path8.join(sectionPath, `${sectionName}.schema.ts`),
       schemaContent
     );
     if (createTemplate) {
       const templateContent = generateSectionTemplate(data);
       await writeFile(
-        path.join(sectionPath, `${sectionName}-default.tsx`),
+        path8.join(sectionPath, `${sectionName}-default.tsx`),
         templateContent
       );
     }
     const indexContent = generateSectionIndex(data, createTemplate);
-    await writeFile(path.join(sectionPath, "index.ts"), indexContent);
+    await writeFile(path8.join(sectionPath, "index.ts"), indexContent);
     logger.stopSpinner(true, "Section files created successfully!");
     logger.newLine();
     logger.section("Next steps:");
     logger.log(
-      `  1. Edit schema: ${path.relative(process.cwd(), path.join(sectionPath, `${sectionName}.schema.ts`))}`
+      `  1. Edit schema: ${path8.relative(process.cwd(), path8.join(sectionPath, `${sectionName}.schema.ts`))}`
     );
     if (createTemplate) {
       logger.log(
-        `  2. Edit template: ${path.relative(process.cwd(), path.join(sectionPath, `${sectionName}-default.tsx`))}`
+        `  2. Edit template: ${path8.relative(process.cwd(), path8.join(sectionPath, `${sectionName}-default.tsx`))}`
       );
     }
     logger.log(
-      `  3. Add to theme manifest: ${path.relative(process.cwd(), path.join(themePath, "manifest.ts"))}`
+      `  3. Add to theme manifest: ${path8.relative(process.cwd(), path8.join(themePath, "manifest.ts"))}`
     );
     logger.newLine();
     logger.success("Section created successfully!");
@@ -1718,10 +1724,10 @@ async function createBlockCommand(name, options) {
   ensureOneXProject();
   if (!options.theme) {
     const isStandaloneTheme = ["theme.config.ts", "bundle-entry.ts"].some(
-      (f) => fs.existsSync(path.join(process.cwd(), f))
+      (f) => fs.existsSync(path8.join(process.cwd(), f))
     );
     if (isStandaloneTheme) {
-      options.theme = path.basename(process.cwd());
+      options.theme = path8.basename(process.cwd());
     }
   }
   const blockName = toKebabCase(name);
@@ -1796,24 +1802,24 @@ async function createBlockCommand(name, options) {
   };
   logger.startSpinner("Creating block files...");
   try {
-    const blockPath = scope === "shared" ? path.join(getFeaturesDir(), "blocks", blockName) : path.join(getThemesDir(), themeName, "blocks", blockName);
+    const blockPath = scope === "shared" ? path8.join(getFeaturesDir(), "blocks", blockName) : path8.join(getThemesDir(), themeName, "blocks", blockName);
     const schemaContent = generateBlockSchema(data);
     await writeFile(
-      path.join(blockPath, `${blockName}.schema.ts`),
+      path8.join(blockPath, `${blockName}.schema.ts`),
       schemaContent
     );
     const componentContent = generateBlockComponent(data);
-    await writeFile(path.join(blockPath, `${blockName}.tsx`), componentContent);
+    await writeFile(path8.join(blockPath, `${blockName}.tsx`), componentContent);
     const indexContent = generateBlockIndex(data);
-    await writeFile(path.join(blockPath, "index.ts"), indexContent);
+    await writeFile(path8.join(blockPath, "index.ts"), indexContent);
     logger.stopSpinner(true, "Block files created successfully!");
     logger.newLine();
     logger.section("Next steps:");
     logger.log(
-      `  1. Edit schema: ${path.relative(process.cwd(), path.join(blockPath, `${blockName}.schema.ts`))}`
+      `  1. Edit schema: ${path8.relative(process.cwd(), path8.join(blockPath, `${blockName}.schema.ts`))}`
     );
     logger.log(
-      `  2. Edit component: ${path.relative(process.cwd(), path.join(blockPath, `${blockName}.tsx`))}`
+      `  2. Edit component: ${path8.relative(process.cwd(), path8.join(blockPath, `${blockName}.tsx`))}`
     );
     logger.log(
       `  3. Register in block registry: src/lib/registry/block-registry.ts`
@@ -1991,31 +1997,31 @@ async function createComponentCommand(name, options) {
   };
   logger.startSpinner("Creating component files...");
   try {
-    const componentPath = path.join(
+    const componentPath = path8.join(
       getFeaturesDir(),
       "components",
       componentName
     );
     const schemaContent = generateComponentSchema(data);
     await writeFile(
-      path.join(componentPath, `${componentName}.schema.ts`),
+      path8.join(componentPath, `${componentName}.schema.ts`),
       schemaContent
     );
     const componentContent = generateComponent(data);
     await writeFile(
-      path.join(componentPath, `${componentName}.tsx`),
+      path8.join(componentPath, `${componentName}.tsx`),
       componentContent
     );
     const indexContent = generateComponentIndex(data);
-    await writeFile(path.join(componentPath, "index.ts"), indexContent);
+    await writeFile(path8.join(componentPath, "index.ts"), indexContent);
     logger.stopSpinner(true, "Component files created successfully!");
     logger.newLine();
     logger.section("Next steps:");
     logger.log(
-      `  1. Edit schema: ${path.relative(process.cwd(), path.join(componentPath, `${componentName}.schema.ts`))}`
+      `  1. Edit schema: ${path8.relative(process.cwd(), path8.join(componentPath, `${componentName}.schema.ts`))}`
     );
     logger.log(
-      `  2. Edit component: ${path.relative(process.cwd(), path.join(componentPath, `${componentName}.tsx`))}`
+      `  2. Edit component: ${path8.relative(process.cwd(), path8.join(componentPath, `${componentName}.tsx`))}`
     );
     logger.log(
       `  3. Register in component registry: src/lib/registry/component-registry.ts`
@@ -2172,13 +2178,13 @@ async function listSections(themeFilter) {
     return;
   }
   for (const theme of themes) {
-    const sectionsDir = path.join(getThemesDir(), theme, "sections");
+    const sectionsDir = path8.join(getThemesDir(), theme, "sections");
     if (!fs.existsSync(sectionsDir)) {
       continue;
     }
     const sections = fs.readdirSync(sectionsDir).filter((name) => {
-      const sectionPath = path.join(sectionsDir, name);
-      return fs.statSync(sectionPath).isDirectory() && fs.existsSync(path.join(sectionPath, "index.ts"));
+      const sectionPath = path8.join(sectionsDir, name);
+      return fs.statSync(sectionPath).isDirectory() && fs.existsSync(path8.join(sectionPath, "index.ts"));
     });
     if (sections.length > 0) {
       logger.log(chalk4.cyan(`
@@ -2192,11 +2198,11 @@ async function listSections(themeFilter) {
 }
 async function listBlocks(themeFilter) {
   logger.section("\u{1F9F1} Blocks");
-  const sharedBlocksDir = path.join(getFeaturesDir(), "blocks");
+  const sharedBlocksDir = path8.join(getFeaturesDir(), "blocks");
   if (fs.existsSync(sharedBlocksDir)) {
     const sharedBlocks = fs.readdirSync(sharedBlocksDir).filter((name) => {
-      const blockPath = path.join(sharedBlocksDir, name);
-      return fs.statSync(blockPath).isDirectory() && fs.existsSync(path.join(blockPath, "index.ts"));
+      const blockPath = path8.join(sharedBlocksDir, name);
+      return fs.statSync(blockPath).isDirectory() && fs.existsSync(path8.join(blockPath, "index.ts"));
     });
     if (sharedBlocks.length > 0) {
       logger.log(chalk4.cyan("\n  Shared:"));
@@ -2207,13 +2213,13 @@ async function listBlocks(themeFilter) {
   }
   const themes = themeFilter ? [themeFilter] : listThemes();
   for (const theme of themes) {
-    const blocksDir = path.join(getThemesDir(), theme, "blocks");
+    const blocksDir = path8.join(getThemesDir(), theme, "blocks");
     if (!fs.existsSync(blocksDir)) {
       continue;
     }
     const blocks = fs.readdirSync(blocksDir).filter((name) => {
-      const blockPath = path.join(blocksDir, name);
-      return fs.statSync(blockPath).isDirectory() && fs.existsSync(path.join(blockPath, "index.ts"));
+      const blockPath = path8.join(blocksDir, name);
+      return fs.statSync(blockPath).isDirectory() && fs.existsSync(path8.join(blockPath, "index.ts"));
     });
     if (blocks.length > 0) {
       logger.log(chalk4.cyan(`
@@ -2227,14 +2233,14 @@ async function listBlocks(themeFilter) {
 }
 async function listComponents() {
   logger.section("\u2699\uFE0F  Components");
-  const componentsDir = path.join(getFeaturesDir(), "components");
+  const componentsDir = path8.join(getFeaturesDir(), "components");
   if (!fs.existsSync(componentsDir)) {
     logger.warning("No components directory found");
     return;
   }
   const components = fs.readdirSync(componentsDir).filter((name) => {
-    const componentPath = path.join(componentsDir, name);
-    return fs.statSync(componentPath).isDirectory() && fs.existsSync(path.join(componentPath, "index.ts"));
+    const componentPath = path8.join(componentsDir, name);
+    return fs.statSync(componentPath).isDirectory() && fs.existsSync(path8.join(componentPath, "index.ts"));
   });
   if (components.length === 0) {
     logger.warning("No components found");
@@ -2255,11 +2261,11 @@ async function listThemesInfo() {
   }
   logger.log("");
   for (const theme of themes) {
-    const themeDir = path.join(getThemesDir(), theme);
+    const themeDir = path8.join(getThemesDir(), theme);
     const candidates = ["theme.config.ts", "bundle-entry.ts", "manifest.ts"];
     let manifestContent = "";
     for (const candidate of candidates) {
-      const candidatePath = path.join(themeDir, candidate);
+      const candidatePath = path8.join(themeDir, candidate);
       if (fs.existsSync(candidatePath)) {
         manifestContent = fs.readFileSync(candidatePath, "utf-8");
         break;
@@ -2297,9 +2303,9 @@ async function validateCommand(options) {
       "theme.config.ts",
       "bundle-entry.ts",
       "manifest.ts"
-    ].some((f) => fs.existsSync(path.join(process.cwd(), f)));
+    ].some((f) => fs.existsSync(path8.join(process.cwd(), f)));
     if (isThemeDir) {
-      themeToValidate = path.basename(process.cwd());
+      themeToValidate = path8.basename(process.cwd());
       logger.info(`Validating current theme: ${themeToValidate}`);
     } else {
       logger.error(
@@ -2308,11 +2314,11 @@ async function validateCommand(options) {
       process.exit(1);
     }
   }
-  const themePath = path.join(getThemesDir(), themeToValidate);
+  const themePath = path8.join(getThemesDir(), themeToValidate);
   logger.startSpinner("Running validation checks...");
   const entryFiles = ["manifest.ts", "theme.config.ts", "bundle-entry.ts"];
   const foundEntry = entryFiles.find(
-    (f) => fs.existsSync(path.join(themePath, f))
+    (f) => fs.existsSync(path8.join(themePath, f))
   );
   if (!foundEntry) {
     issues.push({
@@ -2322,7 +2328,7 @@ async function validateCommand(options) {
     });
   } else if (foundEntry === "manifest.ts") {
     const manifestContent = fs.readFileSync(
-      path.join(themePath, foundEntry),
+      path8.join(themePath, foundEntry),
       "utf-8"
     );
     if (!manifestContent.includes("export const") && !manifestContent.includes("export default") && !manifestContent.includes("export interface")) {
@@ -2333,7 +2339,7 @@ async function validateCommand(options) {
       });
     }
   }
-  const configPath = path.join(themePath, "theme.config.ts");
+  const configPath = path8.join(themePath, "theme.config.ts");
   if (!fs.existsSync(configPath)) {
     issues.push({
       type: "warning",
@@ -2341,7 +2347,7 @@ async function validateCommand(options) {
       message: "Theme config file not found (recommended)"
     });
   }
-  const indexPath = path.join(themePath, "index.ts");
+  const indexPath = path8.join(themePath, "index.ts");
   if (!fs.existsSync(indexPath)) {
     issues.push({
       type: "warning",
@@ -2349,7 +2355,7 @@ async function validateCommand(options) {
       message: "Index file not found (recommended)"
     });
   }
-  const sectionsDir = path.join(themePath, "sections");
+  const sectionsDir = path8.join(themePath, "sections");
   if (!fs.existsSync(sectionsDir)) {
     issues.push({
       type: "warning",
@@ -2358,16 +2364,16 @@ async function validateCommand(options) {
     });
   } else {
     const sections = fs.readdirSync(sectionsDir).filter(
-      (name) => fs.statSync(path.join(sectionsDir, name)).isDirectory()
+      (name) => fs.statSync(path8.join(sectionsDir, name)).isDirectory()
     );
     for (const sectionName of sections) {
-      const sectionPath = path.join(sectionsDir, sectionName);
-      const schemaFile = path.join(sectionPath, `${sectionName}.schema.ts`);
-      const defaultTemplate = path.join(
+      const sectionPath = path8.join(sectionsDir, sectionName);
+      const schemaFile = path8.join(sectionPath, `${sectionName}.schema.ts`);
+      const defaultTemplate = path8.join(
         sectionPath,
         `${sectionName}-default.tsx`
       );
-      const indexFile = path.join(sectionPath, "index.ts");
+      const indexFile = path8.join(sectionPath, "index.ts");
       if (!fs.existsSync(schemaFile)) {
         issues.push({
           type: "error",
@@ -2391,14 +2397,14 @@ async function validateCommand(options) {
       }
     }
   }
-  const blocksDir = path.join(themePath, "blocks");
+  const blocksDir = path8.join(themePath, "blocks");
   if (fs.existsSync(blocksDir)) {
-    const blocks = fs.readdirSync(blocksDir).filter((name) => fs.statSync(path.join(blocksDir, name)).isDirectory());
+    const blocks = fs.readdirSync(blocksDir).filter((name) => fs.statSync(path8.join(blocksDir, name)).isDirectory());
     for (const blockName of blocks) {
-      const blockPath = path.join(blocksDir, blockName);
-      const schemaFile = path.join(blockPath, `${blockName}.schema.ts`);
-      const componentFile = path.join(blockPath, `${blockName}.tsx`);
-      const indexFile = path.join(blockPath, "index.ts");
+      const blockPath = path8.join(blocksDir, blockName);
+      const schemaFile = path8.join(blockPath, `${blockName}.schema.ts`);
+      const componentFile = path8.join(blockPath, `${blockName}.tsx`);
+      const indexFile = path8.join(blockPath, "index.ts");
       if (!fs.existsSync(schemaFile)) {
         issues.push({
           type: "error",
@@ -2470,14 +2476,14 @@ async function buildCommand(options) {
   if (options.theme) {
     themeName = options.theme;
     try {
-      const workspaceThemePath = path.join(getThemesDir(), themeName);
+      const workspaceThemePath = path8.join(getThemesDir(), themeName);
       if (fs.existsSync(workspaceThemePath)) {
         themePath = workspaceThemePath;
       } else {
-        themePath = path.join(process.cwd(), themeName);
+        themePath = path8.join(process.cwd(), themeName);
       }
     } catch {
-      themePath = path.join(process.cwd(), themeName);
+      themePath = path8.join(process.cwd(), themeName);
     }
     if (!fs.existsSync(themePath)) {
       logger.error(`Theme "${themeName}" not found.`);
@@ -2488,10 +2494,10 @@ async function buildCommand(options) {
       "theme.config.ts",
       "bundle-entry.ts",
       "manifest.ts"
-    ].some((f) => fs.existsSync(path.join(process.cwd(), f)));
+    ].some((f) => fs.existsSync(path8.join(process.cwd(), f)));
     if (isThemeDir) {
       themePath = process.cwd();
-      themeName = path.basename(themePath);
+      themeName = path8.basename(themePath);
       logger.info(`Building current theme: ${themeName}`);
     } else {
       logger.error(
@@ -2500,7 +2506,7 @@ async function buildCommand(options) {
       process.exit(1);
     }
   }
-  const packageJsonPath = path.join(themePath, "package.json");
+  const packageJsonPath = path8.join(themePath, "package.json");
   const hasPkgJson = fs.existsSync(packageJsonPath);
   if (!hasPkgJson) {
     logger.warning(
@@ -2556,9 +2562,9 @@ async function buildCommand(options) {
     logger.success("\u2713 Theme built successfully!");
     logger.newLine();
     logger.info(`Theme: ${themeName}`);
-    const distPath = path.join(themePath, "dist");
+    const distPath = path8.join(themePath, "dist");
     if (fs.existsSync(distPath)) {
-      logger.log(`Output: ${path.relative(process.cwd(), distPath)}`);
+      logger.log(`Output: ${path8.relative(process.cwd(), distPath)}`);
       const files = fs.readdirSync(distPath);
       logger.log(`Files: ${files.length}`);
     }
@@ -2596,7 +2602,7 @@ async function packageCommand(options) {
   let themeName;
   if (options.theme) {
     themeName = options.theme;
-    themePath = path.join(getThemesDir(), themeName);
+    themePath = path8.join(getThemesDir(), themeName);
     if (!fs.existsSync(themePath)) {
       logger.error(`Theme "${themeName}" not found.`);
       process.exit(1);
@@ -2606,10 +2612,10 @@ async function packageCommand(options) {
       "theme.config.ts",
       "bundle-entry.ts",
       "manifest.ts"
-    ].some((f) => fs.existsSync(path.join(process.cwd(), f)));
+    ].some((f) => fs.existsSync(path8.join(process.cwd(), f)));
     if (isThemeDir) {
       themePath = process.cwd();
-      themeName = path.basename(themePath);
+      themeName = path8.basename(themePath);
       logger.info(`Packaging current theme: ${themeName}`);
     } else {
       logger.error(
@@ -2618,7 +2624,7 @@ async function packageCommand(options) {
       process.exit(1);
     }
   }
-  const packageJsonPath = path.join(themePath, "package.json");
+  const packageJsonPath = path8.join(themePath, "package.json");
   let version = "1.0.0";
   if (fs.existsSync(packageJsonPath)) {
     const packageJson = await fs.readJson(packageJsonPath);
@@ -2628,7 +2634,7 @@ async function packageCommand(options) {
   logger.info(`Theme: ${themeName}`);
   logger.info(`Version: ${version}`);
   logger.newLine();
-  const compiledThemePath = path.join(
+  const compiledThemePath = path8.join(
     process.cwd(),
     "themes",
     themeName,
@@ -2662,8 +2668,8 @@ async function packageCommand(options) {
   logger.newLine();
   logger.section("Step 2: Create Package");
   const packageName = options.name || `${themeName}-${version}`;
-  const outputDir = options.output || path.join(process.cwd(), "dist");
-  const outputPath = path.join(outputDir, `${packageName}.zip`);
+  const outputDir = options.output || path8.join(process.cwd(), "dist");
+  const outputPath = path8.join(outputDir, `${packageName}.zip`);
   await fs.ensureDir(outputDir);
   logger.startSpinner("Creating zip archive...");
   try {
@@ -2676,11 +2682,11 @@ async function packageCommand(options) {
     logger.newLine();
     logger.info(`Package: ${packageName}.zip`);
     logger.log(`Size: ${sizeMB} MB`);
-    logger.log(`Location: ${path.relative(process.cwd(), outputPath)}`);
+    logger.log(`Location: ${path8.relative(process.cwd(), outputPath)}`);
     logger.newLine();
     logger.section("Next steps:");
     logger.log(
-      `  onex deploy --package ${path.relative(process.cwd(), outputPath)}`
+      `  onex deploy --package ${path8.relative(process.cwd(), outputPath)}`
     );
   } catch (error) {
     logger.stopSpinner(false, "Failed to create package");
@@ -2738,9 +2744,9 @@ async function deployCommand(options) {
   ensureOneXProject();
   let packagePath;
   if (options.package) {
-    packagePath = path.resolve(options.package);
+    packagePath = path8.resolve(options.package);
   } else if (options.theme) {
-    const distDir = path.join(process.cwd(), "dist");
+    const distDir = path8.join(process.cwd(), "dist");
     if (!fs.existsSync(distDir)) {
       logger.error("No dist/ directory found. Run 'onex package' first.");
       process.exit(1);
@@ -2755,7 +2761,7 @@ async function deployCommand(options) {
       process.exit(1);
     }
     packageFiles.sort().reverse();
-    packagePath = path.join(distDir, packageFiles[0]);
+    packagePath = path8.join(distDir, packageFiles[0]);
   } else {
     logger.error("Either --package or --theme must be specified.");
     logger.info("Examples:");
@@ -2769,11 +2775,11 @@ async function deployCommand(options) {
   }
   const stats = await fs.stat(packagePath);
   const sizeMB = (stats.size / 1024 / 1024).toFixed(2);
-  const fileName = path.basename(packagePath);
+  const fileName = path8.basename(packagePath);
   logger.newLine();
   logger.info(`Package: ${fileName}`);
   logger.log(`Size: ${sizeMB} MB`);
-  logger.log(`Path: ${path.relative(process.cwd(), packagePath)}`);
+  logger.log(`Path: ${path8.relative(process.cwd(), packagePath)}`);
   logger.newLine();
   const apiUrl = options.apiUrl || process.env.ONEX_API_URL || "http://localhost:3001";
   const uploadEndpoint = `${apiUrl}/api/themes/upload`;
@@ -2877,11 +2883,11 @@ function getBucketName(env) {
   return environment === "production" ? "onex-themes-prod" : "onex-themes-staging";
 }
 async function findCompiledThemeDir(themeId, version) {
-  const searchPaths = [path.resolve(process.cwd(), "dist")];
+  const searchPaths = [path8.resolve(process.cwd(), "dist")];
   for (const dir of searchPaths) {
     if (await fs.pathExists(dir)) {
-      const hasManifest = await fs.pathExists(path.join(dir, "manifest.json"));
-      const hasThemeEntry = await fs.pathExists(path.join(dir, "bundle-entry.js")) || await fs.pathExists(path.join(dir, "theme.config.js")) || await fs.pathExists(path.join(dir, "index.js"));
+      const hasManifest = await fs.pathExists(path8.join(dir, "manifest.json"));
+      const hasThemeEntry = await fs.pathExists(path8.join(dir, "bundle-entry.js")) || await fs.pathExists(path8.join(dir, "theme.config.js")) || await fs.pathExists(path8.join(dir, "index.js"));
       if (hasManifest || hasThemeEntry) {
         return dir;
       }
@@ -2890,7 +2896,7 @@ async function findCompiledThemeDir(themeId, version) {
   return null;
 }
 async function readManifest() {
-  const manifestTsPath = path.resolve(process.cwd(), "manifest.ts");
+  const manifestTsPath = path8.resolve(process.cwd(), "manifest.ts");
   if (await fs.pathExists(manifestTsPath)) {
     try {
       const module = await import(manifestTsPath);
@@ -2899,7 +2905,7 @@ async function readManifest() {
       logger.warning("Failed to import manifest.ts, trying package.json");
     }
   }
-  const packageJsonPath = path.resolve(process.cwd(), "package.json");
+  const packageJsonPath = path8.resolve(process.cwd(), "package.json");
   if (await fs.pathExists(packageJsonPath)) {
     const pkg = await fs.readJson(packageJsonPath);
     return {
@@ -2933,13 +2939,13 @@ async function findSourceDir(themeId, explicitDir) {
   }
   const searchPaths = [
     process.cwd(),
-    path.resolve(process.cwd(), `../../themes/${themeId}`),
-    path.resolve(process.cwd(), `../themes/${themeId}`)
+    path8.resolve(process.cwd(), `../../themes/${themeId}`),
+    path8.resolve(process.cwd(), `../themes/${themeId}`)
   ];
   const markers = ["theme.config.ts", "bundle-entry.ts"];
   for (const dir of searchPaths) {
     for (const marker of markers) {
-      if (await fs.pathExists(path.join(dir, marker))) {
+      if (await fs.pathExists(path8.join(dir, marker))) {
         return dir;
       }
     }
@@ -2991,7 +2997,7 @@ async function uploadCommand(options) {
     spinner.succeed(`Found compiled theme at: ${compiledDir}`);
     spinner.start("Creating bundle.zip...");
     const tmpDir = os.tmpdir();
-    const bundleZipPath = path.join(tmpDir, `${themeId}-${version}-bundle.zip`);
+    const bundleZipPath = path8.join(tmpDir, `${themeId}-${version}-bundle.zip`);
     await createZipFromDir(compiledDir, bundleZipPath);
     const bundleZipBuffer = await fs.readFile(bundleZipPath);
     const bundleSizeMB = (bundleZipBuffer.length / 1024 / 1024).toFixed(2);
@@ -3045,7 +3051,7 @@ async function uploadCommand(options) {
       if (sourceDir) {
         spinner.succeed(`Found source at: ${sourceDir}`);
         spinner.start("Creating source.zip...");
-        const sourceZipPath = path.join(
+        const sourceZipPath = path8.join(
           tmpDir,
           `${themeId}-${version}-source.zip`
         );
@@ -3179,8 +3185,8 @@ async function resolveLatestVersion(s3Client, bucket, themeId) {
 async function createCompatibilityFiles(outputDir, manifest) {
   const entryFile = manifest.output?.entry || "bundle-entry.js";
   if (entryFile !== "bundle-entry.js" && entryFile.startsWith("bundle-entry-")) {
-    const hashedPath = path.join(outputDir, entryFile);
-    const stablePath = path.join(outputDir, "bundle-entry.js");
+    const hashedPath = path8.join(outputDir, entryFile);
+    const stablePath = path8.join(outputDir, "bundle-entry.js");
     if (await fs.pathExists(hashedPath)) {
       await fs.copy(hashedPath, stablePath);
       const mapPath = hashedPath + ".map";
@@ -3189,13 +3195,13 @@ async function createCompatibilityFiles(outputDir, manifest) {
       }
     }
   }
-  const sectionsRegistryPath = path.join(outputDir, "sections-registry.js");
+  const sectionsRegistryPath = path8.join(outputDir, "sections-registry.js");
   const content = `// Re-export all sections from bundle-entry
 // This file exists to maintain compatibility with the import path
 export * from './bundle-entry.js';
 `;
   await fs.writeFile(sectionsRegistryPath, content, "utf-8");
-  const pkgJsonPath = path.join(outputDir, "package.json");
+  const pkgJsonPath = path8.join(outputDir, "package.json");
   await fs.writeFile(pkgJsonPath, '{\n  "type": "module"\n}\n', "utf-8");
 }
 function showDownloadFailureHelp(themeId, bucket) {
@@ -3278,7 +3284,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 = path.join(outputDir, "manifest.json");
+    const manifestPath = path8.join(outputDir, "manifest.json");
     const manifest = await fs.readJson(manifestPath);
     await createCompatibilityFiles(outputDir, manifest);
     console.log();
@@ -3412,7 +3418,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 = path.join(themeDir, "package.json");
+  const pkgPath = path8.join(themeDir, "package.json");
   if (await fs.pathExists(pkgPath)) {
     const pkg = await fs.readJson(pkgPath);
     pkg.name = `@onex-themes/${newName}`;
@@ -3423,9 +3429,12 @@ async function renameTheme(themeDir, oldName, newName) {
       );
     }
     pkg.version = "1.0.0";
+    if (pkg.devDependencies?.["@onexapis/cli"]) {
+      delete pkg.devDependencies["@onexapis/cli"];
+    }
     await fs.writeJson(pkgPath, pkg, { spaces: 2 });
   }
-  const configPath = path.join(themeDir, "theme.config.ts");
+  const configPath = path8.join(themeDir, "theme.config.ts");
   if (await fs.pathExists(configPath)) {
     let content = await fs.readFile(configPath, "utf-8");
     content = content.replace(/id:\s*"[^"]*"/, `id: "${newName}"`);
@@ -3435,7 +3444,7 @@ async function renameTheme(themeDir, oldName, newName) {
     );
     await fs.writeFile(configPath, content);
   }
-  const layoutPath = path.join(themeDir, "theme.layout.ts");
+  const layoutPath = path8.join(themeDir, "theme.layout.ts");
   if (await fs.pathExists(layoutPath)) {
     let content = await fs.readFile(layoutPath, "utf-8");
     content = content.replace(/id:\s*"[^"]*"/, `id: "${newName}"`);
@@ -3448,7 +3457,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 = path.join(themeDir, file);
+    const filePath = path8.join(themeDir, file);
     let content = await fs.readFile(filePath, "utf-8");
     const original = content;
     content = content.replace(
@@ -3477,7 +3486,7 @@ async function cloneCommand(themeName, options) {
   const spinner = ora("Initializing clone...").start();
   try {
     const bucket = options.bucket || getBucketName3(options.environment);
-    const outputDir = options.output || path.resolve(process.cwd(), newName);
+    const outputDir = options.output || path8.resolve(process.cwd(), newName);
     const s3Client = getS3Client3();
     if (await fs.pathExists(outputDir)) {
       spinner.fail(chalk4.red(`Directory already exists: ${outputDir}`));
@@ -3532,7 +3541,7 @@ async function cloneCommand(themeName, options) {
     spinner.succeed(
       `Renamed theme: ${chalk4.gray(themeName)} \u2192 ${chalk4.cyan(newName)}`
     );
-    const envExamplePath = path.join(outputDir, ".env.example");
+    const envExamplePath = path8.join(outputDir, ".env.example");
     if (!await fs.pathExists(envExamplePath)) {
       await fs.writeFile(
         envExamplePath,
@@ -3547,7 +3556,7 @@ async function cloneCommand(themeName, options) {
     }
     if (options.install !== false) {
       const hasPkgJson = await fs.pathExists(
-        path.join(outputDir, "package.json")
+        path8.join(outputDir, "package.json")
       );
       if (hasPkgJson) {
         spinner.start("Installing dependencies...");
@@ -3574,7 +3583,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 ${path.relative(process.cwd(), outputDir)}`));
+    console.log(chalk4.gray(`   cd ${path8.relative(process.cwd(), outputDir)}`));
     console.log(chalk4.gray("   cp .env.example .env  # then add your Company ID"));
     if (options.install === false) {
       console.log(chalk4.gray("   pnpm install"));
@@ -3627,7 +3636,7 @@ function createDevServer(options) {
       serveFile(res, options.previewRuntimePath);
       return;
     }
-    const filePath = path.join(options.distDir, pathname);
+    const filePath = path8.join(options.distDir, pathname);
     if (!filePath.startsWith(options.distDir)) {
       res.writeHead(403);
       res.end("Forbidden");
@@ -3668,7 +3677,7 @@ function serveFile(res, filePath) {
       res.end("Not Found");
       return;
     }
-    const ext = path.extname(filePath);
+    const ext = path8.extname(filePath);
     const contentType = MIME_TYPES[ext] || "application/octet-stream";
     const content = fs2.readFileSync(filePath);
     res.writeHead(200, { "Content-Type": contentType });
@@ -3728,14 +3737,14 @@ async function devCommand(options) {
   if (options.theme) {
     themeName = options.theme;
     try {
-      const workspaceThemePath = path.join(getThemesDir(), themeName);
+      const workspaceThemePath = path8.join(getThemesDir(), themeName);
       if (fs.existsSync(workspaceThemePath)) {
         themePath = workspaceThemePath;
       } else {
-        themePath = path.join(process.cwd(), themeName);
+        themePath = path8.join(process.cwd(), themeName);
       }
     } catch {
-      themePath = path.join(process.cwd(), themeName);
+      themePath = path8.join(process.cwd(), themeName);
     }
     if (!fs.existsSync(themePath)) {
       logger.error(`Theme "${themeName}" not found.`);
@@ -3746,10 +3755,10 @@ async function devCommand(options) {
       "theme.config.ts",
       "bundle-entry.ts",
       "manifest.ts"
-    ].some((f) => fs.existsSync(path.join(process.cwd(), f)));
+    ].some((f) => fs.existsSync(path8.join(process.cwd(), f)));
     if (isThemeDir) {
       themePath = process.cwd();
-      themeName = path.basename(themePath);
+      themeName = path8.basename(themePath);
     } else {
       logger.error(
         "Not in a theme directory and no --theme specified. Run from theme root or use --theme flag."
@@ -3817,7 +3826,7 @@ async function devCommand(options) {
     watcher.close();
     await context2.dispose();
     server.close();
-    const shimPath = path.join(outputDir, ".process-shim.js");
+    const shimPath = path8.join(outputDir, ".process-shim.js");
     try {
       await fs7.unlink(shimPath);
     } catch {
@@ -3830,14 +3839,14 @@ async function devCommand(options) {
 try {
   const projectRoot = getProjectRoot();
   dotenv.config({
-    path: path.join(projectRoot, ".env.local"),
+    path: path8.join(projectRoot, ".env.local"),
     quiet: true
   });
-  dotenv.config({ path: path.join(projectRoot, ".env"), quiet: true });
+  dotenv.config({ path: path8.join(projectRoot, ".env"), quiet: true });
 } catch {
 }
 dotenv.config({
-  path: path.join(os.homedir(), ".onex", ".env"),
+  path: path8.join(os.homedir(), ".onex", ".env"),
   quiet: true
 });
 var program = new Command();