@o2vend/theme-cli 1.0.34 → 1.0.36

package/lib/lib/dev-server.js

@@ -1,6 +1,11 @@
 /**
  * Development Server
  * Express server for local theme development with hot reload
+ *
+ * Developer guideline: Do NOT add theme-specific CSS class hardcodes (e.g. targeting
+ * .mobile-bottom-nav, .site-header, etc.) in this file. Such fixes would force theme
+ * developers to use those exact class names. Theme behavior and styling must remain
+ * entirely under the theme; the CLI only serves assets, proxies, and generic tooling.
  */
 
 const express = require('express');
@@ -11,6 +16,7 @@ const WidgetService = require('./widget-service');
 const O2VendApiClient = require('./api-client');
 const { setupHotReload } = require('./hot-reload');
 const chalk = require('chalk');
+const webstoreApi = require('./webstoreapi-fetcher');
 
 class DevServer {
   constructor(options = {}) {
@@ -20,6 +26,7 @@ class DevServer {
     this.mode = options.mode || 'mock'; // 'mock' or 'real'
     this.mockApiPort = options.mockApiPort || 3001;
     this.openBrowser = options.open !== false;
+    this.debug = options.debug || process.env.O2VEND_DEBUG === 'true' || process.env.DEBUG === 'true';
     
     this.app = express();
     this.server = null;
@@ -130,29 +137,33 @@ class DevServer {
         // Only process if it contains actual Liquid variables, not just comments
         if (cssContent.includes('{{') && cssContent.includes('settings.')) {
           try {
-            // Load settings from theme config (already extracts 'current' section)
             const settings = this.loadThemeSettings();
-            
-            // Process through Liquid
             const processedCss = await this.liquid.parseAndRender(cssContent, { settings });
-            
             res.setHeader('Content-Type', 'text/css; charset=utf-8');
             res.setHeader('Cache-Control', 'no-cache');
             return res.send(processedCss);
           } catch (liquidError) {
             console.error(`[CSS] Liquid processing error for ${relativePath}:`, liquidError.message);
-            // Fall through to serve static file
           }
         }
         
-        // Serve static file if no Liquid processing needed or if processing failed
         res.setHeader('Content-Type', 'text/css; charset=utf-8');
-        res.sendFile(normalizedPath);
+        res.sendFile(relativePath, { root: path.join(this.themePath, 'assets') });
       } catch (error) {
         console.error(`[CSS] Error processing ${req.path}:`, error.message);
         next();
       }
     });
+
+    // Explicit logo route so /assets/logo.png always serves correctly (avoids broken image)
+    this.app.get('/assets/logo.png', (req, res) => {
+      const logoPath = path.join(this.themePath, 'assets', 'logo.png');
+      if (!fs.existsSync(logoPath)) {
+        return res.status(404).setHeader('Content-Type', 'text/plain').end('Logo not found');
+      }
+      res.setHeader('Content-Type', 'image/png');
+      res.sendFile('logo.png', { root: path.join(this.themePath, 'assets') });
+    });
     
     // Static files (theme assets) with proper MIME types
     this.app.use('/assets', express.static(path.join(this.themePath, 'assets'), {
@@ -225,37 +236,36 @@ class DevServer {
 
   /**
    * Setup API client and widget service
+   * Real mode: no apiClient (use webstoreapi-fetcher only). WidgetService with null for getTemplateSlug.
+   * Mock mode: apiClient created in start() after mock API; WidgetService uses it.
    */
   async setupServices() {
     if (this.mode === 'real') {
-      // Real API mode - create API client from environment
-      const tenantId = process.env.O2VEND_TENANT_ID;
-      const apiKey = process.env.O2VEND_API_KEY;
       const baseUrl = process.env.O2VEND_API_BASE_URL;
-      
-      if (!tenantId || !apiKey || !baseUrl) {
-        console.warn(chalk.yellow('⚠️  Real API mode requires O2VEND_TENANT_ID, O2VEND_API_KEY, and O2VEND_API_BASE_URL'));
+      if (!baseUrl) {
+        console.warn(chalk.yellow('⚠️  Real API mode requires O2VEND_API_BASE_URL (storefront URL, e.g. https://store.myo2vend.com)'));
         console.warn(chalk.yellow('   Falling back to mock mode'));
         this.mode = 'mock';
       } else {
-        this.apiClient = new O2VendApiClient(tenantId, apiKey, baseUrl);
+        this.apiClient = null;
+        this.widgetService = new WidgetService(null, {
+          theme: path.basename(this.themePath),
+          themePath: this.themePath
+        });
       }
     }
-    
-    // In mock mode, create API client - will be updated after mock API starts
-    // We create a placeholder here, actual client will be created in start() after mock API is running
+
     if (this.mode === 'mock') {
-      // Create a temporary client - will be replaced in start() method
       this.apiClient = null;
     }
-    
-    // Create widget service (works with mock or real API)
-    // Note: In mock mode, this will be recreated after mock API starts
-    if (this.apiClient) {
-      this.widgetService = new WidgetService(this.apiClient, {
-        theme: path.basename(this.themePath),
-        themePath: this.themePath
-      });
+
+    if (this.mode === 'mock' || !this.widgetService) {
+      if (this.apiClient) {
+        this.widgetService = new WidgetService(this.apiClient, {
+          theme: path.basename(this.themePath),
+          themePath: this.themePath
+        });
+      }
     }
     
     // Create Liquid engine
@@ -414,15 +424,21 @@ class DevServer {
         // Log context data for debugging
         const widgetSections = Object.keys(context.widgets || {});
         const widgetCounts = widgetSections.map(s => `${s}:${context.widgets[s]?.length || 0}`).join(', ');
-        console.log(`[HOME] Products: ${context.products?.length || 0}, Widgets: [${widgetCounts}], Menus: ${context.menus?.length || 0}`);
+        console.log(`[HOME] Products: ${context.products?.length || 0}, Widgets: [${widgetCounts}], Menus: ${Object.keys(context.menus || {}).length}`);
         
         // Ensure products are available
         if (!context.products || context.products.length === 0) {
           console.warn('[HOME] No products in context, attempting reload...');
           try {
-            if (this.apiClient) {
+            if (this.mode === 'real') {
+              const res = await webstoreApi.fetchProducts({ limit: 50, offset: 0 }, { headers: req.headers.cookie ? { Cookie: req.headers.cookie } : {} });
+              context.products = res?.products || res?.Products || [];
+              context.products = this.enrichProductsData(context.products);
+              console.log(`[HOME] Reloaded ${context.products.length} products (real)`);
+            } else if (this.apiClient) {
               const productsResponse = await this.apiClient.getProducts({ limit: 50, offset: 0 });
               context.products = productsResponse.products || productsResponse.data?.products || [];
+              context.products = this.enrichProductsData(context.products);
               console.log(`[HOME] Reloaded ${context.products.length} products`);
             } else {
               console.error('[HOME] API client not available');
@@ -431,25 +447,25 @@ class DevServer {
             console.error('[HOME] Failed to reload products:', error.message);
           }
         }
-        
-        // Ensure widgets are available
+
         if (!context.widgets || Object.keys(context.widgets).length === 0) {
           console.warn('[HOME] No widgets in context, attempting reload...');
           try {
-            if (this.widgetService) {
-              const widgets = await this.widgetService.getWidgetsBySections();
-              context.widgets = widgets || { hero: [], content: [], footer: [] };
-              console.log(`[HOME] Reloaded widgets: ${Object.keys(context.widgets).join(', ')}`);
+            if (this.mode === 'real') {
+              const opts = { headers: req.headers.cookie ? { Cookie: req.headers.cookie } : {} };
+              context.widgets = await webstoreApi.fetchWidgetsBySections('home', webstoreApi.DEFAULT_SECTIONS, opts) || { hero: [], content: [], footer: [] };
+              console.log(`[HOME] Reloaded widgets (real)`);
+            } else if (this.widgetService) {
+              context.widgets = await this.widgetService.fetchPageWidgets('home');
             } else {
-              console.error('[HOME] Widget service not available');
-              context.widgets = { hero: [], content: [], footer: [] };
+              context.widgets = { header: [], hero: [], content: [], footer: [] };
             }
           } catch (error) {
             console.error('[HOME] Failed to reload widgets:', error.message);
-            context.widgets = { hero: [], content: [], footer: [] };
+            context.widgets = { header: [], hero: [], content: [], footer: [] };
           }
         }
-        
+
         const html = await renderWithLayout(this.liquid, 'templates/index', context, this.themePath);
         res.setHeader('Content-Type', 'text/html; charset=utf-8');
         res.setHeader('Cache-Control', 'no-cache');
@@ -471,22 +487,22 @@ class DevServer {
         if (categoryFilter) {
           console.log(`[PRODUCTS PAGE] Filtering by category: ${categoryFilter}`);
           
-          // Find category by name or handle (case-insensitive)
-          const category = context.categories?.find(c => 
-            (c.name && c.name.toLowerCase() === categoryFilter.toLowerCase()) ||
-            (c.handle && c.handle.toLowerCase() === categoryFilter.toLowerCase())
-          );
+          const cf = (categoryFilter || '').toLowerCase();
+          const category = context.categories?.find(c => {
+            const ch = (c.handle || '').toLowerCase();
+            const cs = (c.slug || '').toLowerCase();
+            const cn = (c.name || '').toLowerCase();
+            const cnNorm = (c.name || '').toLowerCase().replace(/\s+/g, '-');
+            return ch === cf || cs === cf || cn === cf || cnNorm === cf;
+          });
           
           if (category) {
             console.log(`[PRODUCTS PAGE] Found category: ${category.name} (ID: ${category.id})`);
             
-            // Filter products by categoryId and enrich them
-            const filteredProducts = context.products
-              .filter(p => 
-                p.categoryId === category.id || 
-                String(p.categoryId).toLowerCase() === String(category.id).toLowerCase()
-              )
-              .map(p => this.enrichProductData(p)); // Enrich each product
+            const filtered = context.products.filter(p => this.productMatchesCategory(p, category));
+            const filteredProducts = this.mode === 'real'
+              ? filtered
+              : filtered.map(p => this.enrichProductData(p));
             
             // CRITICAL: Set both context.products and context.collection.products to the SAME enriched array
             // This ensures they always reference the same objects (like widgets do)
@@ -507,14 +523,11 @@ class DevServer {
           }
         }
         
-        // Ensure all products have proper data: URL, name/title, price, images
-        // Only enrich if not already enriched (check if first product has url field)
-        if (context.products && context.products.length > 0 && !context.products[0].url && !context.products[0].link) {
-          console.log(`[PRODUCTS PAGE] Products need enrichment - enriching now...`);
-          context.products = this.enrichProductsData(context.products);
-        } else if (context.products && context.products.length > 0) {
-          // Products already enriched
-          console.log(`[PRODUCTS PAGE] Products already enriched, first product has URL: ${context.products[0].url || context.products[0].link}`);
+        if (context.products && context.products.length > 0 && this.mode !== 'real') {
+          if (!context.products[0].url && !context.products[0].link) {
+            console.log(`[PRODUCTS PAGE] Products need enrichment - enriching now...`);
+            context.products = this.enrichProductsData(context.products);
+          }
         }
         
         // Debug: Log sample product data to verify enrichment
@@ -526,7 +539,7 @@ class DevServer {
             price: sample.price || sample.sellingPrice,
             stock: sample.stock,
             inStock: sample.inStock,
-            hasImage: !!(sample.imageUrl || sample.thumbnailImage1)
+            hasImage: !!(sample.imageUrl || sample.thumbnailImage)
           });
         }
         
@@ -535,7 +548,7 @@ class DevServer {
         console.log(`  - Products count: ${context.products?.length || 0}`);
         console.log(`  - Widgets sections: ${Object.keys(context.widgets || {}).join(', ') || 'none'}`);
         console.log(`  - Widgets counts: ${Object.keys(context.widgets || {}).map(s => `${s}:${context.widgets[s]?.length || 0}`).join(', ') || 'none'}`);
-        console.log(`  - Menus count: ${context.menus?.length || 0}`);
+        console.log(`  - Menus count: ${Object.keys(context.menus || {}).length}`);
         console.log(`  - Categories count: ${context.categories?.length || 0}`);
         console.log(`  - Brands count: ${context.brands?.length || 0}`);
         
@@ -543,23 +556,26 @@ class DevServer {
         if (!context.products || context.products.length === 0) {
           console.warn('[PRODUCTS PAGE] ⚠️  No products in context, attempting to reload...');
           try {
-            const queryParams = {};
+            const queryParams = { limit: 50, offset: 0 };
             if (categoryFilter) {
-              // Find category and filter by categoryId
-              const category = context.categories?.find(c => 
-                (c.name && c.name.toLowerCase() === categoryFilter.toLowerCase()) ||
-                (c.handle && c.handle.toLowerCase() === categoryFilter.toLowerCase())
-              );
-              if (category) {
-                queryParams.categoryId = category.id;
-              }
+              const cf = (categoryFilter || '').toLowerCase();
+              const cat = context.categories?.find(c => {
+                const ch = (c.handle || '').toLowerCase();
+                const cs = (c.slug || '').toLowerCase();
+                const cn = (c.name || '').toLowerCase();
+                const cnNorm = (c.name || '').toLowerCase().replace(/\s+/g, '-');
+                return ch === cf || cs === cf || cn === cf || cnNorm === cf;
+              });
+              if (cat) queryParams.categoryId = cat.id;
+            }
+            if (this.mode === 'real') {
+              const res = await webstoreApi.fetchProducts(queryParams, { headers: req.headers.cookie ? { Cookie: req.headers.cookie } : {} });
+              context.products = this.normalizeProductsForRealMode(res?.products || res?.Products || []);
+            } else if (this.apiClient) {
+              const productsResponse = await this.apiClient.getProducts(queryParams);
+              context.products = productsResponse.products || productsResponse.data?.products || [];
+              context.products = this.enrichProductsData(context.products);
             }
-            const productsResponse = await this.apiClient.getProducts({ limit: 50, offset: 0, ...queryParams });
-            context.products = productsResponse.products || productsResponse.data?.products || [];
-            
-            // Ensure URLs and all product data are set
-            context.products = this.enrichProductsData(context.products);
-            
             console.log(`[PRODUCTS PAGE] ✅ Reloaded ${context.products.length} products`);
             if (context.products.length > 0) {
               const sample = context.products[0];
@@ -579,7 +595,7 @@ class DevServer {
           if (context.products.length > 0) {
             const sampleProduct = context.products[0];
             const hasStock = 'stock' in sampleProduct || 'quantity' in sampleProduct;
-            const hasImage = sampleProduct.thumbnailImage1 || sampleProduct.imageUrl || (sampleProduct.images && sampleProduct.images.length > 0);
+            const hasImage = sampleProduct.thumbnailImage || sampleProduct.imageUrl || (sampleProduct.images && sampleProduct.images.length > 0);
             const hasUrl = sampleProduct.url || sampleProduct.link;
             // Use nullish coalescing to show 0 values correctly
             const stockValue = sampleProduct.stock ?? sampleProduct.quantity ?? 'N/A';
@@ -594,37 +610,25 @@ class DevServer {
           }
         }
         
-        // Ensure widgets are available (they should be from buildContext, but double-check)
         if (!context.widgets || Object.keys(context.widgets).length === 0) {
-          console.warn('[PRODUCTS PAGE] ⚠️  No widgets in context, attempting to reload...');
+          console.warn('[PRODUCTS PAGE] No widgets in context, attempting reload...');
           try {
-            if (this.widgetService) {
-              const widgets = await this.widgetService.getWidgetsBySections();
-              context.widgets = widgets || { hero: [], content: [], footer: [], header: [] };
-              console.log(`[PRODUCTS PAGE] ✅ Reloaded widgets: ${Object.keys(context.widgets).join(', ')}`);
+            if (this.mode === 'real') {
+              const opts = { headers: req.headers.cookie ? { Cookie: req.headers.cookie } : {} };
+              context.widgets = await webstoreApi.fetchWidgetsBySections('products', webstoreApi.DEFAULT_SECTIONS, opts) || { header: [], hero: [], content: [], footer: [] };
+            } else if (this.widgetService) {
+              context.widgets = await this.widgetService.fetchPageWidgets('products');
             } else {
-              console.error('[PRODUCTS PAGE] ❌ Widget service not available');
-              context.widgets = { hero: [], content: [], footer: [], header: [] };
+              context.widgets = { header: [], hero: [], content: [], footer: [] };
             }
           } catch (error) {
-            console.error('[PRODUCTS PAGE] ❌ Failed to reload widgets:', error.message);
-            context.widgets = { hero: [], content: [], footer: [], header: [] };
+            console.error('[PRODUCTS PAGE] Failed to reload widgets:', error.message);
+            context.widgets = { header: [], hero: [], content: [], footer: [] };
           }
         }
-        
-        // Ensure menus are available
-        if (!context.menus || context.menus.length === 0) {
-          console.warn('[PRODUCTS PAGE] ⚠️  No menus in context, attempting to reload...');
-          try {
-            const axios = require('axios');
-            const menusResponse = await axios.get(`http://localhost:${this.mockApiPort}/webstoreapi/menus`);
-            const menusData = menusResponse.data;
-            context.menus = Array.isArray(menusData) ? menusData : (menusData.data?.menus || menusData.menus || []);
-            console.log(`[PRODUCTS PAGE] ✅ Reloaded ${context.menus.length} menus`);
-          } catch (error) {
-            console.error('[PRODUCTS PAGE] ❌ Failed to reload menus:', error.message);
-            context.menus = [];
-          }
+
+        if (!context.menus || Object.keys(context.menus).length === 0) {
+          console.warn('[PRODUCTS PAGE] No menus in context');
         }
         
         // Ensure collection.products is set for products template
@@ -663,9 +667,9 @@ class DevServer {
               stockQuantity: sample.stockQuantity !== undefined ? sample.stockQuantity : 'MISSING',
               inStock: sample.inStock !== undefined ? sample.inStock : 'MISSING',
               available: sample.available !== undefined ? sample.available : 'MISSING',
-              hasImage: !!(sample.imageUrl || sample.thumbnailImage1),
-              imageUrl: sample.imageUrl || sample.thumbnailImage1?.url || 'MISSING',
-              hasThumbnailImage1: !!sample.thumbnailImage1,
+              hasImage: !!(sample.imageUrl || sample.thumbnailImage),
+              imageUrl: sample.imageUrl || sample.thumbnailImage?.url || 'MISSING',
+              hasThumbnailImage: !!sample.thumbnailImage,
               hasImagesArray: !!(sample.images && sample.images.length > 0)
             });
           } else {
@@ -687,10 +691,10 @@ class DevServer {
             title: firstProduct.title || firstProduct.name,
             url: firstProduct.url || firstProduct.link,
             price: firstProduct.price || firstProduct.sellingPrice,
-            stock: firstProduct.stock,
+            stockQuantity: firstProduct.stockQuantity,
             inStock: firstProduct.inStock,
-            hasImage: !!(firstProduct.imageUrl || firstProduct.thumbnailImage1),
-            imageUrl: firstProduct.imageUrl || firstProduct.thumbnailImage1?.url
+            hasImage: !!(firstProduct.imageUrl || firstProduct.thumbnailImage),
+            imageUrl: firstProduct.imageUrl || firstProduct.thumbnailImage
           });
         }
         if (context.collection) {
@@ -842,62 +846,32 @@ class DevServer {
       }
     });
 
-    // Collections listing page (uses categories.liquid template per webstore)
-    this.app.get('/collections', async (req, res, next) => {
-      try {
-        const context = await this.buildContext(req, 'collections');
-        // Try categories.liquid first (as per webstore), then collections.liquid, then collection.liquid
-        let html;
-        try {
-          html = await renderWithLayout(this.liquid, 'templates/categories', context, this.themePath);
-        } catch (error) {
-          if (error.message && error.message.includes('Template not found')) {
-            try {
-              html = await renderWithLayout(this.liquid, 'templates/collections', context, this.themePath);
-            } catch (error2) {
-              html = await renderWithLayout(this.liquid, 'templates/collection', context, this.themePath);
-            }
-          } else {
-            throw error;
-          }
-        }
-        res.setHeader('Content-Type', 'text/html; charset=utf-8');
-        res.setHeader('Cache-Control', 'no-cache');
-        res.send(html);
-      } catch (error) {
-        next(error);
-      }
+    this.app.get('/collections', (req, res) => {
+      res.redirect(301, '/categories');
     });
 
     // Collection detail page - Try categories first, then collection
     this.app.get('/collections/:handle', async (req, res, next) => {
       try {
         const context = await this.buildContext(req, 'collection', { collectionHandle: req.params.handle });
-        // Set category in context based on handle
-        const category = context.categories?.find(c => 
-          c.handle === req.params.handle || 
-          c.name?.toLowerCase().replace(/\s+/g, '-') === req.params.handle
-        );
+        const h = (req.params.handle || '').toLowerCase();
+        const category = context.categories?.find(c => {
+          const ch = (c.handle || '').toLowerCase();
+          const cs = (c.slug || '').toLowerCase();
+          const cn = (c.name || '').toLowerCase().replace(/\s+/g, '-');
+          return ch === h || cs === h || cn === h;
+        });
         if (category) {
           context.category = category;
           context.collection = category;
-          
-          // Filter products by this category and enrich them
-          const filteredProducts = (context.products || [])
-            .filter(p => 
-              p.categoryId === category.id || 
-              String(p.categoryId).toLowerCase() === String(category.id).toLowerCase()
-            )
-            .map(p => this.enrichProductData(p));
-          
+          const filtered = (context.products || []).filter(p => this.productMatchesCategory(p, category));
+          const filteredProducts = this.mode === 'real' ? filtered : filtered.map(p => this.enrichProductData(p));
           context.collection.products = filteredProducts;
           context.collection.totalProducts = filteredProducts.length;
-          context.products = filteredProducts; // Also set in products array for consistency
-          
+          context.products = filteredProducts;
           console.log(`[COLLECTION PAGE] Category: ${category.name}, Products: ${filteredProducts.length}`);
         } else {
-          // No category found, use all products with enrichment
-          context.products = this.enrichProductsData(context.products || []);
+          if (this.mode !== 'real') context.products = this.enrichProductsData(context.products || []);
           context.collection = context.collection || {};
           context.collection.products = context.products;
         }
@@ -956,30 +930,24 @@ class DevServer {
     this.app.get('/categories/:handle', async (req, res, next) => {
       try {
         const context = await this.buildContext(req, 'collection', { collectionHandle: req.params.handle });
-        const category = context.categories?.find(c => 
-          c.handle === req.params.handle || 
-          c.name?.toLowerCase().replace(/\s+/g, '-') === req.params.handle
-        );
+        const h = (req.params.handle || '').toLowerCase();
+        const category = context.categories?.find(c => {
+          const ch = (c.handle || '').toLowerCase();
+          const cs = (c.slug || '').toLowerCase();
+          const cn = (c.name || '').toLowerCase().replace(/\s+/g, '-');
+          return ch === h || cs === h || cn === h;
+        });
         if (category) {
           context.category = category;
           context.collection = category;
-          
-          // Filter products by this category and enrich them
-          const filteredProducts = (context.products || [])
-            .filter(p => 
-              p.categoryId === category.id || 
-              String(p.categoryId).toLowerCase() === String(category.id).toLowerCase()
-            )
-            .map(p => this.enrichProductData(p));
-          
+          const filtered = (context.products || []).filter(p => this.productMatchesCategory(p, category));
+          const filteredProducts = this.mode === 'real' ? filtered : filtered.map(p => this.enrichProductData(p));
           context.collection.products = filteredProducts;
           context.collection.totalProducts = filteredProducts.length;
-          context.products = filteredProducts; // Also set in products array for consistency
-          
+          context.products = filteredProducts;
           console.log(`[CATEGORY PAGE] Category: ${category.name}, Products: ${filteredProducts.length}`);
         } else {
-          // No category found, use all products with enrichment
-          context.products = this.enrichProductsData(context.products || []);
+          if (this.mode !== 'real') context.products = this.enrichProductsData(context.products || []);
           context.collection = context.collection || {};
           context.collection.products = context.products;
         }
@@ -1107,41 +1075,38 @@ class DevServer {
       try {
         const context = await this.buildContext(req, 'page', { pageHandle: req.params.handle });
         
-        // Load page content from shopfront API (mock)
+        // Load page content
         try {
-          const axios = require('axios');
-          const pageResponse = await axios.get(`http://localhost:${this.mockApiPort}/shopfront/api/v2/page/${req.params.handle}`);
-          if (pageResponse.data) {
-            context.page = {
-              ...context.page,
-              ...pageResponse.data,
-              body_html: pageResponse.data.content || pageResponse.data.htmlContent,
-              content: pageResponse.data.content || pageResponse.data.htmlContent
-            };
-          }
-        } catch (error) {
-          console.warn(`[PAGE] Failed to load landing page for ${req.params.handle}:`, error.message);
-          // Fallback to mock API pages endpoint
-          try {
-            const axios = require('axios');
-            const pageResponse = await axios.get(`http://localhost:${this.mockApiPort}/webstoreapi/pages/${req.params.handle}`);
-            if (pageResponse.data) {
+          if (this.mode === 'real') {
+            const pageData = await webstoreApi.fetchPage(req.params.handle, { headers: req.headers.cookie ? { Cookie: req.headers.cookie } : {} });
+            if (pageData) {
               context.page = {
                 ...context.page,
-                ...pageResponse.data,
-                body_html: pageResponse.data.content,
-                content: pageResponse.data.content
+                ...pageData,
+                body_html: pageData.content || pageData.body_html,
+                content: pageData.content || pageData.body_html
               };
             }
-          } catch (fallbackError) {
-            context.page = {
-              ...context.page,
-              title: req.params.handle.charAt(0).toUpperCase() + req.params.handle.slice(1).replace(/-/g, ' '),
-              handle: req.params.handle,
-              body_html: `<h2>${req.params.handle.charAt(0).toUpperCase() + req.params.handle.slice(1).replace(/-/g, ' ')}</h2><p>Landing page content coming soon.</p>`,
-              content: `<h2>${req.params.handle.charAt(0).toUpperCase() + req.params.handle.slice(1).replace(/-/g, ' ')}</h2><p>Landing page content coming soon.</p>`
-            };
+          } else {
+            const axios = require('axios');
+            try {
+              const pageResponse = await axios.get(`http://localhost:${this.mockApiPort}/shopfront/api/v2/page/${req.params.handle}`);
+              if (pageResponse.data) {
+                context.page = { ...context.page, ...pageResponse.data, body_html: pageResponse.data.content || pageResponse.data.htmlContent, content: pageResponse.data.content || pageResponse.data.htmlContent };
+              }
+            } catch (e) {
+              const fallback = await axios.get(`http://localhost:${this.mockApiPort}/webstoreapi/pages/${req.params.handle}`);
+              if (fallback.data) {
+                context.page = { ...context.page, ...fallback.data, body_html: fallback.data.content, content: fallback.data.content };
+              }
+            }
           }
+        } catch (error) {
+          console.warn(`[PAGE] Failed to load page for ${req.params.handle}:`, error.message);
+        }
+        if (!context.page.body_html && !context.page.content) {
+          const t = req.params.handle.charAt(0).toUpperCase() + req.params.handle.slice(1).replace(/-/g, ' ');
+          context.page = { ...context.page, title: t, handle: req.params.handle, body_html: `<h2>${t}</h2><p>Landing page content coming soon.</p>`, content: `<h2>${t}</h2><p>Landing page content coming soon.</p>` };
         }
         
         // Try page.liquid template first, then fallback to rendering raw HTML
@@ -1168,30 +1133,27 @@ class DevServer {
       try {
         const context = await this.buildContext(req, 'page', { pageHandle: req.params.handle });
         
-        // Load page content from mock API
         try {
-          const axios = require('axios');
-          const pageResponse = await axios.get(`http://localhost:${this.mockApiPort}/webstoreapi/pages/${req.params.handle}`);
-          if (pageResponse.data) {
-            context.page = {
-              ...context.page,
-              ...pageResponse.data,
-              body_html: pageResponse.data.content,
-              content: pageResponse.data.content
-            };
+          if (this.mode === 'real') {
+            const pageData = await webstoreApi.fetchPage(req.params.handle, { headers: req.headers.cookie ? { Cookie: req.headers.cookie } : {} });
+            if (pageData) {
+              context.page = { ...context.page, ...pageData, body_html: pageData.content || pageData.body_html, content: pageData.content || pageData.body_html };
+            }
+          } else {
+            const axios = require('axios');
+            const pageResponse = await axios.get(`http://localhost:${this.mockApiPort}/webstoreapi/pages/${req.params.handle}`);
+            if (pageResponse.data) {
+              context.page = { ...context.page, ...pageResponse.data, body_html: pageResponse.data.content, content: pageResponse.data.content };
+            }
           }
         } catch (error) {
           console.warn(`[PAGE] Failed to load page content for ${req.params.handle}:`, error.message);
-          // Set default page content
-          context.page = {
-            ...context.page,
-            title: req.params.handle.charAt(0).toUpperCase() + req.params.handle.slice(1).replace(/-/g, ' '),
-            handle: req.params.handle,
-            body_html: `<h2>${req.params.handle.charAt(0).toUpperCase() + req.params.handle.slice(1).replace(/-/g, ' ')}</h2><p>Page content coming soon.</p>`,
-            content: `<h2>${req.params.handle.charAt(0).toUpperCase() + req.params.handle.slice(1).replace(/-/g, ' ')}</h2><p>Page content coming soon.</p>`
-          };
         }
-        
+        if (!context.page.body_html && !context.page.content) {
+          const t = req.params.handle.charAt(0).toUpperCase() + req.params.handle.slice(1).replace(/-/g, ' ');
+          context.page = { ...context.page, title: t, handle: req.params.handle, body_html: `<h2>${t}</h2><p>Page content coming soon.</p>`, content: `<h2>${t}</h2><p>Page content coming soon.</p>` };
+        }
+
         const html = await renderWithLayout(this.liquid, 'templates/page', context, this.themePath);
         res.setHeader('Content-Type', 'text/html; charset=utf-8');
         res.setHeader('Cache-Control', 'no-cache');
@@ -1201,6 +1163,55 @@ class DevServer {
       }
     });
 
+    this.app.get('/dev/context', async (req, res, next) => {
+      try {
+        const pageType = req.query.page || 'home';
+        const context = await this.buildContext(req, pageType);
+        const debugOutput = {
+          mode: this.mode,
+          pageType,
+          shopKeys: Object.keys(context.shop || {}),
+          shop: context.shop,
+          store: context.store,
+          menusKeys: Object.keys(context.menus || {}),
+          mainMenu: context.mainMenu ? { name: context.mainMenu.name, itemCount: context.mainMenu.items?.length } : null,
+          widgetSections: Object.fromEntries(
+            Object.entries(context.widgets || {}).map(([k, v]) =>
+              [k, Array.isArray(v) ? v.map(w => ({ type: w.type, id: w.id, template_path: w.template_path })) : v]
+            )
+          ),
+          productsCount: (context.products || []).length,
+          categoriesCount: (context.categories || []).length,
+          brandsCount: (context.brands || []).length,
+          cart: context.cart,
+          customer: context.customer,
+          request: context.request,
+          deliveryZone: context.deliveryZone,
+          analytics: context.analytics,
+          settingsKeys: Object.keys(context.settings || {}),
+          sampleProduct: (context.products || [])[0] ? {
+            id: context.products[0].id,
+            slug: context.products[0].slug,
+            url: context.products[0].url,
+            stockQuantity: context.products[0].stockQuantity,
+            inStock: context.products[0].inStock,
+            available: context.products[0].available,
+            prices: context.products[0].prices,
+            thumbnailImage: context.products[0].thumbnailImage
+          } : null,
+          sampleCategory: (context.categories || [])[0] ? {
+            id: context.categories[0].id,
+            slug: context.categories[0].slug,
+            handle: context.categories[0].handle,
+            thumbnailImage: context.categories[0].thumbnailImage
+          } : null
+        };
+        res.json(debugOutput);
+      } catch (error) {
+        next(error);
+      }
+    });
+
     // Development Dashboard - List all theme components
     this.app.get('/dev', async (req, res, next) => {
       try {
@@ -1249,10 +1260,13 @@ class DevServer {
         const widgetType = req.params.type.replace(/\.liquid$/, '');
         const context = await this.buildContext(req, 'home');
         
-        // Ensure products are loaded for widget context (needed for product widgets)
         if (!context.products || context.products.length === 0) {
           try {
-            if (this.apiClient) {
+            if (this.mode === 'real') {
+              const res = await webstoreApi.fetchProducts({ limit: 50, offset: 0 }, { headers: req.headers.cookie ? { Cookie: req.headers.cookie } : {} });
+              context.products = this.normalizeProductsForRealMode(res?.products || res?.Products || []);
+              console.log(`[DEV WIDGET] Loaded ${context.products.length} products (real)`);
+            } else if (this.apiClient) {
               const productsResponse = await this.apiClient.getProducts({ limit: 50, offset: 0 });
               context.products = productsResponse.products || productsResponse.data?.products || [];
               console.log(`[DEV WIDGET] Loaded ${context.products.length} products for widget context`);
@@ -1408,32 +1422,22 @@ class DevServer {
         // Build context to get categories, brands, and products
         const context = await this.buildContext(req, 'collection', { collectionHandle: handle });
         
-        // Try to find category by handle (case-insensitive)
-        const category = context.categories?.find(c => 
-          (c.handle && c.handle.toLowerCase() === handle.toLowerCase()) ||
-          (c.name && c.name.toLowerCase().replace(/\s+/g, '-') === handle.toLowerCase())
-        );
+        // Try to find category by handle or slug (case-insensitive)
+        const h = handle.toLowerCase();
+        const category = context.categories?.find(c => {
+          const ch = (c.handle || '').toLowerCase();
+          const cs = (c.slug || '').toLowerCase();
+          const cn = (c.name || '').toLowerCase().replace(/\s+/g, '-');
+          return ch === h || cs === h || cn === h;
+        });
         
         if (category) {
-          // Found a category - render products list (NOT categories list)
           context.category = category;
           context.collection = category;
-          
           console.log(`[ROOT COLLECTION] Found category: ${category.name} (ID: ${category.id})`);
           console.log(`[ROOT COLLECTION] Total products in context: ${context.products?.length || 0}`);
-          
-          // Filter products by this category and enrich them
-          const filteredProducts = (context.products || [])
-            .filter(p => {
-              const matches = p.categoryId === category.id || 
-                             String(p.categoryId).toLowerCase() === String(category.id).toLowerCase();
-              if (matches) {
-                console.log(`[ROOT COLLECTION] Product matches: ${p.title || p.name || p.id}, categoryId: ${p.categoryId}`);
-              }
-              return matches;
-            })
-            .map(p => this.enrichProductData(p)); // Enrich each product
-          
+          const filtered = (context.products || []).filter(p => this.productMatchesCategory(p, category));
+          const filteredProducts = this.mode === 'real' ? filtered : filtered.map(p => this.enrichProductData(p));
           console.log(`[ROOT COLLECTION] Filtered products count: ${filteredProducts.length}`);
           
           // Log sample enriched products
@@ -1446,8 +1450,8 @@ class DevServer {
                 price: product.price || product.sellingPrice,
                 stock: product.stock,
                 inStock: product.inStock,
-                hasImage: !!(product.imageUrl || product.thumbnailImage1),
-                imageUrl: product.imageUrl || product.thumbnailImage1?.url
+                hasImage: !!(product.imageUrl || product.thumbnailImage),
+                imageUrl: product.imageUrl || product.thumbnailImage?.url
               });
             });
           }
@@ -1476,8 +1480,8 @@ class DevServer {
               price: sample.price || sample.sellingPrice,
               stock: sample.stock,
               inStock: sample.inStock,
-              hasImage: !!(sample.imageUrl || sample.thumbnailImage1),
-              imageUrl: sample.imageUrl || sample.thumbnailImage1?.url,
+              hasImage: !!(sample.imageUrl || sample.thumbnailImage),
+              imageUrl: sample.imageUrl || sample.thumbnailImage?.url,
               allKeys: Object.keys(sample).slice(0, 20)
             });
           } else {
@@ -1502,9 +1506,9 @@ class DevServer {
               title: firstProduct.title || firstProduct.name,
               url: firstProduct.url || firstProduct.link,
               price: firstProduct.price || firstProduct.sellingPrice,
-              stock: firstProduct.stock,
+              stockQuantity: firstProduct.stockQuantity,
               inStock: firstProduct.inStock,
-              hasImage: !!(firstProduct.imageUrl || firstProduct.thumbnailImage1)
+              hasImage: !!(firstProduct.imageUrl || firstProduct.thumbnailImage)
             });
           }
           
@@ -1536,17 +1540,13 @@ class DevServer {
         );
         
         if (brand) {
-          // Found a brand - render products list
           context.brand = brand;
-          
-          // Filter products by this brand and enrich them
-          const filteredProducts = (context.products || [])
-            .filter(p => 
-              p.brandId === brand.id || 
-              String(p.brandId).toLowerCase() === String(brand.id).toLowerCase() ||
-              (p.brand && p.brand.toLowerCase() === brand.name.toLowerCase())
-            )
-            .map(p => this.enrichProductData(p));
+          const filtered = (context.products || []).filter(p =>
+            p.brandId === brand.id ||
+            String(p.brandId).toLowerCase() === String(brand.id).toLowerCase() ||
+            (p.brand && p.brand.toLowerCase() === brand.name.toLowerCase())
+          );
+          const filteredProducts = this.mode === 'real' ? filtered : filtered.map(p => this.enrichProductData(p));
           
           context.brand.products = filteredProducts;
           context.products = filteredProducts;
@@ -1604,28 +1604,45 @@ class DevServer {
           }
         }
         
-        // Not found - pass to next middleware (will eventually 404)
-        next();
+        // Not a category, brand, or product -- try as a CMS page
+        {
+          const pageContext = await this.buildContext(req, 'page', { pageHandle: handle });
+          pageContext.page = { title: handle.replace(/-/g, ' ').replace(/\b\w/g, c => c.toUpperCase()), handle: handle };
+          let html;
+          const pageTemplates = ['templates/page', 'templates/pages'];
+          for (const template of pageTemplates) {
+            try {
+              html = await renderWithLayout(this.liquid, template, pageContext, this.themePath);
+              break;
+            } catch (error) {
+              if (!error.message?.includes('Template not found')) throw error;
+            }
+          }
+          if (html) {
+            res.setHeader('Content-Type', 'text/html; charset=utf-8');
+            res.setHeader('Cache-Control', 'no-cache');
+            return res.send(html);
+          }
+        }
+
+        // Not found - 404
+        res.status(404).send(`<!DOCTYPE html><html><head><title>Page Not Found</title></head><body><h1>Page Not Found</h1><p>The page "${handle}" was not found.</p><p><a href="/">Back to Home</a></p></body></html>`);
       } catch (error) {
-        // If there's an error, pass to next middleware
+        console.error(`[CATCH-ALL] Error handling /${req.params?.handle}:`, error.message);
         next(error);
       }
     });
 
-    // Favicon handler
+    // Favicon handler: serve from theme assets if present, else 204
     this.app.get('/favicon.ico', (req, res) => {
-      res.status(204).end(); // No Content
+      const faviconPath = path.join(this.themePath, 'assets', 'favicon.ico');
+      if (fs.existsSync(faviconPath)) {
+        res.setHeader('Content-Type', 'image/x-icon');
+        return res.sendFile('favicon.ico', { root: path.join(this.themePath, 'assets') });
+      }
+      res.status(204).end();
     });
 
-    // API proxy (for real API mode)
-    if (this.mode === 'real' && this.apiClient) {
-      this.app.use('/api', (req, res, next) => {
-        // Proxy API requests to real API
-        // This is handled by mock API in mock mode
-        next();
-      });
-    }
-
     // Error handler
     this.app.use((error, req, res, next) => {
       // Ignore request aborted errors - they're harmless (client cancelled request)
@@ -1695,13 +1712,10 @@ class DevServer {
    *    - If template expects 'quantity' instead of 'stock', consider adding both fields
    * 
    * 2. WIDGETS LOADING:
-   *    - Widgets are loaded via widgetService.getWidgetsBySections()
+   *    - Widgets are loaded via widgetService.fetchPageWidgets(pageId)
    *    - Widgets are organized by section (header, hero, content, footer)
-   *    - Widgets should be available for ALL page types (home, products, collection, etc.)
-   *    - If widgets are missing, check:
-   *      a) widgetService is initialized (should be created in setupServices)
-   *      b) Mock API is returning widgets correctly
-   *      c) Widget service is properly organizing widgets by section
+   *    - Widgets are filtered by pageId to match production behavior
+   *    - pageId is derived from pageType: home->home, product->product, collection->category, etc.
    * 
    * 3. MENUS LOADING:
    *    - Menus are loaded from /webstoreapi/menus endpoint
@@ -1716,8 +1730,10 @@ class DevServer {
    * @returns {Promise<Object>} Template context
    */
   async buildContext(req, pageType, extra = {}) {
+    const hostname = `${this.host}:${this.port}`;
     const context = {
       shop: {},
+      store: {},
       tenant: {},
       page: {
         type: pageType,
@@ -1727,29 +1743,40 @@ class DevServer {
       collections: [],
       categories: [],
       brands: [],
-      cart: { 
+      cart: {
         id: 'mock-cart-1',
-        items: [], 
-        total: 0, 
-        itemCount: 0,
-        currency: 'USD',
-        subtotal: 0,
-        tax: 0,
-        shipping: 0
-      },
-      // Mock authenticated customer for dev mode (allows add-to-cart without login)
-      customer: {
-        id: 'mock-customer-1',
-        isAuthenticated: true,
-        firstName: 'Test',
-        lastName: 'User',
-        email: 'test@example.com',
-        phone: '+1234567890',
-        name: 'Test User'
+        items: [],
+        total: 0,
+        subTotal: 0,
+        taxAmount: 0,
+        shippingAmount: 0,
+        itemCount: 0
       },
+      customer: null,
       widgets: {},
       settings: {},
-      menus: [],
+      menus: {},
+      mainMenu: null,
+      request: {
+        path: req.path,
+        url: req.url,
+        host: hostname
+      },
+      deliveryZone: {
+        enabled: false,
+        mode: 0,
+        current: null,
+        zipcodeSearchEnabled: false,
+        defaultZipcode: null,
+        showModal: false
+      },
+      analytics: {
+        enabled: false,
+        baseUrl: null,
+        siteId: null,
+        visitorId: null
+      },
+      content_for_header: '',
       ...extra
     };
 
@@ -1777,63 +1804,54 @@ class DevServer {
       // Use mock API (API client points to mock API via proxy)
       try {
         const storeInfo = await this.apiClient.getStoreInfo(true);
-        context.shop = storeInfo || {
-          name: 'My Store',
-          description: 'O2VEND Store',
-          domain: 'localhost:3000',
-          email: 'store@example.com'
+        const si = storeInfo || {};
+        const storeSettings = si.settings || {};
+        context.shop = {
+          name: si.name || 'My Store',
+          domain: si.domain || hostname,
+          currency: storeSettings.currency || 'USD',
+          currencySymbol: storeSettings.currencySymbol || '$',
+          timezone: storeSettings.timezone || si.timezone || 'America/New_York',
+          language: storeSettings.language || si.language || 'en',
+          logo: si.logoUrl || storeSettings.logo || '/assets/logo.png',
+          favicon: si.favouriteIconUrl || storeSettings.favicon || '/favicon.ico',
+          id: si.id || 1,
+          identifier: si.identifier || 'store',
+          companyName: si.companyName || si.name || 'My Store',
+          companyAddress: si.companyAddress || '',
+          companyPhoneNumber: si.companyPhoneNumber || si.phone || '',
+          companyEmail: si.companyEmail || si.email || '',
+          settings: storeSettings
+        };
+        context.store = {
+          id: context.shop.id,
+          identifier: context.shop.identifier,
+          name: context.shop.name,
+          settings: storeSettings,
+          companyName: context.shop.companyName,
+          companyAddress: context.shop.companyAddress,
+          companyPhoneNumber: context.shop.companyPhoneNumber,
+          companyEmail: context.shop.companyEmail
+        };
+        context.tenant = {
+          id: si.id || 1,
+          name: context.shop.name,
+          settings: storeSettings
         };
         
-        // Get widgets for sections from mock API
-        // NOTE: Widgets should be loaded for ALL page types (home, products, collection, etc.)
-        // The widget service filters widgets by section, so all sections should be available
+        // Load widgets filtered by page type (matches production behavior)
+        const pageIdMap = { home: 'home', product: 'product', collection: 'category', category: 'category', products: 'products', categories: 'categories', brand: 'brand', checkout: 'checkout', page: 'home' };
+        const widgetPageId = pageIdMap[pageType] || 'home';
         if (this.widgetService) {
           try {
-            console.log(`[CONTEXT] Loading widgets for page type: ${pageType}`);
-            const widgets = await this.widgetService.getWidgetsBySections();
-            context.widgets = widgets || {
-              hero: [],
-              products: [],
-              footer: [],
-              content: [],
-              header: []
-            };
-            // Log widget counts by section
-            const widgetCounts = Object.keys(context.widgets).map(section => 
-              `${section}: ${context.widgets[section]?.length || 0}`
-            ).join(', ');
-            console.log(`[CONTEXT] ✅ Widgets loaded: ${widgetCounts}`);
-            
-            // DEBUG: Log detailed widget information
-            Object.keys(context.widgets).forEach(section => {
-              if (context.widgets[section] && context.widgets[section].length > 0) {
-                console.log(`[CONTEXT DEBUG] Section '${section}' has ${context.widgets[section].length} widget(s):`);
-                context.widgets[section].slice(0, 3).forEach((w, idx) => {
-                  console.log(`  - Widget ${idx + 1}: ${w.type || 'Unknown'} (ID: ${w.id || 'no-id'})`);
-                });
-              }
-            });
+            console.log(`[CONTEXT] Loading widgets for page type: ${pageType} (pageId: ${widgetPageId})`);
+            context.widgets = await this.widgetService.fetchPageWidgets(widgetPageId);
           } catch (error) {
-            console.error('[CONTEXT] ❌ Failed to load widgets:', error.message);
-            console.error('[CONTEXT] Error stack:', error.stack);
-            context.widgets = {
-              hero: [],
-              products: [],
-              footer: [],
-              content: [],
-              header: []
-            };
+            console.error('[CONTEXT] Failed to load widgets:', error.message);
+            context.widgets = { header: [], hero: [], content: [], footer: [] };
           }
         } else {
-          console.warn('[CONTEXT] ⚠️  Widget service not available, using empty widgets');
-          console.warn('[CONTEXT] This may happen if widgetService was not initialized properly');
-          context.widgets = {
-            hero: [],
-            products: [],
-            footer: [],
-            content: [],
-            header: []
-          };
+          context.widgets = { header: [], hero: [], content: [], footer: [] };
         }
         
         // Always load products, categories, brands, menus, and cart for navigation and widgets
@@ -1860,32 +1878,17 @@ class DevServer {
                 stockQuantity: product.stockQuantity !== undefined ? product.stockQuantity : 'MISSING',
                 inStock: product.inStock !== undefined ? product.inStock : 'MISSING',
                 available: product.available !== undefined ? product.available : 'MISSING',
-                hasImage: !!(product.imageUrl || product.thumbnailImage1),
-                imageUrl: product.imageUrl || product.thumbnailImage1?.url || 'MISSING'
+                hasImage: !!(product.imageUrl || product.thumbnailImage),
+                imageUrl: product.imageUrl || product.thumbnailImage?.url || 'MISSING'
               });
             });
           }
           
           console.log(`[CONTEXT] Loaded ${context.products.length} products`);
           
-          // DEBUG: Verify products have quantity/stock field
           if (context.products.length > 0) {
-            const firstProduct = context.products[0];
-            const hasStock = 'stock' in firstProduct || 'quantity' in firstProduct;
-            // Use nullish coalescing to show 0 values correctly (0 || 'N/A' would show N/A incorrectly)
-            const stockValue = firstProduct.stock ?? firstProduct.quantity ?? 'N/A';
-            console.log(`[CONTEXT DEBUG] First product sample - Has stock field: ${hasStock}, Stock value: ${stockValue}`);
-            console.log(`[CONTEXT DEBUG] First product keys: ${Object.keys(firstProduct).join(', ')}`);
-            console.log(`[CONTEXT DEBUG] First product stock details: stock=${firstProduct.stock}, quantity=${firstProduct.quantity}, inStock=${firstProduct.inStock}`);
-            
-            // Check if variants have stock
-            if (firstProduct.variants && firstProduct.variants.length > 0) {
-              const firstVariant = firstProduct.variants[0];
-              const variantHasStock = 'stock' in firstVariant || 'quantity' in firstVariant;
-              const variantStockValue = firstVariant.stock ?? firstVariant.quantity ?? 'N/A';
-              console.log(`[CONTEXT DEBUG] First variant sample - Has stock field: ${variantHasStock}, Stock value: ${variantStockValue}`);
-              console.log(`[CONTEXT DEBUG] First variant stock details: stock=${firstVariant.stock}, quantity=${firstVariant.quantity}, inStock=${firstVariant.inStock}, available=${firstVariant.available}`);
-            }
+            const fp = context.products[0];
+            console.log(`[CONTEXT] First product: id=${fp.id}, slug=${fp.slug}, stockQuantity=${fp.stockQuantity}, inStock=${fp.inStock}`);
           }
           
           // Load categories for navigation
@@ -1893,13 +1896,12 @@ class DevServer {
             const categoriesResponse = await this.apiClient.getCategories({ limit: 50, offset: 0 });
             context.categories = categoriesResponse.categories || categoriesResponse.data?.categories || categoriesResponse || [];
             
-            // Ensure all categories have proper URL fields for navigation
             context.categories = context.categories.map(category => {
-              // Set URL to category handle (e.g., /accessories)
-              if (!category.url && !category.link) {
-                const handle = category.handle || category.name?.toLowerCase().replace(/\s+/g, '-') || category.id;
-                category.url = `/${handle}`;
-                category.link = `/${handle}`;
+              if (!category.slug) {
+                category.slug = category.handle || category.name?.toLowerCase().replace(/\s+/g, '-') || String(category.id);
+              }
+              if (!category.handle) {
+                category.handle = category.slug;
               }
               return category;
             });
@@ -1922,30 +1924,40 @@ class DevServer {
             context.brands = [];
           }
           
-          // Load menus (via webstoreapi) - use axios from apiClient
-          // NOTE: Menus are loaded for navigation in header/footer sections
-          // They should be available in context for all page types
           try {
             const axios = require('axios');
-            console.log(`[CONTEXT] Loading menus from http://localhost:${this.mockApiPort}/webstoreapi/menus`);
             const menusResponse = await axios.get(`http://localhost:${this.mockApiPort}/webstoreapi/menus`);
-            const menusData = menusResponse.data;
-            context.menus = Array.isArray(menusData) ? menusData : (menusData.data?.menus || menusData.menus || []);
-            console.log(`[CONTEXT] ✅ Loaded ${context.menus.length} menus`);
-            
-            // DEBUG: Log menu details
-            if (context.menus.length > 0) {
-              context.menus.forEach((menu, idx) => {
-                const itemCount = menu.items?.length || 0;
-                console.log(`[CONTEXT DEBUG] Menu ${idx + 1}: ${menu.name || menu.id || 'unnamed'} (${itemCount} items)`);
-              });
-            } else {
-              console.warn('[CONTEXT DEBUG] ⚠️  No menus loaded - menus array is empty');
+            const rawMenus = menusResponse.data;
+            const allMenus = Array.isArray(rawMenus) ? rawMenus : (rawMenus.data?.menus || rawMenus.menus || []);
+
+            const menusData = {};
+            allMenus.forEach(menu => {
+              if (menu && menu.name) {
+                const normalizedName = menu.name.toLowerCase()
+                  .replace(/\s+menu$/i, '')
+                  .replace(/\s+/g, '_')
+                  .replace(/[^a-z0-9_]/g, '');
+                menusData[normalizedName] = menu;
+              }
+            });
+            menusData.all = allMenus;
+            context.menus = menusData;
+
+            const mainMenuData = allMenus.find(menu => menu && menu.type === 'Main Menu');
+            if (mainMenuData) {
+              if (mainMenuData.items && Array.isArray(mainMenuData.items)) {
+                mainMenuData.items.sort((a, b) => (a?.displayOrder || 0) - (b?.displayOrder || 0));
+              }
+              context.mainMenu = mainMenuData;
+            } else if (allMenus.length > 0) {
+              context.mainMenu = allMenus[0];
             }
+
+            console.log(`[CONTEXT] Loaded ${allMenus.length} menus`);
           } catch (error) {
-            console.error('[CONTEXT] ❌ Failed to load menus:', error.message);
-            console.error('[CONTEXT] Error details:', error.response?.status, error.response?.data);
-            context.menus = [];
+            console.error('[CONTEXT] Failed to load menus:', error.message);
+            context.menus = {};
+            context.mainMenu = null;
           }
           
           // Load cart data
@@ -2029,73 +2041,212 @@ class DevServer {
         }
       } catch (error) {
         console.warn('[CONTEXT] Failed to load from mock API:', error.message);
-        // Fallback to default values
         context.shop = {
           name: 'My Store',
-          description: 'O2VEND Store',
-          domain: 'localhost:3000',
-          email: 'store@example.com'
+          domain: hostname,
+          currency: 'USD',
+          timezone: 'America/New_York',
+          language: 'en',
+          logo: '/assets/logo.png',
+          favicon: '/favicon.ico',
+          id: 1,
+          identifier: 'store',
+          companyName: 'My Store',
+          companyAddress: '',
+          companyPhoneNumber: '',
+          companyEmail: '',
+          settings: {}
         };
         context.widgets = {
           hero: [],
-          products: [],
+          content: [],
           footer: [],
-          content: []
+          header: []
         };
       }
-    } else if (this.apiClient) {
-      // Use real API
+    } else if (this.mode === 'real') {
+      // Real mode: use webstoreapi-fetcher only (no apiClient). Thin HTTP calls to /webstoreapi/*.
+      const opts = { headers: req.headers.cookie ? { Cookie: req.headers.cookie } : {} };
+      const baseHost = (process.env.O2VEND_API_BASE_URL || '').replace(/^https?:\/\//, '').replace(/\/.*$/, '') || 'localhost';
+      const themeSettings = context.settings || {};
+      let storeInfo = null;
       try {
-        const storeInfo = await this.apiClient.getStoreInfo(true);
-        context.shop = storeInfo;
-        context.tenant = { id: this.apiClient.tenantId };
-        
-        // Get widgets for sections
-        const widgets = await this.widgetService.getWidgetsBySections();
-        context.widgets = widgets;
-        
-        // Ensure all widgets have template_path set for rendering
-        Object.keys(widgets).forEach(section => {
-          if (Array.isArray(widgets[section])) {
-            widgets[section].forEach(widget => {
-              if (!widget.template_path && widget.template) {
-                widget.template_path = `widgets/${widget.template}`;
-              }
-              if (!widget.template_path && widget.type) {
-                const templateSlug = this.widgetService.getTemplateSlug(widget.type);
-                widget.template_path = `widgets/${templateSlug}`;
-                widget.template = templateSlug;
+        storeInfo = await webstoreApi.fetchStoreInfo();
+      } catch (e) {
+        /* use fallbacks */
+      }
+      const logo = (storeInfo && storeInfo.logoUrl) ? storeInfo.logoUrl : '/assets/logo.png';
+      const favicon = (storeInfo && storeInfo.favouriteIconUrl) ? storeInfo.favouriteIconUrl : '/favicon.ico';
+      const storeName = (storeInfo && storeInfo.name) ? storeInfo.name : 'Store';
+      const storeSettings = (storeInfo && storeInfo.settings) || {};
+      try {
+        context.shop = {
+          name: storeName,
+          domain: baseHost,
+          currency: storeSettings.currency || themeSettings.currency || 'USD',
+          currencySymbol: storeSettings.currencySymbol || '$',
+          timezone: storeSettings.timezone || 'America/New_York',
+          language: storeSettings.language || themeSettings.language || 'en',
+          logo,
+          favicon,
+          id: storeInfo?.id || process.env.O2VEND_TENANT_ID || 1,
+          identifier: storeInfo?.identifier || 'store',
+          companyName: storeSettings.companyName || storeName,
+          companyAddress: storeSettings.companyAddress || '',
+          companyPhoneNumber: storeSettings.companyPhoneNumber || '',
+          companyEmail: storeSettings.companyEmail || '',
+          settings: storeSettings
+        };
+        context.store = {
+          id: context.shop.id,
+          identifier: context.shop.identifier,
+          name: context.shop.name,
+          settings: storeSettings,
+          companyName: context.shop.companyName,
+          companyAddress: context.shop.companyAddress,
+          companyPhoneNumber: context.shop.companyPhoneNumber,
+          companyEmail: context.shop.companyEmail
+        };
+        context.tenant = {
+          id: process.env.O2VEND_TENANT_ID || 1,
+          name: storeName,
+          settings: storeSettings
+        };
+
+        if (process.env.O2VEND_LAYOUT_FULL === '1' || process.env.O2VEND_LAYOUT_FULL === 'true') {
+          context.settings = context.settings || {};
+          context.settings.layout_style = 'full-width';
+        }
+
+        const page = pageType === 'home' ? 'home' : (pageType === 'products' ? 'products' : 'home');
+        context.widgets = await webstoreApi.fetchWidgetsBySections(page, webstoreApi.DEFAULT_SECTIONS, opts);
+        context.widgets = context.widgets || { hero: [], products: [], footer: [], content: [], header: [] };
+
+        if (this.widgetService) {
+          Object.keys(context.widgets).forEach((section) => {
+            if (Array.isArray(context.widgets[section])) {
+              context.widgets[section].forEach((widget) => {
+                if (!widget.template_path && widget.template) widget.template_path = `widgets/${widget.template}`;
+                if (!widget.template_path && widget.type) {
+                  const slug = this.widgetService.getTemplateSlug(widget.type);
+                  widget.template_path = `widgets/${slug}`;
+                  widget.template = slug;
+                }
+              });
+            }
+          });
+        }
+
+        const productsRes = await webstoreApi.fetchProducts({ limit: 50, offset: 0 }, opts);
+        context.products = productsRes?.products || productsRes?.Products || [];
+        context.products = this.normalizeProductsForRealMode(context.products);
+
+        try {
+          const catRes = await webstoreApi.fetchCategories({ limit: 50, offset: 0 }, opts);
+          const raw = catRes?.categories || catRes?.data?.categories || catRes || [];
+          context.categories = raw.map((c) => {
+            const h = (c.handle || (c.name || '').toLowerCase().replace(/\s+/g, '-') || c.id || '').toString().trim() || null;
+            if (h) {
+              c.handle = c.handle || h;
+              c.slug = c.slug || h;
+            }
+            return c;
+          });
+          context.collections = context.categories;
+        } catch (e) {
+          context.categories = [];
+          context.collections = [];
+        }
+
+        try {
+          const brandRes = await webstoreApi.fetchBrands({ limit: 50, offset: 0 }, opts);
+          context.brands = brandRes?.brands || brandRes?.data?.brands || brandRes || [];
+        } catch (e) {
+          context.brands = [];
+        }
+
+        try {
+          const allMenus = await webstoreApi.fetchMenus(opts);
+          const menusList = Array.isArray(allMenus) ? allMenus : [];
+          const menusData = {};
+          menusList.forEach(menu => {
+            if (menu && menu.name) {
+              const normalizedName = menu.name.toLowerCase()
+                .replace(/\s+menu$/i, '')
+                .replace(/\s+/g, '_')
+                .replace(/[^a-z0-9_]/g, '');
+              menusData[normalizedName] = menu;
+            }
+          });
+          menusData.all = menusList;
+          context.menus = menusData;
+
+          const mainMenuData = menusList.find(m => m && m.type === 'Main Menu');
+          const candidate = mainMenuData || menusList[0];
+          if (candidate && candidate.id) {
+            try {
+              const fullMenu = await webstoreApi.fetchMenuById(candidate.id, opts);
+              if (fullMenu && fullMenu.items && Array.isArray(fullMenu.items)) {
+                fullMenu.items.sort((a, b) => (a?.displayOrder || 0) - (b?.displayOrder || 0));
               }
-            });
+              context.mainMenu = fullMenu || candidate;
+            } catch (e) {
+              context.mainMenu = candidate;
+            }
           }
-        });
-        
-        // Load page-specific data
-        if (pageType === 'products' || pageType === 'home') {
-          // Load products for products listing page or homepage
-          const productsResponse = await this.apiClient.getProducts({ limit: 50, offset: 0 });
-          context.products = productsResponse.products || [];
-          // For products page, also set collection.products
-          if (pageType === 'products') {
-            context.collection = context.collection || {};
-            context.collection.products = context.products;
-            context.collection.title = 'All Products';
-            context.collection.handle = 'all';
-            context.collection.totalProducts = context.products.length;
+        } catch (e) {
+          context.menus = {};
+          context.mainMenu = null;
+        }
+
+        try {
+          const cartRes = await webstoreApi.fetchCart(opts);
+          const data = cartRes?.data || cartRes;
+          if (data) {
+            context.cart = {
+              ...context.cart,
+              ...data,
+              itemCount: data.items?.length ?? data.itemCount ?? 0,
+              total: data.total ?? data.subTotal ?? 0
+            };
           }
-        } else if (pageType === 'product' && extra.productHandle) {
-          // Load product data
-          // context.product = await this.loadProduct(extra.productHandle);
+        } catch (e) {
+          /* cart optional */
+        }
+
+        if (pageType === 'products') {
+          context.collection = context.collection || {};
+          context.collection.products = context.products;
+          context.collection.title = 'All Products';
+          context.collection.handle = 'all';
+          context.collection.totalProducts = context.products.length;
         } else if (pageType === 'collection') {
-          // Load products for collection
-          const productsResponse = await this.apiClient.getProducts({ limit: 50, offset: 0 });
-          context.products = productsResponse.products || [];
-          // Set collection.products for collection pages
           context.collection = context.collection || {};
           context.collection.products = context.products;
+        } else if (pageType === 'product' && extra.productHandle) {
+          const handle = String(extra.productHandle).toLowerCase().trim();
+          let product = context.products.find((p) => {
+            const h = (p.handle || '').toLowerCase().trim();
+            const s = (p.slug || '').toLowerCase().trim();
+            const id = String(p.id || '').toLowerCase().trim();
+            const pid = String(p.productId || '').toLowerCase().trim();
+            if (h === handle || s === handle || id === handle) return true;
+            if (handle.startsWith('product-') && (pid === handle.replace(/^product-/, '') || id === handle.replace(/^product-/, ''))) return true;
+            return false;
+          });
+          if (!product) {
+            try {
+              const idToFetch = handle.startsWith('product-') ? handle.replace(/^product-/, '') : handle;
+              product = await webstoreApi.fetchProductById(idToFetch, opts);
+              if (product) product = this.normalizeProductForRealMode(product);
+            } catch (e) {
+              /* ignore */
+            }
+          }
+          if (product) context.product = product;
         }
       } catch (error) {
-        console.warn('[CONTEXT] Failed to load from API:', error.message);
+        console.warn('[CONTEXT] Real mode fetch failed:', error.message);
       }
     }
 
@@ -2133,36 +2284,18 @@ class DevServer {
         // Widget templates use: widget.data.products, widget_data.products
         if (type.includes('product') || type === 'featuredproducts' || type === 'bestsellerproducts' || type === 'newproducts' || type === 'simpleproduct' || type === 'singleproduct') {
           const widgetProducts = this.getProductsForWidget(widget, products);
-          
-          // Products are already enriched by getProductsForWidget, but ensure they're properly formatted
-          const enrichedProducts = this.enrichProductsData(widgetProducts);
-          
-          // Set products at multiple levels for template compatibility
-          widget.data.products = enrichedProducts;
-          widget.data.Products = enrichedProducts;
-          widget.products = enrichedProducts;
-          
-          // Also set in content for some template variations
+          const formatted = this.mode === 'real'
+            ? this.normalizeProductsForRealMode(widgetProducts)
+            : this.enrichProductsData(widgetProducts);
+
+          widget.data.products = formatted;
+          widget.data.Products = formatted;
+          widget.products = formatted;
           widget.data.content = widget.data.content || {};
-          widget.data.content.products = enrichedProducts;
-          widget.data.content.Products = enrichedProducts;
-          
+          widget.data.content.products = formatted;
+          widget.data.content.Products = formatted;
           enrichedCount++;
-          console.log(`[ENRICH] ${widget.type} (${widget.id}): Added ${enrichedProducts.length} enriched products`);
-          
-          // Debug: Log sample product data
-          if (enrichedProducts.length > 0) {
-            const sample = enrichedProducts[0];
-            console.log(`[ENRICH] Sample widget product:`, {
-              id: sample.id,
-              title: sample.title || sample.name,
-              url: sample.url || sample.link,
-              price: sample.price || sample.sellingPrice,
-              stock: sample.stock,
-              inStock: sample.inStock,
-              hasImage: !!(sample.imageUrl || sample.thumbnailImage1)
-            });
-          }
+          console.log(`[ENRICH] ${widget.type} (${widget.id}): Added ${formatted.length} products`);
         }
         
         // Enrich CategoryList and CategoryListCarousel widgets with categories
@@ -2199,18 +2332,18 @@ class DevServer {
         
         // Enrich RecentlyViewed widgets with products (use first 6 products as mock recent views)
         if (type === 'recentlyviewed' || type === 'recently-viewed') {
-          const recentProducts = this.enrichProductsData(products.slice(0, 6));
+          const recent = products.slice(0, 6);
+          const recentProducts = this.mode === 'real'
+            ? this.normalizeProductsForRealMode(recent)
+            : this.enrichProductsData(recent);
           widget.data.products = recentProducts;
           widget.data.Products = recentProducts;
           widget.products = recentProducts;
-          
-          // Also set in content
           widget.data.content = widget.data.content || {};
           widget.data.content.products = recentProducts;
           widget.data.content.Products = recentProducts;
-          
           enrichedCount++;
-          console.log(`[ENRICH] ${widget.type} (${widget.id}): Added ${recentProducts.length} enriched recently viewed products`);
+          console.log(`[ENRICH] ${widget.type} (${widget.id}): Added ${recentProducts.length} recently viewed products`);
         }
       });
     });
@@ -2218,6 +2351,28 @@ class DevServer {
     console.log(`[CONTEXT] ✅ Enriched ${enrichedCount} widgets with data`);
   }
   
+  /**
+   * Check if a product belongs to a category (for collection/category filtering).
+   * Handles categoryId, primaryCategoryId, categoryHandle, and categories[].
+   * @param {Object} p - Product
+   * @param {Object} category - Category { id, handle }
+   * @returns {boolean}
+   */
+  productMatchesCategory(p, category) {
+    const cid = category.id;
+    const ch = (category.handle || category.slug || '').toLowerCase();
+    if (p.categoryId != null && (p.categoryId === cid || String(p.categoryId).toLowerCase() === String(cid).toLowerCase())) return true;
+    if (p.primaryCategoryId != null && (p.primaryCategoryId === cid || String(p.primaryCategoryId).toLowerCase() === String(cid).toLowerCase())) return true;
+    const ph = (p.categoryHandle || p.category?.handle || '').toLowerCase();
+    if (ch && ph && ph === ch) return true;
+    const arr = p.categories || p.categoryIds || [];
+    if (Array.isArray(arr) && arr.some(cat => {
+      const o = typeof cat === 'object' ? cat : { id: cat };
+      return o.id === cid || (o.handle || o.slug || '').toLowerCase() === ch;
+    })) return true;
+    return false;
+  }
+
   /**
    * Enrich a single product with all required data (URL, name/title, price, images, stock)
    * This ensures consistency between widgets and pages
@@ -2225,217 +2380,138 @@ class DevServer {
    * @returns {Object} Enriched product (creates a copy to avoid mutation)
    */
   enrichProductData(product) {
-    // Create a copy to avoid mutating the original
     const enriched = { ...product };
-    
-    // CRITICAL: Ensure productId exists - it's the most reliable identifier
+
     if (!enriched.productId && enriched.id) {
-      // Try to extract numeric ID from string ID (e.g., "product-1" -> 1)
       const numericMatch = String(enriched.id).match(/\d+/);
-      if (numericMatch) {
-        enriched.productId = parseInt(numericMatch[0], 10);
-      } else {
-        // Use the ID as-is if it's already numeric
-        enriched.productId = enriched.id;
-      }
-    } else if (!enriched.productId && !enriched.id) {
-      console.warn(`[ENRICH] ⚠️  Product missing both id and productId:`, {
-        keys: Object.keys(enriched).slice(0, 15),
-        title: enriched.title || enriched.name
-      });
-    }
-    
-    // DEBUG: Log incoming product to diagnose missing fields
-    if (!product.id && !product.handle && !product.slug && !product.productId) {
-      console.warn(`[ENRICH] ⚠️  Product missing all identifiers (id/handle/slug/productId):`, {
-        keys: Object.keys(product).slice(0, 15),
-        title: product.title || product.name
-      });
+      enriched.productId = numericMatch ? parseInt(numericMatch[0], 10) : enriched.id;
     }
-    
-    // Ensure URL field exists - CRITICAL for product navigation
-    // Treat '#' as missing URL and regenerate it
-    const hasValidUrl = enriched.url && enriched.url !== '#' && enriched.url !== '';
-    const hasValidLink = enriched.link && enriched.link !== '#' && enriched.link !== '';
-    
-    if (!hasValidUrl && !hasValidLink) {
-      const handle = enriched.handle || enriched.slug || enriched.id;
-      if (handle && handle !== '#' && handle !== '') {
-        enriched.url = `/products/${handle}`;
-        enriched.link = `/products/${handle}`;
-      } else {
-        // Last resort: use numeric ID if available
-        const numericId = enriched.productId || enriched.id;
-        if (numericId) {
-          const fallbackHandle = `product-${numericId}`.toLowerCase();
-          enriched.url = `/products/${fallbackHandle}`;
-          enriched.link = `/products/${fallbackHandle}`;
-          enriched.handle = enriched.handle || fallbackHandle; // Also set handle if missing
-          enriched.slug = enriched.slug || fallbackHandle; // Also set slug if missing
-        } else {
-          enriched.url = '#';
-          enriched.link = '#';
-          console.warn(`[ENRICH] ⚠️  Product has no id/handle/slug/productId, URL set to '#'`, {
-            productKeys: Object.keys(enriched).slice(0, 10)
-          });
-        }
-      }
-    } else if (!hasValidUrl && hasValidLink) {
-      enriched.url = enriched.link;
-    } else if (hasValidUrl && !hasValidLink) {
-      enriched.link = enriched.url;
-    } else if (enriched.url === '#' || enriched.link === '#') {
-      // If one is valid but the other is '#', update the '#' one
-      if (enriched.url === '#') enriched.url = enriched.link;
-      if (enriched.link === '#') enriched.link = enriched.url;
-    }
-    
-    // Ensure handle/slug exist if missing (for template fallback logic)
-    // Also normalize them (remove '#' or empty strings)
-    if (!enriched.handle || enriched.handle === '#' || enriched.handle === '') {
-      if (enriched.slug && enriched.slug !== '#' && enriched.slug !== '') {
-        enriched.handle = enriched.slug;
-      } else if (enriched.id && enriched.id !== '#') {
-        enriched.handle = String(enriched.id).toLowerCase();
-      } else if (enriched.productId) {
-        enriched.handle = `product-${enriched.productId}`.toLowerCase();
-      } else if (!enriched.handle) {
-        // Generate from URL if it was set above
-        if (enriched.url && enriched.url !== '#') {
-          enriched.handle = enriched.url.replace(/^\/products\//, '').toLowerCase();
-        }
-      }
-    }
-    
-    if (!enriched.slug || enriched.slug === '#' || enriched.slug === '') {
-      if (enriched.handle && enriched.handle !== '#' && enriched.handle !== '') {
-        enriched.slug = enriched.handle;
-      } else if (enriched.id && enriched.id !== '#') {
-        enriched.slug = String(enriched.id).toLowerCase();
-      } else if (enriched.productId) {
-        enriched.slug = `product-${enriched.productId}`.toLowerCase();
-      } else if (!enriched.slug) {
-        // Generate from URL if it was set above
-        if (enriched.url && enriched.url !== '#') {
-          enriched.slug = enriched.url.replace(/^\/products\//, '').toLowerCase();
-        }
-      }
+
+    const handle = enriched.handle || enriched.slug || String(enriched.id || enriched.productId || '');
+    const effectiveHandle = (handle && String(handle).trim() && String(handle) !== '#')
+      ? String(handle).trim().toLowerCase() : null;
+
+    if (effectiveHandle) {
+      enriched.url = effectiveHandle;
+      enriched.link = effectiveHandle;
+      if (!enriched.handle) enriched.handle = effectiveHandle;
+      if (!enriched.slug) enriched.slug = effectiveHandle;
     }
-    
-    // Ensure name/title exists - CRITICAL for product display
+
     if (!enriched.name && !enriched.title) {
       enriched.name = `Product ${enriched.id || 'Unknown'}`;
       enriched.title = enriched.name;
     } else if (!enriched.name) {
-      enriched.name = enriched.title || `Product ${enriched.id || 'Unknown'}`;
+      enriched.name = enriched.title;
     } else if (!enriched.title) {
       enriched.title = enriched.name;
     }
-    
-    // Ensure both variations and variants exist (product-card uses variations)
-    if (enriched.variants && !enriched.variations) {
-      enriched.variations = enriched.variants;
-    } else if (enriched.variations && !enriched.variants) {
-      enriched.variants = enriched.variations;
-    }
-    
-    // Ensure price exists - CRITICAL for product display
-    if (!enriched.price && !enriched.sellingPrice) {
-      // Try to get from variants/variations first
-      const variantsOrVariations = enriched.variants || enriched.variations;
-      if (variantsOrVariations && variantsOrVariations.length > 0) {
-        enriched.price = variantsOrVariations[0].price || variantsOrVariations[0].sellingPrice || 0;
-        enriched.sellingPrice = enriched.price;
-      } else {
-        enriched.price = 0;
-        enriched.sellingPrice = 0;
-      }
-    } else if (!enriched.price) {
-      enriched.price = enriched.sellingPrice;
-    } else if (!enriched.sellingPrice) {
-      enriched.sellingPrice = enriched.price;
+
+    if (enriched.variants && !enriched.variations) enriched.variations = enriched.variants;
+    else if (enriched.variations && !enriched.variants) enriched.variants = enriched.variations;
+
+    if (enriched.price == null && enriched.sellingPrice == null) {
+      const v = enriched.variants || enriched.variations;
+      enriched.price = (v && v.length > 0) ? (v[0].price || 0) : 0;
     }
-    
-    // Ensure prices object exists for product-card compatibility - CRITICAL
-    // Make sure price is NOT 0 unless it's actually 0 (check if undefined/null)
-    const finalPrice = (enriched.price !== undefined && enriched.price !== null) 
-      ? enriched.price 
-      : ((enriched.sellingPrice !== undefined && enriched.sellingPrice !== null) 
-          ? enriched.sellingPrice 
-          : 0);
-    
+    if (enriched.price == null) enriched.price = enriched.sellingPrice || 0;
+
     if (!enriched.prices) {
-      const mrpValue = enriched.compareAtPrice || enriched.comparePrice || enriched.mrp || 0;
       enriched.prices = {
-        price: finalPrice,
-        mrp: mrpValue,
-        currency: enriched.currency || 'USD'
+        price: enriched.price,
+        mrp: enriched.compareAtPrice || enriched.comparePrice || 0
       };
-    } else {
-      // Update prices object if it exists but is missing fields
-      if (enriched.prices.price === undefined || enriched.prices.price === null) {
-        enriched.prices.price = finalPrice;
-      }
-      if (enriched.prices.mrp === undefined || enriched.prices.mrp === null) {
-        enriched.prices.mrp = enriched.compareAtPrice || enriched.comparePrice || enriched.mrp || 0;
-      }
-      if (!enriched.prices.currency) {
-        enriched.prices.currency = enriched.currency || 'USD';
-      }
-    }
-    
-    // Ensure price/sellingPrice fields also exist (not just prices object)
-    if (enriched.price === undefined || enriched.price === null) {
-      enriched.price = finalPrice;
     }
-    if (enriched.sellingPrice === undefined || enriched.sellingPrice === null) {
-      enriched.sellingPrice = finalPrice;
-    }
-    
-    // Ensure image exists - CRITICAL for product display
-    if (!enriched.imageUrl && !enriched.thumbnailImage1 && (!enriched.images || enriched.images.length === 0)) {
-      // Fallback to picsum placeholder
+
+    if (!enriched.imageUrl && !enriched.thumbnailImage && (!enriched.images || enriched.images.length === 0)) {
       const imageId = enriched.id ? String(enriched.id).replace(/\D/g, '') || '1' : '1';
       enriched.imageUrl = `https://picsum.photos/seed/${imageId}/800/800`;
-      enriched.thumbnailImage1 = {
-        url: enriched.imageUrl,
-        altText: enriched.title || enriched.name || 'Product image'
-      };
+      enriched.thumbnailImage = enriched.imageUrl;
     }
-    
-    // Ensure stock/availability data exists - CRITICAL to prevent incorrect "SOLD OUT" display
-    if (enriched.stock === undefined && enriched.stockQuantity === undefined) {
-      // Calculate from variants/variations if available
-      const variantsOrVariations = enriched.variants || enriched.variations;
-      if (variantsOrVariations && variantsOrVariations.length > 0) {
-        const totalStock = variantsOrVariations.reduce((sum, v) => sum + (v.stock || v.quantity || 0), 0);
-        enriched.stock = totalStock;
-        enriched.stockQuantity = totalStock;
-        enriched.inStock = totalStock > 0;
-        enriched.available = totalStock > 0;
-      } else {
-        // Default to in stock if no stock info (prevents false "SOLD OUT" display)
-        enriched.stock = 10;
-        enriched.stockQuantity = 10;
-        enriched.inStock = true;
-        enriched.available = true;
+
+    this.enrichProductStockStatus(enriched);
+
+    return enriched;
+  }
+
+  /**
+   * Compute inStock and available flags matching production enrichProductStockStatus().
+   */
+  enrichProductStockStatus(product) {
+    const stockQuantity = product.stockQuantity || 0;
+    const stockTrackingIsEnabled = product.stockTrackingIsEnabled || false;
+    const isAllowToOrder = product.isAllowToOrder || false;
+
+    product.inStock = !stockTrackingIsEnabled || stockQuantity > 0;
+    product.available = !stockTrackingIsEnabled || stockQuantity > 0 || isAllowToOrder;
+
+    if (product.stockQuantity == null) {
+      const variants = product.variants || product.variations;
+      if (variants && variants.length > 0) {
+        product.stockQuantity = variants.reduce((sum, v) => sum + (v.stockQuantity || 0), 0);
+        product.inStock = !stockTrackingIsEnabled || product.stockQuantity > 0;
+        product.available = !stockTrackingIsEnabled || product.stockQuantity > 0 || isAllowToOrder;
       }
-    } else {
-      // Ensure inStock/available flags are set based on stock value
-      // CRITICAL: Use nullish coalescing to handle 0 values correctly
-      const stockValue = enriched.stock !== undefined ? enriched.stock : (enriched.stockQuantity !== undefined ? enriched.stockQuantity : 0);
-      enriched.inStock = stockValue > 0;
-      enriched.available = stockValue > 0;
-      
-      // Also ensure stockQuantity is set if only stock is set (and vice versa)
-      if (enriched.stock !== undefined && enriched.stockQuantity === undefined) {
-        enriched.stockQuantity = enriched.stock;
-      } else if (enriched.stockQuantity !== undefined && enriched.stock === undefined) {
-        enriched.stock = enriched.stockQuantity;
+    }
+
+    return product;
+  }
+
+  /**
+   * Normalize real-API product for template use (no enrichment).
+   * Aliases API keys (Description, Images, etc.) to template-expected keys,
+   * sets url/link for dev navigation, and normalizes image items to { url, altText }.
+   * @param {Object} p - Product from real API
+   * @returns {Object} Normalized product (shallow copy + aliases)
+   */
+  normalizeProductForRealMode(p) {
+    if (!p || typeof p !== 'object') return p;
+    const n = { ...p };
+    if (n.Description != null && n.description == null) n.description = n.Description;
+    if (n.HtmlContent != null && n.htmlContent == null) n.htmlContent = n.HtmlContent;
+    if (n.ShortDescription != null && n.shortDescription == null) n.shortDescription = n.ShortDescription;
+    if (n.Name != null && n.name == null) n.name = n.Name;
+    if (n.Title != null && n.title == null) n.title = n.Title;
+    if (n.Attributes != null && n.attributes == null) n.attributes = n.Attributes;
+
+    const t1 = n.ThumbnailImage1 || n.thumbnailImage || n.thumbnailImage;
+    if (t1 != null) {
+      const u = typeof t1 === 'string' ? t1 : (t1.url || t1.Url || t1.imageUrl || t1.ImageUrl);
+      if (u) {
+        n.thumbnailImage = u;
+        if (!n.imageUrl) n.imageUrl = u;
       }
     }
-    
-    return enriched;
+
+    let imgs = n.images || n.Images;
+    if (Array.isArray(imgs) && imgs.length > 0) {
+      n.images = imgs.map((img) => {
+        if (typeof img === 'string') return { url: img, altText: n.name || n.title };
+        const u = img.url || img.Url || img.imageUrl || img.ImageUrl;
+        const a = img.altText || img.AltText || n.name || n.title;
+        return { url: u || '', altText: a };
+      });
+    } else {
+      const single = n.imageUrl || n.ImageUrl;
+      if (single) n.images = [{ url: single, altText: n.name || n.title }];
+    }
+
+    const handle = (n.handle || n.slug || n.id || '').toString().trim();
+    const h = handle && handle !== '#' ? handle.toLowerCase() : (n.productId ? String(n.productId) : null);
+    if (h) {
+      n.url = h;
+      n.link = h;
+      if (!n.handle) n.handle = h;
+      if (!n.slug) n.slug = h;
+    }
+
+    this.enrichProductStockStatus(n);
+    return n;
+  }
+
+  normalizeProductsForRealMode(products) {
+    if (!Array.isArray(products)) return [];
+    return products.map((p) => this.normalizeProductForRealMode(p));
   }
   
   /**
@@ -2474,12 +2550,9 @@ class DevServer {
       );
       widgetProducts = sorted.slice(0, limit);
     } else {
-      // Default: return first N products
       widgetProducts = products.slice(0, limit);
     }
-    
-    // Enrich all products with required data before returning
-    return this.enrichProductsData(widgetProducts);
+    return widgetProducts;
   }
 
   /**
@@ -2538,7 +2611,7 @@ class DevServer {
     const products = context.collection?.products || [];
     const productCards = products.map(p => `
       <div style="background: #fff; border-radius: 8px; padding: 1rem; box-shadow: 0 2px 4px rgba(0,0,0,0.1);">
-        <a href="/products/${p.handle || p.id}">
+        <a href="/${p.slug || p.handle || p.id}">
           <img src="${p.images?.[0] || p.imageUrl || 'https://picsum.photos/seed/' + p.id + '/300/300'}" 
                alt="${p.title || p.name}" style="width: 100%; height: 200px; object-fit: cover; border-radius: 4px;">
           <h4 style="margin: 0.5rem 0;">${p.title || p.name}</h4>
@@ -3284,6 +3357,22 @@ class DevServer {
           logLevel: 'silent',
           timeout: 2000
         }));
+      } else if (this.mode === 'real') {
+        const base = (process.env.O2VEND_API_BASE_URL || '').replace(/\/$/, '').replace(/\/shopfront\/api\/v2\/?$/i, '').replace(/\/webstoreapi\/?$/i, '');
+        if (base) {
+          const { createProxyMiddleware } = require('http-proxy-middleware');
+          const proxyOpts = {
+            target: base,
+            changeOrigin: true,
+            logLevel: 'silent',
+            timeout: parseInt(process.env.O2VEND_API_TIMEOUT, 10) || 10000,
+            onProxyReq: (proxyReq, req) => {
+              if (req.headers.cookie) proxyReq.setHeader('Cookie', req.headers.cookie);
+            }
+          };
+          this.app.use('/webstoreapi', createProxyMiddleware(proxyOpts));
+          this.app.use('/shopfront/api', createProxyMiddleware(proxyOpts));
+        }
       }
 
       // Inject hot reload script into HTML responses