fix: abbreviate GPU architecture suffixes in article token

Ampere, Hopper, Blackwell now produce AMP/HOP/BWL suffixes (like ADA)
so RTX cards across generations are distinguishable: RTX6000ADA vs
RTX6000BWL. LOVELACE remains a skip token as it duplicates ADA info.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

.gitignore

@@ -1,10 +1,5 @@
 # QuoteForge
 config.yaml
-
-# Data exports and imports with real supplier/pricing data
-*_import.sql
-*_export.csv
-test_export.csv
 .env
 .env.*
 *.pem

acc_lot_log_import.sql

@@ -0,0 +1,33 @@
+-- Generated from /Users/mchusavitin/Downloads/acc.csv
+-- Unambiguous rows only. Rows from headers without a date were skipped.
+INSERT INTO lot_log (`lot`, `supplier`, `date`, `price`, `quality`, `comments`) VALUES
+('ACC_RMK_L_Type', '', '2024-04-01', 19, NULL, 'header supplier missing in source (45383)'),
+('ACC_RMK_SLIDE', '', '2024-04-01', 31, NULL, 'header supplier missing in source (45383)'),
+('NVLINK_2S_Bridge', '', '2023-01-01', 431, NULL, 'header supplier missing in source (44927)'),
+('NVLINK_2S_Bridge', 'Jevy Yang', '2025-01-15', 139, NULL, NULL),
+('NVLINK_2S_Bridge', 'Wendy', '2025-01-15', 143, NULL, NULL),
+('NVLINK_2S_Bridge', 'HONCH (Darian)', '2025-05-06', 155, NULL, NULL),
+('NVLINK_2S_Bridge', 'HONCH (Sunny)', '2025-06-17', 155, NULL, NULL),
+('NVLINK_2S_Bridge', 'Wendy', '2025-07-02', 145, NULL, NULL),
+('NVLINK_2S_Bridge', 'Honch (Sunny)', '2025-07-10', 155, NULL, NULL),
+('NVLINK_2S_Bridge', 'Honch (Yan)', '2025-08-07', 155, NULL, NULL),
+('NVLINK_2S_Bridge', 'Jevy', '2025-09-09', 155, NULL, NULL),
+('NVLINK_2S_Bridge', 'Honch (Darian)', '2025-11-17', 102, NULL, NULL),
+('NVLINK_2W_Bridge(H200)', '', '2023-01-01', 405, NULL, 'header supplier missing in source (44927)'),
+('NVLINK_2W_Bridge(H200)', 'network logic / Stephen', '2025-02-10', 305, NULL, NULL),
+('NVLINK_2W_Bridge(H200)', 'JEVY', '2025-02-18', 411, NULL, NULL),
+('NVLINK_4W_Bridge(H200)', '', '2023-01-01', 820, NULL, 'header supplier missing in source (44927)'),
+('NVLINK_4W_Bridge(H200)', 'network logic / Stephen', '2025-02-10', 610, NULL, NULL),
+('NVLINK_4W_Bridge(H200)', 'JEVY', '2025-02-18', 754, NULL, NULL),
+('25G_SFP28_MMA2P00-AS', 'HONCH (Doris)', '2025-02-19', 65, NULL, NULL),
+('ACC_SuperCap', '', '2024-04-01', 59, NULL, 'header supplier missing in source (45383)'),
+('ACC_SuperCap', 'Chiphome', '2025-02-28', 48, NULL, NULL);
+
+-- Skipped source values due to missing date in header:
+-- lot=ACC_RMK_L_Type; header=FOB; price=19; reason=header has supplier but no date
+-- lot=ACC_RMK_SLIDE; header=FOB; price=31; reason=header has supplier but no date
+-- lot=NVLINK_2S_Bridge; header=FOB; price=155; reason=header has supplier but no date
+-- lot=NVLINK_2W_Bridge(H200); header=FOB; price=405; reason=header has supplier but no date
+-- lot=NVLINK_4W_Bridge(H200); header=FOB; price=754; reason=header has supplier but no date
+-- lot=25G_SFP28_MMA2P00-AS; header=FOB; price=65; reason=header has supplier but no date
+-- lot=ACC_SuperCap; header=FOB; price=48; reason=header has supplier but no date

bible-local/03-database.md

@@ -29,15 +29,17 @@ Rules:
 
 ## MariaDB
 
-MariaDB is the central sync database (`RFQ_LOG`). Final schema as of 2026-04-15.
+MariaDB is the central sync database (`RFQ_LOG`). Final schema as of 2026-03-21.
 
-### QuoteForge tables (qt_*)
+### QuoteForge tables (qt_* and stock_*)
 
 Runtime read:
 - `qt_categories` — pricelist categories
 - `qt_lot_metadata` — component metadata, price settings
 - `qt_pricelists` — pricelist headers (source: estimate / warehouse / competitor)
 - `qt_pricelist_items` — pricelist rows
+- `stock_log` — raw supplier price log, source for pricelist generation
+- `stock_ignore_rules` — patterns to skip during stock import
 - `qt_partnumber_books` — partnumber book headers
 - `qt_partnumber_book_items` — PN→LOT catalog payload
 
@@ -67,20 +69,18 @@ QuoteForge references competitor pricelists only via `qt_pricelists` (source='co
 ### Legacy RFQ tables (pre-QuoteForge, no Go code references)
 
 - `lot` — original component registry (data preserved; superseded by `qt_lot_metadata`)
-- `lot_log` — original supplier price log
+- `lot_log` — original supplier price log (superseded by `stock_log`)
 - `supplier` — supplier registry (FK target for lot_log and machine_log)
 - `machine` — device model registry
 - `machine_log` — device price/quote log
-- `parts_log` — supplier partnumber log used by server-side import/pricing workflows, not by QuoteForge runtime
 
 These tables are retained for historical data. QuoteForge does not read or write them at runtime.
 
 Rules:
 - QuoteForge runtime must not depend on any legacy RFQ tables;
-- QuoteForge sync reads prices and categories from `qt_pricelists` / `qt_pricelist_items` only;
-- QuoteForge does not enrich local pricelist rows from `parts_log` or any other raw supplier log table;
+- stock enrichment happens during sync and is persisted into SQLite;
 - normal UI requests must not query MariaDB tables directly;
-- `qt_client_local_migrations` exists in the 2026-04-15 schema dump, but runtime sync does not depend on it.
+- `qt_client_local_migrations` was removed from the schema on 2026-03-21 (was in earlier drafts).
 
 ## MariaDB Table Structures
 

cmd/qfs/main.go

@@ -1270,7 +1270,6 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 			})
 
 			configs.GET("/:uuid/export", exportHandler.ExportConfigCSV)
-			configs.POST("/:uuid/export/pricing", exportHandler.ExportConfigPricingCSV)
 
 			// Vendor spec (BOM) endpoints
 			configs.GET("/:uuid/vendor-spec", vendorSpecHandler.GetVendorSpec)

internal/article/generator.go

@@ -22,29 +22,24 @@ type BuildResult struct {
 }
 
 var (
-	reMemGiB    = regexp.MustCompile(`(?i)(\d+)\s*(GB|G)`)
-	reMemTiB    = regexp.MustCompile(`(?i)(\d+)\s*(TB|T)`)
+	reMemGiB = regexp.MustCompile(`(?i)(\d+)\s*(GB|G)`)
+	reMemTiB = regexp.MustCompile(`(?i)(\d+)\s*(TB|T)`)
 	reCapacityT = regexp.MustCompile(`(?i)(\d+(?:[.,]\d+)?)T`)
 	reCapacityG = regexp.MustCompile(`(?i)(\d+(?:[.,]\d+)?)G`)
 	rePortSpeed = regexp.MustCompile(`(?i)(\d+)p(\d+)(GbE|G)`)
-	rePortFC    = regexp.MustCompile(`(?i)(\d+)pFC(\d+)`)
-	reWatts     = regexp.MustCompile(`(?i)(\d{3,5})\s*W`)
+	rePortFC = regexp.MustCompile(`(?i)(\d+)pFC(\d+)`)
+	reWatts = regexp.MustCompile(`(?i)(\d{3,5})\s*W`)
 )
 
-type namedSeg struct {
-	group string // "MODEL","CPU","MEM","GPU","DISK","NET","PSU","SUPPORT"
-	value string
-}
-
 func Build(local *localdb.LocalDB, items []models.ConfigItem, opts BuildOptions) (BuildResult, error) {
-	segs := make([]namedSeg, 0, 8)
+	segments := make([]string, 0, 8)
 	warnings := make([]string, 0)
 
 	model := NormalizeServerModel(opts.ServerModel)
 	if model == "" {
 		return BuildResult{}, fmt.Errorf("server_model required")
 	}
-	segs = append(segs, namedSeg{"MODEL", model})
+	segments = append(segments, model)
 
 	lotNames := make([]string, 0, len(items))
 	for _, it := range items {
@@ -60,39 +55,41 @@ func Build(local *localdb.LocalDB, items []models.ConfigItem, opts BuildOptions)
 		return BuildResult{}, err
 	}
 
-	if cpuSeg := buildCPUSegment(items, cats); cpuSeg != "" {
-		segs = append(segs, namedSeg{"CPU", cpuSeg})
+	cpuSeg := buildCPUSegment(items, cats)
+	if cpuSeg != "" {
+		segments = append(segments, cpuSeg)
 	}
 	memSeg, memWarn := buildMemSegment(items, cats)
 	if memWarn != "" {
 		warnings = append(warnings, memWarn)
 	}
 	if memSeg != "" {
-		segs = append(segs, namedSeg{"MEM", memSeg})
+		segments = append(segments, memSeg)
 	}
-	if gpuSeg := buildGPUSegment(items, cats); gpuSeg != "" {
-		segs = append(segs, namedSeg{"GPU", gpuSeg})
+	gpuSeg := buildGPUSegment(items, cats)
+	if gpuSeg != "" {
+		segments = append(segments, gpuSeg)
 	}
 	diskSeg, diskWarn := buildDiskSegment(items, cats)
 	if diskWarn != "" {
 		warnings = append(warnings, diskWarn)
 	}
 	if diskSeg != "" {
-		segs = append(segs, namedSeg{"DISK", diskSeg})
+		segments = append(segments, diskSeg)
 	}
 	netSeg, netWarn := buildNetSegment(items, cats)
 	if netWarn != "" {
 		warnings = append(warnings, netWarn)
 	}
 	if netSeg != "" {
-		segs = append(segs, namedSeg{"NET", netSeg})
+		segments = append(segments, netSeg)
 	}
 	psuSeg, psuWarn := buildPSUSegment(items, cats)
 	if psuWarn != "" {
 		warnings = append(warnings, psuWarn)
 	}
 	if psuSeg != "" {
-		segs = append(segs, namedSeg{"PSU", psuSeg})
+		segments = append(segments, psuSeg)
 	}
 
 	if strings.TrimSpace(opts.SupportCode) != "" {
@@ -100,12 +97,12 @@ func Build(local *localdb.LocalDB, items []models.ConfigItem, opts BuildOptions)
 		if !isSupportCodeValid(code) {
 			return BuildResult{}, fmt.Errorf("invalid_support_code")
 		}
-		segs = append(segs, namedSeg{"SUPPORT", code})
+		segments = append(segments, code)
 	}
 
-	article := strings.Join(namedSegsValues(segs), "-")
+	article := strings.Join(segments, "-")
 	if len([]rune(article)) > 80 {
-		article = compressArticle(segs)
+		article = compressArticle(segments)
 		warnings = append(warnings, "compressed")
 	}
 	if len([]rune(article)) > 80 {
@@ -115,23 +112,6 @@ func Build(local *localdb.LocalDB, items []models.ConfigItem, opts BuildOptions)
 	return BuildResult{Article: article, Warnings: warnings}, nil
 }
 
-func namedSegsValues(segs []namedSeg) []string {
-	out := make([]string, len(segs))
-	for i, s := range segs {
-		out[i] = s.value
-	}
-	return out
-}
-
-func findSegGroup(segs []namedSeg, group string) int {
-	for i, s := range segs {
-		if s.group == group {
-			return i
-		}
-	}
-	return -1
-}
-
 func isSupportCodeValid(code string) bool {
 	if len(code) < 3 {
 		return false
@@ -504,50 +484,60 @@ func atoi(v string) int {
 	return n
 }
 
-func compressArticle(segs []namedSeg) string {
-	if len(segs) == 0 {
+func compressArticle(segments []string) string {
+	if len(segments) == 0 {
 		return ""
 	}
-	for i, s := range segs {
-		segs[i].value = strings.ReplaceAll(s.value, "GbE", "G")
+	normalized := make([]string, 0, len(segments))
+	for _, s := range segments {
+		normalized = append(normalized, strings.ReplaceAll(s, "GbE", "G"))
 	}
-	article := strings.Join(namedSegsValues(segs), "-")
+	segments = normalized
+	article := strings.Join(segments, "-")
 	if len([]rune(article)) <= 80 {
 		return article
 	}
 
+	// segment order: model, cpu, mem, gpu, disk, net, psu, support
+	index := func(i int) (int, bool) {
+		if i >= 0 && i < len(segments) {
+			return i, true
+		}
+		return -1, false
+	}
+
 	// 1) remove PSU
-	if i := findSegGroup(segs, "PSU"); i >= 0 {
-		segs = append(segs[:i], segs[i+1:]...)
-		article = strings.Join(namedSegsValues(segs), "-")
+	if i, ok := index(6); ok {
+		segments = append(segments[:i], segments[i+1:]...)
+		article = strings.Join(segments, "-")
 		if len([]rune(article)) <= 80 {
 			return article
 		}
 	}
 
 	// 2) compress NET/HBA/HCA
-	if i := findSegGroup(segs, "NET"); i >= 0 {
-		segs[i].value = compressNetSegment(segs[i].value)
-		article = strings.Join(namedSegsValues(segs), "-")
+	if i, ok := index(5); ok {
+		segments[i] = compressNetSegment(segments[i])
+		article = strings.Join(segments, "-")
 		if len([]rune(article)) <= 80 {
 			return article
 		}
 	}
 
 	// 3) compress DISK
-	if i := findSegGroup(segs, "DISK"); i >= 0 {
-		segs[i].value = compressDiskSegment(segs[i].value)
-		article = strings.Join(namedSegsValues(segs), "-")
+	if i, ok := index(4); ok {
+		segments[i] = compressDiskSegment(segments[i])
+		article = strings.Join(segments, "-")
 		if len([]rune(article)) <= 80 {
 			return article
 		}
 	}
 
 	// 4) compress GPU to vendor only (GPU_NV)
-	if i := findSegGroup(segs, "GPU"); i >= 0 {
-		segs[i].value = compressGPUSegment(segs[i].value)
+	if i, ok := index(3); ok {
+		segments[i] = compressGPUSegment(segments[i])
 	}
-	return strings.Join(namedSegsValues(segs), "-")
+	return strings.Join(segments, "-")
 }
 
 func compressNetSegment(seg string) string {

internal/article/generator_test.go

@@ -61,79 +61,6 @@ func TestBuild_ParsesNetAndPSU(t *testing.T) {
 	}
 }
 
-// TestBuild_CompressArticle_NoGPU_PSUNotNIC reproduces the bug where 2 PSUs produced
-// "2xNIC" in the article because compressArticle used hard-coded indices that assumed
-// GPU was always present.
-func TestBuild_CompressArticle_NoGPU_PSUNotNIC(t *testing.T) {
-	local, err := localdb.New(filepath.Join(t.TempDir(), "local.db"))
-	if err != nil {
-		t.Fatalf("init local db: %v", err)
-	}
-	t.Cleanup(func() { _ = local.Close() })
-
-	if err := local.SaveLocalPricelist(&localdb.LocalPricelist{
-		ServerID:  2,
-		Source:    "estimate",
-		Version:   "S-2026-05-19-001",
-		Name:      "test",
-		CreatedAt: time.Now(),
-		SyncedAt:  time.Now(),
-	}); err != nil {
-		t.Fatalf("save local pricelist: %v", err)
-	}
-	localPL, err := local.GetLocalPricelistByServerID(2)
-	if err != nil {
-		t.Fatalf("get local pricelist: %v", err)
-	}
-
-	if err := local.SaveLocalPricelistItems([]localdb.LocalPricelistItem{
-		{PricelistID: localPL.ID, LotName: "CPU_INTEL_8358", LotCategory: "CPU", Price: 1},
-		{PricelistID: localPL.ID, LotName: "MEM_DDR4_64G_3200", LotCategory: "MEM", Price: 1},
-		{PricelistID: localPL.ID, LotName: "SSD_SATA_0.4T", LotCategory: "SSD", Price: 1},
-		{PricelistID: localPL.ID, LotName: "SSD_SATA_0.9T", LotCategory: "SSD", Price: 1},
-		{PricelistID: localPL.ID, LotName: "HDD_SATA_16T", LotCategory: "HDD", Price: 1},
-		{PricelistID: localPL.ID, LotName: "NIC_2p25G_MCX512A", LotCategory: "NIC", Price: 1},
-		{PricelistID: localPL.ID, LotName: "HBA_2pFC32_Gen6", LotCategory: "HBA", Price: 1},
-		{PricelistID: localPL.ID, LotName: "NIC_4p1G_I350", LotCategory: "NIC", Price: 1},
-		{PricelistID: localPL.ID, LotName: "PS_1500W_Platinum", LotCategory: "PS", Price: 1},
-	}); err != nil {
-		t.Fatalf("save local items: %v", err)
-	}
-
-	// PS_1500W → "2x1.5kW" (7 chars) brings uncompressed article to 81 chars, triggering
-	// compressArticle. Before the fix, compressArticle used hard-coded index 5 for NET, but
-	// without GPU the PSU sits at index 5, so compressNetSegment("2x1.5kW") returned "2xNIC".
-	items := models.ConfigItems{
-		{LotName: "CPU_INTEL_8358", Quantity: 2},
-		{LotName: "MEM_DDR4_64G_3200", Quantity: 16}, // 1024 GiB = 1T
-		{LotName: "SSD_SATA_0.4T", Quantity: 2},
-		{LotName: "SSD_SATA_0.9T", Quantity: 4},
-		{LotName: "HDD_SATA_16T", Quantity: 6},
-		{LotName: "NIC_2p25G_MCX512A", Quantity: 1},
-		{LotName: "HBA_2pFC32_Gen6", Quantity: 1},
-		{LotName: "NIC_4p1G_I350", Quantity: 1},
-		{LotName: "PS_1500W_Platinum", Quantity: 2},
-	}
-	result, err := Build(local, items, BuildOptions{
-		ServerModel:     "NF5280M6",
-		ServerPricelist: &localPL.ServerID,
-	})
-	if err != nil {
-		t.Fatalf("build article: %v", err)
-	}
-	if len([]rune(result.Article)) > 80 {
-		t.Fatalf("article too long (%d): %s", len([]rune(result.Article)), result.Article)
-	}
-	// PSU segment must not be mis-labeled as NIC during compression
-	// The correct behaviour: PSU is dropped, NET stays as-is or compressed to HBA/NIC labels
-	// Before the fix: article ended with "-2xNIC" (PSU turned into NIC)
-	// After the fix: article must not contain a standalone "NIC" that came from PSU wattage
-	if strings.HasSuffix(result.Article, "-2xNIC") {
-		t.Fatalf("PSU mis-labeled as NIC in article: %s", result.Article)
-	}
-	t.Logf("article: %s (warnings: %v)", result.Article, result.Warnings)
-}
-
 func contains(s, sub string) bool {
 	return strings.Contains(s, sub)
 }

internal/handlers/export.go

@@ -223,63 +223,6 @@ func (h *ExportHandler) ExportProjectCSV(c *gin.Context) {
 	}
 }
 
-func (h *ExportHandler) ExportConfigPricingCSV(c *gin.Context) {
-	uuid := c.Param("uuid")
-
-	var req ProjectExportOptionsRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		RespondError(c, http.StatusBadRequest, "invalid request", err)
-		return
-	}
-
-	config, err := h.configService.GetByUUID(uuid, h.dbUsername)
-	if err != nil {
-		RespondError(c, http.StatusNotFound, "resource not found", err)
-		return
-	}
-
-	opts := services.ProjectPricingExportOptions{
-		IncludeLOT:        req.IncludeLOT,
-		IncludeBOM:        req.IncludeBOM,
-		IncludeEstimate:   req.IncludeEstimate,
-		IncludeStock:      req.IncludeStock,
-		IncludeCompetitor: req.IncludeCompetitor,
-		Basis:             req.Basis,
-		SaleMarkup:        req.SaleMarkup,
-	}
-
-	data, err := h.exportService.ConfigToPricingExportData(config, opts)
-	if err != nil {
-		RespondError(c, http.StatusInternalServerError, "internal server error", err)
-		return
-	}
-
-	basisLabel := "FOB"
-	if strings.EqualFold(strings.TrimSpace(req.Basis), "ddp") {
-		basisLabel = "DDP"
-	}
-
-	projectCode := config.Name
-	if config.ProjectUUID != nil && *config.ProjectUUID != "" {
-		if project, err := h.projectService.GetByUUID(*config.ProjectUUID, h.dbUsername); err == nil && project != nil {
-			projectCode = project.Code
-		}
-	}
-
-	filename := fmt.Sprintf("%s (%s) %s %s SPEC.csv",
-		time.Now().Format("2006-01-02"),
-		projectCode,
-		config.Name,
-		basisLabel,
-	)
-	c.Header("Content-Type", "text/csv; charset=utf-8")
-	c.Header("Content-Disposition", fmt.Sprintf("attachment; filename=\"%s\"", filename))
-
-	if err := h.exportService.ToPricingCSV(c.Writer, data, opts); err != nil {
-		c.Error(err)
-	}
-}
-
 func (h *ExportHandler) ExportProjectPricingCSV(c *gin.Context) {
 	projectUUID := c.Param("uuid")
 

internal/localdb/components.go

@@ -28,9 +28,8 @@ type ComponentSyncResult struct {
 func (l *LocalDB) SyncComponents(mariaDB *gorm.DB) (*ComponentSyncResult, error) {
 	startTime := time.Now()
 
-	// Build the component catalog from every runtime source of LOT names.
-	// Storage lots may exist in qt_lot_metadata / qt_pricelist_items before they appear in lot,
-	// so the sync cannot start from lot alone.
+	// Query to join lot with qt_lot_metadata (metadata only, no pricing)
+	// Use LEFT JOIN to include lots without metadata
 	type componentRow struct {
 		LotName        string
 		LotDescription string
@@ -41,29 +40,15 @@ func (l *LocalDB) SyncComponents(mariaDB *gorm.DB) (*ComponentSyncResult, error)
 	var rows []componentRow
 	err := mariaDB.Raw(`
 		SELECT
-			src.lot_name,
-			COALESCE(MAX(NULLIF(TRIM(l.lot_description), '')), '') AS lot_description,
-			COALESCE(
-				MAX(NULLIF(TRIM(c.code), '')),
-				MAX(NULLIF(TRIM(l.lot_category), '')),
-				SUBSTRING_INDEX(src.lot_name, '_', 1)
-			) AS category,
-			MAX(NULLIF(TRIM(m.model), '')) AS model
-		FROM (
-			SELECT lot_name FROM lot
-			UNION
-			SELECT lot_name FROM qt_lot_metadata
-			WHERE is_hidden = FALSE OR is_hidden IS NULL
-			UNION
-			SELECT lot_name FROM qt_pricelist_items
-		) src
-		LEFT JOIN lot l ON l.lot_name = src.lot_name
-		LEFT JOIN qt_lot_metadata m
-			ON m.lot_name = src.lot_name
-			AND (m.is_hidden = FALSE OR m.is_hidden IS NULL)
+			l.lot_name,
+			l.lot_description,
+			COALESCE(c.code, SUBSTRING_INDEX(l.lot_name, '_', 1)) as category,
+			m.model
+		FROM lot l
+		LEFT JOIN qt_lot_metadata m ON l.lot_name = m.lot_name
 		LEFT JOIN qt_categories c ON m.category_id = c.id
-		GROUP BY src.lot_name
-		ORDER BY src.lot_name
+		WHERE m.is_hidden = FALSE OR m.is_hidden IS NULL
+		ORDER BY l.lot_name
 	`).Scan(&rows).Error
 	if err != nil {
 		return nil, fmt.Errorf("querying components from MariaDB: %w", err)
@@ -86,25 +71,18 @@ func (l *LocalDB) SyncComponents(mariaDB *gorm.DB) (*ComponentSyncResult, error)
 		existingMap[c.LotName] = true
 	}
 
-	// Prepare components for batch insert/update.
-	// Source joins may duplicate the same lot_name, so collapse them before insert.
+	// Prepare components for batch insert/update
 	syncTime := time.Now()
 	components := make([]LocalComponent, 0, len(rows))
-	componentIndex := make(map[string]int, len(rows))
 	newCount := 0
 
 	for _, row := range rows {
-		lotName := strings.TrimSpace(row.LotName)
-		if lotName == "" {
-			continue
-		}
-
 		category := ""
 		if row.Category != nil {
-			category = strings.TrimSpace(*row.Category)
+			category = *row.Category
 		} else {
 			// Parse category from lot_name (e.g., "CPU_AMD_9654" -> "CPU")
-			parts := strings.SplitN(lotName, "_", 2)
+			parts := strings.SplitN(row.LotName, "_", 2)
 			if len(parts) >= 1 {
 				category = parts[0]
 			}
@@ -112,34 +90,18 @@ func (l *LocalDB) SyncComponents(mariaDB *gorm.DB) (*ComponentSyncResult, error)
 
 		model := ""
 		if row.Model != nil {
-			model = strings.TrimSpace(*row.Model)
+			model = *row.Model
 		}
 
 		comp := LocalComponent{
-			LotName:        lotName,
-			LotDescription: strings.TrimSpace(row.LotDescription),
+			LotName:        row.LotName,
+			LotDescription: row.LotDescription,
 			Category:       category,
 			Model:          model,
 		}
-
-		if idx, exists := componentIndex[lotName]; exists {
-			// Keep the first row, but fill any missing metadata from duplicates.
-			if components[idx].LotDescription == "" && comp.LotDescription != "" {
-				components[idx].LotDescription = comp.LotDescription
-			}
-			if components[idx].Category == "" && comp.Category != "" {
-				components[idx].Category = comp.Category
-			}
-			if components[idx].Model == "" && comp.Model != "" {
-				components[idx].Model = comp.Model
-			}
-			continue
-		}
-
-		componentIndex[lotName] = len(components)
 		components = append(components, comp)
 
-		if !existingMap[lotName] {
+		if !existingMap[row.LotName] {
 			newCount++
 		}
 	}

internal/services/export.go

@@ -213,30 +213,27 @@ func (s *ExportService) ToCSVBytes(data *ProjectExportData) ([]byte, error) {
 	return buf.Bytes(), nil
 }
 
-func sortConfigsByLine(configs []models.Configuration) []models.Configuration {
-	sorted := make([]models.Configuration, len(configs))
-	copy(sorted, configs)
-	sort.Slice(sorted, func(i, j int) bool {
-		li, lj := sorted[i].Line, sorted[j].Line
-		if li <= 0 {
-			li = int(^uint(0) >> 1)
-		}
-		if lj <= 0 {
-			lj = int(^uint(0) >> 1)
-		}
-		if li != lj {
-			return li < lj
-		}
-		if !sorted[i].CreatedAt.Equal(sorted[j].CreatedAt) {
-			return sorted[i].CreatedAt.After(sorted[j].CreatedAt)
-		}
-		return sorted[i].UUID > sorted[j].UUID
-	})
-	return sorted
-}
-
 func (s *ExportService) ProjectToPricingExportData(configs []models.Configuration, opts ProjectPricingExportOptions) (*ProjectPricingExportData, error) {
-	sortedConfigs := sortConfigsByLine(configs)
+	sortedConfigs := make([]models.Configuration, len(configs))
+	copy(sortedConfigs, configs)
+	sort.Slice(sortedConfigs, func(i, j int) bool {
+		leftLine := sortedConfigs[i].Line
+		rightLine := sortedConfigs[j].Line
+
+		if leftLine <= 0 {
+			leftLine = int(^uint(0) >> 1)
+		}
+		if rightLine <= 0 {
+			rightLine = int(^uint(0) >> 1)
+		}
+		if leftLine != rightLine {
+			return leftLine < rightLine
+		}
+		if !sortedConfigs[i].CreatedAt.Equal(sortedConfigs[j].CreatedAt) {
+			return sortedConfigs[i].CreatedAt.After(sortedConfigs[j].CreatedAt)
+		}
+		return sortedConfigs[i].UUID > sortedConfigs[j].UUID
+	})
 
 	blocks := make([]ProjectPricingExportConfig, 0, len(sortedConfigs))
 	for i := range sortedConfigs {
@@ -299,7 +296,26 @@ func (s *ExportService) ConfigToExportData(cfg *models.Configuration) *ProjectEx
 
 // ProjectToExportData converts multiple configurations into ProjectExportData.
 func (s *ExportService) ProjectToExportData(configs []models.Configuration) *ProjectExportData {
-	sortedConfigs := sortConfigsByLine(configs)
+	sortedConfigs := make([]models.Configuration, len(configs))
+	copy(sortedConfigs, configs)
+	sort.Slice(sortedConfigs, func(i, j int) bool {
+		leftLine := sortedConfigs[i].Line
+		rightLine := sortedConfigs[j].Line
+
+		if leftLine <= 0 {
+			leftLine = int(^uint(0) >> 1)
+		}
+		if rightLine <= 0 {
+			rightLine = int(^uint(0) >> 1)
+		}
+		if leftLine != rightLine {
+			return leftLine < rightLine
+		}
+		if !sortedConfigs[i].CreatedAt.Equal(sortedConfigs[j].CreatedAt) {
+			return sortedConfigs[i].CreatedAt.After(sortedConfigs[j].CreatedAt)
+		}
+		return sortedConfigs[i].UUID > sortedConfigs[j].UUID
+	})
 
 	blocks := make([]ConfigExportBlock, 0, len(configs))
 	for i := range sortedConfigs {
@@ -311,18 +327,6 @@ func (s *ExportService) ProjectToExportData(configs []models.Configuration) *Pro
 	}
 }
 
-// ConfigToPricingExportData is a single-config variant of ProjectToPricingExportData.
-func (s *ExportService) ConfigToPricingExportData(cfg *models.Configuration, opts ProjectPricingExportOptions) (*ProjectPricingExportData, error) {
-	block, err := s.buildPricingExportBlock(cfg, opts)
-	if err != nil {
-		return nil, err
-	}
-	return &ProjectPricingExportData{
-		Configs:   []ProjectPricingExportConfig{block},
-		CreatedAt: time.Now(),
-	}, nil
-}
-
 func (s *ExportService) buildExportBlock(cfg *models.Configuration) ConfigExportBlock {
 	// Batch-fetch categories from local data (pricelist items → local_components fallback)
 	lotNames := make([]string, len(cfg.Items))

internal/services/export_test.go

@@ -499,7 +499,7 @@ func TestToPricingCSV_UsesSelectedColumns(t *testing.T) {
 	if err != nil {
 		t.Fatalf("read summary row: %v", err)
 	}
-	expectedSummary := []string{"10", "", "ART-1", "Config A", "2", "2 400,50", "2 000,00", "1 800,25"}
+	expectedSummary := []string{"10", "", "", "Config A", "2", "2 400,50", "2 000,00", "1 800,25"}
 	for i, want := range expectedSummary {
 		if summary[i] != want {
 			t.Fatalf("summary[%d]: expected %q, got %q", i, want, summary[i])

internal/services/sync/service.go

@@ -17,7 +17,6 @@ import (
 	"git.mchus.pro/mchus/quoteforge/internal/repository"
 	"github.com/google/uuid"
 	"gorm.io/gorm"
-	"gorm.io/gorm/clause"
 )
 
 var ErrOffline = errors.New("database is offline")
@@ -358,18 +357,6 @@ func (s *Service) SyncPricelists() (int, error) {
 		// Check if pricelist already exists locally
 		existing, _ := s.localDB.GetLocalPricelistByServerID(pl.ID)
 		if existing != nil {
-			existing.Source = pl.Source
-			existing.Version = pl.Version
-			existing.Name = pl.Notification
-			existing.CreatedAt = pl.CreatedAt
-			existing.SyncedAt = time.Now()
-			if err := s.localDB.SaveLocalPricelist(existing); err != nil {
-				if syncErr == nil {
-					syncErr = fmt.Errorf("refresh existing pricelist %s: %w", pl.Version, err)
-				}
-				slog.Warn("failed to refresh existing local pricelist header", "version", pl.Version, "error", err)
-				continue
-			}
 			// Backfill items for legacy/partial local caches where only pricelist metadata exists.
 			if s.localDB.CountLocalPricelistItems(existing.ID) == 0 {
 				itemCount, err := s.SyncPricelistItems(existing.ID)
@@ -481,29 +468,24 @@ func (s *Service) syncNewPricelistSnapshot(localPL *localdb.LocalPricelist) (int
 	}
 
 	if err := s.localDB.DB().Transaction(func(tx *gorm.DB) error {
-		if err := tx.Clauses(clause.OnConflict{
-			Columns: []clause.Column{{Name: "server_id"}},
-			DoUpdates: clause.Assignments(map[string]interface{}{
-				"source":     localPL.Source,
-				"version":    localPL.Version,
-				"name":       localPL.Name,
-				"created_at": localPL.CreatedAt,
-				"synced_at":  localPL.SyncedAt,
-				"is_used":    localPL.IsUsed,
-			}),
-		}).Create(localPL).Error; err != nil {
+		if err := tx.Create(localPL).Error; err != nil {
 			return fmt.Errorf("save local pricelist: %w", err)
 		}
-		if localPL.ID == 0 {
-			if err := tx.Where("server_id = ?", localPL.ServerID).First(localPL).Error; err != nil {
-				return fmt.Errorf("reload local pricelist: %w", err)
-			}
+		if len(localItems) == 0 {
+			return nil
 		}
 		for i := range localItems {
 			localItems[i].PricelistID = localPL.ID
 		}
-		if err := replaceLocalPricelistItemsTx(tx, localPL.ID, localItems); err != nil {
-			return fmt.Errorf("save local pricelist items: %w", err)
+		batchSize := 500
+		for i := 0; i < len(localItems); i += batchSize {
+			end := i + batchSize
+			if end > len(localItems) {
+				end = len(localItems)
+			}
+			if err := tx.CreateInBatches(localItems[i:end], batchSize).Error; err != nil {
+				return fmt.Errorf("save local pricelist items: %w", err)
+			}
 		}
 		return nil
 	}); err != nil {
@@ -514,27 +496,6 @@ func (s *Service) syncNewPricelistSnapshot(localPL *localdb.LocalPricelist) (int
 	return len(localItems), nil
 }
 
-func replaceLocalPricelistItemsTx(tx *gorm.DB, pricelistID uint, items []localdb.LocalPricelistItem) error {
-	if err := tx.Where("pricelist_id = ?", pricelistID).Delete(&localdb.LocalPricelistItem{}).Error; err != nil {
-		return err
-	}
-	if len(items) == 0 {
-		return nil
-	}
-
-	batchSize := 500
-	for i := 0; i < len(items); i += batchSize {
-		end := i + batchSize
-		if end > len(items) {
-			end = len(items)
-		}
-		if err := tx.CreateInBatches(items[i:end], batchSize).Error; err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
 func (s *Service) backfillUsedPricelistItemCategories(pricelistRepo *repository.PricelistRepository, activeServerPricelistIDs []uint) {
 	if s.localDB == nil || pricelistRepo == nil {
 		return
@@ -828,6 +789,9 @@ func (s *Service) fetchServerPricelistItems(serverPricelistID uint) ([]localdb.L
 	for i, item := range serverItems {
 		localItems[i] = *localdb.PricelistItemToLocal(&item, 0)
 	}
+	if err := s.enrichLocalPricelistItemsWithStock(mariaDB, localItems); err != nil {
+		slog.Warn("pricelist stock enrichment skipped", "server_pricelist_id", serverPricelistID, "error", err)
+	}
 
 	return localItems, nil
 }
@@ -841,6 +805,111 @@ func (s *Service) SyncPricelistItemsByServerID(serverPricelistID uint) (int, err
 	return s.SyncPricelistItems(localPL.ID)
 }
 
+func (s *Service) enrichLocalPricelistItemsWithStock(mariaDB *gorm.DB, items []localdb.LocalPricelistItem) error {
+	if len(items) == 0 {
+		return nil
+	}
+
+	bookRepo := repository.NewPartnumberBookRepository(s.localDB.DB())
+	book, err := bookRepo.GetActiveBook()
+	if err != nil || book == nil {
+		return nil
+	}
+
+	bookItems, err := bookRepo.GetBookItems(book.ID)
+	if err != nil {
+		return err
+	}
+	if len(bookItems) == 0 {
+		return nil
+	}
+
+	partnumberToLots := make(map[string][]string, len(bookItems))
+	for _, item := range bookItems {
+		pn := strings.TrimSpace(item.Partnumber)
+		if pn == "" {
+			continue
+		}
+		seenLots := make(map[string]struct{}, len(item.LotsJSON))
+		for _, lot := range item.LotsJSON {
+			lotName := strings.TrimSpace(lot.LotName)
+			if lotName == "" {
+				continue
+			}
+			key := strings.ToLower(lotName)
+			if _, exists := seenLots[key]; exists {
+				continue
+			}
+			seenLots[key] = struct{}{}
+			partnumberToLots[pn] = append(partnumberToLots[pn], lotName)
+		}
+	}
+	if len(partnumberToLots) == 0 {
+		return nil
+	}
+
+	type stockRow struct {
+		Partnumber string   `gorm:"column:partnumber"`
+		Qty        *float64 `gorm:"column:qty"`
+	}
+	rows := make([]stockRow, 0)
+	if err := mariaDB.Raw(`
+		SELECT s.partnumber, s.qty
+		FROM stock_log s
+		INNER JOIN (
+			SELECT partnumber, MAX(date) AS max_date
+			FROM stock_log
+			GROUP BY partnumber
+		) latest ON latest.partnumber = s.partnumber AND latest.max_date = s.date
+		WHERE s.qty IS NOT NULL
+	`).Scan(&rows).Error; err != nil {
+		return err
+	}
+
+	lotTotals := make(map[string]float64, len(items))
+	lotPartnumbers := make(map[string][]string, len(items))
+	seenPartnumbers := make(map[string]map[string]struct{}, len(items))
+
+	for _, row := range rows {
+		pn := strings.TrimSpace(row.Partnumber)
+		if pn == "" || row.Qty == nil {
+			continue
+		}
+		lots := partnumberToLots[pn]
+		if len(lots) == 0 {
+			continue
+		}
+		for _, lotName := range lots {
+			lotTotals[lotName] += *row.Qty
+			if _, ok := seenPartnumbers[lotName]; !ok {
+				seenPartnumbers[lotName] = make(map[string]struct{}, 4)
+			}
+			key := strings.ToLower(pn)
+			if _, exists := seenPartnumbers[lotName][key]; exists {
+				continue
+			}
+			seenPartnumbers[lotName][key] = struct{}{}
+			lotPartnumbers[lotName] = append(lotPartnumbers[lotName], pn)
+		}
+	}
+
+	for i := range items {
+		lotName := strings.TrimSpace(items[i].LotName)
+		if qty, ok := lotTotals[lotName]; ok {
+			qtyCopy := qty
+			items[i].AvailableQty = &qtyCopy
+		}
+		if partnumbers := lotPartnumbers[lotName]; len(partnumbers) > 0 {
+			sort.Slice(partnumbers, func(a, b int) bool {
+				return strings.ToLower(partnumbers[a]) < strings.ToLower(partnumbers[b])
+			})
+			items[i].Partnumbers = append(localdb.LocalStringList{}, partnumbers...)
+		}
+	}
+
+	return nil
+}
+
 // GetLocalPriceForLot returns the price for a lot from a local pricelist
 func (s *Service) GetLocalPriceForLot(localPricelistID uint, lotName string) (float64, error) {
 	return s.localDB.GetLocalPriceForLot(localPricelistID, lotName)

internal/services/sync/service_pricelist_category_backfill_test.go

@@ -17,6 +17,7 @@ func TestSyncPricelists_BackfillsLotCategoryForUsedPricelistItems(t *testing.T)
 		&models.Pricelist{},
 		&models.PricelistItem{},
 		&models.Lot{},
+		&models.StockLog{},
 	); err != nil {
 		t.Fatalf("migrate server tables: %v", err)
 	}
@@ -102,3 +103,103 @@ func TestSyncPricelists_BackfillsLotCategoryForUsedPricelistItems(t *testing.T)
 		t.Fatalf("expected lot_category backfilled to CPU, got %q", items[0].LotCategory)
 	}
 }
+
+func TestSyncPricelistItems_EnrichesStockFromLocalPartnumberBook(t *testing.T) {
+	local := newLocalDBForSyncTest(t)
+	serverDB := newServerDBForSyncTest(t)
+
+	if err := serverDB.AutoMigrate(
+		&models.Pricelist{},
+		&models.PricelistItem{},
+		&models.Lot{},
+		&models.StockLog{},
+	); err != nil {
+		t.Fatalf("migrate server tables: %v", err)
+	}
+
+	serverPL := models.Pricelist{
+		Source:       "warehouse",
+		Version:      "2026-03-07-001",
+		Notification: "server",
+		CreatedBy:    "tester",
+		IsActive:     true,
+		CreatedAt:    time.Now().Add(-1 * time.Hour),
+	}
+	if err := serverDB.Create(&serverPL).Error; err != nil {
+		t.Fatalf("create server pricelist: %v", err)
+	}
+	if err := serverDB.Create(&models.PricelistItem{
+		PricelistID: serverPL.ID,
+		LotName:     "CPU_A",
+		LotCategory: "CPU",
+		Price:       10,
+	}).Error; err != nil {
+		t.Fatalf("create server pricelist item: %v", err)
+	}
+	qty := 7.0
+	if err := serverDB.Create(&models.StockLog{
+		Partnumber: "CPU-PN-1",
+		Date:       time.Now(),
+		Price:      100,
+		Qty:        &qty,
+	}).Error; err != nil {
+		t.Fatalf("create stock log: %v", err)
+	}
+
+	if err := local.SaveLocalPricelist(&localdb.LocalPricelist{
+		ServerID:  serverPL.ID,
+		Source:    serverPL.Source,
+		Version:   serverPL.Version,
+		Name:      serverPL.Notification,
+		CreatedAt: serverPL.CreatedAt,
+		SyncedAt:  time.Now(),
+		IsUsed:    false,
+	}); err != nil {
+		t.Fatalf("seed local pricelist: %v", err)
+	}
+	localPL, err := local.GetLocalPricelistByServerID(serverPL.ID)
+	if err != nil {
+		t.Fatalf("get local pricelist: %v", err)
+	}
+
+	if err := local.DB().Create(&localdb.LocalPartnumberBook{
+		ServerID:        1,
+		Version:         "2026-03-07-001",
+		CreatedAt:       time.Now(),
+		IsActive:        true,
+		PartnumbersJSON: localdb.LocalStringList{"CPU-PN-1"},
+	}).Error; err != nil {
+		t.Fatalf("create local partnumber book: %v", err)
+	}
+	if err := local.DB().Create(&localdb.LocalPartnumberBookItem{
+		Partnumber: "CPU-PN-1",
+		LotsJSON: localdb.LocalPartnumberBookLots{
+			{LotName: "CPU_A", Qty: 1},
+		},
+		Description: "CPU PN",
+	}).Error; err != nil {
+		t.Fatalf("create local partnumber book item: %v", err)
+	}
+
+	svc := syncsvc.NewServiceWithDB(serverDB, local)
+	if _, err := svc.SyncPricelistItems(localPL.ID); err != nil {
+		t.Fatalf("sync pricelist items: %v", err)
+	}
+
+	items, err := local.GetLocalPricelistItems(localPL.ID)
+	if err != nil {
+		t.Fatalf("load local items: %v", err)
+	}
+	if len(items) != 1 {
+		t.Fatalf("expected 1 local item, got %d", len(items))
+	}
+	if items[0].AvailableQty == nil {
+		t.Fatalf("expected available_qty to be set")
+	}
+	if *items[0].AvailableQty != 7 {
+		t.Fatalf("expected available_qty=7, got %v", *items[0].AvailableQty)
+	}
+	if len(items[0].Partnumbers) != 1 || items[0].Partnumbers[0] != "CPU-PN-1" {
+		t.Fatalf("expected partnumbers [CPU-PN-1], got %v", items[0].Partnumbers)
+	}
+}

internal/services/sync/service_pricelist_upsert_test.go

@@ -1,118 +0,0 @@
-package sync
-
-import (
-	"path/filepath"
-	"testing"
-	"time"
-
-	"git.mchus.pro/mchus/quoteforge/internal/localdb"
-	"git.mchus.pro/mchus/quoteforge/internal/models"
-	"github.com/glebarez/sqlite"
-	"gorm.io/gorm"
-)
-
-func TestSyncNewPricelistSnapshotUpsertsExistingServerID(t *testing.T) {
-	local := newLocalDBForUpsertTest(t)
-	serverDB := newServerDBForUpsertTest(t)
-	if err := serverDB.AutoMigrate(&models.Pricelist{}, &models.PricelistItem{}); err != nil {
-		t.Fatalf("migrate server pricelist tables: %v", err)
-	}
-
-	serverPL := models.Pricelist{
-		Source:       "estimate",
-		Version:      "B-2026-04-28-001",
-		Notification: "server-current",
-		CreatedBy:    "tester",
-		IsActive:     true,
-		CreatedAt:    time.Now().Add(-1 * time.Hour),
-	}
-	if err := serverDB.Create(&serverPL).Error; err != nil {
-		t.Fatalf("create server pricelist: %v", err)
-	}
-	if err := serverDB.Create(&models.PricelistItem{PricelistID: serverPL.ID, LotName: "CPU_A", Price: 10}).Error; err != nil {
-		t.Fatalf("create server pricelist item: %v", err)
-	}
-
-	if err := local.SaveLocalPricelist(&localdb.LocalPricelist{
-		ServerID:  serverPL.ID,
-		Source:    "estimate",
-		Version:   "old-version",
-		Name:      "stale-local",
-		CreatedAt: time.Now().Add(-24 * time.Hour),
-		SyncedAt:  time.Now().Add(-24 * time.Hour),
-		IsUsed:    false,
-	}); err != nil {
-		t.Fatalf("seed stale local pricelist: %v", err)
-	}
-	staleLocal, err := local.GetLocalPricelistByServerID(serverPL.ID)
-	if err != nil {
-		t.Fatalf("get stale local pricelist: %v", err)
-	}
-	if err := local.SaveLocalPricelistItems([]localdb.LocalPricelistItem{
-		{PricelistID: staleLocal.ID, LotName: "OLD_LOT", Price: 99},
-	}); err != nil {
-		t.Fatalf("seed stale local pricelist items: %v", err)
-	}
-
-	svc := NewServiceWithDB(serverDB, local)
-	localPL := &localdb.LocalPricelist{
-		ServerID:  serverPL.ID,
-		Source:    serverPL.Source,
-		Version:   serverPL.Version,
-		Name:      serverPL.Notification,
-		CreatedAt: serverPL.CreatedAt,
-		SyncedAt:  time.Now(),
-		IsUsed:    false,
-	}
-
-	itemCount, err := svc.syncNewPricelistSnapshot(localPL)
-	if err != nil {
-		t.Fatalf("sync new pricelist snapshot: %v", err)
-	}
-	if itemCount != 1 {
-		t.Fatalf("expected 1 synced item, got %d", itemCount)
-	}
-
-	refreshed, err := local.GetLocalPricelistByServerID(serverPL.ID)
-	if err != nil {
-		t.Fatalf("get refreshed local pricelist: %v", err)
-	}
-	if refreshed.Version != serverPL.Version {
-		t.Fatalf("expected local version %q, got %q", serverPL.Version, refreshed.Version)
-	}
-	if refreshed.Name != serverPL.Notification {
-		t.Fatalf("expected local name %q, got %q", serverPL.Notification, refreshed.Name)
-	}
-
-	items, err := local.GetLocalPricelistItems(refreshed.ID)
-	if err != nil {
-		t.Fatalf("load refreshed local items: %v", err)
-	}
-	if len(items) != 1 {
-		t.Fatalf("expected 1 local item after refresh, got %d", len(items))
-	}
-	if items[0].LotName != "CPU_A" {
-		t.Fatalf("expected refreshed item CPU_A, got %q", items[0].LotName)
-	}
-}
-
-func newLocalDBForUpsertTest(t *testing.T) *localdb.LocalDB {
-	t.Helper()
-	localPath := filepath.Join(t.TempDir(), "local.db")
-	local, err := localdb.New(localPath)
-	if err != nil {
-		t.Fatalf("init local db: %v", err)
-	}
-	t.Cleanup(func() { _ = local.Close() })
-	return local
-}
-
-func newServerDBForUpsertTest(t *testing.T) *gorm.DB {
-	t.Helper()
-	serverPath := filepath.Join(t.TempDir(), "server.db")
-	db, err := gorm.Open(sqlite.Open(serverPath), &gorm.Config{})
-	if err != nil {
-		t.Fatalf("open server sqlite: %v", err)
-	}
-	return db
-}

internal/services/sync/service_projects_push_test.go

@@ -434,14 +434,54 @@ func newServerDBForSyncTest(t *testing.T) *gorm.DB {
 	if err != nil {
 		t.Fatalf("open server sqlite: %v", err)
 	}
-	if err := db.AutoMigrate(
-		&models.Project{},
-		&models.Configuration{},
-		&models.Pricelist{},
-		&models.PricelistItem{},
-		&models.Lot{},
-	); err != nil {
-		t.Fatalf("migrate server test schema: %v", err)
+	if err := db.Exec(`
+CREATE TABLE qt_projects (
+	id INTEGER PRIMARY KEY AUTOINCREMENT,
+	uuid TEXT NOT NULL UNIQUE,
+	owner_username TEXT NOT NULL,
+	code TEXT NOT NULL,
+	variant TEXT NOT NULL DEFAULT '',
+	name TEXT NOT NULL,
+	tracker_url TEXT NULL,
+	is_active INTEGER NOT NULL DEFAULT 1,
+	is_system INTEGER NOT NULL DEFAULT 0,
+	created_at DATETIME,
+	updated_at DATETIME
+);`).Error; err != nil {
+		t.Fatalf("create qt_projects: %v", err)
+	}
+	if err := db.Exec(`CREATE UNIQUE INDEX idx_qt_projects_code_variant ON qt_projects(code, variant);`).Error; err != nil {
+		t.Fatalf("create qt_projects index: %v", err)
+	}
+	if err := db.Exec(`
+CREATE TABLE qt_configurations (
+	id INTEGER PRIMARY KEY AUTOINCREMENT,
+	uuid TEXT NOT NULL UNIQUE,
+	user_id INTEGER NULL,
+	owner_username TEXT NOT NULL,
+	project_uuid TEXT NULL,
+	app_version TEXT NULL,
+	name TEXT NOT NULL,
+	items TEXT NOT NULL,
+	total_price REAL NULL,
+	custom_price REAL NULL,
+	notes TEXT NULL,
+	is_template INTEGER NOT NULL DEFAULT 0,
+	server_count INTEGER NOT NULL DEFAULT 1,
+	server_model TEXT NULL,
+	support_code TEXT NULL,
+	article TEXT NULL,
+	pricelist_id INTEGER NULL,
+	warehouse_pricelist_id INTEGER NULL,
+	competitor_pricelist_id INTEGER NULL,
+	disable_price_refresh INTEGER NOT NULL DEFAULT 0,
+	only_in_stock INTEGER NOT NULL DEFAULT 0,
+	line_no INTEGER NULL,
+	price_updated_at DATETIME NULL,
+	vendor_spec TEXT NULL,
+	created_at DATETIME
+);`).Error; err != nil {
+		t.Fatalf("create qt_configurations: %v", err)
 	}
 	return db
 }

releases/v1.7/RELEASE_NOTES.md

@@ -1,13 +0,0 @@
-# QuoteForge v1.7
-
-Дата релиза: 2026-04-23
-Тег: `v1.7`
-
-Предыдущий релиз: `v1.6.2`
-
-## Ключевые изменения
-
-- все вкладки estimate (storage, pci, power, accessories, sw, other) теперь используют редактируемый autocomplete-input для существующих позиций — поведение идентично вкладке base;
-- LOT-поля в BOM-таблицах переведены на общий autocomplete dropdown вместо datalist;
-- кнопка ✕ в BOM снимает сопоставление BOM→LOT вместо удаления строки;
-- кнопка «Пересчитать эстимейт» переименована в «Перенести в эстимейт».

releases/v1.8/RELEASE_NOTES.md

@@ -1,13 +0,0 @@
-# QuoteForge v1.8
-
-Дата релиза: 2026-04-28
-Тег: `v1.8`
-
-Предыдущий релиз: `v1.7`
-
-## Ключевые изменения
-
-- исправлен sync прайслистов при конфликте `local_pricelists.server_id`: сохранение локального снапшота стало idempotent через upsert;
-- сохранение нового локального снапшота прайслиста теперь атомарно заменяет строки внутри одной транзакции;
-- sync обновляет метаданные уже существующих локальных прайслистов;
-- устаревшие sync/export тесты приведены к актуальному контракту, `go test ./...` проходит полностью.

web/templates/base.html

@@ -50,25 +50,6 @@
 
     <div id="toast" class="fixed bottom-4 right-4 z-50"></div>
 
-    <!-- Dead-man's switch overlay: shown when backend process stops responding -->
-    <div id="backend-offline-overlay" class="hidden fixed inset-0 z-[9999] bg-black/80 flex items-center justify-center p-6">
-        <div class="bg-white rounded-xl shadow-2xl max-w-md w-full p-8 text-center">
-            <div class="text-red-500 mb-4">
-                <svg class="w-16 h-16 mx-auto" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M9.75 17L9 20l-1 1h8l-1-1-.75-3M3 13h18M5 17h14a2 2 0 002-2V5a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z"/>
-                </svg>
-            </div>
-            <h2 class="text-xl font-bold text-gray-900 mb-3">Приложение остановлено</h2>
-            <p class="text-gray-600 mb-4">Консольное окно QuoteForge было закрыто — без него программа не работает.</p>
-            <div class="bg-amber-50 border border-amber-200 rounded-lg p-3 mb-6 text-sm text-amber-800">
-                Запустите программу заново и нажмите «Обновить страницу».
-            </div>
-            <button onclick="window.location.reload()" class="w-full px-6 py-3 bg-blue-600 text-white rounded-lg hover:bg-blue-700 font-medium">
-                Обновить страницу
-            </button>
-        </div>
-    </div>
-
     <!-- Sync Info Modal -->
     <div id="sync-modal" class="fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center z-50 hidden p-4">
         <div class="bg-white rounded-lg shadow-xl max-w-lg w-full max-h-[90vh] flex flex-col">
@@ -512,35 +493,6 @@
         loadDBUser();
         checkWritePermission();
 
-        // Dead-man's switch: detect if the backend process has stopped
-        (function() {
-            const POLL_MS = 5000;
-            const FAIL_THRESHOLD = 2;
-            let failCount = 0;
-
-            async function checkBackend() {
-                try {
-                    const ctrl = new AbortController();
-                    const timer = setTimeout(() => ctrl.abort(), 3000);
-                    const resp = await fetch('/health', { signal: ctrl.signal });
-                    clearTimeout(timer);
-                    if (resp.ok) {
-                        failCount = 0;
-                        document.getElementById('backend-offline-overlay').classList.add('hidden');
-                    } else {
-                        failCount++;
-                    }
-                } catch (_) {
-                    failCount++;
-                }
-                if (failCount >= FAIL_THRESHOLD) {
-                    document.getElementById('backend-offline-overlay').classList.remove('hidden');
-                }
-            }
-
-            setInterval(checkBackend, POLL_MS);
-        })();
-
         // Load last sync time - removed since dropdown is gone
         // document.addEventListener('DOMContentLoaded', loadLastSyncTime);
     </script>

web/templates/index.html

@@ -194,7 +194,7 @@
                             Сохранить BOM
                         </button>
                         <button onclick="applyBOMToEstimate()" class="px-3 py-1 bg-orange-600 text-white rounded hover:bg-orange-700">
-                            Перенести в эстимейт
+                            Пересчитать эстимейт
                         </button>
                     </div>
                 </div>
@@ -542,8 +542,7 @@ let componentPricesCacheLoading = new Map(); // { category: Promise } - tracks o
 // Autocomplete state
 let autocompleteInput = null;
 let autocompleteCategory = null;
-let autocompleteMode = null; // 'single', 'multi', 'section', 'edit-item'
-let autocompleteEditCategories = null;
+let autocompleteMode = null; // 'single', 'multi', 'section'
 let autocompleteIndex = -1;
 let autocompleteFiltered = [];
 
@@ -838,7 +837,6 @@ document.addEventListener('DOMContentLoaded', async function() {
         serverModelForQuote = config.server_model || '';
         supportCode = config.support_code || '';
         currentArticle = config.article || '';
-        restorePricingStateFromNotes(config.notes || '');
 
         // Restore custom price if saved
         if (config.custom_price) {
@@ -1157,59 +1155,17 @@ function switchTab(tab) {
 const ALWAYS_VISIBLE_TABS = new Set(['base', 'storage', 'pci']);
 
 // Storage-only categories — hidden for server configs
-const STORAGE_ONLY_BASE_CATEGORIES = ['DKC', 'CTL', 'ENC'];
-// Server-only categories — hidden for storage configs
-const SERVER_ONLY_BASE_CATEGORIES = ['MB', 'CPU', 'MEM'];
-const STORAGE_HIDDEN_STORAGE_CATEGORIES = ['RAID'];
-const STORAGE_HIDDEN_PCI_CATEGORIES = ['GPU', 'DPU'];
-const STORAGE_HIDDEN_POWER_CATEGORIES = ['PS', 'PSU'];
+const STORAGE_ONLY_BASE_CATEGORIES = ['ENC', 'DKC', 'CTL'];
 
 function applyConfigTypeToTabs() {
-    const baseCategories = ['MB', 'CPU', 'MEM', 'DKC', 'CTL', 'ENC'];
-    const storageCategories = ['RAID', 'M2', 'SSD', 'HDD', 'EDSFF', 'HHHL'];
-    const storageSections = [
-        { title: 'RAID Контроллеры', categories: ['RAID'] },
-        { title: 'Диски', categories: ['M2', 'SSD', 'HDD', 'EDSFF', 'HHHL'] }
-    ];
-    const pciCategories = ['GPU', 'DPU', 'NIC', 'HCA', 'HBA', 'HIC'];
-    const pciSections = [
-        { title: 'GPU / DPU', categories: ['GPU', 'DPU'] },
-        { title: 'NIC / HCA', categories: ['NIC', 'HCA'] },
-        { title: 'HBA', categories: ['HBA'] },
-        { title: 'HIC', categories: ['HIC'] }
-    ];
-    const powerCategories = ['PS', 'PSU'];
-
-    TAB_CONFIG.base.categories = baseCategories.filter(c => {
-        if (configType === 'storage') {
-            return !SERVER_ONLY_BASE_CATEGORIES.includes(c);
-        }
-        return !STORAGE_ONLY_BASE_CATEGORIES.includes(c);
-    });
-
-    TAB_CONFIG.storage.categories = storageCategories.filter(c => {
-        return configType === 'storage' ? !STORAGE_HIDDEN_STORAGE_CATEGORIES.includes(c) : true;
-    });
-    TAB_CONFIG.storage.sections = storageSections.filter(section => {
-        if (configType === 'storage') {
-            return !section.categories.every(cat => STORAGE_HIDDEN_STORAGE_CATEGORIES.includes(cat));
-        }
-        return true;
-    });
-
-    TAB_CONFIG.pci.categories = pciCategories.filter(c => {
-        return configType === 'storage' ? !STORAGE_HIDDEN_PCI_CATEGORIES.includes(c) : c !== 'HIC';
-    });
-    TAB_CONFIG.pci.sections = pciSections.filter(section => {
-        if (configType === 'storage') {
-            return !section.categories.every(cat => STORAGE_HIDDEN_PCI_CATEGORIES.includes(cat));
-        }
-        return section.title !== 'HIC';
-    });
-    TAB_CONFIG.power.categories = powerCategories.filter(c => {
-        return configType === 'storage' ? !STORAGE_HIDDEN_POWER_CATEGORIES.includes(c) : true;
-    });
-
+    if (configType === 'storage') return; // storage sees everything
+    // Remove ENC/DKC/CTL from Base
+    TAB_CONFIG.base.categories = TAB_CONFIG.base.categories.filter(
+        c => !STORAGE_ONLY_BASE_CATEGORIES.includes(c)
+    );
+    // Remove HIC from PCI tab
+    TAB_CONFIG.pci.categories = TAB_CONFIG.pci.categories.filter(c => c !== 'HIC');
+    TAB_CONFIG.pci.sections = TAB_CONFIG.pci.sections.filter(s => s.title !== 'HIC');
     // Rebuild assigned categories index
     ASSIGNED_CATEGORIES = Object.values(TAB_CONFIG)
         .flatMap(t => t.categories)
@@ -1270,7 +1226,7 @@ function renderSingleSelectTab(categories) {
     if (currentTab === 'base') {
         html += `
         <div class="mb-1 grid grid-cols-1 md:grid-cols-[1fr,16rem] gap-3 items-start">
-            <label for="server-model-input" class="block text-sm font-medium text-gray-700">Модель системы для партномера:</label>
+            <label for="server-model-input" class="block text-sm font-medium text-gray-700">Модель сервера для КП:</label>
             <label for="support-code-select" class="block text-sm font-medium text-gray-700">Уровень техподдержки:</label>
         </div>
         <div class="mb-3 grid grid-cols-1 md:grid-cols-[1fr,16rem] gap-3 items-start">
@@ -1390,16 +1346,7 @@ function renderMultiSelectTab(components) {
 
         html += `
             <tr class="hover:bg-gray-50">
-                <td class="px-3 py-2 min-w-48">
-                    <div class="autocomplete-wrapper relative">
-                        <input type="text"
-                               value="${escapeHtml(item.lot_name)}"
-                               class="w-full px-2 py-1 border rounded text-sm font-mono"
-                               onfocus="showAutocompleteEditItem('${item.lot_name}', this)"
-                               oninput="filterAutocompleteEditItem(this.value)"
-                               onkeydown="handleAutocompleteKeyEditItem(event)">
-                    </div>
-                </td>
+                <td class="px-3 py-2 text-sm font-mono">${escapeHtml(item.lot_name)}</td>
                 <td class="px-3 py-2 text-sm text-gray-500 truncate max-w-xs">${escapeHtml(item.description || comp?.description || '')}</td>
                 <td class="px-3 py-2 text-sm text-right">${formatPriceOrNA(item.estimate_price ?? item.unit_price)}</td>
                 <td class="px-3 py-2 text-center">
@@ -1493,10 +1440,6 @@ function renderMultiSelectTabWithSections(sections) {
                     <tbody class="divide-y">
         `;
 
-        // Add empty row for new item in this section
-        const sectionId = section.categories.join('-');
-        const categoriesStr = section.categories.join(',');
-
         // Render existing cart items for this section
         sectionItems.forEach((item) => {
             const comp = allComponents.find(c => c.lot_name === item.lot_name);
@@ -1504,17 +1447,7 @@ function renderMultiSelectTabWithSections(sections) {
 
             html += `
                 <tr class="hover:bg-gray-50">
-                    <td class="px-3 py-2 min-w-48">
-                        <div class="autocomplete-wrapper relative">
-                            <input type="text"
-                                   value="${escapeHtml(item.lot_name)}"
-                                   data-categories="${categoriesStr}"
-                                   class="w-full px-2 py-1 border rounded text-sm font-mono"
-                                   onfocus="showAutocompleteEditItem('${item.lot_name}', this)"
-                                   oninput="filterAutocompleteEditItem(this.value)"
-                                   onkeydown="handleAutocompleteKeyEditItem(event)">
-                        </div>
-                    </td>
+                    <td class="px-3 py-2 text-sm font-mono">${escapeHtml(item.lot_name)}</td>
                     <td class="px-3 py-2 text-sm text-gray-500 truncate max-w-xs">${escapeHtml(item.description || comp?.description || '')}</td>
                     <td class="px-3 py-2 text-sm text-right">${formatPriceOrNA(item.estimate_price ?? item.unit_price)}</td>
                     <td class="px-3 py-2 text-center">
@@ -1535,6 +1468,8 @@ function renderMultiSelectTabWithSections(sections) {
         });
 
         // Add empty row for new item in this section
+        const sectionId = section.categories.join('-');
+        const categoriesStr = section.categories.join(',');
         html += `
             <tr class="hover:bg-gray-50 bg-gray-50">
                 <td class="px-3 py-2" colspan="2">
@@ -1662,10 +1597,6 @@ function renderAutocomplete() {
             onmousedown = `selectAutocompleteItemSection(${idx}, '${autocompleteCategory}')`;
         } else if (autocompleteMode === 'multi') {
             onmousedown = `selectAutocompleteItemMulti(${idx})`;
-        } else if (autocompleteMode === 'bom') {
-            onmousedown = `selectAutocompleteItemBOM(${idx}, ${autocompleteCategory})`;
-        } else if (autocompleteMode === 'edit-item') {
-            onmousedown = `selectAutocompleteEditItem(${idx})`;
         } else {
             // single mode
             onmousedown = `selectAutocompleteItem(${idx})`;
@@ -1947,138 +1878,6 @@ function selectAutocompleteItemSection(index, sectionId) {
     schedulePriceLevelsRefresh({ delay: 80, rerender: true, autosave: false });
 }
 
-// Autocomplete for editing an existing cart item's LOT (multi/section tabs)
-async function showAutocompleteEditItem(lotName, input) {
-    autocompleteInput = input;
-    autocompleteCategory = lotName;
-    autocompleteMode = 'edit-item';
-    autocompleteIndex = -1;
-    autocompleteEditCategories = input.dataset.categories
-        ? input.dataset.categories.split(',').map(c => c.trim().toUpperCase())
-        : null;
-    const components = getComponentsForTab(currentTab);
-    await ensurePricesLoaded(components);
-    filterAutocompleteEditItem(input.value);
-}
-
-function filterAutocompleteEditItem(search) {
-    const searchLower = (search || '').toLowerCase();
-    const components = autocompleteEditCategories
-        ? allComponents.filter(c => autocompleteEditCategories.includes(getComponentCategory(c)))
-        : getComponentsForTab(currentTab);
-    autocompleteFiltered = components.filter(c => {
-        if (!hasComponentPrice(c.lot_name)) return false;
-        if (!isComponentAllowedByStockFilter(c)) return false;
-        return (c.lot_name + ' ' + (c.description || '')).toLowerCase().includes(searchLower);
-    }).sort((a, b) => {
-        const d = (b.popularity_score || 0) - (a.popularity_score || 0);
-        return d !== 0 ? d : a.lot_name.localeCompare(b.lot_name);
-    });
-    renderAutocomplete();
-}
-
-function handleAutocompleteKeyEditItem(event) {
-    if (event.key === 'ArrowDown') {
-        event.preventDefault();
-        autocompleteIndex = Math.min(autocompleteIndex + 1, autocompleteFiltered.length - 1);
-        renderAutocomplete();
-    } else if (event.key === 'ArrowUp') {
-        event.preventDefault();
-        autocompleteIndex = Math.max(autocompleteIndex - 1, -1);
-        renderAutocomplete();
-    } else if (event.key === 'Enter') {
-        event.preventDefault();
-        if (autocompleteIndex >= 0 && autocompleteIndex < autocompleteFiltered.length) {
-            selectAutocompleteEditItem(autocompleteIndex);
-        }
-    } else if (event.key === 'Escape') {
-        hideAutocomplete();
-    }
-}
-
-function selectAutocompleteEditItem(index) {
-    const comp = autocompleteFiltered[index];
-    if (!comp) return;
-    const lotName = autocompleteCategory;
-    const oldItem = cart.find(i => i.lot_name === lotName);
-    const qty = oldItem?.quantity || 1;
-    cart = cart.filter(i => i.lot_name !== lotName);
-    const price = componentPricesCache[comp.lot_name] || 0;
-    cart.push({
-        lot_name: comp.lot_name,
-        quantity: qty,
-        unit_price: price,
-        estimate_price: price,
-        warehouse_price: null,
-        competitor_price: null,
-        delta_wh_estimate_abs: null,
-        delta_wh_estimate_pct: null,
-        delta_comp_estimate_abs: null,
-        delta_comp_estimate_pct: null,
-        delta_comp_wh_abs: null,
-        delta_comp_wh_pct: null,
-        price_missing: ['warehouse', 'competitor'],
-        description: comp.description || '',
-        category: getComponentCategory(comp)
-    });
-    hideAutocomplete();
-    renderTab();
-    updateCartUI();
-    triggerAutoSave();
-    schedulePriceLevelsRefresh({ delay: 80, rerender: true, autosave: false });
-}
-
-// Autocomplete for BOM LOT mapping
-function showAutocompleteBOM(rowIdx, input) {
-    autocompleteInput = input;
-    autocompleteCategory = rowIdx;
-    autocompleteMode = 'bom';
-    autocompleteIndex = -1;
-    filterAutocompleteBOM(rowIdx, input.value);
-}
-
-function filterAutocompleteBOM(rowIdx, search) {
-    const searchLower = (search || '').toLowerCase();
-    autocompleteFiltered = (window._bomAllComponents || allComponents).filter(c => {
-        const text = (c.lot_name + ' ' + (c.description || '')).toLowerCase();
-        return text.includes(searchLower);
-    }).sort((a, b) => {
-        const popDiff = (b.popularity_score || 0) - (a.popularity_score || 0);
-        if (popDiff !== 0) return popDiff;
-        return a.lot_name.localeCompare(b.lot_name);
-    });
-    renderAutocomplete();
-}
-
-function handleAutocompleteKeyBOM(event, rowIdx) {
-    if (event.key === 'ArrowDown') {
-        event.preventDefault();
-        autocompleteIndex = Math.min(autocompleteIndex + 1, autocompleteFiltered.length - 1);
-        renderAutocomplete();
-    } else if (event.key === 'ArrowUp') {
-        event.preventDefault();
-        autocompleteIndex = Math.max(autocompleteIndex - 1, -1);
-        renderAutocomplete();
-    } else if (event.key === 'Enter') {
-        event.preventDefault();
-        if (autocompleteIndex >= 0 && autocompleteIndex < autocompleteFiltered.length) {
-            selectAutocompleteItemBOM(autocompleteIndex, rowIdx);
-        }
-    } else if (event.key === 'Escape') {
-        hideAutocomplete();
-    }
-}
-
-function selectAutocompleteItemBOM(index, rowIdx) {
-    const comp = autocompleteFiltered[index];
-    if (!comp) return;
-    const row = bomRows.find(r => r.source_row_index === rowIdx) || bomRows[rowIdx];
-    if (!row) return;
-    row.manual_lot = comp.lot_name;
-    hideAutocomplete();
-    resolveBOM();
-}
-
 function clearSingleSelect(category) {
     cart = cart.filter(item =>
         (item.category || getCategoryFromLotName(item.lot_name)).toUpperCase() !== category.toUpperCase()
@@ -2280,58 +2079,6 @@ function getCurrentArticle() {
     return currentArticle || '';
 }
 
-function buildPricingState() {
-    const buyCustom = parseDecimalInput(document.getElementById('pricing-custom-price-buy')?.value || '');
-    const saleUplift = parseDecimalInput(document.getElementById('pricing-uplift-sale')?.value || '');
-    const saleCustom = parseDecimalInput(document.getElementById('pricing-custom-price-sale')?.value || '');
-
-    return {
-        buy_custom_price: buyCustom > 0 ? buyCustom : null,
-        sale_uplift: saleUplift > 0 ? saleUplift : null,
-        sale_custom_price: saleCustom > 0 ? saleCustom : null,
-    };
-}
-
-function serializeConfigNotes() {
-    return JSON.stringify({
-        pricing_ui: buildPricingState()
-    });
-}
-
-function restorePricingStateFromNotes(notesRaw) {
-    if (!notesRaw) return;
-    let parsed;
-    try {
-        parsed = JSON.parse(notesRaw);
-    } catch (_) {
-        return;
-    }
-
-    const pricing = parsed?.pricing_ui;
-    if (!pricing || typeof pricing !== 'object') return;
-
-    const buyInput = document.getElementById('pricing-custom-price-buy');
-    if (buyInput) {
-        buyInput.value = typeof pricing.buy_custom_price === 'number' && pricing.buy_custom_price > 0
-            ? pricing.buy_custom_price.toFixed(2)
-            : '';
-    }
-
-    const upliftInput = document.getElementById('pricing-uplift-sale');
-    if (upliftInput) {
-        upliftInput.value = typeof pricing.sale_uplift === 'number' && pricing.sale_uplift > 0
-            ? formatUpliftInput(pricing.sale_uplift)
-            : '';
-    }
-
-    const saleInput = document.getElementById('pricing-custom-price-sale');
-    if (saleInput) {
-        saleInput.value = typeof pricing.sale_custom_price === 'number' && pricing.sale_custom_price > 0
-            ? pricing.sale_custom_price.toFixed(2)
-            : '';
-    }
-}
-
 function getAutosaveStorageKey() {
     return `qf_config_autosave_${configUUID || 'default'}`;
 }
@@ -2345,7 +2092,7 @@ function buildSavePayload() {
         name: configName,
         items: cart,
         custom_price: customPrice,
-        notes: serializeConfigNotes(),
+        notes: '',
         server_count: serverCount,
         server_model: serverModelForQuote,
         support_code: supportCode,
@@ -2824,67 +2571,66 @@ async function refreshPrices() {
         return;
     }
 
-    const refreshBtn = document.getElementById('refresh-prices-btn');
-    const previousLabel = refreshBtn ? refreshBtn.textContent : '';
-
     try {
-        if (refreshBtn) {
-            refreshBtn.disabled = true;
-            refreshBtn.textContent = 'Обновление...';
-            refreshBtn.className = 'px-4 py-2 bg-gray-300 text-gray-500 rounded cursor-not-allowed';
+        const refreshPayload = {};
+        if (selectedPricelistIds.estimate) {
+            refreshPayload.pricelist_id = selectedPricelistIds.estimate;
         }
-
-        const componentSyncResp = await fetch('/api/sync/components', { method: 'POST' });
-        if (!componentSyncResp.ok) {
-            throw new Error('component sync failed');
-        }
-
-        const pricelistSyncResp = await fetch('/api/sync/pricelists', { method: 'POST' });
-        if (!pricelistSyncResp.ok) {
-            throw new Error('pricelist sync failed');
-        }
-
-        await Promise.all([
-            loadActivePricelists(true),
-            loadAllComponents()
-        ]);
-
-        ['estimate', 'warehouse', 'competitor'].forEach(source => {
-            const latest = activePricelistsBySource[source]?.[0];
-            if (latest && latest.id) {
-                selectedPricelistIds[source] = Number(latest.id);
-                resolvedAutoPricelistIds[source] = null;
-            }
+        const resp = await fetch('/api/configs/' + configUUID + '/refresh-prices', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify(refreshPayload)
         });
 
-        syncPriceSettingsControls();
-        renderPricelistSettingsSummary();
-        persistLocalPriceSettings();
+        if (!resp.ok) {
+            showToast('Ошибка обновления цен', 'error');
+            return;
+        }
 
-        await saveConfig(false);
+        const config = await resp.json();
+
+        // Update cart with new prices
+        if (config.items && config.items.length > 0) {
+            cart = config.items.map(item => ({
+                lot_name: item.lot_name,
+                quantity: item.quantity,
+                unit_price: item.unit_price,
+                estimate_price: item.unit_price,
+                warehouse_price: null,
+                competitor_price: null,
+                description: item.description || '',
+                category: item.category || getCategoryFromLotName(item.lot_name)
+            }));
+        }
+
+        // Update price update date
+        if (config.price_updated_at) {
+            updatePriceUpdateDate(config.price_updated_at);
+        }
+        if (config.pricelist_id) {
+            if (selectedPricelistIds.estimate) {
+                selectedPricelistIds.estimate = config.pricelist_id;
+            } else {
+                resolvedAutoPricelistIds.estimate = Number(config.pricelist_id);
+            }
+            if (!activePricelistsBySource.estimate.some(opt => Number(opt.id) === Number(config.pricelist_id))) {
+                await loadActivePricelists();
+            }
+            syncPriceSettingsControls();
+            renderPricelistSettingsSummary();
+            if (selectedPricelistIds.estimate) {
+                persistLocalPriceSettings();
+            }
+        }
+
+        // Re-render UI
         await refreshPriceLevels({ force: true, noCache: true });
         renderTab();
         updateCartUI();
 
-        if (configUUID) {
-            const configResp = await fetch('/api/configs/' + configUUID);
-            if (configResp.ok) {
-                const config = await configResp.json();
-                if (config.price_updated_at) {
-                    updatePriceUpdateDate(config.price_updated_at);
-                }
-            }
-        }
-
         showToast('Цены обновлены', 'success');
     } catch(e) {
         showToast('Ошибка обновления цен', 'error');
-    } finally {
-        if (refreshBtn) {
-            refreshBtn.disabled = false;
-            refreshBtn.textContent = previousLabel || 'Обновить цены';
-            updateRefreshPricesButtonState();
-        }
     }
 }
 
@@ -3126,18 +2872,6 @@ function deleteBOMRawRow(rowIdx) {
     rebuildBOMRowsFromRaw();
 }
 
-function clearBOMLotMapping(rowIdx) {
-    const row = bomRows.find(r => r.source_row_index === rowIdx);
-    if (!row) return;
-    row.manual_lot = '';
-    row.resolved_lot = '';
-    row.resolution_source = 'unresolved';
-    row.lot_allocations = [];
-    row.bundle_enabled = false;
-    renderBOMTable();
-    debouncedResolveBOM();
-}
-
 function _bomRawLotCell(rowIdx) {
     if (!bomImportRaw || bomImportRaw.mode !== 'raw') return '—';
     if (bomImportRaw.ignoredRows?.[rowIdx]) return '<span class="text-gray-400">—</span>';
@@ -3159,12 +2893,13 @@ function _bomRawLotCell(rowIdx) {
 
     if (isUnresolved) {
         const val = map.manual_lot || '';
-        return `<div class="autocomplete-wrapper relative"><input type="text" placeholder="Введите артикул..."
-            value="${escapeHtml(val)}"
-            class="w-full min-w-28 px-2 py-1 border rounded text-xs font-mono"
-            onfocus="showAutocompleteBOM(${rowIdx}, this)"
-            oninput="filterAutocompleteBOM(${rowIdx}, this.value); setBOMManualLotDraft(${rowIdx}, this.value, this)"
-            onkeydown="handleAutocompleteKeyBOM(event, ${rowIdx})"></div>
+        const invalid = val && !_bomLotValid(val);
+        return `<input type="text" placeholder="LOT..." value="${escapeHtml(val)}"
+            class="w-full min-w-28 px-2 py-1 border rounded text-xs ${invalid ? 'border-red-400 bg-red-50' : ''}"
+            list="lot-autocomplete-list"
+            oninput="setBOMManualLotDraft(${rowIdx}, this.value, this)"
+            onchange="commitBOMManualLot(${rowIdx}, this)"
+            onblur="commitBOMManualLot(${rowIdx}, this)">
             ${renderBOMLotAllocationsEditor(rowIdx)}`;
     }
     let suffix = '';
@@ -3548,12 +3283,12 @@ function _renderBOMParsedTable() {
 
         let lotCell = '';
         if (isUnresolved) {
-            lotCell = `<div class="autocomplete-wrapper relative"><input type="text" placeholder="Введите артикул..."
-                value="${escapeHtml(row.manual_lot || '')}"
-                class="w-full px-2 py-1 border rounded text-sm font-mono focus:ring-1 focus:ring-blue-400"
-                onfocus="showAutocompleteBOM(${row.source_row_index}, this)"
-                oninput="filterAutocompleteBOM(${row.source_row_index}, this.value); bomRows.find(r=>r.source_row_index===${row.source_row_index}).manual_lot=this.value;"
-                onkeydown="handleAutocompleteKeyBOM(event, ${row.source_row_index})"></div>${renderBOMLotAllocationsEditor(idx)}`;
+            lotCell = `<input type="text" placeholder="Введите LOT..." value="${escapeHtml(row.manual_lot || '')}"
+                class="w-full px-2 py-1 border rounded text-sm focus:ring-1 focus:ring-blue-400"
+                oninput="bomRows[${idx}].manual_lot = this.value; this.classList.toggle('border-red-400', this.value && !_bomLotValid(this.value));"
+                onchange="if(_bomLotValid(this.value)){bomRows[${idx}].manual_lot=this.value;resolveBOM(); this.classList.remove('border-red-400');}else{this.value=bomRows[${idx}].manual_lot||'';}"
+                onblur="if(this.value && !_bomLotValid(this.value)){this.value=bomRows[${idx}].manual_lot||'';}"
+                list="lot-autocomplete-list">${renderBOMLotAllocationsEditor(idx)}`;
         } else {
             let suffix = '';
             if (qtyMismatch) suffix = ` <span class="text-yellow-600 text-xs">≠est(${cartQty})</span>`;
@@ -3643,7 +3378,7 @@ function _renderBOMRawTable() {
             <td class="w-12 px-1 py-1 border-b text-center align-top whitespace-nowrap">
                 <button type="button" title="Добавить LOT в bundle" onclick="addBOMAllocation(${rowIdx})" class="inline-block text-xs px-1 text-gray-400 hover:text-blue-600">+</button>
                 <button type="button" title="${ignored ? 'Не игнорировать' : 'Игнорировать'}" onclick="toggleBOMRawRowIgnored(${rowIdx})" class="inline-block text-xs px-1 ${ignored ? 'text-blue-600' : 'text-gray-400 hover:text-gray-700'}">${ignored ? '◉' : '○'}</button>
-                <button type="button" title="Снять сопоставление" onclick="clearBOMLotMapping(${rowIdx})" class="inline-block text-xs px-1 text-gray-400 hover:text-red-600">✕</button>
+                <button type="button" title="Удалить строку" onclick="deleteBOMRawRow(${rowIdx})" class="inline-block text-xs px-1 text-gray-400 hover:text-red-600">✕</button>
             </td>`;
         tbody.appendChild(tr);
     });
@@ -4267,17 +4002,14 @@ function applyCustomPrice(table) {
 
 function onBuyCustomPriceInput() {
     applyCustomPrice('buy');
-    triggerAutoSave();
 }
 
 function onSaleCustomPriceInput() {
     applyCustomPrice('sale');
-    triggerAutoSave();
 }
 
 function onSaleMarkupInput() {
     renderPricingTab();
-    triggerAutoSave();
 }
 
 function setPricingCustomPriceFromVendor() {
@@ -4316,33 +4048,72 @@ function setPricingCustomPriceFromVendor() {
     }
 }
 
-async function exportPricingCSV(table) {
-    if (!configUUID) { showToast('Сохраните конфигурацию перед экспортом', 'error'); return; }
-    const basis = table === 'sale' ? 'ddp' : 'fob';
-    try {
-        const resp = await fetch(`/api/configs/${configUUID}/export/pricing`, {
-            method: 'POST',
-            headers: {'Content-Type': 'application/json'},
-            body: JSON.stringify({
-                include_lot: true,
-                include_bom: true,
-                include_estimate: true,
-                include_stock: true,
-                include_competitor: true,
-                basis: basis,
-            }),
-        });
-        if (!resp.ok) { showToast('Ошибка экспорта', 'error'); return; }
-        const blob = await resp.blob();
-        const url = URL.createObjectURL(blob);
-        const a = document.createElement('a');
-        a.href = url;
-        a.download = getFilenameFromResponse(resp) || `${configName || 'config'} SPEC-${basis.toUpperCase()}.csv`;
-        a.click();
-        URL.revokeObjectURL(url);
-    } catch(e) {
-        showToast('Ошибка экспорта', 'error');
-    }
+function exportPricingCSV(table) {
+    const bodyId = table === 'sale' ? 'pricing-body-sale' : 'pricing-body-buy';
+    const rowClass = table === 'sale' ? 'pricing-row-sale' : 'pricing-row-buy';
+    const totalIds = table === 'sale'
+        ? { est: 'pricing-total-sale-estimate', wh: 'pricing-total-sale-warehouse', comp: 'pricing-total-sale-competitor', vendor: 'pricing-total-sale-vendor' }
+        : { est: 'pricing-total-buy-estimate',  wh: 'pricing-total-buy-warehouse',  comp: 'pricing-total-buy-competitor',  vendor: 'pricing-total-buy-vendor' };
+
+    const rows = document.querySelectorAll(`#${bodyId} tr.${rowClass}`);
+    if (!rows.length) { showToast('Нет данных для экспорта', 'error'); return; }
+
+    const csvDelimiter = ';';
+    const cleanExportCell = value => {
+        const text = String(value || '').replace(/\s+/g, ' ').trim();
+        if (!text || text === '—') return text || '';
+        return text
+            .replace(/\s*\(.*\)$/, '')
+            .replace(/\s*\*+\s*$/, '')
+            .trim();
+    };
+    const csvEscape = v => {
+        if (v == null) return '';
+        const s = String(v).replace(/"/g, '""');
+        return /[;"\n\r]/.test(s) ? `"${s}"` : s;
+    };
+
+    const headers = ['PN вендора', 'Описание', 'LOT', 'Кол-во', 'Estimate', 'Склад', 'Конкуренты', 'Ручная цена'];
+    const lines = [headers.map(csvEscape).join(csvDelimiter)];
+
+    rows.forEach(tr => {
+        // PN вендора, Описание, LOT are stored in dataset to handle rowspan correctly
+        const pn   = cleanExportCell(tr.dataset.vendorPn || '');
+        const desc = cleanExportCell(tr.dataset.desc || '');
+        const lot  = cleanExportCell(tr.dataset.lot || '');
+        // Qty..Ручная цена: cells at offset 2 for group-start rows, offset 0 for sub-rows
+        const isGroupStart = tr.dataset.groupStart === 'true';
+        const cells = tr.querySelectorAll('td');
+        const o = isGroupStart ? 2 : 0;
+        const cols = [pn, desc, lot,
+            cleanExportCell(cells[o]?.textContent),
+            cleanExportCell(cells[o+1]?.textContent),
+            cleanExportCell(cells[o+2]?.textContent),
+            cleanExportCell(cells[o+3]?.textContent),
+            cleanExportCell(cells[o+4]?.textContent),
+        ];
+        lines.push(cols.map(csvEscape).join(csvDelimiter));
+    });
+
+    // Totals row
+    const tEst    = cleanExportCell(document.getElementById(totalIds.est)?.textContent);
+    const tWh     = cleanExportCell(document.getElementById(totalIds.wh)?.textContent);
+    const tComp   = cleanExportCell(document.getElementById(totalIds.comp)?.textContent);
+    const tVendor = cleanExportCell(document.getElementById(totalIds.vendor)?.textContent);
+    lines.push(['', '', '', 'Итого:', tEst, tWh, tComp, tVendor].map(csvEscape).join(csvDelimiter));
+
+    const blob = new Blob(['\uFEFF' + lines.join('\r\n')], {type: 'text/csv;charset=utf-8;'});
+    const url = URL.createObjectURL(blob);
+    const a = document.createElement('a');
+    a.href = url;
+    const today = new Date();
+    const datePart = `${today.getFullYear()}-${String(today.getMonth()+1).padStart(2,'0')}-${String(today.getDate()).padStart(2,'0')}`;
+    const codePart = (projectCode || 'NO-PROJECT').trim();
+    const namePart = (configName || 'config').trim();
+    const suffix = table === 'sale' ? 'SALE' : 'BUY';
+    a.download = `${datePart} (${codePart}) ${namePart} SPEC-${suffix}.csv`;
+    a.click();
+    URL.revokeObjectURL(url);
 }
 
 function escapeHtml(str) {

web/templates/setup.html

@@ -16,13 +16,6 @@
                 <p class="text-gray-600 mt-2">Настройка подключения к базе данных</p>
             </div>
 
-            <div class="bg-amber-50 border border-amber-300 rounded-md p-3 mb-4 flex items-start gap-2">
-                <svg class="w-5 h-5 text-amber-500 mt-0.5 shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 9v2m0 4h.01M10.29 3.86L1.82 18a2 2 0 001.71 3h16.94a2 2 0 001.71-3L13.71 3.86a2 2 0 00-3.42 0z"/>
-                </svg>
-                <p class="text-sm text-amber-800"><span class="font-semibold">Важно:</span> не закрывайте консольное окно приложения — без него программа не работает.</p>
-            </div>
-
             <form id="setup-form" class="space-y-4">
                 <div>
                     <label class="block text-sm font-medium text-gray-700 mb-1">Хост сервера</label>
@@ -92,28 +85,7 @@
         </p>
     </div>
 
-    <!-- Dead-man's switch overlay -->
-    <div id="backend-offline-overlay" class="hidden fixed inset-0 z-[9999] bg-black/80 flex items-center justify-center p-6">
-        <div class="bg-white rounded-xl shadow-2xl max-w-md w-full p-8 text-center">
-            <div class="text-red-500 mb-4">
-                <svg class="w-16 h-16 mx-auto" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M9.75 17L9 20l-1 1h8l-1-1-.75-3M3 13h18M5 17h14a2 2 0 002-2V5a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z"/>
-                </svg>
-            </div>
-            <h2 class="text-xl font-bold text-gray-900 mb-3">Приложение остановлено</h2>
-            <p class="text-gray-600 mb-4">Консольное окно QuoteForge было закрыто — без него программа не работает.</p>
-            <div class="bg-amber-50 border border-amber-200 rounded-lg p-3 mb-6 text-sm text-amber-800">
-                Запустите программу заново и нажмите «Обновить страницу».
-            </div>
-            <button onclick="window.location.reload()" class="w-full px-6 py-3 bg-blue-600 text-white rounded-lg hover:bg-blue-700 font-medium">
-                Обновить страницу
-            </button>
-        </div>
-    </div>
-
     <script>
-        let awaitingRestart = false;
-
         function showStatus(message, type) {
             const status = document.getElementById('status');
             status.classList.remove('hidden', 'bg-green-100', 'text-green-800', 'bg-red-100', 'text-red-800', 'bg-blue-100', 'text-blue-800', 'bg-yellow-100', 'text-yellow-800');
@@ -188,7 +160,6 @@
         }
 
         async function requestRestartAndWait() {
-            awaitingRestart = true;
             showStatus('Перезапуск приложения...', 'info');
             try {
                 await fetch('/api/restart', { method: 'POST' });
@@ -234,35 +205,6 @@
                 showStatus('Ошибка сети: ' + e.message, 'error');
             }
         });
-        // Dead-man's switch: detect if the backend process has stopped
-        (function() {
-            const POLL_MS = 5000;
-            const FAIL_THRESHOLD = 2;
-            let failCount = 0;
-
-            async function checkBackend() {
-                if (awaitingRestart) return;
-                try {
-                    const ctrl = new AbortController();
-                    const timer = setTimeout(() => ctrl.abort(), 3000);
-                    const resp = await fetch('/health', { signal: ctrl.signal });
-                    clearTimeout(timer);
-                    if (resp.ok) {
-                        failCount = 0;
-                        document.getElementById('backend-offline-overlay').classList.add('hidden');
-                    } else {
-                        failCount++;
-                    }
-                } catch (_) {
-                    failCount++;
-                }
-                if (failCount >= FAIL_THRESHOLD) {
-                    document.getElementById('backend-offline-overlay').classList.remove('hidden');
-                }
-            }
-
-            setInterval(checkBackend, POLL_MS);
-        })();
     </script>
 </body>
 </html>