diff --git a/.eslint-baseline.json b/.eslint-baseline.json
index 7c5a6922f..0e5526cdb 100644
--- a/.eslint-baseline.json
+++ b/.eslint-baseline.json
@@ -1,5 +1,5 @@
 {
-  "generatedAt": "2026-05-21T16:35:02.858Z",
+  "generatedAt": "2026-05-22T03:12:40.396Z",
   "totalErrors": 473,
   "counts": {
     "src/components/access/DevAccessDeniedPage.tsx": {
@@ -868,9 +868,6 @@
     "src/components/ui/LoadingState.tsx": {
       "@typescript-eslint/no-unused-vars": 1
     },
-    "src/components/ui/OptimizedImage.tsx": {
-      "@typescript-eslint/no-explicit-any": 1
-    },
     "src/components/ui/ShortcutsHelpDialog.tsx": {
       "@typescript-eslint/naming-convention": 1,
       "@typescript-eslint/no-explicit-any": 2,
@@ -887,6 +884,9 @@
     "src/components/ui/stat-card.tsx": {
       "@typescript-eslint/naming-convention": 2
     },
+    "src/contexts/AuthContext.test.tsx": {
+      "@typescript-eslint/consistent-type-imports": 1
+    },
     "src/contexts/AuthContext.tsx": {
       "@typescript-eslint/no-explicit-any": 2,
       "@typescript-eslint/no-unused-vars": 7
@@ -961,8 +961,7 @@
       "react-hooks/exhaustive-deps": 2
     },
     "src/hooks/kit-builder/useKitBuilderQueries.ts": {
-      "@typescript-eslint/no-non-null-assertion": 3,
-      "no-console": 2
+      "@typescript-eslint/no-non-null-assertion": 3
     },
     "src/hooks/kit-builder/useKitCollaboration.ts": {
       "react-hooks/exhaustive-deps": 1
@@ -1291,6 +1290,9 @@
       "@typescript-eslint/no-explicit-any": 5,
       "no-console": 1
     },
+    "src/tests/AdminLayout.test.tsx": {
+      "@typescript-eslint/no-explicit-any": 1
+    },
     "src/tests/AdminMobileInteraction.test.tsx": {
       "@typescript-eslint/no-unused-vars": 1
     },
diff --git a/.tsc-baseline.json b/.tsc-baseline.json
index fb7f5d582..7c9042cdf 100644
--- a/.tsc-baseline.json
+++ b/.tsc-baseline.json
@@ -1,6 +1,6 @@
 {
-  "generatedAt": "2026-05-14T17:05:26.220Z",
-  "totalErrors": 1262,
+  "generatedAt": "2026-05-22T03:24:58.455Z",
+  "totalErrors": 1373,
   "counts": {
     "src/components/admin/DiscountApprovalQueue.tsx": {
       "TS18048": 1
@@ -47,6 +47,20 @@
     "src/components/admin/connections/useSeverityChangeNotifier.ts": {
       "TS2353": 1
     },
+    "src/components/admin/personalization-manager/ComponentAccordionItem.tsx": {
+      "TS2305": 4
+    },
+    "src/components/admin/personalization-manager/GroupInheritanceSection.tsx": {
+      "TS2305": 1
+    },
+    "src/components/admin/personalization-manager/ProductSelector.tsx": {
+      "TS2305": 1,
+      "TS2459": 1
+    },
+    "src/components/admin/personalization-manager/usePersonalizationManager.ts": {
+      "TS2305": 6,
+      "TS2459": 1
+    },
     "src/components/admin/products/BulkImportDialog.tsx": {
       "TS2322": 1
     },
@@ -60,10 +74,10 @@
       "TS2322": 7
     },
     "src/components/admin/products/bulk-import/StepComplete.tsx": {
-      "TS2345": 1
+      "TS2305": 1
     },
     "src/components/admin/products/bulk-import/StepPreview.tsx": {
-      "TS2322": 2
+      "TS2305": 2
     },
     "src/components/admin/products/hooks/useProductFormDraft.ts": {
       "TS2307": 1
@@ -71,6 +85,20 @@
     "src/components/admin/products/hooks/useSkuValidation.ts": {
       "TS2339": 1
     },
+    "src/components/admin/products/kit-components/ComponentForm.tsx": {
+      "TS2305": 1,
+      "TS7006": 1
+    },
+    "src/components/admin/products/kit-components/PrintAreaForm.tsx": {
+      "TS2305": 1,
+      "TS7006": 1
+    },
+    "src/components/admin/products/kit-components/VolumeValidation.tsx": {
+      "TS2305": 2
+    },
+    "src/components/admin/products/kit-components/api.ts": {
+      "TS2305": 2
+    },
     "src/components/admin/products/new-supplier/tabs/AddressTab.tsx": {
       "TS18046": 32,
       "TS2322": 24
@@ -112,6 +140,9 @@
     "src/components/admin/security/keys/audit/useMcpAuditFeed.ts": {
       "TS7053": 1
     },
+    "src/components/admin/suppliers-manager/SupplierTable.tsx": {
+      "TS2305": 1
+    },
     "src/components/admin/suppliers-manager/useSuppliersManager.ts": {
       "TS2352": 4
     },
@@ -122,6 +153,9 @@
       "TS18048": 4,
       "TS2345": 1
     },
+    "src/components/auth/KnownDevicesManager.tsx": {
+      "TS2352": 1
+    },
     "src/components/cart/CartCompanyPicker.tsx": {
       "TS2459": 1
     },
@@ -138,7 +172,8 @@
       "TS2345": 1
     },
     "src/components/catalog/CatalogContent.tsx": {
-      "TS2322": 1
+      "TS2322": 1,
+      "TS2741": 1
     },
     "src/components/catalog/CatalogHeader.tsx": {
       "TS2322": 1
@@ -202,10 +237,8 @@
     },
     "src/components/compare/FloatingCompareBar.tsx": {
       "TS18047": 1,
-      "TS2345": 1
-    },
-    "src/components/compare/OtherSuppliersRow.tsx": {
-      "TS2345": 1
+      "TS2345": 1,
+      "TS2488": 1
     },
     "src/components/compare/SimilarProductsRail.tsx": {
       "TS2339": 3,
@@ -222,11 +255,15 @@
       "TS2345": 1
     },
     "src/components/expert/chat/ChatInputBar.tsx": {
-      "TS2322": 1
+      "TS2322": 1,
+      "TS2552": 1
     },
     "src/components/expert/chat/ChatMessageList.tsx": {
       "TS2322": 1
     },
+    "src/components/expert/chat/useExpertChat.ts": {
+      "TS1345": 2
+    },
     "src/components/favorites/FavoritesTrashView.tsx": {
       "TS2322": 1
     },
@@ -251,6 +288,10 @@
       "TS2345": 4,
       "TS2740": 1
     },
+    "src/components/filters/filter-panel/useFilterPanelState.ts": {
+      "TS2305": 2,
+      "TS7006": 7
+    },
     "src/components/filters/preset-utils.ts": {
       "TS2339": 5,
       "TS2551": 7
@@ -299,6 +340,10 @@
       "TS18048": 1,
       "TS2345": 4
     },
+    "src/components/layout/Header.tsx": {
+      "TS2304": 2,
+      "TS2339": 1
+    },
     "src/components/layout/sidebar/__tests__/SidebarNavGroup.a11y.test.tsx": {
       "TS2749": 3
     },
@@ -311,8 +356,12 @@
     "src/components/layout/sidebar/__tests__/SidebarNavGroup.suspense.test.tsx": {
       "TS2749": 1
     },
-    "src/components/loading/SkeletonShimmer.tsx": {
-      "TS2322": 2
+    "src/components/loading/SkeletonMonitor.tsx": {
+      "TS2339": 1
+    },
+    "src/components/loading/index.ts": {
+      "TS2305": 5,
+      "TS2724": 2
     },
     "src/components/magic-up/AdImageResult.tsx": {
       "TS2300": 2,
@@ -381,15 +430,43 @@
       "TS2322": 1,
       "TS2352": 2
     },
+    "src/components/pricing/ProductPriceSimulator.tsx": {
+      "TS2305": 4
+    },
+    "src/components/pricing/QuantityPriceCalculator.tsx": {
+      "TS2459": 1
+    },
     "src/components/pricing/calculator/QuantityComparisonTable.tsx": {
       "TS2339": 6
     },
     "src/components/pricing/calculator/TechniqueMultiSelector.tsx": {
-      "TS2339": 4
+      "TS18046": 1,
+      "TS2305": 2,
+      "TS2339": 4,
+      "TS7006": 1
+    },
+    "src/components/pricing/simulator/CustomizationOptions.tsx": {
+      "TS2305": 1
+    },
+    "src/components/pricing/simulator/EngravingList.tsx": {
+      "TS2305": 1
+    },
+    "src/components/pricing/simulator/MultiEngravingResult.tsx": {
+      "TS2305": 1,
+      "TS2459": 1
     },
     "src/components/pricing/simulator/ProductSearch.tsx": {
+      "TS2459": 1,
       "TS2551": 1
     },
+    "src/components/pricing/simulator/QuantityAndResult.tsx": {
+      "TS2305": 1,
+      "TS2459": 1
+    },
+    "src/components/pricing/simulator/TechniqueSelector.tsx": {
+      "TS2305": 4,
+      "TS7006": 4
+    },
     "src/components/products/EnhancedProductCard.tsx": {
       "TS2339": 2
     },
@@ -403,8 +480,7 @@
       "TS2353": 2
     },
     "src/components/products/ProductCard.tsx": {
-      "TS2322": 3,
-      "TS2352": 2
+      "TS2322": 3
     },
     "src/components/products/ProductCardActions.tsx": {
       "TS2322": 2
@@ -428,6 +504,12 @@
       "TS2322": 1,
       "TS2339": 1
     },
+    "src/components/products/ProductTableView.tsx": {
+      "TS7006": 2
+    },
+    "src/components/products/RelatedProducts.tsx": {
+      "TS2322": 1
+    },
     "src/components/products/SalesHistoryChart.tsx": {
       "TS18046": 8,
       "TS2322": 5,
@@ -446,6 +528,20 @@
     "src/components/products/customization/ConfigurationPanelV6.tsx": {
       "TS18048": 8
     },
+    "src/components/products/customization/__tests__/LocationPanel.test.tsx": {
+      "TS2739": 2
+    },
+    "src/components/products/customization/__tests__/LocationPanelAdvanced.test.tsx": {
+      "TS2339": 1,
+      "TS2353": 1
+    },
+    "src/components/products/customization/__tests__/LocationPanelPrice.test.tsx": {
+      "TS2339": 1,
+      "TS2353": 1
+    },
+    "src/components/products/index.ts": {
+      "TS2305": 1
+    },
     "src/components/products/kit-composition/KitComponentCard.tsx": {
       "TS18048": 6,
       "TS2345": 1
@@ -459,8 +555,12 @@
       "TS7006": 3,
       "TS7053": 1
     },
+    "src/components/providers/AppBootstrap.tsx": {
+      "TS2339": 1
+    },
     "src/components/quotes/DraggableQuoteItems.tsx": {
-      "TS2365": 1
+      "TS2304": 2,
+      "TS2322": 1
     },
     "src/components/quotes/MarginInsightBadge.tsx": {
       "TS18048": 2
@@ -480,9 +580,6 @@
     "src/components/quotes/QuoteTemplateForm.tsx": {
       "TS2345": 1
     },
-    "src/components/quotes/__tests__/QuoteBuilderStepper.test.tsx": {
-      "TS2304": 2
-    },
     "src/components/quotes/company-contact/ContactSelector.tsx": {
       "TS2322": 3
     },
@@ -493,6 +590,7 @@
       "TS2724": 1
     },
     "src/components/replenishments/ReplenishmentProductGrid.tsx": {
+      "TS2304": 1,
       "TS2322": 1,
       "TS2339": 1
     },
@@ -510,6 +608,7 @@
       "TS2339": 1
     },
     "src/components/search/SearchWithSuggestions.tsx": {
+      "TS2304": 1,
       "TS2552": 1,
       "TS2687": 1
     },
@@ -522,9 +621,8 @@
       "TS2367": 1
     },
     "src/components/security/useSecurityData.ts": {
-      "TS2339": 1,
-      "TS2345": 3,
-      "TS2769": 2
+      "TS2345": 2,
+      "TS2769": 1
     },
     "src/components/simulator/wizard/PersonalizationSummary.tsx": {
       "TS2322": 1
@@ -532,6 +630,9 @@
     "src/components/simulator/wizard/QuantityRangeComparison.tsx": {
       "TS2345": 1
     },
+    "src/components/system/CloudStatusBanner.tsx": {
+      "TS2367": 1
+    },
     "src/components/ui/StatusBadge.tsx": {
       "TS2322": 1,
       "TS2430": 1
@@ -542,285 +643,287 @@
     "src/contexts/AuthContext.test.tsx": {
       "TS2345": 2
     },
-    "src/contexts/AuthContext.tsx": {
-      "TS2339": 2
-    },
     "src/contexts/ProductsContext.tsx": {
       "TS2345": 1
     },
     "src/hooks/__tests__/useAutoSaveQuote.test.ts": {
       "TS18047": 4
     },
-    "src/hooks/gravacao/gravacao-constants.ts": {
-      "TS2769": 1
-    },
-    "src/hooks/gravacao/index.ts": {
-      "TS2305": 1,
-      "TS2307": 1
-    },
-    "src/hooks/gravacao/useFornecedoresGravacao.ts": {
-      "TS2322": 1
-    },
-    "src/hooks/gravacao/useTecnicasGravacao.ts": {
-      "TS18047": 1,
+    "src/hooks/__tests__/useCatalogState.unit.test.tsx": {
       "TS2322": 2
     },
-    "src/hooks/mockup/mockupGenerationService.ts": {
-      "TS2322": 1,
-      "TS2345": 3,
-      "TS2769": 2
-    },
-    "src/hooks/simulator/useLivePricePreview.ts": {
-      "TS2345": 1
-    },
-    "src/hooks/simulator/useSimulatorWizard.ts": {
-      "TS2820": 1
+    "src/hooks/__tests__/useIPValidation.test.ts": {
+      "TS2339": 7,
+      "TS2345": 1,
+      "TS7005": 1,
+      "TS7034": 1
     },
-    "src/hooks/simulator/useUndoRedo.ts": {
-      "TS2345": 2
+    "src/hooks/admin/useAllowedIPs.ts": {
+      "TS2322": 5,
+      "TS2345": 3,
+      "TS2769": 4
     },
-    "src/hooks/simulator/useWizardDrafts.ts": {
-      "TS2322": 2
+    "src/hooks/admin/useAuditLog.ts": {
+      "TS2345": 5,
+      "TS2353": 1,
+      "TS2589": 2,
+      "TS2769": 3
     },
-    "src/hooks/simulator/useWizardPricing.ts": {
-      "TS2339": 1,
-      "TS2345": 2
+    "src/hooks/admin/useDeviceDetection.ts": {
+      "TS2353": 1
     },
-    "src/hooks/simulator/wizardReducer.ts": {
+    "src/hooks/admin/useGeoBlocking.ts": {
       "TS2322": 3,
-      "TS2678": 1
+      "TS2345": 3,
+      "TS2769": 2
+    },
+    "src/hooks/admin/useSecretsManager.ts": {
+      "TS2322": 6
     },
-    "src/hooks/use2FA.ts": {
+    "src/hooks/auth/use2FA.ts": {
       "TS2322": 5,
       "TS2339": 2,
       "TS2345": 4,
       "TS2353": 1,
       "TS2769": 4
     },
-    "src/hooks/useAccessSecurity.ts": {
+    "src/hooks/auth/useAccessSecurity.ts": {
       "TS2345": 7,
-      "TS2589": 2,
+      "TS2589": 4,
       "TS2769": 9
     },
-    "src/hooks/useAllowedIPs.ts": {
-      "TS2322": 5,
-      "TS2345": 4,
-      "TS2769": 4
-    },
-    "src/hooks/useAuditLog.ts": {
-      "TS2345": 5,
-      "TS2353": 1,
-      "TS2589": 2,
-      "TS2769": 3
-    },
-    "src/hooks/useAutoSaveQuote.ts": {
+    "src/hooks/auth/useAuthMFA.ts": {
       "TS2339": 2
     },
-    "src/hooks/useCartTemplates.ts": {
-      "TS2322": 1
-    },
-    "src/hooks/useCatalogFiltering.ts": {
-      "TS2322": 1,
-      "TS2339": 1,
+    "src/hooks/collections/useCollections.ts": {
       "TS2345": 1
     },
-    "src/hooks/useCatalogPrefetch.ts": {
-      "TS2345": 1
+    "src/hooks/common/useGenericFuzzySearch.ts": {
+      "TS2322": 1
     },
-    "src/hooks/useCatalogState.ts": {
-      "TS2322": 1,
-      "TS2345": 4,
-      "TS2448": 1,
-      "TS2454": 1,
-      "TS2769": 1
+    "src/hooks/common/useOrgData.ts": {
+      "TS2589": 1
     },
-    "src/hooks/useCategoryIcons.ts": {
-      "TS2769": 1
+    "src/hooks/comparison/useComparisonWeights.ts": {
+      "TS2352": 1
     },
-    "src/hooks/useCollections.ts": {
-      "TS2345": 1
+    "src/hooks/crm/useRamoAtividadeFilter.ts": {
+      "TS7006": 2
     },
-    "src/hooks/useColorEnrichment.ts": {
+    "src/hooks/favorites/useEnrichedFavoriteItems.ts": {
       "TS2322": 1
     },
-    "src/hooks/useColorSystem.ts": {
-      "TS2345": 1,
-      "TS2352": 1,
-      "TS2769": 1
-    },
-    "src/hooks/useCommercialIntelligence.ts": {
+    "src/hooks/favorites/useFavoriteLists.ts": {
       "TS2345": 1
     },
-    "src/hooks/useComparisonWeights.ts": {
-      "TS2352": 1
+    "src/hooks/favorites/useFavoritesPageState.ts": {
+      "TS2339": 4,
+      "TS2345": 1
     },
-    "src/hooks/useContextualSuggestions.ts": {
-      "TS7006": 1
+    "src/hooks/gravacao/gravacao-constants.ts": {
+      "TS2769": 1
     },
-    "src/hooks/useCustomizationPrice.ts": {
-      "TS18048": 2
+    "src/hooks/gravacao/useFornecedoresGravacao.ts": {
+      "TS2322": 1
     },
-    "src/hooks/useDeviceDetection.ts": {
-      "TS2345": 5,
-      "TS2353": 1,
-      "TS2769": 3
+    "src/hooks/gravacao/useTecnicasGravacao.ts": {
+      "TS18047": 1,
+      "TS2322": 2
     },
-    "src/hooks/useEnrichedFavoriteItems.ts": {
-      "TS2322": 1
+    "src/hooks/intelligence/useCommercialIntelligence.ts": {
+      "TS2345": 1
     },
-    "src/hooks/useErrorHandler.ts": {
-      "TS2322": 1
+    "src/hooks/intelligence/useContextualSuggestions.ts": {
+      "TS7006": 1
     },
-    "src/hooks/useExternalDatabase.ts": {
+    "src/hooks/intelligence/useExternalDatabase.ts": {
       "TS2339": 4,
       "TS2345": 1,
       "TS2638": 3
     },
-    "src/hooks/useFavoriteLists.ts": {
-      "TS2345": 1
+    "src/hooks/intelligence/useMagicUpGeneration.ts": {
+      "TS2322": 1
     },
-    "src/hooks/useFavoritesPageState.ts": {
-      "TS2339": 4,
-      "TS2345": 1
+    "src/hooks/intelligence/useMagicUpState.ts": {
+      "TS2322": 1,
+      "TS2345": 4,
+      "TS2769": 1,
+      "TS2783": 2
     },
-    "src/hooks/useGenericFuzzySearch.ts": {
+    "src/hooks/intelligence/useScheduledReports.ts": {
       "TS2322": 1
     },
-    "src/hooks/useGeoBlocking.ts": {
-      "TS2322": 3,
-      "TS2339": 1,
-      "TS2345": 3,
+    "src/hooks/intelligence/useSpeechRecognition.ts": {
+      "TS2687": 2,
+      "TS2717": 2
+    },
+    "src/hooks/intelligence/useStockHistory.ts": {
       "TS2769": 2
     },
-    "src/hooks/useGravacaoPriceV2.ts": {
-      "TS2345": 3
+    "src/hooks/intelligence/useVoiceAgent.ts": {
+      "TS2305": 5,
+      "TS2322": 1,
+      "TS7006": 2
     },
-    "src/hooks/useIPValidation.test.ts": {
-      "TS2339": 7,
-      "TS7005": 1,
-      "TS7034": 1
+    "src/hooks/intelligence/useVoiceCommandHistory.ts": {
+      "TS2769": 1
     },
-    "src/hooks/useKitBuilderPageState.ts": {
+    "src/hooks/kit-builder/useKitBuilderPageState.ts": {
       "TS2345": 1,
       "TS7016": 1
     },
-    "src/hooks/useKitBuilderTransformers.ts": {
+    "src/hooks/kit-builder/useKitBuilderTransformers.ts": {
       "TS2345": 4
     },
-    "src/hooks/useKitTemplates.ts": {
+    "src/hooks/kit-builder/useKitTemplates.ts": {
       "TS2322": 3
     },
-    "src/hooks/useMagicUpGeneration.ts": {
-      "TS2322": 1
-    },
-    "src/hooks/useMagicUpState.ts": {
+    "src/hooks/mockup/mockupGenerationService.ts": {
       "TS2322": 1,
-      "TS2345": 4,
-      "TS2769": 1,
-      "TS2783": 2
+      "TS2345": 2,
+      "TS2769": 1
     },
-    "src/hooks/useMockupDraft.ts": {
+    "src/hooks/mockup/useMockupDraft.ts": {
       "TS18046": 9,
-      "TS2345": 4,
-      "TS2769": 3
+      "TS2345": 3,
+      "TS2769": 2
     },
-    "src/hooks/useMockupGenerator.ts": {
+    "src/hooks/mockup/useMockupGenerator.ts": {
       "TS2339": 2,
       "TS2345": 1
     },
-    "src/hooks/useNoveltiesSelectionMode.ts": {
-      "TS2352": 1
+    "src/hooks/products/index.ts": {
+      "TS2308": 2
     },
-    "src/hooks/usePasswordResetRequests.ts": {
-      "TS2322": 9,
-      "TS2339": 1,
+    "src/hooks/products/useCartTemplates.ts": {
+      "TS2322": 1
+    },
+    "src/hooks/products/useCatalogFiltering.ts": {
+      "TS2322": 1,
+      "TS2339": 1
+    },
+    "src/hooks/products/useCatalogState.ts": {
+      "TS2322": 1,
       "TS2345": 4,
-      "TS2589": 1,
-      "TS2769": 5
+      "TS2448": 1,
+      "TS2454": 1,
+      "TS2769": 1
+    },
+    "src/hooks/products/useCategoryIcons.ts": {
+      "TS2769": 1
     },
-    "src/hooks/usePrintAreas.ts": {
+    "src/hooks/products/useColorEnrichment.ts": {
       "TS2322": 1
     },
-    "src/hooks/useProductInsights.ts": {
+    "src/hooks/products/useColorSystem.ts": {
+      "TS2345": 1,
+      "TS2352": 1,
+      "TS2769": 1
+    },
+    "src/hooks/products/useNoveltiesSelectionMode.ts": {
+      "TS2352": 1
+    },
+    "src/hooks/products/usePrefetchProduct.ts": {
+      "TS2551": 1
+    },
+    "src/hooks/products/useProductInsights.ts": {
       "TS18047": 1,
       "TS2345": 1,
       "TS2531": 1
     },
-    "src/hooks/useProductIntelligenceBadges.ts": {
+    "src/hooks/products/useProductIntelligenceBadges.ts": {
       "TS2339": 10,
       "TS7006": 2,
       "TS7053": 1
     },
-    "src/hooks/useProducts.ts": {
-      "TS2367": 1,
+    "src/hooks/products/useProducts.ts": {
       "TS2769": 3
     },
-    "src/hooks/useProductsByColor.ts": {
+    "src/hooks/products/useProductsByColor.ts": {
       "TS2345": 1
     },
-    "src/hooks/usePushNotifications.tsx": {
-      "TS2353": 1
+    "src/hooks/products/useReplenishmentsSelectionMode.ts": {
+      "TS2352": 1
+    },
+    "src/hooks/products/useSupplierComparison.ts": {
+      "TS2339": 2,
+      "TS7006": 2
+    },
+    "src/hooks/products/useSupplierFiscalData.ts": {
+      "TS2352": 2
+    },
+    "src/hooks/quotes/useAutoSaveQuote.ts": {
+      "TS2339": 2
     },
-    "src/hooks/useQuoteBuilderState.ts": {
+    "src/hooks/quotes/useQuoteBuilderState.ts": {
       "TS2304": 2,
       "TS2345": 3
     },
-    "src/hooks/useQuoteFunnel.ts": {
+    "src/hooks/quotes/useQuoteFunnel.ts": {
       "TS2367": 1
     },
-    "src/hooks/useQuoteHistory.ts": {
+    "src/hooks/quotes/useQuoteHistory.ts": {
       "TS2345": 1
     },
-    "src/hooks/useQuoteTemplates.ts": {
+    "src/hooks/quotes/useQuoteTemplates.ts": {
       "TS2322": 2
     },
-    "src/hooks/useQuotes.ts": {
-      "TS2322": 2
+    "src/hooks/simulation/index.ts": {
+      "TS2308": 2
     },
-    "src/hooks/useRamoAtividadeFilter.ts": {
-      "TS7006": 2
+    "src/hooks/simulation/useCustomizationPrice.ts": {
+      "TS18048": 2
     },
-    "src/hooks/useReplenishmentsSelectionMode.ts": {
-      "TS2352": 1
+    "src/hooks/simulation/useGravacaoPriceV2.ts": {
+      "TS2345": 3
     },
-    "src/hooks/useScheduledReports.ts": {
+    "src/hooks/simulation/usePrintAreas.ts": {
       "TS2322": 1
     },
-    "src/hooks/useSecretsManager.ts": {
-      "TS2322": 6
-    },
-    "src/hooks/useSimulation.ts": {
-      "TS2339": 1,
+    "src/hooks/simulation/useSimulation.ts": {
       "TS2345": 1,
-      "TS2352": 3,
+      "TS2352": 2,
       "TS2589": 1,
       "TS2769": 3
     },
-    "src/hooks/useSimulatorPreferences.ts": {
+    "src/hooks/simulation/useSimulatorPreferences.ts": {
       "TS2322": 1
     },
-    "src/hooks/useSpeechRecognition.ts": {
-      "TS2687": 2
+    "src/hooks/simulation/useTechniquePricing.ts": {
+      "TS2362": 1,
+      "TS2363": 1
     },
-    "src/hooks/useStockHistory.ts": {
-      "TS2769": 2
+    "src/hooks/simulator/useLivePricePreview.ts": {
+      "TS2345": 1
     },
-    "src/hooks/useSupplierComparison.ts": {
-      "TS2339": 2,
-      "TS7006": 2
+    "src/hooks/simulator/useSimulatorWizard.ts": {
+      "TS2820": 1
     },
-    "src/hooks/useSupplierFiscalData.ts": {
-      "TS2352": 2
+    "src/hooks/simulator/useUndoRedo.ts": {
+      "TS2345": 2
     },
-    "src/hooks/useTechniquePricing.ts": {
-      "TS2362": 1,
-      "TS2363": 1
+    "src/hooks/simulator/useWizardDrafts.ts": {
+      "TS2322": 2
+    },
+    "src/hooks/simulator/useWizardPricing.ts": {
+      "TS2339": 1,
+      "TS2345": 2
     },
-    "src/hooks/useVoiceAgent.ts": {
+    "src/hooks/simulator/wizardReducer.ts": {
+      "TS2322": 3,
+      "TS2678": 1
+    },
+    "src/hooks/ui/useErrorHandler.ts": {
       "TS2322": 1
     },
-    "src/hooks/useVoiceCommandHistory.ts": {
-      "TS2769": 1
+    "src/hooks/ui/usePushNotifications.tsx": {
+      "TS2353": 1
+    },
+    "src/hooks/voice/logVoiceCommand.ts": {
+      "TS2305": 1
+    },
+    "src/hooks/voice/processTranscript.ts": {
+      "TS2305": 1
     },
     "src/lib/access/log-access-denied.ts": {
       "TS2322": 1
@@ -838,9 +941,18 @@
       "TS2322": 1,
       "TS2353": 3
     },
+    "src/lib/kit-builder/mock-data.ts": {
+      "TS2305": 2
+    },
+    "src/lib/kit-builder/price-calculator.ts": {
+      "TS2305": 3
+    },
     "src/lib/kit-builder/types.ts": {
       "TS18048": 2
     },
+    "src/lib/kit-builder/volume-calculator.ts": {
+      "TS2305": 3
+    },
     "src/lib/pdf/whitelabel-comparison.ts": {
       "TS2322": 3,
       "TS2345": 1,
@@ -853,9 +965,22 @@
       "TS2362": 1,
       "TS2363": 1
     },
+    "src/lib/personalization/calculators.ts": {
+      "TS2305": 5
+    },
     "src/lib/personalization/repositories/technique.repository.ts": {
       "TS7006": 1
     },
+    "src/lib/personalization/selectors.ts": {
+      "TS2305": 6
+    },
+    "src/lib/personalization/transformers.ts": {
+      "TS2305": 3
+    },
+    "src/lib/personalization/validators.ts": {
+      "TS2305": 6,
+      "TS7006": 1
+    },
     "src/lib/query-config.ts": {
       "TS2352": 1
     },
@@ -868,89 +993,16 @@
     "src/lib/system/dev-infra-messages.ts": {
       "TS2345": 1
     },
-    "src/pages/Auth.tsx": {
-      "TS2322": 1
-    },
-    "src/pages/CollectionsPage.tsx": {
-      "TS2304": 2
-    },
-    "src/pages/ComparePage.tsx": {
-      "TS18047": 3,
-      "TS2322": 4,
-      "TS2345": 1,
-      "TS2488": 1,
-      "TS2551": 2
-    },
-    "src/pages/FavoritesPage.tsx": {
-      "TS2322": 9,
-      "TS2339": 2,
-      "TS2345": 1
-    },
-    "src/pages/FiltersPage.tsx": {
-      "TS2339": 2
-    },
     "src/pages/Index.tsx": {
       "TS2322": 1,
-      "TS2339": 4,
+      "TS2339": 5,
       "TS2551": 1
     },
-    "src/pages/KitBuilderPage.tsx": {
-      "TS2322": 3,
-      "TS2551": 2,
-      "TS2741": 1
-    },
-    "src/pages/MockupGenerator.tsx": {
-      "TS2322": 1
-    },
-    "src/pages/ProductDetail.tsx": {
-      "TS2322": 10,
-      "TS2339": 2
-    },
-    "src/pages/ProductMatchPage.tsx": {
-      "TS2322": 1,
-      "TS2339": 3,
-      "TS2345": 1,
-      "TS7006": 2
-    },
-    "src/pages/QuoteBuilderPage.tsx": {
-      "TS2322": 2,
-      "TS2339": 1,
-      "TS7006": 1
-    },
-    "src/pages/QuoteViewPage.tsx": {
-      "TS2322": 1,
-      "TS2339": 2,
-      "TS2345": 3
-    },
-    "src/pages/QuotesKanbanPage.tsx": {
-      "TS2345": 1,
-      "TS2769": 1
-    },
-    "src/pages/QuotesListPage.tsx": {
-      "TS2345": 1,
-      "TS2554": 1,
-      "TS7016": 1
-    },
-    "src/pages/RolePermissionsPage.tsx": {
-      "TS18046": 2,
-      "TS2345": 3
-    },
-    "src/pages/RolesPage.tsx": {
-      "TS2322": 4,
-      "TS2345": 3,
-      "TS2769": 4
-    },
     "src/pages/SidebarQAPage.tsx": {
       "TS2322": 1
     },
-    "src/pages/SystemStatusPage.tsx": {
-      "TS2322": 1,
-      "TS2339": 2
-    },
-    "src/pages/TrendsPage.tsx": {
-      "TS2322": 2,
-      "TS2339": 1,
-      "TS2345": 2
+    "src/pages/admin/AdminClientPerformancePage.tsx": {
+      "TS2322": 1
     },
     "src/pages/admin/AdminProductFormPage.tsx": {
       "TS2339": 59,
@@ -959,6 +1011,15 @@
     "src/pages/admin/DevChallengeExamplesPage.tsx": {
       "TS2322": 1
     },
+    "src/pages/admin/RolePermissionsPage.tsx": {
+      "TS18046": 2,
+      "TS2345": 3
+    },
+    "src/pages/admin/RolesPage.tsx": {
+      "TS2322": 4,
+      "TS2345": 2,
+      "TS2769": 4
+    },
     "src/pages/admin/telemetry/useOptimizationQueue.ts": {
       "TS2339": 1
     },
@@ -972,47 +1033,120 @@
       "TS2339": 3,
       "TS7006": 6
     },
+    "src/pages/auth/Auth.tsx": {
+      "TS2367": 2
+    },
+    "src/pages/auth/AuthBranding.test.tsx": {
+      "TS2305": 1
+    },
+    "src/pages/auth/AuthBranding.tsx": {
+      "TS2345": 1
+    },
+    "src/pages/bi/TrendsPage.tsx": {
+      "TS2322": 2,
+      "TS2339": 1,
+      "TS2345": 2
+    },
+    "src/pages/collections/CollectionsPage.tsx": {
+      "TS2304": 2
+    },
     "src/pages/filters/useFiltersPageState.ts": {
       "TS2339": 1,
       "TS2345": 3
     },
+    "src/pages/kit-builder/KitBuilderPage.tsx": {
+      "TS2322": 3,
+      "TS2551": 2,
+      "TS2741": 1
+    },
     "src/pages/kit-builder/useKitBuilderQuote.ts": {
+      "TS2305": 1,
       "TS2345": 2,
-      "TS2459": 1,
       "TS7006": 3
     },
     "src/pages/magic-up/MagicUpConfigPanel.tsx": {
       "TS2322": 1,
       "TS2345": 1
     },
-    "src/pages/product-detail/ProductDetailHero.tsx": {
+    "src/pages/mockups/MockupGenerator.tsx": {
+      "TS2322": 1
+    },
+    "src/pages/products/ComparePage.tsx": {
+      "TS18047": 3,
+      "TS2322": 4,
+      "TS2345": 1,
+      "TS2551": 2
+    },
+    "src/pages/products/FavoritesPage.tsx": {
+      "TS2322": 9,
+      "TS2339": 2,
+      "TS2345": 1
+    },
+    "src/pages/products/FiltersPage.tsx": {
+      "TS2339": 2
+    },
+    "src/pages/products/ProductDetail.tsx": {
+      "TS2322": 10,
+      "TS2339": 2
+    },
+    "src/pages/products/ProductMatchPage.tsx": {
+      "TS2322": 1,
+      "TS2339": 3,
+      "TS2345": 1,
+      "TS7006": 2
+    },
+    "src/pages/products/product-detail/ProductDetailHero.tsx": {
       "TS2322": 6,
       "TS2339": 4
     },
-    "src/pages/product-match/ProductSearchPanel.tsx": {
+    "src/pages/products/product-match/ProductSearchPanel.tsx": {
       "TS2488": 1
     },
-    "src/pages/quote-view/QuoteActionHandlers.ts": {
+    "src/pages/products/seller-carts/CartSidebar.tsx": {
+      "TS2322": 1
+    },
+    "src/pages/quotes/QuoteBuilderPage.tsx": {
+      "TS2339": 1
+    },
+    "src/pages/quotes/QuoteViewPage.tsx": {
+      "TS2322": 1,
+      "TS2339": 2,
+      "TS2345": 3
+    },
+    "src/pages/quotes/QuotesKanbanPage.tsx": {
+      "TS2345": 1,
+      "TS2769": 1
+    },
+    "src/pages/quotes/QuotesListPage.tsx": {
+      "TS2345": 1,
+      "TS2554": 1,
+      "TS7016": 1
+    },
+    "src/pages/quotes/quote-view/QuoteActionHandlers.ts": {
       "TS2345": 5,
       "TS2532": 1
     },
-    "src/pages/quote-view/QuoteBitrixSync.ts": {
+    "src/pages/quotes/quote-view/QuoteBitrixSync.ts": {
       "TS2322": 1,
       "TS2345": 5,
       "TS2532": 1
     },
-    "src/pages/quote-view/useQuoteViewData.ts": {
+    "src/pages/quotes/quote-view/useQuoteViewData.ts": {
       "TS2322": 1,
       "TS2339": 1,
       "TS2345": 1
     },
-    "src/pages/quotes-dashboard/useQuotesDashboard.ts": {
+    "src/pages/quotes/quotes-dashboard/useQuotesDashboard.ts": {
       "TS2322": 1,
       "TS2339": 1,
       "TS2769": 3
     },
-    "src/pages/seller-carts/CartSidebar.tsx": {
-      "TS2322": 1
+    "src/pages/quotes/useQuotesListPage.ts": {
+      "TS7016": 1
+    },
+    "src/pages/system/SystemStatusPage.tsx": {
+      "TS2322": 3,
+      "TS2339": 2
     },
     "src/pages/trends/TrendsCharts.tsx": {
       "TS18046": 1,
@@ -1021,11 +1155,23 @@
       "TS2362": 1,
       "TS2365": 1
     },
+    "src/services/__tests__/quoteService.test.ts": {
+      "TS18048": 1
+    },
     "src/services/materialService.ts": {
       "TS2322": 4
     },
+    "src/services/productService.ts": {
+      "TS2367": 1
+    },
+    "src/services/quoteService.ts": {
+      "TS2322": 1
+    },
+    "src/tests/AdminStructuralComparison.test.tsx": {
+      "TS2304": 19
+    },
     "src/tests/MockupDeletion.test.tsx": {
-      "TS2769": 2
+      "TS2769": 1
     },
     "src/types/index.ts": {
       "TS2308": 1
diff --git a/AUDITORIA_REDEPLOY_PROMO_GIFTS_2026-05-13_15-32 (1).md b/docs/historico/AUDITORIA_REDEPLOY_PROMO_GIFTS_2026-05-13_15-32.md
similarity index 100%
rename from AUDITORIA_REDEPLOY_PROMO_GIFTS_2026-05-13_15-32 (1).md
rename to docs/historico/AUDITORIA_REDEPLOY_PROMO_GIFTS_2026-05-13_15-32.md
diff --git a/RECOVERY_PLAN.md b/docs/historico/RECOVERY_PLAN.md
similarity index 100%
rename from RECOVERY_PLAN.md
rename to docs/historico/RECOVERY_PLAN.md
diff --git a/package.json b/package.json
index 7f05568bb..b7783b1e7 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
     "e2e:watch-fixtures": "npx chokidar-cli \"e2e/fixtures/permissions-matrix.ts\" -c \"npm run e2e:generate-fixtures\"",
     "dev": "npm run e2e:generate-fixtures && vite",
     "build": "vite build",
-    "build:dev": "node scripts/generate-health.mjs && vite build --mode development",
+    "build:dev": "vite build --mode development",
     "preview": "vite preview",
     "test": "vitest run",
     "test:quality": "vitest run --exclude 'tests/hooks/**'",
diff --git a/src/components/categories/CategoryTreeNavigator.tsx b/src/components/categories/CategoryTreeNavigator.tsx
deleted file mode 100644
index f7f14452a..000000000
--- a/src/components/categories/CategoryTreeNavigator.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * CategoryTreeNavigator — alias semântico para CategoryTreeNavigation,
- * usado em contextos onde o componente atua como navegador de seleção (não apenas exibição).
- */
-export { CategoryTreeNavigation as CategoryTreeNavigator } from "./CategoryTreeNavigation";
diff --git a/src/hooks/kit-builder/useKitBuilderQueries.ts b/src/hooks/kit-builder/useKitBuilderQueries.ts
index 3b545cab3..9da797e16 100644
--- a/src/hooks/kit-builder/useKitBuilderQueries.ts
+++ b/src/hooks/kit-builder/useKitBuilderQueries.ts
@@ -127,7 +127,7 @@ export function useKitBuilderQueries() {
           .filter((box): box is KitBox => box !== null);
 
         if (boxes.length === 0) {
-          console.info('[KitBuilder] No boxes from external DB, using mock data');
+          logger.info('[KitBuilder] No boxes from external DB, using mock data');
           return filterBoxes(MOCK_BOXES, debouncedBoxSearch, boxDimFilters);
         }
 
@@ -165,7 +165,7 @@ export function useKitBuilderQueries() {
           .map((p) => transformToKitItem(p));
 
         if (items.length === 0) {
-          console.info('[KitBuilder] No items from external DB, using mock data');
+          logger.info('[KitBuilder] No items from external DB, using mock data');
           return filterItems(MOCK_ITEMS, debouncedItemSearch);
         }
 
diff --git a/src/hooks/products/index.ts b/src/hooks/products/index.ts
index 91af4cc4e..486e20d6e 100644
--- a/src/hooks/products/index.ts
+++ b/src/hooks/products/index.ts
@@ -10,7 +10,6 @@ export * from "@/hooks/products/useCategoriesTree";
 export * from "@/hooks/products/useCategoryIcons";
 export * from "@/hooks/products/useColorEnrichment";
 export * from "@/hooks/products/useColorSystem";
-export * from "@/hooks/products/useColors";
 export * from "@/hooks/products/useExternalCategoriesQuery";
 export * from "@/hooks/products/useExternalVariantStock";
 export * from "@/hooks/products/useMaterialFilter";
diff --git a/src/hooks/products/useColors.ts b/src/hooks/products/useColors.ts
deleted file mode 100644
index 0f7b8b5ff..000000000
--- a/src/hooks/products/useColors.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * useColors — alias do hook useColorSystem para compatibilidade com código legado/documentação.
- * Mantém uma API estável: retorna a lista de cores normalizadas do sistema.
- */
-export { useColorSystem as useColors } from "@/hooks/products/useColorSystem";
diff --git a/src/hooks/stock/index.ts b/src/hooks/stock/index.ts
deleted file mode 100644
index 98e766cd4..000000000
--- a/src/hooks/stock/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-// Exporting all hooks from stock