@deneb-ui/cli 2.0.7 → 2.0.9

package/bin/index.js

@@ -5,7 +5,6 @@ const fs = require('node:fs');
 const { spawnSync } = require('node:child_process');
 
 const args = process.argv.slice(2);
-const command = args[0];
 
 const toolsDir = path.join(__dirname, '..', 'src', 'tools');
 
@@ -154,8 +153,8 @@ function createTemplate(targetName) {
     console.log(`  npm run validate  # Run Fivora preflight checks`);
     console.log(`  npm run zip       # Create clean upload-ready ZIP\n`);
   } else {
-    console.log(`\n🚀 Scaffolding new Fivora Template via @fivora/create-template...\n`);
-    const res = spawnSync('npx', ['--yes', '@fivora/create-template', projectName], {
+    console.log(`\n🚀 Scaffolding new DENEB Storefront Template via @deneb-ui/create-template...\n`);
+    const res = spawnSync('npx', ['--yes', '@deneb-ui/create-template', projectName], {
       stdio: 'inherit',
       shell: process.platform === 'win32',
     });
@@ -357,19 +356,170 @@ function getDefaultSiteData(projectName, pages) {
   };
 }
 
+function getComponentRegistry(importPkg) {
+  return {
+    'button': {
+      file: 'Button.tsx',
+      component: 'Button',
+      code: `'use client';\n\nimport { Button, type EditableButtonProps } from '${importPkg}';\n\nexport { Button, type EditableButtonProps };\n`,
+    },
+    'dialog': {
+      file: 'Dialog.tsx',
+      component: 'Dialog',
+      code: `'use client';\n\nimport { Dialog, DialogHeader, DialogTitle, DialogDescription, DialogFooter, type DialogProps } from '${importPkg}';\n\nexport { Dialog, DialogHeader, DialogTitle, DialogDescription, DialogFooter, type DialogProps };\n`,
+    },
+    'card': {
+      file: 'Card.tsx',
+      component: 'Card',
+      code: `'use client';\n\nimport { Card, type EditableCardProps } from '${importPkg}';\n\nexport { Card, type EditableCardProps };\n`,
+    },
+    'product-card': {
+      file: 'ProductCard.tsx',
+      component: 'EditableProductCard',
+      code: `'use client';\n\nimport { EditableProductCard, type EditableProductCardProps } from '${importPkg}';\n\nexport function ProductCard(props: EditableProductCardProps) {\n  return <EditableProductCard {...props} />;\n}\n`,
+    },
+    'pricing-card': {
+      file: 'PricingCard.tsx',
+      component: 'EditablePricingCard',
+      code: `'use client';\n\nimport { EditablePricingCard, type EditablePricingCardProps } from '${importPkg}';\n\nexport function PricingCard(props: EditablePricingCardProps) {\n  return <EditablePricingCard {...props} />;\n}\n`,
+    },
+    'testimonial-card': {
+      file: 'TestimonialCard.tsx',
+      component: 'EditableTestimonialCard',
+      code: `'use client';\n\nimport { EditableTestimonialCard, type EditableTestimonialCardProps } from '${importPkg}';\n\nexport function TestimonialCard(props: EditableTestimonialCardProps) {\n  return <EditableTestimonialCard {...props} />;\n}\n`,
+    },
+    'contact-form': {
+      file: 'ContactForm.tsx',
+      component: 'EditableContactForm',
+      code: `'use client';\n\nimport { EditableContactForm, type EditableContactFormProps } from '${importPkg}';\n\nexport function ContactForm(props: EditableContactFormProps) {\n  return <EditableContactForm {...props} />;\n}\n`,
+    },
+    'faq': {
+      file: 'FAQAccordion.tsx',
+      component: 'EditableFAQAccordion',
+      code: `'use client';\n\nimport { EditableFAQAccordion, EditableFAQItem, type EditableFAQAccordionProps } from '${importPkg}';\n\nexport function FAQAccordion(props: EditableFAQAccordionProps) {\n  return <EditableFAQAccordion {...props} />;\n}\n\nexport { EditableFAQItem };\n`,
+    },
+    'navbar': {
+      file: 'Navbar.tsx',
+      component: 'EditableNavbar',
+      code: `'use client';\n\nimport { EditableNavbar, type EditableNavbarProps } from '${importPkg}';\n\nexport function Navbar(props: EditableNavbarProps) {\n  return <EditableNavbar {...props} />;\n}\n`,
+    },
+    'footer': {
+      file: 'Footer.tsx',
+      component: 'EditableFooter',
+      code: `'use client';\n\nimport { EditableFooter, type EditableFooterProps } from '${importPkg}';\n\nexport function Footer(props: EditableFooterProps) {\n  return <EditableFooter {...props} />;\n}\n`,
+    },
+    'hero': {
+      file: 'Hero.tsx',
+      component: 'EditableHeroCentered',
+      code: `'use client';\n\nimport { EditableHeroCentered, EditableHeroSplit, type EditableHeroCenteredProps, type EditableHeroSplitProps } from '${importPkg}';\n\nexport function HeroCentered(props: EditableHeroCenteredProps) {\n  return <EditableHeroCentered {...props} />;\n}\n\nexport function HeroSplit(props: EditableHeroSplitProps) {\n  return <EditableHeroSplit {...props} />;\n}\n`,
+    },
+    'whatsapp-button': {
+      file: 'WhatsAppButton.tsx',
+      component: 'WhatsAppButton',
+      code: `'use client';\n\nimport { WhatsAppButton, type WhatsAppButtonProps } from '${importPkg}';\n\nexport { WhatsAppButton, type WhatsAppButtonProps };\n`,
+    },
+    'phone-button': {
+      file: 'PhoneButton.tsx',
+      component: 'PhoneButton',
+      code: `'use client';\n\nimport { PhoneButton, type PhoneButtonProps } from '${importPkg}';\n\nexport { PhoneButton, type PhoneButtonProps };\n`,
+    },
+    'email-button': {
+      file: 'EmailButton.tsx',
+      component: 'EmailButton',
+      code: `'use client';\n\nimport { EmailButton, type EmailButtonProps } from '${importPkg}';\n\nexport { EmailButton, type EmailButtonProps };\n`,
+    },
+    'contact-actions': {
+      file: 'ContactActions.tsx',
+      component: 'ContactActions',
+      code: `'use client';\n\nimport { ContactActions, type ContactActionsProps } from '${importPkg}';\n\nexport { ContactActions, type ContactActionsProps };\n`,
+    },
+    'location-card': {
+      file: 'LocationCard.tsx',
+      component: 'LocationCard',
+      code: `'use client';\n\nimport { LocationCard, type LocationCardProps } from '${importPkg}';\n\nexport { LocationCard, type LocationCardProps };\n`,
+    },
+    'location-link': {
+      file: 'LocationLink.tsx',
+      component: 'LocationLink',
+      code: `'use client';\n\nimport { LocationLink, type LocationLinkProps } from '${importPkg}';\n\nexport { LocationLink, type LocationLinkProps };\n`,
+    },
+    'map-embed': {
+      file: 'MapEmbed.tsx',
+      component: 'MapEmbed',
+      code: `'use client';\n\nimport { MapEmbed, type MapEmbedProps } from '${importPkg}';\n\nexport { MapEmbed, type MapEmbedProps };\n`,
+    },
+    'social-links': {
+      file: 'SocialLinks.tsx',
+      component: 'SocialLinks',
+      code: `'use client';\n\nimport { SocialLinks, type SocialLinksProps } from '${importPkg}';\n\nexport { SocialLinks, type SocialLinksProps };\n`,
+    },
+    'social-button': {
+      file: 'SocialButton.tsx',
+      component: 'SocialButton',
+      code: `'use client';\n\nimport { SocialButton, type SocialButtonProps } from '${importPkg}';\n\nexport { SocialButton, type SocialButtonProps };\n`,
+    },
+    'business-hours': {
+      file: 'BusinessHours.tsx',
+      component: 'BusinessHours',
+      code: `'use client';\n\nimport { BusinessHours, type BusinessHoursProps } from '${importPkg}';\n\nexport { BusinessHours, type BusinessHoursProps };\n`,
+    },
+    'announcement-bar': {
+      file: 'AnnouncementBar.tsx',
+      component: 'EditableAnnouncementBar',
+      code: `'use client';\n\nimport { EditableAnnouncementBar, AnnouncementBar, type EditableAnnouncementBarProps } from '${importPkg}';\n\nexport { EditableAnnouncementBar, AnnouncementBar, type EditableAnnouncementBarProps };\n`,
+    },
+    'category-pills': {
+      file: 'CategoryPills.tsx',
+      component: 'EditableCategoryPills',
+      code: `'use client';\n\nimport { EditableCategoryPills, CategoryPills, type EditableCategoryPillsProps } from '${importPkg}';\n\nexport { EditableCategoryPills, CategoryPills, type EditableCategoryPillsProps };\n`,
+    },
+    'floating-contact-widget': {
+      file: 'FloatingContactWidget.tsx',
+      component: 'FloatingContactWidget',
+      code: `'use client';\n\nimport { FloatingContactWidget, type FloatingContactWidgetProps } from '${importPkg}';\n\nexport { FloatingContactWidget, type FloatingContactWidgetProps };\n`,
+    },
+    'sticky-mobile-bar': {
+      file: 'StickyMobileBar.tsx',
+      component: 'StickyMobileBar',
+      code: `'use client';\n\nimport { StickyMobileBar, type StickyMobileBarProps, type StickyMobileBarAction } from '${importPkg}';\n\nexport { StickyMobileBar, type StickyMobileBarProps, type StickyMobileBarAction };\n`,
+    },
+    'trust-badges': {
+      file: 'TrustBadges.tsx',
+      component: 'TrustBadges',
+      code: `'use client';\n\nimport { TrustBadges, type TrustBadgesProps, type TrustBadgeItem } from '${importPkg}';\n\nexport { TrustBadges, type TrustBadgesProps, type TrustBadgeItem };\n`,
+    },
+    'product-quickview': {
+      file: 'ProductQuickView.tsx',
+      component: 'ProductQuickView',
+      code: `'use client';\n\nimport { ProductQuickView, type ProductQuickViewProps, type ProductQuickViewItem } from '${importPkg}';\n\nexport { ProductQuickView, type ProductQuickViewProps, type ProductQuickViewItem };\n`,
+    },
+    'cookie-consent': {
+      file: 'CookieConsentBanner.tsx',
+      component: 'CookieConsentBanner',
+      code: `'use client';\n\nimport { CookieConsentBanner, type CookieConsentBannerProps } from '${importPkg}';\n\nexport { CookieConsentBanner, type CookieConsentBannerProps };\n`,
+    },
+    'deneb-action': {
+      file: 'DenebAction.tsx',
+      component: 'DenebAction',
+      code: `'use client';\n\nimport { DenebAction, type DenebActionProps } from '${importPkg}';\n\nexport { DenebAction, type DenebActionProps };\n`,
+    },
+  };
+}
+
 function initProject(targetInput) {
   const targetDir = path.resolve(process.cwd(), targetInput || '.');
   const pkgPath = path.join(targetDir, 'package.json');
 
   console.log('\n' + createBox([
-    '\x1b[1m\x1b[37mFIVORA TEMPLATE INITIALIZER\x1b[0m',
-    '\x1b[90mConfigure existing Next.js app for Fivora\x1b[0m'
-  ], 55) + '\n');
+    '\x1b[1m\x1b[37mDENEB TEMPLATE INITIALIZER\x1b[0m',
+    '\x1b[90mConfigure existing Next.js project for Fivora Platform\x1b[0m',
+    '\x1b[90mPowered by DENEB-UI Collaborate with FIVORA\x1b[0m'
+  ], 58) + '\n');
 
   if (!fs.existsSync(pkgPath)) {
     console.error(`\x1b[31mError:\x1b[0m No package.json found in "${targetDir}".`);
-    console.error(`\nPlease run 'fivora init' inside your Next.js project root, or scaffold a new project with:`);
-    console.error(`  \x1b[36mnpx @fivora/create-template <app-name>\x1b[0m\n`);
+    console.error(`\nPlease run 'deneb init' inside your Next.js project root, or scaffold a new project with:`);
+    console.error(`  \x1b[36mnpx @deneb-ui/create-template <app-name>\x1b[0m\n`);
     process.exit(1);
   }
 
@@ -396,22 +546,29 @@ function initProject(targetInput) {
   // 1. Scan / Detect Pages
   const detectedPages = detectPages(targetDir);
 
-  // 2. Generate fivora-template.json (or keep fivora-template.json if present)
-  const fivoraManifestPath = path.join(targetDir, 'fivora-template.json');
-  const legacyManifestPath = path.join(targetDir, 'fivora-template.json');
-  const manifestPath = fs.existsSync(legacyManifestPath) && !fs.existsSync(fivoraManifestPath)
-    ? legacyManifestPath
-    : fivoraManifestPath;
+  // 2. Run Universal Template Conversion Engine
+  // Automatically detects CSS/UI frameworks (shadcn/ui, HeroUI, Tailwind CSS),
+  // creates safe backup, instruments Root Layout with SiteDataProvider,
+  // extracts hardcoded text/images/buttons/placeholders,
+  // injects data-preview-field-path markers, harmonizes UI components,
+  // and builds synchronized site-data.json & fivora-template.json.
+  let conversionRes = null;
+  try {
+    const { runUniversalTemplateConversion } = require('../src/tools/template-converter.cjs');
+    conversionRes = runUniversalTemplateConversion(targetDir, projectName, detectedPages);
+  } catch (err) {
+    console.error(`\x1b[33m⚠ Note:\x1b[0m Automated conversion encountered an issue: ${err.message}. Falling back to default generation.`);
+  }
 
+  // 3. Fallback: Generate fivora-template.json if not yet present
+  const manifestPath = path.join(targetDir, 'fivora-template.json');
   if (!fs.existsSync(manifestPath)) {
     const manifest = getDefaultManifest(projectName, detectedPages);
     fs.writeFileSync(manifestPath, JSON.stringify(manifest, null, 2) + '\n');
     console.log(`\x1b[32m✔ Created\x1b[0m fivora-template.json (version 2, strict visual editing contract)`);
-  } else {
-    console.log(`\x1b[90m⏩ Kept existing\x1b[0m ${path.basename(manifestPath)}`);
   }
 
-  // 3. Generate siteDataFile
+  // 4. Fallback: Generate siteDataFile if not yet present
   let manifestObj;
   try {
     manifestObj = JSON.parse(fs.readFileSync(manifestPath, 'utf8'));
@@ -426,31 +583,30 @@ function initProject(targetInput) {
     const siteData = getDefaultSiteData(projectName, detectedPages);
     fs.writeFileSync(siteDataPath, JSON.stringify(siteData, null, 2) + '\n');
     console.log(`\x1b[32m✔ Created\x1b[0m ${relSiteData} (merchant & editable site data)`);
-  } else {
-    console.log(`\x1b[90m⏩ Kept existing\x1b[0m ${relSiteData}`);
   }
 
   // 4. Update package.json scripts
   pkg.scripts = pkg.scripts || {};
   const scriptsToAdd = {
-    'lab': 'fivora lab .',
-    'validate': 'fivora validate .',
-    'zip': 'fivora zip .',
-    'package:template': 'fivora package .',
-    'update:fivora': 'fivora update',
+    'lab': 'deneb lab .',
+    'validate': 'deneb validate .',
+    'zip': 'deneb zip .',
+    'validate-and-zip': 'deneb validate-and-zip .',
+    'package:template': 'deneb package .',
+    'update:deneb': 'deneb update',
   };
   let addedCount = 0;
   for (const [key, val] of Object.entries(scriptsToAdd)) {
-    if (!pkg.scripts[key]) {
+    if (!pkg.scripts[key] || pkg.scripts[key].startsWith('fivora ')) {
       pkg.scripts[key] = val;
       addedCount++;
     }
   }
   fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + '\n');
   if (addedCount > 0) {
-    console.log(`\x1b[32m✔ Injected\x1b[0m Fivora scripts into package.json (lab, validate, zip, package:template, update:fivora)`);
+    console.log(`\x1b[32m✔ Configured\x1b[0m DENEB scripts in package.json (lab, validate, zip, validate-and-zip, package:template, update:deneb)`);
   } else {
-    console.log(`\x1b[90m⏩ Fivora scripts already present\x1b[0m in package.json`);
+    console.log(`\x1b[90m⏩ DENEB scripts already present\x1b[0m in package.json`);
   }
 
   // 5. Check next.config for static export
@@ -474,47 +630,53 @@ function initProject(targetInput) {
     console.log(`  \x1b[90mconst nextConfig = { output: 'export' };\x1b[0m`);
   }
 
-  // 6. Install Fivora packages if missing
+  // 6. Install DENEB packages if missing
   const skipInstall = process.argv.includes('--skip-install');
-  const hasEditable = Boolean(
-    (pkg.dependencies && pkg.dependencies['@fivora/editable-components']) ||
-    (pkg.devDependencies && pkg.devDependencies['@fivora/editable-components'])
+  const hasUi = Boolean(
+    (pkg.dependencies && (pkg.dependencies['@deneb-ui/ui'] || pkg.dependencies['@deneb/ui'] || pkg.dependencies['@fivora/editable-components'])) ||
+    (pkg.devDependencies && (pkg.devDependencies['@deneb-ui/ui'] || pkg.devDependencies['@deneb/ui'] || pkg.devDependencies['@fivora/editable-components']))
   );
   const hasCli = Boolean(
-    (pkg.devDependencies && pkg.devDependencies['@fivora/cli']) ||
-    (pkg.dependencies && pkg.dependencies['@fivora/cli'])
+    (pkg.devDependencies && (pkg.devDependencies['@deneb-ui/cli'] || pkg.devDependencies['@fivora/cli'])) ||
+    (pkg.dependencies && (pkg.dependencies['@deneb-ui/cli'] || pkg.dependencies['@fivora/cli']))
   );
 
-  if (!skipInstall && (!hasEditable || !hasCli)) {
-    const toInstall = [];
-    if (!hasEditable) toInstall.push('@fivora/editable-components');
-    if (!hasCli) toInstall.push('@fivora/cli');
+  if (!skipInstall && (!hasUi || !hasCli)) {
+    const depsToInstall = [];
+    const devDepsToInstall = [];
+    if (!hasUi) depsToInstall.push('@deneb-ui/ui@latest');
+    if (!hasCli) devDepsToInstall.push('@deneb-ui/cli@latest');
 
-    console.log(`\n📦 Installing ${toInstall.join(' and ')}...`);
-    const installRes = spawnSync('npm', ['install', ...toInstall], {
-      cwd: targetDir,
-      stdio: 'inherit',
-      shell: process.platform === 'win32',
-    });
-    if (installRes.status === 0) {
-      console.log(`\x1b[32m✔ Packages installed successfully!\x1b[0m`);
-    } else {
-      console.log(`\x1b[33mNote: npm install exited with code ${installRes.status}. You can run 'npm i ${toInstall.join(' ')}' manually.\x1b[0m`);
+    if (depsToInstall.length > 0) {
+      console.log(`\n📦 Installing ${depsToInstall.join(' ')}...`);
+      spawnSync('npm', ['install', ...depsToInstall], {
+        cwd: targetDir,
+        stdio: 'inherit',
+        shell: process.platform === 'win32',
+      });
+    }
+    if (devDepsToInstall.length > 0) {
+      console.log(`\n📦 Installing (dev) ${devDepsToInstall.join(' ')}...`);
+      spawnSync('npm', ['install', '-D', ...devDepsToInstall], {
+        cwd: targetDir,
+        stdio: 'inherit',
+        shell: process.platform === 'win32',
+      });
     }
   }
 
-  console.log(`\n\x1b[32m✔ Template initialization complete!\x1b[0m`);
+  console.log(`\n\x1b[32m✔ Project initialization complete!\x1b[0m`);
   console.log(`\nYou can now run:`);
-  console.log(`  \x1b[36mnpm run lab\x1b[0m       \x1b[90m# Launch Local Visual Editing Lab\x1b[0m`);
-  console.log(`  \x1b[36mnpm run validate\x1b[0m  \x1b[90m# Check compliance with Fivora contract\x1b[0m`);
-  console.log(`  \x1b[36mnpm run zip\x1b[0m       \x1b[90m# Package clean ZIP for 1-click upload\x1b[0m\n`);
+  console.log(`  \x1b[36mnpm run lab\x1b[0m               \x1b[90m# Launch Local Visual Editing Lab\x1b[0m`);
+  console.log(`  \x1b[36mnpm run validate\x1b[0m          \x1b[90m# Check compliance with Fivora contract\x1b[0m`);
+  console.log(`  \x1b[36mnpm run zip\x1b[0m               \x1b[90m# Package clean ZIP for 1-click upload\x1b[0m`);
+  console.log(`  \x1b[36mnpm run validate-and-zip\x1b[0m  \x1b[90m# Validate preflight and bundle clean ZIP in 1 step\x1b[0m\n`);
 }
 
-
 function updateDependencies(cmdArgs = []) {
   let targetDir = '.';
   let isLocal = false;
-  let localPath = '/mnt/GAMES/GitHub/fivora_package';
+  let localPath = path.resolve(__dirname, '..', '..', '..');
 
   for (let i = 0; i < cmdArgs.length; i++) {
     const arg = cmdArgs[i];
@@ -548,52 +710,79 @@ function updateDependencies(cmdArgs = []) {
   }
 
   console.log('\n' + createBox([
-    '\x1b[1m\x1b[37mFIVORA PACKAGE UPDATER\x1b[0m'
-  ], 55) + '\n');
+    '\x1b[1m\x1b[37mDENEB PACKAGE & COMPONENT UPDATER\x1b[0m',
+    '\x1b[90mUpdate DENEB packages and UI components to latest\x1b[0m',
+    '\x1b[90mPowered by DENEB-UI Collaborate with FIVORA\x1b[0m'
+  ], 58) + '\n');
 
-  const currentEditable = String(pkg.dependencies?.['@fivora/editable-components'] || pkg.devDependencies?.['@fivora/editable-components'] || '');
-  const currentCli = String(pkg.dependencies?.['@fivora/cli'] || pkg.devDependencies?.['@fivora/cli'] || '');
-  if (!isLocal && (currentEditable.startsWith('file:') || currentCli.startsWith('file:'))) {
-    isLocal = true;
+  let importPkg = '@deneb-ui/ui';
+  if (pkg.dependencies?.['@deneb-ui/ui'] || pkg.devDependencies?.['@deneb-ui/ui']) {
+    importPkg = '@deneb-ui/ui';
+  } else if (pkg.dependencies?.['@deneb/ui'] || pkg.devDependencies?.['@deneb/ui']) {
+    importPkg = '@deneb/ui';
   }
 
+  // 1. Update npm packages
   if (isLocal) {
-    const editableDir = path.join(localPath, 'packages', 'editable-components');
+    const uiDir = path.join(localPath, 'packages', 'deneb-ui');
     const cliDir = path.join(localPath, 'cli', 'fivora-cli');
 
-    if (fs.existsSync(editableDir) && fs.existsSync(cliDir)) {
-      console.log('🔄 Updating from local Fivora workspace:');
-      console.log('   - ' + editableDir);
+    if (fs.existsSync(uiDir) && fs.existsSync(cliDir)) {
+      console.log('🔄 Updating from local workspace:');
+      console.log('   - ' + uiDir);
       console.log('   - ' + cliDir + '\n');
 
-      const installRes = spawnSync('npm', ['install', editableDir, cliDir], {
+      const installRes = spawnSync('npm', ['install', uiDir, cliDir], {
         cwd: targetDir,
         stdio: 'inherit',
         shell: process.platform === 'win32',
       });
 
       if (installRes.status === 0) {
-        console.log('\n\x1b[32m✔ Local Fivora packages re-linked & updated successfully!\x1b[0m\n');
+        console.log('\n\x1b[32m✔ Local DENEB packages re-linked & updated successfully!\x1b[0m\n');
       } else {
         console.log('\n\x1b[31m✖ Failed to link local packages (exit code: ' + installRes.status + ')\x1b[0m\n');
       }
-      return;
     }
-  }
+  } else {
+    console.log('📦 Updating @deneb-ui/ui and @deneb-ui/cli to latest from npm...');
+    const packagesToInstall = ['@deneb-ui/ui@latest', '@deneb-ui/cli@latest'];
 
-  console.log('📦 Updating @fivora/editable-components and @fivora/cli to latest from npm...');
-  const packagesToInstall = ['@fivora/editable-components@latest', '@fivora/cli@latest'];
+    const installRes = spawnSync('npm', ['install', ...packagesToInstall], {
+      cwd: targetDir,
+      stdio: 'inherit',
+      shell: process.platform === 'win32',
+    });
 
-  const installRes = spawnSync('npm', ['install', ...packagesToInstall], {
-    cwd: targetDir,
-    stdio: 'inherit',
-    shell: process.platform === 'win32',
-  });
+    if (installRes.status === 0) {
+      console.log('\n\x1b[32m✔ DENEB packages updated to latest versions successfully!\x1b[0m\n');
+    } else {
+      console.log('\n\x1b[31m✖ npm install failed with exit code ' + installRes.status + '\x1b[0m\n');
+    }
+  }
 
-  if (installRes.status === 0) {
-    console.log('\n\x1b[32m✔ Fivora packages updated to latest versions successfully!\x1b[0m\n');
-  } else {
-    console.log('\n\x1b[31m✖ npm install failed with exit code ' + installRes.status + '\x1b[0m\n');
+  // 2. Update DENEB components in src/components/ui/
+  const uiDir = path.join(targetDir, 'src', 'components', 'ui');
+  if (fs.existsSync(uiDir)) {
+    console.log('🧩 Inspecting and refreshing installed DENEB UI components in src/components/ui/...\n');
+    const registry = getComponentRegistry(importPkg);
+    const existingFiles = fs.readdirSync(uiDir);
+    let updatedComponentsCount = 0;
+
+    for (const [key, item] of Object.entries(registry)) {
+      if (existingFiles.includes(item.file)) {
+        const filePath = path.join(uiDir, item.file);
+        fs.writeFileSync(filePath, item.code);
+        console.log(`  \x1b[32m✔ Updated\x1b[0m src/components/ui/${item.file} (${key})`);
+        updatedComponentsCount++;
+      }
+    }
+
+    if (updatedComponentsCount > 0) {
+      console.log(`\n\x1b[32m✔ Successfully updated ${updatedComponentsCount} DENEB component(s) to the latest definitions!\x1b[0m\n`);
+    } else {
+      console.log(`  \x1b[90mNo existing DENEB UI components found in src/components/ui to update.\x1b[0m\n`);
+    }
   }
 }
 
@@ -619,133 +808,7 @@ function addComponent(componentName, targetDirInput) {
     }
   }
 
-  const REGISTRY = {
-    'button': {
-      file: 'Button.tsx',
-      component: 'Button',
-      code: `'use client';\n\nimport { Button, type EditableButtonProps } from '${importPkg}';\n\nexport { Button, type EditableButtonProps };\n`,
-    },
-    'dialog': {
-      file: 'Dialog.tsx',
-      component: 'Dialog',
-      code: `'use client';\n\nimport { Dialog, DialogHeader, DialogTitle, DialogDescription, DialogFooter, type DialogProps } from '${importPkg}';\n\nexport { Dialog, DialogHeader, DialogTitle, DialogDescription, DialogFooter, type DialogProps };\n`,
-    },
-    'card': {
-      file: 'Card.tsx',
-      component: 'Card',
-      code: `'use client';\n\nimport { Card, type EditableCardProps } from '${importPkg}';\n\nexport { Card, type EditableCardProps };\n`,
-    },
-    'product-card': {
-      file: 'ProductCard.tsx',
-      component: 'EditableProductCard',
-      code: `'use client';\n\nimport { EditableProductCard, type EditableProductCardProps } from '${importPkg}';\n\nexport function ProductCard(props: EditableProductCardProps) {\n  return <EditableProductCard {...props} />;\n}\n`,
-    },
-    'pricing-card': {
-      file: 'PricingCard.tsx',
-      component: 'EditablePricingCard',
-      code: `'use client';\n\nimport { EditablePricingCard, type EditablePricingCardProps } from '${importPkg}';\n\nexport function PricingCard(props: EditablePricingCardProps) {\n  return <EditablePricingCard {...props} />;\n}\n`,
-    },
-    'testimonial-card': {
-      file: 'TestimonialCard.tsx',
-      component: 'EditableTestimonialCard',
-      code: `'use client';\n\nimport { EditableTestimonialCard, type EditableTestimonialCardProps } from '${importPkg}';\n\nexport function TestimonialCard(props: EditableTestimonialCardProps) {\n  return <EditableTestimonialCard {...props} />;\n}\n`,
-    },
-    'contact-form': {
-      file: 'ContactForm.tsx',
-      component: 'EditableContactForm',
-      code: `'use client';\n\nimport { EditableContactForm, type EditableContactFormProps } from '${importPkg}';\n\nexport function ContactForm(props: EditableContactFormProps) {\n  return <EditableContactForm {...props} />;\n}\n`,
-    },
-    'faq': {
-      file: 'FAQAccordion.tsx',
-      component: 'EditableFAQAccordion',
-      code: `'use client';\n\nimport { EditableFAQAccordion, EditableFAQItem, type EditableFAQAccordionProps } from '${importPkg}';\n\nexport function FAQAccordion(props: EditableFAQAccordionProps) {\n  return <EditableFAQAccordion {...props} />;\n}\n\nexport { EditableFAQItem };\n`,
-    },
-    'navbar': {
-      file: 'Navbar.tsx',
-      component: 'EditableNavbar',
-      code: `'use client';\n\nimport { EditableNavbar, type EditableNavbarProps } from '${importPkg}';\n\nexport function Navbar(props: EditableNavbarProps) {\n  return <EditableNavbar {...props} />;\n}\n`,
-    },
-    'footer': {
-      file: 'Footer.tsx',
-      component: 'EditableFooter',
-      code: `'use client';\n\nimport { EditableFooter, type EditableFooterProps } from '${importPkg}';\n\nexport function Footer(props: EditableFooterProps) {\n  return <EditableFooter {...props} />;\n}\n`,
-    },
-    'hero': {
-      file: 'Hero.tsx',
-      component: 'EditableHeroCentered',
-      code: `'use client';\n\nimport { EditableHeroCentered, EditableHeroSplit, type EditableHeroCenteredProps, type EditableHeroSplitProps } from '${importPkg}';\n\nexport function HeroCentered(props: EditableHeroCenteredProps) {\n  return <EditableHeroCentered {...props} />;\n}\n\nexport function HeroSplit(props: EditableHeroSplitProps) {\n  return <EditableHeroSplit {...props} />;\n}\n`,
-    },
-    'whatsapp-button': {
-      file: 'WhatsAppButton.tsx',
-      component: 'WhatsAppButton',
-      code: `'use client';\n\nimport { WhatsAppButton, type WhatsAppButtonProps } from '${importPkg}';\n\nexport { WhatsAppButton, type WhatsAppButtonProps };\n`,
-    },
-    'phone-button': {
-      file: 'PhoneButton.tsx',
-      component: 'PhoneButton',
-      code: `'use client';\n\nimport { PhoneButton, type PhoneButtonProps } from '${importPkg}';\n\nexport { PhoneButton, type PhoneButtonProps };\n`,
-    },
-    'email-button': {
-      file: 'EmailButton.tsx',
-      component: 'EmailButton',
-      code: `'use client';\n\nimport { EmailButton, type EmailButtonProps } from '${importPkg}';\n\nexport { EmailButton, type EmailButtonProps };\n`,
-    },
-    'contact-actions': {
-      file: 'ContactActions.tsx',
-      component: 'ContactActions',
-      code: `'use client';\n\nimport { ContactActions, type ContactActionsProps } from '${importPkg}';\n\nexport { ContactActions, type ContactActionsProps };\n`,
-    },
-    'location-card': {
-      file: 'LocationCard.tsx',
-      component: 'LocationCard',
-      code: `'use client';\n\nimport { LocationCard, type LocationCardProps } from '${importPkg}';\n\nexport { LocationCard, type LocationCardProps };\n`,
-    },
-    'location-link': {
-      file: 'LocationLink.tsx',
-      component: 'LocationLink',
-      code: `'use client';\n\nimport { LocationLink, type LocationLinkProps } from '${importPkg}';\n\nexport { LocationLink, type LocationLinkProps };\n`,
-    },
-    'map-embed': {
-      file: 'MapEmbed.tsx',
-      component: 'MapEmbed',
-      code: `'use client';\n\nimport { MapEmbed, type MapEmbedProps } from '${importPkg}';\n\nexport { MapEmbed, type MapEmbedProps };\n`,
-    },
-    'social-links': {
-      file: 'SocialLinks.tsx',
-      component: 'SocialLinks',
-      code: `'use client';\n\nimport { SocialLinks, type SocialLinksProps } from '${importPkg}';\n\nexport { SocialLinks, type SocialLinksProps };\n`,
-    },
-    'social-button': {
-      file: 'SocialButton.tsx',
-      component: 'SocialButton',
-      code: `'use client';\n\nimport { SocialButton, type SocialButtonProps } from '${importPkg}';\n\nexport { SocialButton, type SocialButtonProps };\n`,
-    },
-    'business-hours': {
-      file: 'BusinessHours.tsx',
-      component: 'BusinessHours',
-      code: `'use client';\n\nimport { BusinessHours, type BusinessHoursProps } from '${importPkg}';\n\nexport { BusinessHours, type BusinessHoursProps };\n`,
-    },
-    'announcement-bar': {
-      file: 'AnnouncementBar.tsx',
-      component: 'EditableAnnouncementBar',
-      code: `'use client';\n\nimport { EditableAnnouncementBar, AnnouncementBar, type EditableAnnouncementBarProps } from '${importPkg}';\n\nexport { EditableAnnouncementBar, AnnouncementBar, type EditableAnnouncementBarProps };\n`,
-    },
-    'category-pills': {
-      file: 'CategoryPills.tsx',
-      component: 'EditableCategoryPills',
-      code: `'use client';\n\nimport { EditableCategoryPills, CategoryPills, type EditableCategoryPillsProps } from '${importPkg}';\n\nexport { EditableCategoryPills, CategoryPills, type EditableCategoryPillsProps };\n`,
-    },
-    'floating-contact-widget': {
-      file: 'FloatingContactWidget.tsx',
-      component: 'FloatingContactWidget',
-      code: `'use client';\n\nimport { FloatingContactWidget, type FloatingContactWidgetProps } from '${importPkg}';\n\nexport { FloatingContactWidget, type FloatingContactWidgetProps };\n`,
-    },
-    'deneb-action': {
-      file: 'DenebAction.tsx',
-      component: 'DenebAction',
-      code: `'use client';\n\nimport { DenebAction, type DenebActionProps } from '${importPkg}';\n\nexport { DenebAction, type DenebActionProps };\n`,
-    },
-  };
+  const REGISTRY = getComponentRegistry(importPkg);
 
   if (!componentName || componentName === 'list') {
     console.log('\n' + createBox([
@@ -778,43 +841,321 @@ function addComponent(componentName, targetDirInput) {
   console.log('Import them in your pages:\n  \x1b[90mimport { ... } from "@/components/ui/...";\x1b[0m\n');
 }
 
+function runValidateAndZip(targetDirInput, extraArgs = []) {
+  if (targetDirInput === '--help' || targetDirInput === '-h' || extraArgs.includes('--help') || extraArgs.includes('-h')) {
+    console.log(`\nUsage: deneb validate-and-zip [template-directory] [options]
+  (or deneb validate --zip [template-directory])
+  (or deneb validate and zip [template-directory])
+
+Runs Fivora preflight verification against manifest contracts, static export fixtures,
+and visual editing markers. If and only if all checks pass, packages a clean upload-ready
+fivora-template.zip (excluding node_modules, .next, .git, .env*).
+
+Options:
+  --skip-install  Reuse existing dependencies in working directory (diagnostic only)
+  --skip-build    Inspect existing build output directory in place (diagnostic only)
+  --json          Output validation report as JSON\n`);
+    process.exit(0);
+  }
+
+  const targetDir = path.resolve(targetDirInput || '.');
+  const outputZip = path.resolve(targetDir, 'fivora-template.zip');
+
+  console.log('\n' + createBox([
+    '\x1b[1m\x1b[37mDENEB VALIDATE & ZIP PREFLIGHT\x1b[0m',
+    '\x1b[90m1. Validate website configuration with Fivora platform\x1b[0m',
+    '\x1b[90m2. Package clean upload-ready ZIP if 100% compliant\x1b[0m'
+  ], 58) + '\n');
+
+  console.log(`[Step 1/2] Running Fivora preflight validation in ${targetDir}...\n`);
+
+  const validatorScript = path.join(toolsDir, 'fivora-template-validator.cjs');
+  const valRes = spawnSync(process.execPath, [validatorScript, 'validate', targetDir, ...extraArgs], {
+    stdio: 'inherit',
+  });
+
+  if (valRes.status !== 0) {
+    console.error(`\n\x1b[31m✖ Validation failed with exit code ${valRes.status}.\x1b[0m`);
+    console.error(`\x1b[33mRefusing to package ZIP: template does not meet Fivora platform requirements.\x1b[0m`);
+    console.error(`Fix the validation errors above and re-run "deneb validate-and-zip".\n`);
+    process.exit(valRes.status ?? 1);
+  }
+
+  console.log(`\n[Step 2/2] Validation PASSED! Creating clean upload-ready ZIP...\n`);
+  packageCleanZip(targetDir, outputZip);
+
+  console.log('\n' + createBox([
+    '\x1b[1m\x1b[32m✔ PREFLIGHT VALIDATION & PACKAGING SUCCESSFUL!\x1b[0m',
+    `\x1b[37mOutput:\x1b[0m ${path.basename(outputZip)}`,
+    '\x1b[90mReady for 1-click upload at Fivora Developer Portal\x1b[0m'
+  ], 58) + '\n');
+}
+
+function runDoctor(targetDirInput) {
+  const targetDir = path.resolve(targetDirInput || '.');
+
+  console.log('\n' + createBox([
+    '\x1b[1m\x1b[36m🩺 DENEB SYSTEM & TEMPLATE DOCTOR\x1b[0m',
+    '\x1b[90mComprehensive diagnostic analysis for Fivora & Next.js\x1b[0m',
+    `\x1b[37mTarget:\x1b[0m ${targetDir}`
+  ], 60) + '\n');
+
+  let passed = 0;
+  let warnings = 0;
+  let errors = 0;
+
+  function report(type, title, detail) {
+    if (type === 'pass') {
+      passed++;
+      console.log(`  \x1b[32m✔\x1b[0m \x1b[1m${title}\x1b[0m${detail ? ` \x1b[90m(${detail})\x1b[0m` : ''}`);
+    } else if (type === 'warn') {
+      warnings++;
+      console.log(`  \x1b[33m⚠\x1b[0m \x1b[33m${title}\x1b[0m${detail ? ` \x1b[90m- ${detail}\x1b[0m` : ''}`);
+    } else {
+      errors++;
+      console.log(`  \x1b[31m✖\x1b[0m \x1b[31m${title}\x1b[0m${detail ? ` \x1b[90m- ${detail}\x1b[0m` : ''}`);
+    }
+  }
+
+  console.log('\x1b[1m[1/6] System & Runtime Environment:\x1b[0m');
+  const nodeVersion = process.version;
+  const majorNode = parseInt(nodeVersion.replace(/^v/, '').split('.')[0], 10);
+  if (majorNode >= 18) {
+    report('pass', 'Node.js Runtime', `${nodeVersion} (Supported)`);
+  } else {
+    report('err', 'Node.js Runtime', `${nodeVersion} (Requires Node.js >= 18.0.0)`);
+  }
+
+  const npmBin = process.platform === 'win32' ? 'npm.cmd' : 'npm';
+  const npmCheck = spawnSync(npmBin, ['--version'], { encoding: 'utf-8', shell: process.platform === 'win32' });
+  if (!npmCheck.error && npmCheck.status === 0) {
+    report('pass', 'Package Manager', `npm v${npmCheck.stdout.trim()}`);
+  } else {
+    report('warn', 'Package Manager', 'npm not found in system PATH');
+  }
+
+  console.log('\n\x1b[1m[2/6] Project Package Configuration:\x1b[0m');
+  const pkgPath = path.join(targetDir, 'package.json');
+  let pkg = null;
+  if (fs.existsSync(pkgPath)) {
+    try {
+      pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
+      report('pass', 'package.json', `Found "${pkg.name || 'unnamed'}"`);
+      const allDeps = { ...(pkg.dependencies || {}), ...(pkg.devDependencies || {}) };
+
+      if (allDeps['next']) {
+        report('pass', 'Next.js Framework', allDeps['next']);
+      } else {
+        report('err', 'Next.js Framework', 'next dependency missing in package.json');
+      }
+
+      if (allDeps['@deneb-ui/ui']) {
+        report('pass', '@deneb-ui/ui Library', allDeps['@deneb-ui/ui']);
+      } else {
+        report('warn', '@deneb-ui/ui Library', 'Not installed (run "npm i @deneb-ui/ui")');
+      }
+
+      if (allDeps['@deneb-ui/cli']) {
+        report('pass', '@deneb-ui/cli Tooling', allDeps['@deneb-ui/cli']);
+      } else {
+        report('warn', '@deneb-ui/cli Tooling', 'Recommended for local CLI scripts');
+      }
+    } catch (e) {
+      report('err', 'package.json Syntax', e.message);
+    }
+  } else {
+    report('err', 'package.json', `Not found at ${pkgPath}`);
+  }
+
+  console.log('\n\x1b[1m[3/6] Static Export Configuration:\x1b[0m');
+  const nextConfigTs = path.join(targetDir, 'next.config.ts');
+  const nextConfigMjs = path.join(targetDir, 'next.config.mjs');
+  const nextConfigJs = path.join(targetDir, 'next.config.js');
+  let nextConfigFile = [nextConfigTs, nextConfigMjs, nextConfigJs].find((p) => fs.existsSync(p));
+
+  if (nextConfigFile) {
+    const content = fs.readFileSync(nextConfigFile, 'utf-8');
+    if (content.includes("output: 'export'") || content.includes('output: "export"')) {
+      report('pass', 'Next.js Static Export', `output: 'export' verified in ${path.basename(nextConfigFile)}`);
+    } else {
+      report('err', 'Next.js Static Export', `Missing output: 'export' in ${path.basename(nextConfigFile)} (Required by Fivora)`);
+    }
+  } else {
+    report('err', 'Next.js Config', 'No next.config.ts, next.config.mjs, or next.config.js found');
+  }
+
+  console.log('\n\x1b[1m[4/6] Fivora Manifest v2 Contract:\x1b[0m');
+  const manifestPath = path.join(targetDir, 'fivora-template.json');
+  let manifestData = null;
+  if (fs.existsSync(manifestPath)) {
+    try {
+      manifestData = JSON.parse(fs.readFileSync(manifestPath, 'utf-8'));
+      report('pass', 'fivora-template.json', `Valid JSON (strict=${manifestData.strict !== false})`);
+
+      if (manifestData.version === 2 || manifestData.version === '2') {
+        report('pass', 'Manifest Version', 'Version 2 (Current standard)');
+      } else {
+        report('warn', 'Manifest Version', `Version ${manifestData.version} detected (Recommend version 2)`);
+      }
+
+      const hasHome = Array.isArray(manifestData.pages) && manifestData.pages.some((p) =>
+        p.route === '/' || p.slug === '/' || p.path === '/' || p.id === 'home'
+      );
+      if (hasHome) {
+        report('pass', 'Home Page Entry', 'Home page ("/") declared in manifest');
+      } else {
+        report('err', 'Home Page Entry', 'Manifest pages array missing root slug or route: "/"');
+      }
+
+      if (manifestData.theme && (manifestData.theme.primary || manifestData.theme.accent)) {
+        report('pass', 'Theme Configuration', 'Primary and accent color tokens declared');
+      } else {
+        // Will check site-data.json below as alternative
+      }
+    } catch (e) {
+      report('err', 'fivora-template.json Syntax', e.message);
+    }
+  } else {
+    report('err', 'fivora-template.json', 'File not found. Run "deneb init" to generate it');
+  }
+
+  console.log('\n\x1b[1m[5/6] Reactive Site Data & Visual Editing:\x1b[0m');
+  const siteDataPath = path.join(targetDir, 'src', 'data', 'site-data.json');
+  if (fs.existsSync(siteDataPath)) {
+    try {
+      const siteData = JSON.parse(fs.readFileSync(siteDataPath, 'utf-8'));
+      report('pass', 'site-data.json', 'src/data/site-data.json exists & valid');
+      const merchantName = (siteData.merchant && (siteData.merchant.businessName || siteData.merchant.name)) || null;
+      if (merchantName) {
+        report('pass', 'Merchant Metadata', `Name: "${merchantName}"`);
+      } else {
+        report('warn', 'Merchant Metadata', 'Missing merchant name in site-data.json');
+      }
+
+      const themeTokens = manifestData?.theme || siteData?.template?.structure?.theme;
+      if (themeTokens && (themeTokens.primaryColor || themeTokens.primary || themeTokens.accentColor || themeTokens.accent)) {
+        report('pass', 'Theme Design Tokens', 'Theme color tokens declared');
+      } else {
+        report('warn', 'Theme Design Tokens', 'No theme color tokens found in manifest or site-data.json');
+      }
+
+      if (siteData.content) {
+        report('pass', 'Visual Content Bindings', 'Content section ready for live sync');
+      } else {
+        report('warn', 'Visual Content Bindings', 'Missing content section in site-data.json');
+      }
+    } catch (e) {
+      report('err', 'site-data.json Syntax', e.message);
+    }
+  } else {
+    report('warn', 'site-data.json', 'src/data/site-data.json not found. Recommended for Fivora live editor');
+  }
+
+  console.log('\n\x1b[1m[6/6] Cleanliness & Security Check:\x1b[0m');
+  const envFiles = ['.env', '.env.local', '.env.production', '.env.development'];
+  const foundEnv = envFiles.filter((f) => fs.existsSync(path.join(targetDir, f)));
+  if (foundEnv.length === 0) {
+    report('pass', 'Secrets Isolation', 'No raw .env files detected in root directory');
+  } else {
+    report('warn', 'Secrets Isolation', `Active env files: ${foundEnv.join(', ')} (Excluded during packaging)`);
+  }
+
+  const previewExists = fs.existsSync(path.join(targetDir, 'preview.png')) ||
+    fs.existsSync(path.join(targetDir, 'thumbnail.png')) ||
+    fs.existsSync(path.join(targetDir, 'public', 'fivora-logo.png'));
+  if (previewExists) {
+    report('pass', 'Storefront Assets', 'Brand/preview graphics verified');
+  } else {
+    report('warn', 'Storefront Assets', 'preview.png not found in template root');
+  }
+
+  // Summary
+  console.log('\n' + createBox([
+    '\x1b[1mDOCTOR DIAGNOSTIC SUMMARY\x1b[0m',
+    `\x1b[32m✔ Passed:\x1b[0m   ${passed}`,
+    `\x1b[33m⚠ Warnings:\x1b[0m ${warnings}`,
+    `\x1b[31m✖ Errors:\x1b[0m   ${errors}`,
+    errors === 0
+      ? '\x1b[32mStatus: HEALTHY — Ready for Fivora packaging & build!\x1b[0m'
+      : '\x1b[31mStatus: ATTENTION REQUIRED — Fix errors before deployment\x1b[0m'
+  ], 58) + '\n');
+
+  if (errors > 0) {
+    process.exit(1);
+  }
+}
+
+// Normalize multi-word "validate and zip" or "validate & zip"
+let command = args[0];
+let commandArgs = args.slice(1);
+
+if (command === 'validate' && (commandArgs[0] === 'and' || commandArgs[0] === '&') && commandArgs[1] === 'zip') {
+  command = 'validate-and-zip';
+  commandArgs = commandArgs.slice(2);
+}
+
 if (command === 'init') {
-  initProject(args[1]);
+  initProject(commandArgs[0]);
 } else if (command === 'create') {
-  createTemplate(args[1]);
+  createTemplate(commandArgs[0]);
 } else if (command === 'add') {
-  addComponent(args[1], args[2]);
+  addComponent(commandArgs[0], commandArgs[1]);
+} else if (command === 'doctor' || command === 'check') {
+  runDoctor(commandArgs[0]);
 } else if (command === 'lab') {
   const script = path.join(toolsDir, 'local-template-lab.cjs');
-  const res = spawnSync(process.execPath, [script, ...args.slice(1)], { stdio: 'inherit' });
+  const res = spawnSync(process.execPath, [script, ...commandArgs], { stdio: 'inherit' });
   process.exit(res.status ?? 0);
 } else if (command === 'validate') {
-  const script = path.join(toolsDir, 'fivora-template-validator.cjs');
-  const res = spawnSync(process.execPath, [script, 'validate', ...args.slice(1)], { stdio: 'inherit' });
-  process.exit(res.status ?? 0);
+  if (commandArgs.includes('--zip') || commandArgs.includes('-z')) {
+    const cleanArgs = commandArgs.filter((a) => a !== '--zip' && a !== '-z');
+    runValidateAndZip(cleanArgs[0] || '.', cleanArgs.slice(1));
+  } else {
+    const script = path.join(toolsDir, 'fivora-template-validator.cjs');
+    const res = spawnSync(process.execPath, [script, 'validate', ...commandArgs], { stdio: 'inherit' });
+    process.exit(res.status ?? 0);
+  }
 } else if (command === 'pack' || command === 'zip') {
-  const targetDir = path.resolve(args[1] || '.');
+  const targetDir = path.resolve(commandArgs[0] || '.');
   const outputZip = path.resolve(targetDir, 'fivora-template.zip');
   packageCleanZip(targetDir, outputZip);
+} else if (command === 'validate-and-zip' || command === 'validate-zip') {
+  runValidateAndZip(commandArgs[0] || '.', commandArgs.slice(1));
 } else if (command === 'update' || command === 'upgrade') {
-  updateDependencies(args.slice(1));
+  updateDependencies(commandArgs);
 } else if (command === 'package') {
   const script = path.join(toolsDir, 'fivora-template-validator.cjs');
-  const res = spawnSync(process.execPath, [script, 'package', ...args.slice(1)], { stdio: 'inherit' });
+  const res = spawnSync(process.execPath, [script, 'package', ...commandArgs], { stdio: 'inherit' });
   process.exit(res.status ?? 0);
 } else {
-  console.log(`Usage: deneb <command> [options] (or fivora <command> [options])
+  console.log(`Usage: deneb <command> [options]
   DENEB UI Framework — Powered by DENEB-UI Collaborate with FIVORA
 
-Commands:
-  add       Add a DENEB UI component to src/components/ui/ (e.g. deneb add product-card)
-  init      Configure an existing Next.js project with missing Fivora files & scripts
-  create    Scaffold a new storefront template (e.g. deneb create my-store)
-  lab       Start the local visual editing lab
-  validate  Validate template visual editing contracts and empty states
-  update    Update DENEB & Fivora packages to latest
-  pack      Quick-package a clean, upload-ready ZIP without junk files (node_modules, .next, .git, .env)
-  zip       Alias for pack
-  package   Run full preflight verification and generate upload ZIP`);
+Core Commands:
+  init              Auto-convert & configure existing Next.js (shadcn/HeroUI/Tailwind) into editable Fivora template
+  update            Update DENEB packages (@deneb-ui/ui, @deneb-ui/cli) and UI components
+  validate          Validate website configuration and visual editing contracts with Fivora platform
+  doctor            Run comprehensive environment, manifest & asset diagnostic checks
+  zip               Zip the project without unnecessary folders or files (node_modules, .next, .git, .env)
+  validate-and-zip  Validate website configuration and immediately package clean upload-ready ZIP
+
+Development & Scaffolding:
+  add <component>   Add or update a DENEB UI component in src/components/ui/ (e.g. deneb add product-card)
+  create <name>     Scaffold a new storefront template (e.g. deneb create my-store)
+  lab               Start the local visual editing lab simulation
+  pack              Alias for zip
+  package           Run strict sandbox preflight verification and generate upload ZIP
+
+Examples:
+  deneb doctor
+  deneb init
+  deneb update
+  deneb validate .
+  deneb validate --zip
+  deneb validate-and-zip
+  deneb zip .
+  deneb add product-card
+  deneb add all`);
   process.exit(1);
 }
+