Merge branch 'feature/vendor-spec-import'

MB_ lots (e.g. MB_INTEL_..._GPU8) are incorrectly categorized as GPU
in the pricelist. Two fixes:
- Skip MB_ lots in buildGPUSegment regardless of pricelist category
- Add INTEL to vendor token skip list in parseGPUModel (was missing,
  unlike AMD/NV/NVIDIA which were already skipped)

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
@@ -80,12 +75,7 @@ Network Trash Folder
 Temporary Items
 .apdisk
 
-# Release artifacts (binaries, archives, checksums), but keep markdown notes tracked
+# Release artifacts (binaries, archives, checksums), but DO track releases/memory/ for changelog
 releases/*
-!releases/README.md
 !releases/memory/
 !releases/memory/**
-!releases/**/
-releases/**/*
-!releases/README.md
-!releases/*/RELEASE_NOTES.md

README.md

@@ -1,53 +1,66 @@
 # QuoteForge
 
-Local-first desktop web app for server configuration, quotation, and project work.
+**Корпоративный конфигуратор серверов и расчёт КП**
 
-Runtime model:
-- user work is stored in local SQLite;
-- MariaDB is used only for setup checks and background sync;
-- HTTP server binds to loopback only.
+Offline-first архитектура: пользовательские операции через локальную SQLite, MariaDB только для синхронизации.
 
-## What the app does
+![Go Version](https://img.shields.io/badge/Go-1.22+-00ADD8?style=flat&logo=go)
+![License](https://img.shields.io/badge/License-Proprietary-red)
+![Status](https://img.shields.io/badge/Status-In%20Development-yellow)
 
-- configuration editor with price refresh from synced pricelists;
-- projects with variants and ordered configurations;
-- vendor BOM import and PN -> LOT resolution;
-- revision history with rollback;
-- rotating local backups.
+---
 
-## Run
-
-```bash
-go run ./cmd/qfs
-```
-
-Useful commands:
+## Документация
+
+Полная архитектурная документация хранится в **[bible/](bible/README.md)**:
+
+| Файл | Тема |
+|------|------|
+| [bible/01-overview.md](bible/01-overview.md) | Продукт, возможности, технологии, структура репо |
+| [bible/02-architecture.md](bible/02-architecture.md) | Local-first, sync, ценообразование, версионность |
+| [bible/03-database.md](bible/03-database.md) | SQLite и MariaDB схемы, права, миграции |
+| [bible/04-api.md](bible/04-api.md) | Все API endpoints и web-маршруты |
+| [bible/05-config.md](bible/05-config.md) | Конфигурация, env vars, установка |
+| [bible/06-backup.md](bible/06-backup.md) | Резервное копирование |
+| [bible/07-dev.md](bible/07-dev.md) | Команды разработки, стиль кода, guardrails |
+
+---
+
+## Быстрый старт
 
 ```bash
+# Применить миграции
 go run ./cmd/qfs -migrate
-go test ./...
-go vet ./...
+
+# Запустить
+go run ./cmd/qfs
+# или
+make run
+```
+
+Приложение: http://localhost:8080 → откроется `/setup` для настройки подключения к MariaDB.
+
+```bash
+# Сборка
 make build-release
+
+# Проверка
+go build ./cmd/qfs && go vet ./...
 ```
 
-On first run the app creates a minimal `config.yaml`, starts on `http://127.0.0.1:8080`, and opens `/setup` if DB credentials were not saved yet.
+---
 
-## Documentation
+## Releases & Changelog
 
-- Shared engineering rules: [bible/README.md](bible/README.md)
-- Project architecture: [bible-local/README.md](bible-local/README.md)
-- Release notes: `releases/<version>/RELEASE_NOTES.md`
+Changelog между версиями: `releases/memory/v{major}.{minor}.{patch}.md`
 
-`bible-local/` is the source of truth for QuoteForge-specific architecture. If code changes behavior, update the matching file there in the same commit.
+---
 
-## Repository map
+## Поддержка
 
-```text
-cmd/                  entry points and migration tools
-internal/             application code
-web/                  templates and static assets
-bible/                shared engineering rules
-bible-local/          project architecture and contracts
-releases/             packaged release artifacts and release notes
-config.example.yaml   runtime config reference
-```
+- Email: mike@mchus.pro
+- Internal: @mchus
+
+## Лицензия
+
+Собственность компании, только для внутреннего использования. См. [LICENSE](LICENSE).

bible-local/01-overview.md

@@ -1,70 +1,119 @@
-# 01 - Overview
+# 01 — Product Overview
 
-## Product
+## What is QuoteForge
 
-QuoteForge is a local-first tool for server configuration, quotation, and project tracking.
+A corporate server configuration and quotation tool.
+Operates in **strict local-first** mode: all user operations go through local SQLite; MariaDB is used only for synchronization.
 
-Core user flows:
-- create and edit configurations locally;
-- calculate prices from synced pricelists;
-- group configurations into projects and variants;
-- import vendor workspaces and map vendor PNs to internal LOTs;
-- review revision history and roll back safely.
+---
 
-## Runtime model
+## Features
 
-QuoteForge is a single-user thick client.
+### For Users
+- Mobile-first interface — works comfortably on phones and tablets
+- Server configurator — step-by-step component selection
+- Automatic price calculation — based on pricelists from local cache
+- CSV export — ready-to-use specifications for clients
+- Configuration history — versioned snapshots with rollback support
+- Full offline operation — continue working without network, sync later
+- Guarded synchronization — sync is blocked by preflight check if local schema is not ready
 
-Rules:
-- runtime HTTP binds to loopback only;
-- browser requests are treated as part of the same local user session;
-- MariaDB is not a live dependency for normal CRUD;
-- if non-loopback deployment is ever introduced, auth/RBAC must be added first.
+### User Roles
 
-## Product scope
+| Role | Permissions |
+|------|-------------|
+| `viewer` | View, create quotes, export |
+| `editor` | + save configurations |
+| `pricing_admin` | + manage prices and alerts |
+| `admin` | Full access, user management |
 
-In scope:
-- configurator and quote calculation;
-- projects, variants, and configuration ordering;
-- local revision history;
-- read-only pricelist browsing from SQLite cache;
-- background sync with MariaDB;
-- rotating local backups.
+### Price Freshness Indicators
 
-Out of scope and intentionally removed:
-- admin pricing UI/API;
-- alerts and notification workflows;
-- stock import tooling;
-- cron jobs and importer utilities.
+| Color | Status | Condition |
+|-------|--------|-----------|
+| Green | Fresh | < 30 days, ≥ 3 sources |
+| Yellow | Normal | 30–60 days |
+| Orange | Aging | 60–90 days |
+| Red | Stale | > 90 days or no data |
 
-## Tech stack
+---
+
+## Tech Stack
 
 | Layer | Stack |
-| --- | --- |
-| Backend | Go, Gin, GORM |
-| Frontend | HTML templates, htmx, Tailwind CSS |
-| Local storage | SQLite |
-| Sync transport | MariaDB |
-| Export | CSV and XLSX generation |
+|-------|-------|
+| Backend | Go 1.22+, Gin, GORM |
+| Frontend | HTML, Tailwind CSS, htmx |
+| Local DB | SQLite (`qfs.db`) |
+| Server DB | MariaDB 11+ (sync + server admin) |
+| Export | encoding/csv, excelize (XLSX) |
 
-## Repository map
+---
+
+## Product Scope
+
+**In scope:**
+- Component configurator and quotation calculation
+- Projects and configurations
+- Read-only pricelist viewing from local cache
+- Sync (pull components/pricelists, push local changes)
+
+**Out of scope (removed intentionally — do not restore):**
+- Admin pricing UI/API
+- Stock import
+- Alerts
+- Cron/importer utilities
+
+---
+
+## Repository Structure
 
-```text
-cmd/
-  qfs/                   main HTTP runtime
-  migrate/               server migration tool
-  migrate_ops_projects/  OPS project migration helper
-internal/
-  appstate/              backup and runtime state
-  config/                runtime config parsing
-  handlers/              HTTP handlers
-  localdb/               SQLite models and migrations
-  repository/            repositories
-  services/              business logic and sync
-web/
-  templates/             HTML templates
-  static/                static assets
-bible/                   shared engineering rules
-bible-local/             project-specific architecture
-releases/                release artifacts and notes
 ```
+quoteforge/
+├── cmd/
+│   ├── qfs/main.go               # HTTP server entry point
+│   ├── migrate/                  # Migration tool
+│   └── migrate_ops_projects/     # OPS project migrator
+├── internal/
+│   ├── appmeta/                  # App version metadata
+│   ├── appstate/                 # State management, backup
+│   ├── article/                  # Article generation
+│   ├── config/                   # Config parsing
+│   ├── db/                       # DB initialization
+│   ├── handlers/                 # HTTP handlers
+│   ├── localdb/                  # SQLite layer
+│   ├── lotmatch/                 # Lot matching logic
+│   ├── middleware/               # Auth, CORS, etc.
+│   ├── models/                   # GORM models
+│   ├── repository/               # Repository layer
+│   └── services/                 # Business logic
+├── web/
+│   ├── templates/                # HTML templates + partials
+│   └── static/                   # CSS, JS, assets
+├── migrations/                   # SQL migration files (30+)
+├── bible/                        # Architectural documentation (this section)
+├── releases/memory/              # Per-version changelogs
+├── config.example.yaml           # Config template (the only one in repo)
+└── go.mod
+```
+
+---
+
+## Integration with Existing DB
+
+QuoteForge integrates with the existing `RFQ_LOG` database:
+
+**Read-only:**
+- `lot` — component catalog
+- `qt_lot_metadata` — extended component data
+- `qt_categories` — categories
+- `qt_pricelists`, `qt_pricelist_items` — pricelists
+
+**Read + Write:**
+- `qt_configurations` — configurations
+- `qt_projects` — projects
+
+**Sync service tables:**
+- `qt_client_local_migrations` — migration catalog (SELECT only)
+- `qt_client_schema_state` — applied migrations state
+- `qt_pricelist_sync_status` — pricelist sync status

bible-local/02-architecture.md

@@ -1,149 +1,220 @@
-# 02 - Architecture
+# 02 — Architecture
 
-## Local-first rule
+## Local-First Principle
 
-SQLite is the runtime source of truth.
-MariaDB is sync transport plus setup and migration tooling.
-
-```text
-browser -> Gin handlers -> SQLite
-                        -> pending_changes
-background sync <------> MariaDB
-```
-
-Rules:
-- user CRUD must continue when MariaDB is offline;
-- runtime handlers and pages must read and write SQLite only;
-- MariaDB access in runtime code is allowed only inside sync and setup flows;
-- no live MariaDB fallback for reads that already exist in local cache.
-
-## Sync contract
-
-Bidirectional:
-- projects;
-- configurations;
-- `vendor_spec`;
-- pending change metadata.
-
-Pull-only:
-- components;
-- pricelists and pricelist items;
-- partnumber books and partnumber book items.
-
-Readiness guard:
-- every sync push/pull runs a preflight check;
-- blocked sync returns `423 Locked` with a machine-readable reason;
-- local work continues even when sync is blocked.
-- sync metadata updates must preserve project `updated_at`; sync time belongs in `synced_at`, not in the user-facing last-modified timestamp.
-- pricelist pull must persist a new local snapshot atomically: header and items appear together, and `last_pricelist_sync` advances only after item download succeeds.
-- UI sync status must distinguish "last sync failed" from "up to date"; if the app can prove newer server pricelist data exists, the indicator must say local cache is incomplete.
-
-## Pricing contract
-
-Prices come only from `local_pricelist_items`.
-
-Rules:
-- `local_components` is metadata-only;
-- quote calculation must not read prices from components;
-- latest pricelist selection ignores snapshots without items;
-- auto pricelist mode stays auto and must not be persisted as an explicit resolved ID.
-
-## Pricing tab layout
-
-The Pricing tab (Ценообразование) has two tables: Buy (Цена покупки) and Sale (Цена продажи).
-
-Column order (both tables):
+**SQLite** is the single source of truth for the user.
+**MariaDB** is a sync server only — it never blocks local operations.
 
 ```
-PN вендора | Описание | LOT | Кол-во | Estimate | Склад | Конкуренты | Ручная цена
+User
+  │
+  ▼
+SQLite (qfs.db)          ← all CRUD operations go here
+  │
+  │ background sync (every 5 min)
+  ▼
+MariaDB (RFQ_LOG)        ← pull/push only
 ```
 
-Per-LOT row expansion rules:
-- each `lot_mappings` entry in a BOM row becomes its own table row with its own quantity and prices;
-- `baseLot` (resolved LOT without an explicit mapping) is treated as the first sub-row with `quantity_per_pn` from `_getRowLotQtyPerPN`;
-- when one vendor PN expands into N LOT sub-rows, PN вендора and Описание cells use `rowspan="N"` and appear only on the first sub-row;
-- a visual top border (`border-t border-gray-200`) separates each vendor PN group.
+**Rules:**
+- All CRUD operations go through SQLite only
+- If MariaDB is unavailable → local work continues without restrictions
+- Changes are queued in `pending_changes` and pushed on next sync
 
-Vendor price attachment:
-- `vendorOrig` and `vendorOrigUnit` (BOM unit/total price) are attached to the first LOT sub-row only;
-- subsequent sub-rows carry empty `data-vendor-orig` so `setPricingCustomPriceFromVendor` counts each vendor PN exactly once.
+---
 
-Controls terminology:
-- custom price input is labeled **Ручная цена** (not "Своя цена");
-- the button that fills custom price from BOM totals is labeled **BOM Цена** (not "Проставить цены BOM").
+## Synchronization
 
-CSV export reads PN вендора, Описание, and LOT from `data-vendor-pn`, `data-desc`, `data-lot` row attributes to bypass the rowspan cell offset problem.
+### Data Flow Diagram
 
-## Configuration versioning
+```
+                      [ SERVER / MariaDB ]
+                 ┌───────────────────────────┐
+                 │ qt_projects               │
+                 │ qt_configurations         │
+                 │ qt_pricelists             │
+                 │ qt_pricelist_items        │
+                 │ qt_pricelist_sync_status  │
+                 └─────────────┬─────────────┘
+                               │
+              pull (projects/configs/pricelists)
+                               │
+          ┌────────────────────┴────────────────────┐
+          │                                         │
+[ CLIENT A / SQLite ]                   [ CLIENT B / SQLite ]
+local_projects                          local_projects
+local_configurations                    local_configurations
+local_pricelists                        local_pricelists
+local_pricelist_items                   local_pricelist_items
+pending_changes                         pending_changes
+          │                                         │
+          └────── push (projects/configs only) ─────┘
+                               │
+                      [ SERVER / MariaDB ]
+```
 
-Configuration revisions are append-only snapshots stored in `local_configuration_versions`.
+### Sync Direction by Entity
 
-Rules:
-- the editable working configuration is always the implicit head named `main`; UI must not switch the user to a numbered revision after save;
-- create a new revision when spec, BOM, or pricing content changes;
-- revision history is retrospective: the revisions page shows past snapshots, not the current `main` state;
-- rollback creates a new head revision from an old snapshot;
-- rename, reorder, project move, and similar operational edits do not create a new revision snapshot;
-- revision deduplication includes `items`, `server_count`, `total_price`, `custom_price`, `vendor_spec`, pricelist selectors, `disable_price_refresh`, and `only_in_stock`;
-- BOM updates must use version-aware save flow, not a direct SQL field update;
-- current revision pointer must be recoverable if legacy or damaged rows are found locally.
+| Entity | Direction |
+|--------|-----------|
+| Configurations | Client ↔ Server ↔ Other Clients |
+| Projects | Client ↔ Server ↔ Other Clients |
+| Pricelists | Server → Clients only (no push) |
+| Components | Server → Clients only |
 
-## Sync UX
+Local pricelists not present on the server and not referenced by active configurations are deleted automatically on sync.
 
-UI-facing sync status must never block on live MariaDB calls.
+### Soft Deletes (Archive Pattern)
 
-Rules:
-- navbar sync indicator and sync info modal read only local cached state from SQLite/app settings;
-- background/manual sync may talk to MariaDB, but polling endpoints must stay fast even on slow or broken connections;
-- any MariaDB timeout/invalid-connection during sync must invalidate the cached remote handle immediately so UI stops treating the connection as healthy.
+Configurations and projects are **never hard-deleted**. Deletion is archive via `is_active = false`.
 
-## Naming collisions
+- `DELETE /api/configs/:uuid` → sets `is_active = false` (archived); can be restored via `reactivate`
+- `DELETE /api/projects/:uuid` → archives a project **variant** only (`variant` field must be non-empty); main projects cannot be deleted via this endpoint
 
-UI-driven rename and copy flows use one suffix convention for conflicts.
+## Sync Readiness Guard
 
-Rules:
-- configuration and variant names must auto-resolve collisions with `_копия`, then `_копия2`, `_копия3`, and so on;
-- copy checkboxes and copy modals must prefill `_копия`, not ` (копия)`;
-- the literal variant name `main` is reserved and must not be allowed for non-main variants.
+Before every push/pull, a preflight check runs:
+1. Is the server (MariaDB) reachable?
+2. Can centralized local DB migrations be applied?
+3. Does the application version satisfy `min_app_version` of pending migrations?
 
-## Configuration types
+**If the check fails:**
+- Local CRUD continues without restriction
+- Sync API returns `423 Locked` with `reason_code` and `reason_text`
+- UI shows a red indicator with the block reason
 
-Configurations have a `config_type` field: `"server"` (default) or `"storage"`.
+---
 
-Rules:
-- `config_type` defaults to `"server"` for all existing and new configurations unless explicitly set;
-- the configurator page is shared for both types; the SW tab is always visible regardless of type;
-- storage configurations use the same vendor_spec + PN→LOT + pricing flow as server configurations;
-- storage component categories map to existing tabs: `ENC`/`DKC`/`CTL` → Base, `HIC` → PCI (HIC-карты СХД; `HBA`/`NIC` — серверные, не смешивать), `SSD`/`HDD` → Storage (используют существующие серверные LOT), `ACC` → Accessories (используют существующие серверные LOT), `SW` → SW.
-- `DKC` = контроллерная полка (модель СХД + тип дисков + кол-во слотов + кол-во контроллеров); `CTL` = контроллер (кэш + встроенные порты); `ENC` = дисковая полка без контроллера.
-- the available config types and their localized names flow from `qt_settings.config_types` on the server;
-  QF falls back to hardcoded "server/Сервер" and "storage/СХД" when the setting is absent.
+## Pricing
 
-## Server-driven configurator settings (`qt_settings`)
+### Principle
 
-QF reads four settings from `qt_settings` (MariaDB) and caches them in `local_qt_settings` (SQLite).
-They are synced during every component sync. See `bible-local/server-contract-qt-settings.md` for the
-full contract and JSON schemas.
+**Prices come only from `local_pricelist_items`.**
+Components (`local_components`) are metadata-only — they contain no pricing information.
 
-| Setting key | Effect in QF |
-|-------------|-------------|
-| `config_types` | New-config modal buttons; category allowlist per config type |
-| `tab_config` | Configurator tab structure, sections, singleSelect |
-| `always_visible_tabs` | Which tabs are shown even when empty |
-| `required_categories` | Per-config-type badge on tabs with unfilled required categories |
+### Lookup Pattern
 
-Rules:
-- sync runs after `SyncComponents`; failure is non-fatal (Warn log only);
-- `local_qt_settings` is a read-only cache — never written by user actions;
-- absent or unparseable settings: QF uses hardcoded fallbacks for that key only;
-- `config_types[].categories` is an allowlist: a category absent from all types is shown everywhere;
-- `qt_categories.name` and `qt_categories.name_ru` are not used by QF runtime; do not depend on them.
+```go
+// Look up a price for a line item
+price, found := s.lookupPriceByPricelistID(pricelistID, lotName)
+if found && price > 0 {
+    // use price
+}
 
-## Vendor BOM contract
+// Inside lookupPriceByPricelistID:
+localPL, err := s.localDB.GetLocalPricelistByServerID(pricelistID)
+price, err := s.localDB.GetLocalPriceForLot(localPL.ID, lotName)
+```
 
-Vendor BOM is stored in `vendor_spec` on the configuration row.
+### Multi-Level Pricelists
 
-Rules:
-- PN to LOT resolution uses the active local partnumber book;
-- canonical persisted mapping is `lot_mappings[]`;
-- QuoteForge does not use legacy BOM tables such as `qt_bom`, `qt_lot_bundles`, or `qt_lot_bundle_items`.
+A configuration can reference up to three pricelists simultaneously:
+
+| Field | Purpose |
+|-------|---------|
+| `pricelist_id` | Primary (estimate) |
+| `warehouse_pricelist_id` | Warehouse pricing |
+| `competitor_pricelist_id` | Competitor pricing |
+
+Pricelist sources: `estimate` | `warehouse` | `competitor`
+
+### "Auto" Pricelist Selection
+
+Configurator supports explicit and automatic selection per source (`estimate`, `warehouse`, `competitor`):
+
+- **Explicit mode:** concrete `pricelist_id` is set by user in settings.
+- **Auto mode:** client sends no explicit ID for that source; backend resolves the current latest active pricelist.
+
+`auto` must stay `auto` after price-level refresh and after manual "refresh prices":
+- resolved IDs are runtime-only and must not overwrite user's mode;
+- switching to explicit selection must clear runtime auto resolution for that source.
+
+### Latest Pricelist Resolution Rules
+
+For both server (`qt_pricelists`) and local cache (`local_pricelists`), "latest by source" is resolved with:
+
+1. only pricelists that have at least one item (`EXISTS ...pricelist_items`);
+2. deterministic sort: `created_at DESC, id DESC`.
+
+This prevents selecting empty/incomplete snapshots and removes nondeterministic ties.
+
+---
+
+## Configuration Versioning
+
+### Principle
+
+Append-only for **spec+price** changes: immutable snapshots are stored in `local_configuration_versions`.
+
+```
+local_configurations
+  └── current_version_id ──► local_configuration_versions (v3)  ← active
+                              local_configuration_versions (v2)
+                              local_configuration_versions (v1)
+```
+
+- `version_no = max + 1` when configuration **spec+price** changes
+- Old versions are never modified or deleted in normal flow
+- Rollback does **not** rewind history — it creates a **new** version from the snapshot
+- Operational updates (`line_no` reorder, server count, project move, rename)
+  are synced via `pending_changes` but do **not** create a new revision snapshot
+
+### Rollback
+
+```bash
+POST /api/configs/:uuid/rollback
+{
+  "target_version": 3,
+  "note": "optional comment"
+}
+```
+
+Result:
+- A new version `vN` is created with `data` from the target version
+- `change_note = "rollback to v{target_version}"` (+ note if provided)
+- `current_version_id` is switched to the new version
+- Configuration moves to `sync_status = pending`
+
+### Sync Status Flow
+
+```
+local → pending → synced
+```
+
+---
+
+## Project Specification Ordering (`Line`)
+
+- Each project configuration has persistent `line_no` (`10,20,30...`) in both SQLite and MariaDB.
+- Project list ordering is deterministic:
+  `line_no ASC`, then `created_at DESC`, then `id DESC`.
+- Drag-and-drop reorder in project UI updates `line_no` for active project configurations.
+- Reorder writes are queued as configuration `update` events in `pending_changes`
+  without creating new configuration versions.
+- Backward compatibility: if remote MariaDB schema does not yet include `line_no`,
+  sync falls back to create/update without `line_no` instead of failing.
+
+---
+
+## Sync Payload for Versioning
+
+Events in `pending_changes` for configurations contain:
+
+| Field | Description |
+|-------|-------------|
+| `configuration_uuid` | Identifier |
+| `operation` | `create` / `update` / `rollback` |
+| `current_version_id` | Active version ID |
+| `current_version_no` | Version number |
+| `snapshot` | Current configuration state |
+| `idempotency_key` | For idempotent push |
+| `conflict_policy` | `last_write_wins` |
+
+---
+
+## Background Processes
+
+| Process | Interval | What it does |
+|---------|----------|--------------|
+| Sync worker | 5 min | push pending + pull all |
+| Backup scheduler | configurable (`backup.time`) | creates ZIP archives |

bible-local/03-database.md

@@ -1,420 +1,206 @@
-# 03 - Database
+# 03 — Database
 
-## SQLite
+## SQLite (local, client-side)
 
-SQLite is the local runtime database.
+File: `qfs.db` in the user-state directory (see [05-config.md](05-config.md)).
 
-Main tables:
+### Tables
+
+#### Components and Reference Data
+
+| Table | Purpose | Key Fields |
+|-------|---------|------------|
+| `local_components` | Component metadata (NO prices) | `lot_name` (PK), `lot_description`, `category`, `model` |
+| `connection_settings` | MariaDB connection settings | key-value store |
+| `app_settings` | Application settings | `key` (PK), `value`, `updated_at` |
+
+#### Pricelists
+
+| Table | Purpose | Key Fields |
+|-------|---------|------------|
+| `local_pricelists` | Pricelist headers | `id`, `server_id` (unique), `source`, `version`, `created_at` |
+| `local_pricelist_items` | Pricelist line items ← **sole source of prices** | `id`, `pricelist_id` (FK), `lot_name`, `price`, `lot_category` |
+
+#### Partnumber Books (PN → LOT mapping, pull-only from PriceForge)
+
+| Table | Purpose | Key Fields |
+|-------|---------|------------|
+| `local_partnumber_books` | Version snapshots of PN→LOT mappings | `id`, `server_id` (unique), `version`, `created_at`, `is_active` |
+| `local_partnumber_book_items` | PN→LOT mapping rows | `id`, `book_id` (FK), `partnumber`, `lot_name`, `is_primary_pn` |
+
+Active book: `WHERE is_active=1 ORDER BY created_at DESC, id DESC LIMIT 1`
+
+`is_primary_pn=1` means this PN's quantity in the vendor BOM determines qty(LOT). If only non-primary PNs are present for a LOT, qty defaults to 1.
+
+#### Configurations and Projects
+
+| Table | Purpose | Key Fields |
+|-------|---------|------------|
+| `local_configurations` | Saved configurations | `id`, `uuid` (unique), `items` (JSON), `vendor_spec` (JSON: PN/qty/description + canonical `lot_mappings[]`), `line_no`, `pricelist_id`, `warehouse_pricelist_id`, `competitor_pricelist_id`, `current_version_id`, `sync_status` |
+| `local_configuration_versions` | Immutable snapshots (revisions) | `id`, `configuration_id` (FK), `version_no`, `data` (JSON), `change_note`, `created_at` |
+| `local_projects` | Projects | `id`, `uuid` (unique), `name`, `code`, `sync_status` |
+
+#### Sync
 
 | Table | Purpose |
-| --- | --- |
-| `local_components` | synced component metadata |
-| `local_pricelists` | local pricelist headers |
-| `local_pricelist_items` | local pricelist rows, the only runtime price source |
-| `local_projects` | user projects |
-| `local_configurations` | user configurations |
-| `local_configuration_versions` | immutable revision snapshots |
-| `local_partnumber_books` | partnumber book headers |
-| `local_partnumber_book_items` | PN -> LOT catalog payload |
-| `pending_changes` | sync queue |
-| `connection_settings` | encrypted MariaDB connection settings |
-| `app_settings` | local app state |
-| `local_schema_migrations` | applied local migration markers |
-| `local_qt_settings` | server-pushed configurator settings cache (from `qt_settings`) |
+|-------|---------|
+| `pending_changes` | Queue of changes to push to MariaDB |
+| `local_schema_migrations` | Applied migrations (idempotency guard) |
 
-Rules:
-- cache tables may be rebuilt if local migration recovery requires it;
-- user-authored tables must not be dropped as a recovery shortcut;
-- `local_pricelist_items` is the only valid runtime source of prices;
-- configuration `items` and `vendor_spec` are stored as JSON payloads inside configuration rows.
+---
 
-## MariaDB
-
-MariaDB is the central sync database (`RFQ_LOG`). Final schema as of 2026-04-15.
-
-### QuoteForge tables (qt_*)
-
-Runtime read:
-- `qt_categories` — pricelist categories (note: `name`/`name_ru` columns being removed; QF does not use them)
-- `qt_lot_metadata` — component metadata, price settings
-- `qt_pricelists` — pricelist headers (source: estimate / warehouse / competitor)
-- `qt_pricelist_items` — pricelist rows
-- `qt_partnumber_books` — partnumber book headers
-- `qt_partnumber_book_items` — PN→LOT catalog payload
-- `qt_settings` — server-pushed configurator settings; schema managed by server-side agent (see `bible-local/server-contract-qt-settings.md`)
-
-Runtime read/write:
-- `qt_projects` — projects
-- `qt_configurations` — configurations
-- `qt_client_schema_state` — per-client sync status and version tracking
-- `qt_pricelist_sync_status` — pricelist sync timestamps per user
-
-Insert-only tracking:
-- `qt_vendor_partnumber_seen` — vendor partnumbers encountered during sync; `lot_suggestion` column updated when user manually maps PN → LOT in vendor-spec UI
-
-Server-side only (not queried by client runtime):
-- `qt_component_usage_stats` — aggregated component popularity stats (written by server jobs)
-- `qt_pricing_alerts` — price anomaly alerts (models exist in Go; feature disabled in runtime)
-- `qt_schema_migrations` — server migration history (applied via `go run ./cmd/qfs -migrate`)
-- `qt_scheduler_runs` — server background job tracking (no Go code references it in this repo)
-
-### Competitor subsystem (server-side only, not used by QuoteForge Go code)
-
-- `qt_competitors` — competitor registry
-- `partnumber_log_competitors` — competitor price log (FK → qt_competitors)
-
-These tables exist in the schema and are maintained by another tool or workflow.
-QuoteForge references competitor pricelists only via `qt_pricelists` (source='competitor').
-
-### 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
-- `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;
-- 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.
-
-## MariaDB Table Structures
-
-Full column reference as of 2026-03-21 (`RFQ_LOG` final schema).
-
-### qt_categories
-| Column | Type | Notes |
-|--------|------|-------|
-| id | bigint UNSIGNED PK AUTO_INCREMENT | |
-| code | varchar(20) UNIQUE NOT NULL | |
-| name | varchar(100) NOT NULL | being removed; QF does not use at runtime |
-| name_ru | varchar(100) | being removed; QF does not use at runtime |
-| display_order | bigint DEFAULT 0 | |
-| is_required | tinyint(1) DEFAULT 0 | |
-
-### qt_settings
-Managed by the server-side agent. QF has SELECT-only access.
-See `bible-local/server-contract-qt-settings.md` for full schema and value formats.
-| Column | Type | Notes |
-|--------|------|-------|
-| name | varchar(100) PK | setting key |
-| value | TEXT NOT NULL | JSON-encoded value |
-
-### local_qt_settings (SQLite)
-Read-only cache of `qt_settings`. Synced during component sync.
-| Column | Type | Notes |
-|--------|------|-------|
-| name | text PK | setting key |
-| value | text | JSON value as-is from server |
-
-### qt_client_schema_state
-PK: (username, hostname)
-| Column | Type | Notes |
-|--------|------|-------|
-| username | varchar(100) | |
-| hostname | varchar(255) DEFAULT '' | |
-| last_applied_migration_id | varchar(128) | |
-| app_version | varchar(64) | |
-| last_sync_at | datetime | |
-| last_sync_status | varchar(32) | |
-| pending_changes_count | int DEFAULT 0 | |
-| pending_errors_count | int DEFAULT 0 | |
-| configurations_count | int DEFAULT 0 | |
-| projects_count | int DEFAULT 0 | |
-| estimate_pricelist_version | varchar(128) | |
-| warehouse_pricelist_version | varchar(128) | |
-| competitor_pricelist_version | varchar(128) | |
-| last_sync_error_code | varchar(128) | |
-| last_sync_error_text | text | |
-| last_checked_at | datetime NOT NULL | |
-| updated_at | datetime NOT NULL | |
-
-### qt_component_usage_stats
-PK: lot_name
-| Column | Type | Notes |
-|--------|------|-------|
-| lot_name | varchar(255) | |
-| quotes_total | bigint DEFAULT 0 | |
-| quotes_last30d | bigint DEFAULT 0 | |
-| quotes_last7d | bigint DEFAULT 0 | |
-| total_quantity | bigint DEFAULT 0 | |
-| total_revenue | decimal(14,2) DEFAULT 0 | |
-| trend_direction | enum('up','stable','down') DEFAULT 'stable' | |
-| trend_percent | decimal(5,2) DEFAULT 0 | |
-| last_used_at | datetime(3) | |
-
-### qt_competitors
-| Column | Type | Notes |
-|--------|------|-------|
-| id | bigint UNSIGNED PK AUTO_INCREMENT | |
-| name | varchar(255) NOT NULL | |
-| code | varchar(100) UNIQUE NOT NULL | |
-| delivery_basis | varchar(50) DEFAULT 'DDP' | |
-| currency | varchar(10) DEFAULT 'USD' | |
-| column_mapping | longtext JSON | |
-| is_active | tinyint(1) DEFAULT 1 | |
-| created_at | timestamp | |
-| updated_at | timestamp ON UPDATE | |
-| price_uplift | decimal(8,4) DEFAULT 1.3 | effective_price = price / price_uplift |
-
-### qt_configurations
-| Column | Type | Notes |
-|--------|------|-------|
-| id | bigint UNSIGNED PK AUTO_INCREMENT | |
-| uuid | varchar(36) UNIQUE NOT NULL | |
-| user_id | bigint UNSIGNED | |
-| owner_username | varchar(100) NOT NULL | |
-| app_version | varchar(64) | |
-| project_uuid | char(36) | FK → qt_projects.uuid ON DELETE SET NULL |
-| name | varchar(200) NOT NULL | |
-| items | longtext JSON NOT NULL | component list |
-| total_price | decimal(12,2) | |
-| notes | text | |
-| is_template | tinyint(1) DEFAULT 0 | |
-| created_at | datetime(3) | |
-| custom_price | decimal(12,2) | |
-| server_count | bigint DEFAULT 1 | |
-| server_model | varchar(100) | |
-| support_code | varchar(20) | |
-| article | varchar(80) | |
-| pricelist_id | bigint UNSIGNED | FK → qt_pricelists.id |
-| warehouse_pricelist_id | bigint UNSIGNED | FK → qt_pricelists.id |
-| competitor_pricelist_id | bigint UNSIGNED | FK → qt_pricelists.id |
-| disable_price_refresh | tinyint(1) DEFAULT 0 | |
-| only_in_stock | tinyint(1) DEFAULT 0 | |
-| line_no | int | position within project |
-| price_updated_at | timestamp | |
-| vendor_spec | longtext JSON | |
-
-### qt_lot_metadata
-PK: lot_name
-| Column | Type | Notes |
-|--------|------|-------|
-| lot_name | varchar(255) | |
-| category_id | bigint UNSIGNED | FK → qt_categories.id |
-| vendor | varchar(50) | |
-| model | varchar(100) | |
-| specs | longtext JSON | |
-| current_price | decimal(12,2) | cached computed price |
-| price_method | enum('manual','median','average','weighted_median') DEFAULT 'median' | |
-| price_period_days | bigint DEFAULT 90 | |
-| price_updated_at | datetime(3) | |
-| request_count | bigint DEFAULT 0 | |
-| last_request_date | date | |
-| popularity_score | decimal(10,4) DEFAULT 0 | |
-| price_coefficient | decimal(5,2) DEFAULT 0 | markup % |
-| manual_price | decimal(12,2) | |
-| meta_prices | varchar(1000) | raw price samples JSON |
-| meta_method | varchar(20) | method used for last compute |
-| meta_period_days | bigint DEFAULT 90 | |
-| is_hidden | tinyint(1) DEFAULT 0 | |
-
-### qt_partnumber_books
-| Column | Type | Notes |
-|--------|------|-------|
-| id | bigint UNSIGNED PK AUTO_INCREMENT | |
-| version | varchar(30) UNIQUE NOT NULL | |
-| created_at | timestamp | |
-| created_by | varchar(100) | |
-| is_active | tinyint(1) DEFAULT 0 | only one active at a time |
-| partnumbers_json | longtext DEFAULT '[]' | flat list of partnumbers |
-
-### qt_partnumber_book_items
-| Column | Type | Notes |
-|--------|------|-------|
-| id | bigint UNSIGNED PK AUTO_INCREMENT | |
-| partnumber | varchar(255) UNIQUE NOT NULL | |
-| lots_json | longtext NOT NULL | JSON array of lot_names |
-| description | varchar(10000) | |
-
-### qt_pricelists
-| Column | Type | Notes |
-|--------|------|-------|
-| id | bigint UNSIGNED PK AUTO_INCREMENT | |
-| source | varchar(20) DEFAULT 'estimate' | 'estimate' / 'warehouse' / 'competitor' |
-| version | varchar(20) NOT NULL | UNIQUE with source |
-| created_at | datetime(3) | |
-| created_by | varchar(100) | |
-| is_active | tinyint(1) DEFAULT 1 | |
-| usage_count | bigint DEFAULT 0 | |
-| expires_at | datetime(3) | |
-| notification | varchar(500) | shown to clients on sync |
-
-### qt_pricelist_items
-| Column | Type | Notes |
-|--------|------|-------|
-| id | bigint UNSIGNED PK AUTO_INCREMENT | |
-| pricelist_id | bigint UNSIGNED NOT NULL | FK → qt_pricelists.id |
-| lot_name | varchar(255) NOT NULL | INDEX with pricelist_id |
-| lot_category | varchar(50) | |
-| price | decimal(12,2) NOT NULL | |
-| price_method | varchar(20) | |
-| price_period_days | bigint DEFAULT 90 | |
-| price_coefficient | decimal(5,2) DEFAULT 0 | |
-| manual_price | decimal(12,2) | |
-| meta_prices | varchar(1000) | |
-
-### qt_pricelist_sync_status
-PK: username
-| Column | Type | Notes |
-|--------|------|-------|
-| username | varchar(100) | |
-| last_sync_at | datetime NOT NULL | |
-| updated_at | datetime NOT NULL | |
-| app_version | varchar(64) | |
-
-### qt_pricing_alerts
-| Column | Type | Notes |
-|--------|------|-------|
-| id | bigint UNSIGNED PK AUTO_INCREMENT | |
-| lot_name | varchar(255) NOT NULL | |
-| alert_type | enum('high_demand_stale_price','price_spike','price_drop','no_recent_quotes','trending_no_price') | |
-| severity | enum('low','medium','high','critical') DEFAULT 'medium' | |
-| message | text NOT NULL | |
-| details | longtext JSON | |
-| status | enum('new','acknowledged','resolved','ignored') DEFAULT 'new' | |
-| created_at | datetime(3) | |
-
-### qt_projects
-| Column | Type | Notes |
-|--------|------|-------|
-| id | bigint UNSIGNED PK AUTO_INCREMENT | |
-| uuid | char(36) UNIQUE NOT NULL | |
-| owner_username | varchar(100) NOT NULL | |
-| code | varchar(100) NOT NULL | UNIQUE with variant |
-| variant | varchar(100) DEFAULT '' | UNIQUE with code |
-| name | varchar(200) | |
-| tracker_url | varchar(500) | |
-| is_active | tinyint(1) DEFAULT 1 | |
-| is_system | tinyint(1) DEFAULT 0 | |
-| created_at | timestamp | |
-| updated_at | timestamp ON UPDATE | |
-
-### qt_schema_migrations
-| Column | Type | Notes |
-|--------|------|-------|
-| id | bigint UNSIGNED PK AUTO_INCREMENT | |
-| filename | varchar(255) UNIQUE NOT NULL | |
-| applied_at | datetime(3) | |
-
-### qt_scheduler_runs
-PK: job_name
-| Column | Type | Notes |
-|--------|------|-------|
-| job_name | varchar(100) | |
-| last_started_at | datetime | |
-| last_finished_at | datetime | |
-| last_status | varchar(20) DEFAULT 'idle' | |
-| last_error | text | |
-| updated_at | timestamp ON UPDATE | |
-
-### qt_vendor_partnumber_seen
-| Column | Type | Notes |
-|--------|------|-------|
-| id | bigint UNSIGNED PK AUTO_INCREMENT | |
-| source_type | varchar(32) NOT NULL | |
-| vendor | varchar(255) DEFAULT '' | |
-| partnumber | varchar(255) UNIQUE NOT NULL | |
-| description | varchar(10000) | |
-| last_seen_at | datetime(3) NOT NULL | |
-| is_ignored | tinyint(1) DEFAULT 0 | |
-| is_pattern | tinyint(1) DEFAULT 0 | |
-| ignored_at | datetime(3) | |
-| ignored_by | varchar(100) | |
-| created_at | datetime(3) | |
-| updated_at | datetime(3) | |
-| lot_suggestion | longtext (JSON) | nullable; set when user manually maps PN → LOT in vendor-spec UI; same format as `qt_partnumber_book_items.lots_json`; see [11-lot-suggestions.md](11-lot-suggestions.md) |
-
-### stock_ignore_rules
-| Column | Type | Notes |
-|--------|------|-------|
-| id | bigint UNSIGNED PK AUTO_INCREMENT | |
-| target | varchar(20) NOT NULL | UNIQUE with match_type+pattern |
-| match_type | varchar(20) NOT NULL | |
-| pattern | varchar(500) NOT NULL | |
-| created_at | timestamp | |
-
-### stock_log
-| Column | Type | Notes |
-|--------|------|-------|
-| stock_log_id | bigint UNSIGNED PK AUTO_INCREMENT | |
-| partnumber | varchar(255) NOT NULL | INDEX with date |
-| supplier | varchar(255) | |
-| date | date NOT NULL | |
-| price | decimal(12,2) NOT NULL | |
-| quality | varchar(255) | |
-| comments | text | |
-| vendor | varchar(255) | INDEX |
-| qty | decimal(14,3) | |
-
-### partnumber_log_competitors
-| Column | Type | Notes |
-|--------|------|-------|
-| id | bigint UNSIGNED PK AUTO_INCREMENT | |
-| competitor_id | bigint UNSIGNED NOT NULL | FK → qt_competitors.id |
-| partnumber | varchar(255) NOT NULL | |
-| description | varchar(500) | |
-| vendor | varchar(255) | |
-| price | decimal(12,2) NOT NULL | |
-| price_loccur | decimal(12,2) | local currency price |
-| currency | varchar(10) | |
-| qty | decimal(12,4) DEFAULT 1 | |
-| date | date NOT NULL | |
-| created_at | timestamp | |
-
-### Legacy tables (lot / lot_log / machine / machine_log / supplier)
-
-Retained for historical data only. Not queried by QuoteForge.
-
-**lot**: lot_name (PK, char 255), lot_category, lot_description
-**lot_log**: lot_log_id AUTO_INCREMENT, lot (FK→lot), supplier (FK→supplier), date, price double, quality, comments
-**supplier**: supplier_name (PK, char 255), supplier_comment
-**machine**: machine_name (PK, char 255), machine_description
-**machine_log**: machine_log_id AUTO_INCREMENT, date, supplier (FK→supplier), country, opty, type, machine (FK→machine), customer_requirement, variant, price_gpl, price_estimate, qty, quality, carepack, lead_time_weeks, prepayment_percent, price_got, Comment
-
-## MariaDB User Permissions
-
-The application user needs read-only access to reference tables and read/write access to runtime tables.
+### Key SQLite Indexes
 
 ```sql
--- Read-only: reference and pricing data
-GRANT SELECT ON RFQ_LOG.qt_categories            TO 'qfs_user'@'%';
-GRANT SELECT ON RFQ_LOG.qt_lot_metadata          TO 'qfs_user'@'%';
-GRANT SELECT ON RFQ_LOG.qt_pricelists            TO 'qfs_user'@'%';
-GRANT SELECT ON RFQ_LOG.qt_pricelist_items       TO 'qfs_user'@'%';
-GRANT SELECT ON RFQ_LOG.qt_partnumber_books      TO 'qfs_user'@'%';
-GRANT SELECT ON RFQ_LOG.qt_partnumber_book_items TO 'qfs_user'@'%';
-GRANT SELECT ON RFQ_LOG.lot                      TO 'qfs_user'@'%';
+-- Pricelists
+INDEX local_pricelist_items(pricelist_id)
+UNIQUE INDEX local_pricelists(server_id)
+INDEX local_pricelists(source, created_at)   -- used for "latest by source" queries
+-- latest-by-source runtime query also applies deterministic tie-break by id DESC
 
--- Read/write: runtime sync and user data
-GRANT SELECT, INSERT, UPDATE, DELETE ON RFQ_LOG.qt_projects              TO 'qfs_user'@'%';
-GRANT SELECT, INSERT, UPDATE, DELETE ON RFQ_LOG.qt_configurations        TO 'qfs_user'@'%';
-GRANT SELECT, INSERT, UPDATE         ON RFQ_LOG.qt_client_schema_state   TO 'qfs_user'@'%';
-GRANT SELECT, INSERT, UPDATE         ON RFQ_LOG.qt_vendor_partnumber_seen TO 'qfs_user'@'%';
+-- Configurations
+INDEX local_configurations(pricelist_id)
+INDEX local_configurations(warehouse_pricelist_id)
+INDEX local_configurations(competitor_pricelist_id)
+INDEX local_configurations(project_uuid, line_no)  -- project ordering (Line column)
+UNIQUE INDEX local_configurations(uuid)
+```
+
+---
+
+### `items` JSON Structure in Configurations
+
+```json
+{
+  "items": [
+    {
+      "lot_name": "CPU_AMD_9654",
+      "quantity": 2,
+      "unit_price": 123456.78,
+      "section": "Processors"
+    }
+  ]
+}
+```
+
+Prices are stored inside the `items` JSON field and refreshed from the pricelist on configuration refresh.
+
+---
+
+## MariaDB (server-side, sync-only)
+
+Database: `RFQ_LOG`
+
+### Tables and Permissions
+
+| Table | Purpose | Permissions |
+|-------|---------|-------------|
+| `lot` | Component catalog | SELECT |
+| `qt_lot_metadata` | Extended component data | SELECT |
+| `qt_categories` | Component categories | SELECT |
+| `qt_pricelists` | Pricelists | SELECT |
+| `qt_pricelist_items` | Pricelist line items | SELECT |
+| `lot_partnumbers` | Partnumber → lot mapping (pricelist enrichment) | SELECT |
+| `stock_log` | Latest stock qty by partnumber (pricelist enrichment) | SELECT |
+| `qt_configurations` | Saved configurations (includes `line_no`) | SELECT, INSERT, UPDATE |
+| `lot_partnumbers` | Partnumber → lot mapping (pricelist enrichment) | SELECT |
+| `stock_log` | Latest stock qty by partnumber (pricelist enrichment) | SELECT |
+| `qt_projects` | Projects | SELECT, INSERT, UPDATE |
+| `qt_client_local_migrations` | Migration catalog | SELECT only |
+| `qt_client_schema_state` | Applied migrations state | SELECT, INSERT, UPDATE |
+| `qt_pricelist_sync_status` | Pricelist sync status | SELECT, INSERT, UPDATE |
+| `qt_partnumber_books` | Partnumber book snapshots (written by PriceForge) | SELECT |
+| `qt_partnumber_book_items` | PN→LOT mapping rows (written by PriceForge) | SELECT |
+| `qt_vendor_partnumber_seen` | Vendor PN tracking for unresolved/ignored BOM rows (`is_ignored`) | INSERT, UPDATE |
+
+### Grant Permissions to Existing User
+
+```sql
+GRANT SELECT ON RFQ_LOG.lot TO '<DB_USER>'@'%';
+GRANT SELECT ON RFQ_LOG.qt_lot_metadata TO '<DB_USER>'@'%';
+GRANT SELECT ON RFQ_LOG.qt_categories TO '<DB_USER>'@'%';
+GRANT SELECT ON RFQ_LOG.qt_pricelists TO '<DB_USER>'@'%';
+GRANT SELECT ON RFQ_LOG.qt_pricelist_items TO '<DB_USER>'@'%';
+GRANT SELECT ON RFQ_LOG.lot_partnumbers TO '<DB_USER>'@'%';
+GRANT SELECT ON RFQ_LOG.stock_log TO '<DB_USER>'@'%';
+
+GRANT SELECT, INSERT, UPDATE ON RFQ_LOG.qt_configurations TO '<DB_USER>'@'%';
+GRANT SELECT, INSERT, UPDATE ON RFQ_LOG.qt_projects TO '<DB_USER>'@'%';
+
+GRANT SELECT ON RFQ_LOG.qt_client_local_migrations TO '<DB_USER>'@'%';
+GRANT SELECT, INSERT, UPDATE ON RFQ_LOG.qt_client_schema_state TO '<DB_USER>'@'%';
+GRANT SELECT, INSERT, UPDATE ON RFQ_LOG.qt_pricelist_sync_status TO '<DB_USER>'@'%';
+
+GRANT SELECT ON RFQ_LOG.qt_partnumber_books TO '<DB_USER>'@'%';
+GRANT SELECT ON RFQ_LOG.qt_partnumber_book_items TO '<DB_USER>'@'%';
+GRANT INSERT, UPDATE ON RFQ_LOG.qt_vendor_partnumber_seen TO '<DB_USER>'@'%';
 
 FLUSH PRIVILEGES;
 ```
 
-Rules:
-- `qt_client_schema_state` requires INSERT + UPDATE for sync status tracking (uses `ON DUPLICATE KEY UPDATE`);
-- `qt_vendor_partnumber_seen` requires INSERT + UPDATE (vendor PN discovery during sync);
-- no DELETE is needed on sync/tracking tables — rows are never removed by the client;
-- `lot` SELECT is required for the connection validation probe in `/setup`;
-- the setup page shows `can_write: true` only when `qt_client_schema_state` INSERT succeeds.
+### Create a New User
+
+```sql
+CREATE USER IF NOT EXISTS 'quote_user'@'%' IDENTIFIED BY '<DB_PASSWORD>';
+
+GRANT SELECT ON RFQ_LOG.lot TO 'quote_user'@'%';
+GRANT SELECT ON RFQ_LOG.qt_lot_metadata TO 'quote_user'@'%';
+GRANT SELECT ON RFQ_LOG.qt_categories TO 'quote_user'@'%';
+GRANT SELECT ON RFQ_LOG.qt_pricelists TO 'quote_user'@'%';
+GRANT SELECT ON RFQ_LOG.qt_pricelist_items TO 'quote_user'@'%';
+GRANT SELECT ON RFQ_LOG.lot_partnumbers TO 'quote_user'@'%';
+GRANT SELECT ON RFQ_LOG.stock_log TO 'quote_user'@'%';
+GRANT SELECT, INSERT, UPDATE ON RFQ_LOG.qt_configurations TO 'quote_user'@'%';
+GRANT SELECT, INSERT, UPDATE ON RFQ_LOG.qt_projects TO 'quote_user'@'%';
+GRANT SELECT ON RFQ_LOG.qt_client_local_migrations TO 'quote_user'@'%';
+GRANT SELECT, INSERT, UPDATE ON RFQ_LOG.qt_client_schema_state TO 'quote_user'@'%';
+GRANT SELECT, INSERT, UPDATE ON RFQ_LOG.qt_pricelist_sync_status TO 'quote_user'@'%';
+GRANT SELECT ON RFQ_LOG.qt_partnumber_books TO 'quote_user'@'%';
+GRANT SELECT ON RFQ_LOG.qt_partnumber_book_items TO 'quote_user'@'%';
+GRANT INSERT, UPDATE ON RFQ_LOG.qt_vendor_partnumber_seen TO 'quote_user'@'%';
+
+FLUSH PRIVILEGES;
+SHOW GRANTS FOR 'quote_user'@'%';
+```
+
+**Note:** If pricelists sync but show `0` positions (or logs contain `enriching pricelist items with stock` + `SELECT denied`), verify `SELECT` on `lot_partnumbers` and `stock_log` in addition to `qt_pricelist_items`.
+
+**Note:** If you see `Access denied for user ...@'<ip>'`, check for conflicting user entries (user@localhost vs user@'%').
+
+---
 
 ## Migrations
 
-SQLite:
-- schema creation and additive changes go through GORM `AutoMigrate`;
-- data fixes, index repair, and one-off rewrites go through `runLocalMigrations`;
-- local migration state is tracked in `local_schema_migrations`.
+### SQLite Migrations (local) — три уровня, выполняются при каждом старте
 
-MariaDB:
-- SQL files live in `migrations/`;
-- they are applied by `go run ./cmd/qfs -migrate`.
+**1. GORM AutoMigrate** (`internal/localdb/localdb.go`) — первый и основной уровень.
+Список Go-моделей передаётся в `db.AutoMigrate(...)`. GORM создаёт отсутствующие таблицы и добавляет новые колонки. Колонки и таблицы **не удаляет**.
+→ Для добавления новой таблицы или колонки достаточно добавить модель/поле и включить модель в AutoMigrate.
+
+**2. `runLocalMigrations`** (`internal/localdb/migrations.go`) — второй уровень, для операций которые AutoMigrate не умеет: backfill данных, пересоздание таблиц, создание индексов.
+Каждая функция выполняется один раз — идемпотентность через запись `id` в `local_schema_migrations`.
+
+**3. Централизованные (server-side)** — третий уровень, при проверке готовности к синку.
+SQL-тексты хранятся в `qt_client_local_migrations` (MariaDB, пишет только PriceForge). Клиент читает, применяет к локальной SQLite, записывает в `local_remote_migrations_applied` + `qt_client_schema_state`.
+
+### MariaDB Migrations (server-side)
+
+- Stored in `migrations/` (SQL files)
+- Applied via `-migrate` flag
+- `min_app_version` — minimum app version required for the migration
+
+---
+
+## DB Debugging
+
+```bash
+# Inspect schema
+sqlite3 ~/.local/state/quoteforge/qfs.db ".schema local_components"
+sqlite3 ~/.local/state/quoteforge/qfs.db ".schema local_configurations"
+
+# Check pricelist item count
+sqlite3 ~/.local/state/quoteforge/qfs.db "SELECT COUNT(*) FROM local_pricelist_items"
+
+# Check pending sync queue
+sqlite3 ~/.local/state/quoteforge/qfs.db "SELECT COUNT(*) FROM pending_changes"
+```

bible-local/04-api.md

@@ -1,125 +1,163 @@
-# 04 - API
+# 04 — API and Web Routes
 
-## Public web routes
+## API Endpoints
 
-| Route | Purpose |
-| --- | --- |
-| `/` | configurator |
-| `/configs` | configuration list |
-| `/configs/:uuid/revisions` | revision history page |
-| `/projects` | project list |
-| `/projects/:uuid` | project detail |
-| `/pricelists` | pricelist list |
-| `/pricelists/:id` | pricelist detail |
-| `/partnumber-books` | partnumber book page |
-| `/setup` | DB setup page |
+### Setup
 
-## Setup and health
+| Method | Endpoint | Purpose |
+|--------|----------|---------|
+| GET | `/setup` | Initial setup page |
+| POST | `/setup` | Save connection settings |
+| POST | `/setup/test` | Test MariaDB connection |
+| GET | `/setup/status` | Setup status |
 
-| Method | Path | Purpose |
-| --- | --- | --- |
-| `GET` | `/health` | process health |
-| `GET` | `/setup` | setup page |
-| `POST` | `/setup` | save tested DB settings |
-| `POST` | `/setup/test` | test DB connection |
-| `GET` | `/setup/status` | setup status |
-| `GET` | `/api/db-status` | current DB/sync status |
-| `GET` | `/api/current-user` | local user identity |
-| `GET` | `/api/ping` | lightweight API ping |
+### Components
 
-`POST /api/restart` exists only in `debug` mode.
+| Method | Endpoint | Purpose |
+|--------|----------|---------|
+| GET | `/api/components` | List components (metadata only) |
+| GET | `/api/components/:lot_name` | Component by lot_name |
+| GET | `/api/categories` | List categories |
 
-## Reference data
+### Quote
 
-| Method | Path | Purpose |
-| --- | --- | --- |
-| `GET` | `/api/components` | list component metadata |
-| `GET` | `/api/components/:lot_name` | one component |
-| `GET` | `/api/categories` | list categories |
-| `GET` | `/api/pricelists` | list local pricelists |
-| `GET` | `/api/pricelists/latest` | latest pricelist by source |
-| `GET` | `/api/pricelists/:id` | pricelist header |
-| `GET` | `/api/pricelists/:id/items` | pricelist rows |
-| `GET` | `/api/pricelists/:id/lots` | lot names in a pricelist |
-| `GET` | `/api/partnumber-books` | local partnumber books |
-| `GET` | `/api/partnumber-books/:id` | book items by `server_id` |
+| Method | Endpoint | Purpose |
+|--------|----------|---------|
+| POST | `/api/quote/validate` | Validate line items |
+| POST | `/api/quote/calculate` | Calculate quote (prices from pricelist) |
+| POST | `/api/quote/price-levels` | Prices by level (estimate/warehouse/competitor) |
 
-## Quote and export
+### Pricelists (read-only)
 
-| Method | Path | Purpose |
-| --- | --- | --- |
-| `POST` | `/api/quote/validate` | validate config items |
-| `POST` | `/api/quote/calculate` | calculate quote totals |
-| `POST` | `/api/quote/price-levels` | resolve estimate/warehouse/competitor prices |
-| `POST` | `/api/export/csv` | export a single configuration |
-| `GET` | `/api/configs/:uuid/export` | export a stored configuration |
-| `GET` | `/api/projects/:uuid/export` | legacy project BOM export |
-| `POST` | `/api/projects/:uuid/export` | pricing-tab project export |
+| Method | Endpoint | Purpose |
+|--------|----------|---------|
+| GET | `/api/pricelists` | List pricelists (`source`, `active_only`, pagination) |
+| GET | `/api/pricelists/latest` | Latest pricelist by source |
+| GET | `/api/pricelists/:id` | Pricelist by ID |
+| GET | `/api/pricelists/:id/items` | Pricelist line items |
+| GET | `/api/pricelists/:id/lots` | Lot names in pricelist |
 
-## Configurations
+`GET /api/pricelists?active_only=true` returns only pricelists that have synced items (`item_count > 0`).
 
-| Method | Path | Purpose |
-| --- | --- | --- |
-| `GET` | `/api/configs` | list configurations |
-| `POST` | `/api/configs/import` | import configurations from server |
-| `POST` | `/api/configs` | create configuration |
-| `POST` | `/api/configs/preview-article` | preview article |
-| `GET` | `/api/configs/:uuid` | get configuration |
-| `PUT` | `/api/configs/:uuid` | update configuration |
-| `DELETE` | `/api/configs/:uuid` | archive configuration |
-| `POST` | `/api/configs/:uuid/reactivate` | reactivate configuration |
-| `PATCH` | `/api/configs/:uuid/rename` | rename configuration |
-| `POST` | `/api/configs/:uuid/clone` | clone configuration |
-| `POST` | `/api/configs/:uuid/refresh-prices` | refresh prices |
-| `PATCH` | `/api/configs/:uuid/project` | move configuration to project |
-| `GET` | `/api/configs/:uuid/versions` | list revisions |
-| `GET` | `/api/configs/:uuid/versions/:version` | get one revision |
-| `POST` | `/api/configs/:uuid/rollback` | rollback by creating a new head revision |
-| `PATCH` | `/api/configs/:uuid/server-count` | update server count |
-| `GET` | `/api/configs/:uuid/vendor-spec` | read vendor BOM |
-| `PUT` | `/api/configs/:uuid/vendor-spec` | replace vendor BOM |
-| `POST` | `/api/configs/:uuid/vendor-spec/resolve` | resolve PN -> LOT |
-| `POST` | `/api/configs/:uuid/vendor-spec/apply` | apply BOM to cart |
+### Configurations
 
-## Projects
+| Method | Endpoint | Purpose |
+|--------|----------|---------|
+| GET | `/api/configs` | List configurations |
+| POST | `/api/configs` | Create configuration |
+| GET | `/api/configs/:uuid` | Get configuration |
+| PUT | `/api/configs/:uuid` | Update configuration |
+| DELETE | `/api/configs/:uuid` | Archive configuration |
+| POST | `/api/configs/:uuid/refresh-prices` | Refresh prices from pricelist |
+| POST | `/api/configs/:uuid/clone` | Clone configuration |
+| POST | `/api/configs/:uuid/reactivate` | Restore archived configuration |
+| POST | `/api/configs/:uuid/rename` | Rename configuration |
+| POST | `/api/configs/preview-article` | Preview generated article for a configuration |
+| POST | `/api/configs/:uuid/rollback` | Roll back to a version |
+| GET | `/api/configs/:uuid/versions` | List versions |
+| GET | `/api/configs/:uuid/versions/:version` | Get specific version |
 
-| Method | Path | Purpose |
-| --- | --- | --- |
-| `GET` | `/api/projects` | paginated project list |
-| `GET` | `/api/projects/all` | lightweight list for dropdowns |
-| `POST` | `/api/projects` | create project |
-| `GET` | `/api/projects/:uuid` | get project |
-| `PUT` | `/api/projects/:uuid` | update project |
-| `POST` | `/api/projects/:uuid/archive` | archive project |
-| `POST` | `/api/projects/:uuid/reactivate` | reactivate project |
-| `DELETE` | `/api/projects/:uuid` | delete project variant only |
-| `GET` | `/api/projects/:uuid/configs` | list project configurations |
-| `PATCH` | `/api/projects/:uuid/configs/reorder` | persist line order |
-| `POST` | `/api/projects/:uuid/configs` | create configuration inside project |
-| `POST` | `/api/projects/:uuid/configs/:config_uuid/clone` | clone config into project |
-| `POST` | `/api/projects/:uuid/vendor-import` | import CFXML workspace into project |
+`line` field in configuration payloads is backed by persistent `line_no` in DB.
 
-Vendor import contract:
-- multipart field name is `file`;
-- file limit is `1 GiB`;
-- oversized payloads are rejected before XML parsing.
+### Projects
 
-## Sync
+| Method | Endpoint | Purpose |
+|--------|----------|---------|
+| GET | `/api/projects` | List projects |
+| POST | `/api/projects` | Create project |
+| GET | `/api/projects/:uuid` | Get project |
+| PUT | `/api/projects/:uuid` | Update project |
+| DELETE | `/api/projects/:uuid` | Archive project variant (soft-delete via `is_active=false`; fails if project has no `variant` set — main projects cannot be deleted this way) |
+| GET | `/api/projects/:uuid/configs` | Project configurations |
+| PATCH | `/api/projects/:uuid/configs/reorder` | Reorder active project configurations (`ordered_uuids`) and persist `line_no` |
 
-| Method | Path | Purpose |
-| --- | --- | --- |
-| `GET` | `/api/sync/status` | sync status |
-| `GET` | `/api/sync/readiness` | sync readiness |
-| `GET` | `/api/sync/info` | sync modal data |
-| `GET` | `/api/sync/users-status` | remote user status |
-| `GET` | `/api/sync/pending/count` | pending queue count |
-| `GET` | `/api/sync/pending` | pending queue rows |
-| `POST` | `/api/sync/components` | pull components |
-| `POST` | `/api/sync/pricelists` | pull pricelists |
-| `POST` | `/api/sync/partnumber-books` | pull partnumber books |
-| `POST` | `/api/sync/partnumber-seen` | report unresolved vendor PN |
-| `POST` | `/api/sync/all` | push and pull full sync |
-| `POST` | `/api/sync/push` | push pending changes |
-| `POST` | `/api/sync/repair` | repair broken pending rows |
+`GET /api/projects/:uuid/configs` ordering:
+`line ASC`, then `created_at DESC`, then `id DESC`.
 
-When readiness is blocked, sync write endpoints return `423 Locked`.
+### Sync
+
+| Method | Endpoint | Purpose | Flow |
+|--------|----------|---------|------|
+| GET | `/api/sync/status` | Overall sync status | read-only |
+| GET | `/api/sync/readiness` | Preflight status (ready/blocked/unknown) | read-only |
+| GET | `/api/sync/info` | Data for sync modal | read-only |
+| GET | `/api/sync/users-status` | Users status | read-only |
+| GET | `/api/sync/pending` | List pending changes | read-only |
+| GET | `/api/sync/pending/count` | Count of pending changes | read-only |
+| POST | `/api/sync/push` | Push pending → MariaDB | SQLite → MariaDB |
+| POST | `/api/sync/components` | Pull components | MariaDB → SQLite |
+| POST | `/api/sync/pricelists` | Pull pricelists | MariaDB → SQLite |
+| POST | `/api/sync/all` | Full sync: push + pull + import | bidirectional |
+| POST | `/api/sync/repair` | Repair broken entries in pending_changes | SQLite |
+| POST | `/api/sync/partnumber-seen` | Report unresolved/ignored vendor PNs for server-side tracking | QuoteForge → MariaDB |
+
+**If sync is blocked by the readiness guard:** all POST sync methods return `423 Locked` with `reason_code` and `reason_text`.
+
+### Vendor Spec (BOM)
+
+| Method | Endpoint | Purpose |
+|--------|----------|---------|
+| GET | `/api/configs/:uuid/vendor-spec` | Fetch stored vendor BOM |
+| PUT | `/api/configs/:uuid/vendor-spec` | Replace vendor BOM (full update) |
+| POST | `/api/configs/:uuid/vendor-spec/resolve` | Resolve PNs → LOTs (read-only) |
+| POST | `/api/configs/:uuid/vendor-spec/apply` | Apply resolved LOTs to cart |
+
+Notes:
+- `GET` / `PUT /api/configs/:uuid/vendor-spec` exchange normalized BOM rows (`vendor_spec`), not raw pasted Excel layout.
+- BOM row contract stores canonical LOT mapping list as seen in BOM UI:
+  - `lot_mappings[]`
+  - each mapping contains `lot_name` + `quantity_per_pn`
+- `POST /api/configs/:uuid/vendor-spec/apply` rebuilds cart items from explicit BOM mappings:
+  - all LOTs from `lot_mappings[]`
+
+### Partnumber Books (read-only)
+
+| Method | Endpoint | Purpose |
+|--------|----------|---------|
+| GET | `/api/partnumber-books` | List local book snapshots |
+| GET | `/api/partnumber-books/:id` | Items for a book by `server_id` |
+| POST | `/api/sync/partnumber-books` | Pull book snapshots from MariaDB |
+
+See [09-vendor-spec.md](09-vendor-spec.md) for schema and pull logic.
+See [09-vendor-spec.md](09-vendor-spec.md) for `vendor_spec` JSON schema and BOM UI mapping contract.
+
+### Export
+
+| Method | Endpoint | Purpose |
+|--------|----------|---------|
+| POST | `/api/export/csv` | Export configuration to CSV |
+
+**Export filename format:** `YYYY-MM-DD (ProjectCode) ConfigName Article.csv`
+(uses `project.Code`, not `project.Name`)
+
+---
+
+## Web Routes
+
+| Route | Page |
+|-------|------|
+| `/configs` | Configuration list |
+| `/configurator` | Configurator |
+| `/configs/:uuid/revisions` | Configuration revision history |
+| `/projects` | Project list |
+| `/projects/:uuid` | Project details |
+| `/pricelists` | Pricelist list |
+| `/pricelists/:id` | Pricelist details |
+| `/partnumber-books` | Partnumber books (active book summary + snapshot history) |
+| `/setup` | Connection settings |
+
+---
+
+## Rollback API (details)
+
+```bash
+POST /api/configs/:uuid/rollback
+Content-Type: application/json
+
+{
+  "target_version": 3,
+  "note": "optional comment"
+}
+```
+
+Response: updated configuration with the new version.

bible-local/05-config.md

@@ -1,74 +1,129 @@
-# 05 - Config
+# 05 — Configuration and Environment
 
-## Runtime files
+## File Paths
 
-| Artifact | Default location |
-| --- | --- |
-| `qfs.db` | OS-specific user state directory |
-| `config.yaml` | same state directory as `qfs.db` |
-| `local_encryption.key` | same state directory as `qfs.db` |
-| `backups/` | next to `qfs.db` unless overridden |
+### SQLite database (`qfs.db`)
 
-The runtime state directory can be overridden with `QFS_STATE_DIR`.
-Direct paths can be overridden with `QFS_DB_PATH` and `QFS_CONFIG_PATH`.
+| OS | Default path |
+|----|-------------|
+| macOS | `~/Library/Application Support/QuoteForge/qfs.db` |
+| Linux | `$XDG_STATE_HOME/quoteforge/qfs.db` or `~/.local/state/quoteforge/qfs.db` |
+| Windows | `%LOCALAPPDATA%\QuoteForge\qfs.db` |
 
-## Runtime config shape
+Override: `-localdb <path>` or `QFS_DB_PATH`.
 
-Runtime keeps `config.yaml` intentionally small:
+### config.yaml
+
+Searched in the same user-state directory as `qfs.db` by default.
+If the file does not exist, it is created automatically.
+If the format is outdated, it is automatically migrated to the runtime format (`server` + `logging` sections only).
+
+Override: `-config <path>` or `QFS_CONFIG_PATH`.
+
+**Important:** `config.yaml` is a runtime user file — it is **not stored in the repository**.
+`config.example.yaml` is the only config template in the repo.
+
+---
+
+## config.yaml Structure
 
 ```yaml
 server:
-  host: "127.0.0.1"
+  host: "0.0.0.0"
   port: 8080
-  mode: "release"
-  read_timeout: 30s
-  write_timeout: 30s
-
-backup:
-  time: "00:00"
+  mode: "release"   # release | debug
 
 logging:
-  level: "info"
-  format: "json"
-  output: "stdout"
+  level: "info"     # debug | info | warn | error
+  format: "json"    # json | text
+  output: "stdout"  # stdout | stderr | /path/to/file
+
+backup:
+  time: "00:00"     # HH:MM in local time
 ```
 
-Rules:
-- QuoteForge creates this file automatically if it does not exist;
-- startup rewrites legacy config files into this minimal runtime shape;
-- startup normalizes any `server.host` value to `127.0.0.1` before saving the runtime config;
-- `server.host` must stay on loopback.
+---
 
-Saved MariaDB credentials do not live in `config.yaml`.
-They are stored in SQLite and encrypted with `local_encryption.key` unless `QUOTEFORGE_ENCRYPTION_KEY` overrides the key material.
+## Environment Variables
 
-## Environment variables
+| Variable | Description | Default |
+|----------|-------------|---------|
+| `QFS_DB_PATH` | Full path to SQLite DB | OS-specific user state dir |
+| `QFS_STATE_DIR` | State directory (if `QFS_DB_PATH` is not set) | OS-specific user state dir |
+| `QFS_CONFIG_PATH` | Full path to `config.yaml` | OS-specific user state dir |
+| `QFS_BACKUP_DIR` | Root directory for rotating backups | `<db dir>/backups` |
+| `QFS_BACKUP_DISABLE` | Disable automatic backups | — |
+| `QF_DB_HOST` | MariaDB host | localhost |
+| `QF_DB_PORT` | MariaDB port | 3306 |
+| `QF_DB_NAME` | Database name | RFQ_LOG |
+| `QF_DB_USER` | DB user | — |
+| `QF_DB_PASSWORD` | DB password | — |
+| `QF_JWT_SECRET` | JWT secret | — |
+| `QF_SERVER_PORT` | HTTP server port | 8080 |
 
-| Variable | Purpose |
-| --- | --- |
-| `QFS_STATE_DIR` | override runtime state directory |
-| `QFS_DB_PATH` | explicit SQLite path |
-| `QFS_CONFIG_PATH` | explicit config path |
-| `QFS_BACKUP_DIR` | explicit backup root |
-| `QFS_BACKUP_DISABLE` | disable rotating backups |
-| `QUOTEFORGE_ENCRYPTION_KEY` | override encryption key |
-| `QF_SERVER_PORT` | override HTTP port |
+`QFS_BACKUP_DISABLE` accepts: `1`, `true`, `yes`.
 
-`QFS_BACKUP_DISABLE` accepts `1`, `true`, or `yes`.
+---
 
-## CLI flags
+## CLI Flags
 
-| Flag | Purpose |
-| --- | --- |
-| `-config <path>` | config file path |
-| `-localdb <path>` | SQLite path |
-| `-reset-localdb` | destructive local DB reset |
-| `-migrate` | apply server migrations and exit |
-| `-version` | print app version and exit |
+| Flag | Description |
+|------|-------------|
+| `-config <path>` | Path to config.yaml |
+| `-localdb <path>` | Path to SQLite DB |
+| `-reset-localdb` | Reset local DB (destructive!) |
+| `-migrate` | Apply pending migrations and exit |
+| `-version` | Print version and exit |
 
-## First run
+---
 
-1. runtime ensures `config.yaml` exists;
-2. runtime opens the local SQLite database;
-3. if no stored MariaDB credentials exist, `/setup` is served;
-4. after setup, runtime works locally and sync uses saved DB settings in the background.
+## Installation and First Run
+
+### Requirements
+- Go 1.22 or higher
+- MariaDB 11.x (or MySQL 8.x)
+- ~50 MB disk space
+
+### Steps
+
+```bash
+# 1. Clone the repository
+git clone <repo-url>
+cd quoteforge
+
+# 2. Apply migrations
+go run ./cmd/qfs -migrate
+
+# 3. Start
+go run ./cmd/qfs
+# or
+make run
+```
+
+Application is available at: http://localhost:8080
+
+On first run, `/setup` opens for configuring the MariaDB connection.
+
+### OPS Project Migrator
+
+Migrates quotes whose names start with `OPS-xxxx` (where `x` is a digit) into a project named `OPS-xxxx`.
+
+```bash
+# Preview first (always)
+go run ./cmd/migrate_ops_projects
+
+# Apply
+go run ./cmd/migrate_ops_projects -apply
+
+# Apply without interactive confirmation
+go run ./cmd/migrate_ops_projects -apply -yes
+```
+
+---
+
+## Docker
+
+```bash
+docker build -t quoteforge .
+docker-compose up -d
+```

bible-local/06-backup.md

@@ -1,55 +1,221 @@
-# 06 - Backup
+# 06 — Backup
 
-## Scope
+## Overview
 
-QuoteForge creates rotating local ZIP backups of:
-- a consistent SQLite snapshot saved as `qfs.db`;
-- `config.yaml` when present.
+Automatic rotating ZIP backup system for local data.
 
-The backup intentionally does not include `local_encryption.key`.
+**What is included in each archive:**
+- SQLite DB (`qfs.db`)
+- SQLite sidecars (`qfs.db-wal`, `qfs.db-shm`) if present
+- `config.yaml` if present
 
-## Location and naming
-
-Default root:
-- `<db dir>/backups`
-
-Subdirectories:
-- `daily/`
-- `weekly/`
-- `monthly/`
-- `yearly/`
-
-Archive name:
-- `qfs-backp-YYYY-MM-DD.zip`
-
-## Retention
+**Archive name format:** `qfs-backp-YYYY-MM-DD.zip`
 
+**Retention policy:**
 | Period | Keep |
-| --- | --- |
-| Daily | 7 |
-| Weekly | 4 |
-| Monthly | 12 |
-| Yearly | 10 |
+|--------|------|
+| Daily | 7 archives |
+| Weekly | 4 archives |
+| Monthly | 12 archives |
+| Yearly | 10 archives |
+
+**Directories:** `<backup root>/daily`, `/weekly`, `/monthly`, `/yearly`
+
+---
+
+## Configuration
+
+```yaml
+backup:
+  time: "00:00"   # Trigger time in local time (HH:MM format)
+```
+
+**Environment variables:**
+- `QFS_BACKUP_DIR` — backup root directory (default: `<db dir>/backups`)
+- `QFS_BACKUP_DISABLE` — disable backups (`1/true/yes`)
+
+---
 
 ## Behavior
 
-- on startup, QuoteForge creates a backup if the current period has none yet;
-- a daily scheduler creates the next backup at `backup.time`;
-- duplicate snapshots inside the same period are prevented by a period marker file;
-- old archives are pruned automatically.
+- **At startup:** if no backup exists for the current period, one is created immediately
+- **Daily:** at the configured time, a new backup is created
+- **Deduplication:** prevented via a `.period.json` marker file in each period directory
+- **Rotation:** excess old archives are deleted automatically
 
-## Safety rules
+---
 
-- backup root must be outside the git worktree;
-- backup creation is blocked if the resolved backup root sits inside the repository;
-- SQLite snapshot must be created from a consistent database copy, not by copying live WAL files directly;
-- restore to another machine requires re-entering DB credentials unless the encryption key is migrated separately.
+## Implementation
 
-## Restore
+Module: `internal/appstate/backup.go`
 
-1. stop QuoteForge;
-2. unpack the chosen archive outside the repository;
-3. replace `qfs.db`;
-4. replace `config.yaml` if needed;
-5. restart the app;
-6. re-enter MariaDB credentials if the original encryption key is unavailable.
+Main function:
+```go
+func EnsureRotatingLocalBackup(dbPath, configPath string) ([]string, error)
+```
+
+Scheduler (in `main.go`):
+```go
+func startBackupScheduler(ctx context.Context, cfg *config.Config, dbPath, configPath string)
+```
+
+### Config struct
+
+```go
+type BackupConfig struct {
+    Time string `yaml:"time"`
+}
+// Default: "00:00"
+```
+
+---
+
+## Implementation Notes
+
+- `backup.time` is in **local time** without timezone offset parsing
+- `.period.json` is the marker that prevents duplicate backups within the same period
+- Archive filenames contain only the date; uniqueness is ensured by per-period directories + the period marker
+- When changing naming or retention: update both the filename logic and the prune logic together
+
+---
+
+## Full Listing: `internal/appstate/backup.go`
+
+```go
+package appstate
+
+import (
+    "archive/zip"
+    "encoding/json"
+    "fmt"
+    "io"
+    "os"
+    "path/filepath"
+    "sort"
+    "strings"
+    "time"
+)
+
+type backupPeriod struct {
+    name      string
+    retention int
+    key       func(time.Time) string
+    date      func(time.Time) string
+}
+
+var backupPeriods = []backupPeriod{
+    {
+        name:      "daily",
+        retention: 7,
+        key:  func(t time.Time) string { return t.Format("2006-01-02") },
+        date: func(t time.Time) string { return t.Format("2006-01-02") },
+    },
+    {
+        name:      "weekly",
+        retention: 4,
+        key: func(t time.Time) string {
+            y, w := t.ISOWeek()
+            return fmt.Sprintf("%04d-W%02d", y, w)
+        },
+        date: func(t time.Time) string { return t.Format("2006-01-02") },
+    },
+    {
+        name:      "monthly",
+        retention: 12,
+        key:  func(t time.Time) string { return t.Format("2006-01") },
+        date: func(t time.Time) string { return t.Format("2006-01-02") },
+    },
+    {
+        name:      "yearly",
+        retention: 10,
+        key:  func(t time.Time) string { return t.Format("2006") },
+        date: func(t time.Time) string { return t.Format("2006-01-02") },
+    },
+}
+
+func EnsureRotatingLocalBackup(dbPath, configPath string) ([]string, error) {
+    if isBackupDisabled() || dbPath == "" {
+        return nil, nil
+    }
+    if _, err := os.Stat(dbPath); os.IsNotExist(err) {
+        return nil, nil
+    }
+    root := resolveBackupRoot(dbPath)
+    now := time.Now()
+    created := make([]string, 0)
+    for _, period := range backupPeriods {
+        newFiles, err := ensurePeriodBackup(root, period, now, dbPath, configPath)
+        if err != nil {
+            return created, err
+        }
+        created = append(created, newFiles...)
+    }
+    return created, nil
+}
+```
+
+---
+
+## Full Listing: Scheduler Hook (`main.go`)
+
+```go
+func startBackupScheduler(ctx context.Context, cfg *config.Config, dbPath, configPath string) {
+    if cfg == nil {
+        return
+    }
+    hour, minute, err := parseBackupTime(cfg.Backup.Time)
+    if err != nil {
+        slog.Warn("invalid backup time; using 00:00", "value", cfg.Backup.Time, "error", err)
+        hour, minute = 0, 0
+    }
+
+    // Startup check: create backup immediately if none exists for current periods
+    if created, backupErr := appstate.EnsureRotatingLocalBackup(dbPath, configPath); backupErr != nil {
+        slog.Error("local backup failed", "error", backupErr)
+    } else {
+        for _, path := range created {
+            slog.Info("local backup completed", "archive", path)
+        }
+    }
+
+    for {
+        next := nextBackupTime(time.Now(), hour, minute)
+        timer := time.NewTimer(time.Until(next))
+        select {
+        case <-ctx.Done():
+            timer.Stop()
+            return
+        case <-timer.C:
+            start := time.Now()
+            created, backupErr := appstate.EnsureRotatingLocalBackup(dbPath, configPath)
+            duration := time.Since(start)
+            if backupErr != nil {
+                slog.Error("local backup failed", "error", backupErr, "duration", duration)
+            } else {
+                for _, path := range created {
+                    slog.Info("local backup completed", "archive", path, "duration", duration)
+                }
+            }
+        }
+    }
+}
+
+func parseBackupTime(value string) (int, int, error) {
+    if strings.TrimSpace(value) == "" {
+        return 0, 0, fmt.Errorf("empty backup time")
+    }
+    parsed, err := time.Parse("15:04", value)
+    if err != nil {
+        return 0, 0, err
+    }
+    return parsed.Hour(), parsed.Minute(), nil
+}
+
+func nextBackupTime(now time.Time, hour, minute int) time.Time {
+    target := time.Date(now.Year(), now.Month(), now.Day(), hour, minute, 0, 0, now.Location())
+    if !now.Before(target) {
+        target = target.Add(24 * time.Hour)
+    }
+    return target
+}
+```

bible-local/07-dev.md

@@ -1,35 +1,136 @@
-# 07 - Development
+# 07 — Development
 
-## Common commands
+## Commands
 
 ```bash
+# Run (dev)
 go run ./cmd/qfs
-go run ./cmd/qfs -migrate
-go run ./cmd/migrate_project_updated_at
+make run
+
+# Build
+make build-release        # Optimized build with version info
+CGO_ENABLED=0 go build -o bin/qfs ./cmd/qfs
+
+# Cross-platform build
+make build-all            # Linux, macOS, Windows
+make build-windows        # Windows only
+
+# Verification
+go build ./cmd/qfs        # Must compile without errors
+go vet ./...              # Linter
+
+# Tests
 go test ./...
-go vet ./...
-make build-release
-make install-hooks
+make test
+
+# Utilities
+make install-hooks        # Git hooks (block committing secrets)
+make clean                # Clean bin/
+make help                 # All available commands
 ```
 
+---
+
+## Code Style
+
+- **Formatting:** `gofmt` (mandatory)
+- **Logging:** `slog` only (structured logging to the binary's stdout/stderr). No `console.log` or any other logging in browser-side JS — the browser console is never used for diagnostics.
+- **Errors:** explicit wrapping with context (`fmt.Errorf("context: %w", err)`)
+- **Style:** no unnecessary abstractions; minimum code for the task
+
+---
+
 ## Guardrails
 
-- run `gofmt` before commit;
-- use `slog` for server logging;
-- keep runtime business logic SQLite-only;
-- limit MariaDB access to sync, setup, and migration tooling;
-- keep `config.yaml` out of git and use `config.example.yaml` only as a template;
-- update `bible-local/` in the same commit as architecture changes.
+### What Must Never Be Restored
 
-## Removed features that must not return
+The following components were **intentionally removed** and must not be brought back:
+- cron jobs
+- importer utility
+- admin pricing UI/API
+- alerts
+- stock import
 
-- admin pricing UI/API;
-- alerts and notification workflows;
-- stock import tooling;
-- cron jobs;
-- standalone importer utility.
+### Configuration Files
 
-## Release notes
+- `config.yaml` — runtime user file, **not stored in the repository**
+- `config.example.yaml` — the only config template in the repo
 
-Release history belongs under `releases/<version>/RELEASE_NOTES.md`.
-Do not keep temporary change summaries in the repository root.
+### Sync and Local-First
+
+- Any sync changes must preserve local-first behavior
+- Local CRUD must not be blocked when MariaDB is unavailable
+
+### Formats and UI
+
+- **CSV export:** filename must use **project code** (`project.Code`), not project name
+  Format: `YYYY-MM-DD (ProjectCode) ConfigName Article.csv`
+- **Breadcrumbs UI:** names longer than 16 characters must be truncated with an ellipsis
+
+### Architecture Documentation
+
+- **Every architectural decision must be recorded in `bible/`**
+- The corresponding Bible file must be updated **in the same commit** as the code change
+- On every user-requested commit, review and update the Bible in that same commit
+
+---
+
+## Common Tasks
+
+### Add a Field to Configuration
+
+1. Add the field to `LocalConfiguration` struct (`internal/models/`)
+2. Add GORM tags for the DB column
+3. Write a SQL migration (`migrations/`)
+4. Update `ConfigurationToLocal` / `LocalToConfiguration` converters
+5. Update API handlers and services
+
+### Add a Field to Component
+
+1. Add the field to `LocalComponent` struct (`internal/models/`)
+2. Update the SQL query in `SyncComponents()`
+3. Update the `componentRow` struct to match
+4. Update converter functions
+
+### Add a Pricelist Price Lookup
+
+```go
+// Modern pattern
+price, found := s.lookupPriceByPricelistID(pricelistID, lotName)
+if found && price > 0 {
+    // use price
+}
+```
+
+---
+
+## Known Gotchas
+
+1. **`CurrentPrice` removed from components** — any code using it will fail to compile
+2. **`HasPrice` filter removed** — `component.go ListComponents` no longer supports this filter
+3. **Quote calculation:** always offline-first (SQLite); online path is separate
+4. **Items JSON:** prices are stored in the `items` field of the configuration, not fetched from components
+5. **Migrations are additive:** already-applied migrations are skipped (checked by `id` in `local_schema_migrations`)
+6. **`SyncedAt` removed:** last component sync time is now in `app_settings` (key=`last_component_sync`)
+
+---
+
+## Debugging Price Issues
+
+**Problem: quote returns no prices**
+1. Check that `pricelist_id` is set on the configuration
+2. Check that pricelist items exist: `SELECT COUNT(*) FROM local_pricelist_items`
+3. Check `lookupPriceByPricelistID()` in `quote.go`
+4. Verify the correct source is used (estimate/warehouse/competitor)
+
+**Problem: component sync not working**
+1. Components sync as metadata only — no prices
+2. Prices come via a separate pricelist sync
+3. Check `SyncComponents()` and the MariaDB query
+
+**Problem: configuration refresh does not update prices**
+1. Refresh uses the latest estimate pricelist by default
+2. Latest resolution ignores pricelists without items (`EXISTS local_pricelist_items`)
+3. Old prices in `config.items` are preserved if a line item is not found in the pricelist
+4. To force a pricelist update: set `configuration.pricelist_id`
+5. In configurator, `Авто` must remain auto-mode (runtime resolved ID must not be persisted as explicit selection)

bible-local/09-vendor-spec.md

@@ -1,160 +1,364 @@
-# 09 - Vendor BOM
+# 09 — Vendor Spec (BOM Import)
 
-## Storage contract
+## Overview
 
-Vendor BOM is stored in `local_configurations.vendor_spec` and synced with `qt_configurations.vendor_spec`.
+The vendor spec feature allows importing a vendor BOM (Bill of Materials) into a configuration. It maps vendor part numbers (PN) to internal LOT names using an active partnumber book (snapshot pulled from PriceForge), then aggregates quantities to populate the Estimate (cart).
 
-Each row uses this canonical shape:
+---
+
+## Architecture
+
+### Storage
+
+| Data | Storage | Sync direction |
+|------|---------|---------------|
+| `vendor_spec` JSON | `local_configurations.vendor_spec` (TEXT, JSON-encoded) | Two-way via `pending_changes` |
+| Partnumber book snapshots | `local_partnumber_books` + `local_partnumber_book_items` | Pull-only from PriceForge |
+
+`vendor_spec` is a JSON array of `VendorSpecItem` objects stored inside the configuration row. It syncs to MariaDB `qt_configurations.vendor_spec` via the existing pending_changes mechanism.
+
+### `vendor_spec` JSON Schema
+
+```json
+[
+  {
+    "sort_order": 10,
+    "vendor_partnumber": "ABC-123",
+    "quantity": 2,
+    "description": "...",
+    "unit_price": 4500.00,
+    "total_price": 9000.00,
+    "lot_mappings": [
+      { "lot_name": "LOT_A", "quantity_per_pn": 1 },
+      { "lot_name": "LOT_B", "quantity_per_pn": 2 }
+    ]
+  }
+]
+```
+
+`lot_mappings[]` is the canonical persisted LOT mapping list for a BOM row.
+Each mapping entry stores:
+
+- `lot_name`
+- `quantity_per_pn` (how many units of this LOT are included in **one vendor PN**)
+
+### PN → LOT Mapping Contract (single LOT, multiplier, bundle)
+
+QuoteForge expects the server to return/store BOM rows (`vendor_spec`) using a single canonical mapping list:
+
+- `lot_mappings[]` contains **all** LOT mappings for the PN row (single LOT and bundle cases alike)
+- the list stores exactly what the user sees in BOM (LOT + "LOT в 1 PN")
+- the DB contract does **not** split mappings into "base LOT" vs "bundle LOTs"
+
+#### Final quantity contribution to Estimate
+
+For one BOM row with vendor PN quantity `pn_qty`:
+
+- each mapping contribution:
+  - `lot_qty = pn_qty * lot_mappings[i].quantity_per_pn`
+
+#### Example: one PN maps to multiple LOTs
 
 ```json
 {
-  "sort_order": 10,
-  "vendor_partnumber": "ABC-123",
-  "quantity": 2,
-  "description": "row description",
-  "unit_price": 4500.0,
-  "total_price": 9000.0,
+  "vendor_partnumber": "SYS-821GE-TNHR",
+  "quantity": 3,
   "lot_mappings": [
-    { "lot_name": "LOT_A", "quantity_per_pn": 1 }
+    { "lot_name": "CHASSIS_X13_8GPU", "quantity_per_pn": 1 },
+    { "lot_name": "PS_3000W_Titanium", "quantity_per_pn": 2 },
+    { "lot_name": "RAILKIT_X13", "quantity_per_pn": 1 }
   ]
 }
 ```
 
-Rules:
-- `lot_mappings[]` is the only persisted PN -> LOT mapping contract;
-- QuoteForge does not use legacy BOM tables;
-- apply flow rebuilds cart rows from `lot_mappings[]`.
+This row contributes to Estimate:
 
-## Partnumber books
+- `CHASSIS_X13_8GPU` → `3 * 1 = 3`
+- `PS_3000W_Titanium` → `3 * 2 = 6`
+- `RAILKIT_X13` → `3 * 1 = 3`
 
-Partnumber books are pull-only snapshots from PriceForge.
+---
 
-Local tables:
-- `local_partnumber_books`
-- `local_partnumber_book_items`
+## Partnumber Books (Snapshots)
 
-Server tables:
-- `qt_partnumber_books`
-- `qt_partnumber_book_items`
+Partnumber books are immutable versioned snapshots of the global PN→LOT mapping table, analogous to pricelists. PriceForge creates new snapshots; QuoteForge only pulls and reads them.
 
-Resolution flow:
-1. load the active local book;
-2. find `vendor_partnumber`;
-3. copy `lots_json` into `lot_mappings[]`;
-4. keep unresolved rows editable in the UI.
+### SQLite (local mirror)
 
-## CFXML import
+```sql
+CREATE TABLE local_partnumber_books (
+    id         INTEGER PRIMARY KEY AUTOINCREMENT,
+    server_id  INTEGER UNIQUE NOT NULL,   -- id from qt_partnumber_books
+    version    TEXT    NOT NULL,          -- format YYYY-MM-DD-NNN
+    created_at DATETIME NOT NULL,
+    is_active  INTEGER NOT NULL DEFAULT 1
+);
 
-`POST /api/projects/:uuid/vendor-import` imports one vendor workspace into an existing project.
-
-Rules:
-- accepted file field is `file`;
-- maximum file size is `1 GiB`;
-- one `ProprietaryGroupIdentifier` becomes one QuoteForge configuration;
-- software rows stay inside their hardware group and never become standalone configurations;
-- primary group row is selected structurally, without vendor-specific SKU hardcoding;
-- imported configuration order follows workspace order.
-
-Imported configuration fields:
-- `name` from primary row `ProductName`
-- `server_count` from primary row `Quantity`
-- `server_model` from primary row `ProductDescription`
-- `article` or `support_code` from `ProprietaryProductIdentifier`
-
-Imported BOM rows become `vendor_spec` rows and are resolved through the active local partnumber book when possible.
-
-## Inspur BOM import
-
-The same endpoint `POST /api/projects/:uuid/vendor-import` also accepts Inspur text BOM exports.
-
-Format: one component per line, `<partnumber>*<quantity>`. A leading `|` character is optional and stripped. Trailing whitespace around `*` is normalised.
-
-Example:
-```
-|CPU_AMD_9535-EPYC2.4_64C_256M_300W*1
-|PowerSupply_1300W_Titanium_220VACor240VDC_GaN*2
+CREATE TABLE local_partnumber_book_items (
+    id            INTEGER PRIMARY KEY AUTOINCREMENT,
+    book_id       INTEGER NOT NULL,      -- FK → local_partnumber_books.id
+    partnumber    TEXT    NOT NULL,
+    lot_name      TEXT    NOT NULL,
+    is_primary_pn INTEGER NOT NULL DEFAULT 0,
+    description   TEXT
+);
+CREATE INDEX idx_local_book_pn ON local_partnumber_book_items(book_id, partnumber);
 ```
 
-Rules:
-- the entire file becomes a single configuration (`server_count = 1`);
-- configuration `name` is derived from the uploaded filename (without extension);
-- lines that do not contain `*<digits>` are skipped;
-- no price data is present in the format; `unit_price` and `total_price` are left nil.
+**Active book query:** `WHERE is_active=1 ORDER BY created_at DESC, id DESC LIMIT 1`
 
-## Text BOM import
+**Schema creation:** GORM AutoMigrate (not `runLocalMigrations`).
 
-The same endpoint `POST /api/projects/:uuid/vendor-import` also accepts a human-readable Russian text BOM.
+### MariaDB (managed exclusively by PriceForge)
 
-Format: an optional header line ending with `, в составе:` followed by one component per line as
-`<description> - <quantity> шт.`. The separator may be a hyphen, en-dash, or em-dash; the space before
-`шт` is optional; a trailing `.` after `шт` is optional. Quantities are anchored to the end of the line,
-so hyphens, commas, and digits inside the description (e.g. `8-GPU-2304GB`, `RAID0,1,10`) are preserved.
+```sql
+CREATE TABLE qt_partnumber_books (
+    id         INT AUTO_INCREMENT PRIMARY KEY,
+    version    VARCHAR(50)  NOT NULL,
+    created_at DATETIME     NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    is_active  TINYINT(1)   NOT NULL DEFAULT 1
+);
 
-Example:
-```
-Вычислительный GPU сервер G5500V7, в составе:
-GPU-NVIDIA HGX B300 8-GPU-2304GB HBM3E - 1 шт.
-CPU Intel 6760P Xeon 2.2GHz 64C 320M 330W - 2 шт.
-Mem 128G DDR5-6400MHz ECC-RDIMM - 16 шт.
-NVIDIA twin port transceiver, 800Gbps, OSFP - 8шт.
+CREATE TABLE qt_partnumber_book_items (
+    id            INT AUTO_INCREMENT PRIMARY KEY,
+    book_id       INT          NOT NULL,
+    partnumber    VARCHAR(255) NOT NULL,
+    lot_name      VARCHAR(255) NOT NULL,
+    is_primary_pn TINYINT(1)   NOT NULL DEFAULT 0,
+    description   VARCHAR(10000) NULL,
+    INDEX idx_book_pn (book_id, partnumber),
+    FOREIGN KEY (book_id) REFERENCES qt_partnumber_books(id)
+);
+
+ALTER TABLE qt_configurations ADD COLUMN vendor_spec JSON NULL;
 ```
 
-Rules:
-- the entire file becomes a single configuration (`server_count = 1`);
-- the header (any line ending with `, в составе:`) supplies `server_model` and `name`; the model is the
-  last whitespace-separated token before the comma (so both `Сервер X3` and `Вычислительный GPU сервер X3`
-  resolve to `X3`);
-- without a header, `name` falls back to the uploaded filename (without extension) and `server_model` is empty;
-- each line is trimmed, so leading/trailing whitespace never enters `vendor_partnumber`;
-- the format carries no partnumbers — each line's description is stored as both `vendor_partnumber` and
-  `description`, so rows resolve through the active partnumber book when matched and otherwise stay
-  unresolved and editable in the UI;
-- lines that do not match `<description> - <quantity> шт.` are skipped;
-- no price data is present in the format; `unit_price` and `total_price` are left nil.
+QuoteForge has `SELECT` permission only on `qt_partnumber_books` and `qt_partnumber_book_items`. All writes are managed by PriceForge.
 
-## Nx BOM import (quantity-first)
-
-The same endpoint `POST /api/projects/:uuid/vendor-import` also accepts a quantity-first BOM
-where each item line begins with `<qty>x <description>`.
-
-Format: an optional header line ending with `, в составе:` followed by one component per line as
-`<qty>x <description>`. The `x` separator is case-insensitive; parentheses, commas, and hyphens
-inside the description are preserved as-is.
-
-Example:
-```
-Сервер G893-SD1-AAX3, в составе:
-1x 8U 2CPU 8GPU Server System (32x DDR5 DIMM Slots,8x 2.5" Hot-Swap Drive Bays, 4+4 3000W, 2x 10Gb/s RJ45, 2x IPMI RJ45)
-2x Intel Xeon 8570 (56 cores, 2.1GHz, 300MB, 350W)
-32x 64GB DDR5 ECC RDIMM
-1x GPU Nvidia HGX H200 141GB 8GPU
-3x 1.92TB NVMe PCIe SFF RI
-5x 7.68TB NVMe PCIe SFF RI
-8x 1-port 400G NDR OSFP CX7
-2x 2-port 100GbE QSFP56 CX6
-1x 2-port 10GbE RJ45
+**Grant (add to existing user setup):**
+```sql
+GRANT SELECT ON RFQ_LOG.qt_partnumber_books TO '<DB_USER>'@'%';
+GRANT SELECT ON RFQ_LOG.qt_partnumber_book_items TO '<DB_USER>'@'%';
 ```
 
-Rules:
-- the entire file becomes a single configuration (`server_count = 1`);
-- the header (any line ending with `, в составе:`) supplies `server_model` and `name`; the model is the
-  last whitespace-separated token before the comma;
-- without a header, `name` falls back to the uploaded filename (without extension) and `server_model` is empty;
-- the format carries no partnumbers — each line's description is stored as both `vendor_partnumber` and
-  `description`, so rows resolve through the active partnumber book when matched and otherwise stay
-  unresolved and editable in the UI;
-- lines that do not match `<qty>x <description>` are skipped;
-- no price data is present in the format; `unit_price` and `total_price` are left nil;
-- detection runs before Text BOM in the format switch (Inspur → Nx → Text).
+### `is_primary_pn` semantics
 
-## Pasted BOM text parsing
+- `1` = primary PN for this `lot_name`. Its quantity in the vendor BOM determines `qty(LOT)`.
+- `0` = non-primary (trigger) PN. If no primary PN for the LOT is found in BOM, contributes `qty=1`.
 
-`POST /api/vendor-spec/parse-text` is a stateless endpoint that parses pasted single-column text BOM
-(Inspur and Russian text BOM) into rows. Request body: `{"text": "..."}`. Response:
-`{"rows": [{vendor_partnumber, quantity, description}], "format": "Inspur"|"Text"|""}`.
+---
 
-This shares the exact detectors and parsers used by the file-import path
-(`ParsePastedBOMText` → `IsInspurBOM`/`parseInspurBOM`, `IsNxBOM`/`parseNxBOM`, `IsTextBOM`/`parseTextBOM`),
-so paste and upload behave identically — there is no second parser in the frontend. The configurator's BOM
-paste box calls this endpoint; an empty `rows` result (or any payload containing tabs, i.e. a real
-spreadsheet table) falls back to the manual column-mapping grid.
+## Resolution Algorithm (3-step)
+
+For each `vendor_partnumber` in the BOM, QuoteForge builds/updates UI-visible LOT mappings:
+
+1. **Active book lookup** — query `local_partnumber_book_items WHERE book_id = activeBook.id AND partnumber = ?`.
+2. **Populate BOM UI** — if a match exists, BOM row shows a LOT value (user can still edit it).
+3. **Unresolved** — red row + inline LOT input with strict autocomplete.
+
+Persistence note: the application stores the final user-visible mappings in `lot_mappings[]` (not separate "resolved/manual" persisted fields).
+
+---
+
+## Qty Aggregation Logic
+
+After resolution, qty per LOT is computed as:
+
+```
+qty(lot) = SUM(quantity of rows where is_primary_pn=1 AND resolved_lot=lot)
+           if at least one primary PN for this lot was found in BOM
+         = 1
+           if only non-primary PNs for this lot were found
+```
+
+Examples (book: LOT_A → x1[primary], x2, x3):
+- BOM: x2×1, x3×2 → 1×LOT_A (no primary PN)
+- BOM: x1×2, x2×1 → 2×LOT_A (primary qty=2)
+- BOM: x1×1, x2×3 → 1×LOT_A (primary qty=1)
+
+---
+
+## UI: Three Top-Level Tabs
+
+The configurator (`/configurator`) has three tabs:
+
+1. **Estimate** — existing cart/component configurator (unchanged).
+2. **BOM** — paste/import vendor BOM, manual column mapping, LOT matching, bundle decomposition (`1 PN -> multiple LOTs`), "Пересчитать эстимейт", "Очистить".
+3. **Ценообразование** — pricing summary table + custom price input.
+
+BOM data is shared between tabs 2 and 3.
+
+### BOM Import UI (raw table, manual column mapping)
+
+After paste (`Ctrl+V`) QuoteForge renders an editable raw table (not auto-detected parsing).
+
+- The pasted rows are shown **as-is** (including header rows, if present).
+- The user selects a type for each column manually:
+  - `P/N`
+  - `Кол-во`
+  - `Цена`
+  - `Описание`
+  - `Не использовать`
+- Required mapping:
+  - exactly one `P/N`
+  - exactly one `Кол-во`
+- Optional mapping:
+  - `Цена` (0..1)
+  - `Описание` (0..1)
+- Rows can be:
+  - ignored (UI-only, excluded from `vendor_spec`)
+  - deleted
+- Raw cells are editable inline after paste.
+
+Notes:
+- There is **no auto column detection**.
+- There is **no auto header-row skip**.
+- Raw import layout itself is not stored on server; only normalized `vendor_spec` is stored.
+
+### LOT matching in BOM table
+
+The BOM table adds service columns on the right:
+
+- `LOT`
+- `LOT в 1 PN`
+- actions (`+`, ignore, delete)
+
+`LOT` behavior:
+- The first LOT row shown in the BOM UI is the primary LOT mapping for the PN row.
+- Additional LOT rows are added via the `+` action.
+- inline LOT input is strict:
+  - autocomplete source = full local components list (`/api/components?per_page=5000`)
+  - free text that does not match an existing LOT is rejected
+
+`LOT в 1 PN` behavior:
+- quantity multiplier for each visible LOT row in BOM (`quantity_per_pn` in persisted `lot_mappings[]`)
+- default = `1`
+- editable inline
+
+### Bundle mode (`1 PN -> multiple LOTs`)
+
+The `+` action in BOM rows adds an extra LOT mapping row for the same vendor PN row.
+
+- All visible LOT rows (first + added rows) are persisted uniformly in `lot_mappings[]`
+- Each mapping row has:
+  - LOT
+  - qty (`LOT in 1 PN` = `quantity_per_pn`)
+
+### BOM restore on config open
+
+On config open, QuoteForge loads `vendor_spec` from server and reconstructs the editable BOM table in normalized form:
+
+- columns restored as: `Qty | P/N | Description | Price`
+- column mapping restored as:
+  - `qty`, `pn`, `description`, `price`
+- LOT / `LOT в 1 PN` rows are restored from `vendor_spec.lot_mappings[]`
+
+This restores the BOM editing state, but not the original raw Excel layout (extra columns, ignored rows, original headers).
+
+### Pricing Tab: column order
+
+```
+LOT | PN вендора | Описание | Кол-во | Estimate | Цена вендора | Склад | Конк.
+```
+
+**If BOM is empty** — the pricing tab still renders, using cart items as rows (PN вендора = "—", Цена вендора = "—").
+
+**Description source priority:** BOM row description → LOT description from `local_components`.
+
+### Pricing Tab: BOM + Estimate merge behavior
+
+When BOM exists, the pricing tab renders:
+
+- BOM-based rows (including rows resolved via manual LOT and bundle mappings)
+- plus **Estimate-only LOTs** (rows currently in cart but not covered by BOM mappings)
+
+Estimate-only rows are shown as separate rows with:
+- `PN вендора = "—"`
+- vendor price = `—`
+- description from local components
+
+### Pricing Tab: "Своя цена" input
+
+- Manual entry → proportionally redistributes custom price into "Цена вендора" cells (proportional to each row's Estimate share). Last row absorbs rounding remainder.
+- "Проставить цены BOM" button → restores per-row original BOM prices directly (no proportional redistribution). Sets "Своя цена" to their sum.
+- Both paths show "Скидка от Estimate: X%" info.
+- "Экспорт CSV" button → downloads `pricing_<uuid>.csv` with UTF-8 BOM, same column order as table, plus Итого row.
+
+---
+
+## API Endpoints
+
+| Method | URL | Description |
+|--------|-----|-------------|
+| GET | `/api/configs/:uuid/vendor-spec` | Fetch stored BOM |
+| PUT | `/api/configs/:uuid/vendor-spec` | Replace BOM (full update) |
+| POST | `/api/configs/:uuid/vendor-spec/resolve` | Resolve PNs → LOTs (no cart mutation) |
+| POST | `/api/configs/:uuid/vendor-spec/apply` | Apply resolved LOTs to cart |
+| GET | `/api/partnumber-books` | List local book snapshots |
+| GET | `/api/partnumber-books/:id` | Items for a book by server_id |
+| POST | `/api/sync/partnumber-books` | Pull book snapshots from MariaDB |
+| POST | `/api/sync/partnumber-seen` | Push unresolved PNs to `qt_vendor_partnumber_seen` on MariaDB |
+
+## Unresolved PN Tracking (`qt_vendor_partnumber_seen`)
+
+After each `resolveBOM()` call, QuoteForge pushes PN rows to `POST /api/sync/partnumber-seen` (fire-and-forget from JS — errors silently ignored):
+
+- unresolved BOM rows (`ignored = false`)
+- raw BOM rows explicitly marked as ignored in UI (`ignored = true`) — these rows are **not** saved to `vendor_spec`, but are reported for server-side tracking
+
+The handler calls `sync.PushPartnumberSeen()` which upserts into `qt_vendor_partnumber_seen`:
+
+```sql
+INSERT INTO qt_vendor_partnumber_seen (source_type, vendor, partnumber, description, is_ignored, last_seen_at)
+VALUES ('manual', '', ?, ?, ?, NOW())
+ON DUPLICATE KEY UPDATE
+    last_seen_at = VALUES(last_seen_at),
+    is_ignored   = VALUES(is_ignored),
+    description  = COALESCE(NULLIF(VALUES(description), ''), description)
+```
+
+Uniqueness key: `partnumber` only (after PriceForge migration 025). PriceForge uses this table for populating the partnumber book.
+
+## BOM Persistence
+
+- `vendor_spec` is saved to server via `PUT /api/configs/:uuid/vendor-spec`.
+- `GET` / `PUT` `vendor_spec` must preserve row-level mapping fields used by the UI:
+  - `lot_mappings[]`
+  - each item: `lot_name`, `quantity_per_pn`
+- `description` is persisted in each BOM row and is used by the Pricing tab when available.
+- Ignored raw rows are **not** persisted into `vendor_spec`.
+- The PUT handler explicitly marshals `VendorSpec` to JSON string before passing to GORM `Update` (GORM does not reliably call `driver.Valuer` for custom types in `Update(column, value)`).
+- BOM is autosaved (debounced) after BOM-changing actions, including:
+  - `resolveBOM()`
+  - LOT row qty (`LOT в 1 PN`) changes
+  - LOT row add/remove (`+` / delete in bundle context)
+- "Сохранить BOM" button triggers explicit save.
+
+## Pricing Tab: Estimate Price Source
+
+`renderPricingTab()` is async. It calls `POST /api/quote/price-levels` with LOTs collected from:
+
+- `lot_mappings[]` from BOM rows
+- current Estimate/cart LOTs not covered by BOM mappings (to show estimate-only rows)
+
+This ensures Estimate prices appear for:
+
+- manually matched LOTs in the BOM tab
+- bundle LOTs
+- LOTs already present in Estimate but not mapped from BOM
+
+### Apply to Estimate (`Пересчитать эстимейт`)
+
+When applying BOM to Estimate, QuoteForge builds cart rows from explicit UI mappings stored in `lot_mappings[]`.
+
+For a BOM row with PN qty = `Q`:
+
+- each mapped LOT contributes `Q * quantity_per_pn`
+
+Rows without any valid LOT mapping are skipped.
+
+## Web Route
+
+| Route | Page |
+|-------|------|
+| `/partnumber-books` | Partnumber books — active book summary (unique LOTs, total PN, primary PN count), searchable items table, collapsible snapshot history |

bible-local/10-agent-api-guide.md

@@ -1,563 +0,0 @@
-# 10 - Agent API Guide: Pricing Servers from a TZ
-
-This guide is written for an AI agent that needs to price a server configuration
-(техническое задание, ТЗ) using the QuoteForge HTTP API.
-
-## Runtime assumptions
-
-- QuoteForge runs locally, binds to `127.0.0.1:8080` by default.
-- No authentication is required — the app is single-user, loopback-only.
-- All responses are JSON. All request bodies are JSON unless stated otherwise.
-- The port can be overridden with the `QF_SERVER_PORT` environment variable.
-
-Base URL for all examples: `http://127.0.0.1:8080`
-
----
-
-## Configuration composition rules
-
-These rules are mandatory and must be respected before saving any configuration.
-
-### 1. Every configuration must belong to a project
-
-Configurations cannot be created in isolation. The correct sequence is:
-
-1. Create a project (`POST /api/projects`) and save the returned `uuid`.
-2. Create the configuration inside that project by passing `project_uuid` in the
-   config body, or by using `POST /api/projects/:uuid/configs`.
-
-If the project for a given TZ already exists, retrieve its `uuid` first:
-```
-GET /api/projects?page=1&per_page=100
-```
-then pass the matching `uuid` in `project_uuid`.
-
-### 2. Every server configuration must contain all four required component groups
-
-A configuration is not valid for pricing unless items from all four of the
-following category groups are present:
-
-| Category code | Meaning          | Notes                                             |
-|---------------|------------------|---------------------------------------------------|
-| `MB`          | Motherboard      | exactly one MB per configuration                  |
-| `CPU`         | Processor        | one or more CPUs                                  |
-| `MEM`         | Memory / RAM     | one or more memory modules                        |
-| `PS` / `PSU`  | Power supply     | `PSU` is the current code; `PS` is legacy — both are accepted |
-
-Before saving, verify the assembled BOM with `POST /api/quote/validate`:
-the response `errors` array will contain `"Component not found: …"` entries
-for unknown lot names, and `warnings` will list lots without a price.
-Reject the configuration and report back to the user if any of the four
-required categories is missing.
-
-### 3. Category codes to use when searching
-
-Use `category=<code>` in `GET /api/components` to narrow results:
-
-```
-GET /api/components?category=MB&search=X13&has_price=true
-GET /api/components?category=CPU&search=Xeon+Gold&has_price=true
-GET /api/components?category=MEM&search=32GB+DDR5&has_price=true
-GET /api/components?category=PSU&search=800W&has_price=true
-```
-
-Retrieve the full list of active categories at any time:
-```
-GET /api/categories
-```
-
----
-
-## Typical workflow for pricing a server
-
-```
-1.  Check the app is up                 GET  /api/ping
-2.  Find or create a project            GET  /api/projects  →  POST /api/projects
-3.  Find the latest pricelist           GET  /api/pricelists/latest?source=estimate
-4.  Look up lot names for MB            GET  /api/components?category=MB&search=…
-5.  Look up lot names for CPU           GET  /api/components?category=CPU&search=…
-6.  Look up lot names for MEM           GET  /api/components?category=MEM&search=…
-7.  Look up lot names for PSU           GET  /api/components?category=PSU&search=…
-8.  (Repeat for other components)       GET  /api/components?category=…&search=…
-9.  Validate and calculate the quote    POST /api/quote/validate
-10. (Optional) Compare price tiers      POST /api/quote/price-levels
-11. Save configuration in the project   POST /api/projects/:uuid/configs
-```
-
----
-
-## Step 1 — Verify the app is running
-
-```
-GET /api/ping
-```
-
-Response `200 OK`:
-```json
-{"status": "ok"}
-```
-
----
-
-## Step 2 — Find or create a project
-
-Each TZ maps to one project. Use the TZ identifier as the `code` field.
-
-### Find an existing project
-
-```
-GET /api/projects?page=1&per_page=100
-```
-
-Response `200 OK`:
-```json
-{
-  "projects": [
-    {
-      "uuid": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee",
-      "code": "TZ-123",
-      "variant": "",
-      "name": "Проект по ТЗ №123",
-      "tracker_url": "",
-      "is_active": true,
-      "created_at": "2026-06-01T00:00:00Z"
-    }
-  ],
-  "total": 1,
-  "page": 1,
-  "per_page": 100
-}
-```
-
-### Create a new project
-
-```
-POST /api/projects
-Content-Type: application/json
-```
-
-Request body:
-```json
-{
-  "code": "TZ-123",
-  "name": "Проект по ТЗ №123",
-  "tracker_url": ""
-}
-```
-
-Fields:
-
-| field         | type   | required | description                                                        |
-|---------------|--------|----------|--------------------------------------------------------------------|
-| `code`        | string | yes      | short identifier, unique per variant; use the TZ number or ticket  |
-| `variant`     | string | no       | variant label within the same `code`; default is empty string      |
-| `name`        | string | no       | human-readable title                                               |
-| `tracker_url` | string | no       | link to a ticket or issue tracker                                  |
-
-Response `201 Created`:
-```json
-{
-  "uuid": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee",
-  "code": "TZ-123",
-  "variant": "",
-  "name": "Проект по ТЗ №123",
-  "is_active": true,
-  "created_at": "2026-06-11T10:00:00Z"
-}
-```
-
-Save the `uuid` — it is required to create configurations inside this project.
-
----
-
-## Step 3 — Find the latest pricelist
-
-QuoteForge maintains three pricing tiers. The `source` values are:
-
-| source       | meaning                     |
-|--------------|-----------------------------|
-| `estimate`   | list / catalogue price      |
-| `warehouse`  | stock price (purchase cost) |
-| `competitor` | competitor reference price  |
-
-```
-GET /api/pricelists/latest?source=estimate
-```
-
-Response `200 OK`:
-```json
-{
-  "id": 42,
-  "source": "estimate",
-  "version": "2026-05-28",
-  "item_count": 12500,
-  "is_active": true,
-  "created_at": "2026-05-28T06:00:00Z"
-}
-```
-
-The `id` field is a numeric pricelist identifier. Pass it as `pricelist_id`
-when calculating a quote to pin pricing to a specific pricelist.
-
-To list all available pricelists:
-```
-GET /api/pricelists?source=estimate&active_only=true
-```
-
----
-
-## Steps 4–8 — Look up component lot names
-
-Each component is identified by a `lot_name` (internal SKU). The TZ typically
-contains model names or descriptions; use the search endpoint to resolve them.
-
-```
-GET /api/components?search=Xeon+Gold+6342&category=CPU&has_price=true&page=1&per_page=20
-```
-
-Query parameters:
-
-| parameter        | default | description                                       |
-|------------------|---------|---------------------------------------------------|
-| `search`         | —       | free-text search in lot name and description      |
-| `category`       | —       | filter by category code (`MB`, `CPU`, `MEM`, `PSU`, …) |
-| `has_price`      | false   | return only components that have a price          |
-| `include_hidden` | false   | include hidden/retired components                 |
-| `page`           | 1       | page number                                       |
-| `per_page`       | 20      | page size                                         |
-
-Response `200 OK`:
-```json
-{
-  "components": [
-    {
-      "lot_name": "CPU-XEON-6342",
-      "description": "Intel Xeon Gold 6342, 24C/48T, 2.8 GHz, LGA4189",
-      "category": "CPU",
-      "category_name": "CPU",
-      "model": "Xeon Gold 6342"
-    }
-  ],
-  "total": 1,
-  "page": 1,
-  "per_page": 20
-}
-```
-
-To look up a single component by exact lot name:
-```
-GET /api/components/CPU-XEON-6342
-```
-
-To list all known categories:
-```
-GET /api/categories
-```
-
----
-
-## Step 9 — Validate and calculate the quote
-
-Before saving, validate the assembled BOM. This catches unknown lot names and
-missing prices, and also confirms that all required categories are covered.
-
-```
-POST /api/quote/validate
-Content-Type: application/json
-```
-
-Request body:
-```json
-{
-  "items": [
-    {"lot_name": "MB-X13DAI-N",        "quantity": 1},
-    {"lot_name": "CPU-XEON-6342",       "quantity": 2},
-    {"lot_name": "RAM-32GB-DDR4-3200",  "quantity": 8},
-    {"lot_name": "SSD-480GB-SATA",      "quantity": 2},
-    {"lot_name": "PSU-800W-TITANIUM",   "quantity": 2}
-  ],
-  "pricelist_id": 42
-}
-```
-
-Response `200 OK`:
-```json
-{
-  "valid": true,
-  "items": [
-    {
-      "lot_name": "MB-X13DAI-N",
-      "quantity": 1,
-      "unit_price": 95000.00,
-      "total_price": 95000.00,
-      "description": "Supermicro X13DAi-N dual-socket server board",
-      "category": "MB",
-      "has_price": true
-    },
-    {
-      "lot_name": "CPU-XEON-6342",
-      "quantity": 2,
-      "unit_price": 87500.00,
-      "total_price": 175000.00,
-      "description": "Intel Xeon Gold 6342, 24C/48T, 2.8 GHz",
-      "category": "CPU",
-      "has_price": true
-    },
-    {
-      "lot_name": "RAM-32GB-DDR4-3200",
-      "quantity": 8,
-      "unit_price": 12000.00,
-      "total_price": 96000.00,
-      "description": "32 GB DDR4-3200 ECC RDIMM",
-      "category": "MEM",
-      "has_price": true
-    },
-    {
-      "lot_name": "PSU-800W-TITANIUM",
-      "quantity": 2,
-      "unit_price": 18500.00,
-      "total_price": 37000.00,
-      "description": "800W 80+ Titanium redundant PSU",
-      "category": "PSU",
-      "has_price": true
-    }
-  ],
-  "errors": [],
-  "warnings": [],
-  "total": 403000.00
-}
-```
-
-**Agent check after validation:**
-
-1. `valid` must be `true` — all lot names resolved.
-2. `errors` must be empty — no unknown components.
-3. The returned `items` array must contain at least one entry from each required
-   category: `MB`, `CPU`, `MEM`, and `PS` or `PSU`.
-4. Items with `has_price: false` are allowed but should be flagged to the user.
-
-If any check fails, do not save the configuration. Report the issue and ask the
-user to clarify or replace the problematic component.
-
-For simple price totals without validation metadata use `POST /api/quote/calculate`
-— identical request body, response contains only `items` and `total`.
-
----
-
-## Step 10 (optional) — Compare price tiers
-
-To see estimate, warehouse, and competitor prices side-by-side for a BOM:
-
-```
-POST /api/quote/price-levels
-Content-Type: application/json
-```
-
-Request body:
-```json
-{
-  "items": [
-    {"lot_name": "CPU-XEON-6342", "quantity": 2},
-    {"lot_name": "RAM-32GB-DDR4-3200", "quantity": 8}
-  ],
-  "pricelist_ids": {
-    "estimate": 42,
-    "warehouse": 31,
-    "competitor": 15
-  },
-  "no_cache": false
-}
-```
-
-`pricelist_ids` is optional. When omitted the latest pricelist for each source
-is used automatically.
-
-Response `200 OK`:
-```json
-{
-  "items": [
-    {
-      "lot_name": "CPU-XEON-6342",
-      "quantity": 2,
-      "estimate_price": 87500.00,
-      "warehouse_price": 71000.00,
-      "competitor_price": 85000.00,
-      "delta_wh_estimate_abs": -16500.00,
-      "delta_wh_estimate_pct": -18.86,
-      "delta_comp_estimate_abs": -2500.00,
-      "delta_comp_estimate_pct": -2.86,
-      "delta_comp_wh_abs": 14000.00,
-      "delta_comp_wh_pct": 19.72,
-      "price_missing": []
-    }
-  ],
-  "resolved_pricelist_ids": {
-    "estimate": 42,
-    "warehouse": 31,
-    "competitor": 15
-  }
-}
-```
-
-`price_missing` lists the source names for which no price was found for that lot.
-Delta fields are `null` when either operand price is missing.
-
----
-
-## Step 11 — Save a configuration inside the project
-
-Use the project-scoped endpoint so the configuration is immediately linked to
-the correct project without a separate move operation.
-
-```
-POST /api/projects/:project_uuid/configs
-Content-Type: application/json
-```
-
-The request body is identical to `POST /api/configs` — the `project_uuid` field
-in the body is ignored when using the project-scoped route; the URL parameter
-takes precedence.
-
-Request body:
-```json
-{
-  "name": "Сервер по ТЗ №123 — вариант А",
-  "items": [
-    {"lot_name": "MB-X13DAI-N",       "quantity": 1, "unit_price": 95000.00},
-    {"lot_name": "CPU-XEON-6342",      "quantity": 2, "unit_price": 87500.00},
-    {"lot_name": "RAM-32GB-DDR4-3200", "quantity": 8, "unit_price": 12000.00},
-    {"lot_name": "SSD-480GB-SATA",     "quantity": 2, "unit_price": 8500.00},
-    {"lot_name": "PSU-800W-TITANIUM",  "quantity": 2, "unit_price": 18500.00}
-  ],
-  "server_model": "2U",
-  "support_code": "NBD",
-  "server_count": 1,
-  "pricelist_id": 42,
-  "warehouse_pricelist_id": 31,
-  "competitor_pricelist_id": 15,
-  "config_type": "server",
-  "notes": "Автоматически создано агентом на основании ТЗ №123"
-}
-```
-
-Key fields:
-
-| field                    | type   | required | description                                         |
-|--------------------------|--------|----------|-----------------------------------------------------|
-| `name`                   | string | yes      | human-readable name                                 |
-| `items`                  | array  | yes      | `{lot_name, quantity, unit_price}` from validate    |
-| `server_model`           | string | no       | chassis/form-factor code; used for article generation |
-| `support_code`           | string | no       | support tier code; used for article generation      |
-| `server_count`           | int    | no       | number of identical servers; total is multiplied    |
-| `pricelist_id`           | uint   | no       | estimate pricelist to attach                        |
-| `warehouse_pricelist_id` | uint   | no       | warehouse pricelist to attach                       |
-| `competitor_pricelist_id`| uint   | no       | competitor pricelist to attach                      |
-| `config_type`            | string | no       | `"server"` (default) or `"storage"`                 |
-| `notes`                  | string | no       | free text                                           |
-| `custom_price`           | float  | no       | override total price                                |
-| `disable_price_refresh`  | bool   | no       | prevent automatic price refresh on open             |
-| `only_in_stock`          | bool   | no       | filter to in-stock components only                  |
-
-Response `201 Created`:
-```json
-{
-  "uuid": "550e8400-e29b-41d4-a716-446655440000",
-  "name": "Сервер по ТЗ №123 — вариант А",
-  "items": [...],
-  "total_price": 403000.00,
-  "server_count": 1,
-  "config_type": "server",
-  "article": "2U-6342x2-32GBx8-NBD",
-  "project_uuid": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee",
-  "created_at": "2026-06-11T10:00:00Z"
-}
-```
-
-The `uuid` can be used for all subsequent operations on this configuration.
-
----
-
-## Working with saved configurations
-
-```
-GET  /api/configs/:uuid                 — retrieve a saved configuration
-PUT  /api/configs/:uuid                 — full update (same body as create)
-POST /api/configs/:uuid/refresh-prices  — re-price from latest pricelist
-POST /api/configs/:uuid/clone           — duplicate: body {"name": "clone name"}
-GET  /api/configs/:uuid/versions        — revision history
-GET  /api/configs?page=1&per_page=20    — list all configurations
-```
-
----
-
-## Error responses
-
-All error responses follow the same shape:
-
-```json
-{"error": "human-readable message"}
-```
-
-Common status codes:
-
-| code | meaning                                               |
-|------|-------------------------------------------------------|
-| 400  | invalid request body or validation failure            |
-| 404  | entity (component, pricelist, config) not found       |
-| 423  | sync readiness is blocked; retry after sync completes |
-| 500  | internal server error                                 |
-
----
-
-## Minimal end-to-end example
-
-```bash
-BASE=http://127.0.0.1:8080
-
-# 1. Verify the app is up
-curl -s $BASE/api/ping
-
-# 2. Create a project for this TZ
-PROJECT_UUID=$(curl -s -X POST $BASE/api/projects \
-  -H "Content-Type: application/json" \
-  -d '{"code": "TZ-123", "name": "Проект по ТЗ №123"}' | jq -r .uuid)
-
-# 3. Get latest estimate pricelist
-PRICELIST_ID=$(curl -s "$BASE/api/pricelists/latest?source=estimate" | jq .id)
-
-# 4. Find lot names for required categories
-curl -s "$BASE/api/components?category=MB&search=X13&has_price=true"  | jq '.components[].lot_name'
-curl -s "$BASE/api/components?category=CPU&search=Xeon&has_price=true" | jq '.components[].lot_name'
-curl -s "$BASE/api/components?category=MEM&search=32GB&has_price=true" | jq '.components[].lot_name'
-curl -s "$BASE/api/components?category=PSU&search=800W&has_price=true" | jq '.components[].lot_name'
-
-# 5. Validate the BOM (must contain MB, CPU, MEM, PSU/PS)
-curl -s -X POST $BASE/api/quote/validate \
-  -H "Content-Type: application/json" \
-  -d "{
-    \"pricelist_id\": $PRICELIST_ID,
-    \"items\": [
-      {\"lot_name\": \"MB-X13DAI-N\",        \"quantity\": 1},
-      {\"lot_name\": \"CPU-XEON-6342\",       \"quantity\": 2},
-      {\"lot_name\": \"RAM-32GB-DDR4-3200\",  \"quantity\": 8},
-      {\"lot_name\": \"PSU-800W-TITANIUM\",   \"quantity\": 2}
-    ]
-  }" | jq '{valid, errors, warnings, total}'
-
-# 6. Save the configuration inside the project
-curl -s -X POST "$BASE/api/projects/$PROJECT_UUID/configs" \
-  -H "Content-Type: application/json" \
-  -d "{
-    \"name\": \"Сервер по ТЗ №123\",
-    \"pricelist_id\": $PRICELIST_ID,
-    \"server_model\": \"2U\",
-    \"server_count\": 1,
-    \"config_type\": \"server\",
-    \"items\": [
-      {\"lot_name\": \"MB-X13DAI-N\",        \"quantity\": 1,  \"unit_price\": 95000},
-      {\"lot_name\": \"CPU-XEON-6342\",       \"quantity\": 2,  \"unit_price\": 87500},
-      {\"lot_name\": \"RAM-32GB-DDR4-3200\",  \"quantity\": 8,  \"unit_price\": 12000},
-      {\"lot_name\": \"PSU-800W-TITANIUM\",   \"quantity\": 2,  \"unit_price\": 18500}
-    ]
-  }" | jq '{uuid, total_price, article}'
-```

bible-local/11-lot-suggestions.md

@@ -1,161 +0,0 @@
-# 11 - Lot Suggestions (qt_vendor_partnumber_seen)
-
-## Purpose
-
-`qt_vendor_partnumber_seen` records vendor partnumbers encountered during import
-that have no mapping in the active partnumber book. When a user manually maps
-such a partnumber to one or more LOT names in the QuoteForge UI, those mappings
-are written back to the server as **lot suggestions** — hints for the team that
-maintains `qt_partnumber_book_items`.
-
-## Schema Extension
-
-Add one nullable column to `qt_vendor_partnumber_seen`:
-
-```sql
-ALTER TABLE `qt_vendor_partnumber_seen`
-  ADD COLUMN `lot_suggestion` longtext DEFAULT NULL
-    COMMENT 'JSON array [{lot_name, qty}] — user-entered LOT mappings from the UI';
-```
-
-### Updated table contract (relevant columns only)
-
-| Column | Type | Notes |
-|--------|------|-------|
-| `partnumber` | varchar(255) UNIQUE NOT NULL | natural key |
-| `lot_suggestion` | longtext (JSON) | nullable; set when user maps the PN manually |
-
-`lot_suggestion` contains the same JSON shape as `qt_partnumber_book_items.lots_json`:
-
-```json
-[
-  { "lot_name": "LOT_A", "qty": 1 },
-  { "lot_name": "LOT_B", "qty": 2 }
-]
-```
-
-Rules:
-- `null` or absent means no suggestion has been entered yet;
-- an empty array `[]` is not a valid value — use `null` instead;
-- a single PN may map to multiple lots (`lot_name` entries), each with its own `qty`;
-- the array is ordered — the order reflects the order of `lot_mappings[]` in the
-  vendor spec row at the time of last user save;
-- `qty` must be a positive integer (≥ 1).
-
-## Write Contract (QuoteForge → MariaDB)
-
-QuoteForge writes `lot_suggestion` when all of the following are true:
-
-1. The user saves a vendor BOM via `PUT /api/configs/:uuid/vendor-spec`.
-2. At least one `vendor_spec` row has a non-empty `lot_mappings[]` array (manually
-   entered or confirmed by the user — not auto-resolved from a partnumber book).
-3. The MariaDB connection is available at the time of save.
-
-For each such row:
-
-```sql
-INSERT INTO qt_vendor_partnumber_seen
-    (source_type, vendor, partnumber, description, is_ignored, last_seen_at, lot_suggestion)
-VALUES
-    ('manual', '', ?, ?, 0, NOW(3), ?)
-ON DUPLICATE KEY UPDATE
-    lot_suggestion = VALUES(lot_suggestion),
-    last_seen_at   = IF(lot_suggestion IS NULL, last_seen_at, NOW(3))
-```
-
-- `lot_suggestion` value = JSON-marshalled `lot_mappings[]` from the vendor spec item,
-  reusing the same `{lot_name, qty}` shape.
-- If the PN row already exists and `lot_suggestion` is already set, it is **overwritten**
-  with the latest user input (the user is assumed to have corrected it).
-- If the user **clears** all lot_mappings for a PN (sets to empty), no update is sent —
-  the existing `lot_suggestion` on the server is left untouched.
-- Rows where `lot_mappings[]` is empty or nil are skipped entirely (no insert, no update).
-- Writes are best-effort: a MariaDB error for one row is logged and skipped; remaining
-  rows continue. A write failure does not fail the vendor-spec save.
-
-## Read Contract (Partnumber-Book Creation Tool → MariaDB)
-
-The tool that maintains `qt_partnumber_book_items` reads `qt_vendor_partnumber_seen`
-to discover new partnumbers and their suggested mappings.
-
-### Discovery query
-
-```sql
-SELECT
-    s.id,
-    s.partnumber,
-    s.description,
-    s.vendor,
-    s.lot_suggestion,
-    s.last_seen_at,
-    b.lots_json AS book_lots_json
-FROM qt_vendor_partnumber_seen s
-LEFT JOIN qt_partnumber_book_items b ON b.partnumber = s.partnumber
-WHERE s.is_ignored = 0
-  AND s.lot_suggestion IS NOT NULL
-ORDER BY s.last_seen_at DESC;
-```
-
-### Interpretation rules
-
-| Condition | Meaning | Suggested action |
-|-----------|---------|-----------------|
-| `book_lots_json IS NULL` AND `lot_suggestion IS NOT NULL` | No book entry yet; user suggested mapping | Create new `qt_partnumber_book_items` row with `lots_json = lot_suggestion` |
-| `book_lots_json IS NOT NULL` AND `lot_suggestion IS NOT NULL` AND they differ | User corrected or extended the existing mapping | Review diff and decide whether to update `qt_partnumber_book_items` |
-| `book_lots_json IS NOT NULL` AND `lot_suggestion IS NOT NULL` AND they match | Suggestion already applied | No action needed |
-
-### Suggestion format
-
-`lot_suggestion` is valid JSON (or `null`). Parse it as an array of objects:
-
-```json
-[
-  { "lot_name": "LOT_A", "qty": 1 },
-  { "lot_name": "LOT_B", "qty": 2 }
-]
-```
-
-Map directly to `qt_partnumber_book_items.lots_json` — the formats are identical.
-
-### Multiple lots per PN
-
-One PN may have multiple suggestion entries (e.g., a bundle). The array carries
-all of them. The book-creation tool must preserve the full array when writing
-`lots_json`, not just the first element.
-
-### Qty semantics
-
-`qty` in a lot suggestion means "how many of this LOT per one occurrence of the
-vendor PN". This matches `qt_partnumber_book_items.lots_json` exactly. Example:
-a server platform that comes with 4 PSUs would produce
-`[{"lot_name": "PS_1300W_Titanium", "qty": 4}]`.
-
-## Permissions
-
-The existing `qfs_user` grant covers this column — no new permission is required:
-
-```sql
-GRANT SELECT, INSERT, UPDATE ON RFQ_LOG.qt_vendor_partnumber_seen TO 'qfs_user'@'%';
-```
-
-The book-creation tool connects with its own credentials and needs at minimum:
-
-```sql
-GRANT SELECT ON RFQ_LOG.qt_vendor_partnumber_seen TO '<book_tool_user>'@'%';
-GRANT SELECT, INSERT, UPDATE ON RFQ_LOG.qt_partnumber_book_items TO '<book_tool_user>'@'%';
-```
-
-## Migration
-
-Migration is applied outside this repo (server-side DDL):
-
-```sql
-ALTER TABLE `qt_vendor_partnumber_seen`
-  ADD COLUMN IF NOT EXISTS `lot_suggestion` longtext DEFAULT NULL
-    COMMENT 'JSON [{lot_name, qty}] — user LOT suggestions from QuoteForge UI';
-```
-
-QuoteForge handles a missing column gracefully: if the migration has not run yet,
-the write with `lot_suggestion` fails with "Unknown column" (MariaDB 1054), a warning
-is logged, and the row is re-inserted without the column. The app never crashes on
-migration lag.

bible-local/README.md

@@ -1,32 +1,55 @@
-# QuoteForge Bible
+# QuoteForge Bible — Architectural Documentation
 
-Project-specific architecture and operational contracts.
+The single source of truth for architecture, schemas, and patterns.
 
-## Files
+---
 
-| File | Scope |
-| --- | --- |
-| [01-overview.md](01-overview.md) | Product scope, runtime model, repository map |
-| [02-architecture.md](02-architecture.md) | Local-first rules, sync, pricing, versioning |
-| [03-database.md](03-database.md) | SQLite and MariaDB data model, permissions, migrations |
-| [04-api.md](04-api.md) | HTTP routes and API contract |
-| [05-config.md](05-config.md) | Runtime config, paths, env vars, startup behavior |
-| [06-backup.md](06-backup.md) | Backup contract and restore workflow |
-| [07-dev.md](07-dev.md) | Development commands and guardrails |
-| [09-vendor-spec.md](09-vendor-spec.md) | Vendor BOM and CFXML import contract |
-| [10-agent-api-guide.md](10-agent-api-guide.md) | End-to-end API guide for agents pricing servers from a TZ |
-| [11-lot-suggestions.md](11-lot-suggestions.md) | lot_suggestion column in qt_vendor_partnumber_seen — write/read contract for manual UI mappings |
+## Table of Contents
 
-## Rules
+| File | Topic |
+|------|-------|
+| [01-overview.md](01-overview.md) | Product: purpose, features, tech stack, repository structure |
+| [02-architecture.md](02-architecture.md) | Architecture: local-first, sync, pricing, versioning |
+| [03-database.md](03-database.md) | DB schemas: SQLite + MariaDB, permissions, indexes |
+| [04-api.md](04-api.md) | API endpoints and web routes |
+| [05-config.md](05-config.md) | Configuration, environment variables, paths, installation |
+| [06-backup.md](06-backup.md) | Backup: implementation, rotation policy |
+| [07-dev.md](07-dev.md) | Development: commands, code style, guardrails |
 
-- `bible-local/` is the source of truth for QuoteForge-specific behavior.
-- Keep these files in English.
-- Update the matching file in the same commit as any architectural change.
-- Remove stale documentation instead of preserving history in place.
+---
 
-## Quick reference
+## Bible Rules
 
-- Local DB path: see [05-config.md](05-config.md)
-- Runtime bind: loopback only
-- Local backups: see [06-backup.md](06-backup.md)
-- Release notes: `releases/<version>/RELEASE_NOTES.md`
+> **Every architectural decision must be recorded in the Bible.**
+>
+> Any change to DB schema, data access patterns, sync behavior, API contracts,
+> configuration format, or any other system-level aspect — the corresponding `bible/` file
+> **must be updated in the same commit** as the code.
+>
+> On every user-requested commit, the Bible must be reviewed and updated in that commit.
+>
+> The Bible is the single source of truth for architecture. Outdated documentation is worse than none.
+
+> **Documentation language: English.**
+>
+> All files in `bible/` are written and updated **in English only**.
+> Mixing languages is not allowed.
+
+---
+
+## Quick Reference
+
+**Where is user data stored?**
+SQLite → `~/Library/Application Support/QuoteForge/qfs.db` (macOS). MariaDB is sync-only.
+
+**How to look up a price for a line item?**
+`local_pricelist_items` → by `pricelist_id` from config + `lot_name`. Prices are **never** taken from `local_components`.
+
+**Pre-commit check?**
+`go build ./cmd/qfs && go vet ./...`
+
+**What must never be restored?**
+cron jobs, admin pricing, alerts, stock import, importer utility — all removed intentionally.
+
+**Where is the release changelog?**
+`releases/memory/v{major}.{minor}.{patch}.md`

bible-local/decisions/README.md

@@ -1,31 +0,0 @@
-# Architectural Decision Log
-
-One file per decision, named `YYYY-MM-DD-short-topic.md`.
-
-Write a new entry when:
-- Choosing between non-obvious implementation approaches.
-- Intentionally rejecting a feature or pattern.
-- A bug causes a rule change.
-- Freezing or deprecating something.
-
-Format:
-
-```markdown
-# Decision: <short title>
-
-**Date:** YYYY-MM-DD
-**Status:** active | superseded by YYYY-MM-DD-topic.md
-
-## Context
-Situation making this decision necessary.
-
-## Decision
-What was decided, stated clearly.
-
-## Consequences
-What this means going forward; what is forbidden or required.
-```
-
-When a decision is superseded: add "superseded by" to the old file and create the new one.
-Do NOT delete old entries.
-Record the decision in the SAME COMMIT as the implementation code.

bible-local/runtime-flows.md

@@ -1,86 +0,0 @@
-# Runtime Flows
-
-Critical mutation paths, deduplication logic, and cross-entity side effects.
-Update this file in the same commit as any change to the flows below.
-
----
-
-## 1. Configuration save (create/update)
-
-1. Handler receives JSON body; validates via `ShouldBindJSON`.
-2. `LocalConfigurationService.Create` or `Update` is called.
-3. Service computes `total_price` from `req.Items.Total()` (sum of `unit_price * quantity` per item).
-4. A new revision snapshot is created via `createWithVersion`; revision number increments.
-5. `quoteService.RecordUsage` is called best-effort (warn on failure, do not abort save).
-6. Configuration row written to SQLite (`local_configurations`); version row appended to `local_configuration_versions`.
-7. Pending change queued in `pending_changes` for later sync push.
-
-**DO NOT** read prices from `local_components` during save - prices must already be on items.
-**DO NOT** skip version creation on rename/reorder/project-move - those operations call different paths that must NOT call `createWithVersion`.
-
----
-
-## 2. Refresh prices (POST /api/configs/:uuid/refresh-prices)
-
-1. Handler calls `LocalConfigurationService.RefreshPricesNoAuth(uuid, pricelistServerID)`.
-2. If online, `SyncPricelistsIfNeeded` runs best-effort (warn on failure, do not block).
-3. Resolves target pricelist in order:
-   a. Explicitly requested pricelist (`pricelistServerID` param).
-   b. Pricelist stored in configuration row (`localCfg.PricelistID`).
-   c. Latest local pricelist as fallback.
-4. For each item in the config, looks up price from `local_pricelist_items` via `GetLocalPricesForLots` (batch, single query).
-5. Items with matching prices are updated; items with no price keep their existing `unit_price`.
-6. Updated configuration saved as a new version (same flow as §1 from step 4 onward).
-
-**DO NOT** read prices from `qt_pricelist_items` (MariaDB) directly - prices come from SQLite cache only.
-
----
-
-## 3. Pricelist sync (POST /api/sync/pricelists)
-
-1. Readiness guard checked; returns 423 if guard blocks sync.
-2. `SyncService.SyncPricelists` pulls from `qt_pricelists` and `qt_pricelist_items` (MariaDB).
-3. For each pricelist: header upserted first, then items replaced atomically via `ReplaceLocalPricelistItems`.
-4. After all pricelists: `RecalculateAllLocalPricelistUsage` marks which pricelists are referenced by active configurations.
-5. Sync result (status, error, timestamp) written to `app_settings` via `SetPricelistSyncResult`.
-
-**DO NOT** write pricelist header without items in the same transaction - must be atomic.
-**DO NOT** query MariaDB from runtime handlers outside sync/setup flows.
-
----
-
-## 4. Vendor spec apply (POST /api/configs/:uuid/vendor-spec/apply)
-
-1. Incoming `items[]` (lot_name, quantity, unit_price) replace the configuration's `items` entirely.
-2. New item list saved through `LocalConfigurationService.UpdateItemsNoAuth`.
-3. A new revision is created reflecting the BOM-derived item state.
-
-**DO NOT** apply vendor spec without going through the service layer - handler must not write items directly to DB.
-
----
-
-## 5. Configuration versioning invariants
-
-- `local_configuration_versions` is append-only; rows are never updated or deleted.
-- Version deduplication: if new snapshot hash equals current head, no new version is created.
-- Rollback = create new HEAD revision from old snapshot data (does not restore version pointer to old row).
-- UI must always show "main" (implicit head) as the active state; never point to a numbered revision after save.
-- Operations that do NOT create a new version: rename, reorder within project, project move, pricelist selector change only.
-
----
-
-## 6. Pending changes queue
-
-- Every local write (create/update/delete) appends a row to `pending_changes`.
-- `POST /api/sync/push` drains the queue by writing to MariaDB.
-- If a push fails, `increment_attempts` and `last_error` are updated; row stays in queue.
-- `RepairPendingChanges` reconciles orphaned changes (configuration/project deleted locally).
-
----
-
-## 7. Error handling boundary rules
-
-- Handlers: log 500 responses with `slog.Error`; surface error message via `RespondError`.
-- Services: wrap errors with `fmt.Errorf("context: %w", err)`; do NOT log inside service.
-- Repositories: return raw errors; no logging.
-- Best-effort operations (usage stats, background sync): log `slog.Warn` and continue.

bible-local/server-contract-qt-settings.md

@@ -1,165 +0,0 @@
-# Server contract: qt_settings
-
-## Purpose
-
-`qt_settings` is a general-purpose key→JSON-value table that the price management
-application uses to push configuration into QuoteForge clients. QF reads it during
-component sync and caches the result in `local_qt_settings` (SQLite).
-
-## Required MariaDB changes (implemented by server-side agent)
-
-```sql
-CREATE TABLE IF NOT EXISTS qt_settings (
-    name  VARCHAR(100) NOT NULL PRIMARY KEY,
-    value TEXT         NOT NULL   -- JSON-encoded value
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-GRANT SELECT ON RFQ_LOG.qt_settings TO 'qfs_user'@'%';
-```
-
-## Settings consumed by QuoteForge
-
-All values are JSON. Missing or unparseable entries are silently skipped; QF
-falls back to hardcoded defaults for each missing key.
-
----
-
-### `config_types`
-
-Defines the available device configuration types, their localized names, and the
-category codes that are allowed for each type. QF uses this for:
-- the new-config modal (button list + labels);
-- the configurator's category filter per `config_type`.
-
-**Value format:** JSON array of objects.
-
-```json
-[
-  {
-    "code":          "server",
-    "name_ru":       "Сервер",
-    "display_order": 10,
-    "categories":    [
-      "MB","CPU","MEM","RAID",
-      "SSD","HDD","M2","EDSFF","HHHL",
-      "GPU","NIC","HCA","DPU","HBA",
-      "PSU","PS","ACC","RISERS","CARD","BB"
-    ]
-  },
-  {
-    "code":          "storage",
-    "name_ru":       "СХД",
-    "display_order": 20,
-    "categories":    [
-      "DKC","CPU","MEM","PS",
-      "SSD","HDD","M2","EDSFF","HHHL",
-      "NIC","HBA","HCA","ACC","CARD"
-    ]
-  }
-]
-```
-
-Fields:
-| Field | Type | Description |
-|-------|------|-------------|
-| `code` | string | Identifier stored on `qt_configurations.config_type`. Must be stable. |
-| `name_ru` | string | Display name in Russian for the QF UI. |
-| `display_order` | int | Sort order for the modal button list. |
-| `categories` | string[] | Allowlist of LOT category codes visible in this config type. A category absent from ALL entries is visible in all types. |
-
----
-
-### `tab_config`
-
-Defines the configurator tab layout: which tabs exist, which categories each tab
-contains, optional sub-sections within a tab, and whether the tab uses
-single-select mode.
-
-**Value format:** JSON array of tab objects (ordered — defines tab bar order).
-
-```json
-[
-  {
-    "key":           "base",
-    "label":         "Base",
-    "single_select": true,
-    "categories":    ["MB","CPU","MEM","ENC","DKC","CTL"],
-    "sections":      null
-  },
-  {
-    "key":           "storage",
-    "label":         "Storage",
-    "single_select": false,
-    "categories":    ["RAID","M2","SSD","HDD","EDSFF","HHHL"],
-    "sections": [
-      { "title": "RAID Контроллеры", "categories": ["RAID"] },
-      { "title": "Диски",            "categories": ["M2","SSD","HDD","EDSFF","HHHL"] }
-    ]
-  },
-  {
-    "key":           "pci",
-    "label":         "PCI",
-    "single_select": false,
-    "categories":    ["GPU","DPU","NIC","HCA","HBA","HIC"],
-    "sections": [
-      { "title": "GPU / DPU", "categories": ["GPU","DPU"] },
-      { "title": "NIC / HCA", "categories": ["NIC","HCA"] },
-      { "title": "HBA",       "categories": ["HBA"] },
-      { "title": "HIC",       "categories": ["HIC"] }
-    ]
-  },
-  { "key": "power",       "label": "Power",       "single_select": false, "categories": ["PS","PSU"] },
-  { "key": "accessories", "label": "Accessories", "single_select": false, "categories": ["ACC","CARD"] },
-  { "key": "sw",          "label": "SW",          "single_select": false, "categories": ["SW"] }
-]
-```
-
-The QF frontend always appends an "other" tab for any categories not listed here.
-
----
-
-### `always_visible_tabs`
-
-Tab keys that are always shown in the configurator regardless of whether they
-contain any items. Other tabs are hidden when empty.
-
-**Value format:** JSON string array.
-
-```json
-["base", "storage", "pci"]
-```
-
----
-
-### `required_categories`
-
-Category codes that must have at least one LOT selected for a configuration to
-be considered complete. Keyed by `config_type` code. QF uses this to show a
-badge on the tab label when required categories are missing.
-
-**Value format:** JSON object mapping config_type code → string array.
-
-```json
-{
-  "server":  ["CPU", "MEM", "BB"],
-  "storage": ["DKC", "CPU", "MEM"]
-}
-```
-
----
-
-## Backward compatibility
-
-- If `qt_settings` does not exist (old server): QF logs `Warn` during sync and
-  leaves `local_qt_settings` empty. The frontend falls back to hardcoded defaults
-  for all four settings. No crash, no data loss.
-- If a specific key is absent from `qt_settings`: QF falls back to the hardcoded
-  default for that key only.
-- Old QF clients that do not know about `local_qt_settings` continue to use their
-  hardcoded JS constants unchanged.
-
-## Note on `qt_categories`
-
-`qt_categories.name` and `qt_categories.name_ru` are being removed.
-QF runtime does not depend on them — `GetCategories` derives `Name` from the
-category code string stored in `local_components`.

cmd/migrate/main.go

@@ -2,8 +2,8 @@ package main
 
 import (
 	"flag"
+	"fmt"
 	"log"
-	"log/slog"
 	"time"
 
 	"git.mchus.pro/mchus/quoteforge/internal/appstate"
@@ -153,7 +153,7 @@ func main() {
 	log.Printf("  Skipped:  %d", skipped)
 	log.Printf("  Errors:   %d", errors)
 
-	slog.Info("Done! You can now run the server with: go run ./cmd/qfs")
+	fmt.Println("\nDone! You can now run the server with: go run ./cmd/qfs")
 }
 
 func derefUint(v *uint) uint {

cmd/migrate_ops_projects/main.go

@@ -5,7 +5,6 @@ import (
 	"flag"
 	"fmt"
 	"log"
-	"log/slog"
 	"os"
 	"regexp"
 	"sort"
@@ -80,12 +79,12 @@ func main() {
 
 	printPlan(actions)
 	if len(actions) == 0 {
-		slog.Info("Nothing to migrate.")
+		fmt.Println("Nothing to migrate.")
 		return
 	}
 
 	if !*apply {
-		slog.Info("Preview complete. Re-run with -apply to execute.")
+		fmt.Println("\nPreview complete. Re-run with -apply to execute.")
 		return
 	}
 
@@ -95,7 +94,7 @@ func main() {
 			log.Fatalf("confirmation failed: %v", confirmErr)
 		}
 		if !ok {
-			slog.Info("Aborted.")
+			fmt.Println("Aborted.")
 			return
 		}
 	}
@@ -104,7 +103,7 @@ func main() {
 		log.Fatalf("migration failed: %v", err)
 	}
 
-	slog.Info("Migration completed successfully.")
+	fmt.Println("Migration completed successfully.")
 }
 
 func ensureProjectsTable(db *gorm.DB) error {
@@ -213,8 +212,10 @@ func printPlan(actions []migrationAction) {
 		}
 	}
 
-	slog.Info("Plan summary", "actions", len(actions), "create", createCount, "reactivate", reactivateCount)
-	slog.Info("Details:")
+	fmt.Printf("Planned actions: %d\n", len(actions))
+	fmt.Printf("Projects to create: %d\n", createCount)
+	fmt.Printf("Projects to reactivate: %d\n", reactivateCount)
+	fmt.Println("\nDetails:")
 
 	for _, a := range actions {
 		extra := ""

cmd/migrate_project_updated_at/main.go

@@ -1,173 +0,0 @@
-package main
-
-import (
-	"flag"
-	"log"
-	"log/slog"
-	"sort"
-	"time"
-
-	"git.mchus.pro/mchus/quoteforge/internal/appstate"
-	"git.mchus.pro/mchus/quoteforge/internal/localdb"
-	"git.mchus.pro/mchus/quoteforge/internal/models"
-	"gorm.io/driver/mysql"
-	"gorm.io/gorm"
-	"gorm.io/gorm/logger"
-)
-
-type projectTimestampRow struct {
-	UUID      string
-	UpdatedAt time.Time
-}
-
-type updatePlanRow struct {
-	UUID            string
-	Code            string
-	Variant         string
-	LocalUpdatedAt  time.Time
-	ServerUpdatedAt time.Time
-}
-
-func main() {
-	defaultLocalDBPath, err := appstate.ResolveDBPath("")
-	if err != nil {
-		log.Fatalf("failed to resolve default local SQLite path: %v", err)
-	}
-
-	localDBPath := flag.String("localdb", defaultLocalDBPath, "path to local SQLite database (default: user state dir or QFS_DB_PATH)")
-	apply := flag.Bool("apply", false, "apply updates to local SQLite (default is preview only)")
-	flag.Parse()
-
-	local, err := localdb.New(*localDBPath)
-	if err != nil {
-		log.Fatalf("failed to initialize local database: %v", err)
-	}
-	defer local.Close()
-
-	if !local.HasSettings() {
-		log.Fatalf("SQLite connection settings are not configured. Run qfs setup first.")
-	}
-
-	dsn, err := local.GetDSN()
-	if err != nil {
-		log.Fatalf("failed to build DSN from SQLite settings: %v", err)
-	}
-
-	db, err := gorm.Open(mysql.Open(dsn), &gorm.Config{
-		Logger: logger.Default.LogMode(logger.Silent),
-	})
-	if err != nil {
-		log.Fatalf("failed to connect to MariaDB: %v", err)
-	}
-
-	serverRows, err := loadServerProjects(db)
-	if err != nil {
-		log.Fatalf("failed to load server projects: %v", err)
-	}
-
-	localProjects, err := local.GetAllProjects(true)
-	if err != nil {
-		log.Fatalf("failed to load local projects: %v", err)
-	}
-
-	plan := buildUpdatePlan(localProjects, serverRows)
-	printPlan(plan, *apply)
-
-	if !*apply || len(plan) == 0 {
-		return
-	}
-
-	updated := 0
-	for i := range plan {
-		project, err := local.GetProjectByUUID(plan[i].UUID)
-		if err != nil {
-			log.Printf("skip %s: load local project: %v", plan[i].UUID, err)
-			continue
-		}
-		project.UpdatedAt = plan[i].ServerUpdatedAt
-		if err := local.SaveProjectPreservingUpdatedAt(project); err != nil {
-			log.Printf("skip %s: save local project: %v", plan[i].UUID, err)
-			continue
-		}
-		updated++
-	}
-
-	log.Printf("updated %d local project timestamps", updated)
-}
-
-func loadServerProjects(db *gorm.DB) (map[string]time.Time, error) {
-	var rows []projectTimestampRow
-	if err := db.Model(&models.Project{}).
-		Select("uuid, updated_at").
-		Find(&rows).Error; err != nil {
-		return nil, err
-	}
-
-	out := make(map[string]time.Time, len(rows))
-	for _, row := range rows {
-		if row.UUID == "" {
-			continue
-		}
-		out[row.UUID] = row.UpdatedAt
-	}
-	return out, nil
-}
-
-func buildUpdatePlan(localProjects []localdb.LocalProject, serverRows map[string]time.Time) []updatePlanRow {
-	plan := make([]updatePlanRow, 0)
-	for i := range localProjects {
-		project := localProjects[i]
-		serverUpdatedAt, ok := serverRows[project.UUID]
-		if !ok {
-			continue
-		}
-		if project.UpdatedAt.Equal(serverUpdatedAt) {
-			continue
-		}
-		plan = append(plan, updatePlanRow{
-			UUID:            project.UUID,
-			Code:            project.Code,
-			Variant:         project.Variant,
-			LocalUpdatedAt:  project.UpdatedAt,
-			ServerUpdatedAt: serverUpdatedAt,
-		})
-	}
-
-	sort.Slice(plan, func(i, j int) bool {
-		if plan[i].Code != plan[j].Code {
-			return plan[i].Code < plan[j].Code
-		}
-		return plan[i].Variant < plan[j].Variant
-	})
-
-	return plan
-}
-
-func printPlan(plan []updatePlanRow, apply bool) {
-	mode := "preview"
-	if apply {
-		mode = "apply"
-	}
-	log.Printf("project updated_at resync mode=%s changes=%d", mode, len(plan))
-	if len(plan) == 0 {
-		log.Printf("no local project timestamps need resync")
-		return
-	}
-	for _, row := range plan {
-		variant := row.Variant
-		if variant == "" {
-			variant = "main"
-		}
-		log.Printf("%s [%s] local=%s server=%s", row.Code, variant, formatStamp(row.LocalUpdatedAt), formatStamp(row.ServerUpdatedAt))
-	}
-	if !apply {
-		slog.Info("Re-run with -apply to write server updated_at into local SQLite.")
-	}
-}
-
-func formatStamp(value time.Time) string {
-	if value.IsZero() {
-		return "zero"
-	}
-	return value.Format(time.RFC3339)
-}

cmd/qfs/config_migration_test.go

@@ -39,10 +39,6 @@ logging:
 		t.Fatalf("load legacy config: %v", err)
 	}
 	setConfigDefaults(cfg)
-	cfg.Server.Host, _, err = normalizeLoopbackServerHost(cfg.Server.Host)
-	if err != nil {
-		t.Fatalf("normalize server host: %v", err)
-	}
 	if err := migrateConfigFileToRuntimeShape(path, cfg); err != nil {
 		t.Fatalf("migrate config: %v", err)
 	}
@@ -64,43 +60,7 @@ logging:
 	if !strings.Contains(text, "port: 9191") {
 		t.Fatalf("migrated config did not preserve server port:\n%s", text)
 	}
-	if !strings.Contains(text, "host: 127.0.0.1") {
-		t.Fatalf("migrated config did not normalize server host:\n%s", text)
-	}
 	if !strings.Contains(text, "level: debug") {
 		t.Fatalf("migrated config did not preserve logging level:\n%s", text)
 	}
 }
-
-func TestNormalizeLoopbackServerHost(t *testing.T) {
-	t.Parallel()
-
-	cases := []struct {
-		host        string
-		want        string
-		wantChanged bool
-		wantErr     bool
-	}{
-		{host: "127.0.0.1", want: "127.0.0.1", wantChanged: false, wantErr: false},
-		{host: "localhost", want: "127.0.0.1", wantChanged: true, wantErr: false},
-		{host: "::1", want: "127.0.0.1", wantChanged: true, wantErr: false},
-		{host: "0.0.0.0", want: "127.0.0.1", wantChanged: true, wantErr: false},
-		{host: "192.168.1.10", want: "127.0.0.1", wantChanged: true, wantErr: false},
-	}
-
-	for _, tc := range cases {
-		got, changed, err := normalizeLoopbackServerHost(tc.host)
-		if tc.wantErr && err == nil {
-			t.Fatalf("expected error for host %q", tc.host)
-		}
-		if !tc.wantErr && err != nil {
-			t.Fatalf("unexpected error for host %q: %v", tc.host, err)
-		}
-		if got != tc.want {
-			t.Fatalf("unexpected normalized host for %q: got %q want %q", tc.host, got, tc.want)
-		}
-		if changed != tc.wantChanged {
-			t.Fatalf("unexpected changed flag for %q: got %t want %t", tc.host, changed, tc.wantChanged)
-		}
-	}
-}

cmd/qfs/main.go

@@ -6,11 +6,9 @@ import (
 	"errors"
 	"flag"
 	"fmt"
-	"io"
 	"io/fs"
 	"log/slog"
 	"math"
-	"net"
 	"net/http"
 	"os"
 	"os/exec"
@@ -33,6 +31,7 @@ import (
 	"git.mchus.pro/mchus/quoteforge/internal/localdb"
 	"git.mchus.pro/mchus/quoteforge/internal/middleware"
 	"git.mchus.pro/mchus/quoteforge/internal/models"
+	"git.mchus.pro/mchus/quoteforge/internal/repository"
 	"git.mchus.pro/mchus/quoteforge/internal/services"
 	"git.mchus.pro/mchus/quoteforge/internal/services/sync"
 	"github.com/gin-gonic/gin"
@@ -44,16 +43,11 @@ import (
 
 // Version is set via ldflags during build
 var Version = "dev"
-var errVendorImportTooLarge = errors.New("vendor workspace file exceeds 1 GiB limit")
 
 const backgroundSyncInterval = 5 * time.Minute
 const onDemandPullCooldown = 30 * time.Second
 const startupConsoleWarning = "Не закрывайте консоль иначе приложение не будет работать"
 
-var vendorImportMaxBytes int64 = 1 << 30
-
-const vendorImportMultipartOverheadBytes int64 = 8 << 20
-
 func main() {
 	showStartupConsoleWarning()
 
@@ -148,15 +142,6 @@ func main() {
 		}
 	}
 	setConfigDefaults(cfg)
-	normalizedHost, changed, err := normalizeLoopbackServerHost(cfg.Server.Host)
-	if err != nil {
-		slog.Error("invalid server host", "host", cfg.Server.Host, "error", err)
-		os.Exit(1)
-	}
-	if changed {
-		slog.Warn("corrected server host to loopback", "from", cfg.Server.Host, "to", normalizedHost)
-	}
-	cfg.Server.Host = normalizedHost
 	if err := migrateConfigFileToRuntimeShape(resolvedConfigPath, cfg); err != nil {
 		slog.Error("failed to migrate config file format", "path", resolvedConfigPath, "error", err)
 		os.Exit(1)
@@ -165,25 +150,29 @@ func main() {
 
 	setupLogger(cfg.Logging)
 
-	// Create connection manager. Runtime stays local-first; MariaDB is used on demand by sync/setup only.
+	// Create connection manager and try to connect immediately if settings exist
 	connMgr := db.NewConnectionManager(local)
 
 	dbUser := local.GetDBUser()
 
+	// Try to connect to MariaDB on startup
+	mariaDB, err := connMgr.GetDB()
+	if err != nil {
+		slog.Warn("failed to connect to MariaDB on startup, starting in offline mode", "error", err)
+		mariaDB = nil
+	} else {
+		slog.Info("successfully connected to MariaDB on startup")
+	}
+
 	slog.Info("starting QuoteForge server",
 		"version", Version,
 		"host", cfg.Server.Host,
 		"port", cfg.Server.Port,
 		"db_user", dbUser,
-		"online", false,
+		"online", mariaDB != nil,
 	)
 
 	if *migrate {
-		mariaDB, err := connMgr.GetDB()
-		if err != nil {
-			slog.Error("cannot run migrations: database not available", "error", err)
-			os.Exit(1)
-		}
 		if mariaDB == nil {
 			slog.Error("cannot run migrations: database not available")
 			os.Exit(1)
@@ -200,10 +189,39 @@ func main() {
 		slog.Info("migrations completed")
 	}
 
+	// Always apply SQL migrations on startup when database is available.
+	// This keeps schema in sync for long-running installations without manual steps.
+	// If current DB user does not have enough privileges, continue startup in normal mode.
+	if mariaDB != nil {
+		sqlMigrationsPath := filepath.Join("migrations")
+		needsMigrations, err := models.NeedsSQLMigrations(mariaDB, sqlMigrationsPath)
+		if err != nil {
+			if models.IsMigrationPermissionError(err) {
+				slog.Info("startup SQL migrations skipped: insufficient database privileges", "path", sqlMigrationsPath, "error", err)
+			} else {
+				slog.Error("startup SQL migrations check failed", "path", sqlMigrationsPath, "error", err)
+				os.Exit(1)
+			}
+		} else if needsMigrations {
+			if err := models.RunSQLMigrations(mariaDB, sqlMigrationsPath); err != nil {
+				if models.IsMigrationPermissionError(err) {
+					slog.Info("startup SQL migrations skipped: insufficient database privileges", "path", sqlMigrationsPath, "error", err)
+				} else {
+					slog.Error("startup SQL migrations failed", "path", sqlMigrationsPath, "error", err)
+					os.Exit(1)
+				}
+			} else {
+				slog.Info("startup SQL migrations applied", "path", sqlMigrationsPath)
+			}
+		} else {
+			slog.Debug("startup SQL migrations not needed", "path", sqlMigrationsPath)
+		}
+	}
+
 	gin.SetMode(cfg.Server.Mode)
 	restartSig := make(chan struct{}, 1)
 
-	router, syncService, err := setupRouter(cfg, local, connMgr, dbUser, restartSig)
+	router, syncService, err := setupRouter(cfg, local, connMgr, mariaDB, dbUser, restartSig)
 	if err != nil {
 		slog.Error("failed to setup router", "error", err)
 		os.Exit(1)
@@ -289,7 +307,8 @@ func main() {
 }
 
 func showStartupConsoleWarning() {
-	slog.Warn(startupConsoleWarning)
+	// Visible in console output.
+	fmt.Println(startupConsoleWarning)
 	// Keep the warning always visible in the console window title when supported.
 	fmt.Printf("\033]0;%s\007", startupConsoleWarning)
 }
@@ -331,51 +350,31 @@ func setConfigDefaults(cfg *config.Config) {
 		cfg.Server.ReadTimeout = 30 * time.Second
 	}
 	if cfg.Server.WriteTimeout == 0 {
-		// Sync operations (pricelist download over slow VPN) can take several minutes.
-		// Loopback-only binding means there is no risk of holding connections from external clients.
-		cfg.Server.WriteTimeout = 10 * time.Minute
+		cfg.Server.WriteTimeout = 30 * time.Second
+	}
+	if cfg.Pricing.DefaultMethod == "" {
+		cfg.Pricing.DefaultMethod = "weighted_median"
+	}
+	if cfg.Pricing.DefaultPeriodDays == 0 {
+		cfg.Pricing.DefaultPeriodDays = 90
+	}
+	if cfg.Pricing.FreshnessGreenDays == 0 {
+		cfg.Pricing.FreshnessGreenDays = 30
+	}
+	if cfg.Pricing.FreshnessYellowDays == 0 {
+		cfg.Pricing.FreshnessYellowDays = 60
+	}
+	if cfg.Pricing.FreshnessRedDays == 0 {
+		cfg.Pricing.FreshnessRedDays = 90
+	}
+	if cfg.Pricing.MinQuotesForMedian == 0 {
+		cfg.Pricing.MinQuotesForMedian = 3
 	}
 	if cfg.Backup.Time == "" {
 		cfg.Backup.Time = "00:00"
 	}
 }
 
-func normalizeLoopbackServerHost(host string) (string, bool, error) {
-	trimmed := strings.TrimSpace(host)
-	if trimmed == "" {
-		return "", false, fmt.Errorf("server.host must not be empty")
-	}
-	const loopbackHost = "127.0.0.1"
-	if trimmed == loopbackHost {
-		return loopbackHost, false, nil
-	}
-	if strings.EqualFold(trimmed, "localhost") {
-		return loopbackHost, true, nil
-	}
-
-	ip := net.ParseIP(strings.Trim(trimmed, "[]"))
-	if ip != nil {
-		if ip.IsLoopback() || ip.IsUnspecified() {
-			return loopbackHost, trimmed != loopbackHost, nil
-		}
-		return loopbackHost, true, nil
-	}
-
-	return loopbackHost, true, nil
-}
-
-func vendorImportBodyLimit() int64 {
-	return vendorImportMaxBytes + vendorImportMultipartOverheadBytes
-}
-
-func isVendorImportTooLarge(fileSize int64, err error) bool {
-	if fileSize > vendorImportMaxBytes {
-		return true
-	}
-	var maxBytesErr *http.MaxBytesError
-	return errors.As(err, &maxBytesErr)
-}
-
 func ensureDefaultConfigFile(configPath string) error {
 	if strings.TrimSpace(configPath) == "" {
 		return fmt.Errorf("config path is empty")
@@ -395,7 +394,7 @@ func ensureDefaultConfigFile(configPath string) error {
   port: 8080
   mode: "release"
   read_timeout: 30s
-  write_timeout: 10m
+  write_timeout: 30s
 
 backup:
   time: "00:00"
@@ -672,14 +671,46 @@ func setupDatabaseFromDSN(dsn string) (*gorm.DB, error) {
 	return db, nil
 }
 
-func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.ConnectionManager, dbUsername string, restartSig chan struct{}) (*gin.Engine, *sync.Service, error) {
+func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.ConnectionManager, mariaDB *gorm.DB, dbUsername string, restartSig chan struct{}) (*gin.Engine, *sync.Service, error) {
+	// mariaDB may be nil if we're in offline mode
+
+	// Repositories
+	var componentRepo *repository.ComponentRepository
+	var categoryRepo *repository.CategoryRepository
+	var statsRepo *repository.StatsRepository
+	var pricelistRepo *repository.PricelistRepository
+
+	// Only initialize repositories if we have a database connection
+	if mariaDB != nil {
+		componentRepo = repository.NewComponentRepository(mariaDB)
+		categoryRepo = repository.NewCategoryRepository(mariaDB)
+		statsRepo = repository.NewStatsRepository(mariaDB)
+		pricelistRepo = repository.NewPricelistRepository(mariaDB)
+	} else {
+		// In offline mode, we'll use nil repositories or handle them differently
+		// This is handled in the sync service and other components
+	}
+
+	// Services
+	var componentService *services.ComponentService
+	var quoteService *services.QuoteService
+	var exportService *services.ExportService
 	var syncService *sync.Service
 	var projectService *services.ProjectService
 
+	// Sync service always uses ConnectionManager (works offline and online)
 	syncService = sync.NewService(connMgr, local)
-	componentService := services.NewComponentService(nil, nil)
-	quoteService := services.NewQuoteService(nil, nil, local, nil)
-	exportService := services.NewExportService(cfg.Export, local)
+
+	if mariaDB != nil {
+		componentService = services.NewComponentService(componentRepo, categoryRepo, statsRepo)
+		quoteService = services.NewQuoteService(componentRepo, statsRepo, pricelistRepo, local, nil)
+		exportService = services.NewExportService(cfg.Export, categoryRepo, local)
+	} else {
+		// In offline mode, we still need to create services that don't require DB.
+		componentService = services.NewComponentService(nil, nil, nil)
+		quoteService = services.NewQuoteService(nil, nil, nil, local, nil)
+		exportService = services.NewExportService(cfg.Export, nil, local)
+	}
 
 	// isOnline function for local-first architecture
 	isOnline := func() bool {
@@ -700,6 +731,16 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 	if err := local.BackfillConfigurationProjects(dbUsername); err != nil {
 		slog.Warn("failed to backfill local configuration projects", "error", err)
 	}
+	if mariaDB != nil {
+		serverProjectRepo := repository.NewProjectRepository(mariaDB)
+		if removed, err := serverProjectRepo.PurgeEmptyNamelessProjects(); err == nil && removed > 0 {
+			slog.Info("purged empty nameless server projects", "removed", removed)
+		}
+		if err := serverProjectRepo.EnsureSystemProjectsAndBackfillConfigurations(); err != nil {
+			slog.Warn("failed to backfill server configuration projects", "error", err)
+		}
+	}
+
 	type pullState struct {
 		mu          syncpkg.Mutex
 		running     bool
@@ -777,18 +818,15 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 	// Handlers
 	componentHandler := handlers.NewComponentHandler(componentService, local)
 	quoteHandler := handlers.NewQuoteHandler(quoteService)
-	exportHandler := handlers.NewExportHandler(exportService, configService, projectService, dbUsername)
+	exportHandler := handlers.NewExportHandler(exportService, configService, projectService)
 	pricelistHandler := handlers.NewPricelistHandler(local)
-	vendorSpecHandler := handlers.NewVendorSpecHandler(local, syncService)
+	vendorSpecHandler := handlers.NewVendorSpecHandler(local)
 	partnumberBooksHandler := handlers.NewPartnumberBooksHandler(local)
-	respondError := handlers.RespondError
 	syncHandler, err := handlers.NewSyncHandler(local, syncService, connMgr, templatesPath, backgroundSyncInterval)
 	if err != nil {
 		return nil, nil, fmt.Errorf("creating sync handler: %w", err)
 	}
 
-	supportBundleHandler := handlers.NewSupportBundleHandler(local, connMgr, syncService, cfg.Logging.FilePath)
-
 	// Setup handler (for reconfiguration)
 	setupHandler, err := handlers.NewSetupHandler(local, connMgr, templatesPath, restartSig)
 	if err != nil {
@@ -796,14 +834,13 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 	}
 
 	// Web handler (templates)
-	webHandler, err := handlers.NewWebHandler(templatesPath, local)
+	webHandler, err := handlers.NewWebHandler(templatesPath, componentService)
 	if err != nil {
 		return nil, nil, err
 	}
 
 	// Router
 	router := gin.New()
-	router.MaxMultipartMemory = vendorImportBodyLimit()
 	router.Use(gin.Recovery())
 	router.Use(requestLogger())
 	router.Use(middleware.CORS())
@@ -824,17 +861,17 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 		})
 	})
 
-	// Restart endpoint is intentionally debug-only.
-	if cfg.Server.Mode == "debug" {
-		router.POST("/api/restart", func(c *gin.Context) {
-			slog.Info("Restart requested via API")
-			go func() {
-				time.Sleep(100 * time.Millisecond)
-				restartProcess()
-			}()
-			c.JSON(http.StatusOK, gin.H{"message": "restarting..."})
-		})
-	}
+	// Restart endpoint (for development purposes)
+	router.POST("/api/restart", func(c *gin.Context) {
+		// This will cause the server to restart by exiting
+		// The restartProcess function will be called to restart the process
+		slog.Info("Restart requested via API")
+		go func() {
+			time.Sleep(100 * time.Millisecond)
+			restartProcess()
+		}()
+		c.JSON(http.StatusOK, gin.H{"message": "restarting..."})
+	})
 
 	// DB status endpoint
 	router.GET("/api/db-status", func(c *gin.Context) {
@@ -853,8 +890,20 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 			}
 		}
 
-		// Runtime diagnostics stay local-only. Server table counts are intentionally unavailable here.
-		if !includeCounts || !status.IsConnected {
+		// Optional diagnostics mode with server table counts.
+		if includeCounts && status.IsConnected {
+			if db, err := connMgr.GetDB(); err == nil && db != nil {
+				_ = db.Table("lot").Count(&lotCount)
+				_ = db.Table("lot_log").Count(&lotLogCount)
+				_ = db.Table("qt_lot_metadata").Count(&metadataCount)
+			} else if err != nil {
+				dbOK = false
+				dbError = err.Error()
+			} else {
+				dbOK = false
+				dbError = "Database not connected (offline mode)"
+			}
+		} else {
 			lotCount = 0
 			lotLogCount = 0
 			metadataCount = 0
@@ -870,10 +919,11 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 		})
 	})
 
-	// Current user info (local DB username)
+	// Current user info (DB user, not app user)
 	router.GET("/api/current-user", func(c *gin.Context) {
 		c.JSON(http.StatusOK, gin.H{
 			"username": local.GetDBUser(),
+			"role":     "db_user",
 		})
 	})
 
@@ -894,27 +944,6 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 	router.GET("/pricelists/:id", webHandler.PricelistDetail)
 	router.GET("/partnumber-books", webHandler.PartnumberBooks)
 
-	// Short project URLs: /:code → main variant, /:code/:variant → named variant
-	router.GET("/:code", func(c *gin.Context) {
-		code := c.Param("code")
-		project, err := projectService.GetByCode(code)
-		if err != nil {
-			c.Redirect(http.StatusFound, "/projects")
-			return
-		}
-		c.Redirect(http.StatusFound, "/projects/"+project.UUID)
-	})
-	router.GET("/:code/:variant", func(c *gin.Context) {
-		code := c.Param("code")
-		variant := c.Param("variant")
-		project, err := projectService.GetByCodeAndVariant(code, variant)
-		if err != nil {
-			c.Redirect(http.StatusFound, "/projects")
-			return
-		}
-		c.Redirect(http.StatusFound, "/projects/"+project.UUID)
-	})
-
 	// htmx partials
 	partials := router.Group("/partials")
 	{
@@ -929,8 +958,6 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 			c.JSON(http.StatusOK, gin.H{"message": "pong"})
 		})
 
-		api.GET("/support-bundle", supportBundleHandler.DownloadBundle)
-
 		// Components (public read)
 		components := api.Group("/components")
 		{
@@ -940,7 +967,6 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 
 		// Categories (public)
 		api.GET("/categories", componentHandler.GetCategories)
-		api.GET("/configurator-settings", componentHandler.GetConfiguratorSettings)
 
 		// Quote (public)
 		quote := api.Group("/quote")
@@ -973,9 +999,6 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 			pnBooks.GET("/:id", partnumberBooksHandler.GetItems)
 		}
 
-		// Stateless BOM text parsing shared by paste and file-import paths.
-		api.POST("/vendor-spec/parse-text", vendorSpecHandler.ParseText)
-
 		// Configurations (public - RBAC disabled)
 		configs := api.Group("/configs")
 		{
@@ -993,7 +1016,7 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 
 				cfgs, total, err := configService.ListAllWithStatus(page, perPage, status, search)
 				if err != nil {
-					respondError(c, http.StatusInternalServerError, "internal server error", err)
+					c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 					return
 				}
 
@@ -1014,7 +1037,7 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 						c.JSON(http.StatusServiceUnavailable, gin.H{"error": "Database is offline"})
 						return
 					}
-					respondError(c, http.StatusInternalServerError, "internal server error", err)
+					c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 					return
 				}
 				c.JSON(http.StatusOK, result)
@@ -1023,13 +1046,13 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 			configs.POST("", func(c *gin.Context) {
 				var req services.CreateConfigRequest
 				if err := c.ShouldBindJSON(&req); err != nil {
-					respondError(c, http.StatusBadRequest, "invalid request", err)
+					c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 					return
 				}
 
 				config, err := configService.Create(dbUsername, &req)
 				if err != nil {
-					respondError(c, http.StatusInternalServerError, "internal server error", err)
+					c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 					return
 				}
 
@@ -1039,12 +1062,12 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 			configs.POST("/preview-article", func(c *gin.Context) {
 				var req services.ArticlePreviewRequest
 				if err := c.ShouldBindJSON(&req); err != nil {
-					respondError(c, http.StatusBadRequest, "invalid request", err)
+					c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 					return
 				}
 				result, err := configService.BuildArticlePreview(&req)
 				if err != nil {
-					respondError(c, http.StatusBadRequest, "invalid request", err)
+					c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 					return
 				}
 				c.JSON(http.StatusOK, gin.H{
@@ -1067,7 +1090,7 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 				uuid := c.Param("uuid")
 				var req services.CreateConfigRequest
 				if err := c.ShouldBindJSON(&req); err != nil {
-					respondError(c, http.StatusBadRequest, "invalid request", err)
+					c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 					return
 				}
 
@@ -1075,13 +1098,13 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 				if err != nil {
 					switch {
 					case errors.Is(err, services.ErrConfigNotFound):
-						respondError(c, http.StatusNotFound, "resource not found", err)
+						c.JSON(http.StatusNotFound, gin.H{"error": err.Error()})
 					case errors.Is(err, services.ErrProjectNotFound):
-						respondError(c, http.StatusNotFound, "resource not found", err)
+						c.JSON(http.StatusNotFound, gin.H{"error": err.Error()})
 					case errors.Is(err, services.ErrProjectForbidden):
-						respondError(c, http.StatusForbidden, "access denied", err)
+						c.JSON(http.StatusForbidden, gin.H{"error": err.Error()})
 					default:
-						respondError(c, http.StatusInternalServerError, "internal server error", err)
+						c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 					}
 					return
 				}
@@ -1092,7 +1115,7 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 			configs.DELETE("/:uuid", func(c *gin.Context) {
 				uuid := c.Param("uuid")
 				if err := configService.DeleteNoAuth(uuid); err != nil {
-					respondError(c, http.StatusInternalServerError, "internal server error", err)
+					c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 					return
 				}
 				c.JSON(http.StatusOK, gin.H{"message": "archived"})
@@ -1102,7 +1125,7 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 				uuid := c.Param("uuid")
 				config, err := configService.ReactivateNoAuth(uuid)
 				if err != nil {
-					respondError(c, http.StatusInternalServerError, "internal server error", err)
+					c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 					return
 				}
 				c.JSON(http.StatusOK, gin.H{
@@ -1117,13 +1140,13 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 					Name string `json:"name"`
 				}
 				if err := c.ShouldBindJSON(&req); err != nil {
-					respondError(c, http.StatusBadRequest, "invalid request", err)
+					c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 					return
 				}
 
 				config, err := configService.RenameNoAuth(uuid, req.Name)
 				if err != nil {
-					respondError(c, http.StatusInternalServerError, "internal server error", err)
+					c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 					return
 				}
 
@@ -1137,7 +1160,7 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 					FromVersion int    `json:"from_version"`
 				}
 				if err := c.ShouldBindJSON(&req); err != nil {
-					respondError(c, http.StatusBadRequest, "invalid request", err)
+					c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 					return
 				}
 
@@ -1147,7 +1170,7 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 						c.JSON(http.StatusNotFound, gin.H{"error": "version not found"})
 						return
 					}
-					respondError(c, http.StatusInternalServerError, "internal server error", err)
+					c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 					return
 				}
 
@@ -1156,48 +1179,34 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 
 			configs.POST("/:uuid/refresh-prices", func(c *gin.Context) {
 				uuid := c.Param("uuid")
-				var req struct {
-					PricelistID *uint `json:"pricelist_id"`
-				}
-				// Ignore bind error — pricelist_id is optional
-				_ = c.ShouldBindJSON(&req)
-				config, err := configService.RefreshPricesNoAuth(uuid, req.PricelistID)
+				config, err := configService.RefreshPricesNoAuth(uuid)
 				if err != nil {
-					respondError(c, http.StatusInternalServerError, "internal server error", err)
+					c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 					return
 				}
 				c.JSON(http.StatusOK, config)
 			})
 
-			configs.POST("/:uuid/snapshot", func(c *gin.Context) {
-				uuid := c.Param("uuid")
-				if err := configService.SnapshotCurrentState(uuid); err != nil {
-					respondError(c, http.StatusInternalServerError, "internal server error", err)
-					return
-				}
-				c.JSON(http.StatusOK, gin.H{"ok": true})
-			})
-
 			configs.PATCH("/:uuid/project", func(c *gin.Context) {
 				uuid := c.Param("uuid")
 				var req struct {
 					ProjectUUID string `json:"project_uuid"`
 				}
 				if err := c.ShouldBindJSON(&req); err != nil {
-					respondError(c, http.StatusBadRequest, "invalid request", err)
+					c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 					return
 				}
 				updated, err := configService.SetProjectNoAuth(uuid, req.ProjectUUID)
 				if err != nil {
 					switch {
 					case errors.Is(err, services.ErrConfigNotFound):
-						respondError(c, http.StatusNotFound, "resource not found", err)
+						c.JSON(http.StatusNotFound, gin.H{"error": err.Error()})
 					case errors.Is(err, services.ErrProjectNotFound):
-						respondError(c, http.StatusNotFound, "resource not found", err)
+						c.JSON(http.StatusNotFound, gin.H{"error": err.Error()})
 					case errors.Is(err, services.ErrProjectForbidden):
-						respondError(c, http.StatusForbidden, "access denied", err)
+						c.JSON(http.StatusForbidden, gin.H{"error": err.Error()})
 					default:
-						respondError(c, http.StatusInternalServerError, "internal server error", err)
+						c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 					}
 					return
 				}
@@ -1226,7 +1235,7 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 					case errors.Is(err, services.ErrInvalidVersionNumber):
 						c.JSON(http.StatusBadRequest, gin.H{"error": "invalid paging params"})
 					default:
-						respondError(c, http.StatusInternalServerError, "internal server error", err)
+						c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 					}
 					return
 				}
@@ -1254,7 +1263,7 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 					case errors.Is(err, services.ErrConfigVersionNotFound):
 						c.JSON(http.StatusNotFound, gin.H{"error": "version not found"})
 					default:
-						respondError(c, http.StatusInternalServerError, "internal server error", err)
+						c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 					}
 					return
 				}
@@ -1269,7 +1278,7 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 					Note          string `json:"note"`
 				}
 				if err := c.ShouldBindJSON(&req); err != nil {
-					respondError(c, http.StatusBadRequest, "invalid request", err)
+					c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 					return
 				}
 				if req.TargetVersion <= 0 {
@@ -1287,7 +1296,7 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 					case errors.Is(err, services.ErrVersionConflict):
 						c.JSON(http.StatusConflict, gin.H{"error": "version conflict"})
 					default:
-						respondError(c, http.StatusInternalServerError, "internal server error", err)
+						c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 					}
 					return
 				}
@@ -1309,7 +1318,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)
@@ -1323,12 +1331,12 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 					ServerCount int `json:"server_count" binding:"required,min=1"`
 				}
 				if err := c.ShouldBindJSON(&req); err != nil {
-					respondError(c, http.StatusBadRequest, "invalid request", err)
+					c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 					return
 				}
 				config, err := configService.UpdateServerCount(uuid, req.ServerCount)
 				if err != nil {
-					respondError(c, http.StatusInternalServerError, "internal server error", err)
+					c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 					return
 				}
 				c.JSON(http.StatusOK, config)
@@ -1373,7 +1381,7 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 
 				allProjects, err := projectService.ListByUser(dbUsername, true)
 				if err != nil {
-					respondError(c, http.StatusInternalServerError, "internal server error", err)
+					c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 					return
 				}
 
@@ -1507,7 +1515,7 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 			projects.GET("/all", func(c *gin.Context) {
 				allProjects, err := projectService.ListByUser(dbUsername, true)
 				if err != nil {
-					respondError(c, http.StatusInternalServerError, "internal server error", err)
+					c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 					return
 				}
 
@@ -1537,7 +1545,7 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 			projects.POST("", func(c *gin.Context) {
 				var req services.CreateProjectRequest
 				if err := c.ShouldBindJSON(&req); err != nil {
-					respondError(c, http.StatusBadRequest, "invalid request", err)
+					c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 					return
 				}
 				if strings.TrimSpace(req.Code) == "" {
@@ -1547,14 +1555,10 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 				project, err := projectService.Create(dbUsername, &req)
 				if err != nil {
 					switch {
-					case errors.Is(err, services.ErrReservedMainVariant),
-						errors.Is(err, services.ErrProjectCodeInvalidChars),
-						errors.Is(err, services.ErrProjectVariantInvalidChars):
-						respondError(c, http.StatusBadRequest, "invalid request", err)
 					case errors.Is(err, services.ErrProjectCodeExists):
-						respondError(c, http.StatusConflict, "conflict detected", err)
+						c.JSON(http.StatusConflict, gin.H{"error": err.Error()})
 					default:
-						respondError(c, http.StatusInternalServerError, "internal server error", err)
+						c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 					}
 					return
 				}
@@ -1566,11 +1570,11 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 				if err != nil {
 					switch {
 					case errors.Is(err, services.ErrProjectNotFound):
-						respondError(c, http.StatusNotFound, "resource not found", err)
+						c.JSON(http.StatusNotFound, gin.H{"error": err.Error()})
 					case errors.Is(err, services.ErrProjectForbidden):
-						respondError(c, http.StatusForbidden, "access denied", err)
+						c.JSON(http.StatusForbidden, gin.H{"error": err.Error()})
 					default:
-						respondError(c, http.StatusInternalServerError, "internal server error", err)
+						c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 					}
 					return
 				}
@@ -1580,25 +1584,20 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 			projects.PUT("/:uuid", func(c *gin.Context) {
 				var req services.UpdateProjectRequest
 				if err := c.ShouldBindJSON(&req); err != nil {
-					respondError(c, http.StatusBadRequest, "invalid request", err)
+					c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 					return
 				}
 				project, err := projectService.Update(c.Param("uuid"), dbUsername, &req)
 				if err != nil {
 					switch {
-					case errors.Is(err, services.ErrReservedMainVariant),
-						errors.Is(err, services.ErrCannotRenameMainVariant),
-						errors.Is(err, services.ErrProjectCodeInvalidChars),
-						errors.Is(err, services.ErrProjectVariantInvalidChars):
-						respondError(c, http.StatusBadRequest, "invalid request", err)
 					case errors.Is(err, services.ErrProjectCodeExists):
-						respondError(c, http.StatusConflict, "conflict detected", err)
+						c.JSON(http.StatusConflict, gin.H{"error": err.Error()})
 					case errors.Is(err, services.ErrProjectNotFound):
-						respondError(c, http.StatusNotFound, "resource not found", err)
+						c.JSON(http.StatusNotFound, gin.H{"error": err.Error()})
 					case errors.Is(err, services.ErrProjectForbidden):
-						respondError(c, http.StatusForbidden, "access denied", err)
+						c.JSON(http.StatusForbidden, gin.H{"error": err.Error()})
 					default:
-						respondError(c, http.StatusInternalServerError, "internal server error", err)
+						c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 					}
 					return
 				}
@@ -1609,11 +1608,11 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 				if err := projectService.Archive(c.Param("uuid"), dbUsername); err != nil {
 					switch {
 					case errors.Is(err, services.ErrProjectNotFound):
-						respondError(c, http.StatusNotFound, "resource not found", err)
+						c.JSON(http.StatusNotFound, gin.H{"error": err.Error()})
 					case errors.Is(err, services.ErrProjectForbidden):
-						respondError(c, http.StatusForbidden, "access denied", err)
+						c.JSON(http.StatusForbidden, gin.H{"error": err.Error()})
 					default:
-						respondError(c, http.StatusInternalServerError, "internal server error", err)
+						c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 					}
 					return
 				}
@@ -1624,11 +1623,11 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 				if err := projectService.Reactivate(c.Param("uuid"), dbUsername); err != nil {
 					switch {
 					case errors.Is(err, services.ErrProjectNotFound):
-						respondError(c, http.StatusNotFound, "resource not found", err)
+						c.JSON(http.StatusNotFound, gin.H{"error": err.Error()})
 					case errors.Is(err, services.ErrProjectForbidden):
-						respondError(c, http.StatusForbidden, "access denied", err)
+						c.JSON(http.StatusForbidden, gin.H{"error": err.Error()})
 					default:
-						respondError(c, http.StatusInternalServerError, "internal server error", err)
+						c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 					}
 					return
 				}
@@ -1639,13 +1638,13 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 				if err := projectService.DeleteVariant(c.Param("uuid"), dbUsername); err != nil {
 					switch {
 					case errors.Is(err, services.ErrCannotDeleteMainVariant):
-						respondError(c, http.StatusBadRequest, "invalid request", err)
+						c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 					case errors.Is(err, services.ErrProjectNotFound):
-						respondError(c, http.StatusNotFound, "resource not found", err)
+						c.JSON(http.StatusNotFound, gin.H{"error": err.Error()})
 					case errors.Is(err, services.ErrProjectForbidden):
-						respondError(c, http.StatusForbidden, "access denied", err)
+						c.JSON(http.StatusForbidden, gin.H{"error": err.Error()})
 					default:
-						respondError(c, http.StatusInternalServerError, "internal server error", err)
+						c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 					}
 					return
 				}
@@ -1665,11 +1664,11 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 				if err != nil {
 					switch {
 					case errors.Is(err, services.ErrProjectNotFound):
-						respondError(c, http.StatusNotFound, "resource not found", err)
+						c.JSON(http.StatusNotFound, gin.H{"error": err.Error()})
 					case errors.Is(err, services.ErrProjectForbidden):
-						respondError(c, http.StatusForbidden, "access denied", err)
+						c.JSON(http.StatusForbidden, gin.H{"error": err.Error()})
 					default:
-						respondError(c, http.StatusInternalServerError, "internal server error", err)
+						c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 					}
 					return
 				}
@@ -1682,7 +1681,7 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 					OrderedUUIDs []string `json:"ordered_uuids"`
 				}
 				if err := c.ShouldBindJSON(&req); err != nil {
-					respondError(c, http.StatusBadRequest, "invalid request", err)
+					c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 					return
 				}
 				if len(req.OrderedUUIDs) == 0 {
@@ -1694,9 +1693,9 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 				if err != nil {
 					switch {
 					case errors.Is(err, services.ErrProjectNotFound):
-						respondError(c, http.StatusNotFound, "resource not found", err)
+						c.JSON(http.StatusNotFound, gin.H{"error": err.Error()})
 					default:
-						respondError(c, http.StatusBadRequest, "invalid request", err)
+						c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 					}
 					return
 				}
@@ -1717,7 +1716,7 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 			projects.POST("/:uuid/configs", func(c *gin.Context) {
 				var req services.CreateConfigRequest
 				if err := c.ShouldBindJSON(&req); err != nil {
-					respondError(c, http.StatusBadRequest, "invalid request", err)
+					c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 					return
 				}
 				projectUUID := c.Param("uuid")
@@ -1725,79 +1724,27 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 
 				config, err := configService.Create(dbUsername, &req)
 				if err != nil {
-					respondError(c, http.StatusInternalServerError, "internal server error", err)
+					c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 					return
 				}
 				c.JSON(http.StatusCreated, config)
 			})
 
-			projects.POST("/:uuid/vendor-import", func(c *gin.Context) {
-				c.Request.Body = http.MaxBytesReader(c.Writer, c.Request.Body, vendorImportBodyLimit())
-				fileHeader, err := c.FormFile("file")
-				if err != nil {
-					if isVendorImportTooLarge(0, err) {
-						respondError(c, http.StatusBadRequest, "vendor workspace file exceeds 1 GiB limit", errVendorImportTooLarge)
-						return
-					}
-					respondError(c, http.StatusBadRequest, "file is required", err)
-					return
-				}
-				if isVendorImportTooLarge(fileHeader.Size, nil) {
-					respondError(c, http.StatusBadRequest, "vendor workspace file exceeds 1 GiB limit", errVendorImportTooLarge)
-					return
-				}
-
-				file, err := fileHeader.Open()
-				if err != nil {
-					respondError(c, http.StatusBadRequest, "failed to open uploaded file", err)
-					return
-				}
-				defer file.Close()
-
-				data, err := io.ReadAll(io.LimitReader(file, vendorImportMaxBytes+1))
-				if err != nil {
-					respondError(c, http.StatusBadRequest, "failed to read uploaded file", err)
-					return
-				}
-				if int64(len(data)) > vendorImportMaxBytes {
-					respondError(c, http.StatusBadRequest, "vendor workspace file exceeds 1 GiB limit", errVendorImportTooLarge)
-					return
-				}
-				if !services.IsCFXMLWorkspace(data) && !services.IsQuoteForgeCSV(data) && !services.IsInspurBOM(data) && !services.IsTextBOM(data) {
-					c.JSON(http.StatusBadRequest, gin.H{"error": "unsupported vendor export format"})
-					return
-				}
-
-				result, err := configService.ImportVendorWorkspaceToProject(c.Param("uuid"), fileHeader.Filename, data, dbUsername)
-				if err != nil {
-					switch {
-					case errors.Is(err, services.ErrProjectNotFound):
-						respondError(c, http.StatusNotFound, "resource not found", err)
-					default:
-						respondError(c, http.StatusBadRequest, "invalid request", err)
-					}
-					return
-				}
-
-				c.JSON(http.StatusCreated, result)
-			})
-
 			projects.GET("/:uuid/export", exportHandler.ExportProjectCSV)
-			projects.POST("/:uuid/export", exportHandler.ExportProjectPricingCSV)
 
 			projects.POST("/:uuid/configs/:config_uuid/clone", func(c *gin.Context) {
 				var req struct {
 					Name string `json:"name"`
 				}
 				if err := c.ShouldBindJSON(&req); err != nil {
-					respondError(c, http.StatusBadRequest, "invalid request", err)
+					c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 					return
 				}
 
 				projectUUID := c.Param("uuid")
 				config, err := configService.CloneNoAuthToProject(c.Param("config_uuid"), req.Name, dbUsername, &projectUUID)
 				if err != nil {
-					respondError(c, http.StatusInternalServerError, "internal server error", err)
+					c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 					return
 				}
 				c.JSON(http.StatusCreated, config)
@@ -1871,12 +1818,22 @@ func requestLogger() gin.HandlerFunc {
 		path := c.Request.URL.Path
 		query := c.Request.URL.RawQuery
 
+		blw := &captureResponseWriter{
+			ResponseWriter: c.Writer,
+			body:           bytes.NewBuffer(nil),
+		}
+		c.Writer = blw
+
 		c.Next()
 
 		latency := time.Since(start)
 		status := c.Writer.Status()
 
 		if status >= http.StatusBadRequest {
+			responseBody := strings.TrimSpace(blw.body.String())
+			if len(responseBody) > 2048 {
+				responseBody = responseBody[:2048] + "...(truncated)"
+			}
 			errText := strings.TrimSpace(c.Errors.String())
 
 			slog.Error("request failed",
@@ -1887,6 +1844,7 @@ func requestLogger() gin.HandlerFunc {
 				"latency", latency,
 				"ip", c.ClientIP(),
 				"errors", errText,
+				"response", responseBody,
 			)
 			return
 		}
@@ -1901,3 +1859,22 @@ func requestLogger() gin.HandlerFunc {
 		)
 	}
 }
+
+type captureResponseWriter struct {
+	gin.ResponseWriter
+	body *bytes.Buffer
+}
+
+func (w *captureResponseWriter) Write(b []byte) (int, error) {
+	if len(b) > 0 {
+		_, _ = w.body.Write(b)
+	}
+	return w.ResponseWriter.Write(b)
+}
+
+func (w *captureResponseWriter) WriteString(s string) (int, error) {
+	if s != "" {
+		_, _ = w.body.WriteString(s)
+	}
+	return w.ResponseWriter.WriteString(s)
+}

cmd/qfs/request_logger_test.go

@@ -1,48 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"errors"
-	"log/slog"
-	"net/http"
-	"net/http/httptest"
-	"strings"
-	"testing"
-
-	"github.com/gin-gonic/gin"
-)
-
-func TestRequestLoggerDoesNotLogResponseBody(t *testing.T) {
-	gin.SetMode(gin.TestMode)
-
-	var logBuffer bytes.Buffer
-	previousLogger := slog.Default()
-	slog.SetDefault(slog.New(slog.NewTextHandler(&logBuffer, &slog.HandlerOptions{})))
-	defer slog.SetDefault(previousLogger)
-
-	router := gin.New()
-	router.Use(requestLogger())
-	router.GET("/fail", func(c *gin.Context) {
-		_ = c.Error(errors.New("root cause"))
-		c.JSON(http.StatusBadRequest, gin.H{"error": "do not log this body"})
-	})
-
-	rec := httptest.NewRecorder()
-	req := httptest.NewRequest(http.MethodGet, "/fail?debug=1", nil)
-	router.ServeHTTP(rec, req)
-
-	if rec.Code != http.StatusBadRequest {
-		t.Fatalf("expected 400, got %d", rec.Code)
-	}
-
-	logOutput := logBuffer.String()
-	if !strings.Contains(logOutput, "request failed") {
-		t.Fatalf("expected request failure log, got %q", logOutput)
-	}
-	if strings.Contains(logOutput, "do not log this body") {
-		t.Fatalf("response body leaked into logs: %q", logOutput)
-	}
-	if !strings.Contains(logOutput, "root cause") {
-		t.Fatalf("expected error details in logs, got %q", logOutput)
-	}
-}

cmd/qfs/versioning_api_test.go

@@ -3,12 +3,10 @@ package main
 import (
 	"bytes"
 	"encoding/json"
-	"mime/multipart"
 	"net/http"
 	"net/http/httptest"
 	"os"
 	"path/filepath"
-	"strings"
 	"testing"
 
 	"git.mchus.pro/mchus/quoteforge/internal/config"
@@ -39,7 +37,7 @@ func TestConfigurationVersioningAPI(t *testing.T) {
 
 	cfg := &config.Config{}
 	setConfigDefaults(cfg)
-	router, _, err := setupRouter(cfg, local, connMgr, "tester", nil)
+	router, _, err := setupRouter(cfg, local, connMgr, nil, "tester", nil)
 	if err != nil {
 		t.Fatalf("setup router: %v", err)
 	}
@@ -146,7 +144,7 @@ func TestProjectArchiveHidesConfigsAndCloneIntoProject(t *testing.T) {
 
 	cfg := &config.Config{}
 	setConfigDefaults(cfg)
-	router, _, err := setupRouter(cfg, local, connMgr, "tester", nil)
+	router, _, err := setupRouter(cfg, local, connMgr, nil, "tester", nil)
 	if err != nil {
 		t.Fatalf("setup router: %v", err)
 	}
@@ -240,7 +238,7 @@ func TestConfigMoveToProjectEndpoint(t *testing.T) {
 	local, connMgr, _ := newAPITestStack(t)
 	cfg := &config.Config{}
 	setConfigDefaults(cfg)
-	router, _, err := setupRouter(cfg, local, connMgr, "tester", nil)
+	router, _, err := setupRouter(cfg, local, connMgr, nil, "tester", nil)
 	if err != nil {
 		t.Fatalf("setup router: %v", err)
 	}
@@ -292,88 +290,6 @@ func TestConfigMoveToProjectEndpoint(t *testing.T) {
 	}
 }
 
-func TestVendorImportRejectsOversizedUpload(t *testing.T) {
-	moveToRepoRoot(t)
-
-	prevLimit := vendorImportMaxBytes
-	vendorImportMaxBytes = 128
-	defer func() { vendorImportMaxBytes = prevLimit }()
-
-	local, connMgr, _ := newAPITestStack(t)
-	cfg := &config.Config{}
-	setConfigDefaults(cfg)
-	router, _, err := setupRouter(cfg, local, connMgr, "tester", nil)
-	if err != nil {
-		t.Fatalf("setup router: %v", err)
-	}
-
-	createProjectReq := httptest.NewRequest(http.MethodPost, "/api/projects", bytes.NewReader([]byte(`{"name":"Import Project","code":"IMP"}`)))
-	createProjectReq.Header.Set("Content-Type", "application/json")
-	createProjectRec := httptest.NewRecorder()
-	router.ServeHTTP(createProjectRec, createProjectReq)
-	if createProjectRec.Code != http.StatusCreated {
-		t.Fatalf("create project status=%d body=%s", createProjectRec.Code, createProjectRec.Body.String())
-	}
-
-	var project models.Project
-	if err := json.Unmarshal(createProjectRec.Body.Bytes(), &project); err != nil {
-		t.Fatalf("unmarshal project: %v", err)
-	}
-
-	var body bytes.Buffer
-	writer := multipart.NewWriter(&body)
-	part, err := writer.CreateFormFile("file", "huge.xml")
-	if err != nil {
-		t.Fatalf("create form file: %v", err)
-	}
-	payload := "<CFXML>" + strings.Repeat("A", int(vendorImportMaxBytes)+1) + "</CFXML>"
-	if _, err := part.Write([]byte(payload)); err != nil {
-		t.Fatalf("write multipart payload: %v", err)
-	}
-	if err := writer.Close(); err != nil {
-		t.Fatalf("close multipart writer: %v", err)
-	}
-
-	req := httptest.NewRequest(http.MethodPost, "/api/projects/"+project.UUID+"/vendor-import", &body)
-	req.Header.Set("Content-Type", writer.FormDataContentType())
-	rec := httptest.NewRecorder()
-	router.ServeHTTP(rec, req)
-
-	if rec.Code != http.StatusBadRequest {
-		t.Fatalf("expected 400 for oversized upload, got %d body=%s", rec.Code, rec.Body.String())
-	}
-	if !strings.Contains(rec.Body.String(), "1 GiB") {
-		t.Fatalf("expected size limit message, got %s", rec.Body.String())
-	}
-}
-
-func TestCreateConfigMalformedJSONReturnsGenericError(t *testing.T) {
-	moveToRepoRoot(t)
-
-	local, connMgr, _ := newAPITestStack(t)
-	cfg := &config.Config{}
-	setConfigDefaults(cfg)
-	router, _, err := setupRouter(cfg, local, connMgr, "tester", nil)
-	if err != nil {
-		t.Fatalf("setup router: %v", err)
-	}
-
-	req := httptest.NewRequest(http.MethodPost, "/api/configs", bytes.NewReader([]byte(`{"name":`)))
-	req.Header.Set("Content-Type", "application/json")
-	rec := httptest.NewRecorder()
-	router.ServeHTTP(rec, req)
-
-	if rec.Code != http.StatusBadRequest {
-		t.Fatalf("expected 400 for malformed json, got %d body=%s", rec.Code, rec.Body.String())
-	}
-	if strings.Contains(strings.ToLower(rec.Body.String()), "unexpected eof") {
-		t.Fatalf("expected sanitized error body, got %s", rec.Body.String())
-	}
-	if !strings.Contains(rec.Body.String(), "invalid request") {
-		t.Fatalf("expected generic invalid request message, got %s", rec.Body.String())
-	}
-}
-
 func newAPITestStack(t *testing.T) (*localdb.LocalDB, *db.ConnectionManager, *services.LocalConfigurationService) {
 	t.Helper()
 

config.example.yaml

@@ -1,18 +1,61 @@
-# QuoteForge runtime config
-# Runtime creates a minimal config automatically on first start.
-# This file is only a reference template.
+# QuoteForge Configuration
+# Copy this file to config.yaml and update values
 
 server:
-  host: "127.0.0.1"  # Loopback only; remote HTTP binding is unsupported
+  host: "127.0.0.1"  # Use 0.0.0.0 to listen on all interfaces
   port: 8080
   mode: "release"  # debug | release
   read_timeout: "30s"
   write_timeout: "30s"
 
+database:
+  host: "localhost"
+  port: 3306
+  name: "RFQ_LOG"
+  user: "quoteforge"
+  password: "CHANGE_ME"
+  max_open_conns: 25
+  max_idle_conns: 5
+  conn_max_lifetime: "5m"
+
+auth:
+  jwt_secret: "CHANGE_ME_MIN_32_CHARACTERS_LONG"
+  token_expiry: "24h"
+  refresh_expiry: "168h"  # 7 days
+
+pricing:
+  default_method: "weighted_median"  # median | average | weighted_median
+  default_period_days: 90
+  freshness_green_days: 30
+  freshness_yellow_days: 60
+  freshness_red_days: 90
+  min_quotes_for_median: 3
+  popularity_decay_days: 180
+
+export:
+  temp_dir: "/tmp/quoteforge-exports"
+  max_file_age: "1h"
+  company_name: "Your Company Name"
+
 backup:
   time: "00:00"
 
+alerts:
+  enabled: true
+  check_interval: "1h"
+  high_demand_threshold: 5      # КП за 30 дней
+  trending_threshold_percent: 50 # % роста для алерта
+
+notifications:
+  email_enabled: false
+  smtp_host: "smtp.example.com"
+  smtp_port: 587
+  smtp_user: ""
+  smtp_password: ""
+  from_address: "quoteforge@example.com"
+
 logging:
   level: "info"  # debug | info | warn | error
-  format: "json"  # json | text
-  output: "stdout"  # stdout | stderr | /path/to/file
+  format: "json" # json | text
+  output: "stdout" # stdout | file
+  file_path: "/var/log/quoteforge/app.log"

docs/storage-components-guide.md

@@ -1,213 +0,0 @@
-# Руководство по составлению каталога лотов СХД
-
-## Что такое LOT и зачем он нужен
-
-LOT — это внутренний идентификатор типа компонента в системе QuoteForge.
-
-Каждый LOT представляет одну рыночную позицию и хранит **средневзвешенную рыночную цену**, рассчитанную по историческим данным от поставщиков. Это позволяет получать актуальную оценку стоимости независимо от конкретного поставщика или прайс-листа.
-
-Партномера вендора (Part Number, Feature Code) сами по себе не имеют цены в системе — они **переводятся в LOT** через книгу партномеров. Именно через LOT происходит расценка конфигурации.
-
-**Пример:** Feature Code `B4B9` и Part Number `4C57A14368` — это два разных обозначения одной и той же HIC-карты от Lenovo. Оба маппируются на один LOT `HIC_4pFC32`, у которого есть рыночная цена.
-
----
-
-## Категории и вкладки конфигуратора
-
-Категория LOT определяет, в какой вкладке конфигуратора он появится.
-
-| Код категории | Название | Вкладка | Что сюда относится |
-|---|---|---|---|
-| `ENC` | Storage Enclosure | **Base** | Дисковая полка без контроллера |
-| `DKC` | Disk/Controller Enclosure | **Base** | Контроллерная полка: модель СХД + тип дисков + кол-во слотов + кол-во контроллеров |
-| `CTL` | Storage Controller | **Base** | Контроллер СХД: объём кэша + встроенные хост-порты |
-| `HIC` | Host Interface Card | **PCI** | HIC-карты СХД: интерфейсы подключения (FC, iSCSI, SAS) |
-| `HDD` | HDD | **Storage** | Жёсткие диски (HDD) |
-| `SSD` | SSD | **Storage** | Твердотельные диски (SSD, NVMe) |
-| `ACC` | Accessories | **Accessories** | Кабели подключения, кабели питания |
-| `SW` | Software | **SW** | Программные лицензии |
-| *(прочее)* | — | **Other** | Гарантийные опции, инсталляция |
-
----
-
-## Правила именования LOT
-
-Формат: `КАТЕГОРИЯ_МОДЕЛЬСХД_СПЕЦИФИКА`
-
-- только латиница, цифры и знак `_`
-- регистр — ВЕРХНИЙ
-- без пробелов, дефисов, точек
-- каждый LOT уникален — два разных компонента не могут иметь одинаковое имя
-
-### DKC — контроллерная полка
-
-Специфика: `ТИПДИСКА_СЛОТЫ_NCTRL`
-
-| Пример | Расшифровка |
-|---|---|
-| `DKC_DE4000H_SFF_24_2CTRL` | DE4000H, 24 слота SFF (2.5"), 2 контроллера |
-| `DKC_DE4000H_LFF_12_2CTRL` | DE4000H, 12 слотов LFF (3.5"), 2 контроллера |
-| `DKC_DE4000H_SFF_24_1CTRL` | DE4000H, 24 слота SFF, 1 контроллер (симплекс) |
-
-Обозначения типа диска: `SFF` — 2.5", `LFF` — 3.5", `NVMe` — U.2/U.3.
-
-### CTL — контроллер
-
-Специфика: `КЭШГБ_ПОРТЫТИП` (если встроенные порты есть) или `КЭШГБ_BASE` (если без портов, добавляются через HIC)
-
-| Пример | Расшифровка |
-|---|---|
-| `CTL_DE4000H_32GB_BASE` | 32GB кэш, без встроенных хост-портов |
-| `CTL_DE4000H_8GB_BASE` | 8GB кэш, без встроенных хост-портов |
-| `CTL_MSA2060_8GB_ISCSI10G_4P` | 8GB кэш, встроенные 4× iSCSI 10GbE |
-
-### HIC — HIC-карты (интерфейс подключения)
-
-Специфика: `NpПРОТОКОЛ` — без привязки к модели СХД, по аналогии с серверными `HBA_2pFC16`, `HBA_4pFC32_Gen6`.
-
-| Пример | Расшифровка |
-|---|---|
-| `HIC_4pFC32` | 4 порта FC 32Gb |
-| `HIC_4pFC16` | 4 порта FC 16G/10GbE |
-| `HIC_4p25G_iSCSI` | 4 порта 25G iSCSI |
-| `HIC_4p12G_SAS` | 4 порта SAS 12Gb |
-| `HIC_2p10G_BaseT` | 2 порта 10G Base-T |
-
-### HDD / SSD / NVMe — диски
-
-Диски **не привязываются к модели СХД** — используются существующие LOT из серверного каталога (`HDD_...`, `SSD_...`, `NVME_...`). Новые LOT для дисков СХД не создаются; партномера дисков маппируются на уже существующие серверные LOT.
-
-### ACC — кабели
-
-Кабели **не привязываются к модели СХД**. Формат: `ACC_CABLE_{ТИП}_{ДЛИНА}` — универсальные LOT, одинаковые для серверов и СХД.
-
-| Пример | Расшифровка |
-|---|---|
-| `ACC_CABLE_CAT6_10M` | Кабель CAT6 10м |
-| `ACC_CABLE_FC_OM4_3M` | Кабель FC LC-LC OM4 до 3м |
-| `ACC_CABLE_PWR_C13C14_15M` | Кабель питания C13–C14 1.5м |
-
-### SW — программные лицензии
-
-Специфика: краткое название функции.
-
-| Пример | Расшифровка |
-|---|---|
-| `SW_DE4000H_ASYNC_MIRROR` | Async Mirroring |
-| `SW_DE4000H_SNAPSHOT_512` | Snapshot 512 |
-
----
-
-## Таблица лотов: DE4000H (пример заполнения)
-
-### DKC — контроллерная полка
-
-| lot_name | vendor | model | description | disk_slots | disk_type | controllers |
-|---|---|---|---|---|---|---|
-| `DKC_DE4000H_SFF_24_2CTRL` | Lenovo | DE4000H 2U24 | DE4000H, 24× SFF, 2 контроллера | 24 | SFF | 2 |
-| `DKC_DE4000H_LFF_12_2CTRL` | Lenovo | DE4000H 2U12 | DE4000H, 12× LFF, 2 контроллера | 12 | LFF | 2 |
-
-### CTL — контроллер
-
-| lot_name | vendor | model | description | cache_gb | host_ports |
-|---|---|---|---|---|---|
-| `CTL_DE4000H_32GB_BASE` | Lenovo | DE4000 Controller 32GB Gen2 | Контроллер DE4000, 32GB кэш, без встроенных портов | 32 | — |
-| `CTL_DE4000H_8GB_BASE` | Lenovo | DE4000 Controller 8GB Gen2 | Контроллер DE4000, 8GB кэш, без встроенных портов | 8 | — |
-
-### HIC — HIC-карты
-
-| lot_name | vendor | model | description |
-|---|---|---|---|
-| `HIC_2p10G_BaseT` | Lenovo | HIC 10GBASE-T 2-Ports | HIC 10GBASE-T, 2 порта |
-| `HIC_4p25G_iSCSI` | Lenovo | HIC 10/25GbE iSCSI 4-ports | HIC iSCSI 10/25GbE, 4 порта |
-| `HIC_4p12G_SAS` | Lenovo | HIC 12Gb SAS 4-ports | HIC SAS 12Gb, 4 порта |
-| `HIC_4pFC32` | Lenovo | HIC 32Gb FC 4-ports | HIC FC 32Gb, 4 порта |
-| `HIC_4pFC16` | Lenovo | HIC 16G FC/10GbE 4-ports | HIC FC 16G/10GbE, 4 порта |
-
-### HDD / SSD / NVMe / ACC — диски и кабели
-
-Для дисков и кабелей новые LOT не создаются. Партномера маппируются на существующие серверные LOT из каталога.
-
-### SW — программные лицензии
-
-| lot_name | vendor | model | description |
-|---|---|---|---|
-| `SW_DE4000H_ASYNC_MIRROR` | Lenovo | DE4000H Asynchronous Mirroring | Лицензия Async Mirroring |
-| `SW_DE4000H_SNAPSHOT_512` | Lenovo | DE4000H Snapshot Upgrade 512 | Лицензия Snapshot 512 |
-| `SW_DE4000H_SYNC_MIRROR` | Lenovo | DE4000 Synchronous Mirroring | Лицензия Sync Mirroring |
-
----
-
-## Таблица партномеров: DE4000H (пример заполнения)
-
-Каждый Feature Code и Part Number должен быть привязан к своему LOT.
-Если у компонента есть оба — добавить две строки.
-
-| partnumber | lot_name | описание |
-|---|---|---|
-| `BEY7` | `ENC_2U24_CHASSIS` | Lenovo ThinkSystem Storage 2U24 Chassis |
-| `BQA0` | `CTL_DE4000H_32GB_BASE` | DE4000 Controller 32GB Gen2 |
-| `BQ9Z` | `CTL_DE4000H_8GB_BASE` | DE4000 Controller 8GB Gen2 |
-| `B4B1` | `HIC_2p10G_BaseT` | HIC 10GBASE-T 2-Ports |
-| `4C57A14376` | `HIC_2p10G_BaseT` | HIC 10GBASE-T 2-Ports |
-| `B4BA` | `HIC_4p25G_iSCSI` | HIC 10/25GbE iSCSI 4-ports |
-| `4C57A14369` | `HIC_4p25G_iSCSI` | HIC 10/25GbE iSCSI 4-ports |
-| `B4B8` | `HIC_4p12G_SAS` | HIC 12Gb SAS 4-ports |
-| `4C57A14367` | `HIC_4p12G_SAS` | HIC 12Gb SAS 4-ports |
-| `B4B9` | `HIC_4pFC32` | HIC 32Gb FC 4-ports |
-| `4C57A14368` | `HIC_4pFC32` | HIC 32Gb FC 4-ports |
-| `B4B7` | `HIC_4pFC16` | HIC 16G FC/10GbE 4-ports |
-| `4C57A14366` | `HIC_4pFC16` | HIC 16G FC/10GbE 4-ports |
-| `BW12` | `HDD_SAS_02.4TB` | 2.4TB 10K 2.5" HDD 2U24 |
-| `4XB7A88046` | `HDD_SAS_02.4TB` | 2.4TB 10K 2.5" HDD 2U24 |
-| `B4C0` | `HDD_SAS_01.8TB` | 1.8TB 10K 2.5" HDD SED FIPS |
-| `4XB7A14114` | `HDD_SAS_01.8TB` | 1.8TB 10K 2.5" HDD SED FIPS |
-| `BW13` | `HDD_SAS_02.4TB` | 2.4TB 10K 2.5" HDD FIPS |
-| `4XB7A88048` | `HDD_SAS_02.4TB` | 2.4TB 10K 2.5" HDD FIPS |
-| `BKUQ` | `SSD_SAS_0.960T` | 960GB 1DWD 2.5" SSD |
-| `4XB7A74948` | `SSD_SAS_0.960T` | 960GB 1DWD 2.5" SSD |
-| `BKUT` | `SSD_SAS_01.92T` | 1.92TB 1DWD 2.5" SSD |
-| `4XB7A74951` | `SSD_SAS_01.92T` | 1.92TB 1DWD 2.5" SSD |
-| `BKUK` | `SSD_SAS_03.84T` | 3.84TB 1DWD 2.5" SSD |
-| `4XB7A74955` | `SSD_SAS_03.84T` | 3.84TB 1DWD 2.5" SSD |
-| `B4RY` | `SSD_SAS_07.68T` | 7.68TB 1DWD 2.5" SSD |
-| `4XB7A14176` | `SSD_SAS_07.68T` | 7.68TB 1DWD 2.5" SSD |
-| `B4CD` | `SSD_SAS_15.36T` | 15.36TB 1DWD 2.5" SSD |
-| `4XB7A14110` | `SSD_SAS_15.36T` | 15.36TB 1DWD 2.5" SSD |
-| `BWCJ` | `SSD_SAS_03.84T` | 3.84TB 1DWD 2.5" SSD FIPS |
-| `4XB7A88469` | `SSD_SAS_03.84T` | 3.84TB 1DWD 2.5" SSD FIPS |
-| `BW2B` | `SSD_SAS_15.36T` | 15.36TB 1DWD 2.5" SSD SED |
-| `4XB7A88466` | `SSD_SAS_15.36T` | 15.36TB 1DWD 2.5" SSD SED |
-| `AVFW` | `ACC_CABLE_CAT6_1M` | CAT6 0.75-1.5m |
-| `A1MT` | `ACC_CABLE_CAT6_10M` | CAT6 10m |
-| `90Y3718` | `ACC_CABLE_CAT6_10M` | CAT6 10m |
-| `A1MW` | `ACC_CABLE_CAT6_25M` | CAT6 25m |
-| `90Y3727` | `ACC_CABLE_CAT6_25M` | CAT6 25m |
-| `39Y7937` | `ACC_CABLE_PWR_C13C14_15M` | C13–C14 1.5m |
-| `39Y7938` | `ACC_CABLE_PWR_C13C20_28M` | C13–C20 2.8m |
-| `4L67A08371` | `ACC_CABLE_PWR_C13C14_43M` | C13–C14 4.3m |
-| `C932` | `SW_DE4000H_ASYNC_MIRROR` | DE4000H Asynchronous Mirroring |
-| `00WE123` | `SW_DE4000H_ASYNC_MIRROR` | DE4000H Asynchronous Mirroring |
-| `C930` | `SW_DE4000H_SNAPSHOT_512` | DE4000H Snapshot Upgrade 512 |
-| `C931` | `SW_DE4000H_SYNC_MIRROR` | DE4000 Synchronous Mirroring |
-
----
-
-## Шаблон для новых моделей СХД
-
-```
-DKC_МОДЕЛЬ_ТИПДИСКА_СЛОТЫ_NCTRL   — контроллерная полка
-CTL_МОДЕЛЬ_КЭШГБ_ПОРТЫ            — контроллер
-HIC_МОДЕЛЬ_ПРОТОКОЛ_СКОРОСТЬ_ПОРТЫ — HIC-карта (интерфейс подключения)
-SW_МОДЕЛЬ_ФУНКЦИЯ                 — лицензия
-```
-
-Диски (HDD/SSD/NVMe) и кабели (ACC) — маппируются на существующие серверные LOT, новые не создаются.
-
-Пример для HPE MSA 2060:
-```
-DKC_MSA2060_SFF_24_2CTRL
-CTL_MSA2060_8GB_ISCSI10G_4P
-HIC_MSA2060_FC32G_2P
-SW_MSA2060_REMOTE_SNAP
-```

go.mod

@@ -5,8 +5,9 @@ go 1.24.0
 require (
 	github.com/gin-gonic/gin v1.9.1
 	github.com/glebarez/sqlite v1.11.0
-	github.com/go-sql-driver/mysql v1.7.1
+	github.com/golang-jwt/jwt/v5 v5.3.0
 	github.com/google/uuid v1.6.0
+	golang.org/x/crypto v0.43.0
 	gopkg.in/yaml.v3 v3.0.1
 	gorm.io/driver/mysql v1.5.2
 	gorm.io/gorm v1.25.7
@@ -22,6 +23,7 @@ require (
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-playground/validator/v10 v10.14.0 // indirect
+	github.com/go-sql-driver/mysql v1.7.1 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
@@ -37,7 +39,6 @@ require (
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.11 // indirect
 	golang.org/x/arch v0.3.0 // indirect
-	golang.org/x/crypto v0.43.0 // indirect
 	golang.org/x/net v0.46.0 // indirect
 	golang.org/x/sys v0.37.0 // indirect
 	golang.org/x/text v0.30.0 // indirect

go.sum

@@ -32,6 +32,8 @@ github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrt
 github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
 github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
 github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo=
+github.com/golang-jwt/jwt/v5 v5.3.0/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=

internal/appstate/backup.go

@@ -10,10 +10,6 @@ import (
 	"sort"
 	"strings"
 	"time"
-
-	"github.com/glebarez/sqlite"
-	"gorm.io/gorm"
-	"gorm.io/gorm/logger"
 )
 
 type backupPeriod struct {
@@ -92,9 +88,6 @@ func EnsureRotatingLocalBackup(dbPath, configPath string) ([]string, error) {
 	}
 
 	root := resolveBackupRoot(dbPath)
-	if err := validateBackupRoot(root); err != nil {
-		return nil, err
-	}
 	now := backupNow()
 
 	created := make([]string, 0)
@@ -118,40 +111,6 @@ func resolveBackupRoot(dbPath string) string {
 	return filepath.Join(filepath.Dir(dbPath), "backups")
 }
 
-func validateBackupRoot(root string) error {
-	absRoot, err := filepath.Abs(root)
-	if err != nil {
-		return fmt.Errorf("resolve backup root: %w", err)
-	}
-
-	if gitRoot, ok := findGitWorktreeRoot(absRoot); ok {
-		return fmt.Errorf("backup root must stay outside git worktree: %s is inside %s", absRoot, gitRoot)
-	}
-
-	return nil
-}
-
-func findGitWorktreeRoot(path string) (string, bool) {
-	current := filepath.Clean(path)
-	info, err := os.Stat(current)
-	if err == nil && !info.IsDir() {
-		current = filepath.Dir(current)
-	}
-
-	for {
-		gitPath := filepath.Join(current, ".git")
-		if _, err := os.Stat(gitPath); err == nil {
-			return current, true
-		}
-
-		parent := filepath.Dir(current)
-		if parent == current {
-			return "", false
-		}
-		current = parent
-	}
-}
-
 func isBackupDisabled() bool {
 	val := strings.ToLower(strings.TrimSpace(os.Getenv(envBackupDisable)))
 	return val == "1" || val == "true" || val == "yes"
@@ -254,12 +213,6 @@ func pruneOldBackups(periodDir string, keep int) error {
 }
 
 func createBackupArchive(destPath, dbPath, configPath string) error {
-	snapshotPath, cleanup, err := createSQLiteSnapshot(dbPath)
-	if err != nil {
-		return err
-	}
-	defer cleanup()
-
 	file, err := os.Create(destPath)
 	if err != nil {
 		return err
@@ -267,10 +220,12 @@ func createBackupArchive(destPath, dbPath, configPath string) error {
 	defer file.Close()
 
 	zipWriter := zip.NewWriter(file)
-	if err := addZipFileAs(zipWriter, snapshotPath, filepath.Base(dbPath)); err != nil {
+	if err := addZipFile(zipWriter, dbPath); err != nil {
 		_ = zipWriter.Close()
 		return err
 	}
+	_ = addZipOptionalFile(zipWriter, dbPath+"-wal")
+	_ = addZipOptionalFile(zipWriter, dbPath+"-shm")
 
 	if strings.TrimSpace(configPath) != "" {
 		_ = addZipOptionalFile(zipWriter, configPath)
@@ -282,77 +237,6 @@ func createBackupArchive(destPath, dbPath, configPath string) error {
 	return file.Sync()
 }
 
-func createSQLiteSnapshot(dbPath string) (string, func(), error) {
-	tempFile, err := os.CreateTemp("", "qfs-backup-*.db")
-	if err != nil {
-		return "", func() {}, err
-	}
-	tempPath := tempFile.Name()
-	if err := tempFile.Close(); err != nil {
-		_ = os.Remove(tempPath)
-		return "", func() {}, err
-	}
-	if err := os.Remove(tempPath); err != nil && !os.IsNotExist(err) {
-		return "", func() {}, err
-	}
-
-	cleanup := func() {
-		_ = os.Remove(tempPath)
-	}
-
-	db, err := gorm.Open(sqlite.Open(dbPath), &gorm.Config{
-		Logger: logger.Default.LogMode(logger.Silent),
-	})
-	if err != nil {
-		cleanup()
-		return "", func() {}, err
-	}
-
-	sqlDB, err := db.DB()
-	if err != nil {
-		cleanup()
-		return "", func() {}, err
-	}
-	defer sqlDB.Close()
-
-	if err := db.Exec("PRAGMA busy_timeout = 5000").Error; err != nil {
-		cleanup()
-		return "", func() {}, fmt.Errorf("configure sqlite busy_timeout: %w", err)
-	}
-
-	literalPath := strings.ReplaceAll(tempPath, "'", "''")
-	if err := vacuumIntoWithRetry(db, literalPath); err != nil {
-		cleanup()
-		return "", func() {}, err
-	}
-
-	return tempPath, cleanup, nil
-}
-
-func vacuumIntoWithRetry(db *gorm.DB, literalPath string) error {
-	var lastErr error
-	for attempt := 0; attempt < 3; attempt++ {
-		if err := db.Exec("VACUUM INTO '" + literalPath + "'").Error; err != nil {
-			lastErr = err
-			if !isSQLiteBusyError(err) {
-				return fmt.Errorf("create sqlite snapshot: %w", err)
-			}
-			time.Sleep(time.Duration(attempt+1) * 250 * time.Millisecond)
-			continue
-		}
-		return nil
-	}
-	return fmt.Errorf("create sqlite snapshot after retries: %w", lastErr)
-}
-
-func isSQLiteBusyError(err error) bool {
-	if err == nil {
-		return false
-	}
-	lower := strings.ToLower(err.Error())
-	return strings.Contains(lower, "database is locked") || strings.Contains(lower, "database is busy")
-}
-
 func addZipOptionalFile(writer *zip.Writer, path string) error {
 	if _, err := os.Stat(path); err != nil {
 		return nil
@@ -361,10 +245,6 @@ func addZipOptionalFile(writer *zip.Writer, path string) error {
 }
 
 func addZipFile(writer *zip.Writer, path string) error {
-	return addZipFileAs(writer, path, filepath.Base(path))
-}
-
-func addZipFileAs(writer *zip.Writer, path string, archiveName string) error {
 	in, err := os.Open(path)
 	if err != nil {
 		return err
@@ -380,7 +260,7 @@ func addZipFileAs(writer *zip.Writer, path string, archiveName string) error {
 	if err != nil {
 		return err
 	}
-	header.Name = archiveName
+	header.Name = filepath.Base(path)
 	header.Method = zip.Deflate
 
 	out, err := writer.CreateHeader(header)

internal/appstate/backup_test.go

@@ -1,15 +1,10 @@
 package appstate
 
 import (
-	"archive/zip"
 	"os"
 	"path/filepath"
-	"strings"
 	"testing"
 	"time"
-
-	"github.com/glebarez/sqlite"
-	"gorm.io/gorm"
 )
 
 func TestEnsureRotatingLocalBackupCreatesAndRotates(t *testing.T) {
@@ -17,8 +12,8 @@ func TestEnsureRotatingLocalBackupCreatesAndRotates(t *testing.T) {
 	dbPath := filepath.Join(temp, "qfs.db")
 	cfgPath := filepath.Join(temp, "config.yaml")
 
-	if err := writeTestSQLiteDB(dbPath); err != nil {
-		t.Fatalf("write sqlite db: %v", err)
+	if err := os.WriteFile(dbPath, []byte("db"), 0644); err != nil {
+		t.Fatalf("write db: %v", err)
 	}
 	if err := os.WriteFile(cfgPath, []byte("cfg"), 0644); err != nil {
 		t.Fatalf("write config: %v", err)
@@ -40,7 +35,6 @@ func TestEnsureRotatingLocalBackupCreatesAndRotates(t *testing.T) {
 	if _, err := os.Stat(dailyArchive); err != nil {
 		t.Fatalf("daily archive missing: %v", err)
 	}
-	assertZipContains(t, dailyArchive, "qfs.db", "config.yaml")
 
 	backupNow = func() time.Time { return time.Date(2026, 2, 12, 10, 0, 0, 0, time.UTC) }
 	created, err = EnsureRotatingLocalBackup(dbPath, cfgPath)
@@ -62,8 +56,8 @@ func TestEnsureRotatingLocalBackupEnvControls(t *testing.T) {
 	dbPath := filepath.Join(temp, "qfs.db")
 	cfgPath := filepath.Join(temp, "config.yaml")
 
-	if err := writeTestSQLiteDB(dbPath); err != nil {
-		t.Fatalf("write sqlite db: %v", err)
+	if err := os.WriteFile(dbPath, []byte("db"), 0644); err != nil {
+		t.Fatalf("write db: %v", err)
 	}
 	if err := os.WriteFile(cfgPath, []byte("cfg"), 0644); err != nil {
 		t.Fatalf("write config: %v", err)
@@ -75,7 +69,7 @@ func TestEnsureRotatingLocalBackupEnvControls(t *testing.T) {
 	if _, err := EnsureRotatingLocalBackup(dbPath, cfgPath); err != nil {
 		t.Fatalf("backup with env: %v", err)
 	}
-	if _, err := os.Stat(filepath.Join(backupRoot, "daily", ".period.json")); err != nil {
+	if _, err := os.Stat(filepath.Join(backupRoot, "daily", "meta.json")); err != nil {
 		t.Fatalf("expected backup in custom dir: %v", err)
 	}
 
@@ -83,75 +77,7 @@ func TestEnsureRotatingLocalBackupEnvControls(t *testing.T) {
 	if _, err := EnsureRotatingLocalBackup(dbPath, cfgPath); err != nil {
 		t.Fatalf("backup disabled: %v", err)
 	}
-	if _, err := os.Stat(filepath.Join(backupRoot, "daily", ".period.json")); err != nil {
+	if _, err := os.Stat(filepath.Join(backupRoot, "daily", "meta.json")); err != nil {
 		t.Fatalf("backup should remain from previous run: %v", err)
 	}
 }
-
-func TestEnsureRotatingLocalBackupRejectsGitWorktree(t *testing.T) {
-	temp := t.TempDir()
-	repoRoot := filepath.Join(temp, "repo")
-	if err := os.MkdirAll(filepath.Join(repoRoot, ".git"), 0755); err != nil {
-		t.Fatalf("mkdir git dir: %v", err)
-	}
-
-	dbPath := filepath.Join(repoRoot, "data", "qfs.db")
-	cfgPath := filepath.Join(repoRoot, "data", "config.yaml")
-	if err := os.MkdirAll(filepath.Dir(dbPath), 0755); err != nil {
-		t.Fatalf("mkdir data dir: %v", err)
-	}
-	if err := writeTestSQLiteDB(dbPath); err != nil {
-		t.Fatalf("write sqlite db: %v", err)
-	}
-	if err := os.WriteFile(cfgPath, []byte("cfg"), 0644); err != nil {
-		t.Fatalf("write cfg: %v", err)
-	}
-
-	_, err := EnsureRotatingLocalBackup(dbPath, cfgPath)
-	if err == nil {
-		t.Fatal("expected git worktree backup root to be rejected")
-	}
-	if !strings.Contains(err.Error(), "outside git worktree") {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func writeTestSQLiteDB(path string) error {
-	db, err := gorm.Open(sqlite.Open(path), &gorm.Config{})
-	if err != nil {
-		return err
-	}
-	sqlDB, err := db.DB()
-	if err != nil {
-		return err
-	}
-	defer sqlDB.Close()
-
-	return db.Exec(`
-		CREATE TABLE sample_items (
-			id INTEGER PRIMARY KEY AUTOINCREMENT,
-			name TEXT NOT NULL
-		);
-		INSERT INTO sample_items(name) VALUES ('backup');
-	`).Error
-}
-
-func assertZipContains(t *testing.T, archivePath string, expected ...string) {
-	t.Helper()
-
-	reader, err := zip.OpenReader(archivePath)
-	if err != nil {
-		t.Fatalf("open archive: %v", err)
-	}
-	defer reader.Close()
-
-	found := make(map[string]bool, len(reader.File))
-	for _, file := range reader.File {
-		found[file.Name] = true
-	}
-	for _, name := range expected {
-		if !found[name] {
-			t.Fatalf("archive %s missing %s", archivePath, name)
-		}
-	}
-}

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
@@ -349,60 +329,33 @@ func parseGPUModel(lotName string) string {
 	}
 	parts := strings.Split(upper, "_")
 	model := ""
-	numSuffix := ""
 	mem := ""
 	for i, p := range parts {
 		if p == "" {
 			continue
 		}
 		switch p {
-		case "NV", "NVIDIA", "INTEL", "AMD", "RADEON", "PCIE", "PCI", "SXM", "SXMX", "SFF", "LOVELACE":
-			continue
-		case "ADA", "AMPERE", "HOPPER", "BLACKWELL":
-			if model != "" {
-				archAbbr := map[string]string{
-					"ADA": "ADA", "AMPERE": "AMP", "HOPPER": "HOP", "BLACKWELL": "BWL",
-				}
-				numSuffix += archAbbr[p]
-			}
+		case "NV", "NVIDIA", "INTEL", "AMD", "RADEON", "PCIE", "PCI", "SXM", "SXMX":
 			continue
 		default:
 			if strings.Contains(p, "GB") {
 				mem = p
 				continue
 			}
-			if model == "" && i > 0 {
+			if model == "" && (i > 0) {
 				model = p
-			} else if model != "" && numSuffix == "" && isNumeric(p) {
-				numSuffix = p
 			}
 		}
 	}
-	full := model
-	if numSuffix != "" {
-		full = model + numSuffix
+	if model != "" && mem != "" {
+		return model + "_" + mem
 	}
-	if full != "" && mem != "" {
-		return full + "_" + mem
-	}
-	if full != "" {
-		return full
+	if model != "" {
+		return model
 	}
 	return normalizeModelToken(lotName)
 }
 
-func isNumeric(s string) bool {
-	if s == "" {
-		return false
-	}
-	for _, r := range s {
-		if r < '0' || r > '9' {
-			return false
-		}
-	}
-	return true
-}
-
 func parseMemGiB(lotName string) int {
 	if m := reMemTiB.FindStringSubmatch(lotName); len(m) == 3 {
 		return atoi(m[1]) * 1024
@@ -504,50 +457,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/config/config.go

@@ -7,14 +7,20 @@ import (
 	"strconv"
 	"time"
 
+	mysqlDriver "github.com/go-sql-driver/mysql"
 	"gopkg.in/yaml.v3"
 )
 
 type Config struct {
-	Server  ServerConfig  `yaml:"server"`
-	Export  ExportConfig  `yaml:"export"`
-	Logging LoggingConfig `yaml:"logging"`
-	Backup  BackupConfig  `yaml:"backup"`
+	Server        ServerConfig        `yaml:"server"`
+	Database      DatabaseConfig      `yaml:"database"`
+	Auth          AuthConfig          `yaml:"auth"`
+	Pricing       PricingConfig       `yaml:"pricing"`
+	Export        ExportConfig        `yaml:"export"`
+	Alerts        AlertsConfig        `yaml:"alerts"`
+	Notifications NotificationsConfig `yaml:"notifications"`
+	Logging       LoggingConfig       `yaml:"logging"`
+	Backup        BackupConfig        `yaml:"backup"`
 }
 
 type ServerConfig struct {
@@ -25,6 +31,70 @@ type ServerConfig struct {
 	WriteTimeout time.Duration `yaml:"write_timeout"`
 }
 
+type DatabaseConfig struct {
+	Host            string        `yaml:"host"`
+	Port            int           `yaml:"port"`
+	Name            string        `yaml:"name"`
+	User            string        `yaml:"user"`
+	Password        string        `yaml:"password"`
+	MaxOpenConns    int           `yaml:"max_open_conns"`
+	MaxIdleConns    int           `yaml:"max_idle_conns"`
+	ConnMaxLifetime time.Duration `yaml:"conn_max_lifetime"`
+}
+
+func (d *DatabaseConfig) DSN() string {
+	cfg := mysqlDriver.NewConfig()
+	cfg.User = d.User
+	cfg.Passwd = d.Password
+	cfg.Net = "tcp"
+	cfg.Addr = net.JoinHostPort(d.Host, strconv.Itoa(d.Port))
+	cfg.DBName = d.Name
+	cfg.ParseTime = true
+	cfg.Loc = time.Local
+	cfg.Params = map[string]string{
+		"charset": "utf8mb4",
+	}
+	return cfg.FormatDSN()
+}
+
+type AuthConfig struct {
+	JWTSecret     string        `yaml:"jwt_secret"`
+	TokenExpiry   time.Duration `yaml:"token_expiry"`
+	RefreshExpiry time.Duration `yaml:"refresh_expiry"`
+}
+
+type PricingConfig struct {
+	DefaultMethod       string `yaml:"default_method"`
+	DefaultPeriodDays   int    `yaml:"default_period_days"`
+	FreshnessGreenDays  int    `yaml:"freshness_green_days"`
+	FreshnessYellowDays int    `yaml:"freshness_yellow_days"`
+	FreshnessRedDays    int    `yaml:"freshness_red_days"`
+	MinQuotesForMedian  int    `yaml:"min_quotes_for_median"`
+	PopularityDecayDays int    `yaml:"popularity_decay_days"`
+}
+
+type ExportConfig struct {
+	TempDir     string        `yaml:"temp_dir"`
+	MaxFileAge  time.Duration `yaml:"max_file_age"`
+	CompanyName string        `yaml:"company_name"`
+}
+
+type AlertsConfig struct {
+	Enabled                  bool          `yaml:"enabled"`
+	CheckInterval            time.Duration `yaml:"check_interval"`
+	HighDemandThreshold      int           `yaml:"high_demand_threshold"`
+	TrendingThresholdPercent int           `yaml:"trending_threshold_percent"`
+}
+
+type NotificationsConfig struct {
+	EmailEnabled bool   `yaml:"email_enabled"`
+	SMTPHost     string `yaml:"smtp_host"`
+	SMTPPort     int    `yaml:"smtp_port"`
+	SMTPUser     string `yaml:"smtp_user"`
+	SMTPPassword string `yaml:"smtp_password"`
+	FromAddress  string `yaml:"from_address"`
+}
+
 type LoggingConfig struct {
 	Level    string `yaml:"level"`
 	Format   string `yaml:"format"`
@@ -32,10 +102,6 @@ type LoggingConfig struct {
 	FilePath string `yaml:"file_path"`
 }
 
-// ExportConfig is kept for constructor compatibility in export services.
-// Runtime no longer persists an export section in config.yaml.
-type ExportConfig struct{}
-
 type BackupConfig struct {
 	Time string `yaml:"time"`
 }
@@ -73,6 +139,45 @@ func (c *Config) setDefaults() {
 		c.Server.WriteTimeout = 30 * time.Second
 	}
 
+	if c.Database.Port == 0 {
+		c.Database.Port = 3306
+	}
+	if c.Database.MaxOpenConns == 0 {
+		c.Database.MaxOpenConns = 25
+	}
+	if c.Database.MaxIdleConns == 0 {
+		c.Database.MaxIdleConns = 5
+	}
+	if c.Database.ConnMaxLifetime == 0 {
+		c.Database.ConnMaxLifetime = 5 * time.Minute
+	}
+
+	if c.Auth.TokenExpiry == 0 {
+		c.Auth.TokenExpiry = 24 * time.Hour
+	}
+	if c.Auth.RefreshExpiry == 0 {
+		c.Auth.RefreshExpiry = 7 * 24 * time.Hour
+	}
+
+	if c.Pricing.DefaultMethod == "" {
+		c.Pricing.DefaultMethod = "weighted_median"
+	}
+	if c.Pricing.DefaultPeriodDays == 0 {
+		c.Pricing.DefaultPeriodDays = 90
+	}
+	if c.Pricing.FreshnessGreenDays == 0 {
+		c.Pricing.FreshnessGreenDays = 30
+	}
+	if c.Pricing.FreshnessYellowDays == 0 {
+		c.Pricing.FreshnessYellowDays = 60
+	}
+	if c.Pricing.FreshnessRedDays == 0 {
+		c.Pricing.FreshnessRedDays = 90
+	}
+	if c.Pricing.MinQuotesForMedian == 0 {
+		c.Pricing.MinQuotesForMedian = 3
+	}
+
 	if c.Logging.Level == "" {
 		c.Logging.Level = "info"
 	}
@@ -89,5 +194,5 @@ func (c *Config) setDefaults() {
 }
 
 func (c *Config) Address() string {
-	return net.JoinHostPort(c.Server.Host, strconv.Itoa(c.Server.Port))
+	return fmt.Sprintf("%s:%d", c.Server.Host, c.Server.Port)
 }

internal/db/connection.go

@@ -238,22 +238,6 @@ func (cm *ConnectionManager) Disconnect() {
 	cm.lastError = nil
 }
 
-// MarkOffline closes the current connection and preserves the last observed error.
-func (cm *ConnectionManager) MarkOffline(err error) {
-	cm.mu.Lock()
-	defer cm.mu.Unlock()
-
-	if cm.db != nil {
-		sqlDB, dbErr := cm.db.DB()
-		if dbErr == nil {
-			sqlDB.Close()
-		}
-	}
-	cm.db = nil
-	cm.lastError = err
-	cm.lastCheck = time.Now()
-}
-
 // GetLastError returns the last connection error (thread-safe)
 func (cm *ConnectionManager) GetLastError() error {
 	cm.mu.RLock()

internal/db/validate.go

@@ -1,60 +0,0 @@
-package db
-
-import (
-	"errors"
-	"fmt"
-	"time"
-
-	gormmysql "gorm.io/driver/mysql"
-	"gorm.io/gorm"
-	"gorm.io/gorm/logger"
-)
-
-var errPermissionProbeRollback = errors.New("permission probe rollback")
-
-// ValidateMariaDBConnection opens a one-off connection using dsn, pings, checks
-// the required lot table exists, and probes write access to qt_client_schema_state.
-// Returns (lot row count, canWrite, error).
-func ValidateMariaDBConnection(dsn string) (int64, bool, error) {
-	db, err := gorm.Open(gormmysql.Open(dsn), &gorm.Config{
-		Logger: logger.Default.LogMode(logger.Silent),
-	})
-	if err != nil {
-		return 0, false, fmt.Errorf("open MariaDB connection: %w", err)
-	}
-
-	sqlDB, err := db.DB()
-	if err != nil {
-		return 0, false, fmt.Errorf("get database handle: %w", err)
-	}
-	defer sqlDB.Close()
-
-	if err := sqlDB.Ping(); err != nil {
-		return 0, false, fmt.Errorf("ping MariaDB: %w", err)
-	}
-
-	var lotCount int64
-	if err := db.Table("lot").Count(&lotCount).Error; err != nil {
-		return 0, false, fmt.Errorf("check required table lot: %w", err)
-	}
-
-	return lotCount, testSyncWritePermission(db), nil
-}
-
-func testSyncWritePermission(db *gorm.DB) bool {
-	sentinel := fmt.Sprintf("quoteforge-permission-check-%d", time.Now().UnixNano())
-	err := db.Transaction(func(tx *gorm.DB) error {
-		if err := tx.Exec(`
-			INSERT INTO qt_client_schema_state (username, hostname, last_checked_at, updated_at)
-			VALUES (?, ?, NOW(), NOW())
-			ON DUPLICATE KEY UPDATE
-				last_checked_at = VALUES(last_checked_at),
-				updated_at = VALUES(updated_at)
-		`, sentinel, "setup-check").Error; err != nil {
-			return err
-		}
-		return errPermissionProbeRollback
-	})
-
-	return errors.Is(err, errPermissionProbeRollback)
-}

internal/handlers/auth.go

@@ -0,0 +1,113 @@
+package handlers
+
+import (
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+	"git.mchus.pro/mchus/quoteforge/internal/middleware"
+	"git.mchus.pro/mchus/quoteforge/internal/repository"
+	"git.mchus.pro/mchus/quoteforge/internal/services"
+)
+
+type AuthHandler struct {
+	authService *services.AuthService
+	userRepo    *repository.UserRepository
+}
+
+func NewAuthHandler(authService *services.AuthService, userRepo *repository.UserRepository) *AuthHandler {
+	return &AuthHandler{
+		authService: authService,
+		userRepo:    userRepo,
+	}
+}
+
+type LoginRequest struct {
+	Username string `json:"username" binding:"required"`
+	Password string `json:"password" binding:"required"`
+}
+
+type LoginResponse struct {
+	AccessToken  string `json:"access_token"`
+	RefreshToken string `json:"refresh_token"`
+	ExpiresAt    int64  `json:"expires_at"`
+	User         UserResponse `json:"user"`
+}
+
+type UserResponse struct {
+	ID       uint   `json:"id"`
+	Username string `json:"username"`
+	Email    string `json:"email"`
+	Role     string `json:"role"`
+}
+
+func (h *AuthHandler) Login(c *gin.Context) {
+	var req LoginRequest
+	if err := c.ShouldBindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+		return
+	}
+
+	tokens, user, err := h.authService.Login(req.Username, req.Password)
+	if err != nil {
+		c.JSON(http.StatusUnauthorized, gin.H{"error": err.Error()})
+		return
+	}
+
+	c.JSON(http.StatusOK, LoginResponse{
+		AccessToken:  tokens.AccessToken,
+		RefreshToken: tokens.RefreshToken,
+		ExpiresAt:    tokens.ExpiresAt,
+		User: UserResponse{
+			ID:       user.ID,
+			Username: user.Username,
+			Email:    user.Email,
+			Role:     string(user.Role),
+		},
+	})
+}
+
+type RefreshRequest struct {
+	RefreshToken string `json:"refresh_token" binding:"required"`
+}
+
+func (h *AuthHandler) Refresh(c *gin.Context) {
+	var req RefreshRequest
+	if err := c.ShouldBindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+		return
+	}
+
+	tokens, err := h.authService.RefreshTokens(req.RefreshToken)
+	if err != nil {
+		c.JSON(http.StatusUnauthorized, gin.H{"error": err.Error()})
+		return
+	}
+
+	c.JSON(http.StatusOK, tokens)
+}
+
+func (h *AuthHandler) Me(c *gin.Context) {
+	claims := middleware.GetClaims(c)
+	if claims == nil {
+		c.JSON(http.StatusUnauthorized, gin.H{"error": "not authenticated"})
+		return
+	}
+
+	user, err := h.userRepo.GetByID(claims.UserID)
+	if err != nil {
+		c.JSON(http.StatusNotFound, gin.H{"error": "user not found"})
+		return
+	}
+
+	c.JSON(http.StatusOK, UserResponse{
+		ID:       user.ID,
+		Username: user.Username,
+		Email:    user.Email,
+		Role:     string(user.Role),
+	})
+}
+
+func (h *AuthHandler) Logout(c *gin.Context) {
+	// JWT is stateless, logout is handled on client by discarding tokens
+	c.JSON(http.StatusOK, gin.H{"message": "logged out"})
+}

internal/handlers/component.go

@@ -49,7 +49,7 @@ func (h *ComponentHandler) List(c *gin.Context) {
 	offset := (page - 1) * perPage
 	localComps, total, err := h.localDB.ListComponents(localFilter, offset, perPage)
 	if err != nil {
-		RespondError(c, http.StatusInternalServerError, "internal server error", err)
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
 	}
 
@@ -64,16 +64,11 @@ func (h *ComponentHandler) List(c *gin.Context) {
 		}
 	}
 
-	totalPages := int((total + int64(perPage) - 1) / int64(perPage))
-	if totalPages < 1 {
-		totalPages = 1
-	}
 	c.JSON(http.StatusOK, &services.ComponentListResult{
-		Items:      components,
-		TotalCount: total,
+		Components: components,
+		Total:      total,
 		Page:       page,
 		PerPage:    perPage,
-		TotalPages: totalPages,
 	})
 }
 
@@ -95,12 +90,6 @@ func (h *ComponentHandler) Get(c *gin.Context) {
 }
 
 func (h *ComponentHandler) GetCategories(c *gin.Context) {
-	// Build display_order lookup from the canonical list.
-	orderMap := make(map[string]int, len(models.DefaultCategories))
-	for _, cat := range models.DefaultCategories {
-		orderMap[strings.ToUpper(cat.Code)] = cat.DisplayOrder
-	}
-
 	codes, err := h.localDB.GetLocalComponentCategories()
 	if err == nil && len(codes) > 0 {
 		categories := make([]models.Category, 0, len(codes))
@@ -109,15 +98,7 @@ func (h *ComponentHandler) GetCategories(c *gin.Context) {
 			if trimmed == "" {
 				continue
 			}
-			order := orderMap[strings.ToUpper(trimmed)]
-			if order == 0 {
-				order = models.MaxKnownDisplayOrder + 1
-			}
-			categories = append(categories, models.Category{
-				Code:         trimmed,
-				Name:         trimmed,
-				DisplayOrder: order,
-			})
+			categories = append(categories, models.Category{Code: trimmed, Name: trimmed})
 		}
 		c.JSON(http.StatusOK, categories)
 		return
@@ -125,102 +106,3 @@ func (h *ComponentHandler) GetCategories(c *gin.Context) {
 
 	c.JSON(http.StatusOK, models.DefaultCategories)
 }
-
-func (h *ComponentHandler) GetConfiguratorSettings(c *gin.Context) {
-	s, _ := h.localDB.GetConfiguratorSettings()
-	if s == nil {
-		s = &localdb.ConfiguratorSettings{}
-	}
-
-	if len(s.ConfigTypes) == 0 {
-		s.ConfigTypes = defaultConfigTypes()
-	}
-	if len(s.TabConfig) == 0 {
-		s.TabConfig = defaultTabConfig()
-	}
-	if len(s.AlwaysVisibleTabs) == 0 {
-		s.AlwaysVisibleTabs = []string{"base", "storage", "pci"}
-	}
-	if len(s.RequiredCategories) == 0 {
-		s.RequiredCategories = map[string][]string{"server": {"CPU", "MEM", "BB"}}
-	}
-
-	c.JSON(http.StatusOK, s)
-}
-
-func defaultConfigTypes() []localdb.ConfigTypeDef {
-	return []localdb.ConfigTypeDef{
-		{
-			Code:         "server",
-			NameRu:       "Сервер",
-			DisplayOrder: 10,
-			Categories: []string{
-				"MB", "CPU", "MEM", "RAID",
-				"SSD", "HDD", "M2", "EDSFF", "HHHL",
-				"GPU", "NIC", "HCA", "DPU", "HBA",
-				"PSU", "PS", "ACC", "RISERS", "CARD", "BB",
-			},
-		},
-		{
-			Code:         "storage",
-			NameRu:       "СХД",
-			DisplayOrder: 20,
-			Categories: []string{
-				"DKC", "CPU", "MEM", "PS",
-				"SSD", "HDD", "M2", "EDSFF", "HHHL",
-				"NIC", "HBA", "HCA", "ACC", "CARD",
-			},
-		},
-	}
-}
-
-func defaultTabConfig() []localdb.TabDef {
-	return []localdb.TabDef{
-		{
-			Key:          "base",
-			Label:        "Base",
-			SingleSelect: true,
-			Categories:   []string{"MB", "CPU", "MEM", "ENC", "DKC", "CTL"},
-		},
-		{
-			Key:          "storage",
-			Label:        "Storage",
-			SingleSelect: false,
-			Categories:   []string{"RAID", "M2", "SSD", "HDD", "EDSFF", "HHHL"},
-			Sections: []localdb.TabSection{
-				{Title: "RAID Контроллеры", Categories: []string{"RAID"}},
-				{Title: "Диски", Categories: []string{"M2", "SSD", "HDD", "EDSFF", "HHHL"}},
-			},
-		},
-		{
-			Key:          "pci",
-			Label:        "PCI",
-			SingleSelect: false,
-			Categories:   []string{"GPU", "DPU", "NIC", "HCA", "HBA", "HIC"},
-			Sections: []localdb.TabSection{
-				{Title: "GPU / DPU", Categories: []string{"GPU", "DPU"}},
-				{Title: "NIC / HCA", Categories: []string{"NIC", "HCA"}},
-				{Title: "HBA", Categories: []string{"HBA"}},
-				{Title: "HIC", Categories: []string{"HIC"}},
-			},
-		},
-		{
-			Key:          "power",
-			Label:        "Power",
-			SingleSelect: false,
-			Categories:   []string{"PS", "PSU"},
-		},
-		{
-			Key:          "accessories",
-			Label:        "Accessories",
-			SingleSelect: false,
-			Categories:   []string{"ACC", "CARD"},
-		},
-		{
-			Key:          "sw",
-			Label:        "SW",
-			SingleSelect: false,
-			Categories:   []string{"SW"},
-		},
-	}
-}

internal/handlers/configuration.go

@@ -0,0 +1,239 @@
+package handlers
+
+import (
+	"net/http"
+	"strconv"
+
+	"git.mchus.pro/mchus/quoteforge/internal/middleware"
+	"git.mchus.pro/mchus/quoteforge/internal/services"
+	"github.com/gin-gonic/gin"
+)
+
+type ConfigurationHandler struct {
+	configService *services.ConfigurationService
+	exportService *services.ExportService
+}
+
+func NewConfigurationHandler(
+	configService *services.ConfigurationService,
+	exportService *services.ExportService,
+) *ConfigurationHandler {
+	return &ConfigurationHandler{
+		configService: configService,
+		exportService: exportService,
+	}
+}
+
+func (h *ConfigurationHandler) List(c *gin.Context) {
+	username := middleware.GetUsername(c)
+	page, _ := strconv.Atoi(c.DefaultQuery("page", "1"))
+	perPage, _ := strconv.Atoi(c.DefaultQuery("per_page", "20"))
+
+	configs, total, err := h.configService.ListByUser(username, page, perPage)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+		return
+	}
+
+	c.JSON(http.StatusOK, gin.H{
+		"configurations": configs,
+		"total":          total,
+		"page":           page,
+		"per_page":       perPage,
+	})
+}
+
+func (h *ConfigurationHandler) Create(c *gin.Context) {
+	username := middleware.GetUsername(c)
+
+	var req services.CreateConfigRequest
+	if err := c.ShouldBindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+		return
+	}
+
+	config, err := h.configService.Create(username, &req)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+		return
+	}
+
+	c.JSON(http.StatusCreated, config)
+}
+
+func (h *ConfigurationHandler) Get(c *gin.Context) {
+	username := middleware.GetUsername(c)
+	uuid := c.Param("uuid")
+
+	config, err := h.configService.GetByUUID(uuid, username)
+	if err != nil {
+		status := http.StatusNotFound
+		if err == services.ErrConfigForbidden {
+			status = http.StatusForbidden
+		}
+		c.JSON(status, gin.H{"error": err.Error()})
+		return
+	}
+
+	c.JSON(http.StatusOK, config)
+}
+
+func (h *ConfigurationHandler) Update(c *gin.Context) {
+	username := middleware.GetUsername(c)
+	uuid := c.Param("uuid")
+
+	var req services.CreateConfigRequest
+	if err := c.ShouldBindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+		return
+	}
+
+	config, err := h.configService.Update(uuid, username, &req)
+	if err != nil {
+		status := http.StatusInternalServerError
+		if err == services.ErrConfigNotFound {
+			status = http.StatusNotFound
+		} else if err == services.ErrConfigForbidden {
+			status = http.StatusForbidden
+		}
+		c.JSON(status, gin.H{"error": err.Error()})
+		return
+	}
+
+	c.JSON(http.StatusOK, config)
+}
+
+func (h *ConfigurationHandler) Delete(c *gin.Context) {
+	username := middleware.GetUsername(c)
+	uuid := c.Param("uuid")
+
+	err := h.configService.Delete(uuid, username)
+	if err != nil {
+		status := http.StatusInternalServerError
+		if err == services.ErrConfigNotFound {
+			status = http.StatusNotFound
+		} else if err == services.ErrConfigForbidden {
+			status = http.StatusForbidden
+		}
+		c.JSON(status, gin.H{"error": err.Error()})
+		return
+	}
+
+	c.JSON(http.StatusOK, gin.H{"message": "deleted"})
+}
+
+type RenameConfigRequest struct {
+	Name string `json:"name" binding:"required"`
+}
+
+func (h *ConfigurationHandler) Rename(c *gin.Context) {
+	username := middleware.GetUsername(c)
+	uuid := c.Param("uuid")
+
+	var req RenameConfigRequest
+	if err := c.ShouldBindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+		return
+	}
+
+	config, err := h.configService.Rename(uuid, username, req.Name)
+	if err != nil {
+		status := http.StatusInternalServerError
+		if err == services.ErrConfigNotFound {
+			status = http.StatusNotFound
+		} else if err == services.ErrConfigForbidden {
+			status = http.StatusForbidden
+		}
+		c.JSON(status, gin.H{"error": err.Error()})
+		return
+	}
+
+	c.JSON(http.StatusOK, config)
+}
+
+type CloneConfigRequest struct {
+	Name string `json:"name" binding:"required"`
+}
+
+func (h *ConfigurationHandler) Clone(c *gin.Context) {
+	username := middleware.GetUsername(c)
+	uuid := c.Param("uuid")
+
+	var req CloneConfigRequest
+	if err := c.ShouldBindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+		return
+	}
+
+	config, err := h.configService.Clone(uuid, username, req.Name)
+	if err != nil {
+		status := http.StatusInternalServerError
+		if err == services.ErrConfigNotFound {
+			status = http.StatusNotFound
+		} else if err == services.ErrConfigForbidden {
+			status = http.StatusForbidden
+		}
+		c.JSON(status, gin.H{"error": err.Error()})
+		return
+	}
+
+	c.JSON(http.StatusCreated, config)
+}
+
+func (h *ConfigurationHandler) RefreshPrices(c *gin.Context) {
+	username := middleware.GetUsername(c)
+	uuid := c.Param("uuid")
+
+	config, err := h.configService.RefreshPrices(uuid, username)
+	if err != nil {
+		status := http.StatusInternalServerError
+		if err == services.ErrConfigNotFound {
+			status = http.StatusNotFound
+		} else if err == services.ErrConfigForbidden {
+			status = http.StatusForbidden
+		}
+		c.JSON(status, gin.H{"error": err.Error()})
+		return
+	}
+
+	c.JSON(http.StatusOK, config)
+}
+
+// func (h *ConfigurationHandler) ExportJSON(c *gin.Context) {
+// 	userID := middleware.GetUserID(c)
+// 	uuid := c.Param("uuid")
+//
+// 	config, err := h.configService.GetByUUID(uuid, userID)
+// 	if err != nil {
+// 		c.JSON(http.StatusNotFound, gin.H{"error": err.Error()})
+// 		return
+// 	}
+//
+// 	data, err := h.configService.ExportJSON(uuid, userID)
+// 	if err != nil {
+// 		c.JSON(http.StatusNotFound, gin.H{"error": err.Error()})
+// 		return
+// 	}
+//
+// 	filename := fmt.Sprintf("%s %s SPEC.json", config.CreatedAt.Format("2006-01-02"), config.Name)
+// 	c.Header("Content-Disposition", fmt.Sprintf("attachment; filename=\"%s\"", filename))
+// 	c.Data(http.StatusOK, "application/json", data)
+// }
+
+// func (h *ConfigurationHandler) ImportJSON(c *gin.Context) {
+// 	userID := middleware.GetUserID(c)
+//
+// 	data, err := io.ReadAll(c.Request.Body)
+// 	if err != nil {
+// 		c.JSON(http.StatusBadRequest, gin.H{"error": "failed to read body"})
+// 		return
+// 	}
+//
+// 	config, err := h.configService.ImportJSON(userID, data)
+// 	if err != nil {
+// 		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+// 		return
+// 	}
+//
+// 	c.JSON(http.StatusCreated, config)
+// }

internal/handlers/export.go

@@ -6,6 +6,7 @@ import (
 	"strings"
 	"time"
 
+	"git.mchus.pro/mchus/quoteforge/internal/middleware"
 	"git.mchus.pro/mchus/quoteforge/internal/models"
 	"git.mchus.pro/mchus/quoteforge/internal/services"
 	"github.com/gin-gonic/gin"
@@ -15,20 +16,17 @@ type ExportHandler struct {
 	exportService  *services.ExportService
 	configService  services.ConfigurationGetter
 	projectService *services.ProjectService
-	dbUsername     string
 }
 
 func NewExportHandler(
 	exportService *services.ExportService,
 	configService services.ConfigurationGetter,
 	projectService *services.ProjectService,
-	dbUsername string,
 ) *ExportHandler {
 	return &ExportHandler{
 		exportService:  exportService,
 		configService:  configService,
 		projectService: projectService,
-		dbUsername:     dbUsername,
 	}
 }
 
@@ -47,20 +45,10 @@ type ExportRequest struct {
 	Notes string `json:"notes"`
 }
 
-type ProjectExportOptionsRequest struct {
-	IncludeLOT        bool    `json:"include_lot"`
-	IncludeBOM        bool    `json:"include_bom"`
-	IncludeEstimate   bool    `json:"include_estimate"`
-	IncludeStock      bool    `json:"include_stock"`
-	IncludeCompetitor bool    `json:"include_competitor"`
-	Basis             string  `json:"basis"`       // "fob" or "ddp"
-	SaleMarkup        float64 `json:"sale_markup"` // DDP multiplier; 0 defaults to 1.3
-}
-
 func (h *ExportHandler) ExportCSV(c *gin.Context) {
 	var req ExportRequest
 	if err := c.ShouldBindJSON(&req); err != nil {
-		RespondError(c, http.StatusUnprocessableEntity, "invalid request", err)
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 		return
 	}
 
@@ -68,14 +56,15 @@ func (h *ExportHandler) ExportCSV(c *gin.Context) {
 
 	// Validate before streaming (can return JSON error)
 	if len(data.Configs) == 0 || len(data.Configs[0].Items) == 0 {
-		c.JSON(http.StatusUnprocessableEntity, gin.H{"error": "no items to export"})
+		c.JSON(http.StatusBadRequest, gin.H{"error": "no items to export"})
 		return
 	}
 
 	// Get project code for filename
 	projectCode := req.ProjectName // legacy field: may contain code from frontend
 	if projectCode == "" && req.ProjectUUID != "" {
-		if project, err := h.projectService.GetByUUID(req.ProjectUUID, h.dbUsername); err == nil && project != nil {
+		username := middleware.GetUsername(c)
+		if project, err := h.projectService.GetByUUID(req.ProjectUUID, username); err == nil && project != nil {
 			projectCode = project.Code
 		}
 	}
@@ -147,12 +136,13 @@ func sanitizeFilenameSegment(value string) string {
 }
 
 func (h *ExportHandler) ExportConfigCSV(c *gin.Context) {
+	username := middleware.GetUsername(c)
 	uuid := c.Param("uuid")
 
 	// Get config before streaming (can return JSON error)
-	config, err := h.configService.GetByUUIDNoAuth(uuid)
+	config, err := h.configService.GetByUUID(uuid, username)
 	if err != nil {
-		RespondError(c, http.StatusNotFound, "resource not found", err)
+		c.JSON(http.StatusNotFound, gin.H{"error": err.Error()})
 		return
 	}
 
@@ -160,14 +150,14 @@ func (h *ExportHandler) ExportConfigCSV(c *gin.Context) {
 
 	// Validate before streaming (can return JSON error)
 	if len(data.Configs) == 0 || len(data.Configs[0].Items) == 0 {
-		c.JSON(http.StatusUnprocessableEntity, gin.H{"error": "no items to export"})
+		c.JSON(http.StatusBadRequest, gin.H{"error": "no items to export"})
 		return
 	}
 
 	// Get project code for filename
 	projectCode := config.Name // fallback: use config name if no project
 	if config.ProjectUUID != nil && *config.ProjectUUID != "" {
-		if project, err := h.projectService.GetByUUID(*config.ProjectUUID, h.dbUsername); err == nil && project != nil {
+		if project, err := h.projectService.GetByUUID(*config.ProjectUUID, username); err == nil && project != nil {
 			projectCode = project.Code
 		}
 	}
@@ -191,22 +181,23 @@ func (h *ExportHandler) ExportConfigCSV(c *gin.Context) {
 
 // ExportProjectCSV exports all active configurations of a project as a single CSV file.
 func (h *ExportHandler) ExportProjectCSV(c *gin.Context) {
+	username := middleware.GetUsername(c)
 	projectUUID := c.Param("uuid")
 
-	project, err := h.projectService.GetByUUID(projectUUID, h.dbUsername)
+	project, err := h.projectService.GetByUUID(projectUUID, username)
 	if err != nil {
-		RespondError(c, http.StatusNotFound, "resource not found", err)
+		c.JSON(http.StatusNotFound, gin.H{"error": err.Error()})
 		return
 	}
 
-	result, err := h.projectService.ListConfigurations(projectUUID, h.dbUsername, "active")
+	result, err := h.projectService.ListConfigurations(projectUUID, username, "active")
 	if err != nil {
-		RespondError(c, http.StatusInternalServerError, "internal server error", err)
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
 	}
 
 	if len(result.Configs) == 0 {
-		c.JSON(http.StatusUnprocessableEntity, gin.H{"error": "no configurations to export"})
+		c.JSON(http.StatusBadRequest, gin.H{"error": "no configurations to export"})
 		return
 	}
 
@@ -222,119 +213,3 @@ func (h *ExportHandler) ExportProjectCSV(c *gin.Context) {
 		return
 	}
 }
-
-func (h *ExportHandler) ExportConfigPricingCSV(c *gin.Context) {
-	uuid := c.Param("uuid")
-
-	var req ProjectExportOptionsRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		RespondError(c, http.StatusUnprocessableEntity, "invalid request", err)
-		return
-	}
-
-	config, err := h.configService.GetByUUIDNoAuth(uuid)
-	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")
-
-	var req ProjectExportOptionsRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		RespondError(c, http.StatusUnprocessableEntity, "invalid request", err)
-		return
-	}
-
-	project, err := h.projectService.GetByUUID(projectUUID, h.dbUsername)
-	if err != nil {
-		RespondError(c, http.StatusNotFound, "resource not found", err)
-		return
-	}
-
-	result, err := h.projectService.ListConfigurations(projectUUID, h.dbUsername, "active")
-	if err != nil {
-		RespondError(c, http.StatusInternalServerError, "internal server error", err)
-		return
-	}
-	if len(result.Configs) == 0 {
-		c.JSON(http.StatusUnprocessableEntity, gin.H{"error": "no configurations to export"})
-		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.ProjectToPricingExportData(result.Configs, 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"
-	}
-	variantLabel := strings.TrimSpace(project.Variant)
-	if variantLabel == "" {
-		variantLabel = "main"
-	}
-	filename := fmt.Sprintf("%s (%s) %s %s.csv", time.Now().Format("2006-01-02"), project.Code, basisLabel, variantLabel)
-	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)
-		return
-	}
-}

internal/handlers/export_test.go

@@ -26,20 +26,16 @@ func (m *mockConfigService) GetByUUID(uuid string, ownerUsername string) (*model
 	return m.config, m.err
 }
 
-func (m *mockConfigService) GetByUUIDNoAuth(uuid string) (*models.Configuration, error) {
-	return m.config, m.err
-}
 
 func TestExportCSV_Success(t *testing.T) {
 	gin.SetMode(gin.TestMode)
 
 	// Create handler with mocks
-	exportSvc := services.NewExportService(config.ExportConfig{}, nil)
+	exportSvc := services.NewExportService(config.ExportConfig{}, nil, nil)
 	handler := NewExportHandler(
 		exportSvc,
 		&mockConfigService{},
 		nil,
-		"testuser",
 	)
 
 	// Create JSON request body
@@ -109,12 +105,11 @@ func TestExportCSV_Success(t *testing.T) {
 func TestExportCSV_InvalidRequest(t *testing.T) {
 	gin.SetMode(gin.TestMode)
 
-	exportSvc := services.NewExportService(config.ExportConfig{}, nil)
+	exportSvc := services.NewExportService(config.ExportConfig{}, nil, nil)
 	handler := NewExportHandler(
 		exportSvc,
 		&mockConfigService{},
 		nil,
-		"testuser",
 	)
 
 	// Create invalid request (missing required field)
@@ -128,8 +123,8 @@ func TestExportCSV_InvalidRequest(t *testing.T) {
 	handler.ExportCSV(c)
 
 	// Should return 400 Bad Request
-	if w.Code != http.StatusUnprocessableEntity {
-		t.Errorf("Expected status 422, got %d", w.Code)
+	if w.Code != http.StatusBadRequest {
+		t.Errorf("Expected status 400, got %d", w.Code)
 	}
 
 	// Should return JSON error
@@ -143,12 +138,11 @@ func TestExportCSV_InvalidRequest(t *testing.T) {
 func TestExportCSV_EmptyItems(t *testing.T) {
 	gin.SetMode(gin.TestMode)
 
-	exportSvc := services.NewExportService(config.ExportConfig{}, nil)
+	exportSvc := services.NewExportService(config.ExportConfig{}, nil, nil)
 	handler := NewExportHandler(
 		exportSvc,
 		&mockConfigService{},
 		nil,
-		"testuser",
 	)
 
 	// Create request with empty items array - should fail binding validation
@@ -162,8 +156,8 @@ func TestExportCSV_EmptyItems(t *testing.T) {
 	handler.ExportCSV(c)
 
 	// Should return 400 Bad Request (validation error from gin binding)
-	if w.Code != http.StatusUnprocessableEntity {
-		t.Logf("Status code: %d (expected 422 for empty items)", w.Code)
+	if w.Code != http.StatusBadRequest {
+		t.Logf("Status code: %d (expected 400 for empty items)", w.Code)
 	}
 }
 
@@ -185,12 +179,11 @@ func TestExportConfigCSV_Success(t *testing.T) {
 		CreatedAt: time.Now(),
 	}
 
-	exportSvc := services.NewExportService(config.ExportConfig{}, nil)
+	exportSvc := services.NewExportService(config.ExportConfig{}, nil, nil)
 	handler := NewExportHandler(
 		exportSvc,
 		&mockConfigService{config: mockConfig},
 		nil,
-		"testuser",
 	)
 
 	// Create HTTP request
@@ -203,6 +196,9 @@ func TestExportConfigCSV_Success(t *testing.T) {
 		{Key: "uuid", Value: "test-uuid"},
 	}
 
+	// Mock middleware.GetUsername
+	c.Set("username", "testuser")
+
 	handler.ExportConfigCSV(c)
 
 	// Check status code
@@ -232,12 +228,11 @@ func TestExportConfigCSV_Success(t *testing.T) {
 func TestExportConfigCSV_NotFound(t *testing.T) {
 	gin.SetMode(gin.TestMode)
 
-	exportSvc := services.NewExportService(config.ExportConfig{}, nil)
+	exportSvc := services.NewExportService(config.ExportConfig{}, nil, nil)
 	handler := NewExportHandler(
 		exportSvc,
 		&mockConfigService{err: errors.New("config not found")},
 		nil,
-		"testuser",
 	)
 
 	req, _ := http.NewRequest("GET", "/api/configs/nonexistent-uuid/export", nil)
@@ -248,6 +243,8 @@ func TestExportConfigCSV_NotFound(t *testing.T) {
 	c.Params = gin.Params{
 		{Key: "uuid", Value: "nonexistent-uuid"},
 	}
+	c.Set("username", "testuser")
+
 	handler.ExportConfigCSV(c)
 
 	// Should return 404 Not Found
@@ -275,12 +272,11 @@ func TestExportConfigCSV_EmptyItems(t *testing.T) {
 		CreatedAt:     time.Now(),
 	}
 
-	exportSvc := services.NewExportService(config.ExportConfig{}, nil)
+	exportSvc := services.NewExportService(config.ExportConfig{}, nil, nil)
 	handler := NewExportHandler(
 		exportSvc,
 		&mockConfigService{config: mockConfig},
 		nil,
-		"testuser",
 	)
 
 	req, _ := http.NewRequest("GET", "/api/configs/test-uuid/export", nil)
@@ -291,11 +287,13 @@ func TestExportConfigCSV_EmptyItems(t *testing.T) {
 	c.Params = gin.Params{
 		{Key: "uuid", Value: "test-uuid"},
 	}
+	c.Set("username", "testuser")
+
 	handler.ExportConfigCSV(c)
 
 	// Should return 400 Bad Request
-	if w.Code != http.StatusUnprocessableEntity {
-		t.Errorf("Expected status 422, got %d", w.Code)
+	if w.Code != http.StatusBadRequest {
+		t.Errorf("Expected status 400, got %d", w.Code)
 	}
 
 	// Should return JSON error

internal/handlers/partnumber_books.go

@@ -3,7 +3,6 @@ package handlers
 import (
 	"net/http"
 	"strconv"
-	"strings"
 
 	"git.mchus.pro/mchus/quoteforge/internal/localdb"
 	"git.mchus.pro/mchus/quoteforge/internal/repository"
@@ -25,7 +24,7 @@ func (h *PartnumberBooksHandler) List(c *gin.Context) {
 	bookRepo := repository.NewPartnumberBookRepository(h.localDB.DB())
 	books, err := bookRepo.ListBooks()
 	if err != nil {
-		RespondError(c, http.StatusInternalServerError, "internal server error", err)
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
 	}
 
@@ -51,11 +50,8 @@ func (h *PartnumberBooksHandler) List(c *gin.Context) {
 	}
 
 	c.JSON(http.StatusOK, gin.H{
-		"items":       summaries,
-		"total_count": len(summaries),
-		"page":        1,
-		"per_page":    len(summaries),
-		"total_pages": 1,
+		"books": summaries,
+		"total": len(summaries),
 	})
 }
 
@@ -65,49 +61,30 @@ func (h *PartnumberBooksHandler) GetItems(c *gin.Context) {
 	idStr := c.Param("id")
 	id, err := strconv.ParseUint(idStr, 10, 64)
 	if err != nil {
-		c.JSON(http.StatusUnprocessableEntity, gin.H{"error": "invalid book ID"})
+		c.JSON(http.StatusBadRequest, gin.H{"error": "invalid book ID"})
 		return
 	}
 
 	bookRepo := repository.NewPartnumberBookRepository(h.localDB.DB())
-	page, _ := strconv.Atoi(c.DefaultQuery("page", "1"))
-	perPage, _ := strconv.Atoi(c.DefaultQuery("per_page", "100"))
-	search := strings.TrimSpace(c.Query("search"))
-	if page < 1 {
-		page = 1
-	}
-	if perPage < 1 || perPage > 500 {
-		perPage = 100
-	}
 
-	book, err := h.localDB.GetLocalPartnumberBookByServerID(uint(id))
-	if err != nil {
+	// Find local book by server_id
+	var book localdb.LocalPartnumberBook
+	if err := h.localDB.DB().Where("server_id = ?", id).First(&book).Error; err != nil {
 		c.JSON(http.StatusNotFound, gin.H{"error": "partnumber book not found"})
 		return
 	}
 
-	items, total, err := bookRepo.GetBookItemsPage(book.ID, search, page, perPage)
+	items, err := bookRepo.GetBookItems(book.ID)
 	if err != nil {
-		RespondError(c, http.StatusInternalServerError, "internal server error", err)
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
 	}
 
-	totalPages := int((total + int64(perPage) - 1) / int64(perPage))
-	if totalPages < 1 {
-		totalPages = 1
-	}
 	c.JSON(http.StatusOK, gin.H{
-		"book_id":     book.ServerID,
-		"version":     book.Version,
-		"is_active":   book.IsActive,
-		"partnumbers": book.PartnumbersJSON,
-		"items":       items,
-		"total_count": total,
-		"page":        page,
-		"per_page":    perPage,
-		"total_pages": totalPages,
-		"search":      search,
-		"book_total":  bookRepo.CountBookItems(book.ID),
-		"lot_count":   bookRepo.CountDistinctLots(book.ID),
+		"book_id":   book.ServerID,
+		"version":   book.Version,
+		"is_active": book.IsActive,
+		"items":     items,
+		"total":     len(items),
 	})
 }

internal/handlers/pricelist.go

@@ -34,7 +34,7 @@ func (h *PricelistHandler) List(c *gin.Context) {
 
 	localPLs, err := h.localDB.GetLocalPricelists()
 	if err != nil {
-		RespondError(c, http.StatusInternalServerError, "internal server error", err)
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
 	}
 	if source != "" {
@@ -106,16 +106,11 @@ func (h *PricelistHandler) List(c *gin.Context) {
 		})
 	}
 
-	totalPages := (total + perPage - 1) / perPage
-	if totalPages < 1 {
-		totalPages = 1
-	}
 	c.JSON(http.StatusOK, gin.H{
-		"items":       summaries,
-		"total_count": total,
-		"page":        page,
-		"per_page":    perPage,
-		"total_pages": totalPages,
+		"pricelists": summaries,
+		"total":      total,
+		"page":       page,
+		"per_page":   perPage,
 	})
 }
 
@@ -124,7 +119,7 @@ func (h *PricelistHandler) Get(c *gin.Context) {
 	idStr := c.Param("id")
 	id, err := strconv.ParseUint(idStr, 10, 32)
 	if err != nil {
-		c.JSON(http.StatusUnprocessableEntity, gin.H{"error": "invalid pricelist ID"})
+		c.JSON(http.StatusBadRequest, gin.H{"error": "invalid pricelist ID"})
 		return
 	}
 
@@ -151,7 +146,7 @@ func (h *PricelistHandler) GetItems(c *gin.Context) {
 	idStr := c.Param("id")
 	id, err := strconv.ParseUint(idStr, 10, 32)
 	if err != nil {
-		c.JSON(http.StatusUnprocessableEntity, gin.H{"error": "invalid pricelist ID"})
+		c.JSON(http.StatusBadRequest, gin.H{"error": "invalid pricelist ID"})
 		return
 	}
 
@@ -170,47 +165,40 @@ func (h *PricelistHandler) GetItems(c *gin.Context) {
 	if perPage < 1 {
 		perPage = 50
 	}
-
-	items, total, err := h.localDB.GetLocalPricelistItemsPage(localPL.ID, strings.TrimSpace(search), page, perPage)
-	if err != nil {
-		RespondError(c, http.StatusInternalServerError, "internal server error", err)
+	var items []localdb.LocalPricelistItem
+	dbq := h.localDB.DB().Model(&localdb.LocalPricelistItem{}).Where("pricelist_id = ?", localPL.ID)
+	if strings.TrimSpace(search) != "" {
+		dbq = dbq.Where("lot_name LIKE ?", "%"+strings.TrimSpace(search)+"%")
+	}
+	var total int64
+	if err := dbq.Count(&total).Error; err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
 	}
+	offset := (page - 1) * perPage
 
-	lotNames := make([]string, len(items))
-	for i, item := range items {
-		lotNames[i] = item.LotName
-	}
-	descMap, err := h.localDB.GetLocalComponentDescriptionsByLotNames(lotNames)
-	if err != nil {
-		RespondError(c, http.StatusInternalServerError, "internal server error", err)
+	if err := dbq.Order("lot_name").Offset(offset).Limit(perPage).Find(&items).Error; err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
 	}
-
 	resultItems := make([]gin.H, 0, len(items))
 	for _, item := range items {
 		resultItems = append(resultItems, gin.H{
-			"id":               item.ID,
-			"lot_name":         item.LotName,
-			"lot_description":  descMap[item.LotName],
-			"price":            item.Price,
-			"category":         item.LotCategory,
-			"available_qty":    item.AvailableQty,
-			"partnumbers":      []string(item.Partnumbers),
-			"partnumber_qtys":  map[string]interface{}{},
-			"competitor_names": []string{},
-			"price_spread_pct": nil,
+			"id":            item.ID,
+			"lot_name":      item.LotName,
+			"price":         item.Price,
+			"category":      item.LotCategory,
+			"available_qty": item.AvailableQty,
+			"partnumbers":   []string(item.Partnumbers),
 		})
 	}
 
-	totalPages := int((total + int64(perPage) - 1) / int64(perPage))
 	c.JSON(http.StatusOK, gin.H{
-		"source":      localPL.Source,
-		"items":       resultItems,
-		"total_count": total,
-		"page":        page,
-		"per_page":    perPage,
-		"total_pages": totalPages,
+		"source":   localPL.Source,
+		"items":    resultItems,
+		"total":    total,
+		"page":     page,
+		"per_page": perPage,
 	})
 }
 
@@ -218,7 +206,7 @@ func (h *PricelistHandler) GetLotNames(c *gin.Context) {
 	idStr := c.Param("id")
 	id, err := strconv.ParseUint(idStr, 10, 32)
 	if err != nil {
-		c.JSON(http.StatusUnprocessableEntity, gin.H{"error": "invalid pricelist ID"})
+		c.JSON(http.StatusBadRequest, gin.H{"error": "invalid pricelist ID"})
 		return
 	}
 
@@ -229,7 +217,7 @@ func (h *PricelistHandler) GetLotNames(c *gin.Context) {
 	}
 	items, err := h.localDB.GetLocalPricelistItems(localPL.ID)
 	if err != nil {
-		RespondError(c, http.StatusInternalServerError, "internal server error", err)
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
 	}
 	lotNames := make([]string, 0, len(items))

internal/handlers/pricelist_test.go

@@ -141,21 +141,21 @@ func TestPricelistList_ActiveOnlyExcludesPricelistsWithoutItems(t *testing.T) {
 	}
 
 	var resp struct {
-		Items []struct {
+		Pricelists []struct {
 			ID uint `json:"id"`
-		} `json:"items"`
-		TotalCount int `json:"total_count"`
+		} `json:"pricelists"`
+		Total int `json:"total"`
 	}
 	if err := json.Unmarshal(w.Body.Bytes(), &resp); err != nil {
 		t.Fatalf("unmarshal response: %v", err)
 	}
-	if resp.TotalCount != 1 {
-		t.Fatalf("expected total=1, got %d", resp.TotalCount)
+	if resp.Total != 1 {
+		t.Fatalf("expected total=1, got %d", resp.Total)
 	}
-	if len(resp.Items) != 1 {
-		t.Fatalf("expected 1 pricelist, got %d", len(resp.Items))
+	if len(resp.Pricelists) != 1 {
+		t.Fatalf("expected 1 pricelist, got %d", len(resp.Pricelists))
 	}
-	if resp.Items[0].ID != 10 {
-		t.Fatalf("expected pricelist id=10, got %d", resp.Items[0].ID)
+	if resp.Pricelists[0].ID != 10 {
+		t.Fatalf("expected pricelist id=10, got %d", resp.Pricelists[0].ID)
 	}
 }

internal/handlers/quote.go

@@ -18,13 +18,13 @@ func NewQuoteHandler(quoteService *services.QuoteService) *QuoteHandler {
 func (h *QuoteHandler) Validate(c *gin.Context) {
 	var req services.QuoteRequest
 	if err := c.ShouldBindJSON(&req); err != nil {
-		RespondError(c, http.StatusUnprocessableEntity, "invalid request", err)
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 		return
 	}
 
 	result, err := h.quoteService.ValidateAndCalculate(&req)
 	if err != nil {
-		RespondError(c, http.StatusUnprocessableEntity, "invalid request", err)
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 		return
 	}
 
@@ -34,13 +34,13 @@ func (h *QuoteHandler) Validate(c *gin.Context) {
 func (h *QuoteHandler) Calculate(c *gin.Context) {
 	var req services.QuoteRequest
 	if err := c.ShouldBindJSON(&req); err != nil {
-		RespondError(c, http.StatusUnprocessableEntity, "invalid request", err)
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 		return
 	}
 
 	result, err := h.quoteService.ValidateAndCalculate(&req)
 	if err != nil {
-		RespondError(c, http.StatusUnprocessableEntity, "invalid request", err)
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 		return
 	}
 
@@ -53,13 +53,13 @@ func (h *QuoteHandler) Calculate(c *gin.Context) {
 func (h *QuoteHandler) PriceLevels(c *gin.Context) {
 	var req services.PriceLevelsRequest
 	if err := c.ShouldBindJSON(&req); err != nil {
-		RespondError(c, http.StatusUnprocessableEntity, "invalid request", err)
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 		return
 	}
 
 	result, err := h.quoteService.CalculatePriceLevels(&req)
 	if err != nil {
-		RespondError(c, http.StatusUnprocessableEntity, "invalid request", err)
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 		return
 	}
 

internal/handlers/respond.go

@@ -1,73 +0,0 @@
-package handlers
-
-import (
-	"encoding/json"
-	"errors"
-	"io"
-	"strings"
-
-	"github.com/gin-gonic/gin"
-)
-
-func RespondError(c *gin.Context, status int, fallback string, err error) {
-	if err != nil {
-		_ = c.Error(err)
-	}
-	c.JSON(status, gin.H{"error": clientFacingErrorMessage(status, fallback, err)})
-}
-
-func clientFacingErrorMessage(status int, fallback string, err error) string {
-	if err == nil {
-		return fallback
-	}
-	if status >= 500 {
-		return fallback
-	}
-	if isRequestDecodeError(err) {
-		return fallback
-	}
-
-	message := strings.TrimSpace(err.Error())
-	if message == "" {
-		return fallback
-	}
-	if looksTechnicalError(message) {
-		return fallback
-	}
-	return message
-}
-
-func isRequestDecodeError(err error) bool {
-	var syntaxErr *json.SyntaxError
-	if errors.As(err, &syntaxErr) {
-		return true
-	}
-
-	var unmarshalTypeErr *json.UnmarshalTypeError
-	if errors.As(err, &unmarshalTypeErr) {
-		return true
-	}
-
-	return errors.Is(err, io.ErrUnexpectedEOF) || errors.Is(err, io.EOF)
-}
-
-func looksTechnicalError(message string) bool {
-	lower := strings.ToLower(strings.TrimSpace(message))
-	needles := []string{
-		"sql",
-		"gorm",
-		"driver",
-		"constraint",
-		"syntax error",
-		"unexpected eof",
-		"record not found",
-		"no such table",
-		"stack trace",
-	}
-	for _, needle := range needles {
-		if strings.Contains(lower, needle) {
-			return true
-		}
-	}
-	return false
-}

internal/handlers/respond_test.go

@@ -1,41 +0,0 @@
-package handlers
-
-import (
-	"encoding/json"
-	"testing"
-)
-
-func TestClientFacingErrorMessageKeepsDomain4xx(t *testing.T) {
-	t.Parallel()
-
-	got := clientFacingErrorMessage(400, "invalid request", &json.SyntaxError{Offset: 1})
-	if got != "invalid request" {
-		t.Fatalf("expected fallback for decode error, got %q", got)
-	}
-}
-
-func TestClientFacingErrorMessagePreservesBusinessMessage(t *testing.T) {
-	t.Parallel()
-
-	err := errString("main project variant cannot be deleted")
-	got := clientFacingErrorMessage(400, "invalid request", err)
-	if got != err.Error() {
-		t.Fatalf("expected business message, got %q", got)
-	}
-}
-
-func TestClientFacingErrorMessageHidesTechnical4xx(t *testing.T) {
-	t.Parallel()
-
-	err := errString("sql: no rows in result set")
-	got := clientFacingErrorMessage(404, "resource not found", err)
-	if got != "resource not found" {
-		t.Fatalf("expected fallback for technical error, got %q", got)
-	}
-}
-
-type errString string
-
-func (e errString) Error() string {
-	return string(e)
-}

internal/handlers/setup.go

@@ -12,8 +12,11 @@ import (
 	qfassets "git.mchus.pro/mchus/quoteforge"
 	"git.mchus.pro/mchus/quoteforge/internal/db"
 	"git.mchus.pro/mchus/quoteforge/internal/localdb"
-	"github.com/gin-gonic/gin"
 	mysqlDriver "github.com/go-sql-driver/mysql"
+	"github.com/gin-gonic/gin"
+	gormmysql "gorm.io/driver/mysql"
+	"gorm.io/gorm"
+	"gorm.io/gorm/logger"
 )
 
 type SetupHandler struct {
@@ -61,8 +64,7 @@ func (h *SetupHandler) ShowSetup(c *gin.Context) {
 
 	tmpl := h.templates["setup.html"]
 	if err := tmpl.ExecuteTemplate(c.Writer, "setup.html", data); err != nil {
-		_ = c.Error(err)
-		c.String(http.StatusInternalServerError, "Template error")
+		c.String(http.StatusInternalServerError, "Template error: %v", err)
 	}
 }
 
@@ -87,16 +89,49 @@ func (h *SetupHandler) TestConnection(c *gin.Context) {
 	}
 
 	dsn := buildMySQLDSN(host, port, database, user, password, 5*time.Second)
-	lotCount, canWrite, err := db.ValidateMariaDBConnection(dsn)
+
+	db, err := gorm.Open(gormmysql.Open(dsn), &gorm.Config{
+		Logger: logger.Default.LogMode(logger.Silent),
+	})
 	if err != nil {
-		_ = c.Error(err)
 		c.JSON(http.StatusOK, gin.H{
 			"success": false,
-			"error":   "Connection check failed",
+			"error":   fmt.Sprintf("Connection failed: %v", err),
 		})
 		return
 	}
 
+	sqlDB, err := db.DB()
+	if err != nil {
+		c.JSON(http.StatusOK, gin.H{
+			"success": false,
+			"error":   fmt.Sprintf("Failed to get database handle: %v", err),
+		})
+		return
+	}
+	defer sqlDB.Close()
+
+	if err := sqlDB.Ping(); err != nil {
+		c.JSON(http.StatusOK, gin.H{
+			"success": false,
+			"error":   fmt.Sprintf("Ping failed: %v", err),
+		})
+		return
+	}
+
+	// Check for required tables
+	var lotCount int64
+	if err := db.Table("lot").Count(&lotCount).Error; err != nil {
+		c.JSON(http.StatusOK, gin.H{
+			"success": false,
+			"error":   fmt.Sprintf("Table 'lot' not found or inaccessible: %v", err),
+		})
+		return
+	}
+
+	// Check write permission
+	canWrite := testWritePermission(db)
+
 	c.JSON(http.StatusOK, gin.H{
 		"success":   true,
 		"lot_count": lotCount,
@@ -129,21 +164,26 @@ func (h *SetupHandler) SaveConnection(c *gin.Context) {
 
 	// Test connection first
 	dsn := buildMySQLDSN(host, port, database, user, password, 5*time.Second)
-	if _, _, err := db.ValidateMariaDBConnection(dsn); err != nil {
-		_ = c.Error(err)
+
+	db, err := gorm.Open(gormmysql.Open(dsn), &gorm.Config{
+		Logger: logger.Default.LogMode(logger.Silent),
+	})
+	if err != nil {
 		c.JSON(http.StatusBadRequest, gin.H{
 			"success": false,
-			"error":   "Connection check failed",
+			"error":   fmt.Sprintf("Connection failed: %v", err),
 		})
 		return
 	}
 
+	sqlDB, _ := db.DB()
+	sqlDB.Close()
+
 	// Save settings
 	if err := h.localDB.SaveSettings(host, port, database, user, password); err != nil {
-		_ = c.Error(err)
 		c.JSON(http.StatusInternalServerError, gin.H{
 			"success": false,
-			"error":   "Failed to save settings",
+			"error":   fmt.Sprintf("Failed to save settings: %v", err),
 		})
 		return
 	}
@@ -192,6 +232,22 @@ func (h *SetupHandler) GetStatus(c *gin.Context) {
 	})
 }
 
+func testWritePermission(db *gorm.DB) bool {
+	// Simple check: try to create a temporary table and drop it
+	testTable := fmt.Sprintf("qt_write_test_%d", time.Now().UnixNano())
+
+	// Try to create a test table
+	err := db.Exec(fmt.Sprintf("CREATE TABLE %s (id INT)", testTable)).Error
+	if err != nil {
+		return false
+	}
+
+	// Drop it immediately
+	db.Exec(fmt.Sprintf("DROP TABLE %s", testTable))
+
+	return true
+}
+
 func buildMySQLDSN(host string, port int, database, user, password string, timeout time.Duration) string {
 	cfg := mysqlDriver.NewConfig()
 	cfg.User = user
@@ -207,4 +263,3 @@ func buildMySQLDSN(host string, port int, database, user, password string, timeo
 	}
 	return cfg.FormatDSN()
 }
-

internal/handlers/support_bundle.go

@@ -1,212 +0,0 @@
-package handlers
-
-import (
-	"archive/zip"
-	"encoding/json"
-	"fmt"
-	"io"
-	"log/slog"
-	"net"
-	"net/http"
-	"os"
-	"runtime"
-	"strconv"
-	"time"
-
-	"git.mchus.pro/mchus/quoteforge/internal/appmeta"
-	"git.mchus.pro/mchus/quoteforge/internal/db"
-	"git.mchus.pro/mchus/quoteforge/internal/localdb"
-	syncsvc "git.mchus.pro/mchus/quoteforge/internal/services/sync"
-	"github.com/gin-gonic/gin"
-)
-
-type SupportBundleHandler struct {
-	localDB     *localdb.LocalDB
-	connMgr     *db.ConnectionManager
-	syncService *syncsvc.Service
-	logFilePath string
-}
-
-func NewSupportBundleHandler(local *localdb.LocalDB, connMgr *db.ConnectionManager, svc *syncsvc.Service, logFilePath string) *SupportBundleHandler {
-	return &SupportBundleHandler{
-		localDB:     local,
-		connMgr:     connMgr,
-		syncService: svc,
-		logFilePath: logFilePath,
-	}
-}
-
-// DownloadBundle collects diagnostic data and streams a ZIP archive.
-// GET /api/support-bundle
-func (h *SupportBundleHandler) DownloadBundle(c *gin.Context) {
-	now := time.Now().UTC()
-	hostname, err := os.Hostname()
-	if err != nil {
-		slog.Warn("support bundle: could not get hostname", "err", err)
-	}
-
-	c.Header("Content-Type", "application/zip")
-	c.Header("Content-Disposition", fmt.Sprintf(`attachment; filename="qfs-bundle-%s.zip"`, now.Format("20060102-150405")))
-
-	zw := zip.NewWriter(c.Writer)
-	defer zw.Close()
-
-	writeJSON := func(name string, v any) {
-		w, err := zw.Create(name)
-		if err != nil {
-			return
-		}
-		enc := json.NewEncoder(w)
-		enc.SetIndent("", "  ")
-		_ = enc.Encode(v)
-	}
-
-	// app_info.json
-	writeJSON("app_info.json", map[string]any{
-		"app_version":  appmeta.Version(),
-		"go_version":   runtime.Version(),
-		"os":           runtime.GOOS,
-		"arch":         runtime.GOARCH,
-		"hostname":     hostname,
-		"db_user":      h.localDB.GetDBUser(),
-		"collected_at": now.Format(time.RFC3339),
-	})
-
-	// local_db_stats.json
-	writeJSON("local_db_stats.json", map[string]any{
-		"components":                   h.localDB.CountLocalComponents(),
-		"configurations":               h.localDB.CountConfigurations(),
-		"projects":                     h.localDB.CountProjects(),
-		"pricelists":                   h.localDB.CountLocalPricelists(),
-		"pending_changes":              h.localDB.GetPendingCount(),
-		"db_size_bytes":                h.localDB.DBFileSizeBytes(),
-		"last_pricelist_sync_time":     h.localDB.GetLastSyncTime(),
-		"last_pricelist_attempt":       h.localDB.GetLastPricelistSyncAttemptAt(),
-		"last_pricelist_status":        h.localDB.GetLastPricelistSyncStatus(),
-		"last_pricelist_error":         h.localDB.GetLastPricelistSyncError(),
-		"last_component_sync_attempt":  h.localDB.GetLastComponentSyncAttemptAt(),
-		"last_component_sync_status":   h.localDB.GetLastComponentSyncStatus(),
-		"last_component_sync_error":    h.localDB.GetLastComponentSyncError(),
-	})
-
-	// db_connection.json — includes TCP ping to DB host
-	connStatus := h.connMgr.GetStatus()
-	dbConnDoc := map[string]any{
-		"is_connected": connStatus.IsConnected,
-		"last_error":   connStatus.LastError,
-	}
-	if settings, err := h.localDB.GetSettings(); err == nil && settings.Host != "" {
-		addr := net.JoinHostPort(settings.Host, strconv.Itoa(settings.Port))
-		start := time.Now()
-		conn, dialErr := net.DialTimeout("tcp", addr, 3*time.Second)
-		pingMs := time.Since(start).Milliseconds()
-		if dialErr == nil {
-			conn.Close()
-			dbConnDoc["tcp_ping_ms"] = pingMs
-			dbConnDoc["tcp_ping_addr"] = addr
-		} else {
-			dbConnDoc["tcp_ping_error"] = dialErr.Error()
-			dbConnDoc["tcp_ping_addr"] = addr
-		}
-	}
-	writeJSON("db_connection.json", dbConnDoc)
-
-	// sync_readiness.json
-	if h.syncService != nil {
-		readiness, err := h.syncService.GetReadiness()
-		if err != nil {
-			writeJSON("sync_readiness.json", map[string]any{"error": err.Error()})
-		} else {
-			writeJSON("sync_readiness.json", readiness)
-		}
-	}
-
-	// system_metrics.json
-	writeJSON("system_metrics.json", collectSystemMetrics())
-
-	// sync_log.json — history of sync operations
-	if entries, err := h.localDB.GetSyncLog(200); err == nil {
-		writeJSON("sync_log.json", entries)
-	}
-
-	// pricelists.json — downloaded pricelists grouped by source
-	if pricelists, err := h.localDB.GetLocalPricelists(); err == nil {
-		type plEntry struct {
-			ServerID  uint      `json:"server_id"`
-			Source    string    `json:"source"`
-			Version   string    `json:"version"`
-			Name      string    `json:"name,omitempty"`
-			CreatedAt time.Time `json:"created_at"`
-			SyncedAt  time.Time `json:"synced_at"`
-			IsUsed    bool      `json:"is_used"`
-		}
-		bySource := map[string][]plEntry{}
-		for _, pl := range pricelists {
-			e := plEntry{
-				ServerID:  pl.ServerID,
-				Source:    pl.Source,
-				Version:   pl.Version,
-				Name:      pl.Name,
-				CreatedAt: pl.CreatedAt,
-				SyncedAt:  pl.SyncedAt,
-				IsUsed:    pl.IsUsed,
-			}
-			bySource[pl.Source] = append(bySource[pl.Source], e)
-		}
-		writeJSON("pricelists.json", bySource)
-	}
-
-	// schema_migrations.json
-	migrations, err := h.localDB.GetSchemaMigrations()
-	if err != nil {
-		slog.Warn("support bundle: could not load schema migrations", "err", err)
-	}
-	writeJSON("schema_migrations.json", migrations)
-
-	// app.log (tail 5 MiB)
-	if h.logFilePath != "" {
-		if f, err := os.Open(h.logFilePath); err == nil {
-			defer f.Close()
-			if info, err := f.Stat(); err == nil {
-				const maxLog = 5 << 20
-				offset := int64(0)
-				if info.Size() > maxLog {
-					offset = info.Size() - maxLog
-				}
-				if _, err := f.Seek(offset, io.SeekStart); err == nil {
-					if w, err := zw.Create("app.log"); err == nil {
-						if _, err := io.Copy(w, f); err != nil {
-							slog.Warn("support bundle: error copying log file", "err", err)
-						}
-					}
-				}
-			}
-		}
-	}
-
-	c.Status(http.StatusOK)
-}
-
-func collectSystemMetrics() map[string]any {
-	var ms runtime.MemStats
-	runtime.ReadMemStats(&ms)
-
-	m := map[string]any{
-		"goroutines":        runtime.NumGoroutine(),
-		"cpu_count":         runtime.NumCPU(),
-		"heap_alloc_bytes":  ms.HeapAlloc,
-		"heap_sys_bytes":    ms.HeapSys,
-		"heap_inuse_bytes":  ms.HeapInuse,
-		"stack_inuse_bytes": ms.StackInuse,
-		"gc_cycles":         ms.NumGC,
-		"next_gc_bytes":     ms.NextGC,
-	}
-
-	if wd, err := os.Getwd(); err == nil {
-		if info := diskUsage(wd); info != nil {
-			m["disk"] = info
-		}
-	}
-
-	return m
-}

internal/handlers/support_bundle_disk_unix.go

@@ -1,20 +0,0 @@
-//go:build linux || darwin
-
-package handlers
-
-import "syscall"
-
-func diskUsage(path string) map[string]any {
-	var stat syscall.Statfs_t
-	if err := syscall.Statfs(path, &stat); err != nil {
-		return nil
-	}
-	total := stat.Blocks * uint64(stat.Bsize)
-	free := stat.Bfree * uint64(stat.Bsize)
-	return map[string]any{
-		"total_bytes": total,
-		"free_bytes":  free,
-		"used_bytes":  total - free,
-		"path":        path,
-	}
-}

internal/handlers/support_bundle_disk_windows.go

@@ -1,7 +0,0 @@
-//go:build windows
-
-package handlers
-
-func diskUsage(_ string) map[string]any {
-	return nil
-}

internal/handlers/sync.go

@@ -6,7 +6,6 @@ import (
 	"html/template"
 	"log/slog"
 	"net/http"
-	"strings"
 	stdsync "sync"
 	"time"
 
@@ -50,20 +49,15 @@ func NewSyncHandler(localDB *localdb.LocalDB, syncService *sync.Service, connMgr
 
 // SyncStatusResponse represents the sync status
 type SyncStatusResponse struct {
-	LastComponentSync       *time.Time          `json:"last_component_sync"`
-	LastPricelistSync       *time.Time          `json:"last_pricelist_sync"`
-	LastPricelistAttemptAt  *time.Time          `json:"last_pricelist_attempt_at,omitempty"`
-	LastPricelistSyncStatus string              `json:"last_pricelist_sync_status,omitempty"`
-	LastPricelistSyncError  string              `json:"last_pricelist_sync_error,omitempty"`
-	HasIncompleteServerSync bool                `json:"has_incomplete_server_sync"`
-	KnownServerChangesMiss  bool                `json:"known_server_changes_missing"`
-	IsOnline                bool                `json:"is_online"`
-	ComponentsCount         int64               `json:"components_count"`
-	PricelistsCount         int64               `json:"pricelists_count"`
-	ServerPricelists        int                 `json:"server_pricelists"`
-	NeedComponentSync       bool                `json:"need_component_sync"`
-	NeedPricelistSync       bool                `json:"need_pricelist_sync"`
-	Readiness               *sync.SyncReadiness `json:"readiness,omitempty"`
+	LastComponentSync *time.Time          `json:"last_component_sync"`
+	LastPricelistSync *time.Time          `json:"last_pricelist_sync"`
+	IsOnline          bool                `json:"is_online"`
+	ComponentsCount   int64               `json:"components_count"`
+	PricelistsCount   int64               `json:"pricelists_count"`
+	ServerPricelists  int                 `json:"server_pricelists"`
+	NeedComponentSync bool                `json:"need_component_sync"`
+	NeedPricelistSync bool                `json:"need_pricelist_sync"`
+	Readiness         *sync.SyncReadiness `json:"readiness,omitempty"`
 }
 
 type SyncReadinessResponse struct {
@@ -78,34 +72,42 @@ type SyncReadinessResponse struct {
 // GetStatus returns current sync status
 // GET /api/sync/status
 func (h *SyncHandler) GetStatus(c *gin.Context) {
-	connStatus := h.connMgr.GetStatus()
-	isOnline := connStatus.IsConnected && strings.TrimSpace(connStatus.LastError) == ""
+	// Check online status by pinging MariaDB
+	isOnline := h.checkOnline()
+
+	// Get sync times
 	lastComponentSync := h.localDB.GetComponentSyncTime()
 	lastPricelistSync := h.localDB.GetLastSyncTime()
+
+	// Get counts
 	componentsCount := h.localDB.CountLocalComponents()
 	pricelistsCount := h.localDB.CountLocalPricelists()
-	lastPricelistAttemptAt := h.localDB.GetLastPricelistSyncAttemptAt()
-	lastPricelistSyncStatus := h.localDB.GetLastPricelistSyncStatus()
-	lastPricelistSyncError := h.localDB.GetLastPricelistSyncError()
-	hasFailedSync := strings.EqualFold(lastPricelistSyncStatus, "failed")
+
+	// Get server pricelist count if online
+	serverPricelists := 0
+	needPricelistSync := false
+	if isOnline {
+		status, err := h.syncService.GetStatus()
+		if err == nil {
+			serverPricelists = status.ServerPricelists
+			needPricelistSync = status.NeedsSync
+		}
+	}
+
+	// Check if component sync is needed (older than 24 hours)
 	needComponentSync := h.localDB.NeedComponentSync(24)
-	readiness := h.getReadinessLocal()
+	readiness := h.getReadinessCached(10 * time.Second)
 
 	c.JSON(http.StatusOK, SyncStatusResponse{
-		LastComponentSync:       lastComponentSync,
-		LastPricelistSync:       lastPricelistSync,
-		LastPricelistAttemptAt:  lastPricelistAttemptAt,
-		LastPricelistSyncStatus: lastPricelistSyncStatus,
-		LastPricelistSyncError:  lastPricelistSyncError,
-		HasIncompleteServerSync: hasFailedSync,
-		KnownServerChangesMiss:  hasFailedSync,
-		IsOnline:                isOnline,
-		ComponentsCount:         componentsCount,
-		PricelistsCount:         pricelistsCount,
-		ServerPricelists:        0,
-		NeedComponentSync:       needComponentSync,
-		NeedPricelistSync:       lastPricelistSync == nil || hasFailedSync,
-		Readiness:               readiness,
+		LastComponentSync: lastComponentSync,
+		LastPricelistSync: lastPricelistSync,
+		IsOnline:          isOnline,
+		ComponentsCount:   componentsCount,
+		PricelistsCount:   pricelistsCount,
+		ServerPricelists:  serverPricelists,
+		NeedComponentSync: needComponentSync,
+		NeedPricelistSync: needPricelistSync,
+		Readiness:         readiness,
 	})
 }
 
@@ -114,7 +116,9 @@ func (h *SyncHandler) GetStatus(c *gin.Context) {
 func (h *SyncHandler) GetReadiness(c *gin.Context) {
 	readiness, err := h.syncService.GetReadiness()
 	if err != nil && readiness == nil {
-		RespondError(c, http.StatusInternalServerError, "internal server error", err)
+		c.JSON(http.StatusInternalServerError, gin.H{
+			"error": err.Error(),
+		})
 		return
 	}
 	if readiness == nil {
@@ -154,9 +158,8 @@ func (h *SyncHandler) ensureSyncReadiness(c *gin.Context) bool {
 
 	c.JSON(http.StatusInternalServerError, gin.H{
 		"success": false,
-		"error":   "internal server error",
+		"error":   err.Error(),
 	})
-	_ = c.Error(err)
 	_ = readiness
 	return false
 }
@@ -181,31 +184,20 @@ func (h *SyncHandler) SyncComponents(c *gin.Context) {
 	if err != nil {
 		c.JSON(http.StatusServiceUnavailable, gin.H{
 			"success": false,
-			"error":   "database connection failed",
+			"error":   "Database connection failed: " + err.Error(),
 		})
-		_ = c.Error(err)
 		return
 	}
 
-	now := time.Now()
 	result, err := h.localDB.SyncComponents(mariaDB)
 	if err != nil {
-		_ = h.localDB.SetComponentSyncResult("error", err.Error(), now)
-		h.localDB.AppendSyncLog("components", "error", err.Error(), 0, now, time.Since(now).Milliseconds())
 		slog.Error("component sync failed", "error", err)
 		c.JSON(http.StatusInternalServerError, gin.H{
 			"success": false,
-			"error":   "component sync failed",
+			"error":   err.Error(),
 		})
-		_ = c.Error(err)
 		return
 	}
-	_ = h.localDB.SetComponentSyncResult("ok", "", now)
-	h.localDB.AppendSyncLog("components", "ok", "", result.TotalSynced, now, result.Duration.Milliseconds())
-
-	if err := h.localDB.SyncQtSettings(mariaDB); err != nil {
-		slog.Warn("qt_settings sync failed", "error", err)
-	}
 
 	c.JSON(http.StatusOK, SyncResultResponse{
 		Success:  true,
@@ -225,20 +217,13 @@ func (h *SyncHandler) SyncPricelists(c *gin.Context) {
 	startTime := time.Now()
 	synced, err := h.syncService.SyncPricelists()
 	if err != nil {
-		h.localDB.AppendSyncLog("pricelists", "error", err.Error(), 0, startTime, time.Since(startTime).Milliseconds())
 		slog.Error("pricelist sync failed", "error", err)
 		c.JSON(http.StatusInternalServerError, gin.H{
 			"success": false,
-			"error":   "pricelist sync failed",
+			"error":   err.Error(),
 		})
-		_ = c.Error(err)
 		return
 	}
-	h.localDB.AppendSyncLog("pricelists", "ok", "", synced, startTime, time.Since(startTime).Milliseconds())
-
-	if _, err := h.syncService.PullPartnumberBooks(); err != nil {
-		slog.Warn("partnumber books pull failed after pricelist sync", "error", err)
-	}
 
 	c.JSON(http.StatusOK, SyncResultResponse{
 		Success:  true,
@@ -246,6 +231,7 @@ func (h *SyncHandler) SyncPricelists(c *gin.Context) {
 		Synced:   synced,
 		Duration: time.Since(startTime).String(),
 	})
+	h.syncService.RecordSyncHeartbeat()
 }
 
 // SyncPartnumberBooks syncs partnumber book snapshots from MariaDB to local SQLite.
@@ -261,9 +247,8 @@ func (h *SyncHandler) SyncPartnumberBooks(c *gin.Context) {
 		slog.Error("partnumber books pull failed", "error", err)
 		c.JSON(http.StatusInternalServerError, gin.H{
 			"success": false,
-			"error":   "partnumber books sync failed",
+			"error":   err.Error(),
 		})
-		_ = c.Error(err)
 		return
 	}
 
@@ -273,6 +258,7 @@ func (h *SyncHandler) SyncPartnumberBooks(c *gin.Context) {
 		Synced:   pulled,
 		Duration: time.Since(startTime).String(),
 	})
+	h.syncService.RecordSyncHeartbeat()
 }
 
 // SyncAllResponse represents result of full sync
@@ -309,9 +295,8 @@ func (h *SyncHandler) SyncAll(c *gin.Context) {
 		slog.Error("pending push failed during full sync", "error", err)
 		c.JSON(http.StatusInternalServerError, gin.H{
 			"success": false,
-			"error":   "pending changes push failed",
+			"error":   "Pending changes push failed: " + err.Error(),
 		})
-		_ = c.Error(err)
 		return
 	}
 
@@ -320,65 +305,45 @@ func (h *SyncHandler) SyncAll(c *gin.Context) {
 	if err != nil {
 		c.JSON(http.StatusServiceUnavailable, gin.H{
 			"success": false,
-			"error":   "database connection failed",
+			"error":   "Database connection failed: " + err.Error(),
 		})
-		_ = c.Error(err)
 		return
 	}
 
-	compNow := time.Now()
 	compResult, err := h.localDB.SyncComponents(mariaDB)
 	if err != nil {
-		_ = h.localDB.SetComponentSyncResult("error", err.Error(), compNow)
-		h.localDB.AppendSyncLog("components", "error", err.Error(), 0, compNow, time.Since(compNow).Milliseconds())
 		slog.Error("component sync failed during full sync", "error", err)
 		c.JSON(http.StatusInternalServerError, gin.H{
 			"success": false,
-			"error":   "component sync failed",
+			"error":   "Component sync failed: " + err.Error(),
 		})
-		_ = c.Error(err)
 		return
 	}
-	_ = h.localDB.SetComponentSyncResult("ok", "", compNow)
-	h.localDB.AppendSyncLog("components", "ok", "", compResult.TotalSynced, compNow, compResult.Duration.Milliseconds())
 	componentsSynced = compResult.TotalSynced
 
-	if err := h.localDB.SyncQtSettings(mariaDB); err != nil {
-		slog.Warn("qt_settings sync failed", "error", err)
-	}
-
 	// Sync pricelists
-	plNow := time.Now()
 	pricelistsSynced, err = h.syncService.SyncPricelists()
 	if err != nil {
-		h.localDB.AppendSyncLog("pricelists", "error", err.Error(), 0, plNow, time.Since(plNow).Milliseconds())
 		slog.Error("pricelist sync failed during full sync", "error", err)
 		c.JSON(http.StatusInternalServerError, gin.H{
 			"success":           false,
-			"error":             "pricelist sync failed",
+			"error":             "Pricelist sync failed: " + err.Error(),
 			"pending_pushed":    pendingPushed,
 			"components_synced": componentsSynced,
 		})
-		_ = c.Error(err)
 		return
 	}
-	h.localDB.AppendSyncLog("pricelists", "ok", "", pricelistsSynced, plNow, time.Since(plNow).Milliseconds())
-
-	if _, err := h.syncService.PullPartnumberBooks(); err != nil {
-		slog.Warn("partnumber books pull failed during full sync", "error", err)
-	}
 
 	projectsResult, err := h.syncService.ImportProjectsToLocal()
 	if err != nil {
 		slog.Error("project import failed during full sync", "error", err)
 		c.JSON(http.StatusInternalServerError, gin.H{
 			"success":           false,
-			"error":             "project import failed",
+			"error":             "Project import failed: " + err.Error(),
 			"pending_pushed":    pendingPushed,
 			"components_synced": componentsSynced,
 			"pricelists_synced": pricelistsSynced,
 		})
-		_ = c.Error(err)
 		return
 	}
 
@@ -387,7 +352,7 @@ func (h *SyncHandler) SyncAll(c *gin.Context) {
 		slog.Error("configuration import failed during full sync", "error", err)
 		c.JSON(http.StatusInternalServerError, gin.H{
 			"success":           false,
-			"error":             "configuration import failed",
+			"error":             "Configuration import failed: " + err.Error(),
 			"pending_pushed":    pendingPushed,
 			"components_synced": componentsSynced,
 			"pricelists_synced": pricelistsSynced,
@@ -395,7 +360,6 @@ func (h *SyncHandler) SyncAll(c *gin.Context) {
 			"projects_updated":  projectsResult.Updated,
 			"projects_skipped":  projectsResult.Skipped,
 		})
-		_ = c.Error(err)
 		return
 	}
 
@@ -413,6 +377,7 @@ func (h *SyncHandler) SyncAll(c *gin.Context) {
 		ConfigurationsSkipped:  configsResult.Skipped,
 		Duration:               time.Since(startTime).String(),
 	})
+	h.syncService.RecordSyncHeartbeat()
 }
 
 // checkOnline checks if MariaDB is accessible
@@ -433,9 +398,8 @@ func (h *SyncHandler) PushPendingChanges(c *gin.Context) {
 		slog.Error("push pending changes failed", "error", err)
 		c.JSON(http.StatusInternalServerError, gin.H{
 			"success": false,
-			"error":   "pending changes push failed",
+			"error":   err.Error(),
 		})
-		_ = c.Error(err)
 		return
 	}
 
@@ -445,6 +409,7 @@ func (h *SyncHandler) PushPendingChanges(c *gin.Context) {
 		Synced:   pushed,
 		Duration: time.Since(startTime).String(),
 	})
+	h.syncService.RecordSyncHeartbeat()
 }
 
 // GetPendingCount returns the number of pending changes
@@ -461,7 +426,9 @@ func (h *SyncHandler) GetPendingCount(c *gin.Context) {
 func (h *SyncHandler) GetPendingChanges(c *gin.Context) {
 	changes, err := h.localDB.GetPendingChanges()
 	if err != nil {
-		RespondError(c, http.StatusInternalServerError, "internal server error", err)
+		c.JSON(http.StatusInternalServerError, gin.H{
+			"error": err.Error(),
+		})
 		return
 	}
 
@@ -478,9 +445,8 @@ func (h *SyncHandler) RepairPendingChanges(c *gin.Context) {
 		slog.Error("repair pending changes failed", "error", err)
 		c.JSON(http.StatusInternalServerError, gin.H{
 			"success": false,
-			"error":   "pending changes repair failed",
+			"error":   err.Error(),
 		})
-		_ = c.Error(err)
 		return
 	}
 
@@ -499,13 +465,8 @@ type SyncInfoResponse struct {
 	DBName string `json:"db_name"`
 
 	// Status
-	IsOnline                bool       `json:"is_online"`
-	LastSyncAt              *time.Time `json:"last_sync_at"`
-	LastPricelistAttemptAt  *time.Time `json:"last_pricelist_attempt_at,omitempty"`
-	LastPricelistSyncStatus string     `json:"last_pricelist_sync_status,omitempty"`
-	LastPricelistSyncError  string     `json:"last_pricelist_sync_error,omitempty"`
-	NeedPricelistSync       bool       `json:"need_pricelist_sync"`
-	HasIncompleteServerSync bool       `json:"has_incomplete_server_sync"`
+	IsOnline   bool       `json:"is_online"`
+	LastSyncAt *time.Time `json:"last_sync_at"`
 
 	// Statistics
 	LotCount     int64 `json:"lot_count"`
@@ -541,8 +502,8 @@ type SyncError struct {
 // GetInfo returns sync information for modal
 // GET /api/sync/info
 func (h *SyncHandler) GetInfo(c *gin.Context) {
-	connStatus := h.connMgr.GetStatus()
-	isOnline := connStatus.IsConnected && strings.TrimSpace(connStatus.LastError) == ""
+	// Check online status by pinging MariaDB
+	isOnline := h.checkOnline()
 
 	// Get DB connection info
 	var dbHost, dbUser, dbName string
@@ -554,18 +515,19 @@ func (h *SyncHandler) GetInfo(c *gin.Context) {
 
 	// Get sync times
 	lastPricelistSync := h.localDB.GetLastSyncTime()
-	lastPricelistAttemptAt := h.localDB.GetLastPricelistSyncAttemptAt()
-	lastPricelistSyncStatus := h.localDB.GetLastPricelistSyncStatus()
-	lastPricelistSyncError := h.localDB.GetLastPricelistSyncError()
-	hasFailedSync := strings.EqualFold(lastPricelistSyncStatus, "failed")
-	needPricelistSync := lastPricelistSync == nil || hasFailedSync
-	hasIncompleteServerSync := hasFailedSync
+
+	// Get MariaDB counts (if online)
+	var lotCount, lotLogCount int64
+	if isOnline {
+		if mariaDB, err := h.connMgr.GetDB(); err == nil {
+			mariaDB.Table("lot").Count(&lotCount)
+			mariaDB.Table("lot_log").Count(&lotLogCount)
+		}
+	}
 
 	// Get local counts
 	configCount := h.localDB.CountConfigurations()
 	projectCount := h.localDB.CountProjects()
-	componentCount := h.localDB.CountLocalComponents()
-	pricelistCount := h.localDB.CountLocalPricelists()
 
 	// Get error count (only changes with LastError != "")
 	errorCount := int(h.localDB.CountErroredChanges())
@@ -592,27 +554,22 @@ func (h *SyncHandler) GetInfo(c *gin.Context) {
 		syncErrors = syncErrors[:10]
 	}
 
-	readiness := h.getReadinessLocal()
+	readiness := h.getReadinessCached(10 * time.Second)
 
 	c.JSON(http.StatusOK, SyncInfoResponse{
-		DBHost:                  dbHost,
-		DBUser:                  dbUser,
-		DBName:                  dbName,
-		IsOnline:                isOnline,
-		LastSyncAt:              lastPricelistSync,
-		LastPricelistAttemptAt:  lastPricelistAttemptAt,
-		LastPricelistSyncStatus: lastPricelistSyncStatus,
-		LastPricelistSyncError:  lastPricelistSyncError,
-		NeedPricelistSync:       needPricelistSync,
-		HasIncompleteServerSync: hasIncompleteServerSync,
-		LotCount:                componentCount,
-		LotLogCount:             pricelistCount,
-		ConfigCount:             configCount,
-		ProjectCount:            projectCount,
-		PendingChanges:          changes,
-		ErrorCount:              errorCount,
-		Errors:                  syncErrors,
-		Readiness:               readiness,
+		DBHost:         dbHost,
+		DBUser:         dbUser,
+		DBName:         dbName,
+		IsOnline:       isOnline,
+		LastSyncAt:     lastPricelistSync,
+		LotCount:       lotCount,
+		LotLogCount:    lotLogCount,
+		ConfigCount:    configCount,
+		ProjectCount:   projectCount,
+		PendingChanges: changes,
+		ErrorCount:     errorCount,
+		Errors:         syncErrors,
+		Readiness:      readiness,
 	})
 }
 
@@ -633,9 +590,14 @@ func (h *SyncHandler) GetUsersStatus(c *gin.Context) {
 		return
 	}
 
+	// Keep current client heartbeat fresh so app version is available in the table.
+	h.syncService.RecordSyncHeartbeat()
+
 	users, err := h.syncService.ListUserSyncStatuses(threshold)
 	if err != nil {
-		RespondError(c, http.StatusInternalServerError, "internal server error", err)
+		c.JSON(http.StatusInternalServerError, gin.H{
+			"error": err.Error(),
+		})
 		return
 	}
 
@@ -664,33 +626,15 @@ func (h *SyncHandler) SyncStatusPartial(c *gin.Context) {
 
 	// Get pending count
 	pendingCount := h.localDB.GetPendingCount()
-	readiness := h.getReadinessLocal()
+	readiness := h.getReadinessCached(10 * time.Second)
 	isBlocked := readiness != nil && readiness.Blocked
-	lastPricelistSyncStatus := h.localDB.GetLastPricelistSyncStatus()
-	lastPricelistSyncError := h.localDB.GetLastPricelistSyncError()
-	hasFailedSync := strings.EqualFold(lastPricelistSyncStatus, "failed")
-	hasIncompleteServerSync := hasFailedSync
 
 	slog.Debug("rendering sync status", "is_offline", isOffline, "pending_count", pendingCount, "sync_blocked", isBlocked)
 
 	data := gin.H{
-		"IsOffline":               isOffline,
-		"PendingCount":            pendingCount,
-		"IsBlocked":               isBlocked,
-		"HasFailedSync":           hasFailedSync,
-		"HasIncompleteServerSync": hasIncompleteServerSync,
-		"SyncIssueTitle": func() string {
-			if hasIncompleteServerSync {
-				return "Последняя синхронизация прайслистов прервалась. На сервере есть изменения, которые не загружены локально."
-			}
-			if hasFailedSync {
-				if lastPricelistSyncError != "" {
-					return lastPricelistSyncError
-				}
-				return "Последняя синхронизация прайслистов завершилась ошибкой."
-			}
-			return ""
-		}(),
+		"IsOffline":    isOffline,
+		"PendingCount": pendingCount,
+		"IsBlocked":    isBlocked,
 		"BlockedReason": func() string {
 			if readiness == nil {
 				return ""
@@ -702,41 +646,24 @@ func (h *SyncHandler) SyncStatusPartial(c *gin.Context) {
 	c.Header("Content-Type", "text/html; charset=utf-8")
 	if err := h.tmpl.ExecuteTemplate(c.Writer, "sync_status", data); err != nil {
 		slog.Error("failed to render sync_status template", "error", err)
-		_ = c.Error(err)
-		c.String(http.StatusInternalServerError, "Template error")
+		c.String(http.StatusInternalServerError, "Template error: "+err.Error())
 	}
 }
 
-func (h *SyncHandler) getReadinessLocal() *sync.SyncReadiness {
+func (h *SyncHandler) getReadinessCached(maxAge time.Duration) *sync.SyncReadiness {
 	h.readinessMu.Lock()
-	if h.readinessCached != nil && time.Since(h.readinessCachedAt) < 10*time.Second {
+	if h.readinessCached != nil && time.Since(h.readinessCachedAt) < maxAge {
 		cached := *h.readinessCached
 		h.readinessMu.Unlock()
 		return &cached
 	}
 	h.readinessMu.Unlock()
 
-	state, err := h.localDB.GetSyncGuardState()
-	if err != nil || state == nil {
+	readiness, err := h.syncService.GetReadiness()
+	if err != nil && readiness == nil {
 		return nil
 	}
 
-	// OFFLINE_UNVERIFIED_SCHEMA is only valid while actually offline.
-	// Suppress it when the connection manager reports online so the stale
-	// blocked state from a previous disconnection doesn't linger in the UI.
-	if state.ReasonCode == "OFFLINE_UNVERIFIED_SCHEMA" && h.checkOnline() {
-		return nil
-	}
-
-	readiness := &sync.SyncReadiness{
-		Status:                state.Status,
-		Blocked:               state.Status == sync.ReadinessBlocked,
-		ReasonCode:            state.ReasonCode,
-		ReasonText:            state.ReasonText,
-		RequiredMinAppVersion: state.RequiredMinAppVersion,
-		LastCheckedAt:         state.LastCheckedAt,
-	}
-
 	h.readinessMu.Lock()
 	h.readinessCached = readiness
 	h.readinessCachedAt = time.Now()
@@ -755,7 +682,7 @@ func (h *SyncHandler) ReportPartnumberSeen(c *gin.Context) {
 		} `json:"items"`
 	}
 	if err := c.ShouldBindJSON(&body); err != nil {
-		RespondError(c, http.StatusUnprocessableEntity, "invalid request", err)
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 		return
 	}
 
@@ -771,7 +698,7 @@ func (h *SyncHandler) ReportPartnumberSeen(c *gin.Context) {
 	}
 
 	if err := h.syncService.PushPartnumberSeen(items); err != nil {
-		RespondError(c, http.StatusServiceUnavailable, "service unavailable", err)
+		c.JSON(http.StatusServiceUnavailable, gin.H{"error": err.Error()})
 		return
 	}
 

internal/handlers/vendor_spec.go

@@ -1,31 +1,24 @@
 package handlers
 
 import (
+	"encoding/json"
 	"errors"
-	"log/slog"
 	"net/http"
 	"strings"
 
 	"git.mchus.pro/mchus/quoteforge/internal/localdb"
 	"git.mchus.pro/mchus/quoteforge/internal/repository"
 	"git.mchus.pro/mchus/quoteforge/internal/services"
-	syncsvc "git.mchus.pro/mchus/quoteforge/internal/services/sync"
 	"github.com/gin-gonic/gin"
 )
 
 // VendorSpecHandler handles vendor BOM spec operations for a configuration.
 type VendorSpecHandler struct {
-	localDB       *localdb.LocalDB
-	configService *services.LocalConfigurationService
-	syncService   *syncsvc.Service // optional; nil = no server push
+	localDB *localdb.LocalDB
 }
 
-func NewVendorSpecHandler(localDB *localdb.LocalDB, syncService *syncsvc.Service) *VendorSpecHandler {
-	return &VendorSpecHandler{
-		localDB:       localDB,
-		configService: services.NewLocalConfigurationService(localDB, nil, nil, func() bool { return false }),
-		syncService:   syncService,
-	}
+func NewVendorSpecHandler(localDB *localdb.LocalDB) *VendorSpecHandler {
+	return &VendorSpecHandler{localDB: localDB}
 }
 
 // lookupConfig finds an active configuration by UUID using the standard localDB method.
@@ -40,28 +33,6 @@ func (h *VendorSpecHandler) lookupConfig(uuid string) (*localdb.LocalConfigurati
 	return cfg, nil
 }
 
-// ParseText parses a pasted single-column text BOM (Inspur or Russian text BOM)
-// using the same parsers as the vendor file-import path. It is stateless: no
-// configuration is required. Returns the parsed rows and the detected format, or
-// an empty result when the text is not a recognized single-column format (the
-// client then falls back to manual column mapping).
-// POST /api/vendor-spec/parse-text
-func (h *VendorSpecHandler) ParseText(c *gin.Context) {
-	var body struct {
-		Text string `json:"text"`
-	}
-	if err := c.ShouldBindJSON(&body); err != nil {
-		RespondError(c, http.StatusUnprocessableEntity, "invalid request", err)
-		return
-	}
-
-	rows, format := services.ParsePastedBOMText(body.Text)
-	if rows == nil {
-		rows = []localdb.VendorSpecItem{}
-	}
-	c.JSON(http.StatusOK, gin.H{"rows": rows, "format": format})
-}
-
 // GetVendorSpec returns the vendor spec (BOM) for a configuration.
 // GET /api/configs/:uuid/vendor-spec
 func (h *VendorSpecHandler) GetVendorSpec(c *gin.Context) {
@@ -91,7 +62,7 @@ func (h *VendorSpecHandler) PutVendorSpec(c *gin.Context) {
 		VendorSpec []localdb.VendorSpecItem `json:"vendor_spec"`
 	}
 	if err := c.ShouldBindJSON(&body); err != nil {
-		RespondError(c, http.StatusUnprocessableEntity, "invalid request", err)
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 		return
 	}
 
@@ -109,62 +80,19 @@ func (h *VendorSpecHandler) PutVendorSpec(c *gin.Context) {
 	}
 
 	spec := localdb.VendorSpec(body.VendorSpec)
-	if _, err := h.configService.UpdateVendorSpecNoAuth(cfg.UUID, spec); err != nil {
-		RespondError(c, http.StatusInternalServerError, "internal server error", err)
+	specJSON, err := json.Marshal(spec)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+		return
+	}
+	if err := h.localDB.DB().Model(cfg).Update("vendor_spec", string(specJSON)).Error; err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
 	}
-
-	// Push manual lot mappings as suggestions to the server (best-effort, non-blocking).
-	h.pushLotSuggestions(body.VendorSpec)
 
 	c.JSON(http.StatusOK, gin.H{"vendor_spec": spec})
 }
 
-// pushLotSuggestions sends manual PN→LOT mappings to qt_vendor_partnumber_seen.lot_suggestion.
-// Errors are logged and silently dropped — they must not affect the HTTP response.
-func (h *VendorSpecHandler) pushLotSuggestions(spec []localdb.VendorSpecItem) {
-	if h.syncService == nil {
-		return
-	}
-
-	var items []syncsvc.SeenPartnumber
-	for _, row := range spec {
-		if row.VendorPartnumber == "" || len(row.LotMappings) == 0 {
-			continue
-		}
-		suggestion := make([]syncsvc.LotSuggestionEntry, 0, len(row.LotMappings))
-		for _, m := range row.LotMappings {
-			if m.LotName == "" {
-				continue
-			}
-			qty := m.QuantityPerPN
-			if qty < 1 {
-				qty = 1
-			}
-			suggestion = append(suggestion, syncsvc.LotSuggestionEntry{
-				LotName: m.LotName,
-				Qty:     qty,
-			})
-		}
-		if len(suggestion) == 0 {
-			continue
-		}
-		items = append(items, syncsvc.SeenPartnumber{
-			Partnumber:    row.VendorPartnumber,
-			Description:   row.Description,
-			LotSuggestion: suggestion,
-		})
-	}
-
-	if len(items) == 0 {
-		return
-	}
-
-	if err := h.syncService.PushPartnumberSeen(items); err != nil {
-		slog.Warn("vendor_spec: failed to push lot suggestions to server", "error", err)
-	}
-}
-
 func normalizeLotMappings(in []localdb.VendorSpecLotMapping) []localdb.VendorSpecLotMapping {
 	if len(in) == 0 {
 		return nil
@@ -210,7 +138,7 @@ func (h *VendorSpecHandler) ResolveVendorSpec(c *gin.Context) {
 		VendorSpec []localdb.VendorSpecItem `json:"vendor_spec"`
 	}
 	if err := c.ShouldBindJSON(&body); err != nil {
-		RespondError(c, http.StatusUnprocessableEntity, "invalid request", err)
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 		return
 	}
 
@@ -219,18 +147,14 @@ func (h *VendorSpecHandler) ResolveVendorSpec(c *gin.Context) {
 
 	resolved, err := resolver.Resolve(body.VendorSpec)
 	if err != nil {
-		RespondError(c, http.StatusInternalServerError, "internal server error", err)
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
 	}
 
-	book, err := bookRepo.GetActiveBook()
-	if err != nil {
-		slog.Warn("vendor spec resolve: no active partnumber book", "err", err)
-		book = nil
-	}
+	book, _ := bookRepo.GetActiveBook()
 	aggregated, err := services.AggregateLOTs(resolved, book, bookRepo)
 	if err != nil {
-		RespondError(c, http.StatusInternalServerError, "internal server error", err)
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
 	}
 
@@ -257,7 +181,7 @@ func (h *VendorSpecHandler) ApplyVendorSpec(c *gin.Context) {
 		} `json:"items"`
 	}
 	if err := c.ShouldBindJSON(&body); err != nil {
-		RespondError(c, http.StatusUnprocessableEntity, "invalid request", err)
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 		return
 	}
 
@@ -270,8 +194,14 @@ func (h *VendorSpecHandler) ApplyVendorSpec(c *gin.Context) {
 		})
 	}
 
-	if _, err := h.configService.ApplyVendorSpecItemsNoAuth(cfg.UUID, newItems); err != nil {
-		RespondError(c, http.StatusInternalServerError, "internal server error", err)
+	itemsJSON, err := json.Marshal(newItems)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+		return
+	}
+
+	if err := h.localDB.DB().Model(cfg).Update("items", string(itemsJSON)).Error; err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
 	}
 

internal/handlers/web.go

@@ -1,24 +1,21 @@
 package handlers
 
 import (
-	"fmt"
 	"html/template"
 	"strconv"
-	"strings"
 
 	qfassets "git.mchus.pro/mchus/quoteforge"
-	"git.mchus.pro/mchus/quoteforge/internal/appmeta"
-	"git.mchus.pro/mchus/quoteforge/internal/localdb"
-	"git.mchus.pro/mchus/quoteforge/internal/models"
+	"git.mchus.pro/mchus/quoteforge/internal/repository"
+	"git.mchus.pro/mchus/quoteforge/internal/services"
 	"github.com/gin-gonic/gin"
 )
 
 type WebHandler struct {
-	templates map[string]*template.Template
-	localDB   *localdb.LocalDB
+	templates        map[string]*template.Template
+	componentService *services.ComponentService
 }
 
-func NewWebHandler(_ string, localDB *localdb.LocalDB) (*WebHandler, error) {
+func NewWebHandler(_ string, componentService *services.ComponentService) (*WebHandler, error) {
 	funcMap := template.FuncMap{
 		"sub": func(a, b int) int { return a - b },
 		"add": func(a, b int) int { return a + b },
@@ -62,7 +59,7 @@ func NewWebHandler(_ string, localDB *localdb.LocalDB) (*WebHandler, error) {
 
 	templates := make(map[string]*template.Template)
 	// Load each page template with base
-	simplePages := []string{"configs.html", "projects.html", "project_detail.html", "pricelists.html", "pricelist_detail.html", "config_revisions.html", "partnumber_books.html"}
+	simplePages := []string{"login.html", "configs.html", "projects.html", "project_detail.html", "pricelists.html", "pricelist_detail.html", "config_revisions.html", "partnumber_books.html"}
 	for _, page := range simplePages {
 		var tmpl *template.Template
 		var err error
@@ -107,24 +104,21 @@ func NewWebHandler(_ string, localDB *localdb.LocalDB) (*WebHandler, error) {
 	}
 
 	return &WebHandler{
-		templates: templates,
-		localDB:   localDB,
+		templates:        templates,
+		componentService: componentService,
 	}, nil
 }
 
 func (h *WebHandler) render(c *gin.Context, name string, data gin.H) {
-	data["AppVersion"] = appmeta.Version()
 	c.Header("Content-Type", "text/html; charset=utf-8")
 	tmpl, ok := h.templates[name]
 	if !ok {
-		_ = c.Error(fmt.Errorf("template %q not found", name))
-		c.String(500, "Template error")
+		c.String(500, "Template not found: %s", name)
 		return
 	}
 	// Execute the page template which will use base
 	if err := tmpl.ExecuteTemplate(c.Writer, name, data); err != nil {
-		_ = c.Error(err)
-		c.String(500, "Template error")
+		c.String(500, "Template error: %v", err)
 	}
 }
 
@@ -134,28 +128,36 @@ func (h *WebHandler) Index(c *gin.Context) {
 }
 
 func (h *WebHandler) Configurator(c *gin.Context) {
+	categories, _ := h.componentService.GetCategories()
 	uuid := c.Query("uuid")
-	categories, _ := h.localCategories()
-	components, total, err := h.localDB.ListComponents(localdb.ComponentFilter{}, 0, 20)
+
+	filter := repository.ComponentFilter{}
+	result, err := h.componentService.List(filter, 1, 20)
 
 	data := gin.H{
 		"ActivePage": "configurator",
 		"Categories": categories,
-		"Components": []localComponentView{},
+		"Components": []interface{}{},
 		"Total":      int64(0),
 		"Page":       1,
 		"PerPage":    20,
 		"ConfigUUID": uuid,
 	}
 
-	if err == nil {
-		data["Components"] = toLocalComponentViews(components)
-		data["Total"] = total
+	if err == nil && result != nil {
+		data["Components"] = result.Components
+		data["Total"] = result.Total
+		data["Page"] = result.Page
+		data["PerPage"] = result.PerPage
 	}
 
 	h.render(c, "index.html", data)
 }
 
+func (h *WebHandler) Login(c *gin.Context) {
+	h.render(c, "login.html", nil)
+}
+
 func (h *WebHandler) Configs(c *gin.Context) {
 	h.render(c, "configs.html", gin.H{"ActivePage": "configs"})
 }
@@ -194,30 +196,25 @@ func (h *WebHandler) PartnumberBooks(c *gin.Context) {
 
 func (h *WebHandler) ComponentsPartial(c *gin.Context) {
 	page, _ := strconv.Atoi(c.DefaultQuery("page", "1"))
-	if page < 1 {
-		page = 1
-	}
 
-	filter := localdb.ComponentFilter{
+	filter := repository.ComponentFilter{
 		Category: c.Query("category"),
 		Search:   c.Query("search"),
 	}
-	if c.Query("has_price") == "true" {
-		filter.HasPrice = true
-	}
-	offset := (page - 1) * 20
 
 	data := gin.H{
-		"Components": []localComponentView{},
+		"Components": []interface{}{},
 		"Total":      int64(0),
 		"Page":       page,
 		"PerPage":    20,
 	}
 
-	components, total, err := h.localDB.ListComponents(filter, offset, 20)
-	if err == nil {
-		data["Components"] = toLocalComponentViews(components)
-		data["Total"] = total
+	result, err := h.componentService.List(filter, page, 20)
+	if err == nil && result != nil {
+		data["Components"] = result.Components
+		data["Total"] = result.Total
+		data["Page"] = result.Page
+		data["PerPage"] = result.PerPage
 	}
 
 	c.Header("Content-Type", "text/html; charset=utf-8")
@@ -225,46 +222,3 @@ func (h *WebHandler) ComponentsPartial(c *gin.Context) {
 		tmpl.ExecuteTemplate(c.Writer, "components_list.html", data)
 	}
 }
-
-type localComponentView struct {
-	LotName      string
-	Description  string
-	Category     string
-	CategoryName string
-	Model        string
-	CurrentPrice *float64
-}
-
-func toLocalComponentViews(items []localdb.LocalComponent) []localComponentView {
-	result := make([]localComponentView, 0, len(items))
-	for _, item := range items {
-		result = append(result, localComponentView{
-			LotName:      item.LotName,
-			Description:  item.LotDescription,
-			Category:     item.Category,
-			CategoryName: item.Category,
-			Model:        item.Model,
-		})
-	}
-	return result
-}
-
-func (h *WebHandler) localCategories() ([]models.Category, error) {
-	codes, err := h.localDB.GetLocalComponentCategories()
-	if err != nil || len(codes) == 0 {
-		return []models.Category{}, err
-	}
-
-	categories := make([]models.Category, 0, len(codes))
-	for _, code := range codes {
-		trimmed := strings.TrimSpace(code)
-		if trimmed == "" {
-			continue
-		}
-		categories = append(categories, models.Category{
-			Code: trimmed,
-			Name: trimmed,
-		})
-	}
-	return categories, nil
-}

internal/handlers/web_test.go

@@ -1,47 +0,0 @@
-package handlers
-
-import (
-	"errors"
-	"html/template"
-	"net/http"
-	"net/http/httptest"
-	"strings"
-	"testing"
-
-	"github.com/gin-gonic/gin"
-)
-
-func TestWebHandlerRenderHidesTemplateExecutionError(t *testing.T) {
-	gin.SetMode(gin.TestMode)
-
-	tmpl := template.Must(template.New("broken.html").Funcs(template.FuncMap{
-		"boom": func() (string, error) {
-			return "", errors.New("secret template failure")
-		},
-	}).Parse(`{{define "broken.html"}}{{boom}}{{end}}`))
-
-	handler := &WebHandler{
-		templates: map[string]*template.Template{
-			"broken.html": tmpl,
-		},
-	}
-
-	rec := httptest.NewRecorder()
-	ctx, _ := gin.CreateTestContext(rec)
-	ctx.Request = httptest.NewRequest(http.MethodGet, "/broken", nil)
-
-	handler.render(ctx, "broken.html", gin.H{})
-
-	if rec.Code != http.StatusInternalServerError {
-		t.Fatalf("expected 500, got %d", rec.Code)
-	}
-	if body := strings.TrimSpace(rec.Body.String()); body != "Template error" {
-		t.Fatalf("expected generic template error, got %q", body)
-	}
-	if len(ctx.Errors) != 1 {
-		t.Fatalf("expected logged template error, got %d", len(ctx.Errors))
-	}
-	if !strings.Contains(ctx.Errors.String(), "secret template failure") {
-		t.Fatalf("expected original error in gin context, got %q", ctx.Errors.String())
-	}
-}

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/localdb/configuration_business_fields_test.go

@@ -1,154 +0,0 @@
-package localdb
-
-import (
-	"testing"
-
-	"git.mchus.pro/mchus/quoteforge/internal/models"
-)
-
-func TestConfigurationConvertersPreserveBusinessFields(t *testing.T) {
-	estimateID := uint(11)
-	warehouseID := uint(22)
-	competitorID := uint(33)
-
-	cfg := &models.Configuration{
-		UUID:                  "cfg-1",
-		OwnerUsername:         "tester",
-		Name:                  "Config",
-		PricelistID:           &estimateID,
-		WarehousePricelistID:  &warehouseID,
-		CompetitorPricelistID: &competitorID,
-		DisablePriceRefresh:   true,
-		OnlyInStock:           true,
-	}
-
-	local := ConfigurationToLocal(cfg)
-	if local.WarehousePricelistID == nil || *local.WarehousePricelistID != warehouseID {
-		t.Fatalf("warehouse pricelist lost in ConfigurationToLocal: %+v", local.WarehousePricelistID)
-	}
-	if local.CompetitorPricelistID == nil || *local.CompetitorPricelistID != competitorID {
-		t.Fatalf("competitor pricelist lost in ConfigurationToLocal: %+v", local.CompetitorPricelistID)
-	}
-	if !local.DisablePriceRefresh {
-		t.Fatalf("disable_price_refresh lost in ConfigurationToLocal")
-	}
-
-	back := LocalToConfiguration(local)
-	if back.WarehousePricelistID == nil || *back.WarehousePricelistID != warehouseID {
-		t.Fatalf("warehouse pricelist lost in LocalToConfiguration: %+v", back.WarehousePricelistID)
-	}
-	if back.CompetitorPricelistID == nil || *back.CompetitorPricelistID != competitorID {
-		t.Fatalf("competitor pricelist lost in LocalToConfiguration: %+v", back.CompetitorPricelistID)
-	}
-	if !back.DisablePriceRefresh {
-		t.Fatalf("disable_price_refresh lost in LocalToConfiguration")
-	}
-}
-
-func TestConfigurationSnapshotPreservesBusinessFields(t *testing.T) {
-	estimateID := uint(11)
-	warehouseID := uint(22)
-	competitorID := uint(33)
-
-	cfg := &LocalConfiguration{
-		UUID:                  "cfg-1",
-		Name:                  "Config",
-		PricelistID:           &estimateID,
-		WarehousePricelistID:  &warehouseID,
-		CompetitorPricelistID: &competitorID,
-		DisablePriceRefresh:   true,
-		OnlyInStock:           true,
-		VendorSpec: VendorSpec{
-			{
-				SortOrder:        10,
-				VendorPartnumber: "PN-1",
-				Quantity:         1,
-				LotMappings: []VendorSpecLotMapping{
-					{LotName: "LOT_A", QuantityPerPN: 2},
-				},
-			},
-		},
-	}
-
-	raw, err := BuildConfigurationSnapshot(cfg)
-	if err != nil {
-		t.Fatalf("BuildConfigurationSnapshot: %v", err)
-	}
-
-	decoded, err := DecodeConfigurationSnapshot(raw)
-	if err != nil {
-		t.Fatalf("DecodeConfigurationSnapshot: %v", err)
-	}
-	if decoded.WarehousePricelistID == nil || *decoded.WarehousePricelistID != warehouseID {
-		t.Fatalf("warehouse pricelist lost in snapshot: %+v", decoded.WarehousePricelistID)
-	}
-	if decoded.CompetitorPricelistID == nil || *decoded.CompetitorPricelistID != competitorID {
-		t.Fatalf("competitor pricelist lost in snapshot: %+v", decoded.CompetitorPricelistID)
-	}
-	if !decoded.DisablePriceRefresh {
-		t.Fatalf("disable_price_refresh lost in snapshot")
-	}
-	if len(decoded.VendorSpec) != 1 || decoded.VendorSpec[0].VendorPartnumber != "PN-1" {
-		t.Fatalf("vendor_spec lost in snapshot: %+v", decoded.VendorSpec)
-	}
-	if len(decoded.VendorSpec[0].LotMappings) != 1 || decoded.VendorSpec[0].LotMappings[0].LotName != "LOT_A" {
-		t.Fatalf("lot mappings lost in snapshot: %+v", decoded.VendorSpec)
-	}
-}
-
-func TestConfigurationFingerprintIncludesPricingSelectorsAndVendorSpec(t *testing.T) {
-	estimateID := uint(11)
-	warehouseID := uint(22)
-	competitorID := uint(33)
-
-	base := &LocalConfiguration{
-		UUID:                  "cfg-1",
-		Name:                  "Config",
-		ServerCount:           1,
-		Items:                 LocalConfigItems{{LotName: "LOT_A", Quantity: 1, UnitPrice: 100}},
-		PricelistID:           &estimateID,
-		WarehousePricelistID:  &warehouseID,
-		CompetitorPricelistID: &competitorID,
-		DisablePriceRefresh:   true,
-		OnlyInStock:           true,
-		VendorSpec: VendorSpec{
-			{
-				SortOrder:        10,
-				VendorPartnumber: "PN-1",
-				Quantity:         1,
-			},
-		},
-	}
-
-	baseFingerprint, err := BuildConfigurationSpecPriceFingerprint(base)
-	if err != nil {
-		t.Fatalf("base fingerprint: %v", err)
-	}
-
-	changedPricelist := *base
-	newEstimateID := uint(44)
-	changedPricelist.PricelistID = &newEstimateID
-	pricelistFingerprint, err := BuildConfigurationSpecPriceFingerprint(&changedPricelist)
-	if err != nil {
-		t.Fatalf("pricelist fingerprint: %v", err)
-	}
-	if pricelistFingerprint == baseFingerprint {
-		t.Fatalf("expected pricelist selector to affect fingerprint")
-	}
-
-	changedVendorSpec := *base
-	changedVendorSpec.VendorSpec = VendorSpec{
-		{
-			SortOrder:        10,
-			VendorPartnumber: "PN-2",
-			Quantity:         1,
-		},
-	}
-	vendorFingerprint, err := BuildConfigurationSpecPriceFingerprint(&changedVendorSpec)
-	if err != nil {
-		t.Fatalf("vendor fingerprint: %v", err)
-	}
-	if vendorFingerprint == baseFingerprint {
-		t.Fatalf("expected vendor spec to affect fingerprint")
-	}
-}

internal/localdb/converters.go

@@ -18,33 +18,32 @@ func ConfigurationToLocal(cfg *models.Configuration) *LocalConfiguration {
 	}
 
 	local := &LocalConfiguration{
-		UUID:                  cfg.UUID,
-		ProjectUUID:           cfg.ProjectUUID,
-		IsActive:              true,
-		Name:                  cfg.Name,
-		Items:                 items,
-		TotalPrice:            cfg.TotalPrice,
-		CustomPrice:           cfg.CustomPrice,
-		Notes:                 cfg.Notes,
-		IsTemplate:            cfg.IsTemplate,
-		ServerCount:           cfg.ServerCount,
-		ServerModel:           cfg.ServerModel,
-		SupportCode:           cfg.SupportCode,
-		Article:               cfg.Article,
-		PricelistID:           cfg.PricelistID,
-		WarehousePricelistID:  cfg.WarehousePricelistID,
-		CompetitorPricelistID: cfg.CompetitorPricelistID,
-		ConfigType:            cfg.ConfigType,
-		VendorSpec:            modelVendorSpecToLocal(cfg.VendorSpec),
-		DisablePriceRefresh:   cfg.DisablePriceRefresh,
-		OnlyInStock:           cfg.OnlyInStock,
-		Line:                  cfg.Line,
-		PriceUpdatedAt:        cfg.PriceUpdatedAt,
-		CreatedAt:             cfg.CreatedAt,
-		UpdatedAt:             time.Now(),
-		SyncStatus:            "pending",
-		OriginalUserID:        derefUint(cfg.UserID),
-		OriginalUsername:      cfg.OwnerUsername,
+		UUID:             cfg.UUID,
+		ProjectUUID:      cfg.ProjectUUID,
+		IsActive:         true,
+		Name:             cfg.Name,
+		Items:            items,
+		TotalPrice:       cfg.TotalPrice,
+		CustomPrice:      cfg.CustomPrice,
+		Notes:            cfg.Notes,
+		IsTemplate:       cfg.IsTemplate,
+		ServerCount:      cfg.ServerCount,
+		ServerModel:      cfg.ServerModel,
+		SupportCode:      cfg.SupportCode,
+		Article:          cfg.Article,
+		PricelistID:      cfg.PricelistID,
+		OnlyInStock:      cfg.OnlyInStock,
+		Line:             cfg.Line,
+		PriceUpdatedAt:   cfg.PriceUpdatedAt,
+		CreatedAt:        cfg.CreatedAt,
+		UpdatedAt:        time.Now(),
+		SyncStatus:       "pending",
+		OriginalUserID:   derefUint(cfg.UserID),
+		OriginalUsername: cfg.OwnerUsername,
+	}
+
+	if local.OriginalUsername == "" && cfg.User != nil {
+		local.OriginalUsername = cfg.User.Username
 	}
 
 	if cfg.ID > 0 {
@@ -67,29 +66,24 @@ func LocalToConfiguration(local *LocalConfiguration) *models.Configuration {
 	}
 
 	cfg := &models.Configuration{
-		UUID:                  local.UUID,
-		OwnerUsername:         local.OriginalUsername,
-		ProjectUUID:           local.ProjectUUID,
-		Name:                  local.Name,
-		Items:                 items,
-		TotalPrice:            local.TotalPrice,
-		CustomPrice:           local.CustomPrice,
-		Notes:                 local.Notes,
-		IsTemplate:            local.IsTemplate,
-		ServerCount:           local.ServerCount,
-		ServerModel:           local.ServerModel,
-		SupportCode:           local.SupportCode,
-		Article:               local.Article,
-		PricelistID:           local.PricelistID,
-		WarehousePricelistID:  local.WarehousePricelistID,
-		CompetitorPricelistID: local.CompetitorPricelistID,
-		ConfigType:            local.ConfigType,
-		VendorSpec:            localVendorSpecToModel(local.VendorSpec),
-		DisablePriceRefresh:   local.DisablePriceRefresh,
-		OnlyInStock:           local.OnlyInStock,
-		Line:                  local.Line,
-		PriceUpdatedAt:        local.PriceUpdatedAt,
-		CreatedAt:             local.CreatedAt,
+		UUID:           local.UUID,
+		OwnerUsername:  local.OriginalUsername,
+		ProjectUUID:    local.ProjectUUID,
+		Name:           local.Name,
+		Items:          items,
+		TotalPrice:     local.TotalPrice,
+		CustomPrice:    local.CustomPrice,
+		Notes:          local.Notes,
+		IsTemplate:     local.IsTemplate,
+		ServerCount:    local.ServerCount,
+		ServerModel:    local.ServerModel,
+		SupportCode:    local.SupportCode,
+		Article:        local.Article,
+		PricelistID:    local.PricelistID,
+		OnlyInStock:    local.OnlyInStock,
+		Line:           local.Line,
+		PriceUpdatedAt: local.PriceUpdatedAt,
+		CreatedAt:      local.CreatedAt,
 	}
 
 	if local.ServerID != nil {
@@ -113,88 +107,6 @@ func derefUint(v *uint) uint {
 	return *v
 }
 
-func modelVendorSpecToLocal(spec models.VendorSpec) VendorSpec {
-	if len(spec) == 0 {
-		return nil
-	}
-	out := make(VendorSpec, 0, len(spec))
-	for _, item := range spec {
-		row := VendorSpecItem{
-			SortOrder:           item.SortOrder,
-			VendorPartnumber:    item.VendorPartnumber,
-			Quantity:            item.Quantity,
-			Description:         item.Description,
-			UnitPrice:           item.UnitPrice,
-			TotalPrice:          item.TotalPrice,
-			ResolvedLotName:     item.ResolvedLotName,
-			ResolutionSource:    item.ResolutionSource,
-			ManualLotSuggestion: item.ManualLotSuggestion,
-			LotQtyPerPN:         item.LotQtyPerPN,
-		}
-		if len(item.LotAllocations) > 0 {
-			row.LotAllocations = make([]VendorSpecLotAllocation, 0, len(item.LotAllocations))
-			for _, alloc := range item.LotAllocations {
-				row.LotAllocations = append(row.LotAllocations, VendorSpecLotAllocation{
-					LotName:  alloc.LotName,
-					Quantity: alloc.Quantity,
-				})
-			}
-		}
-		if len(item.LotMappings) > 0 {
-			row.LotMappings = make([]VendorSpecLotMapping, 0, len(item.LotMappings))
-			for _, mapping := range item.LotMappings {
-				row.LotMappings = append(row.LotMappings, VendorSpecLotMapping{
-					LotName:       mapping.LotName,
-					QuantityPerPN: mapping.QuantityPerPN,
-				})
-			}
-		}
-		out = append(out, row)
-	}
-	return out
-}
-
-func localVendorSpecToModel(spec VendorSpec) models.VendorSpec {
-	if len(spec) == 0 {
-		return nil
-	}
-	out := make(models.VendorSpec, 0, len(spec))
-	for _, item := range spec {
-		row := models.VendorSpecItem{
-			SortOrder:           item.SortOrder,
-			VendorPartnumber:    item.VendorPartnumber,
-			Quantity:            item.Quantity,
-			Description:         item.Description,
-			UnitPrice:           item.UnitPrice,
-			TotalPrice:          item.TotalPrice,
-			ResolvedLotName:     item.ResolvedLotName,
-			ResolutionSource:    item.ResolutionSource,
-			ManualLotSuggestion: item.ManualLotSuggestion,
-			LotQtyPerPN:         item.LotQtyPerPN,
-		}
-		if len(item.LotAllocations) > 0 {
-			row.LotAllocations = make([]models.VendorSpecLotAllocation, 0, len(item.LotAllocations))
-			for _, alloc := range item.LotAllocations {
-				row.LotAllocations = append(row.LotAllocations, models.VendorSpecLotAllocation{
-					LotName:  alloc.LotName,
-					Quantity: alloc.Quantity,
-				})
-			}
-		}
-		if len(item.LotMappings) > 0 {
-			row.LotMappings = make([]models.VendorSpecLotMapping, 0, len(item.LotMappings))
-			for _, mapping := range item.LotMappings {
-				row.LotMappings = append(row.LotMappings, models.VendorSpecLotMapping{
-					LotName:       mapping.LotName,
-					QuantityPerPN: mapping.QuantityPerPN,
-				})
-			}
-		}
-		out = append(out, row)
-	}
-	return out
-}
-
 func ProjectToLocal(project *models.Project) *LocalProject {
 	local := &LocalProject{
 		UUID:          project.UUID,

internal/localdb/encryption.go

@@ -7,104 +7,19 @@ import (
 	"crypto/sha256"
 	"encoding/base64"
 	"errors"
-	"fmt"
 	"io"
 	"os"
-	"path/filepath"
-	"strings"
-
-	"git.mchus.pro/mchus/quoteforge/internal/appstate"
 )
 
-const encryptionKeyFileName = "local_encryption.key"
-
-// getEncryptionKey resolves the active encryption key.
-// Preference order:
-// 1. QUOTEFORGE_ENCRYPTION_KEY env var
-// 2. application-managed random key file in the user state directory
-func getEncryptionKey() ([]byte, error) {
+// getEncryptionKey derives a 32-byte key from environment variable or machine ID
+func getEncryptionKey() []byte {
 	key := os.Getenv("QUOTEFORGE_ENCRYPTION_KEY")
-	if key != "" {
-		hash := sha256.Sum256([]byte(key))
-		return hash[:], nil
+	if key == "" {
+		// Fallback to a machine-based key (hostname + fixed salt)
+		hostname, _ := os.Hostname()
+		key = hostname + "quoteforge-salt-2024"
 	}
-
-	stateDir, err := resolveEncryptionStateDir()
-	if err != nil {
-		return nil, fmt.Errorf("resolve encryption state dir: %w", err)
-	}
-
-	return loadOrCreateEncryptionKey(filepath.Join(stateDir, encryptionKeyFileName))
-}
-
-func resolveEncryptionStateDir() (string, error) {
-	configPath, err := appstate.ResolveConfigPath("")
-	if err != nil {
-		return "", err
-	}
-	return filepath.Dir(configPath), nil
-}
-
-func loadOrCreateEncryptionKey(path string) ([]byte, error) {
-	if data, err := os.ReadFile(path); err == nil {
-		return parseEncryptionKeyFile(data)
-	} else if !errors.Is(err, os.ErrNotExist) {
-		return nil, fmt.Errorf("read encryption key: %w", err)
-	}
-
-	if err := os.MkdirAll(filepath.Dir(path), 0700); err != nil {
-		return nil, fmt.Errorf("create encryption key dir: %w", err)
-	}
-
-	raw := make([]byte, 32)
-	if _, err := io.ReadFull(rand.Reader, raw); err != nil {
-		return nil, fmt.Errorf("generate encryption key: %w", err)
-	}
-
-	encoded := base64.StdEncoding.EncodeToString(raw)
-	if err := writeKeyFile(path, []byte(encoded+"\n")); err != nil {
-		if errors.Is(err, os.ErrExist) {
-			data, readErr := os.ReadFile(path)
-			if readErr != nil {
-				return nil, fmt.Errorf("read concurrent encryption key: %w", readErr)
-			}
-			return parseEncryptionKeyFile(data)
-		}
-		return nil, err
-	}
-
-	return raw, nil
-}
-
-func writeKeyFile(path string, data []byte) error {
-	file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0600)
-	if err != nil {
-		return err
-	}
-	defer file.Close()
-
-	if _, err := file.Write(data); err != nil {
-		return err
-	}
-
-	return file.Sync()
-}
-
-func parseEncryptionKeyFile(data []byte) ([]byte, error) {
-	trimmed := strings.TrimSpace(string(data))
-	decoded, err := base64.StdEncoding.DecodeString(trimmed)
-	if err != nil {
-		return nil, fmt.Errorf("decode encryption key file: %w", err)
-	}
-	if len(decoded) != 32 {
-		return nil, fmt.Errorf("invalid encryption key length: %d", len(decoded))
-	}
-	return decoded, nil
-}
-
-func getLegacyEncryptionKey() []byte {
-	hostname, _ := os.Hostname()
-	key := hostname + "quoteforge-salt-2024"
+	// Hash to get exactly 32 bytes for AES-256
 	hash := sha256.Sum256([]byte(key))
 	return hash[:]
 }
@@ -115,10 +30,7 @@ func Encrypt(plaintext string) (string, error) {
 		return "", nil
 	}
 
-	key, err := getEncryptionKey()
-	if err != nil {
-		return "", err
-	}
+	key := getEncryptionKey()
 	block, err := aes.NewCipher(key)
 	if err != nil {
 		return "", err
@@ -144,50 +56,12 @@ func Decrypt(ciphertext string) (string, error) {
 		return "", nil
 	}
 
-	key, err := getEncryptionKey()
-	if err != nil {
-		return "", err
-	}
-	plaintext, legacy, err := decryptWithKeys(ciphertext, key, getLegacyEncryptionKey())
-	if err != nil {
-		return "", err
-	}
-	_ = legacy
-	return plaintext, nil
-}
-
-func DecryptWithMetadata(ciphertext string) (string, bool, error) {
-	if ciphertext == "" {
-		return "", false, nil
-	}
-
-	key, err := getEncryptionKey()
-	if err != nil {
-		return "", false, err
-	}
-	return decryptWithKeys(ciphertext, key, getLegacyEncryptionKey())
-}
-
-func decryptWithKeys(ciphertext string, primaryKey, legacyKey []byte) (string, bool, error) {
+	key := getEncryptionKey()
 	data, err := base64.StdEncoding.DecodeString(ciphertext)
 	if err != nil {
-		return "", false, err
+		return "", err
 	}
 
-	plaintext, err := decryptWithKey(data, primaryKey)
-	if err == nil {
-		return plaintext, false, nil
-	}
-
-	legacyPlaintext, legacyErr := decryptWithKey(data, legacyKey)
-	if legacyErr == nil {
-		return legacyPlaintext, true, nil
-	}
-
-	return "", false, err
-}
-
-func decryptWithKey(data, key []byte) (string, error) {
 	block, err := aes.NewCipher(key)
 	if err != nil {
 		return "", err

internal/localdb/encryption_test.go

@@ -1,97 +0,0 @@
-package localdb
-
-import (
-	"crypto/aes"
-	"crypto/cipher"
-	"crypto/rand"
-	"crypto/sha256"
-	"encoding/base64"
-	"io"
-	"os"
-	"path/filepath"
-	"testing"
-)
-
-func TestEncryptCreatesPersistentKeyFile(t *testing.T) {
-	stateDir := t.TempDir()
-	t.Setenv("QFS_STATE_DIR", stateDir)
-	t.Setenv("QUOTEFORGE_ENCRYPTION_KEY", "")
-
-	ciphertext, err := Encrypt("secret-password")
-	if err != nil {
-		t.Fatalf("encrypt: %v", err)
-	}
-	if ciphertext == "" {
-		t.Fatal("expected ciphertext")
-	}
-
-	keyPath := filepath.Join(stateDir, encryptionKeyFileName)
-	info, err := os.Stat(keyPath)
-	if err != nil {
-		t.Fatalf("stat key file: %v", err)
-	}
-	if info.Mode().Perm() != 0600 {
-		t.Fatalf("expected 0600 key file, got %v", info.Mode().Perm())
-	}
-}
-
-func TestDecryptMigratesLegacyCiphertext(t *testing.T) {
-	stateDir := t.TempDir()
-	t.Setenv("QFS_STATE_DIR", stateDir)
-	t.Setenv("QUOTEFORGE_ENCRYPTION_KEY", "")
-
-	legacyCiphertext := encryptWithKeyForTest(t, getLegacyEncryptionKey(), "legacy-password")
-
-	plaintext, migrated, err := DecryptWithMetadata(legacyCiphertext)
-	if err != nil {
-		t.Fatalf("decrypt legacy: %v", err)
-	}
-	if plaintext != "legacy-password" {
-		t.Fatalf("unexpected plaintext: %q", plaintext)
-	}
-	if !migrated {
-		t.Fatal("expected legacy ciphertext to require migration")
-	}
-
-	currentCiphertext, err := Encrypt("legacy-password")
-	if err != nil {
-		t.Fatalf("encrypt current: %v", err)
-	}
-	plaintext, migrated, err = DecryptWithMetadata(currentCiphertext)
-	if err != nil {
-		t.Fatalf("decrypt current: %v", err)
-	}
-	if migrated {
-		t.Fatal("did not expect current ciphertext to require migration")
-	}
-}
-
-func encryptWithKeyForTest(t *testing.T, key []byte, plaintext string) string {
-	t.Helper()
-
-	block, err := aes.NewCipher(key)
-	if err != nil {
-		t.Fatalf("new cipher: %v", err)
-	}
-	gcm, err := cipher.NewGCM(block)
-	if err != nil {
-		t.Fatalf("new gcm: %v", err)
-	}
-
-	nonce := make([]byte, gcm.NonceSize())
-	if _, err := io.ReadFull(rand.Reader, nonce); err != nil {
-		t.Fatalf("read nonce: %v", err)
-	}
-
-	ciphertext := gcm.Seal(nonce, nonce, []byte(plaintext), nil)
-	return base64.StdEncoding.EncodeToString(ciphertext)
-}
-
-func TestLegacyEncryptionKeyRemainsDeterministic(t *testing.T) {
-	hostname, _ := os.Hostname()
-	expected := sha256.Sum256([]byte(hostname + "quoteforge-salt-2024"))
-	actual := getLegacyEncryptionKey()
-	if string(actual) != string(expected[:]) {
-		t.Fatal("legacy key derivation changed")
-	}
-}

internal/localdb/local_migrations_test.go

@@ -5,10 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/glebarez/sqlite"
 	"github.com/google/uuid"
-	"gorm.io/gorm"
-	"gorm.io/gorm/logger"
 )
 
 func TestRunLocalMigrationsBackfillsExistingConfigurations(t *testing.T) {
@@ -316,280 +313,3 @@ func TestRunLocalMigrationsBackfillsConfigurationLineNo(t *testing.T) {
 		t.Fatalf("expected line_no [10,20], got [%d,%d]", rows[0].Line, rows[1].Line)
 	}
 }
-
-func TestRunLocalMigrationsDeduplicatesCanonicalPartnumberCatalog(t *testing.T) {
-	dbPath := filepath.Join(t.TempDir(), "partnumber_catalog_dedup.db")
-	db, err := gorm.Open(sqlite.Open(dbPath), &gorm.Config{
-		Logger: logger.Default.LogMode(logger.Silent),
-	})
-	if err != nil {
-		t.Fatalf("open sqlite: %v", err)
-	}
-
-	firstLots := LocalPartnumberBookLots{
-		{LotName: "LOT-A", Qty: 1},
-	}
-	secondLots := LocalPartnumberBookLots{
-		{LotName: "LOT-B", Qty: 2},
-	}
-
-	if err := db.Exec(`
-		CREATE TABLE local_partnumber_book_items (
-			id INTEGER PRIMARY KEY AUTOINCREMENT,
-			partnumber TEXT NOT NULL,
-			lots_json TEXT NOT NULL,
-			description TEXT
-		)
-	`).Error; err != nil {
-		t.Fatalf("create dirty local_partnumber_book_items: %v", err)
-	}
-
-	if err := db.Create(&LocalPartnumberBookItem{
-		Partnumber:  "PN-001",
-		LotsJSON:    firstLots,
-		Description: "",
-	}).Error; err != nil {
-		t.Fatalf("insert first duplicate row: %v", err)
-	}
-	if err := db.Create(&LocalPartnumberBookItem{
-		Partnumber:  "PN-001",
-		LotsJSON:    secondLots,
-		Description: "Canonical description",
-	}).Error; err != nil {
-		t.Fatalf("insert second duplicate row: %v", err)
-	}
-
-	if err := migrateLocalPartnumberBookCatalog(db); err != nil {
-		t.Fatalf("migrate local partnumber catalog: %v", err)
-	}
-
-	var items []LocalPartnumberBookItem
-	if err := db.Order("partnumber ASC").Find(&items).Error; err != nil {
-		t.Fatalf("load migrated partnumber items: %v", err)
-	}
-	if len(items) != 1 {
-		t.Fatalf("expected 1 deduplicated item, got %d", len(items))
-	}
-	if items[0].Partnumber != "PN-001" {
-		t.Fatalf("unexpected partnumber: %s", items[0].Partnumber)
-	}
-	if items[0].Description != "Canonical description" {
-		t.Fatalf("expected merged description, got %q", items[0].Description)
-	}
-	if len(items[0].LotsJSON) != 2 {
-		t.Fatalf("expected merged lots from duplicates, got %d", len(items[0].LotsJSON))
-	}
-
-	var duplicateCount int64
-	if err := db.Model(&LocalPartnumberBookItem{}).
-		Where("partnumber = ?", "PN-001").
-		Count(&duplicateCount).Error; err != nil {
-		t.Fatalf("count deduplicated partnumber: %v", err)
-	}
-	if duplicateCount != 1 {
-		t.Fatalf("expected unique partnumber row after migration, got %d", duplicateCount)
-	}
-}
-
-func TestSanitizeLocalPartnumberBookCatalogRemovesRowsWithoutPartnumber(t *testing.T) {
-	dbPath := filepath.Join(t.TempDir(), "sanitize_partnumber_catalog.db")
-	db, err := gorm.Open(sqlite.Open(dbPath), &gorm.Config{
-		Logger: logger.Default.LogMode(logger.Silent),
-	})
-	if err != nil {
-		t.Fatalf("open sqlite: %v", err)
-	}
-
-	if err := db.Exec(`
-		CREATE TABLE local_partnumber_book_items (
-			id INTEGER PRIMARY KEY AUTOINCREMENT,
-			partnumber TEXT NULL,
-			lots_json TEXT NOT NULL,
-			description TEXT
-		)
-	`).Error; err != nil {
-		t.Fatalf("create local_partnumber_book_items: %v", err)
-	}
-	if err := db.Exec(`
-		INSERT INTO local_partnumber_book_items (partnumber, lots_json, description) VALUES
-		(NULL, '[]', 'null pn'),
-		('', '[]', 'empty pn'),
-		('PN-OK', '[]', 'valid pn')
-	`).Error; err != nil {
-		t.Fatalf("seed local_partnumber_book_items: %v", err)
-	}
-
-	if err := sanitizeLocalPartnumberBookCatalog(db); err != nil {
-		t.Fatalf("sanitize local partnumber catalog: %v", err)
-	}
-
-	var items []LocalPartnumberBookItem
-	if err := db.Order("id ASC").Find(&items).Error; err != nil {
-		t.Fatalf("load sanitized items: %v", err)
-	}
-	if len(items) != 1 {
-		t.Fatalf("expected 1 valid item after sanitize, got %d", len(items))
-	}
-	if items[0].Partnumber != "PN-OK" {
-		t.Fatalf("expected remaining partnumber PN-OK, got %q", items[0].Partnumber)
-	}
-}
-
-func TestNewMigratesLegacyPartnumberBookCatalogBeforeAutoMigrate(t *testing.T) {
-	dbPath := filepath.Join(t.TempDir(), "legacy_partnumber_catalog.db")
-	db, err := gorm.Open(sqlite.Open(dbPath), &gorm.Config{
-		Logger: logger.Default.LogMode(logger.Silent),
-	})
-	if err != nil {
-		t.Fatalf("open sqlite: %v", err)
-	}
-
-	if err := db.Exec(`
-		CREATE TABLE local_partnumber_book_items (
-			id INTEGER PRIMARY KEY AUTOINCREMENT,
-			partnumber TEXT NOT NULL UNIQUE,
-			lots_json TEXT NOT NULL,
-			is_primary_pn INTEGER NOT NULL DEFAULT 0,
-			description TEXT
-		)
-	`).Error; err != nil {
-		t.Fatalf("create legacy local_partnumber_book_items: %v", err)
-	}
-	if err := db.Exec(`
-		INSERT INTO local_partnumber_book_items (partnumber, lots_json, is_primary_pn, description)
-		VALUES ('PN-001', '[{"lot_name":"CPU_A","qty":1}]', 0, 'Legacy row')
-	`).Error; err != nil {
-		t.Fatalf("seed legacy local_partnumber_book_items: %v", err)
-	}
-
-	local, err := New(dbPath)
-	if err != nil {
-		t.Fatalf("open localdb with legacy catalog: %v", err)
-	}
-	t.Cleanup(func() { _ = local.Close() })
-
-	var columns []struct {
-		Name string `gorm:"column:name"`
-	}
-	if err := local.DB().Raw(`SELECT name FROM pragma_table_info('local_partnumber_book_items')`).Scan(&columns).Error; err != nil {
-		t.Fatalf("load local_partnumber_book_items columns: %v", err)
-	}
-	for _, column := range columns {
-		if column.Name == "is_primary_pn" {
-			t.Fatalf("expected legacy is_primary_pn column to be removed before automigrate")
-		}
-	}
-
-	var items []LocalPartnumberBookItem
-	if err := local.DB().Find(&items).Error; err != nil {
-		t.Fatalf("load migrated local_partnumber_book_items: %v", err)
-	}
-	if len(items) != 1 || items[0].Partnumber != "PN-001" {
-		t.Fatalf("unexpected migrated rows: %#v", items)
-	}
-}
-
-func TestNewRecoversBrokenPartnumberBookCatalogCache(t *testing.T) {
-	dbPath := filepath.Join(t.TempDir(), "broken_partnumber_catalog.db")
-	db, err := gorm.Open(sqlite.Open(dbPath), &gorm.Config{
-		Logger: logger.Default.LogMode(logger.Silent),
-	})
-	if err != nil {
-		t.Fatalf("open sqlite: %v", err)
-	}
-
-	if err := db.Exec(`
-		CREATE TABLE local_partnumber_book_items (
-			id INTEGER PRIMARY KEY AUTOINCREMENT,
-			partnumber TEXT NOT NULL UNIQUE,
-			lots_json TEXT NOT NULL,
-			description TEXT
-		)
-	`).Error; err != nil {
-		t.Fatalf("create broken local_partnumber_book_items: %v", err)
-	}
-	if err := db.Exec(`
-		INSERT INTO local_partnumber_book_items (partnumber, lots_json, description)
-		VALUES ('PN-001', '{not-json}', 'Broken cache row')
-	`).Error; err != nil {
-		t.Fatalf("seed broken local_partnumber_book_items: %v", err)
-	}
-
-	local, err := New(dbPath)
-	if err != nil {
-		t.Fatalf("open localdb with broken catalog cache: %v", err)
-	}
-	t.Cleanup(func() { _ = local.Close() })
-
-	var count int64
-	if err := local.DB().Model(&LocalPartnumberBookItem{}).Count(&count).Error; err != nil {
-		t.Fatalf("count recovered local_partnumber_book_items: %v", err)
-	}
-	if count != 0 {
-		t.Fatalf("expected empty recovered local_partnumber_book_items, got %d rows", count)
-	}
-
-	var quarantineTables []struct {
-		Name string `gorm:"column:name"`
-	}
-	if err := local.DB().Raw(`
-		SELECT name
-		FROM sqlite_master
-		WHERE type = 'table' AND name LIKE 'local_partnumber_book_items_broken_%'
-	`).Scan(&quarantineTables).Error; err != nil {
-		t.Fatalf("load quarantine tables: %v", err)
-	}
-	if len(quarantineTables) != 1 {
-		t.Fatalf("expected one quarantined broken catalog table, got %d", len(quarantineTables))
-	}
-}
-
-func TestCleanupStaleReadOnlyCacheTempTablesDropsShadowTempWhenBaseExists(t *testing.T) {
-	dbPath := filepath.Join(t.TempDir(), "stale_cache_temp.db")
-	db, err := gorm.Open(sqlite.Open(dbPath), &gorm.Config{
-		Logger: logger.Default.LogMode(logger.Silent),
-	})
-	if err != nil {
-		t.Fatalf("open sqlite: %v", err)
-	}
-
-	if err := db.Exec(`
-		CREATE TABLE local_pricelist_items (
-			id INTEGER PRIMARY KEY AUTOINCREMENT,
-			pricelist_id INTEGER NOT NULL,
-			partnumber TEXT,
-			brand TEXT NOT NULL DEFAULT '',
-			lot_name TEXT NOT NULL,
-			description TEXT,
-			price REAL NOT NULL DEFAULT 0,
-			quantity INTEGER NOT NULL DEFAULT 0,
-			reserve INTEGER NOT NULL DEFAULT 0,
-			available_qty REAL,
-			partnumbers TEXT,
-			lot_category TEXT,
-			created_at DATETIME,
-			updated_at DATETIME
-		)
-	`).Error; err != nil {
-		t.Fatalf("create local_pricelist_items: %v", err)
-	}
-	if err := db.Exec(`
-		CREATE TABLE local_pricelist_items__temp (
-			id INTEGER PRIMARY KEY AUTOINCREMENT,
-			legacy TEXT
-		)
-	`).Error; err != nil {
-		t.Fatalf("create local_pricelist_items__temp: %v", err)
-	}
-
-	if err := cleanupStaleReadOnlyCacheTempTables(db); err != nil {
-		t.Fatalf("cleanup stale read-only cache temp tables: %v", err)
-	}
-
-	if db.Migrator().HasTable("local_pricelist_items__temp") {
-		t.Fatalf("expected stale temp table to be dropped")
-	}
-	if !db.Migrator().HasTable("local_pricelist_items") {
-		t.Fatalf("expected base local_pricelist_items table to remain")
-	}
-}

internal/localdb/localdb.go

@@ -1,7 +1,6 @@
 package localdb
 
 import (
-	"encoding/json"
 	"errors"
 	"fmt"
 	"log/slog"
@@ -43,14 +42,6 @@ type LocalDB struct {
 	path string
 }
 
-var localReadOnlyCacheTables = []string{
-	"local_pricelist_items",
-	"local_pricelists",
-	"local_components",
-	"local_partnumber_book_items",
-	"local_partnumber_books",
-}
-
 // ResetData clears local data tables while keeping connection settings.
 // It does not drop schema or connection_settings.
 func ResetData(dbPath string) error {
@@ -79,6 +70,7 @@ func ResetData(dbPath string) error {
 		"local_pricelists",
 		"local_pricelist_items",
 		"local_components",
+		"local_remote_migrations_applied",
 		"local_sync_guard_state",
 		"pending_changes",
 		"app_settings",
@@ -116,23 +108,9 @@ func New(dbPath string) (*LocalDB, error) {
 		return nil, fmt.Errorf("opening sqlite database: %w", err)
 	}
 
-	// Enable WAL mode so background sync writes never block UI reads.
-	if err := db.Exec("PRAGMA journal_mode=WAL").Error; err != nil {
-		slog.Warn("failed to enable WAL mode", "error", err)
-	}
-	if err := db.Exec("PRAGMA synchronous=NORMAL").Error; err != nil {
-		slog.Warn("failed to set synchronous=NORMAL", "error", err)
-	}
-
 	if err := ensureLocalProjectsTable(db); err != nil {
 		return nil, fmt.Errorf("ensure local_projects table: %w", err)
 	}
-	if err := prepareLocalPartnumberBookCatalog(db); err != nil {
-		return nil, fmt.Errorf("prepare local partnumber book catalog: %w", err)
-	}
-	if err := cleanupStaleReadOnlyCacheTempTables(db); err != nil {
-		return nil, fmt.Errorf("cleanup stale read-only cache temp tables: %w", err)
-	}
 
 	// Preflight: ensure local_projects has non-null UUIDs before AutoMigrate rebuilds tables.
 	if db.Migrator().HasTable(&LocalProject{}) {
@@ -153,28 +131,24 @@ func New(dbPath string) (*LocalDB, error) {
 	}
 
 	// Auto-migrate all local tables
-	if err := autoMigrateLocalSchema(db); err != nil {
-		if recovered, recoveryErr := recoverFromReadOnlyCacheInitFailure(db, err); recoveryErr != nil {
-			return nil, fmt.Errorf("migrating sqlite database: %w (recovery failed: %v)", err, recoveryErr)
-		} else if !recovered {
-			return nil, fmt.Errorf("migrating sqlite database: %w", err)
-		}
-		if err := autoMigrateLocalSchema(db); err != nil {
-			return nil, fmt.Errorf("migrating sqlite database after cache recovery: %w", err)
-		}
-	}
-	if err := ensureLocalPartnumberBookItemTable(db); err != nil {
-		return nil, fmt.Errorf("ensure local partnumber book item table: %w", err)
+	if err := db.AutoMigrate(
+		&ConnectionSettings{},
+		&LocalConfiguration{},
+		&LocalConfigurationVersion{},
+		&LocalPricelist{},
+		&LocalPricelistItem{},
+		&LocalComponent{},
+		&AppSetting{},
+		&LocalRemoteMigrationApplied{},
+		&LocalSyncGuardState{},
+		&PendingChange{},
+		&LocalPartnumberBook{},
+		&LocalPartnumberBookItem{},
+	); err != nil {
+		return nil, fmt.Errorf("migrating sqlite database: %w", err)
 	}
 	if err := runLocalMigrations(db); err != nil {
-		if recovered, recoveryErr := recoverFromReadOnlyCacheInitFailure(db, err); recoveryErr != nil {
-			return nil, fmt.Errorf("running local sqlite migrations: %w (recovery failed: %v)", err, recoveryErr)
-		} else if !recovered {
-			return nil, fmt.Errorf("running local sqlite migrations: %w", err)
-		}
-		if err := runLocalMigrations(db); err != nil {
-			return nil, fmt.Errorf("running local sqlite migrations after cache recovery: %w", err)
-		}
+		return nil, fmt.Errorf("running local sqlite migrations: %w", err)
 	}
 
 	slog.Info("local SQLite database initialized", "path", dbPath)
@@ -217,291 +191,10 @@ CREATE TABLE local_projects (
 	return nil
 }
 
-func autoMigrateLocalSchema(db *gorm.DB) error {
-	return db.AutoMigrate(
-		&ConnectionSettings{},
-		&LocalConfiguration{},
-		&LocalConfigurationVersion{},
-		&LocalPricelist{},
-		&LocalPricelistItem{},
-		&LocalComponent{},
-		&AppSetting{},
-		&LocalSyncGuardState{},
-		&PendingChange{},
-		&LocalPartnumberBook{},
-		&SyncLogEntry{},
-		&LocalQtSetting{},
-	)
-}
-
-func sanitizeLocalPartnumberBookCatalog(db *gorm.DB) error {
-	if !db.Migrator().HasTable(&LocalPartnumberBookItem{}) {
-		return nil
-	}
-
-	// Old local databases may contain partially migrated catalog rows with NULL/empty
-	// partnumber values. SQLite table rebuild during AutoMigrate fails on such rows once
-	// the schema enforces NOT NULL, so remove them before AutoMigrate touches the table.
-	if err := db.Exec(`
-		DELETE FROM local_partnumber_book_items
-		WHERE partnumber IS NULL OR TRIM(partnumber) = ''
-	`).Error; err != nil {
-		return err
-	}
-	return nil
-}
-
-func prepareLocalPartnumberBookCatalog(db *gorm.DB) error {
-	if err := cleanupStaleLocalPartnumberBookCatalogTempTable(db); err != nil {
-		if recoveryErr := recoverLocalPartnumberBookCatalog(db, fmt.Errorf("cleanup stale temp table: %w", err)); recoveryErr != nil {
-			return recoveryErr
-		}
-		return nil
-	}
-	if err := sanitizeLocalPartnumberBookCatalog(db); err != nil {
-		if recoveryErr := recoverLocalPartnumberBookCatalog(db, fmt.Errorf("sanitize catalog: %w", err)); recoveryErr != nil {
-			return recoveryErr
-		}
-		return nil
-	}
-	if err := migrateLegacyPartnumberBookCatalogBeforeAutoMigrate(db); err != nil {
-		if recoveryErr := recoverLocalPartnumberBookCatalog(db, fmt.Errorf("migrate legacy catalog: %w", err)); recoveryErr != nil {
-			return recoveryErr
-		}
-		return nil
-	}
-	if err := ensureLocalPartnumberBookItemTable(db); err != nil {
-		if recoveryErr := recoverLocalPartnumberBookCatalog(db, fmt.Errorf("ensure canonical catalog table: %w", err)); recoveryErr != nil {
-			return recoveryErr
-		}
-		return nil
-	}
-	if err := validateLocalPartnumberBookCatalog(db); err != nil {
-		if recoveryErr := recoverLocalPartnumberBookCatalog(db, fmt.Errorf("validate canonical catalog: %w", err)); recoveryErr != nil {
-			return recoveryErr
-		}
-	}
-	return nil
-}
-
-func cleanupStaleReadOnlyCacheTempTables(db *gorm.DB) error {
-	for _, tableName := range localReadOnlyCacheTables {
-		tempName := tableName + "__temp"
-		if !db.Migrator().HasTable(tempName) {
-			continue
-		}
-		if db.Migrator().HasTable(tableName) {
-			if err := db.Exec(`DROP TABLE ` + tempName).Error; err != nil {
-				return err
-			}
-			continue
-		}
-		if err := quarantineSQLiteTable(db, tempName, localReadOnlyCacheQuarantineTableName(tableName, "temp")); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func cleanupStaleLocalPartnumberBookCatalogTempTable(db *gorm.DB) error {
-	if !db.Migrator().HasTable("local_partnumber_book_items__temp") {
-		return nil
-	}
-	if db.Migrator().HasTable(&LocalPartnumberBookItem{}) {
-		return db.Exec(`DROP TABLE local_partnumber_book_items__temp`).Error
-	}
-	return quarantineSQLiteTable(db, "local_partnumber_book_items__temp", localPartnumberBookCatalogQuarantineTableName("temp"))
-}
-
-func migrateLegacyPartnumberBookCatalogBeforeAutoMigrate(db *gorm.DB) error {
-	if !db.Migrator().HasTable(&LocalPartnumberBookItem{}) {
-		return nil
-	}
-
-	// Legacy databases may still have the pre-catalog shape (`book_id`/`lot_name`) or the
-	// intermediate canonical shape with obsolete columns like `is_primary_pn`. Let the
-	// explicit rebuild logic normalize this table before GORM AutoMigrate attempts a
-	// table-copy migration on its own.
-	return migrateLocalPartnumberBookCatalog(db)
-}
-
-func ensureLocalPartnumberBookItemTable(db *gorm.DB) error {
-	if db.Migrator().HasTable(&LocalPartnumberBookItem{}) {
-		return nil
-	}
-	if err := db.Exec(`
-		CREATE TABLE local_partnumber_book_items (
-			id INTEGER PRIMARY KEY AUTOINCREMENT,
-			partnumber TEXT NOT NULL UNIQUE,
-			lots_json TEXT NOT NULL,
-			description TEXT
-		)
-	`).Error; err != nil {
-		return err
-	}
-	return db.Exec(`CREATE UNIQUE INDEX IF NOT EXISTS idx_local_partnumber_book_items_partnumber ON local_partnumber_book_items(partnumber)`).Error
-}
-
-func validateLocalPartnumberBookCatalog(db *gorm.DB) error {
-	if !db.Migrator().HasTable(&LocalPartnumberBookItem{}) {
-		return nil
-	}
-
-	type rawCatalogRow struct {
-		Partnumber  string `gorm:"column:partnumber"`
-		LotsJSON    string `gorm:"column:lots_json"`
-		Description string `gorm:"column:description"`
-	}
-
-	var rows []rawCatalogRow
-	if err := db.Raw(`
-		SELECT partnumber, lots_json, COALESCE(description, '') AS description
-		FROM local_partnumber_book_items
-		ORDER BY id ASC
-	`).Scan(&rows).Error; err != nil {
-		return fmt.Errorf("load canonical catalog rows: %w", err)
-	}
-
-	seen := make(map[string]struct{}, len(rows))
-	for _, row := range rows {
-		partnumber := strings.TrimSpace(row.Partnumber)
-		if partnumber == "" {
-			return errors.New("catalog contains empty partnumber")
-		}
-		if _, exists := seen[partnumber]; exists {
-			return fmt.Errorf("catalog contains duplicate partnumber %q", partnumber)
-		}
-		seen[partnumber] = struct{}{}
-		if strings.TrimSpace(row.LotsJSON) == "" {
-			return fmt.Errorf("catalog row %q has empty lots_json", partnumber)
-		}
-		var lots LocalPartnumberBookLots
-		if err := json.Unmarshal([]byte(row.LotsJSON), &lots); err != nil {
-			return fmt.Errorf("catalog row %q has invalid lots_json: %w", partnumber, err)
-		}
-	}
-
-	return nil
-}
-
-func recoverLocalPartnumberBookCatalog(db *gorm.DB, cause error) error {
-	slog.Warn("recovering broken local partnumber book catalog", "error", cause.Error())
-
-	if err := ensureLocalPartnumberBooksCatalogColumn(db); err != nil {
-		return fmt.Errorf("ensure local_partnumber_books.partnumbers_json during recovery: %w", err)
-	}
-
-	if db.Migrator().HasTable("local_partnumber_book_items__temp") {
-		if err := quarantineSQLiteTable(db, "local_partnumber_book_items__temp", localPartnumberBookCatalogQuarantineTableName("temp")); err != nil {
-			return fmt.Errorf("quarantine local_partnumber_book_items__temp: %w", err)
-		}
-	}
-	if db.Migrator().HasTable(&LocalPartnumberBookItem{}) {
-		if err := quarantineSQLiteTable(db, "local_partnumber_book_items", localPartnumberBookCatalogQuarantineTableName("broken")); err != nil {
-			return fmt.Errorf("quarantine local_partnumber_book_items: %w", err)
-		}
-	}
-	if err := ensureLocalPartnumberBookItemTable(db); err != nil {
-		return fmt.Errorf("recreate local_partnumber_book_items after recovery: %w", err)
-	}
-
-	slog.Warn("local partnumber book catalog reset to empty cache; next sync will rebuild it")
-	return nil
-}
-
-func recoverFromReadOnlyCacheInitFailure(db *gorm.DB, cause error) (bool, error) {
-	lowerCause := strings.ToLower(cause.Error())
-	recoveredAny := false
-
-	for _, tableName := range affectedReadOnlyCacheTables(lowerCause) {
-		if err := resetReadOnlyCacheTable(db, tableName); err != nil {
-			return recoveredAny, err
-		}
-		recoveredAny = true
-	}
-
-	if strings.Contains(lowerCause, "local_partnumber_book_items") || strings.Contains(lowerCause, "local_partnumber_books") {
-		if err := recoverLocalPartnumberBookCatalog(db, cause); err != nil {
-			return recoveredAny, err
-		}
-		recoveredAny = true
-	}
-
-	if recoveredAny {
-		slog.Warn("recovered read-only local cache tables after startup failure", "error", cause.Error())
-	}
-	return recoveredAny, nil
-}
-
-func affectedReadOnlyCacheTables(lowerCause string) []string {
-	affected := make([]string, 0, len(localReadOnlyCacheTables))
-	for _, tableName := range localReadOnlyCacheTables {
-		if tableName == "local_partnumber_book_items" || tableName == "local_partnumber_books" {
-			continue
-		}
-		if strings.Contains(lowerCause, tableName) {
-			affected = append(affected, tableName)
-		}
-	}
-	return affected
-}
-
-func resetReadOnlyCacheTable(db *gorm.DB, tableName string) error {
-	slog.Warn("resetting read-only local cache table", "table", tableName)
-	tempName := tableName + "__temp"
-	if db.Migrator().HasTable(tempName) {
-		if err := quarantineSQLiteTable(db, tempName, localReadOnlyCacheQuarantineTableName(tableName, "temp")); err != nil {
-			return fmt.Errorf("quarantine temp table %s: %w", tempName, err)
-		}
-	}
-	if db.Migrator().HasTable(tableName) {
-		if err := quarantineSQLiteTable(db, tableName, localReadOnlyCacheQuarantineTableName(tableName, "broken")); err != nil {
-			return fmt.Errorf("quarantine table %s: %w", tableName, err)
-		}
-	}
-	return nil
-}
-
-func ensureLocalPartnumberBooksCatalogColumn(db *gorm.DB) error {
-	if !db.Migrator().HasTable(&LocalPartnumberBook{}) {
-		return nil
-	}
-	if db.Migrator().HasColumn(&LocalPartnumberBook{}, "partnumbers_json") {
-		return nil
-	}
-	return db.Exec(`ALTER TABLE local_partnumber_books ADD COLUMN partnumbers_json TEXT NOT NULL DEFAULT '[]'`).Error
-}
-
-func quarantineSQLiteTable(db *gorm.DB, tableName string, quarantineName string) error {
-	if !db.Migrator().HasTable(tableName) {
-		return nil
-	}
-	if tableName == quarantineName {
-		return nil
-	}
-	if db.Migrator().HasTable(quarantineName) {
-		if err := db.Exec(`DROP TABLE ` + quarantineName).Error; err != nil {
-			return err
-		}
-	}
-	return db.Exec(`ALTER TABLE ` + tableName + ` RENAME TO ` + quarantineName).Error
-}
-
-func localPartnumberBookCatalogQuarantineTableName(kind string) string {
-	return "local_partnumber_book_items_" + kind + "_" + time.Now().UTC().Format("20060102150405")
-}
-
-func localReadOnlyCacheQuarantineTableName(tableName string, kind string) string {
-	return tableName + "_" + kind + "_" + time.Now().UTC().Format("20060102150405")
-}
-
 // HasSettings returns true if connection settings exist
 func (l *LocalDB) HasSettings() bool {
 	var count int64
-	if err := l.db.Model(&ConnectionSettings{}).Count(&count).Error; err != nil {
-		slog.Error("localdb: HasSettings count failed", "err", err)
-		return false
-	}
+	l.db.Model(&ConnectionSettings{}).Count(&count)
 	return count > 0
 }
 
@@ -513,23 +206,10 @@ func (l *LocalDB) GetSettings() (*ConnectionSettings, error) {
 	}
 
 	// Decrypt password
-	password, migrated, err := DecryptWithMetadata(settings.PasswordEncrypted)
+	password, err := Decrypt(settings.PasswordEncrypted)
 	if err != nil {
 		return nil, fmt.Errorf("decrypting password: %w", err)
 	}
-
-	if migrated {
-		encrypted, encryptErr := Encrypt(password)
-		if encryptErr != nil {
-			return nil, fmt.Errorf("re-encrypting legacy password: %w", encryptErr)
-		}
-		if err := l.db.Model(&ConnectionSettings{}).
-			Where("id = ?", settings.ID).
-			Update("password_encrypted", encrypted).Error; err != nil {
-			return nil, fmt.Errorf("upgrading legacy password encryption: %w", err)
-		}
-	}
-
 	settings.PasswordEncrypted = password // Return decrypted password in this field
 
 	return &settings, nil
@@ -624,46 +304,6 @@ func (l *LocalDB) SaveProject(project *LocalProject) error {
 	return l.db.Save(project).Error
 }
 
-// SaveProjectPreservingUpdatedAt stores a project without replacing UpdatedAt
-// with the current local sync time.
-func (l *LocalDB) SaveProjectPreservingUpdatedAt(project *LocalProject) error {
-	if project == nil {
-		return fmt.Errorf("project is nil")
-	}
-
-	if project.ID == 0 && strings.TrimSpace(project.UUID) != "" {
-		var existing LocalProject
-		err := l.db.Where("uuid = ?", project.UUID).First(&existing).Error
-		if err == nil {
-			project.ID = existing.ID
-		} else if !errors.Is(err, gorm.ErrRecordNotFound) {
-			return err
-		}
-	}
-
-	if project.ID == 0 {
-		return l.db.Create(project).Error
-	}
-
-	return l.db.Model(&LocalProject{}).
-		Where("id = ?", project.ID).
-		UpdateColumns(map[string]interface{}{
-			"uuid":           project.UUID,
-			"server_id":      project.ServerID,
-			"owner_username": project.OwnerUsername,
-			"code":           project.Code,
-			"variant":        project.Variant,
-			"name":           project.Name,
-			"tracker_url":    project.TrackerURL,
-			"is_active":      project.IsActive,
-			"is_system":      project.IsSystem,
-			"created_at":     project.CreatedAt,
-			"updated_at":     project.UpdatedAt,
-			"synced_at":      project.SyncedAt,
-			"sync_status":    project.SyncStatus,
-		}).Error
-}
-
 func (l *LocalDB) GetProjects(ownerUsername string, includeArchived bool) ([]LocalProject, error) {
 	var projects []LocalProject
 	query := l.db.Model(&LocalProject{}).Where("owner_username = ?", ownerUsername)
@@ -692,22 +332,6 @@ func (l *LocalDB) GetProjectByUUID(uuid string) (*LocalProject, error) {
 	return &project, nil
 }
 
-func (l *LocalDB) GetProjectByCode(code string) (*LocalProject, error) {
-	var project LocalProject
-	if err := l.db.Where("LOWER(code) = LOWER(?) AND variant = ''", code).First(&project).Error; err != nil {
-		return nil, err
-	}
-	return &project, nil
-}
-
-func (l *LocalDB) GetProjectByCodeAndVariant(code, variant string) (*LocalProject, error) {
-	var project LocalProject
-	if err := l.db.Where("LOWER(code) = LOWER(?) AND LOWER(variant) = LOWER(?)", code, variant).First(&project).Error; err != nil {
-		return nil, err
-	}
-	return &project, nil
-}
-
 func (l *LocalDB) GetProjectByName(ownerUsername, name string) (*LocalProject, error) {
 	var project LocalProject
 	if err := l.db.Where("owner_username = ? AND name = ?", ownerUsername, name).First(&project).Error; err != nil {
@@ -1064,18 +688,14 @@ func (l *LocalDB) DeactivateConfiguration(uuid string) error {
 // CountConfigurations returns the number of local configurations
 func (l *LocalDB) CountConfigurations() int64 {
 	var count int64
-	if err := l.db.Model(&LocalConfiguration{}).Count(&count).Error; err != nil {
-		slog.Error("localdb: CountConfigurations failed", "err", err)
-	}
+	l.db.Model(&LocalConfiguration{}).Count(&count)
 	return count
 }
 
 // CountProjects returns the number of local projects
 func (l *LocalDB) CountProjects() int64 {
 	var count int64
-	if err := l.db.Model(&LocalProject{}).Count(&count).Error; err != nil {
-		slog.Error("localdb: CountProjects failed", "err", err)
-	}
+	l.db.Model(&LocalProject{}).Count(&count)
 	return count
 }
 
@@ -1099,26 +719,6 @@ func (l *LocalDB) GetLastSyncTime() *time.Time {
 	return &t
 }
 
-func (l *LocalDB) getAppSettingValue(key string) (string, bool) {
-	var setting struct {
-		Value string
-	}
-	if err := l.db.Table("app_settings").
-		Where("key = ?", key).
-		First(&setting).Error; err != nil {
-		return "", false
-	}
-	return setting.Value, true
-}
-
-func (l *LocalDB) upsertAppSetting(tx *gorm.DB, key, value string, updatedAt time.Time) error {
-	return tx.Exec(`
-		INSERT INTO app_settings (key, value, updated_at)
-		VALUES (?, ?, ?)
-		ON CONFLICT(key) DO UPDATE SET value = excluded.value, updated_at = excluded.updated_at
-	`, key, value, updatedAt.Format(time.RFC3339)).Error
-}
-
 // SetLastSyncTime sets the last sync timestamp
 func (l *LocalDB) SetLastSyncTime(t time.Time) error {
 	// Using raw SQL for upsert since SQLite doesn't have native UPSERT in all versions
@@ -1129,134 +729,6 @@ func (l *LocalDB) SetLastSyncTime(t time.Time) error {
 	`, "last_pricelist_sync", t.Format(time.RFC3339), time.Now().Format(time.RFC3339)).Error
 }
 
-func (l *LocalDB) GetLastPricelistSyncAttemptAt() *time.Time {
-	value, ok := l.getAppSettingValue("last_pricelist_sync_attempt_at")
-	if !ok {
-		return nil
-	}
-	t, err := time.Parse(time.RFC3339, value)
-	if err != nil {
-		return nil
-	}
-	return &t
-}
-
-func (l *LocalDB) GetLastPricelistSyncStatus() string {
-	value, ok := l.getAppSettingValue("last_pricelist_sync_status")
-	if !ok {
-		return ""
-	}
-	return strings.TrimSpace(value)
-}
-
-func (l *LocalDB) GetLastPricelistSyncError() string {
-	value, ok := l.getAppSettingValue("last_pricelist_sync_error")
-	if !ok {
-		return ""
-	}
-	return strings.TrimSpace(value)
-}
-
-func (l *LocalDB) SetPricelistSyncResult(status, errorText string, attemptedAt time.Time) error {
-	status = strings.TrimSpace(status)
-	errorText = strings.TrimSpace(errorText)
-	if status == "" {
-		status = "unknown"
-	}
-
-	return l.db.Transaction(func(tx *gorm.DB) error {
-		if err := l.upsertAppSetting(tx, "last_pricelist_sync_status", status, attemptedAt); err != nil {
-			return err
-		}
-		if err := l.upsertAppSetting(tx, "last_pricelist_sync_error", errorText, attemptedAt); err != nil {
-			return err
-		}
-		if err := l.upsertAppSetting(tx, "last_pricelist_sync_attempt_at", attemptedAt.Format(time.RFC3339), attemptedAt); err != nil {
-			return err
-		}
-		return nil
-	})
-}
-
-const syncLogMaxPerType = 100
-
-// AppendSyncLog writes a sync result and prunes old entries beyond the per-type cap.
-func (l *LocalDB) AppendSyncLog(syncType, status, errorText string, syncedCount int, startedAt time.Time, durationMs int64) {
-	entry := SyncLogEntry{
-		SyncType:    syncType,
-		Status:      status,
-		ErrorText:   errorText,
-		SyncedCount: syncedCount,
-		StartedAt:   startedAt,
-		DurationMs:  durationMs,
-	}
-	if err := l.db.Create(&entry).Error; err != nil {
-		return
-	}
-	// Prune: keep only the most recent N entries for this sync_type
-	l.db.Exec(`
-		DELETE FROM sync_log
-		WHERE sync_type = ? AND id NOT IN (
-			SELECT id FROM sync_log WHERE sync_type = ? ORDER BY started_at DESC LIMIT ?
-		)
-	`, syncType, syncType, syncLogMaxPerType)
-}
-
-// GetSyncLog returns the most recent sync log entries, newest first.
-func (l *LocalDB) GetSyncLog(limit int) ([]SyncLogEntry, error) {
-	var entries []SyncLogEntry
-	err := l.db.Order("started_at DESC").Limit(limit).Find(&entries).Error
-	return entries, err
-}
-
-func (l *LocalDB) GetLastComponentSyncAttemptAt() *time.Time {
-	value, ok := l.getAppSettingValue("last_component_sync_attempt_at")
-	if !ok {
-		return nil
-	}
-	t, err := time.Parse(time.RFC3339, value)
-	if err != nil {
-		return nil
-	}
-	return &t
-}
-
-func (l *LocalDB) GetLastComponentSyncStatus() string {
-	value, ok := l.getAppSettingValue("last_component_sync_status")
-	if !ok {
-		return ""
-	}
-	return strings.TrimSpace(value)
-}
-
-func (l *LocalDB) GetLastComponentSyncError() string {
-	value, ok := l.getAppSettingValue("last_component_sync_error")
-	if !ok {
-		return ""
-	}
-	return strings.TrimSpace(value)
-}
-
-func (l *LocalDB) SetComponentSyncResult(status, errorText string, attemptedAt time.Time) error {
-	status = strings.TrimSpace(status)
-	errorText = strings.TrimSpace(errorText)
-	if status == "" {
-		status = "unknown"
-	}
-	return l.db.Transaction(func(tx *gorm.DB) error {
-		if err := l.upsertAppSetting(tx, "last_component_sync_status", status, attemptedAt); err != nil {
-			return err
-		}
-		if err := l.upsertAppSetting(tx, "last_component_sync_error", errorText, attemptedAt); err != nil {
-			return err
-		}
-		if err := l.upsertAppSetting(tx, "last_component_sync_attempt_at", attemptedAt.Format(time.RFC3339), attemptedAt); err != nil {
-			return err
-		}
-		return nil
-	})
-}
-
 // CountLocalPricelists returns the number of local pricelists
 func (l *LocalDB) CountLocalPricelists() int64 {
 	var count int64
@@ -1264,29 +736,6 @@ func (l *LocalDB) CountLocalPricelists() int64 {
 	return count
 }
 
-// CountAllPricelistItems returns total rows across all local_pricelist_items.
-func (l *LocalDB) CountAllPricelistItems() int64 {
-	var count int64
-	l.db.Model(&LocalPricelistItem{}).Count(&count)
-	return count
-}
-
-// CountComponents returns the number of rows in local_components.
-func (l *LocalDB) CountComponents() int64 {
-	var count int64
-	l.db.Model(&LocalComponent{}).Count(&count)
-	return count
-}
-
-// DBFileSizeBytes returns the size of the SQLite database file in bytes.
-func (l *LocalDB) DBFileSizeBytes() int64 {
-	info, err := os.Stat(l.path)
-	if err != nil {
-		return 0
-	}
-	return info.Size()
-}
-
 // GetLatestLocalPricelist returns the most recently synced pricelist
 func (l *LocalDB) GetLatestLocalPricelist() (*LocalPricelist, error) {
 	var pricelist LocalPricelist
@@ -1391,20 +840,20 @@ func (l *LocalDB) CountLocalPricelistItemsWithEmptyCategory(pricelistID uint) (i
 	return count, nil
 }
 
-// SaveLocalPricelistItems saves pricelist items to local SQLite.
-// Duplicate (pricelist_id, lot_name) rows are silently ignored.
+// SaveLocalPricelistItems saves pricelist items to local SQLite
 func (l *LocalDB) SaveLocalPricelistItems(items []LocalPricelistItem) error {
 	if len(items) == 0 {
 		return nil
 	}
 
+	// Batch insert
 	batchSize := 500
 	for i := 0; i < len(items); i += batchSize {
 		end := i + batchSize
 		if end > len(items) {
 			end = len(items)
 		}
-		if err := l.db.Clauses(clause.OnConflict{DoNothing: true}).CreateInBatches(items[i:end], batchSize).Error; err != nil {
+		if err := l.db.CreateInBatches(items[i:end], batchSize).Error; err != nil {
 			return err
 		}
 	}
@@ -1454,32 +903,6 @@ func (l *LocalDB) GetLocalPriceForLot(pricelistID uint, lotName string) (float64
 	return item.Price, nil
 }
 
-// GetLocalPricesForLots returns prices for multiple lots from a local pricelist in a single query.
-// Uses the composite index (pricelist_id, lot_name). Missing lots are omitted from the result.
-func (l *LocalDB) GetLocalPricesForLots(pricelistID uint, lotNames []string) (map[string]float64, error) {
-	result := make(map[string]float64, len(lotNames))
-	if len(lotNames) == 0 {
-		return result, nil
-	}
-	type row struct {
-		LotName string  `gorm:"column:lot_name"`
-		Price   float64 `gorm:"column:price"`
-	}
-	var rows []row
-	if err := l.db.Model(&LocalPricelistItem{}).
-		Select("lot_name, price").
-		Where("pricelist_id = ? AND lot_name IN ?", pricelistID, lotNames).
-		Find(&rows).Error; err != nil {
-		return nil, err
-	}
-	for _, r := range rows {
-		if r.Price > 0 {
-			result[r.LotName] = r.Price
-		}
-	}
-	return result, nil
-}
-
 // GetLocalLotCategoriesByServerPricelistID returns lot_category for each lot_name from a local pricelist resolved by server ID.
 // Missing lots are not included in the map; caller is responsible for strict validation.
 func (l *LocalDB) GetLocalLotCategoriesByServerPricelistID(serverPricelistID uint, lotNames []string) (map[string]string, error) {
@@ -1812,6 +1235,42 @@ func (l *LocalDB) repairConfigurationChange(change *PendingChange) error {
 	return nil
 }
 
+// GetRemoteMigrationApplied returns a locally applied remote migration by ID.
+func (l *LocalDB) GetRemoteMigrationApplied(id string) (*LocalRemoteMigrationApplied, error) {
+	var migration LocalRemoteMigrationApplied
+	if err := l.db.Where("id = ?", id).First(&migration).Error; err != nil {
+		return nil, err
+	}
+	return &migration, nil
+}
+
+// UpsertRemoteMigrationApplied writes applied migration metadata.
+func (l *LocalDB) UpsertRemoteMigrationApplied(id, checksum, appVersion string, appliedAt time.Time) error {
+	record := &LocalRemoteMigrationApplied{
+		ID:         id,
+		Checksum:   checksum,
+		AppVersion: appVersion,
+		AppliedAt:  appliedAt,
+	}
+	return l.db.Clauses(clause.OnConflict{
+		Columns: []clause.Column{{Name: "id"}},
+		DoUpdates: clause.Assignments(map[string]interface{}{
+			"checksum":    checksum,
+			"app_version": appVersion,
+			"applied_at":  appliedAt,
+		}),
+	}).Create(record).Error
+}
+
+// GetLatestAppliedRemoteMigrationID returns last applied remote migration id.
+func (l *LocalDB) GetLatestAppliedRemoteMigrationID() (string, error) {
+	var record LocalRemoteMigrationApplied
+	if err := l.db.Order("applied_at DESC").First(&record).Error; err != nil {
+		return "", err
+	}
+	return record.ID, nil
+}
+
 // GetSyncGuardState returns the latest readiness guard state.
 func (l *LocalDB) GetSyncGuardState() (*LocalSyncGuardState, error) {
 	var state LocalSyncGuardState
@@ -1843,62 +1302,3 @@ func (l *LocalDB) SetSyncGuardState(status, reasonCode, reasonText string, requi
 		}),
 	}).Create(state).Error
 }
-
-// GetLocalPartnumberBookByServerID returns a local partnumber book by its server-side ID.
-func (l *LocalDB) GetLocalPartnumberBookByServerID(serverID uint) (*LocalPartnumberBook, error) {
-	var book LocalPartnumberBook
-	if err := l.db.Where("server_id = ?", serverID).First(&book).Error; err != nil {
-		return nil, err
-	}
-	return &book, nil
-}
-
-// GetLocalPricelistItemsPage returns a paginated, searchable list of items for a pricelist.
-func (l *LocalDB) GetLocalPricelistItemsPage(pricelistID uint, search string, page, perPage int) ([]LocalPricelistItem, int64, error) {
-	dbq := l.db.Model(&LocalPricelistItem{}).Where("pricelist_id = ?", pricelistID)
-	if search != "" {
-		dbq = dbq.Where("lot_name LIKE ?", "%"+search+"%")
-	}
-	var total int64
-	if err := dbq.Count(&total).Error; err != nil {
-		return nil, 0, fmt.Errorf("count pricelist items: %w", err)
-	}
-	offset := (page - 1) * perPage
-	var items []LocalPricelistItem
-	if err := dbq.Order("lot_name").Offset(offset).Limit(perPage).Find(&items).Error; err != nil {
-		return nil, 0, fmt.Errorf("fetch pricelist items: %w", err)
-	}
-	return items, total, nil
-}
-
-// GetLocalComponentDescriptionsByLotNames returns a map of lot_name → lot_description for the given lots.
-func (l *LocalDB) GetLocalComponentDescriptionsByLotNames(lotNames []string) (map[string]string, error) {
-	if len(lotNames) == 0 {
-		return map[string]string{}, nil
-	}
-	type row struct {
-		LotName        string
-		LotDescription string
-	}
-	var rows []row
-	if err := l.db.Table("local_components").
-		Select("lot_name, lot_description").
-		Where("lot_name IN ?", lotNames).
-		Scan(&rows).Error; err != nil {
-		return nil, fmt.Errorf("fetch component descriptions: %w", err)
-	}
-	m := make(map[string]string, len(rows))
-	for _, r := range rows {
-		m[r.LotName] = r.LotDescription
-	}
-	return m, nil
-}
-
-// GetSchemaMigrations returns all applied local schema migrations ordered by applied_at.
-func (l *LocalDB) GetSchemaMigrations() ([]LocalSchemaMigration, error) {
-	var migrations []LocalSchemaMigration
-	if err := l.db.Order("applied_at ASC").Find(&migrations).Error; err != nil {
-		return nil, fmt.Errorf("fetch schema migrations: %w", err)
-	}
-	return migrations, nil
-}

internal/localdb/migrations.go

@@ -4,7 +4,6 @@ import (
 	"errors"
 	"fmt"
 	"log/slog"
-	"sort"
 	"strings"
 	"time"
 
@@ -114,24 +113,6 @@ var localMigrations = []localMigration{
 		name: "Add line_no to local_configurations and backfill ordering",
 		run:  addLocalConfigurationLineNo,
 	},
-	{
-		id:   "2026_03_07_local_partnumber_book_catalog",
-		name: "Convert local partnumber book cache to book membership + deduplicated PN catalog",
-		run:  migrateLocalPartnumberBookCatalog,
-	},
-	{
-		id:   "2026_03_13_pricelist_items_dedup_unique",
-		name: "Deduplicate local_pricelist_items and add unique index on (pricelist_id, lot_name)",
-		run:  deduplicatePricelistItemsAndAddUniqueIndex,
-	},
-}
-
-type localPartnumberCatalogRow struct {
-	Partnumber  string
-	LotsJSON    LocalPartnumberBookLots
-	Description string
-	CreatedAt   time.Time
-	ServerID    int
 }
 
 func runLocalMigrations(db *gorm.DB) error {
@@ -884,239 +865,3 @@ WHERE id IN (SELECT id FROM ranked)
 	return nil
 }
 
-func migrateLocalPartnumberBookCatalog(tx *gorm.DB) error {
-	type columnInfo struct {
-		Name string `gorm:"column:name"`
-	}
-
-	hasBooksTable := tx.Migrator().HasTable(&LocalPartnumberBook{})
-	hasItemsTable := tx.Migrator().HasTable(&LocalPartnumberBookItem{})
-	if !hasItemsTable {
-		return nil
-	}
-
-	if hasBooksTable {
-		var bookCols []columnInfo
-		if err := tx.Raw(`SELECT name FROM pragma_table_info('local_partnumber_books')`).Scan(&bookCols).Error; err != nil {
-			return fmt.Errorf("load local_partnumber_books columns: %w", err)
-		}
-		hasPartnumbersJSON := false
-		for _, c := range bookCols {
-			if c.Name == "partnumbers_json" {
-				hasPartnumbersJSON = true
-				break
-			}
-		}
-		if !hasPartnumbersJSON {
-			if err := tx.Exec(`ALTER TABLE local_partnumber_books ADD COLUMN partnumbers_json TEXT NOT NULL DEFAULT '[]'`).Error; err != nil {
-				return fmt.Errorf("add local_partnumber_books.partnumbers_json: %w", err)
-			}
-		}
-	}
-
-	var itemCols []columnInfo
-	if err := tx.Raw(`SELECT name FROM pragma_table_info('local_partnumber_book_items')`).Scan(&itemCols).Error; err != nil {
-		return fmt.Errorf("load local_partnumber_book_items columns: %w", err)
-	}
-	hasBookID := false
-	hasLotName := false
-	hasLotsJSON := false
-	for _, c := range itemCols {
-		if c.Name == "book_id" {
-			hasBookID = true
-		}
-		if c.Name == "lot_name" {
-			hasLotName = true
-		}
-		if c.Name == "lots_json" {
-			hasLotsJSON = true
-		}
-	}
-	if !hasBookID && !hasLotName && !hasLotsJSON {
-		return nil
-	}
-
-	type legacyRow struct {
-		BookID      uint
-		Partnumber  string
-		LotName     string
-		Description string
-		CreatedAt   time.Time
-		ServerID    int
-	}
-	bookPNs := make(map[uint]map[string]struct{})
-	catalog := make(map[string]*localPartnumberCatalogRow)
-
-	if hasBookID || hasLotName {
-		var rows []legacyRow
-		if err := tx.Raw(`
-			SELECT
-				i.book_id,
-				i.partnumber,
-				i.lot_name,
-				COALESCE(i.description, '') AS description,
-				b.created_at,
-				b.server_id
-			FROM local_partnumber_book_items i
-			INNER JOIN local_partnumber_books b ON b.id = i.book_id
-			ORDER BY b.created_at DESC, b.id DESC, i.partnumber ASC, i.id ASC
-		`).Scan(&rows).Error; err != nil {
-			return fmt.Errorf("load legacy local partnumber book items: %w", err)
-		}
-
-		for _, row := range rows {
-			if _, ok := bookPNs[row.BookID]; !ok {
-				bookPNs[row.BookID] = make(map[string]struct{})
-			}
-			bookPNs[row.BookID][row.Partnumber] = struct{}{}
-
-			entry, ok := catalog[row.Partnumber]
-			if !ok {
-				entry = &localPartnumberCatalogRow{
-					Partnumber:  row.Partnumber,
-					Description: row.Description,
-					CreatedAt:   row.CreatedAt,
-					ServerID:    row.ServerID,
-				}
-				catalog[row.Partnumber] = entry
-			}
-			if row.CreatedAt.After(entry.CreatedAt) || (row.CreatedAt.Equal(entry.CreatedAt) && row.ServerID >= entry.ServerID) {
-				entry.Description = row.Description
-				entry.CreatedAt = row.CreatedAt
-				entry.ServerID = row.ServerID
-			}
-			found := false
-			for i := range entry.LotsJSON {
-				if entry.LotsJSON[i].LotName == row.LotName {
-					entry.LotsJSON[i].Qty += 1
-					found = true
-					break
-				}
-			}
-			if !found && row.LotName != "" {
-				entry.LotsJSON = append(entry.LotsJSON, LocalPartnumberBookLot{LotName: row.LotName, Qty: 1})
-			}
-		}
-
-		var books []LocalPartnumberBook
-		if err := tx.Find(&books).Error; err != nil {
-			return fmt.Errorf("load local partnumber books: %w", err)
-		}
-		for _, book := range books {
-			pnSet := bookPNs[book.ID]
-			partnumbers := make([]string, 0, len(pnSet))
-			for pn := range pnSet {
-				partnumbers = append(partnumbers, pn)
-			}
-			sort.Strings(partnumbers)
-			if err := tx.Model(&LocalPartnumberBook{}).
-				Where("id = ?", book.ID).
-				Update("partnumbers_json", LocalStringList(partnumbers)).Error; err != nil {
-				return fmt.Errorf("update partnumbers_json for local book %d: %w", book.ID, err)
-			}
-		}
-	} else {
-		var items []LocalPartnumberBookItem
-		if err := tx.Order("id DESC").Find(&items).Error; err != nil {
-			return fmt.Errorf("load canonical local partnumber book items: %w", err)
-		}
-		for _, item := range items {
-			entry, ok := catalog[item.Partnumber]
-			if !ok {
-				copiedLots := append(LocalPartnumberBookLots(nil), item.LotsJSON...)
-				catalog[item.Partnumber] = &localPartnumberCatalogRow{
-					Partnumber:  item.Partnumber,
-					LotsJSON:    copiedLots,
-					Description: item.Description,
-				}
-				continue
-			}
-			if entry.Description == "" && item.Description != "" {
-				entry.Description = item.Description
-			}
-			for _, lot := range item.LotsJSON {
-				merged := false
-				for i := range entry.LotsJSON {
-					if entry.LotsJSON[i].LotName == lot.LotName {
-						if lot.Qty > entry.LotsJSON[i].Qty {
-							entry.LotsJSON[i].Qty = lot.Qty
-						}
-						merged = true
-						break
-					}
-				}
-				if !merged {
-					entry.LotsJSON = append(entry.LotsJSON, lot)
-				}
-			}
-		}
-	}
-
-	return rebuildLocalPartnumberBookCatalog(tx, catalog)
-}
-
-func rebuildLocalPartnumberBookCatalog(tx *gorm.DB, catalog map[string]*localPartnumberCatalogRow) error {
-	if err := tx.Exec(`
-		CREATE TABLE local_partnumber_book_items_new (
-			id INTEGER PRIMARY KEY AUTOINCREMENT,
-			partnumber TEXT NOT NULL UNIQUE,
-			lots_json TEXT NOT NULL,
-			description TEXT
-		)
-	`).Error; err != nil {
-		return fmt.Errorf("create new local_partnumber_book_items table: %w", err)
-	}
-
-	orderedPartnumbers := make([]string, 0, len(catalog))
-	for pn := range catalog {
-		orderedPartnumbers = append(orderedPartnumbers, pn)
-	}
-	sort.Strings(orderedPartnumbers)
-	for _, pn := range orderedPartnumbers {
-		row := catalog[pn]
-		sort.Slice(row.LotsJSON, func(i, j int) bool {
-			return row.LotsJSON[i].LotName < row.LotsJSON[j].LotName
-		})
-		if err := tx.Table("local_partnumber_book_items_new").Create(&LocalPartnumberBookItem{
-			Partnumber:  row.Partnumber,
-			LotsJSON:    row.LotsJSON,
-			Description: row.Description,
-		}).Error; err != nil {
-			return fmt.Errorf("insert new local_partnumber_book_items row for %s: %w", pn, err)
-		}
-	}
-
-	if err := tx.Exec(`DROP TABLE local_partnumber_book_items`).Error; err != nil {
-		return fmt.Errorf("drop legacy local_partnumber_book_items: %w", err)
-	}
-	if err := tx.Exec(`ALTER TABLE local_partnumber_book_items_new RENAME TO local_partnumber_book_items`).Error; err != nil {
-		return fmt.Errorf("rename new local_partnumber_book_items table: %w", err)
-	}
-	if err := tx.Exec(`CREATE UNIQUE INDEX IF NOT EXISTS idx_local_partnumber_book_items_partnumber ON local_partnumber_book_items(partnumber)`).Error; err != nil {
-		return fmt.Errorf("create local_partnumber_book_items partnumber index: %w", err)
-	}
-	return nil
-}
-
-func deduplicatePricelistItemsAndAddUniqueIndex(tx *gorm.DB) error {
-	// Remove duplicate (pricelist_id, lot_name) rows keeping only the row with the lowest id.
-	if err := tx.Exec(`
-		DELETE FROM local_pricelist_items
-		WHERE id NOT IN (
-			SELECT MIN(id) FROM local_pricelist_items
-			GROUP BY pricelist_id, lot_name
-		)
-	`).Error; err != nil {
-		return fmt.Errorf("deduplicate local_pricelist_items: %w", err)
-	}
-
-	// Add unique index to prevent future duplicates.
-	if err := tx.Exec(`
-		CREATE UNIQUE INDEX IF NOT EXISTS idx_local_pricelist_items_pricelist_lot_unique
-		ON local_pricelist_items(pricelist_id, lot_name)
-	`).Error; err != nil {
-		return fmt.Errorf("create unique index on local_pricelist_items: %w", err)
-	}
-	slog.Info("deduplicated local_pricelist_items and added unique index")
-	return nil
-}

internal/localdb/models.go

@@ -102,15 +102,13 @@ type LocalConfiguration struct {
 	PricelistID           *uint                       `gorm:"index" json:"pricelist_id,omitempty"`
 	WarehousePricelistID  *uint                       `gorm:"index" json:"warehouse_pricelist_id,omitempty"`
 	CompetitorPricelistID *uint                       `gorm:"index" json:"competitor_pricelist_id,omitempty"`
-	DisablePriceRefresh   bool                        `gorm:"default:false" json:"disable_price_refresh"`
 	OnlyInStock           bool                        `gorm:"default:false" json:"only_in_stock"`
-	VendorSpec            VendorSpec                  `gorm:"type:text" json:"vendor_spec,omitempty"`
+	VendorSpec             VendorSpec                  `gorm:"type:text" json:"vendor_spec,omitempty"`
 	Line                  int                         `gorm:"column:line_no;index" json:"line"`
 	PriceUpdatedAt        *time.Time                  `gorm:"type:timestamp" json:"price_updated_at,omitempty"`
 	CreatedAt             time.Time                   `json:"created_at"`
 	UpdatedAt             time.Time                   `json:"updated_at"`
 	SyncedAt              *time.Time                  `json:"synced_at"`
-	ConfigType            string                      `gorm:"default:server" json:"config_type"` // "server" | "storage"
 	SyncStatus            string                      `gorm:"default:'local'" json:"sync_status"` // 'local', 'synced', 'modified'
 	OriginalUserID        uint                        `json:"original_user_id"`                   // UserID from MariaDB for reference
 	OriginalUsername      string                      `gorm:"not null;default:'';index" json:"original_username"`
@@ -204,6 +202,18 @@ func (LocalComponent) TableName() string {
 	return "local_components"
 }
 
+// LocalRemoteMigrationApplied tracks remote SQLite migrations received from server and applied locally.
+type LocalRemoteMigrationApplied struct {
+	ID         string    `gorm:"primaryKey;size:128" json:"id"`
+	Checksum   string    `gorm:"size:128;not null" json:"checksum"`
+	AppVersion string    `gorm:"size:64" json:"app_version,omitempty"`
+	AppliedAt  time.Time `gorm:"not null" json:"applied_at"`
+}
+
+func (LocalRemoteMigrationApplied) TableName() string {
+	return "local_remote_migrations_applied"
+}
+
 // LocalSyncGuardState stores latest sync readiness decision for UI and preflight checks.
 type LocalSyncGuardState struct {
 	ID                    uint       `gorm:"primaryKey;autoIncrement" json:"id"`
@@ -237,52 +247,25 @@ func (PendingChange) TableName() string {
 
 // LocalPartnumberBook stores a version snapshot of the PN→LOT mapping book (pull-only from PriceForge)
 type LocalPartnumberBook struct {
-	ID              uint            `gorm:"primaryKey;autoIncrement" json:"id"`
-	ServerID        int             `gorm:"uniqueIndex;not null" json:"server_id"`
-	Version         string          `gorm:"not null" json:"version"`
-	CreatedAt       time.Time       `gorm:"not null" json:"created_at"`
-	IsActive        bool            `gorm:"not null;default:true" json:"is_active"`
-	PartnumbersJSON LocalStringList `gorm:"column:partnumbers_json;type:text" json:"partnumbers_json"`
+	ID        uint      `gorm:"primaryKey;autoIncrement" json:"id"`
+	ServerID  int       `gorm:"uniqueIndex;not null" json:"server_id"`
+	Version   string    `gorm:"not null" json:"version"`
+	CreatedAt time.Time `gorm:"not null" json:"created_at"`
+	IsActive  bool      `gorm:"not null;default:true" json:"is_active"`
 }
 
 func (LocalPartnumberBook) TableName() string {
 	return "local_partnumber_books"
 }
 
-type LocalPartnumberBookLot struct {
-	LotName string  `json:"lot_name"`
-	Qty     float64 `json:"qty"`
-}
-
-type LocalPartnumberBookLots []LocalPartnumberBookLot
-
-func (l LocalPartnumberBookLots) Value() (driver.Value, error) {
-	return json.Marshal(l)
-}
-
-func (l *LocalPartnumberBookLots) Scan(value interface{}) error {
-	if value == nil {
-		*l = make(LocalPartnumberBookLots, 0)
-		return nil
-	}
-	var bytes []byte
-	switch v := value.(type) {
-	case []byte:
-		bytes = v
-	case string:
-		bytes = []byte(v)
-	default:
-		return errors.New("type assertion failed for LocalPartnumberBookLots")
-	}
-	return json.Unmarshal(bytes, l)
-}
-
-// LocalPartnumberBookItem stores the canonical PN composition pulled from PriceForge.
+// LocalPartnumberBookItem stores a single PN→LOT mapping within a book snapshot
 type LocalPartnumberBookItem struct {
-	ID          uint                    `gorm:"primaryKey;autoIncrement" json:"id"`
-	Partnumber  string                  `gorm:"not null" json:"partnumber"`
-	LotsJSON    LocalPartnumberBookLots `gorm:"column:lots_json;type:text" json:"lots_json"`
-	Description string                  `json:"description,omitempty"`
+	ID          uint   `gorm:"primaryKey;autoIncrement" json:"id"`
+	BookID      uint   `gorm:"not null;index:idx_local_book_pn,priority:1" json:"book_id"`
+	Partnumber  string `gorm:"not null;index:idx_local_book_pn,priority:2" json:"partnumber"`
+	LotName     string `gorm:"not null" json:"lot_name"`
+	IsPrimaryPN bool   `gorm:"not null;default:false" json:"is_primary_pn"`
+	Description string `json:"description,omitempty"`
 }
 
 func (LocalPartnumberBookItem) TableName() string {
@@ -291,18 +274,18 @@ func (LocalPartnumberBookItem) TableName() string {
 
 // VendorSpecItem represents a single row in a vendor BOM specification
 type VendorSpecItem struct {
-	SortOrder           int                       `json:"sort_order"`
-	VendorPartnumber    string                    `json:"vendor_partnumber"`
-	Quantity            int                       `json:"quantity"`
-	Description         string                    `json:"description,omitempty"`
-	UnitPrice           *float64                  `json:"unit_price,omitempty"`
-	TotalPrice          *float64                  `json:"total_price,omitempty"`
-	ResolvedLotName     string                    `json:"resolved_lot_name,omitempty"`
-	ResolutionSource    string                    `json:"resolution_source,omitempty"` // "book", "manual", "unresolved"
-	ManualLotSuggestion string                    `json:"manual_lot_suggestion,omitempty"`
-	LotQtyPerPN         int                       `json:"lot_qty_per_pn,omitempty"`
+	SortOrder           int      `json:"sort_order"`
+	VendorPartnumber    string   `json:"vendor_partnumber"`
+	Quantity            int      `json:"quantity"`
+	Description         string   `json:"description,omitempty"`
+	UnitPrice           *float64 `json:"unit_price,omitempty"`
+	TotalPrice          *float64 `json:"total_price,omitempty"`
+	ResolvedLotName     string   `json:"resolved_lot_name,omitempty"`
+	ResolutionSource    string   `json:"resolution_source,omitempty"` // "book", "manual", "unresolved"
+	ManualLotSuggestion string   `json:"manual_lot_suggestion,omitempty"`
+	LotQtyPerPN         int      `json:"lot_qty_per_pn,omitempty"`
 	LotAllocations      []VendorSpecLotAllocation `json:"lot_allocations,omitempty"`
-	LotMappings         []VendorSpecLotMapping    `json:"lot_mappings,omitempty"`
+	LotMappings         []VendorSpecLotMapping `json:"lot_mappings,omitempty"`
 }
 
 type VendorSpecLotAllocation struct {
@@ -317,19 +300,6 @@ type VendorSpecLotMapping struct {
 	QuantityPerPN int    `json:"quantity_per_pn"`
 }
 
-// SyncLogEntry records the outcome of a single sync operation for diagnostics.
-type SyncLogEntry struct {
-	ID          uint      `gorm:"primaryKey;autoIncrement" json:"id"`
-	SyncType    string    `gorm:"not null;index;size:32" json:"sync_type"`   // components | pricelists | push | full
-	Status      string    `gorm:"not null;size:16" json:"status"`            // ok | error | skipped
-	ErrorText   string    `gorm:"size:1000" json:"error_text,omitempty"`
-	SyncedCount int       `gorm:"default:0" json:"synced_count"`
-	StartedAt   time.Time `gorm:"not null;index" json:"started_at"`
-	DurationMs  int64     `gorm:"default:0" json:"duration_ms"`
-}
-
-func (SyncLogEntry) TableName() string { return "sync_log" }
-
 // VendorSpec is a JSON-encodable slice of VendorSpecItem
 type VendorSpec []VendorSpecItem
 
@@ -356,12 +326,3 @@ func (v *VendorSpec) Scan(value interface{}) error {
 	}
 	return json.Unmarshal(bytes, v)
 }
-
-// LocalQtSetting caches server-pushed settings from qt_settings (MariaDB) into local SQLite.
-// Synced during component sync. Each row is a JSON-valued setting identified by name.
-type LocalQtSetting struct {
-	Name  string `gorm:"primaryKey;size:100"`
-	Value string `gorm:"type:text"`
-}
-
-func (LocalQtSetting) TableName() string { return "local_qt_settings" }

internal/localdb/project_sync_timestamp_test.go

@@ -1,53 +0,0 @@
-package localdb
-
-import (
-	"path/filepath"
-	"testing"
-	"time"
-)
-
-func TestSaveProjectPreservingUpdatedAtKeepsProvidedTimestamp(t *testing.T) {
-	dbPath := filepath.Join(t.TempDir(), "project_sync_timestamp.db")
-
-	local, err := New(dbPath)
-	if err != nil {
-		t.Fatalf("open localdb: %v", err)
-	}
-	t.Cleanup(func() { _ = local.Close() })
-
-	createdAt := time.Date(2026, 2, 1, 10, 0, 0, 0, time.UTC)
-	updatedAt := time.Date(2026, 2, 3, 12, 30, 0, 0, time.UTC)
-	project := &LocalProject{
-		UUID:          "project-1",
-		OwnerUsername: "tester",
-		Code:          "OPS-1",
-		Variant:       "Lenovo",
-		IsActive:      true,
-		CreatedAt:     createdAt,
-		UpdatedAt:     updatedAt,
-		SyncStatus:    "synced",
-	}
-
-	if err := local.SaveProjectPreservingUpdatedAt(project); err != nil {
-		t.Fatalf("save project: %v", err)
-	}
-
-	syncedAt := time.Date(2026, 3, 16, 8, 45, 0, 0, time.UTC)
-	project.SyncedAt = &syncedAt
-	project.SyncStatus = "synced"
-
-	if err := local.SaveProjectPreservingUpdatedAt(project); err != nil {
-		t.Fatalf("save project second time: %v", err)
-	}
-
-	stored, err := local.GetProjectByUUID(project.UUID)
-	if err != nil {
-		t.Fatalf("get project: %v", err)
-	}
-	if !stored.UpdatedAt.Equal(updatedAt) {
-		t.Fatalf("updated_at changed during sync save: got %s want %s", stored.UpdatedAt, updatedAt)
-	}
-	if stored.SyncedAt == nil || !stored.SyncedAt.Equal(syncedAt) {
-		t.Fatalf("synced_at not updated correctly: got %+v want %s", stored.SyncedAt, syncedAt)
-	}
-}

internal/localdb/qt_settings.go

@@ -1,122 +0,0 @@
-package localdb
-
-import (
-	"encoding/json"
-	"fmt"
-	"log/slog"
-
-	"gorm.io/gorm"
-)
-
-// ConfigTypeDef describes one device configuration type as synced from qt_settings.
-type ConfigTypeDef struct {
-	Code         string   `json:"code"`
-	NameRu       string   `json:"name_ru"`
-	DisplayOrder int      `json:"display_order"`
-	Categories   []string `json:"categories"`
-}
-
-// TabSection is a named sub-group of categories within a configurator tab.
-type TabSection struct {
-	Title      string   `json:"title"`
-	Categories []string `json:"categories"`
-}
-
-// TabDef describes one tab in the configurator as synced from qt_settings.
-type TabDef struct {
-	Key          string       `json:"key"`
-	Label        string       `json:"label"`
-	SingleSelect bool         `json:"single_select"`
-	Categories   []string     `json:"categories"`
-	Sections     []TabSection `json:"sections,omitempty"`
-}
-
-// ConfiguratorSettings holds all four server-driven settings consumed by the configurator.
-// Fields are nil/empty when the corresponding qt_settings key is absent or unparseable;
-// callers are expected to apply hardcoded fallbacks in that case.
-type ConfiguratorSettings struct {
-	ConfigTypes        []ConfigTypeDef     `json:"config_types"`
-	TabConfig          []TabDef            `json:"tab_config"`
-	AlwaysVisibleTabs  []string            `json:"always_visible_tabs"`
-	RequiredCategories map[string][]string `json:"required_categories"`
-}
-
-// SyncQtSettings reads all rows from qt_settings on MariaDB and replaces the
-// local_qt_settings cache in a single SQLite transaction. Returns an error if
-// the qt_settings table doesn't exist on the server (old server without the
-// table) or on any query/write failure.
-func (l *LocalDB) SyncQtSettings(mariaDB *gorm.DB) error {
-	var rows []LocalQtSetting
-	if err := mariaDB.
-		Table("qt_settings").
-		Select("name, value").
-		Find(&rows).Error; err != nil {
-		return fmt.Errorf("reading qt_settings from MariaDB: %w", err)
-	}
-
-	return l.db.Transaction(func(tx *gorm.DB) error {
-		if err := tx.Exec("DELETE FROM local_qt_settings").Error; err != nil {
-			return fmt.Errorf("clearing local_qt_settings: %w", err)
-		}
-		if len(rows) == 0 {
-			return nil
-		}
-		if err := tx.Create(&rows).Error; err != nil {
-			return fmt.Errorf("inserting local_qt_settings: %w", err)
-		}
-		slog.Info("qt_settings synced", "count", len(rows))
-		return nil
-	})
-}
-
-// GetQtSetting returns the raw JSON value for a named setting.
-// found is false when the key does not exist.
-func (l *LocalDB) GetQtSetting(name string) (value string, found bool, err error) {
-	var row LocalQtSetting
-	res := l.db.Where("name = ?", name).First(&row)
-	if res.Error != nil {
-		if res.Error == gorm.ErrRecordNotFound {
-			return "", false, nil
-		}
-		return "", false, res.Error
-	}
-	return row.Value, true, nil
-}
-
-// GetConfiguratorSettings reads all four known settings from local_qt_settings and
-// parses them. Any missing or unparseable key is left as nil/zero in the result;
-// the caller must apply fallbacks.
-func (l *LocalDB) GetConfiguratorSettings() (*ConfiguratorSettings, error) {
-	out := &ConfiguratorSettings{}
-
-	keys := []string{"config_types", "tab_config", "always_visible_tabs", "required_categories"}
-	for _, key := range keys {
-		raw, found, err := l.GetQtSetting(key)
-		if err != nil {
-			return out, fmt.Errorf("reading setting %q: %w", key, err)
-		}
-		if !found || raw == "" {
-			continue
-		}
-		switch key {
-		case "config_types":
-			if err := json.Unmarshal([]byte(raw), &out.ConfigTypes); err != nil {
-				slog.Warn("failed to parse config_types setting", "error", err)
-			}
-		case "tab_config":
-			if err := json.Unmarshal([]byte(raw), &out.TabConfig); err != nil {
-				slog.Warn("failed to parse tab_config setting", "error", err)
-			}
-		case "always_visible_tabs":
-			if err := json.Unmarshal([]byte(raw), &out.AlwaysVisibleTabs); err != nil {
-				slog.Warn("failed to parse always_visible_tabs setting", "error", err)
-			}
-		case "required_categories":
-			if err := json.Unmarshal([]byte(raw), &out.RequiredCategories); err != nil {
-				slog.Warn("failed to parse required_categories setting", "error", err)
-			}
-		}
-	}
-
-	return out, nil
-}

internal/localdb/snapshots.go

@@ -10,36 +10,32 @@ import (
 // BuildConfigurationSnapshot serializes the full local configuration state.
 func BuildConfigurationSnapshot(localCfg *LocalConfiguration) (string, error) {
 	snapshot := map[string]interface{}{
-		"id":                      localCfg.ID,
-		"uuid":                    localCfg.UUID,
-		"server_id":               localCfg.ServerID,
-		"project_uuid":            localCfg.ProjectUUID,
-		"current_version_id":      localCfg.CurrentVersionID,
-		"is_active":               localCfg.IsActive,
-		"name":                    localCfg.Name,
-		"items":                   localCfg.Items,
-		"total_price":             localCfg.TotalPrice,
-		"custom_price":            localCfg.CustomPrice,
-		"notes":                   localCfg.Notes,
-		"is_template":             localCfg.IsTemplate,
-		"server_count":            localCfg.ServerCount,
-		"server_model":            localCfg.ServerModel,
-		"support_code":            localCfg.SupportCode,
-		"article":                 localCfg.Article,
-		"pricelist_id":            localCfg.PricelistID,
-		"warehouse_pricelist_id":  localCfg.WarehousePricelistID,
-		"competitor_pricelist_id": localCfg.CompetitorPricelistID,
-		"disable_price_refresh":   localCfg.DisablePriceRefresh,
-		"only_in_stock":           localCfg.OnlyInStock,
-		"vendor_spec":             localCfg.VendorSpec,
-		"line":                    localCfg.Line,
-		"price_updated_at":        localCfg.PriceUpdatedAt,
-		"created_at":              localCfg.CreatedAt,
-		"updated_at":              localCfg.UpdatedAt,
-		"synced_at":               localCfg.SyncedAt,
-		"sync_status":             localCfg.SyncStatus,
-		"original_user_id":        localCfg.OriginalUserID,
-		"original_username":       localCfg.OriginalUsername,
+		"id":                 localCfg.ID,
+		"uuid":               localCfg.UUID,
+		"server_id":          localCfg.ServerID,
+		"project_uuid":       localCfg.ProjectUUID,
+		"current_version_id": localCfg.CurrentVersionID,
+		"is_active":          localCfg.IsActive,
+		"name":               localCfg.Name,
+		"items":              localCfg.Items,
+		"total_price":        localCfg.TotalPrice,
+		"custom_price":       localCfg.CustomPrice,
+		"notes":              localCfg.Notes,
+		"is_template":        localCfg.IsTemplate,
+		"server_count":       localCfg.ServerCount,
+		"server_model":       localCfg.ServerModel,
+		"support_code":       localCfg.SupportCode,
+		"article":            localCfg.Article,
+		"pricelist_id":       localCfg.PricelistID,
+		"only_in_stock":      localCfg.OnlyInStock,
+		"line":               localCfg.Line,
+		"price_updated_at":   localCfg.PriceUpdatedAt,
+		"created_at":         localCfg.CreatedAt,
+		"updated_at":         localCfg.UpdatedAt,
+		"synced_at":          localCfg.SyncedAt,
+		"sync_status":        localCfg.SyncStatus,
+		"original_user_id":   localCfg.OriginalUserID,
+		"original_username":  localCfg.OriginalUsername,
 	}
 
 	data, err := json.Marshal(snapshot)
@@ -52,28 +48,24 @@ func BuildConfigurationSnapshot(localCfg *LocalConfiguration) (string, error) {
 // DecodeConfigurationSnapshot returns editable fields from one saved snapshot.
 func DecodeConfigurationSnapshot(data string) (*LocalConfiguration, error) {
 	var snapshot struct {
-		ProjectUUID           *string          `json:"project_uuid"`
-		IsActive              *bool            `json:"is_active"`
-		Name                  string           `json:"name"`
-		Items                 LocalConfigItems `json:"items"`
-		TotalPrice            *float64         `json:"total_price"`
-		CustomPrice           *float64         `json:"custom_price"`
-		Notes                 string           `json:"notes"`
-		IsTemplate            bool             `json:"is_template"`
-		ServerCount           int              `json:"server_count"`
-		ServerModel           string           `json:"server_model"`
-		SupportCode           string           `json:"support_code"`
-		Article               string           `json:"article"`
-		PricelistID           *uint            `json:"pricelist_id"`
-		WarehousePricelistID  *uint            `json:"warehouse_pricelist_id"`
-		CompetitorPricelistID *uint            `json:"competitor_pricelist_id"`
-		DisablePriceRefresh   bool             `json:"disable_price_refresh"`
-		OnlyInStock           bool             `json:"only_in_stock"`
-		VendorSpec            VendorSpec       `json:"vendor_spec"`
-		Line                  int              `json:"line"`
-		PriceUpdatedAt        *time.Time       `json:"price_updated_at"`
-		OriginalUserID        uint             `json:"original_user_id"`
-		OriginalUsername      string           `json:"original_username"`
+		ProjectUUID      *string          `json:"project_uuid"`
+		IsActive         *bool            `json:"is_active"`
+		Name             string           `json:"name"`
+		Items            LocalConfigItems `json:"items"`
+		TotalPrice       *float64         `json:"total_price"`
+		CustomPrice      *float64         `json:"custom_price"`
+		Notes            string           `json:"notes"`
+		IsTemplate       bool             `json:"is_template"`
+		ServerCount      int              `json:"server_count"`
+		ServerModel      string           `json:"server_model"`
+		SupportCode      string           `json:"support_code"`
+		Article          string           `json:"article"`
+		PricelistID      *uint            `json:"pricelist_id"`
+		OnlyInStock      bool             `json:"only_in_stock"`
+		Line             int              `json:"line"`
+		PriceUpdatedAt   *time.Time       `json:"price_updated_at"`
+		OriginalUserID   uint             `json:"original_user_id"`
+		OriginalUsername string           `json:"original_username"`
 	}
 
 	if err := json.Unmarshal([]byte(data), &snapshot); err != nil {
@@ -86,42 +78,32 @@ func DecodeConfigurationSnapshot(data string) (*LocalConfiguration, error) {
 	}
 
 	return &LocalConfiguration{
-		IsActive:              isActive,
-		ProjectUUID:           snapshot.ProjectUUID,
-		Name:                  snapshot.Name,
-		Items:                 snapshot.Items,
-		TotalPrice:            snapshot.TotalPrice,
-		CustomPrice:           snapshot.CustomPrice,
-		Notes:                 snapshot.Notes,
-		IsTemplate:            snapshot.IsTemplate,
-		ServerCount:           snapshot.ServerCount,
-		ServerModel:           snapshot.ServerModel,
-		SupportCode:           snapshot.SupportCode,
-		Article:               snapshot.Article,
-		PricelistID:           snapshot.PricelistID,
-		WarehousePricelistID:  snapshot.WarehousePricelistID,
-		CompetitorPricelistID: snapshot.CompetitorPricelistID,
-		DisablePriceRefresh:   snapshot.DisablePriceRefresh,
-		OnlyInStock:           snapshot.OnlyInStock,
-		VendorSpec:            snapshot.VendorSpec,
-		Line:                  snapshot.Line,
-		PriceUpdatedAt:        snapshot.PriceUpdatedAt,
-		OriginalUserID:        snapshot.OriginalUserID,
-		OriginalUsername:      snapshot.OriginalUsername,
+		IsActive:         isActive,
+		ProjectUUID:      snapshot.ProjectUUID,
+		Name:             snapshot.Name,
+		Items:            snapshot.Items,
+		TotalPrice:       snapshot.TotalPrice,
+		CustomPrice:      snapshot.CustomPrice,
+		Notes:            snapshot.Notes,
+		IsTemplate:       snapshot.IsTemplate,
+		ServerCount:      snapshot.ServerCount,
+		ServerModel:      snapshot.ServerModel,
+		SupportCode:      snapshot.SupportCode,
+		Article:          snapshot.Article,
+		PricelistID:      snapshot.PricelistID,
+		OnlyInStock:      snapshot.OnlyInStock,
+		Line:             snapshot.Line,
+		PriceUpdatedAt:   snapshot.PriceUpdatedAt,
+		OriginalUserID:   snapshot.OriginalUserID,
+		OriginalUsername: snapshot.OriginalUsername,
 	}, nil
 }
 
 type configurationSpecPriceFingerprint struct {
-	Items                 []configurationSpecPriceFingerprintItem `json:"items"`
-	ServerCount           int                                     `json:"server_count"`
-	TotalPrice            *float64                                `json:"total_price,omitempty"`
-	CustomPrice           *float64                                `json:"custom_price,omitempty"`
-	PricelistID           *uint                                   `json:"pricelist_id,omitempty"`
-	WarehousePricelistID  *uint                                   `json:"warehouse_pricelist_id,omitempty"`
-	CompetitorPricelistID *uint                                   `json:"competitor_pricelist_id,omitempty"`
-	DisablePriceRefresh   bool                                    `json:"disable_price_refresh"`
-	OnlyInStock           bool                                    `json:"only_in_stock"`
-	VendorSpec            VendorSpec                              `json:"vendor_spec,omitempty"`
+	Items       []configurationSpecPriceFingerprintItem `json:"items"`
+	ServerCount int                                     `json:"server_count"`
+	TotalPrice  *float64                                `json:"total_price,omitempty"`
+	CustomPrice *float64                                `json:"custom_price,omitempty"`
 }
 
 type configurationSpecPriceFingerprintItem struct {
@@ -152,16 +134,10 @@ func BuildConfigurationSpecPriceFingerprint(localCfg *LocalConfiguration) (strin
 	})
 
 	payload := configurationSpecPriceFingerprint{
-		Items:                 items,
-		ServerCount:           localCfg.ServerCount,
-		TotalPrice:            localCfg.TotalPrice,
-		CustomPrice:           localCfg.CustomPrice,
-		PricelistID:           localCfg.PricelistID,
-		WarehousePricelistID:  localCfg.WarehousePricelistID,
-		CompetitorPricelistID: localCfg.CompetitorPricelistID,
-		DisablePriceRefresh:   localCfg.DisablePriceRefresh,
-		OnlyInStock:           localCfg.OnlyInStock,
-		VendorSpec:            localCfg.VendorSpec,
+		Items:       items,
+		ServerCount: localCfg.ServerCount,
+		TotalPrice:  localCfg.TotalPrice,
+		CustomPrice: localCfg.CustomPrice,
 	}
 
 	raw, err := json.Marshal(payload)

internal/lotmatch/resolver.go

@@ -0,0 +1,238 @@
+package lotmatch
+
+import (
+	"errors"
+	"regexp"
+	"sort"
+	"strings"
+
+	"git.mchus.pro/mchus/quoteforge/internal/models"
+	"gorm.io/gorm"
+)
+
+var (
+	ErrResolveConflict = errors.New("multiple lot matches")
+	ErrResolveNotFound = errors.New("lot not found")
+)
+
+type LotResolver struct {
+	partnumberToLots map[string][]string
+	exactLots        map[string]string
+	allLots          []string
+}
+
+type MappingMatcher struct {
+	exact    map[string][]string
+	exactLot map[string]string
+	wildcard []wildcardMapping
+}
+
+type wildcardMapping struct {
+	lotName string
+	re      *regexp.Regexp
+}
+
+func NewLotResolverFromDB(db *gorm.DB) (*LotResolver, error) {
+	mappings, lots, err := loadMappingsAndLots(db)
+	if err != nil {
+		return nil, err
+	}
+	return NewLotResolver(mappings, lots), nil
+}
+
+func NewMappingMatcherFromDB(db *gorm.DB) (*MappingMatcher, error) {
+	mappings, lots, err := loadMappingsAndLots(db)
+	if err != nil {
+		return nil, err
+	}
+	return NewMappingMatcher(mappings, lots), nil
+}
+
+func NewLotResolver(mappings []models.LotPartnumber, lots []models.Lot) *LotResolver {
+	partnumberToLots := make(map[string][]string, len(mappings))
+	for _, m := range mappings {
+		pn := NormalizeKey(m.Partnumber)
+		lot := strings.TrimSpace(m.LotName)
+		if pn == "" || lot == "" {
+			continue
+		}
+		partnumberToLots[pn] = append(partnumberToLots[pn], lot)
+	}
+	for key := range partnumberToLots {
+		partnumberToLots[key] = uniqueCaseInsensitive(partnumberToLots[key])
+	}
+
+	exactLots := make(map[string]string, len(lots))
+	allLots := make([]string, 0, len(lots))
+	for _, l := range lots {
+		name := strings.TrimSpace(l.LotName)
+		if name == "" {
+			continue
+		}
+		exactLots[NormalizeKey(name)] = name
+		allLots = append(allLots, name)
+	}
+	sort.Slice(allLots, func(i, j int) bool {
+		li := len([]rune(allLots[i]))
+		lj := len([]rune(allLots[j]))
+		if li == lj {
+			return allLots[i] < allLots[j]
+		}
+		return li > lj
+	})
+
+	return &LotResolver{
+		partnumberToLots: partnumberToLots,
+		exactLots:        exactLots,
+		allLots:          allLots,
+	}
+}
+
+func NewMappingMatcher(mappings []models.LotPartnumber, lots []models.Lot) *MappingMatcher {
+	exact := make(map[string][]string, len(mappings))
+	wildcards := make([]wildcardMapping, 0, len(mappings))
+	for _, m := range mappings {
+		pn := NormalizeKey(m.Partnumber)
+		lot := strings.TrimSpace(m.LotName)
+		if pn == "" || lot == "" {
+			continue
+		}
+		if strings.Contains(pn, "*") {
+			pattern := "^" + regexp.QuoteMeta(pn) + "$"
+			pattern = strings.ReplaceAll(pattern, "\\*", ".*")
+			re, err := regexp.Compile(pattern)
+			if err != nil {
+				continue
+			}
+			wildcards = append(wildcards, wildcardMapping{lotName: lot, re: re})
+			continue
+		}
+		exact[pn] = append(exact[pn], lot)
+	}
+	for key := range exact {
+		exact[key] = uniqueCaseInsensitive(exact[key])
+	}
+
+	exactLot := make(map[string]string, len(lots))
+	for _, l := range lots {
+		name := strings.TrimSpace(l.LotName)
+		if name == "" {
+			continue
+		}
+		exactLot[NormalizeKey(name)] = name
+	}
+
+	return &MappingMatcher{
+		exact:    exact,
+		exactLot: exactLot,
+		wildcard: wildcards,
+	}
+}
+
+func (r *LotResolver) Resolve(partnumber string) (string, string, error) {
+	key := NormalizeKey(partnumber)
+	if key == "" {
+		return "", "", ErrResolveNotFound
+	}
+
+	if mapped := r.partnumberToLots[key]; len(mapped) > 0 {
+		if len(mapped) == 1 {
+			return mapped[0], "mapping_table", nil
+		}
+		return "", "", ErrResolveConflict
+	}
+	if exact, ok := r.exactLots[key]; ok {
+		return exact, "article_exact", nil
+	}
+
+	best := ""
+	bestLen := -1
+	tie := false
+	for _, lot := range r.allLots {
+		lotKey := NormalizeKey(lot)
+		if lotKey == "" {
+			continue
+		}
+		if strings.HasPrefix(key, lotKey) {
+			l := len([]rune(lotKey))
+			if l > bestLen {
+				best = lot
+				bestLen = l
+				tie = false
+			} else if l == bestLen && !strings.EqualFold(best, lot) {
+				tie = true
+			}
+		}
+	}
+	if best == "" {
+		return "", "", ErrResolveNotFound
+	}
+	if tie {
+		return "", "", ErrResolveConflict
+	}
+	return best, "prefix", nil
+}
+
+func (m *MappingMatcher) MatchLots(partnumber string) []string {
+	if m == nil {
+		return nil
+	}
+	key := NormalizeKey(partnumber)
+	if key == "" {
+		return nil
+	}
+
+	lots := make([]string, 0, 2)
+	if exact := m.exact[key]; len(exact) > 0 {
+		lots = append(lots, exact...)
+	}
+	for _, wc := range m.wildcard {
+		if wc.re == nil || !wc.re.MatchString(key) {
+			continue
+		}
+		lots = append(lots, wc.lotName)
+	}
+	if lot, ok := m.exactLot[key]; ok && strings.TrimSpace(lot) != "" {
+		lots = append(lots, lot)
+	}
+	return uniqueCaseInsensitive(lots)
+}
+
+func NormalizeKey(v string) string {
+	s := strings.ToLower(strings.TrimSpace(v))
+	replacer := strings.NewReplacer(" ", "", "-", "", "_", "", ".", "", "/", "", "\\", "", "\"", "", "'", "", "(", "", ")", "")
+	return replacer.Replace(s)
+}
+
+func loadMappingsAndLots(db *gorm.DB) ([]models.LotPartnumber, []models.Lot, error) {
+	var mappings []models.LotPartnumber
+	if err := db.Find(&mappings).Error; err != nil {
+		return nil, nil, err
+	}
+	var lots []models.Lot
+	if err := db.Select("lot_name").Find(&lots).Error; err != nil {
+		return nil, nil, err
+	}
+	return mappings, lots, nil
+}
+
+func uniqueCaseInsensitive(values []string) []string {
+	seen := make(map[string]struct{}, len(values))
+	out := make([]string, 0, len(values))
+	for _, v := range values {
+		trimmed := strings.TrimSpace(v)
+		if trimmed == "" {
+			continue
+		}
+		key := strings.ToLower(trimmed)
+		if _, ok := seen[key]; ok {
+			continue
+		}
+		seen[key] = struct{}{}
+		out = append(out, trimmed)
+	}
+	sort.Slice(out, func(i, j int) bool {
+		return strings.ToLower(out[i]) < strings.ToLower(out[j])
+	})
+	return out
+}

internal/lotmatch/resolver_test.go

@@ -0,0 +1,62 @@
+package lotmatch
+
+import (
+	"testing"
+
+	"git.mchus.pro/mchus/quoteforge/internal/models"
+)
+
+func TestLotResolverPrecedence(t *testing.T) {
+	resolver := NewLotResolver(
+		[]models.LotPartnumber{
+			{Partnumber: "PN-1", LotName: "LOT_A"},
+		},
+		[]models.Lot{
+			{LotName: "CPU_X_LONG"},
+			{LotName: "CPU_X"},
+		},
+	)
+
+	lot, by, err := resolver.Resolve("PN-1")
+	if err != nil || lot != "LOT_A" || by != "mapping_table" {
+		t.Fatalf("expected mapping_table LOT_A, got lot=%s by=%s err=%v", lot, by, err)
+	}
+
+	lot, by, err = resolver.Resolve("CPU_X")
+	if err != nil || lot != "CPU_X" || by != "article_exact" {
+		t.Fatalf("expected article_exact CPU_X, got lot=%s by=%s err=%v", lot, by, err)
+	}
+
+	lot, by, err = resolver.Resolve("CPU_X_LONG_001")
+	if err != nil || lot != "CPU_X_LONG" || by != "prefix" {
+		t.Fatalf("expected prefix CPU_X_LONG, got lot=%s by=%s err=%v", lot, by, err)
+	}
+}
+
+func TestMappingMatcherWildcardAndExactLot(t *testing.T) {
+	matcher := NewMappingMatcher(
+		[]models.LotPartnumber{
+			{Partnumber: "R750*", LotName: "SERVER_R750"},
+			{Partnumber: "HDD-01", LotName: "HDD_01"},
+		},
+		[]models.Lot{
+			{LotName: "MEM_DDR5_16G_4800"},
+		},
+	)
+
+	check := func(partnumber string, want string) {
+		t.Helper()
+		got := matcher.MatchLots(partnumber)
+		if len(got) != 1 || got[0] != want {
+			t.Fatalf("partnumber %s: expected [%s], got %#v", partnumber, want, got)
+		}
+	}
+
+	check("R750XD", "SERVER_R750")
+	check("HDD-01", "HDD_01")
+	check("MEM_DDR5_16G_4800", "MEM_DDR5_16G_4800")
+
+	if got := matcher.MatchLots("UNKNOWN"); len(got) != 0 {
+		t.Fatalf("expected no matches for UNKNOWN, got %#v", got)
+	}
+}

internal/middleware/auth.go

@@ -0,0 +1,110 @@
+package middleware
+
+import (
+	"net/http"
+	"strings"
+
+	"git.mchus.pro/mchus/quoteforge/internal/models"
+	"git.mchus.pro/mchus/quoteforge/internal/services"
+	"github.com/gin-gonic/gin"
+)
+
+const (
+	AuthUserKey   = "auth_user"
+	AuthClaimsKey = "auth_claims"
+)
+
+func Auth(authService *services.AuthService) gin.HandlerFunc {
+	return func(c *gin.Context) {
+		authHeader := c.GetHeader("Authorization")
+		if authHeader == "" {
+			c.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{
+				"error": "authorization header required",
+			})
+			return
+		}
+
+		parts := strings.SplitN(authHeader, " ", 2)
+		if len(parts) != 2 || parts[0] != "Bearer" {
+			c.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{
+				"error": "invalid authorization header format",
+			})
+			return
+		}
+
+		claims, err := authService.ValidateToken(parts[1])
+		if err != nil {
+			c.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{
+				"error": err.Error(),
+			})
+			return
+		}
+
+		c.Set(AuthClaimsKey, claims)
+		c.Next()
+	}
+}
+
+func RequireRole(roles ...models.UserRole) gin.HandlerFunc {
+	return func(c *gin.Context) {
+		claims, exists := c.Get(AuthClaimsKey)
+		if !exists {
+			c.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{
+				"error": "authentication required",
+			})
+			return
+		}
+
+		authClaims := claims.(*services.Claims)
+
+		for _, role := range roles {
+			if authClaims.Role == role {
+				c.Next()
+				return
+			}
+		}
+
+		c.AbortWithStatusJSON(http.StatusForbidden, gin.H{
+			"error": "insufficient permissions",
+		})
+	}
+}
+
+func RequireEditor() gin.HandlerFunc {
+	return RequireRole(models.RoleEditor, models.RolePricingAdmin, models.RoleAdmin)
+}
+
+func RequirePricingAdmin() gin.HandlerFunc {
+	return RequireRole(models.RolePricingAdmin, models.RoleAdmin)
+}
+
+func RequireAdmin() gin.HandlerFunc {
+	return RequireRole(models.RoleAdmin)
+}
+
+// GetClaims extracts auth claims from context
+func GetClaims(c *gin.Context) *services.Claims {
+	claims, exists := c.Get(AuthClaimsKey)
+	if !exists {
+		return nil
+	}
+	return claims.(*services.Claims)
+}
+
+// GetUserID extracts user ID from context
+func GetUserID(c *gin.Context) uint {
+	claims := GetClaims(c)
+	if claims == nil {
+		return 0
+	}
+	return claims.UserID
+}
+
+// GetUsername extracts username from context
+func GetUsername(c *gin.Context) string {
+	claims := GetClaims(c)
+	if claims == nil {
+		return ""
+	}
+	return claims.Username
+}

internal/models/alert.go

@@ -0,0 +1,93 @@
+package models
+
+import (
+	"database/sql/driver"
+	"encoding/json"
+	"errors"
+	"time"
+)
+
+type AlertType string
+
+const (
+	AlertHighDemandStalePrice AlertType = "high_demand_stale_price"
+	AlertPriceSpike           AlertType = "price_spike"
+	AlertPriceDrop            AlertType = "price_drop"
+	AlertNoRecentQuotes       AlertType = "no_recent_quotes"
+	AlertTrendingNoPrice      AlertType = "trending_no_price"
+)
+
+type AlertSeverity string
+
+const (
+	SeverityLow      AlertSeverity = "low"
+	SeverityMedium   AlertSeverity = "medium"
+	SeverityHigh     AlertSeverity = "high"
+	SeverityCritical AlertSeverity = "critical"
+)
+
+type AlertStatus string
+
+const (
+	AlertStatusNew          AlertStatus = "new"
+	AlertStatusAcknowledged AlertStatus = "acknowledged"
+	AlertStatusResolved     AlertStatus = "resolved"
+	AlertStatusIgnored      AlertStatus = "ignored"
+)
+
+type AlertDetails map[string]interface{}
+
+func (d AlertDetails) Value() (driver.Value, error) {
+	return json.Marshal(d)
+}
+
+func (d *AlertDetails) Scan(value interface{}) error {
+	if value == nil {
+		*d = make(AlertDetails)
+		return nil
+	}
+	bytes, ok := value.([]byte)
+	if !ok {
+		return errors.New("type assertion to []byte failed")
+	}
+	return json.Unmarshal(bytes, d)
+}
+
+type PricingAlert struct {
+	ID        uint          `gorm:"primaryKey;autoIncrement" json:"id"`
+	LotName   string        `gorm:"size:255;not null" json:"lot_name"`
+	AlertType AlertType     `gorm:"type:enum('high_demand_stale_price','price_spike','price_drop','no_recent_quotes','trending_no_price');not null" json:"alert_type"`
+	Severity  AlertSeverity `gorm:"type:enum('low','medium','high','critical');default:'medium'" json:"severity"`
+	Message   string        `gorm:"type:text;not null" json:"message"`
+	Details   AlertDetails  `gorm:"type:json" json:"details"`
+	Status    AlertStatus   `gorm:"type:enum('new','acknowledged','resolved','ignored');default:'new'" json:"status"`
+	CreatedAt time.Time     `gorm:"autoCreateTime" json:"created_at"`
+}
+
+func (PricingAlert) TableName() string {
+	return "qt_pricing_alerts"
+}
+
+type TrendDirection string
+
+const (
+	TrendUp     TrendDirection = "up"
+	TrendStable TrendDirection = "stable"
+	TrendDown   TrendDirection = "down"
+)
+
+type ComponentUsageStats struct {
+	LotName        string         `gorm:"column:lot_name;primaryKey;size:255" json:"lot_name"`
+	QuotesTotal    int            `gorm:"default:0" json:"quotes_total"`
+	QuotesLast30d  int            `gorm:"default:0" json:"quotes_last_30d"`
+	QuotesLast7d   int            `gorm:"default:0" json:"quotes_last_7d"`
+	TotalQuantity  int            `gorm:"default:0" json:"total_quantity"`
+	TotalRevenue   float64        `gorm:"type:decimal(14,2);default:0" json:"total_revenue"`
+	TrendDirection TrendDirection `gorm:"type:enum('up','stable','down');default:'stable'" json:"trend_direction"`
+	TrendPercent   float64        `gorm:"type:decimal(5,2);default:0" json:"trend_percent"`
+	LastUsedAt     *time.Time     `json:"last_used_at"`
+}
+
+func (ComponentUsageStats) TableName() string {
+	return "qt_component_usage_stats"
+}

internal/models/category.go

@@ -13,32 +13,32 @@ func (Category) TableName() string {
 	return "qt_categories"
 }
 
-// DefaultCategories defines the standard categories with display order.
-// Canonical order: MB, CPU, MEM, RAID, storage drives, PCIe GPU, PCIe NICs, HBA, PSU, accessories, other.
-// Display orders use gaps of 10 to allow future insertions without renumbering.
+// DefaultCategories defines the standard categories with display order
+// Order: BB, CPU, MEM, GPU, SSD, RAID, HBA, NIC, PSU, RISERS, ACC, and others
 var DefaultCategories = []Category{
-	{Code: "MB", Name: "Motherboard", NameRu: "Материнская плата", DisplayOrder: 10},
-	{Code: "CPU", Name: "Processor", NameRu: "Процессор", DisplayOrder: 20, IsRequired: true},
-	{Code: "MEM", Name: "Memory", NameRu: "Оперативная память", DisplayOrder: 30, IsRequired: true},
-	{Code: "RAID", Name: "RAID Controller", NameRu: "RAID контроллер", DisplayOrder: 40},
-	{Code: "SSD", Name: "SSD Storage", NameRu: "SSD накопитель", DisplayOrder: 50},
-	{Code: "HDD", Name: "HDD Storage", NameRu: "HDD накопитель", DisplayOrder: 51},
-	{Code: "M2", Name: "M.2 Storage", NameRu: "M.2 накопитель", DisplayOrder: 52},
-	{Code: "EDSFF", Name: "EDSFF Storage", NameRu: "EDSFF накопитель", DisplayOrder: 53},
-	{Code: "HHHL", Name: "HHHL Storage", NameRu: "HHHL накопитель", DisplayOrder: 54},
-	{Code: "GPU", Name: "Graphics Card", NameRu: "Видеокарта", DisplayOrder: 60},
-	{Code: "NIC", Name: "Network Card", NameRu: "Сетевая карта", DisplayOrder: 70},
-	{Code: "HCA", Name: "HCA Adapter", NameRu: "HCA адаптер", DisplayOrder: 71},
-	{Code: "DPU", Name: "DPU", NameRu: "DPU", DisplayOrder: 72},
-	{Code: "HBA", Name: "HBA Adapter", NameRu: "HBA адаптер", DisplayOrder: 80},
-	{Code: "PSU", Name: "Power Supply", NameRu: "Блок питания", DisplayOrder: 90},
-	{Code: "PS", Name: "Power Supply (Legacy)", NameRu: "Блок питания", DisplayOrder: 91},
-	{Code: "ACC", Name: "Accessories", NameRu: "Аксессуары", DisplayOrder: 100},
-	{Code: "RISERS", Name: "Risers", NameRu: "Райзеры", DisplayOrder: 101},
-	{Code: "CARD", Name: "Cards", NameRu: "Карты", DisplayOrder: 110},
-	{Code: "BB", Name: "Barebone", NameRu: "Шасси", DisplayOrder: 120, IsRequired: true},
+	{Code: "BB", Name: "Barebone", NameRu: "Шасси", DisplayOrder: 1, IsRequired: true},
+	{Code: "CPU", Name: "Processor", NameRu: "Процессор", DisplayOrder: 2, IsRequired: true},
+	{Code: "MEM", Name: "Memory", NameRu: "Оперативная память", DisplayOrder: 3, IsRequired: true},
+	{Code: "GPU", Name: "Graphics Card", NameRu: "Видеокарта", DisplayOrder: 4},
+	{Code: "SSD", Name: "SSD Storage", NameRu: "SSD накопитель", DisplayOrder: 5},
+	{Code: "RAID", Name: "RAID Controller", NameRu: "RAID контроллер", DisplayOrder: 6},
+	{Code: "HBA", Name: "HBA Adapter", NameRu: "HBA адаптер", DisplayOrder: 7},
+	{Code: "NIC", Name: "Network Card", NameRu: "Сетевая карта", DisplayOrder: 8},
+	{Code: "PSU", Name: "Power Supply", NameRu: "Блок питания", DisplayOrder: 9},
+	{Code: "RISERS", Name: "Risers", NameRu: "Райзеры", DisplayOrder: 10},
+	{Code: "ACC", Name: "Accessories", NameRu: "Аксессуары", DisplayOrder: 11},
+	// Additional categories
+	{Code: "MB", Name: "Motherboard", NameRu: "Материнская плата", DisplayOrder: 12},
+	{Code: "HDD", Name: "HDD Storage", NameRu: "HDD накопитель", DisplayOrder: 13},
+	{Code: "HCA", Name: "HCA Adapter", NameRu: "HCA адаптер", DisplayOrder: 14},
+	{Code: "DPU", Name: "DPU", NameRu: "DPU", DisplayOrder: 15},
+	{Code: "M2", Name: "M.2 Storage", NameRu: "M.2 накопитель", DisplayOrder: 16},
+	{Code: "EDSFF", Name: "EDSFF Storage", NameRu: "EDSFF накопитель", DisplayOrder: 17},
+	{Code: "HHHL", Name: "HHHL Storage", NameRu: "HHHL накопитель", DisplayOrder: 18},
+	{Code: "PS", Name: "Power Supply (Legacy)", NameRu: "Блок питания", DisplayOrder: 19},
+	{Code: "CARD", Name: "Cards", NameRu: "Карты", DisplayOrder: 20},
 }
 
-// MaxKnownDisplayOrder is the highest display order for known categories.
-// New categories will get display order starting from this + 1.
-const MaxKnownDisplayOrder = 200
+// MaxKnownDisplayOrder is the highest display order for known categories
+// New categories will get display order starting from this + 1
+const MaxKnownDisplayOrder = 100

internal/models/configuration.go

@@ -39,57 +39,6 @@ func (c ConfigItems) Total() float64 {
 	return total
 }
 
-type VendorSpecLotAllocation struct {
-	LotName  string `json:"lot_name"`
-	Quantity int    `json:"quantity"`
-}
-
-type VendorSpecLotMapping struct {
-	LotName       string `json:"lot_name"`
-	QuantityPerPN int    `json:"quantity_per_pn"`
-}
-
-type VendorSpecItem struct {
-	SortOrder           int                       `json:"sort_order"`
-	VendorPartnumber    string                    `json:"vendor_partnumber"`
-	Quantity            int                       `json:"quantity"`
-	Description         string                    `json:"description,omitempty"`
-	UnitPrice           *float64                  `json:"unit_price,omitempty"`
-	TotalPrice          *float64                  `json:"total_price,omitempty"`
-	ResolvedLotName     string                    `json:"resolved_lot_name,omitempty"`
-	ResolutionSource    string                    `json:"resolution_source,omitempty"`
-	ManualLotSuggestion string                    `json:"manual_lot_suggestion,omitempty"`
-	LotQtyPerPN         int                       `json:"lot_qty_per_pn,omitempty"`
-	LotAllocations      []VendorSpecLotAllocation `json:"lot_allocations,omitempty"`
-	LotMappings         []VendorSpecLotMapping    `json:"lot_mappings,omitempty"`
-}
-
-type VendorSpec []VendorSpecItem
-
-func (v VendorSpec) Value() (driver.Value, error) {
-	if v == nil {
-		return nil, nil
-	}
-	return json.Marshal(v)
-}
-
-func (v *VendorSpec) Scan(value interface{}) error {
-	if value == nil {
-		*v = nil
-		return nil
-	}
-	var bytes []byte
-	switch val := value.(type) {
-	case []byte:
-		bytes = val
-	case string:
-		bytes = []byte(val)
-	default:
-		return errors.New("type assertion failed for VendorSpec")
-	}
-	return json.Unmarshal(bytes, v)
-}
-
 type Configuration struct {
 	ID                    uint        `gorm:"primaryKey;autoIncrement" json:"id"`
 	UUID                  string      `gorm:"size:36;uniqueIndex;not null" json:"uuid"`
@@ -110,17 +59,32 @@ type Configuration struct {
 	PricelistID           *uint       `gorm:"index" json:"pricelist_id,omitempty"`
 	WarehousePricelistID  *uint       `gorm:"index" json:"warehouse_pricelist_id,omitempty"`
 	CompetitorPricelistID *uint       `gorm:"index" json:"competitor_pricelist_id,omitempty"`
-	VendorSpec            VendorSpec  `gorm:"type:json" json:"vendor_spec,omitempty"`
-	ConfigType            string      `gorm:"size:20;default:server" json:"config_type"` // "server" | "storage"
 	DisablePriceRefresh   bool        `gorm:"default:false" json:"disable_price_refresh"`
 	OnlyInStock           bool        `gorm:"default:false" json:"only_in_stock"`
 	Line                  int         `gorm:"column:line_no;index" json:"line"`
 	PriceUpdatedAt        *time.Time  `gorm:"type:timestamp" json:"price_updated_at,omitempty"`
 	CreatedAt             time.Time   `gorm:"autoCreateTime" json:"created_at"`
 	CurrentVersionNo      int         `gorm:"-" json:"current_version_no,omitempty"`
+
+	User *User `gorm:"foreignKey:UserID" json:"user,omitempty"`
 }
 
 func (Configuration) TableName() string {
 	return "qt_configurations"
 }
 
+type PriceOverride struct {
+	ID         uint       `gorm:"primaryKey;autoIncrement" json:"id"`
+	LotName    string     `gorm:"size:255;not null" json:"lot_name"`
+	Price      float64    `gorm:"type:decimal(12,2);not null" json:"price"`
+	ValidFrom  time.Time  `gorm:"type:date;not null" json:"valid_from"`
+	ValidUntil *time.Time `gorm:"type:date" json:"valid_until"`
+	Reason     string     `gorm:"type:text" json:"reason"`
+	CreatedBy  uint       `gorm:"not null" json:"created_by"`
+
+	Creator *User `gorm:"foreignKey:CreatedBy" json:"creator,omitempty"`
+}
+
+func (PriceOverride) TableName() string {
+	return "qt_price_overrides"
+}

internal/models/lot.go

@@ -1,5 +1,7 @@
 package models
 
+import "time"
+
 // Lot represents existing lot table
 type Lot struct {
 	LotName        string  `gorm:"column:lot_name;primaryKey;size:255" json:"lot_name"`
@@ -10,3 +12,69 @@ type Lot struct {
 func (Lot) TableName() string {
 	return "lot"
 }
+
+// LotLog represents existing lot_log table (READ-ONLY)
+type LotLog struct {
+	LotLogID uint      `gorm:"column:lot_log_id;primaryKey;autoIncrement"`
+	Lot      string    `gorm:"column:lot;size:255;not null"`
+	Supplier string    `gorm:"column:supplier;size:255;not null"`
+	Date     time.Time `gorm:"column:date;type:date;not null"`
+	Price    float64   `gorm:"column:price;not null"`
+	Quality  string    `gorm:"column:quality;size:255"`
+	Comments string    `gorm:"column:comments;size:15000"`
+}
+
+func (LotLog) TableName() string {
+	return "lot_log"
+}
+
+// Supplier represents existing supplier table (READ-ONLY)
+type Supplier struct {
+	SupplierName    string `gorm:"column:supplier_name;primaryKey;size:255"`
+	SupplierComment string `gorm:"column:supplier_comment;size:10000"`
+}
+
+func (Supplier) TableName() string {
+	return "supplier"
+}
+
+// StockLog stores warehouse stock snapshots imported from external files.
+type StockLog struct {
+	StockLogID uint      `gorm:"column:stock_log_id;primaryKey;autoIncrement"`
+	Partnumber string    `gorm:"column:partnumber;size:255;not null"`
+	Supplier   *string   `gorm:"column:supplier;size:255"`
+	Date       time.Time `gorm:"column:date;type:date;not null"`
+	Price      float64   `gorm:"column:price;not null"`
+	Quality    *string   `gorm:"column:quality;size:255"`
+	Comments   *string   `gorm:"column:comments;size:15000"`
+	Vendor     *string   `gorm:"column:vendor;size:255"`
+	Qty        *float64  `gorm:"column:qty"`
+}
+
+func (StockLog) TableName() string {
+	return "stock_log"
+}
+
+// LotPartnumber maps external part numbers to internal lots.
+type LotPartnumber struct {
+	Partnumber  string  `gorm:"column:partnumber;size:255;primaryKey" json:"partnumber"`
+	LotName     string  `gorm:"column:lot_name;size:255;primaryKey" json:"lot_name"`
+	Description *string `gorm:"column:description;size:10000" json:"description,omitempty"`
+}
+
+func (LotPartnumber) TableName() string {
+	return "lot_partnumbers"
+}
+
+// StockIgnoreRule contains import ignore pattern rules.
+type StockIgnoreRule struct {
+	ID        uint      `gorm:"column:id;primaryKey;autoIncrement" json:"id"`
+	Target    string    `gorm:"column:target;size:20;not null" json:"target"`         // partnumber|description
+	MatchType string    `gorm:"column:match_type;size:20;not null" json:"match_type"` // exact|prefix|suffix
+	Pattern   string    `gorm:"column:pattern;size:500;not null" json:"pattern"`
+	CreatedAt time.Time `gorm:"column:created_at;autoCreateTime" json:"created_at"`
+}
+
+func (StockIgnoreRule) TableName() string {
+	return "stock_ignore_rules"
+}

internal/models/models.go

@@ -10,10 +10,14 @@ import (
 // AllModels returns all models for auto-migration
 func AllModels() []interface{} {
 	return []interface{}{
+		&User{},
 		&Category{},
 		&LotMetadata{},
 		&Project{},
 		&Configuration{},
+		&PriceOverride{},
+		&PricingAlert{},
+		&ComponentUsageStats{},
 		&Pricelist{},
 		&PricelistItem{},
 	}
@@ -28,9 +32,7 @@ func Migrate(db *gorm.DB) error {
 			errStr := err.Error()
 			if strings.Contains(errStr, "Can't DROP") ||
 				strings.Contains(errStr, "Duplicate key name") ||
-				strings.Contains(errStr, "check that it exists") ||
-				strings.Contains(errStr, "Cannot change column") ||
-				strings.Contains(errStr, "used in a foreign key constraint") {
+				strings.Contains(errStr, "check that it exists") {
 				slog.Warn("migration warning (skipped)", "model", model, "error", errStr)
 				continue
 			}
@@ -40,19 +42,64 @@ func Migrate(db *gorm.DB) error {
 	return nil
 }
 
-// SeedCategories upserts default categories, updating display_order on existing rows.
+// SeedCategories inserts default categories if not exist
 func SeedCategories(db *gorm.DB) error {
 	for _, cat := range DefaultCategories {
-		var existing Category
-		if err := db.Where("code = ?", cat.Code).First(&existing).Error; err != nil {
-			if err := db.Create(&cat).Error; err != nil {
-				return err
-			}
-		} else {
-			if err := db.Model(&existing).Update("display_order", cat.DisplayOrder).Error; err != nil {
-				return err
-			}
+		result := db.Where("code = ?", cat.Code).FirstOrCreate(&cat)
+		if result.Error != nil {
+			return result.Error
 		}
 	}
 	return nil
 }
+
+// SeedAdminUser creates default admin user if not exists
+// Default credentials: admin / admin123
+func SeedAdminUser(db *gorm.DB, passwordHash string) error {
+	var count int64
+	db.Model(&User{}).Where("username = ?", "admin").Count(&count)
+	if count > 0 {
+		return nil
+	}
+
+	admin := &User{
+		Username:     "admin",
+		Email:        "admin@example.com",
+		PasswordHash: passwordHash,
+		Role:         RoleAdmin,
+		IsActive:     true,
+	}
+	return db.Create(admin).Error
+}
+
+// EnsureDBUser creates or returns the user corresponding to the database connection username.
+// This is used when RBAC is disabled - configurations are owned by the DB user.
+// Returns the user ID that should be used for all operations.
+func EnsureDBUser(db *gorm.DB, dbUsername string) (uint, error) {
+	if dbUsername == "" {
+		return 0, nil
+	}
+
+	var user User
+	err := db.Where("username = ?", dbUsername).First(&user).Error
+	if err == nil {
+		return user.ID, nil
+	}
+
+	// User doesn't exist, create it
+	user = User{
+		Username:     dbUsername,
+		Email:        dbUsername + "@db.local",
+		PasswordHash: "-", // No password - this is a DB user, not an app user
+		Role:         RoleAdmin,
+		IsActive:     true,
+	}
+
+	if err := db.Create(&user).Error; err != nil {
+		slog.Error("failed to create DB user", "username", dbUsername, "error", err)
+		return 0, err
+	}
+
+	slog.Info("created DB user for configurations", "username", dbUsername, "user_id", user.ID)
+	return user.ID, nil
+}

internal/models/qt_setting.go

@@ -1,10 +0,0 @@
-package models
-
-// QtSetting is the MariaDB-side model for qt_settings.
-// The table is managed by the server-side agent; QF only reads from it.
-type QtSetting struct {
-	Name  string `gorm:"primaryKey;size:100" json:"name"`
-	Value string `gorm:"type:text" json:"value"`
-}
-
-func (QtSetting) TableName() string { return "qt_settings" }

internal/models/user.go

@@ -0,0 +1,39 @@
+package models
+
+import "time"
+
+type UserRole string
+
+const (
+	RoleViewer       UserRole = "viewer"
+	RoleEditor       UserRole = "editor"
+	RolePricingAdmin UserRole = "pricing_admin"
+	RoleAdmin        UserRole = "admin"
+)
+
+type User struct {
+	ID           uint      `gorm:"primaryKey;autoIncrement" json:"id"`
+	Username     string    `gorm:"size:100;uniqueIndex;not null" json:"username"`
+	Email        string    `gorm:"size:255;uniqueIndex;not null" json:"email"`
+	PasswordHash string    `gorm:"size:255;not null" json:"-"`
+	Role         UserRole  `gorm:"type:enum('viewer','editor','pricing_admin','admin');default:'viewer'" json:"role"`
+	IsActive     bool      `gorm:"default:true" json:"is_active"`
+	CreatedAt    time.Time `gorm:"autoCreateTime" json:"created_at"`
+	UpdatedAt    time.Time `gorm:"autoUpdateTime" json:"updated_at"`
+}
+
+func (User) TableName() string {
+	return "qt_users"
+}
+
+func (u *User) CanEdit() bool {
+	return u.Role == RoleEditor || u.Role == RolePricingAdmin || u.Role == RoleAdmin
+}
+
+func (u *User) CanManagePricing() bool {
+	return u.Role == RolePricingAdmin || u.Role == RoleAdmin
+}
+
+func (u *User) CanManageUsers() bool {
+	return u.Role == RoleAdmin
+}

internal/repository/alert.go

@@ -0,0 +1,91 @@
+package repository
+
+import (
+	"git.mchus.pro/mchus/quoteforge/internal/models"
+	"gorm.io/gorm"
+)
+
+type AlertRepository struct {
+	db *gorm.DB
+}
+
+func NewAlertRepository(db *gorm.DB) *AlertRepository {
+	return &AlertRepository{db: db}
+}
+
+func (r *AlertRepository) Create(alert *models.PricingAlert) error {
+	return r.db.Create(alert).Error
+}
+
+func (r *AlertRepository) GetByID(id uint) (*models.PricingAlert, error) {
+	var alert models.PricingAlert
+	err := r.db.First(&alert, id).Error
+	if err != nil {
+		return nil, err
+	}
+	return &alert, nil
+}
+
+func (r *AlertRepository) Update(alert *models.PricingAlert) error {
+	return r.db.Save(alert).Error
+}
+
+type AlertFilter struct {
+	Status   models.AlertStatus
+	Severity models.AlertSeverity
+	Type     models.AlertType
+	LotName  string
+}
+
+func (r *AlertRepository) List(filter AlertFilter, offset, limit int) ([]models.PricingAlert, int64, error) {
+	var alerts []models.PricingAlert
+	var total int64
+
+	query := r.db.Model(&models.PricingAlert{})
+
+	if filter.Status != "" {
+		query = query.Where("status = ?", filter.Status)
+	}
+	if filter.Severity != "" {
+		query = query.Where("severity = ?", filter.Severity)
+	}
+	if filter.Type != "" {
+		query = query.Where("alert_type = ?", filter.Type)
+	}
+	if filter.LotName != "" {
+		query = query.Where("lot_name = ?", filter.LotName)
+	}
+
+	query.Count(&total)
+
+	err := query.
+		Order("FIELD(severity, 'critical', 'high', 'medium', 'low')").
+		Order("created_at DESC").
+		Offset(offset).
+		Limit(limit).
+		Find(&alerts).Error
+
+	return alerts, total, err
+}
+
+func (r *AlertRepository) CountByStatus(status models.AlertStatus) (int64, error) {
+	var count int64
+	err := r.db.Model(&models.PricingAlert{}).
+		Where("status = ?", status).
+		Count(&count).Error
+	return count, err
+}
+
+func (r *AlertRepository) UpdateStatus(id uint, status models.AlertStatus) error {
+	return r.db.Model(&models.PricingAlert{}).
+		Where("id = ?", id).
+		Update("status", status).Error
+}
+
+func (r *AlertRepository) ExistsByLotAndType(lotName string, alertType models.AlertType) (bool, error) {
+	var count int64
+	err := r.db.Model(&models.PricingAlert{}).
+		Where("lot_name = ? AND alert_type = ? AND status IN ('new', 'acknowledged')", lotName, alertType).
+		Count(&count).Error
+	return count > 0, err
+}

internal/repository/component.go

@@ -63,6 +63,11 @@ func (r *ComponentRepository) List(filter ComponentFilter, offset, limit int) ([
 			Order("current_price " + sortDir)
 	case "lot_name":
 		query = query.Order("lot_name " + sortDir)
+	case "quote_count":
+		// Sort by quote count from lot_log table
+		query = query.
+			Select("qt_lot_metadata.*, (SELECT COUNT(*) FROM lot_log WHERE lot_log.lot = qt_lot_metadata.lot_name) as quote_count_sort").
+			Order("quote_count_sort " + sortDir)
 	default:
 		// Default: sort by popularity, no price goes last
 		query = query.

internal/repository/partnumber_book.go

@@ -3,7 +3,6 @@ package repository
 import (
 	"git.mchus.pro/mchus/quoteforge/internal/localdb"
 	"gorm.io/gorm"
-	"gorm.io/gorm/clause"
 )
 
 // PartnumberBookRepository provides read-only access to local partnumber book snapshots.
@@ -27,48 +26,15 @@ func (r *PartnumberBookRepository) GetActiveBook() (*localdb.LocalPartnumberBook
 
 // GetBookItems returns all items for the given local book ID.
 func (r *PartnumberBookRepository) GetBookItems(bookID uint) ([]localdb.LocalPartnumberBookItem, error) {
-	book, err := r.getBook(bookID)
-	if err != nil {
-		return nil, err
-	}
-	items, _, err := r.listCatalogItems(book.PartnumbersJSON, "", 0, 0)
+	var items []localdb.LocalPartnumberBookItem
+	err := r.db.Where("book_id = ?", bookID).Find(&items).Error
 	return items, err
 }
 
-// GetBookItemsPage returns items for the given local book ID with optional search and pagination.
-func (r *PartnumberBookRepository) GetBookItemsPage(bookID uint, search string, page, perPage int) ([]localdb.LocalPartnumberBookItem, int64, error) {
-	if page < 1 {
-		page = 1
-	}
-	if perPage < 1 {
-		perPage = 100
-	}
-
-	book, err := r.getBook(bookID)
-	if err != nil {
-		return nil, 0, err
-	}
-	return r.listCatalogItems(book.PartnumbersJSON, search, page, perPage)
-}
-
 // FindLotByPartnumber looks up a partnumber in the active book and returns the matching items.
 func (r *PartnumberBookRepository) FindLotByPartnumber(bookID uint, partnumber string) ([]localdb.LocalPartnumberBookItem, error) {
-	book, err := r.getBook(bookID)
-	if err != nil {
-		return nil, err
-	}
-	found := false
-	for _, pn := range book.PartnumbersJSON {
-		if pn == partnumber {
-			found = true
-			break
-		}
-	}
-	if !found {
-		return nil, nil
-	}
 	var items []localdb.LocalPartnumberBookItem
-	err = r.db.Where("partnumber = ?", partnumber).Find(&items).Error
+	err := r.db.Where("book_id = ? AND partnumber = ?", bookID, partnumber).Find(&items).Error
 	return items, err
 }
 
@@ -84,91 +50,17 @@ func (r *PartnumberBookRepository) SaveBook(book *localdb.LocalPartnumberBook) e
 	return r.db.Save(book).Error
 }
 
-// SaveBookItems upserts canonical PN catalog rows.
+// SaveBookItems bulk-inserts items for a book snapshot.
 func (r *PartnumberBookRepository) SaveBookItems(items []localdb.LocalPartnumberBookItem) error {
 	if len(items) == 0 {
 		return nil
 	}
-	return r.db.Clauses(clause.OnConflict{
-		Columns: []clause.Column{{Name: "partnumber"}},
-		DoUpdates: clause.AssignmentColumns([]string{
-			"lots_json",
-			"description",
-		}),
-	}).CreateInBatches(items, 500).Error
+	return r.db.CreateInBatches(items, 500).Error
 }
 
 // CountBookItems returns the number of items for a given local book ID.
 func (r *PartnumberBookRepository) CountBookItems(bookID uint) int64 {
-	book, err := r.getBook(bookID)
-	if err != nil {
-		return 0
-	}
-	return int64(len(book.PartnumbersJSON))
-}
-
-func (r *PartnumberBookRepository) CountDistinctLots(bookID uint) int64 {
-	items, err := r.GetBookItems(bookID)
-	if err != nil {
-		return 0
-	}
-	seen := make(map[string]struct{})
-	for _, item := range items {
-		for _, lot := range item.LotsJSON {
-			if lot.LotName == "" {
-				continue
-			}
-			seen[lot.LotName] = struct{}{}
-		}
-	}
-	return int64(len(seen))
-}
-
-func (r *PartnumberBookRepository) HasAllBookItems(bookID uint) bool {
-	book, err := r.getBook(bookID)
-	if err != nil {
-		return false
-	}
-	if len(book.PartnumbersJSON) == 0 {
-		return true
-	}
 	var count int64
-	if err := r.db.Model(&localdb.LocalPartnumberBookItem{}).
-		Where("partnumber IN ?", []string(book.PartnumbersJSON)).
-		Count(&count).Error; err != nil {
-		return false
-	}
-	return count == int64(len(book.PartnumbersJSON))
-}
-
-func (r *PartnumberBookRepository) getBook(bookID uint) (*localdb.LocalPartnumberBook, error) {
-	var book localdb.LocalPartnumberBook
-	if err := r.db.First(&book, bookID).Error; err != nil {
-		return nil, err
-	}
-	return &book, nil
-}
-
-func (r *PartnumberBookRepository) listCatalogItems(partnumbers localdb.LocalStringList, search string, page, perPage int) ([]localdb.LocalPartnumberBookItem, int64, error) {
-	if len(partnumbers) == 0 {
-		return []localdb.LocalPartnumberBookItem{}, 0, nil
-	}
-
-	query := r.db.Model(&localdb.LocalPartnumberBookItem{}).Where("partnumber IN ?", []string(partnumbers))
-	if search != "" {
-		trimmedSearch := "%" + search + "%"
-		query = query.Where("partnumber LIKE ? OR CAST(lots_json AS TEXT) LIKE ? OR description LIKE ?", trimmedSearch, trimmedSearch, trimmedSearch)
-	}
-
-	var total int64
-	if err := query.Count(&total).Error; err != nil {
-		return nil, 0, err
-	}
-
-	var items []localdb.LocalPartnumberBookItem
-	if page > 0 && perPage > 0 {
-		query = query.Offset((page - 1) * perPage).Limit(perPage)
-	}
-	err := query.Order("partnumber ASC, id ASC").Find(&items).Error
-	return items, total, err
+	r.db.Model(&localdb.LocalPartnumberBookItem{}).Where("book_id = ?", bookID).Count(&count)
+	return count
 }

internal/repository/price.go

@@ -0,0 +1,124 @@
+package repository
+
+import (
+	"time"
+
+	"git.mchus.pro/mchus/quoteforge/internal/models"
+	"gorm.io/gorm"
+)
+
+type PriceRepository struct {
+	db *gorm.DB
+}
+
+func NewPriceRepository(db *gorm.DB) *PriceRepository {
+	return &PriceRepository{db: db}
+}
+
+type PricePoint struct {
+	Price float64
+	Date  time.Time
+}
+
+// GetPriceHistory returns price history from lot_log for a component
+func (r *PriceRepository) GetPriceHistory(lotName string, periodDays int) ([]PricePoint, error) {
+	var points []PricePoint
+	since := time.Now().AddDate(0, 0, -periodDays)
+
+	err := r.db.Model(&models.LotLog{}).
+		Select("price, date").
+		Where("lot = ? AND date >= ?", lotName, since).
+		Order("date DESC").
+		Scan(&points).Error
+
+	return points, err
+}
+
+// GetLatestPrice returns the most recent price for a component
+func (r *PriceRepository) GetLatestPrice(lotName string) (*PricePoint, error) {
+	var point PricePoint
+	err := r.db.Model(&models.LotLog{}).
+		Select("price, date").
+		Where("lot = ?", lotName).
+		Order("date DESC").
+		First(&point).Error
+	if err != nil {
+		return nil, err
+	}
+	return &point, nil
+}
+
+// GetPriceOverride returns active override for a component
+func (r *PriceRepository) GetPriceOverride(lotName string) (*models.PriceOverride, error) {
+	var override models.PriceOverride
+	today := time.Now().Truncate(24 * time.Hour)
+
+	err := r.db.
+		Where("lot_name = ?", lotName).
+		Where("valid_from <= ?", today).
+		Where("valid_until IS NULL OR valid_until >= ?", today).
+		Order("valid_from DESC").
+		First(&override).Error
+
+	if err != nil {
+		return nil, err
+	}
+	return &override, nil
+}
+
+// CreatePriceOverride creates a new price override
+func (r *PriceRepository) CreatePriceOverride(override *models.PriceOverride) error {
+	return r.db.Create(override).Error
+}
+
+// GetPriceOverrides returns all overrides for a component
+func (r *PriceRepository) GetPriceOverrides(lotName string) ([]models.PriceOverride, error) {
+	var overrides []models.PriceOverride
+	err := r.db.
+		Where("lot_name = ?", lotName).
+		Order("valid_from DESC").
+		Find(&overrides).Error
+	return overrides, err
+}
+
+// DeletePriceOverride deletes an override
+func (r *PriceRepository) DeletePriceOverride(id uint) error {
+	return r.db.Delete(&models.PriceOverride{}, id).Error
+}
+
+// GetQuoteCount returns the number of quotes in lot_log for a period
+func (r *PriceRepository) GetQuoteCount(lotName string, periodDays int) (int64, error) {
+	var count int64
+	since := time.Now().AddDate(0, 0, -periodDays)
+
+	err := r.db.Model(&models.LotLog{}).
+		Where("lot = ? AND date >= ?", lotName, since).
+		Count(&count).Error
+
+	return count, err
+}
+
+// GetQuoteCounts returns quote counts for multiple lot names
+func (r *PriceRepository) GetQuoteCounts(lotNames []string) (map[string]int64, error) {
+	type Result struct {
+		Lot   string
+		Count int64
+	}
+	var results []Result
+
+	err := r.db.Model(&models.LotLog{}).
+		Select("lot, COUNT(*) as count").
+		Where("lot IN ?", lotNames).
+		Group("lot").
+		Scan(&results).Error
+
+	if err != nil {
+		return nil, err
+	}
+
+	counts := make(map[string]int64)
+	for _, r := range results {
+		counts[r.Lot] = r.Count
+	}
+	return counts, nil
+}

internal/repository/pricelist.go

@@ -3,10 +3,13 @@ package repository
 import (
 	"errors"
 	"fmt"
+	"log/slog"
+	"sort"
 	"strconv"
 	"strings"
 	"time"
 
+	"git.mchus.pro/mchus/quoteforge/internal/lotmatch"
 	"git.mchus.pro/mchus/quoteforge/internal/models"
 	"gorm.io/gorm"
 )
@@ -243,9 +246,94 @@ func (r *PricelistRepository) GetItems(pricelistID uint, offset, limit int, sear
 		items[i].Category = strings.TrimSpace(items[i].LotCategory)
 	}
 
+	// Stock/partnumber enrichment is optional for pricelist item listing.
+	// Return base pricelist rows (lot_name/price/category) even when DB user lacks
+	// access to stock mapping tables (e.g. lot_partnumbers, stock_log).
+	if err := r.enrichItemsWithStock(items); err != nil {
+		slog.Warn("pricelist items stock enrichment skipped", "pricelist_id", pricelistID, "error", err)
+	}
+
 	return items, total, nil
 }
 
+func (r *PricelistRepository) enrichItemsWithStock(items []models.PricelistItem) error {
+	if len(items) == 0 {
+		return nil
+	}
+
+	resolver, err := lotmatch.NewLotResolverFromDB(r.db)
+	if err != nil {
+		return err
+	}
+
+	type stockRow struct {
+		Partnumber string   `gorm:"column:partnumber"`
+		Qty        *float64 `gorm:"column:qty"`
+	}
+	rows := make([]stockRow, 0)
+	if err := r.db.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 i := range rows {
+		row := rows[i]
+		if strings.TrimSpace(row.Partnumber) == "" {
+			continue
+		}
+		lotName, _, resolveErr := resolver.Resolve(row.Partnumber)
+		if resolveErr != nil || strings.TrimSpace(lotName) == "" {
+			continue
+		}
+
+		if row.Qty != nil {
+			lotTotals[lotName] += *row.Qty
+		}
+
+		pn := strings.TrimSpace(row.Partnumber)
+		if pn == "" {
+			continue
+		}
+		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 := 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 = partnumbers
+		}
+	}
+
+	return nil
+}
+
 // GetLotNames returns distinct lot names from pricelist items.
 func (r *PricelistRepository) GetLotNames(pricelistID uint) ([]string, error) {
 	var lotNames []string

internal/repository/pricelist_test.go

@@ -75,6 +75,57 @@ func TestGenerateVersion_IsolatedBySource(t *testing.T) {
 	}
 }
 
+func TestGetItems_WarehouseAvailableQtyUsesPrefixResolver(t *testing.T) {
+	repo := newTestPricelistRepository(t)
+	db := repo.db
+
+	warehouse := models.Pricelist{
+		Source:    string(models.PricelistSourceWarehouse),
+		Version:   "S-2026-02-07-001",
+		CreatedBy: "test",
+		IsActive:  true,
+	}
+	if err := db.Create(&warehouse).Error; err != nil {
+		t.Fatalf("create pricelist: %v", err)
+	}
+	if err := db.Create(&models.PricelistItem{
+		PricelistID: warehouse.ID,
+		LotName:     "SSD_NVME_03.2T",
+		Price:       100,
+	}).Error; err != nil {
+		t.Fatalf("create pricelist item: %v", err)
+	}
+	if err := db.Create(&models.Lot{LotName: "SSD_NVME_03.2T"}).Error; err != nil {
+		t.Fatalf("create lot: %v", err)
+	}
+	qty := 5.0
+	if err := db.Create(&models.StockLog{
+		Partnumber: "SSD_NVME_03.2T_GEN3_P4610",
+		Date:       time.Now(),
+		Price:      200,
+		Qty:        &qty,
+	}).Error; err != nil {
+		t.Fatalf("create stock log: %v", err)
+	}
+
+	items, total, err := repo.GetItems(warehouse.ID, 0, 20, "")
+	if err != nil {
+		t.Fatalf("GetItems: %v", err)
+	}
+	if total != 1 {
+		t.Fatalf("expected total=1, got %d", total)
+	}
+	if len(items) != 1 {
+		t.Fatalf("expected 1 item, got %d", len(items))
+	}
+	if items[0].AvailableQty == nil {
+		t.Fatalf("expected available qty to be set")
+	}
+	if *items[0].AvailableQty != 5 {
+		t.Fatalf("expected available qty=5, got %v", *items[0].AvailableQty)
+	}
+}
+
 func TestGetLatestActiveBySource_SkipsPricelistsWithoutItems(t *testing.T) {
 	repo := newTestPricelistRepository(t)
 	db := repo.db
@@ -177,7 +228,7 @@ func newTestPricelistRepository(t *testing.T) *PricelistRepository {
 	if err != nil {
 		t.Fatalf("open sqlite: %v", err)
 	}
-	if err := db.AutoMigrate(&models.Pricelist{}, &models.PricelistItem{}, &models.Lot{}); err != nil {
+	if err := db.AutoMigrate(&models.Pricelist{}, &models.PricelistItem{}, &models.Lot{}, &models.LotPartnumber{}, &models.StockLog{}); err != nil {
 		t.Fatalf("migrate: %v", err)
 	}
 	return NewPricelistRepository(db)

internal/repository/stats.go

@@ -0,0 +1,115 @@
+package repository
+
+import (
+	"time"
+
+	"git.mchus.pro/mchus/quoteforge/internal/models"
+	"gorm.io/gorm"
+)
+
+type StatsRepository struct {
+	db *gorm.DB
+}
+
+func NewStatsRepository(db *gorm.DB) *StatsRepository {
+	return &StatsRepository{db: db}
+}
+
+func (r *StatsRepository) GetByLotName(lotName string) (*models.ComponentUsageStats, error) {
+	var stats models.ComponentUsageStats
+	err := r.db.Where("lot_name = ?", lotName).First(&stats).Error
+	if err != nil {
+		return nil, err
+	}
+	return &stats, nil
+}
+
+func (r *StatsRepository) Upsert(stats *models.ComponentUsageStats) error {
+	return r.db.Save(stats).Error
+}
+
+func (r *StatsRepository) IncrementUsage(lotName string, quantity int, revenue float64) error {
+	now := time.Now()
+
+	result := r.db.Model(&models.ComponentUsageStats{}).
+		Where("lot_name = ?", lotName).
+		Updates(map[string]interface{}{
+			"quotes_total":    gorm.Expr("quotes_total + 1"),
+			"quotes_last_30d": gorm.Expr("quotes_last_30d + 1"),
+			"quotes_last_7d":  gorm.Expr("quotes_last_7d + 1"),
+			"total_quantity":  gorm.Expr("total_quantity + ?", quantity),
+			"total_revenue":   gorm.Expr("total_revenue + ?", revenue),
+			"last_used_at":    now,
+		})
+
+	if result.RowsAffected == 0 {
+		stats := &models.ComponentUsageStats{
+			LotName:       lotName,
+			QuotesTotal:   1,
+			QuotesLast30d: 1,
+			QuotesLast7d:  1,
+			TotalQuantity: quantity,
+			TotalRevenue:  revenue,
+			LastUsedAt:    &now,
+		}
+		return r.db.Create(stats).Error
+	}
+
+	return result.Error
+}
+
+func (r *StatsRepository) GetTopComponents(limit int) ([]models.ComponentUsageStats, error) {
+	var stats []models.ComponentUsageStats
+	err := r.db.
+		Order("quotes_last_30d DESC").
+		Limit(limit).
+		Find(&stats).Error
+	return stats, err
+}
+
+func (r *StatsRepository) GetTrendingComponents(limit int) ([]models.ComponentUsageStats, error) {
+	var stats []models.ComponentUsageStats
+	err := r.db.
+		Where("trend_direction = ? AND trend_percent > ?", models.TrendUp, 20).
+		Order("trend_percent DESC").
+		Limit(limit).
+		Find(&stats).Error
+	return stats, err
+}
+
+// ResetWeeklyCounters resets quotes_last_7d (run weekly via cron)
+func (r *StatsRepository) ResetWeeklyCounters() error {
+	return r.db.Model(&models.ComponentUsageStats{}).
+		Where("1 = 1").
+		Update("quotes_last_7d", 0).Error
+}
+
+// ResetMonthlyCounters resets quotes_last_30d (run monthly via cron)
+func (r *StatsRepository) ResetMonthlyCounters() error {
+	return r.db.Model(&models.ComponentUsageStats{}).
+		Where("1 = 1").
+		Update("quotes_last_30d", 0).Error
+}
+
+// UpdatePopularityScores recalculates popularity_score in qt_lot_metadata
+// based on supplier quotes from lot_log table
+func (r *StatsRepository) UpdatePopularityScores() error {
+	// Formula: popularity_score = quotes_last_30d * 3 + quotes_last_90d * 1 + quotes_total * 0.1
+	// This gives more weight to recent supplier activity
+	return r.db.Exec(`
+		UPDATE qt_lot_metadata m
+		LEFT JOIN (
+			SELECT
+				lot,
+				COUNT(*) as quotes_total,
+				SUM(CASE WHEN date >= DATE_SUB(NOW(), INTERVAL 30 DAY) THEN 1 ELSE 0 END) as quotes_last_30d,
+				SUM(CASE WHEN date >= DATE_SUB(NOW(), INTERVAL 90 DAY) THEN 1 ELSE 0 END) as quotes_last_90d
+			FROM lot_log
+			GROUP BY lot
+		) s ON m.lot_name = s.lot
+		SET m.popularity_score = COALESCE(
+			s.quotes_last_30d * 3 + s.quotes_last_90d * 1 + s.quotes_total * 0.1,
+			0
+		)
+	`).Error
+}

internal/repository/user.go

@@ -0,0 +1,62 @@
+package repository
+
+import (
+	"git.mchus.pro/mchus/quoteforge/internal/models"
+	"gorm.io/gorm"
+)
+
+type UserRepository struct {
+	db *gorm.DB
+}
+
+func NewUserRepository(db *gorm.DB) *UserRepository {
+	return &UserRepository{db: db}
+}
+
+func (r *UserRepository) Create(user *models.User) error {
+	return r.db.Create(user).Error
+}
+
+func (r *UserRepository) GetByID(id uint) (*models.User, error) {
+	var user models.User
+	err := r.db.First(&user, id).Error
+	if err != nil {
+		return nil, err
+	}
+	return &user, nil
+}
+
+func (r *UserRepository) GetByUsername(username string) (*models.User, error) {
+	var user models.User
+	err := r.db.Where("username = ?", username).First(&user).Error
+	if err != nil {
+		return nil, err
+	}
+	return &user, nil
+}
+
+func (r *UserRepository) GetByEmail(email string) (*models.User, error) {
+	var user models.User
+	err := r.db.Where("email = ?", email).First(&user).Error
+	if err != nil {
+		return nil, err
+	}
+	return &user, nil
+}
+
+func (r *UserRepository) Update(user *models.User) error {
+	return r.db.Save(user).Error
+}
+
+func (r *UserRepository) Delete(id uint) error {
+	return r.db.Delete(&models.User{}, id).Error
+}
+
+func (r *UserRepository) List(offset, limit int) ([]models.User, int64, error) {
+	var users []models.User
+	var total int64
+
+	r.db.Model(&models.User{}).Count(&total)
+	err := r.db.Offset(offset).Limit(limit).Find(&users).Error
+	return users, total, err
+}

internal/services/auth.go

@@ -0,0 +1,180 @@
+package services
+
+import (
+	"errors"
+	"time"
+
+	"github.com/golang-jwt/jwt/v5"
+	"git.mchus.pro/mchus/quoteforge/internal/config"
+	"git.mchus.pro/mchus/quoteforge/internal/models"
+	"git.mchus.pro/mchus/quoteforge/internal/repository"
+	"golang.org/x/crypto/bcrypt"
+)
+
+var (
+	ErrInvalidCredentials = errors.New("invalid username or password")
+	ErrUserNotFound       = errors.New("user not found")
+	ErrUserInactive       = errors.New("user account is inactive")
+	ErrInvalidToken       = errors.New("invalid token")
+	ErrTokenExpired       = errors.New("token expired")
+)
+
+type AuthService struct {
+	userRepo *repository.UserRepository
+	config   config.AuthConfig
+}
+
+func NewAuthService(userRepo *repository.UserRepository, cfg config.AuthConfig) *AuthService {
+	return &AuthService{
+		userRepo: userRepo,
+		config:   cfg,
+	}
+}
+
+type TokenPair struct {
+	AccessToken  string `json:"access_token"`
+	RefreshToken string `json:"refresh_token"`
+	ExpiresAt    int64  `json:"expires_at"`
+}
+
+type Claims struct {
+	UserID   uint            `json:"user_id"`
+	Username string          `json:"username"`
+	Role     models.UserRole `json:"role"`
+	jwt.RegisteredClaims
+}
+
+func (s *AuthService) Login(username, password string) (*TokenPair, *models.User, error) {
+	user, err := s.userRepo.GetByUsername(username)
+	if err != nil {
+		return nil, nil, ErrInvalidCredentials
+	}
+
+	if !user.IsActive {
+		return nil, nil, ErrUserInactive
+	}
+
+	if err := bcrypt.CompareHashAndPassword([]byte(user.PasswordHash), []byte(password)); err != nil {
+		return nil, nil, ErrInvalidCredentials
+	}
+
+	tokens, err := s.generateTokenPair(user)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	return tokens, user, nil
+}
+
+func (s *AuthService) RefreshTokens(refreshToken string) (*TokenPair, error) {
+	claims, err := s.ValidateToken(refreshToken)
+	if err != nil {
+		return nil, err
+	}
+
+	user, err := s.userRepo.GetByID(claims.UserID)
+	if err != nil {
+		return nil, ErrUserNotFound
+	}
+
+	if !user.IsActive {
+		return nil, ErrUserInactive
+	}
+
+	return s.generateTokenPair(user)
+}
+
+func (s *AuthService) ValidateToken(tokenString string) (*Claims, error) {
+	token, err := jwt.ParseWithClaims(tokenString, &Claims{}, func(token *jwt.Token) (interface{}, error) {
+		return []byte(s.config.JWTSecret), nil
+	})
+
+	if err != nil {
+		if errors.Is(err, jwt.ErrTokenExpired) {
+			return nil, ErrTokenExpired
+		}
+		return nil, ErrInvalidToken
+	}
+
+	claims, ok := token.Claims.(*Claims)
+	if !ok || !token.Valid {
+		return nil, ErrInvalidToken
+	}
+
+	return claims, nil
+}
+
+func (s *AuthService) generateTokenPair(user *models.User) (*TokenPair, error) {
+	now := time.Now()
+	accessExpiry := now.Add(s.config.TokenExpiry)
+	refreshExpiry := now.Add(s.config.RefreshExpiry)
+
+	accessClaims := &Claims{
+		UserID:   user.ID,
+		Username: user.Username,
+		Role:     user.Role,
+		RegisteredClaims: jwt.RegisteredClaims{
+			ExpiresAt: jwt.NewNumericDate(accessExpiry),
+			IssuedAt:  jwt.NewNumericDate(now),
+			Subject:   user.Username,
+		},
+	}
+
+	accessToken := jwt.NewWithClaims(jwt.SigningMethodHS256, accessClaims)
+	accessTokenString, err := accessToken.SignedString([]byte(s.config.JWTSecret))
+	if err != nil {
+		return nil, err
+	}
+
+	refreshClaims := &Claims{
+		UserID:   user.ID,
+		Username: user.Username,
+		Role:     user.Role,
+		RegisteredClaims: jwt.RegisteredClaims{
+			ExpiresAt: jwt.NewNumericDate(refreshExpiry),
+			IssuedAt:  jwt.NewNumericDate(now),
+			Subject:   user.Username,
+		},
+	}
+
+	refreshToken := jwt.NewWithClaims(jwt.SigningMethodHS256, refreshClaims)
+	refreshTokenString, err := refreshToken.SignedString([]byte(s.config.JWTSecret))
+	if err != nil {
+		return nil, err
+	}
+
+	return &TokenPair{
+		AccessToken:  accessTokenString,
+		RefreshToken: refreshTokenString,
+		ExpiresAt:    accessExpiry.Unix(),
+	}, nil
+}
+
+func (s *AuthService) HashPassword(password string) (string, error) {
+	hash, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
+	if err != nil {
+		return "", err
+	}
+	return string(hash), nil
+}
+
+func (s *AuthService) CreateUser(username, email, password string, role models.UserRole) (*models.User, error) {
+	hash, err := s.HashPassword(password)
+	if err != nil {
+		return nil, err
+	}
+
+	user := &models.User{
+		Username:     username,
+		Email:        email,
+		PasswordHash: hash,
+		Role:         role,
+		IsActive:     true,
+	}
+
+	if err := s.userRepo.Create(user); err != nil {
+		return nil, err
+	}
+
+	return user, nil
+}

internal/services/component.go

@@ -2,7 +2,6 @@ package services
 
 import (
 	"fmt"
-	"log/slog"
 	"strings"
 
 	"git.mchus.pro/mchus/quoteforge/internal/models"
@@ -12,15 +11,18 @@ import (
 type ComponentService struct {
 	componentRepo *repository.ComponentRepository
 	categoryRepo  *repository.CategoryRepository
+	statsRepo     *repository.StatsRepository
 }
 
 func NewComponentService(
 	componentRepo *repository.ComponentRepository,
 	categoryRepo *repository.CategoryRepository,
+	statsRepo *repository.StatsRepository,
 ) *ComponentService {
 	return &ComponentService{
 		componentRepo: componentRepo,
 		categoryRepo:  categoryRepo,
+		statsRepo:     statsRepo,
 	}
 }
 
@@ -39,11 +41,10 @@ func ParsePartNumber(lotName string) (category, model string) {
 }
 
 type ComponentListResult struct {
-	Items      []ComponentView `json:"items"`
-	TotalCount int64           `json:"total_count"`
+	Components []ComponentView `json:"components"`
+	Total      int64           `json:"total"`
 	Page       int             `json:"page"`
 	PerPage    int             `json:"per_page"`
-	TotalPages int             `json:"total_pages"`
 }
 
 type ComponentView struct {
@@ -62,11 +63,10 @@ func (s *ComponentService) List(filter repository.ComponentFilter, page, perPage
 	// Components should be loaded via /api/sync/components first
 	if s.componentRepo == nil {
 		return &ComponentListResult{
-			Items:      []ComponentView{},
-			TotalCount: 0,
+			Components: []ComponentView{},
+			Total:      0,
 			Page:       page,
 			PerPage:    perPage,
-			TotalPages: 1,
 		}, nil
 	}
 
@@ -107,16 +107,11 @@ func (s *ComponentService) List(filter repository.ComponentFilter, page, perPage
 		views[i] = view
 	}
 
-	totalPages := int((total + int64(perPage) - 1) / int64(perPage))
-	if totalPages < 1 {
-		totalPages = 1
-	}
 	return &ComponentListResult{
-		Items:      views,
-		TotalCount: total,
+		Components: views,
+		Total:      total,
 		Page:       page,
 		PerPage:    perPage,
-		TotalPages: totalPages,
 	}, nil
 }
 
@@ -131,10 +126,8 @@ func (s *ComponentService) GetByLotName(lotName string) (*ComponentView, error)
 		return nil, err
 	}
 
-	// Track usage (best-effort)
-	if err := s.componentRepo.IncrementRequestCount(lotName); err != nil {
-		slog.Warn("component: could not increment request count", "lot", lotName, "err", err)
-	}
+	// Track usage
+	_ = s.componentRepo.IncrementRequestCount(lotName)
 
 	view := &ComponentView{
 		LotName:         c.LotName,

internal/services/configuration.go

@@ -18,7 +18,6 @@ var (
 // Used by handlers to work with both ConfigurationService and LocalConfigurationService
 type ConfigurationGetter interface {
 	GetByUUID(uuid string, ownerUsername string) (*models.Configuration, error)
-	GetByUUIDNoAuth(uuid string) (*models.Configuration, error)
 }
 
 type ConfigurationService struct {
@@ -46,22 +45,18 @@ func NewConfigurationService(
 }
 
 type CreateConfigRequest struct {
-	Name                  string             `json:"name"`
-	Items                 models.ConfigItems `json:"items"`
-	ProjectUUID           *string            `json:"project_uuid,omitempty"`
-	CustomPrice           *float64           `json:"custom_price"`
-	Notes                 string             `json:"notes"`
-	IsTemplate            bool               `json:"is_template"`
-	ServerCount           int                `json:"server_count"`
-	ServerModel           string             `json:"server_model,omitempty"`
-	SupportCode           string             `json:"support_code,omitempty"`
-	Article               string             `json:"article,omitempty"`
-	PricelistID           *uint              `json:"pricelist_id,omitempty"`
-	WarehousePricelistID  *uint              `json:"warehouse_pricelist_id,omitempty"`
-	CompetitorPricelistID *uint              `json:"competitor_pricelist_id,omitempty"`
-	ConfigType            string             `json:"config_type,omitempty"` // "server" | "storage"
-	DisablePriceRefresh   bool               `json:"disable_price_refresh"`
-	OnlyInStock           bool               `json:"only_in_stock"`
+	Name        string             `json:"name"`
+	Items       models.ConfigItems `json:"items"`
+	ProjectUUID *string            `json:"project_uuid,omitempty"`
+	CustomPrice *float64           `json:"custom_price"`
+	Notes       string             `json:"notes"`
+	IsTemplate  bool               `json:"is_template"`
+	ServerCount int                `json:"server_count"`
+	ServerModel string             `json:"server_model,omitempty"`
+	SupportCode string             `json:"support_code,omitempty"`
+	Article     string             `json:"article,omitempty"`
+	PricelistID *uint              `json:"pricelist_id,omitempty"`
+	OnlyInStock bool               `json:"only_in_stock"`
 }
 
 type ArticlePreviewRequest struct {
@@ -89,34 +84,30 @@ func (s *ConfigurationService) Create(ownerUsername string, req *CreateConfigReq
 	}
 
 	config := &models.Configuration{
-		UUID:                  uuid.New().String(),
-		OwnerUsername:         ownerUsername,
-		ProjectUUID:           projectUUID,
-		Name:                  req.Name,
-		Items:                 req.Items,
-		TotalPrice:            &total,
-		CustomPrice:           req.CustomPrice,
-		Notes:                 req.Notes,
-		IsTemplate:            req.IsTemplate,
-		ServerCount:           req.ServerCount,
-		ServerModel:           req.ServerModel,
-		SupportCode:           req.SupportCode,
-		Article:               req.Article,
-		PricelistID:           pricelistID,
-		WarehousePricelistID:  req.WarehousePricelistID,
-		CompetitorPricelistID: req.CompetitorPricelistID,
-		ConfigType:            req.ConfigType,
-		DisablePriceRefresh:   req.DisablePriceRefresh,
-		OnlyInStock:           req.OnlyInStock,
-	}
-	if config.ConfigType == "" {
-		config.ConfigType = "server"
+		UUID:          uuid.New().String(),
+		OwnerUsername: ownerUsername,
+		ProjectUUID:   projectUUID,
+		Name:          req.Name,
+		Items:         req.Items,
+		TotalPrice:    &total,
+		CustomPrice:   req.CustomPrice,
+		Notes:         req.Notes,
+		IsTemplate:    req.IsTemplate,
+		ServerCount:   req.ServerCount,
+		ServerModel:   req.ServerModel,
+		SupportCode:   req.SupportCode,
+		Article:       req.Article,
+		PricelistID:   pricelistID,
+		OnlyInStock:   req.OnlyInStock,
 	}
 
 	if err := s.configRepo.Create(config); err != nil {
 		return nil, err
 	}
 
+	// Record usage stats
+	_ = s.quoteService.RecordUsage(req.Items)
+
 	return config, nil
 }
 
@@ -172,9 +163,6 @@ func (s *ConfigurationService) Update(uuid string, ownerUsername string, req *Cr
 	config.SupportCode = req.SupportCode
 	config.Article = req.Article
 	config.PricelistID = pricelistID
-	config.WarehousePricelistID = req.WarehousePricelistID
-	config.CompetitorPricelistID = req.CompetitorPricelistID
-	config.DisablePriceRefresh = req.DisablePriceRefresh
 	config.OnlyInStock = req.OnlyInStock
 
 	if err := s.configRepo.Update(config); err != nil {
@@ -242,24 +230,18 @@ func (s *ConfigurationService) CloneToProject(configUUID string, ownerUsername s
 	}
 
 	clone := &models.Configuration{
-		UUID:                  uuid.New().String(),
-		OwnerUsername:         ownerUsername,
-		ProjectUUID:           resolvedProjectUUID,
-		Name:                  newName,
-		Items:                 original.Items,
-		TotalPrice:            &total,
-		CustomPrice:           original.CustomPrice,
-		Notes:                 original.Notes,
-		IsTemplate:            false, // Clone is never a template
-		ServerCount:           original.ServerCount,
-		ServerModel:           original.ServerModel,
-		SupportCode:           original.SupportCode,
-		Article:               original.Article,
-		PricelistID:           original.PricelistID,
-		WarehousePricelistID:  original.WarehousePricelistID,
-		CompetitorPricelistID: original.CompetitorPricelistID,
-		DisablePriceRefresh:   original.DisablePriceRefresh,
-		OnlyInStock:           original.OnlyInStock,
+		UUID:          uuid.New().String(),
+		OwnerUsername: ownerUsername,
+		ProjectUUID:   resolvedProjectUUID,
+		Name:          newName,
+		Items:         original.Items,
+		TotalPrice:    &total,
+		CustomPrice:   original.CustomPrice,
+		Notes:         original.Notes,
+		IsTemplate:    false, // Clone is never a template
+		ServerCount:   original.ServerCount,
+		PricelistID:   original.PricelistID,
+		OnlyInStock:   original.OnlyInStock,
 	}
 
 	if err := s.configRepo.Create(clone); err != nil {
@@ -332,13 +314,7 @@ func (s *ConfigurationService) UpdateNoAuth(uuid string, req *CreateConfigReques
 	config.Notes = req.Notes
 	config.IsTemplate = req.IsTemplate
 	config.ServerCount = req.ServerCount
-	config.ServerModel = req.ServerModel
-	config.SupportCode = req.SupportCode
-	config.Article = req.Article
 	config.PricelistID = pricelistID
-	config.WarehousePricelistID = req.WarehousePricelistID
-	config.CompetitorPricelistID = req.CompetitorPricelistID
-	config.DisablePriceRefresh = req.DisablePriceRefresh
 	config.OnlyInStock = req.OnlyInStock
 
 	if err := s.configRepo.Update(config); err != nil {
@@ -611,7 +587,13 @@ func (s *ConfigurationService) isOwner(config *models.Configuration, ownerUserna
 	if config == nil || ownerUsername == "" {
 		return false
 	}
-	return config.OwnerUsername == ownerUsername
+	if config.OwnerUsername != "" {
+		return config.OwnerUsername == ownerUsername
+	}
+	if config.User != nil {
+		return config.User.Username == ownerUsername
+	}
+	return false
 }
 
 // // Export configuration as JSON

internal/services/export.go

@@ -13,17 +13,20 @@ import (
 	"git.mchus.pro/mchus/quoteforge/internal/config"
 	"git.mchus.pro/mchus/quoteforge/internal/localdb"
 	"git.mchus.pro/mchus/quoteforge/internal/models"
+	"git.mchus.pro/mchus/quoteforge/internal/repository"
 )
 
 type ExportService struct {
-	config  config.ExportConfig
-	localDB *localdb.LocalDB
+	config       config.ExportConfig
+	categoryRepo *repository.CategoryRepository
+	localDB      *localdb.LocalDB
 }
 
-func NewExportService(cfg config.ExportConfig, local *localdb.LocalDB) *ExportService {
+func NewExportService(cfg config.ExportConfig, categoryRepo *repository.CategoryRepository, local *localdb.LocalDB) *ExportService {
 	return &ExportService{
-		config:  cfg,
-		localDB: local,
+		config:       cfg,
+		categoryRepo: categoryRepo,
+		localDB:      local,
 	}
 }
 
@@ -52,53 +55,6 @@ type ProjectExportData struct {
 	CreatedAt time.Time
 }
 
-type ProjectPricingExportOptions struct {
-	IncludeLOT        bool     `json:"include_lot"`
-	IncludeBOM        bool     `json:"include_bom"`
-	IncludeEstimate   bool     `json:"include_estimate"`
-	IncludeStock      bool     `json:"include_stock"`
-	IncludeCompetitor bool     `json:"include_competitor"`
-	Basis             string   `json:"basis"`         // "fob" or "ddp"; empty defaults to "fob"
-	SaleMarkup        float64  `json:"sale_markup"`   // DDP multiplier; 0 defaults to 1.3
-	ManualPrice       *float64 `json:"manual_price"`  // user-defined total price; distributed proportionally across rows
-}
-
-func (o ProjectPricingExportOptions) saleMarkupFactor() float64 {
-	if o.SaleMarkup > 0 {
-		return o.SaleMarkup
-	}
-	return 1.3
-}
-
-func (o ProjectPricingExportOptions) isDDP() bool {
-	return strings.EqualFold(strings.TrimSpace(o.Basis), "ddp")
-}
-
-type ProjectPricingExportData struct {
-	Configs   []ProjectPricingExportConfig
-	CreatedAt time.Time
-}
-
-type ProjectPricingExportConfig struct {
-	Name        string
-	Article     string
-	Line        int
-	ServerCount int
-	Rows        []ProjectPricingExportRow
-}
-
-type ProjectPricingExportRow struct {
-	LotDisplay   string
-	VendorPN     string
-	Description  string
-	Quantity     int
-	BOMTotal     *float64
-	Estimate     *float64
-	Stock        *float64
-	Competitor   *float64
-	ManualPrice  *float64 // proportional share of the user-defined total price
-}
-
 // ToCSV writes project export data in the new structured CSV format.
 //
 // Format:
@@ -126,7 +82,16 @@ func (s *ExportService) ToCSV(w io.Writer, data *ProjectExportData) error {
 		return fmt.Errorf("failed to write header: %w", err)
 	}
 
-	categoryOrder := defaultCategoryOrder()
+	// Get category hierarchy for sorting
+	categoryOrder := make(map[string]int)
+	if s.categoryRepo != nil {
+		categories, err := s.categoryRepo.GetAll()
+		if err == nil {
+			for _, cat := range categories {
+				categoryOrder[cat.Code] = cat.DisplayOrder
+			}
+		}
+	}
 
 	for i, block := range data.Configs {
 		lineNo := block.Line
@@ -203,81 +168,6 @@ 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)
-
-	blocks := make([]ProjectPricingExportConfig, 0, len(sortedConfigs))
-	for i := range sortedConfigs {
-		block, err := s.buildPricingExportBlock(&sortedConfigs[i], opts)
-		if err != nil {
-			return nil, err
-		}
-		blocks = append(blocks, block)
-	}
-
-	return &ProjectPricingExportData{
-		Configs:   blocks,
-		CreatedAt: time.Now(),
-	}, nil
-}
-
-func (s *ExportService) ToPricingCSV(w io.Writer, data *ProjectPricingExportData, opts ProjectPricingExportOptions) error {
-	if _, err := w.Write([]byte{0xEF, 0xBB, 0xBF}); err != nil {
-		return fmt.Errorf("failed to write BOM: %w", err)
-	}
-
-	csvWriter := csv.NewWriter(w)
-	csvWriter.Comma = ';'
-	defer csvWriter.Flush()
-
-	headers := pricingCSVHeaders(opts)
-	if err := csvWriter.Write(headers); err != nil {
-		return fmt.Errorf("failed to write pricing header: %w", err)
-	}
-
-	writeRows := opts.IncludeLOT || opts.IncludeBOM
-	for _, cfg := range data.Configs {
-		if err := csvWriter.Write(pricingConfigSummaryRow(cfg, opts)); err != nil {
-			return fmt.Errorf("failed to write config summary row: %w", err)
-		}
-		if writeRows {
-			for _, row := range cfg.Rows {
-				if err := csvWriter.Write(pricingCSVRow(row, opts)); err != nil {
-					return fmt.Errorf("failed to write pricing row: %w", err)
-				}
-			}
-		}
-	}
-
-	csvWriter.Flush()
-	if err := csvWriter.Error(); err != nil {
-		return fmt.Errorf("csv writer error: %w", err)
-	}
-	return nil
-}
-
 // ConfigToExportData converts a single configuration into ProjectExportData.
 func (s *ExportService) ConfigToExportData(cfg *models.Configuration) *ProjectExportData {
 	block := s.buildExportBlock(cfg)
@@ -289,7 +179,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 {
@@ -301,18 +210,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))
@@ -350,173 +247,6 @@ func (s *ExportService) buildExportBlock(cfg *models.Configuration) ConfigExport
 	}
 }
 
-func (s *ExportService) buildPricingExportBlock(cfg *models.Configuration, opts ProjectPricingExportOptions) (ProjectPricingExportConfig, error) {
-	block := ProjectPricingExportConfig{
-		Name:        cfg.Name,
-		Article:     cfg.Article,
-		Line:        cfg.Line,
-		ServerCount: exportPositiveInt(cfg.ServerCount, 1),
-		Rows:        make([]ProjectPricingExportRow, 0),
-	}
-	if s.localDB == nil {
-		for _, item := range cfg.Items {
-			block.Rows = append(block.Rows, ProjectPricingExportRow{
-				LotDisplay: item.LotName,
-				VendorPN:   "—",
-				Quantity:   item.Quantity,
-				Estimate:   floatPtr(item.UnitPrice * float64(item.Quantity)),
-			})
-		}
-		return block, nil
-	}
-
-	localCfg, err := s.localDB.GetConfigurationByUUID(cfg.UUID)
-	if err != nil {
-		localCfg = nil
-	}
-
-	priceMap := s.resolvePricingTotals(cfg, localCfg, opts)
-	componentDescriptions := s.resolveLotDescriptions(cfg, localCfg)
-	if opts.IncludeBOM && localCfg != nil && len(localCfg.VendorSpec) > 0 {
-		coveredLots := make(map[string]struct{})
-		for _, row := range localCfg.VendorSpec {
-			rowMappings := normalizeLotMappings(row.LotMappings)
-			for _, mapping := range rowMappings {
-				coveredLots[mapping.LotName] = struct{}{}
-			}
-
-			description := strings.TrimSpace(row.Description)
-			if description == "" && len(rowMappings) > 0 {
-				description = componentDescriptions[rowMappings[0].LotName]
-			}
-
-			if len(rowMappings) == 0 {
-				block.Rows = append(block.Rows, ProjectPricingExportRow{
-					LotDisplay:  "н/д",
-					VendorPN:    row.VendorPartnumber,
-					Description: description,
-					Quantity:    exportPositiveInt(row.Quantity, 1),
-					BOMTotal:    vendorRowTotal(row),
-				})
-				continue
-			}
-
-			// One export row per LOT mapping so that bundles (1 PN → N LOTs) appear
-			// as separate lines, matching the frontend pricing table layout.
-			pnQty := exportPositiveInt(row.Quantity, 1)
-			for i, mapping := range rowMappings {
-				lotQty := pnQty * mapping.QuantityPerPN
-				var bomTotal *float64
-				if i == 0 {
-					bomTotal = vendorRowTotal(row)
-				}
-				block.Rows = append(block.Rows, ProjectPricingExportRow{
-					LotDisplay:  mapping.LotName,
-					VendorPN:    row.VendorPartnumber,
-					Description: description,
-					Quantity:    lotQty,
-					BOMTotal:    bomTotal,
-					Estimate:    computeSingleLotTotal(priceMap, mapping.LotName, lotQty, func(p pricingLevels) *float64 { return p.Estimate }),
-					Stock:       computeSingleLotTotal(priceMap, mapping.LotName, lotQty, func(p pricingLevels) *float64 { return p.Stock }),
-					Competitor:  computeSingleLotTotal(priceMap, mapping.LotName, lotQty, func(p pricingLevels) *float64 { return p.Competitor }),
-				})
-			}
-		}
-
-		for _, item := range cfg.Items {
-			if item.LotName == "" {
-				continue
-			}
-			if _, ok := coveredLots[item.LotName]; ok {
-				continue
-			}
-			estimate := estimateOnlyTotal(priceMap[item.LotName].Estimate, item.UnitPrice, item.Quantity)
-			block.Rows = append(block.Rows, ProjectPricingExportRow{
-				LotDisplay:  item.LotName,
-				VendorPN:    "—",
-				Description: componentDescriptions[item.LotName],
-				Quantity:    exportPositiveInt(item.Quantity, 1),
-				Estimate:    estimate,
-				Stock:       totalForUnitPrice(priceMap[item.LotName].Stock, item.Quantity),
-				Competitor:  totalForUnitPrice(priceMap[item.LotName].Competitor, item.Quantity),
-			})
-		}
-		if opts.isDDP() {
-			applyDDPMarkup(block.Rows, opts.saleMarkupFactor())
-		}
-		if opts.ManualPrice != nil && *opts.ManualPrice > 0 {
-			distributeManualPrice(block.Rows, *opts.ManualPrice)
-		}
-		return block, nil
-	}
-
-	catOrder := defaultCategoryOrder()
-	lotNames := make([]string, 0, len(cfg.Items))
-	for _, item := range cfg.Items {
-		if item.LotName != "" {
-			lotNames = append(lotNames, item.LotName)
-		}
-	}
-	itemCategories := s.resolveCategories(cfg.PricelistID, lotNames)
-	sortedItems := sortConfigItemsByCategoryMap(cfg.Items, catOrder, itemCategories)
-	for _, item := range sortedItems {
-		if item.LotName == "" {
-			continue
-		}
-		estimate := estimateOnlyTotal(priceMap[item.LotName].Estimate, item.UnitPrice, item.Quantity)
-		block.Rows = append(block.Rows, ProjectPricingExportRow{
-			LotDisplay:  item.LotName,
-			VendorPN:    "—",
-			Description: componentDescriptions[item.LotName],
-			Quantity:    exportPositiveInt(item.Quantity, 1),
-			Estimate:    estimate,
-			Stock:       totalForUnitPrice(priceMap[item.LotName].Stock, item.Quantity),
-			Competitor:  totalForUnitPrice(priceMap[item.LotName].Competitor, item.Quantity),
-		})
-	}
-
-	if opts.isDDP() {
-		applyDDPMarkup(block.Rows, opts.saleMarkupFactor())
-	}
-	if opts.ManualPrice != nil && *opts.ManualPrice > 0 {
-		distributeManualPrice(block.Rows, *opts.ManualPrice)
-	}
-
-	return block, nil
-}
-
-// sortConfigItemsByCategoryMap returns a copy of items sorted by category display order.
-// categories maps lot_name → category code; catOrder maps category code → display order.
-func sortConfigItemsByCategoryMap(items models.ConfigItems, catOrder map[string]int, categories map[string]string) models.ConfigItems {
-	sorted := make(models.ConfigItems, len(items))
-	copy(sorted, items)
-	sort.SliceStable(sorted, func(i, j int) bool {
-		orderI, hasI := categoryDisplayOrder(catOrder, categories[sorted[i].LotName])
-		orderJ, hasJ := categoryDisplayOrder(catOrder, categories[sorted[j].LotName])
-		if hasI && hasJ {
-			return orderI < orderJ
-		}
-		return hasI && !hasJ
-	})
-	return sorted
-}
-
-func applyDDPMarkup(rows []ProjectPricingExportRow, factor float64) {
-	for i := range rows {
-		rows[i].Estimate = scaleFloatPtr(rows[i].Estimate, factor)
-		rows[i].Stock = scaleFloatPtr(rows[i].Stock, factor)
-		rows[i].Competitor = scaleFloatPtr(rows[i].Competitor, factor)
-	}
-}
-
-func scaleFloatPtr(v *float64, factor float64) *float64 {
-	if v == nil {
-		return nil
-	}
-	result := *v * factor
-	return &result
-}
-
 // resolveCategories returns lot_name → category map.
 // Primary source: pricelist items (lot_category). Fallback: local_components table.
 func (s *ExportService) resolveCategories(pricelistID *uint, lotNames []string) map[string]string {
@@ -557,400 +287,20 @@ func (s *ExportService) resolveCategories(pricelistID *uint, lotNames []string)
 	return categories
 }
 
-// defaultCategoryOrder returns an uppercase category code → display_order map from models.DefaultCategories.
-func defaultCategoryOrder() map[string]int {
-	m := make(map[string]int, len(models.DefaultCategories))
-	for _, cat := range models.DefaultCategories {
-		m[strings.ToUpper(cat.Code)] = cat.DisplayOrder
-	}
-	return m
-}
-
-func categoryDisplayOrder(categoryOrder map[string]int, category string) (int, bool) {
-	order, ok := categoryOrder[strings.ToUpper(strings.TrimSpace(category))]
-	return order, ok
-}
-
 // sortItemsByCategory sorts items by category display order (items without category go to the end).
 func sortItemsByCategory(items []ExportItem, categoryOrder map[string]int) {
-	sort.SliceStable(items, func(i, j int) bool {
-		orderI, hasI := categoryDisplayOrder(categoryOrder, items[i].Category)
-		orderJ, hasJ := categoryDisplayOrder(categoryOrder, items[j].Category)
-		if hasI && hasJ {
-			return orderI < orderJ
-		}
-		return hasI && !hasJ
-	})
-}
+	for i := 0; i < len(items)-1; i++ {
+		for j := i + 1; j < len(items); j++ {
+			orderI, hasI := categoryOrder[items[i].Category]
+			orderJ, hasJ := categoryOrder[items[j].Category]
 
-type pricingLevels struct {
-	Estimate   *float64
-	Stock      *float64
-	Competitor *float64
-}
-
-func (s *ExportService) resolvePricingTotals(cfg *models.Configuration, localCfg *localdb.LocalConfiguration, opts ProjectPricingExportOptions) map[string]pricingLevels {
-	result := map[string]pricingLevels{}
-	lots := collectPricingLots(cfg, localCfg, opts.IncludeBOM)
-	if len(lots) == 0 || s.localDB == nil {
-		return result
-	}
-
-	estimateID := cfg.PricelistID
-	if estimateID == nil || *estimateID == 0 {
-		if latest, err := s.localDB.GetLatestLocalPricelistBySource("estimate"); err == nil && latest != nil {
-			estimateID = &latest.ServerID
-		}
-	}
-
-	var warehouseID *uint
-	var competitorID *uint
-	if localCfg != nil {
-		warehouseID = localCfg.WarehousePricelistID
-		competitorID = localCfg.CompetitorPricelistID
-	}
-	if warehouseID == nil || *warehouseID == 0 {
-		if latest, err := s.localDB.GetLatestLocalPricelistBySource("warehouse"); err == nil && latest != nil {
-			warehouseID = &latest.ServerID
-		}
-	}
-	if competitorID == nil || *competitorID == 0 {
-		if latest, err := s.localDB.GetLatestLocalPricelistBySource("competitor"); err == nil && latest != nil {
-			competitorID = &latest.ServerID
-		}
-	}
-
-	estimatePrices := s.batchLookupPrices(estimateID, lots)
-	stockPrices := s.batchLookupPrices(warehouseID, lots)
-	competitorPrices := s.batchLookupPrices(competitorID, lots)
-
-	for _, lot := range lots {
-		level := pricingLevels{}
-		if p, ok := estimatePrices[lot]; ok {
-			level.Estimate = floatPtr(p)
-		}
-		if p, ok := stockPrices[lot]; ok {
-			level.Stock = floatPtr(p)
-		}
-		if p, ok := competitorPrices[lot]; ok {
-			level.Competitor = floatPtr(p)
-		}
-		result[lot] = level
-	}
-	return result
-}
-
-// batchLookupPrices fetches prices for all lots from a pricelist in a single query.
-func (s *ExportService) batchLookupPrices(serverPricelistID *uint, lots []string) map[string]float64 {
-	if s.localDB == nil || serverPricelistID == nil || *serverPricelistID == 0 || len(lots) == 0 {
-		return nil
-	}
-	localPL, err := s.localDB.GetLocalPricelistByServerID(*serverPricelistID)
-	if err != nil {
-		return nil
-	}
-	prices, err := s.localDB.GetLocalPricesForLots(localPL.ID, lots)
-	if err != nil {
-		return nil
-	}
-	return prices
-}
-
-func (s *ExportService) resolveLotDescriptions(cfg *models.Configuration, localCfg *localdb.LocalConfiguration) map[string]string {
-	lots := collectPricingLots(cfg, localCfg, true)
-	if s.localDB == nil || len(lots) == 0 {
-		return map[string]string{}
-	}
-	descriptions, err := s.localDB.GetLocalComponentDescriptionsByLotNames(lots)
-	if err != nil {
-		return map[string]string{}
-	}
-	return descriptions
-}
-
-func collectPricingLots(cfg *models.Configuration, localCfg *localdb.LocalConfiguration, includeBOM bool) []string {
-	seen := map[string]struct{}{}
-	out := make([]string, 0)
-	if includeBOM && localCfg != nil {
-		for _, row := range localCfg.VendorSpec {
-			for _, mapping := range normalizeLotMappings(row.LotMappings) {
-				if _, ok := seen[mapping.LotName]; ok {
-					continue
-				}
-				seen[mapping.LotName] = struct{}{}
-				out = append(out, mapping.LotName)
+			if !hasI && hasJ {
+				items[i], items[j] = items[j], items[i]
+			} else if hasI && hasJ && orderI > orderJ {
+				items[i], items[j] = items[j], items[i]
 			}
 		}
 	}
-	for _, item := range cfg.Items {
-		lot := strings.TrimSpace(item.LotName)
-		if lot == "" {
-			continue
-		}
-		if _, ok := seen[lot]; ok {
-			continue
-		}
-		seen[lot] = struct{}{}
-		out = append(out, lot)
-	}
-	return out
-}
-
-func normalizeLotMappings(mappings []localdb.VendorSpecLotMapping) []localdb.VendorSpecLotMapping {
-	if len(mappings) == 0 {
-		return nil
-	}
-	out := make([]localdb.VendorSpecLotMapping, 0, len(mappings))
-	for _, mapping := range mappings {
-		lot := strings.TrimSpace(mapping.LotName)
-		if lot == "" {
-			continue
-		}
-		qty := mapping.QuantityPerPN
-		if qty < 1 {
-			qty = 1
-		}
-		out = append(out, localdb.VendorSpecLotMapping{
-			LotName:       lot,
-			QuantityPerPN: qty,
-		})
-	}
-	return out
-}
-
-func vendorRowTotal(row localdb.VendorSpecItem) *float64 {
-	if row.TotalPrice != nil {
-		return floatPtr(*row.TotalPrice)
-	}
-	if row.UnitPrice == nil {
-		return nil
-	}
-	return floatPtr(*row.UnitPrice * float64(exportPositiveInt(row.Quantity, 1)))
-}
-
-func computeMappingTotal(priceMap map[string]pricingLevels, mappings []localdb.VendorSpecLotMapping, pnQty int, selector func(pricingLevels) *float64) *float64 {
-	if len(mappings) == 0 {
-		return nil
-	}
-	total := 0.0
-	hasValue := false
-	qty := exportPositiveInt(pnQty, 1)
-	for _, mapping := range mappings {
-		price := selector(priceMap[mapping.LotName])
-		if price == nil || *price <= 0 {
-			continue
-		}
-		total += *price * float64(qty*mapping.QuantityPerPN)
-		hasValue = true
-	}
-	if !hasValue {
-		return nil
-	}
-	return floatPtr(total)
-}
-
-// distributeManualPrice sets ManualPrice on each row proportionally based on the
-// row's Estimate share. The last row with a price absorbs rounding remainder so
-// the sum of ManualPrice values always equals manualPrice exactly.
-func distributeManualPrice(rows []ProjectPricingExportRow, manualPrice float64) {
-	if manualPrice <= 0 || len(rows) == 0 {
-		return
-	}
-	totalEstimate := 0.0
-	for _, row := range rows {
-		if row.Estimate != nil && *row.Estimate > 0 {
-			totalEstimate += *row.Estimate
-		}
-	}
-	if totalEstimate <= 0 {
-		return
-	}
-	lastIdx := -1
-	for i, row := range rows {
-		if row.Estimate != nil && *row.Estimate > 0 {
-			lastIdx = i
-		}
-	}
-	assigned := 0.0
-	for i, row := range rows {
-		if row.Estimate == nil || *row.Estimate <= 0 {
-			continue
-		}
-		var share float64
-		if i == lastIdx {
-			share = math.Round((manualPrice-assigned)*100) / 100
-		} else {
-			share = math.Round((*row.Estimate/totalEstimate)*manualPrice*100) / 100
-			assigned += share
-		}
-		rows[i].ManualPrice = floatPtr(share)
-	}
-}
-
-func computeSingleLotTotal(priceMap map[string]pricingLevels, lotName string, qty int, selector func(pricingLevels) *float64) *float64 {
-	price := selector(priceMap[lotName])
-	if price == nil || *price <= 0 {
-		return nil
-	}
-	return floatPtr(*price * float64(qty))
-}
-
-func totalForUnitPrice(unitPrice *float64, quantity int) *float64 {
-	if unitPrice == nil || *unitPrice <= 0 {
-		return nil
-	}
-	total := *unitPrice * float64(exportPositiveInt(quantity, 1))
-	return &total
-}
-
-func estimateOnlyTotal(estimatePrice *float64, fallbackUnitPrice float64, quantity int) *float64 {
-	if estimatePrice != nil && *estimatePrice > 0 {
-		return totalForUnitPrice(estimatePrice, quantity)
-	}
-	if fallbackUnitPrice <= 0 {
-		return nil
-	}
-	total := fallbackUnitPrice * float64(maxInt(quantity, 1))
-	return &total
-}
-
-func pricingCSVHeaders(opts ProjectPricingExportOptions) []string {
-	headers := make([]string, 0, 9)
-	headers = append(headers, "Line Item")
-	if opts.IncludeLOT {
-		headers = append(headers, "LOT")
-	}
-	headers = append(headers, "PN вендора", "Описание", "Кол-во")
-	if opts.IncludeBOM {
-		headers = append(headers, "BOM")
-	}
-	if opts.IncludeEstimate {
-		headers = append(headers, "Estimate")
-	}
-	if opts.IncludeStock {
-		headers = append(headers, "Stock")
-	}
-	if opts.IncludeCompetitor {
-		headers = append(headers, "Конкуренты")
-	}
-	if opts.ManualPrice != nil && *opts.ManualPrice > 0 {
-		headers = append(headers, "Ручная цена")
-	}
-	return headers
-}
-
-func pricingCSVRow(row ProjectPricingExportRow, opts ProjectPricingExportOptions) []string {
-	record := make([]string, 0, 9)
-	record = append(record, "")
-	if opts.IncludeLOT {
-		record = append(record, emptyDash(row.LotDisplay))
-	}
-	record = append(record,
-		emptyDash(row.VendorPN),
-		emptyDash(row.Description),
-		fmt.Sprintf("%d", exportPositiveInt(row.Quantity, 1)),
-	)
-	if opts.IncludeBOM {
-		record = append(record, formatMoneyValue(row.BOMTotal))
-	}
-	if opts.IncludeEstimate {
-		record = append(record, formatMoneyValue(row.Estimate))
-	}
-	if opts.IncludeStock {
-		record = append(record, formatMoneyValue(row.Stock))
-	}
-	if opts.IncludeCompetitor {
-		record = append(record, formatMoneyValue(row.Competitor))
-	}
-	if opts.ManualPrice != nil && *opts.ManualPrice > 0 {
-		record = append(record, formatMoneyValue(row.ManualPrice))
-	}
-	return record
-}
-
-func pricingConfigSummaryRow(cfg ProjectPricingExportConfig, opts ProjectPricingExportOptions) []string {
-	record := make([]string, 0, 9)
-	record = append(record, fmt.Sprintf("%d", cfg.Line))
-	if opts.IncludeLOT {
-		record = append(record, "")
-	}
-	record = append(record,
-		emptyDash(cfg.Article),
-		emptyDash(cfg.Name),
-		fmt.Sprintf("%d", exportPositiveInt(cfg.ServerCount, 1)),
-	)
-	if opts.IncludeBOM {
-		record = append(record, formatMoneyValue(sumPricingColumn(cfg.Rows, func(row ProjectPricingExportRow) *float64 { return row.BOMTotal })))
-	}
-	if opts.IncludeEstimate {
-		record = append(record, formatMoneyValue(sumPricingColumn(cfg.Rows, func(row ProjectPricingExportRow) *float64 { return row.Estimate })))
-	}
-	if opts.IncludeStock {
-		record = append(record, formatMoneyValue(sumPricingColumn(cfg.Rows, func(row ProjectPricingExportRow) *float64 { return row.Stock })))
-	}
-	if opts.IncludeCompetitor {
-		record = append(record, formatMoneyValue(sumPricingColumn(cfg.Rows, func(row ProjectPricingExportRow) *float64 { return row.Competitor })))
-	}
-	if opts.ManualPrice != nil && *opts.ManualPrice > 0 {
-		record = append(record, formatMoneyValue(opts.ManualPrice))
-	}
-	return record
-}
-
-
-func formatMoneyValue(value *float64) string {
-	if value == nil {
-		return "—"
-	}
-	n := math.Round(*value*100) / 100
-	sign := ""
-	if n < 0 {
-		sign = "-"
-		n = -n
-	}
-	whole := int64(n)
-	fraction := int(math.Round((n - float64(whole)) * 100))
-	if fraction == 100 {
-		whole++
-		fraction = 0
-	}
-	return fmt.Sprintf("%s%s,%02d", sign, formatIntWithSpace(whole), fraction)
-}
-
-func emptyDash(value string) string {
-	if strings.TrimSpace(value) == "" {
-		return "—"
-	}
-	return value
-}
-
-func sumPricingColumn(rows []ProjectPricingExportRow, selector func(ProjectPricingExportRow) *float64) *float64 {
-	total := 0.0
-	hasValue := false
-	for _, row := range rows {
-		value := selector(row)
-		if value == nil {
-			continue
-		}
-		total += *value
-		hasValue = true
-	}
-	if !hasValue {
-		return nil
-	}
-	return floatPtr(total)
-}
-
-func floatPtr(value float64) *float64 {
-	v := value
-	return &v
-}
-
-func exportPositiveInt(value, fallback int) int {
-	if value < 1 {
-		return fallback
-	}
-	return value
 }
 
 // formatPriceComma formats a price with comma as decimal separator (e.g., "2074,5").

internal/services/export_test.go

@@ -33,7 +33,7 @@ func newTestProjectData(items []ExportItem, article string, serverCount int) *Pr
 }
 
 func TestToCSV_UTF8BOM(t *testing.T) {
-	svc := NewExportService(config.ExportConfig{}, nil)
+	svc := NewExportService(config.ExportConfig{}, nil, nil)
 
 	data := newTestProjectData([]ExportItem{
 		{
@@ -63,7 +63,7 @@ func TestToCSV_UTF8BOM(t *testing.T) {
 }
 
 func TestToCSV_SemicolonDelimiter(t *testing.T) {
-	svc := NewExportService(config.ExportConfig{}, nil)
+	svc := NewExportService(config.ExportConfig{}, nil, nil)
 
 	data := newTestProjectData([]ExportItem{
 		{
@@ -130,7 +130,7 @@ func TestToCSV_SemicolonDelimiter(t *testing.T) {
 }
 
 func TestToCSV_ServerRow(t *testing.T) {
-	svc := NewExportService(config.ExportConfig{}, nil)
+	svc := NewExportService(config.ExportConfig{}, nil, nil)
 
 	data := newTestProjectData([]ExportItem{
 		{LotName: "LOT-001", Category: "CAT", Quantity: 1, UnitPrice: 100.0, TotalPrice: 100.0},
@@ -175,7 +175,7 @@ func TestToCSV_ServerRow(t *testing.T) {
 }
 
 func TestToCSV_CategorySorting(t *testing.T) {
-	svc := NewExportService(config.ExportConfig{}, nil)
+	svc := NewExportService(config.ExportConfig{}, nil, nil)
 
 	data := newTestProjectData([]ExportItem{
 		{LotName: "LOT-001", Category: "CAT-A", Quantity: 1, UnitPrice: 100.0, TotalPrice: 100.0},
@@ -214,7 +214,7 @@ func TestToCSV_CategorySorting(t *testing.T) {
 }
 
 func TestToCSV_EmptyData(t *testing.T) {
-	svc := NewExportService(config.ExportConfig{}, nil)
+	svc := NewExportService(config.ExportConfig{}, nil, nil)
 
 	data := &ProjectExportData{
 		Configs:   []ConfigExportBlock{},
@@ -247,7 +247,7 @@ func TestToCSV_EmptyData(t *testing.T) {
 }
 
 func TestToCSVBytes_BackwardCompat(t *testing.T) {
-	svc := NewExportService(config.ExportConfig{}, nil)
+	svc := NewExportService(config.ExportConfig{}, nil, nil)
 
 	data := newTestProjectData([]ExportItem{
 		{LotName: "LOT-001", Category: "CAT", Quantity: 1, UnitPrice: 100.0, TotalPrice: 100.0},
@@ -270,7 +270,7 @@ func TestToCSVBytes_BackwardCompat(t *testing.T) {
 }
 
 func TestToCSV_WriterError(t *testing.T) {
-	svc := NewExportService(config.ExportConfig{}, nil)
+	svc := NewExportService(config.ExportConfig{}, nil, nil)
 
 	data := newTestProjectData([]ExportItem{
 		{LotName: "LOT-001", Category: "CAT", Quantity: 1, UnitPrice: 100.0, TotalPrice: 100.0},
@@ -284,7 +284,7 @@ func TestToCSV_WriterError(t *testing.T) {
 }
 
 func TestToCSV_MultipleBlocks(t *testing.T) {
-	svc := NewExportService(config.ExportConfig{}, nil)
+	svc := NewExportService(config.ExportConfig{}, nil, nil)
 
 	data := &ProjectExportData{
 		Configs: []ConfigExportBlock{
@@ -359,7 +359,7 @@ func TestToCSV_MultipleBlocks(t *testing.T) {
 }
 
 func TestProjectToExportData_SortsByLine(t *testing.T) {
-	svc := NewExportService(config.ExportConfig{}, nil)
+	svc := NewExportService(config.ExportConfig{}, nil, nil)
 
 	configs := []models.Configuration{
 		{
@@ -444,117 +444,6 @@ func TestFormatPriceComma(t *testing.T) {
 	}
 }
 
-func TestToPricingCSV_UsesSelectedColumns(t *testing.T) {
-	svc := NewExportService(config.ExportConfig{}, nil)
-	data := &ProjectPricingExportData{
-		Configs: []ProjectPricingExportConfig{
-			{
-				Name:        "Config A",
-				Article:     "ART-1",
-				Line:        10,
-				ServerCount: 2,
-				Rows: []ProjectPricingExportRow{
-					{
-						LotDisplay:  "LOT_A +1",
-						VendorPN:    "PN-001",
-						Description: "Bundle row",
-						Quantity:    2,
-						BOMTotal:    floatPtr(2400.5),
-						Estimate:    floatPtr(2000),
-						Stock:       floatPtr(1800.25),
-					},
-				},
-			},
-		},
-		CreatedAt: time.Now(),
-	}
-	opts := ProjectPricingExportOptions{
-		IncludeLOT:      true,
-		IncludeBOM:      true,
-		IncludeEstimate: true,
-		IncludeStock:    true,
-	}
-
-	var buf bytes.Buffer
-	if err := svc.ToPricingCSV(&buf, data, opts); err != nil {
-		t.Fatalf("ToPricingCSV failed: %v", err)
-	}
-
-	reader := csv.NewReader(bytes.NewReader(buf.Bytes()[3:]))
-	reader.Comma = ';'
-	reader.FieldsPerRecord = -1
-
-	header, err := reader.Read()
-	if err != nil {
-		t.Fatalf("read header row: %v", err)
-	}
-	expectedHeader := []string{"Line Item", "LOT", "PN вендора", "Описание", "Кол-во", "BOM", "Estimate", "Stock"}
-	for i, want := range expectedHeader {
-		if header[i] != want {
-			t.Fatalf("header[%d]: expected %q, got %q", i, want, header[i])
-		}
-	}
-
-	summary, err := reader.Read()
-	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"}
-	for i, want := range expectedSummary {
-		if summary[i] != want {
-			t.Fatalf("summary[%d]: expected %q, got %q", i, want, summary[i])
-		}
-	}
-
-	row, err := reader.Read()
-	if err != nil {
-		t.Fatalf("read data row: %v", err)
-	}
-	expectedRow := []string{"", "LOT_A +1", "PN-001", "Bundle row", "2", "2 400,50", "2 000,00", "1 800,25"}
-	for i, want := range expectedRow {
-		if row[i] != want {
-			t.Fatalf("row[%d]: expected %q, got %q", i, want, row[i])
-		}
-	}
-}
-
-func TestProjectToPricingExportData_UsesCartRowsWithoutBOM(t *testing.T) {
-	svc := NewExportService(config.ExportConfig{}, nil)
-	configs := []models.Configuration{
-		{
-			UUID:        "cfg-1",
-			Name:        "Config A",
-			Article:     "ART-1",
-			ServerCount: 1,
-			Items: models.ConfigItems{
-				{LotName: "LOT_A", Quantity: 2, UnitPrice: 300},
-			},
-			CreatedAt: time.Now(),
-		},
-	}
-
-	data, err := svc.ProjectToPricingExportData(configs, ProjectPricingExportOptions{
-		IncludeLOT:      true,
-		IncludeEstimate: true,
-	})
-	if err != nil {
-		t.Fatalf("ProjectToPricingExportData failed: %v", err)
-	}
-	if len(data.Configs) != 1 || len(data.Configs[0].Rows) != 1 {
-		t.Fatalf("unexpected rows count: %+v", data.Configs)
-	}
-	row := data.Configs[0].Rows[0]
-	if row.LotDisplay != "LOT_A" {
-		t.Fatalf("expected LOT_A, got %q", row.LotDisplay)
-	}
-	if row.VendorPN != "—" {
-		t.Fatalf("expected vendor dash, got %q", row.VendorPN)
-	}
-	if row.Estimate == nil || *row.Estimate != 600 {
-		t.Fatalf("expected estimate total 600, got %+v", row.Estimate)
-	}
-}
-
 // failingWriter always returns an error
 type failingWriter struct{}
 

internal/services/local_configuration.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"log/slog"
 	"strings"
 	"time"
 
@@ -50,13 +49,11 @@ func NewLocalConfigurationService(
 
 // Create creates a new configuration in local SQLite and queues it for sync
 func (s *LocalConfigurationService) Create(ownerUsername string, req *CreateConfigRequest) (*models.Configuration, error) {
-	// If online, trigger pricelist sync in the background — do not block config creation
+	// If online, check for new pricelists first
 	if s.isOnline() {
-		go func() {
-			if err := s.syncService.SyncPricelistsIfNeeded(); err != nil {
-				// Log but don't fail - we can still use local pricelists
-			}
-		}()
+		if err := s.syncService.SyncPricelistsIfNeeded(); err != nil {
+			// Log but don't fail - we can still use local pricelists
+		}
 	}
 
 	projectUUID, err := s.resolveProjectUUID(ownerUsername, req.ProjectUUID)
@@ -86,29 +83,22 @@ func (s *LocalConfigurationService) Create(ownerUsername string, req *CreateConf
 	}
 
 	cfg := &models.Configuration{
-		UUID:                  uuid.New().String(),
-		OwnerUsername:         ownerUsername,
-		ProjectUUID:           projectUUID,
-		Name:                  req.Name,
-		Items:                 req.Items,
-		TotalPrice:            &total,
-		CustomPrice:           req.CustomPrice,
-		Notes:                 req.Notes,
-		IsTemplate:            req.IsTemplate,
-		ServerCount:           req.ServerCount,
-		ServerModel:           req.ServerModel,
-		SupportCode:           req.SupportCode,
-		Article:               req.Article,
-		PricelistID:           pricelistID,
-		WarehousePricelistID:  req.WarehousePricelistID,
-		CompetitorPricelistID: req.CompetitorPricelistID,
-		ConfigType:            req.ConfigType,
-		DisablePriceRefresh:   req.DisablePriceRefresh,
-		OnlyInStock:           req.OnlyInStock,
-		CreatedAt:             time.Now(),
-	}
-	if cfg.ConfigType == "" {
-		cfg.ConfigType = "server"
+		UUID:          uuid.New().String(),
+		OwnerUsername: ownerUsername,
+		ProjectUUID:   projectUUID,
+		Name:          req.Name,
+		Items:         req.Items,
+		TotalPrice:    &total,
+		CustomPrice:   req.CustomPrice,
+		Notes:         req.Notes,
+		IsTemplate:    req.IsTemplate,
+		ServerCount:   req.ServerCount,
+		ServerModel:   req.ServerModel,
+		SupportCode:   req.SupportCode,
+		Article:       req.Article,
+		PricelistID:   pricelistID,
+		OnlyInStock:   req.OnlyInStock,
+		CreatedAt:     time.Now(),
 	}
 
 	// Convert to local model
@@ -119,6 +109,9 @@ func (s *LocalConfigurationService) Create(ownerUsername string, req *CreateConf
 	}
 	cfg.Line = localCfg.Line
 
+	// Record usage stats
+	_ = s.quoteService.RecordUsage(req.Items)
+
 	return cfg, nil
 }
 
@@ -203,9 +196,6 @@ func (s *LocalConfigurationService) Update(uuid string, ownerUsername string, re
 	localCfg.SupportCode = req.SupportCode
 	localCfg.Article = req.Article
 	localCfg.PricelistID = pricelistID
-	localCfg.WarehousePricelistID = req.WarehousePricelistID
-	localCfg.CompetitorPricelistID = req.CompetitorPricelistID
-	localCfg.DisablePriceRefresh = req.DisablePriceRefresh
 	localCfg.OnlyInStock = req.OnlyInStock
 	localCfg.UpdatedAt = time.Now()
 	localCfg.SyncStatus = "pending"
@@ -314,25 +304,22 @@ func (s *LocalConfigurationService) CloneToProject(configUUID string, ownerUsern
 	}
 
 	clone := &models.Configuration{
-		UUID:                  uuid.New().String(),
-		OwnerUsername:         ownerUsername,
-		ProjectUUID:           resolvedProjectUUID,
-		Name:                  newName,
-		Items:                 original.Items,
-		TotalPrice:            &total,
-		CustomPrice:           original.CustomPrice,
-		Notes:                 original.Notes,
-		IsTemplate:            false,
-		ServerCount:           original.ServerCount,
-		ServerModel:           original.ServerModel,
-		SupportCode:           original.SupportCode,
-		Article:               original.Article,
-		PricelistID:           original.PricelistID,
-		WarehousePricelistID:  original.WarehousePricelistID,
-		CompetitorPricelistID: original.CompetitorPricelistID,
-		DisablePriceRefresh:   original.DisablePriceRefresh,
-		OnlyInStock:           original.OnlyInStock,
-		CreatedAt:             time.Now(),
+		UUID:          uuid.New().String(),
+		OwnerUsername: ownerUsername,
+		ProjectUUID:   resolvedProjectUUID,
+		Name:          newName,
+		Items:         original.Items,
+		TotalPrice:    &total,
+		CustomPrice:   original.CustomPrice,
+		Notes:         original.Notes,
+		IsTemplate:    false,
+		ServerCount:   original.ServerCount,
+		ServerModel:   original.ServerModel,
+		SupportCode:   original.SupportCode,
+		Article:       original.Article,
+		PricelistID:   original.PricelistID,
+		OnlyInStock:   original.OnlyInStock,
+		CreatedAt:     time.Now(),
 	}
 
 	localCfg := localdb.ConfigurationToLocal(clone)
@@ -403,38 +390,17 @@ func (s *LocalConfigurationService) RefreshPrices(uuid string, ownerUsername str
 		return nil, ErrConfigForbidden
 	}
 
-	// Refresh local pricelists when online.
+	// Refresh local pricelists when online and use latest active/local pricelist for recalculation.
 	if s.isOnline() {
-		if err := s.syncService.SyncPricelistsIfNeeded(); err != nil {
-			slog.Warn("local configuration: background pricelist sync failed", "err", err)
-		}
+		_ = s.syncService.SyncPricelistsIfNeeded()
 	}
-
-	// Use the pricelist stored in the config; fall back to latest if unavailable.
-	var pricelist *localdb.LocalPricelist
-	if localCfg.PricelistID != nil && *localCfg.PricelistID > 0 {
-		if pl, err := s.localDB.GetLocalPricelistByServerID(*localCfg.PricelistID); err == nil {
-			pricelist = pl
-		}
-	}
-	if pricelist == nil {
-		if pl, err := s.localDB.GetLatestLocalPricelist(); err == nil {
-			pricelist = pl
-		}
-	}
-
-	// Capture fingerprint of the current state before any mutations.
-	preRefreshFP, err := localdb.BuildConfigurationSpecPriceFingerprint(localCfg)
-	if err != nil {
-		return nil, fmt.Errorf("build pre-refresh fingerprint: %w", err)
-	}
-	preRefreshCfg := *localCfg
+	latestPricelist, latestErr := s.localDB.GetLatestLocalPricelist()
 
 	// Update prices for all items from pricelist
 	updatedItems := make(localdb.LocalConfigItems, len(localCfg.Items))
 	for i, item := range localCfg.Items {
-		if pricelist != nil {
-			price, err := s.localDB.GetLocalPriceForLot(pricelist.ID, item.LotName)
+		if latestErr == nil && latestPricelist != nil {
+			price, err := s.localDB.GetLocalPriceForLot(latestPricelist.ID, item.LotName)
 			if err == nil && price > 0 {
 				updatedItems[i] = localdb.LocalConfigItem{
 					LotName:   item.LotName,
@@ -459,8 +425,8 @@ func (s *LocalConfigurationService) RefreshPrices(uuid string, ownerUsername str
 	}
 
 	localCfg.TotalPrice = &total
-	if pricelist != nil {
-		localCfg.PricelistID = &pricelist.ServerID
+	if latestErr == nil && latestPricelist != nil {
+		localCfg.PricelistID = &latestPricelist.ServerID
 	}
 
 	// Set price update timestamp and mark for sync
@@ -469,18 +435,6 @@ func (s *LocalConfigurationService) RefreshPrices(uuid string, ownerUsername str
 	localCfg.UpdatedAt = now
 	localCfg.SyncStatus = "pending"
 
-	// Before saving the new prices, snapshot the pre-refresh state so the revision
-	// history shows a clear before/after for every price update.
-	postRefreshFP, err := localdb.BuildConfigurationSpecPriceFingerprint(localCfg)
-	if err != nil {
-		return nil, fmt.Errorf("build post-refresh fingerprint: %w", err)
-	}
-	if preRefreshFP != postRefreshFP {
-		if err := s.snapshotPreRefreshTx(&preRefreshCfg, ownerUsername); err != nil {
-			return nil, fmt.Errorf("snapshot pre-refresh state: %w", err)
-		}
-	}
-
 	cfg, err := s.saveWithVersionAndPending(localCfg, "update", ownerUsername)
 	if err != nil {
 		return nil, fmt.Errorf("refresh prices with version: %w", err)
@@ -567,9 +521,6 @@ func (s *LocalConfigurationService) UpdateNoAuth(uuid string, req *CreateConfigR
 	localCfg.SupportCode = req.SupportCode
 	localCfg.Article = req.Article
 	localCfg.PricelistID = pricelistID
-	localCfg.WarehousePricelistID = req.WarehousePricelistID
-	localCfg.CompetitorPricelistID = req.CompetitorPricelistID
-	localCfg.DisablePriceRefresh = req.DisablePriceRefresh
 	localCfg.OnlyInStock = req.OnlyInStock
 	localCfg.UpdatedAt = time.Now()
 	localCfg.SyncStatus = "pending"
@@ -672,25 +623,19 @@ func (s *LocalConfigurationService) CloneNoAuthToProjectFromVersion(configUUID s
 	}
 
 	clone := &models.Configuration{
-		UUID:                  uuid.New().String(),
-		OwnerUsername:         ownerUsername,
-		ProjectUUID:           resolvedProjectUUID,
-		Name:                  newName,
-		Items:                 original.Items,
-		TotalPrice:            &total,
-		CustomPrice:           original.CustomPrice,
-		Notes:                 original.Notes,
-		IsTemplate:            false,
-		ServerCount:           original.ServerCount,
-		ServerModel:           original.ServerModel,
-		SupportCode:           original.SupportCode,
-		Article:               original.Article,
-		PricelistID:           original.PricelistID,
-		WarehousePricelistID:  original.WarehousePricelistID,
-		CompetitorPricelistID: original.CompetitorPricelistID,
-		DisablePriceRefresh:   original.DisablePriceRefresh,
-		OnlyInStock:           original.OnlyInStock,
-		CreatedAt:             time.Now(),
+		UUID:          uuid.New().String(),
+		OwnerUsername: ownerUsername,
+		ProjectUUID:   resolvedProjectUUID,
+		Name:          newName,
+		Items:         original.Items,
+		TotalPrice:    &total,
+		CustomPrice:   original.CustomPrice,
+		Notes:         original.Notes,
+		IsTemplate:    false,
+		ServerCount:   original.ServerCount,
+		PricelistID:   original.PricelistID,
+		OnlyInStock:   original.OnlyInStock,
+		CreatedAt:     time.Now(),
 	}
 
 	localCfg := localdb.ConfigurationToLocal(clone)
@@ -799,10 +744,8 @@ func (s *LocalConfigurationService) ListTemplates(page, perPage int) ([]models.C
 	return templates[start:end], total, nil
 }
 
-// RefreshPricesNoAuth updates all component prices in the configuration without ownership check.
-// pricelistServerID optionally specifies which pricelist to use; if nil, the config's stored
-// pricelist is used; if that is also absent, the latest local pricelist is used as a fallback.
-func (s *LocalConfigurationService) RefreshPricesNoAuth(uuid string, pricelistServerID *uint) (*models.Configuration, error) {
+// RefreshPricesNoAuth updates all component prices in the configuration without ownership check
+func (s *LocalConfigurationService) RefreshPricesNoAuth(uuid string) (*models.Configuration, error) {
 	// Get configuration from local SQLite
 	localCfg, err := s.localDB.GetConfigurationByUUID(uuid)
 	if err != nil {
@@ -810,47 +753,15 @@ func (s *LocalConfigurationService) RefreshPricesNoAuth(uuid string, pricelistSe
 	}
 
 	if s.isOnline() {
-		if err := s.syncService.SyncPricelistsIfNeeded(); err != nil {
-			slog.Warn("local configuration: background pricelist sync failed", "err", err)
-		}
+		_ = s.syncService.SyncPricelistsIfNeeded()
 	}
-
-	// Resolve which pricelist to use:
-	// 1. Explicitly requested pricelist (from UI selection)
-	// 2. Pricelist stored in the configuration
-	// 3. Latest local pricelist as last-resort fallback
-	var targetServerID *uint
-	if pricelistServerID != nil && *pricelistServerID > 0 {
-		targetServerID = pricelistServerID
-	} else if localCfg.PricelistID != nil && *localCfg.PricelistID > 0 {
-		targetServerID = localCfg.PricelistID
-	}
-
-	var pricelist *localdb.LocalPricelist
-	if targetServerID != nil {
-		if pl, err := s.localDB.GetLocalPricelistByServerID(*targetServerID); err == nil {
-			pricelist = pl
-		}
-	}
-	if pricelist == nil {
-		// Fallback: use latest local pricelist
-		if pl, err := s.localDB.GetLatestLocalPricelist(); err == nil {
-			pricelist = pl
-		}
-	}
-
-	// Capture fingerprint of the current state before any mutations.
-	preRefreshFP, err := localdb.BuildConfigurationSpecPriceFingerprint(localCfg)
-	if err != nil {
-		return nil, fmt.Errorf("build pre-refresh fingerprint: %w", err)
-	}
-	preRefreshCfg := *localCfg
+	latestPricelist, latestErr := s.localDB.GetLatestLocalPricelist()
 
 	// Update prices for all items from pricelist
 	updatedItems := make(localdb.LocalConfigItems, len(localCfg.Items))
 	for i, item := range localCfg.Items {
-		if pricelist != nil {
-			price, err := s.localDB.GetLocalPriceForLot(pricelist.ID, item.LotName)
+		if latestErr == nil && latestPricelist != nil {
+			price, err := s.localDB.GetLocalPriceForLot(latestPricelist.ID, item.LotName)
 			if err == nil && price > 0 {
 				updatedItems[i] = localdb.LocalConfigItem{
 					LotName:   item.LotName,
@@ -875,8 +786,8 @@ func (s *LocalConfigurationService) RefreshPricesNoAuth(uuid string, pricelistSe
 	}
 
 	localCfg.TotalPrice = &total
-	if pricelist != nil {
-		localCfg.PricelistID = &pricelist.ServerID
+	if latestErr == nil && latestPricelist != nil {
+		localCfg.PricelistID = &latestPricelist.ServerID
 	}
 
 	// Set price update timestamp and mark for sync
@@ -885,18 +796,6 @@ func (s *LocalConfigurationService) RefreshPricesNoAuth(uuid string, pricelistSe
 	localCfg.UpdatedAt = now
 	localCfg.SyncStatus = "pending"
 
-	// Before saving the new prices, snapshot the pre-refresh state so the revision
-	// history shows a clear before/after for every price update.
-	postRefreshFP, err := localdb.BuildConfigurationSpecPriceFingerprint(localCfg)
-	if err != nil {
-		return nil, fmt.Errorf("build post-refresh fingerprint: %w", err)
-	}
-	if preRefreshFP != postRefreshFP {
-		if err := s.snapshotPreRefreshTx(&preRefreshCfg, ""); err != nil {
-			return nil, fmt.Errorf("snapshot pre-refresh state: %w", err)
-		}
-	}
-
 	cfg, err := s.saveWithVersionAndPending(localCfg, "update", "")
 	if err != nil {
 		return nil, fmt.Errorf("refresh prices without auth with version: %w", err)
@@ -904,16 +803,6 @@ func (s *LocalConfigurationService) RefreshPricesNoAuth(uuid string, pricelistSe
 	return cfg, nil
 }
 
-// SnapshotCurrentState creates a revision of the current configuration state without modifying it.
-// Called before a client-side price refresh so the revision history has a clear before/after.
-func (s *LocalConfigurationService) SnapshotCurrentState(uuid string) error {
-	localCfg, err := s.localDB.GetConfigurationByUUID(uuid)
-	if err != nil {
-		return ErrConfigNotFound
-	}
-	return s.snapshotPreRefreshTx(localCfg, "")
-}
-
 // UpdateServerCount updates server count and recalculates total price without creating a new version.
 func (s *LocalConfigurationService) UpdateServerCount(configUUID string, serverCount int) (*models.Configuration, error) {
 	if serverCount < 1 {
@@ -1164,41 +1053,37 @@ func (s *LocalConfigurationService) isOwner(cfg *localdb.LocalConfiguration, own
 
 func (s *LocalConfigurationService) createWithVersion(localCfg *localdb.LocalConfiguration, createdBy string) error {
 	return s.localDB.DB().Transaction(func(tx *gorm.DB) error {
-		return s.createWithVersionTx(tx, localCfg, createdBy)
-	})
-}
-
-func (s *LocalConfigurationService) createWithVersionTx(tx *gorm.DB, localCfg *localdb.LocalConfiguration, createdBy string) error {
-	if localCfg.IsActive {
-		if err := s.ensureConfigurationLineTx(tx, localCfg); err != nil {
-			return err
+		if localCfg.IsActive {
+			if err := s.ensureConfigurationLineTx(tx, localCfg); err != nil {
+				return err
+			}
+		}
+		if err := tx.Create(localCfg).Error; err != nil {
+			return fmt.Errorf("create local configuration: %w", err)
 		}
-	}
-	if err := tx.Create(localCfg).Error; err != nil {
-		return fmt.Errorf("create local configuration: %w", err)
-	}
 
-	version, err := s.appendVersionTx(tx, localCfg, "create", createdBy)
-	if err != nil {
-		return fmt.Errorf("append create version: %w", err)
-	}
+		version, err := s.appendVersionTx(tx, localCfg, "create", createdBy)
+		if err != nil {
+			return fmt.Errorf("append create version: %w", err)
+		}
 
-	if err := tx.Model(&localdb.LocalConfiguration{}).
-		Where("uuid = ?", localCfg.UUID).
-		Update("current_version_id", version.ID).Error; err != nil {
-		return fmt.Errorf("set current version id: %w", err)
-	}
-	localCfg.CurrentVersionID = &version.ID
-	localCfg.CurrentVersion = version
+		if err := tx.Model(&localdb.LocalConfiguration{}).
+			Where("uuid = ?", localCfg.UUID).
+			Update("current_version_id", version.ID).Error; err != nil {
+			return fmt.Errorf("set current version id: %w", err)
+		}
+		localCfg.CurrentVersionID = &version.ID
+		localCfg.CurrentVersion = version
 
-	if err := s.enqueueConfigurationPendingChangeTx(tx, localCfg, "create", version, createdBy); err != nil {
-		return fmt.Errorf("enqueue create pending change: %w", err)
-	}
-	if err := s.recalculateLocalPricelistUsageTx(tx); err != nil {
-		return fmt.Errorf("recalculate local pricelist usage: %w", err)
-	}
+		if err := s.enqueueConfigurationPendingChangeTx(tx, localCfg, "create", version, createdBy); err != nil {
+			return fmt.Errorf("enqueue create pending change: %w", err)
+		}
+		if err := s.recalculateLocalPricelistUsageTx(tx); err != nil {
+			return fmt.Errorf("recalculate local pricelist usage: %w", err)
+		}
 
-	return nil
+		return nil
+	})
 }
 
 func (s *LocalConfigurationService) saveWithVersionAndPending(localCfg *localdb.LocalConfiguration, operation string, createdBy string) (*models.Configuration, error) {
@@ -1298,55 +1183,20 @@ func hasNonRevisionConfigurationChanges(current *localdb.LocalConfiguration, nex
 		current.ServerModel != next.ServerModel ||
 		current.SupportCode != next.SupportCode ||
 		current.Article != next.Article ||
+		current.OnlyInStock != next.OnlyInStock ||
 		current.IsActive != next.IsActive ||
 		current.Line != next.Line {
 		return true
 	}
-	if !equalStringPtr(current.ProjectUUID, next.ProjectUUID) {
+	if !equalUintPtr(current.PricelistID, next.PricelistID) ||
+		!equalUintPtr(current.WarehousePricelistID, next.WarehousePricelistID) ||
+		!equalUintPtr(current.CompetitorPricelistID, next.CompetitorPricelistID) ||
+		!equalStringPtr(current.ProjectUUID, next.ProjectUUID) {
 		return true
 	}
 	return false
 }
 
-func (s *LocalConfigurationService) UpdateVendorSpecNoAuth(uuid string, spec localdb.VendorSpec) (*models.Configuration, error) {
-	localCfg, err := s.localDB.GetConfigurationByUUID(uuid)
-	if err != nil {
-		return nil, ErrConfigNotFound
-	}
-
-	localCfg.VendorSpec = spec
-	localCfg.UpdatedAt = time.Now()
-	localCfg.SyncStatus = "pending"
-
-	cfg, err := s.saveWithVersionAndPending(localCfg, "update", "")
-	if err != nil {
-		return nil, fmt.Errorf("update vendor spec without auth with version: %w", err)
-	}
-	return cfg, nil
-}
-
-func (s *LocalConfigurationService) ApplyVendorSpecItemsNoAuth(uuid string, items localdb.LocalConfigItems) (*models.Configuration, error) {
-	localCfg, err := s.localDB.GetConfigurationByUUID(uuid)
-	if err != nil {
-		return nil, ErrConfigNotFound
-	}
-
-	localCfg.Items = items
-	total := items.Total()
-	if localCfg.ServerCount > 1 {
-		total *= float64(localCfg.ServerCount)
-	}
-	localCfg.TotalPrice = &total
-	localCfg.UpdatedAt = time.Now()
-	localCfg.SyncStatus = "pending"
-
-	cfg, err := s.saveWithVersionAndPending(localCfg, "update", "")
-	if err != nil {
-		return nil, fmt.Errorf("apply vendor spec items without auth with version: %w", err)
-	}
-	return cfg, nil
-}
-
 func equalStringPtr(a, b *string) bool {
 	if a == nil && b == nil {
 		return true
@@ -1480,25 +1330,12 @@ func (s *LocalConfigurationService) appendVersionTx(
 	localCfg *localdb.LocalConfiguration,
 	operation string,
 	createdBy string,
-) (*localdb.LocalConfigurationVersion, error) {
-	return s.appendVersionTxNote(tx, localCfg, operation, createdBy, "")
-}
-
-func (s *LocalConfigurationService) appendVersionTxNote(
-	tx *gorm.DB,
-	localCfg *localdb.LocalConfiguration,
-	operation string,
-	createdBy string,
-	noteOverride string,
 ) (*localdb.LocalConfigurationVersion, error) {
 	snapshot, err := s.buildConfigurationSnapshot(localCfg)
 	if err != nil {
 		return nil, fmt.Errorf("build snapshot: %w", err)
 	}
 	changeNote := fmt.Sprintf("%s via local-first flow", operation)
-	if noteOverride != "" {
-		changeNote = noteOverride
-	}
 
 	var createdByPtr *string
 	if createdBy != "" {
@@ -1539,35 +1376,6 @@ func (s *LocalConfigurationService) appendVersionTxNote(
 	return nil, fmt.Errorf("%w: exceeded retries for %s", ErrVersionConflict, localCfg.UUID)
 }
 
-// snapshotPreRefreshTx creates a revision of the current configuration state before a price
-// refresh so the history clearly shows what existed before prices were updated.
-// Called only when prices are about to change (fingerprints differ).
-func (s *LocalConfigurationService) snapshotPreRefreshTx(localCfg *localdb.LocalConfiguration, createdBy string) error {
-	return s.localDB.DB().Transaction(func(tx *gorm.DB) error {
-		var locked localdb.LocalConfiguration
-		if err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).
-			Where("uuid = ?", localCfg.UUID).
-			First(&locked).Error; err != nil {
-			if errors.Is(err, gorm.ErrRecordNotFound) {
-				return ErrConfigNotFound
-			}
-			return fmt.Errorf("lock row for pre-refresh snapshot: %w", err)
-		}
-
-		version, err := s.appendVersionTxNote(tx, localCfg, "update", createdBy, "до обновления цен")
-		if err != nil {
-			return fmt.Errorf("append pre-refresh version: %w", err)
-		}
-
-		if err := tx.Model(&localdb.LocalConfiguration{}).
-			Where("uuid = ?", localCfg.UUID).
-			Update("current_version_id", version.ID).Error; err != nil {
-			return fmt.Errorf("set current_version_id for pre-refresh snapshot: %w", err)
-		}
-		return nil
-	})
-}
-
 func (s *LocalConfigurationService) buildConfigurationSnapshot(localCfg *localdb.LocalConfiguration) (string, error) {
 	return localdb.BuildConfigurationSnapshot(localCfg)
 }
@@ -1611,15 +1419,8 @@ func (s *LocalConfigurationService) rollbackToVersion(configurationUUID string,
 		current.Notes = rollbackData.Notes
 		current.IsTemplate = rollbackData.IsTemplate
 		current.ServerCount = rollbackData.ServerCount
-		current.ServerModel = rollbackData.ServerModel
-		current.SupportCode = rollbackData.SupportCode
-		current.Article = rollbackData.Article
 		current.PricelistID = rollbackData.PricelistID
-		current.WarehousePricelistID = rollbackData.WarehousePricelistID
-		current.CompetitorPricelistID = rollbackData.CompetitorPricelistID
-		current.DisablePriceRefresh = rollbackData.DisablePriceRefresh
 		current.OnlyInStock = rollbackData.OnlyInStock
-		current.VendorSpec = rollbackData.VendorSpec
 		if rollbackData.Line > 0 {
 			current.Line = rollbackData.Line
 		}

internal/services/local_configuration_versioning_test.go

@@ -137,77 +137,6 @@ func TestUpdateNoAuthSkipsRevisionWhenSpecAndPriceUnchanged(t *testing.T) {
 	}
 }
 
-func TestUpdateNoAuthCreatesRevisionWhenPricingSettingsChanged(t *testing.T) {
-	service, local := newLocalConfigServiceForTest(t)
-
-	created, err := service.Create("tester", &CreateConfigRequest{
-		Name:        "pricing",
-		Items:       models.ConfigItems{{LotName: "CPU_A", Quantity: 1, UnitPrice: 1000}},
-		ServerCount: 1,
-	})
-	if err != nil {
-		t.Fatalf("create config: %v", err)
-	}
-
-	if _, err := service.UpdateNoAuth(created.UUID, &CreateConfigRequest{
-		Name:                "pricing",
-		Items:               models.ConfigItems{{LotName: "CPU_A", Quantity: 1, UnitPrice: 1000}},
-		ServerCount:         1,
-		DisablePriceRefresh: true,
-		OnlyInStock:         true,
-	}); err != nil {
-		t.Fatalf("update pricing settings: %v", err)
-	}
-
-	versions := loadVersions(t, local, created.UUID)
-	if len(versions) != 2 {
-		t.Fatalf("expected 2 versions after pricing settings change, got %d", len(versions))
-	}
-	if versions[1].VersionNo != 2 {
-		t.Fatalf("expected latest version_no=2, got %d", versions[1].VersionNo)
-	}
-}
-
-func TestUpdateVendorSpecNoAuthCreatesRevision(t *testing.T) {
-	service, local := newLocalConfigServiceForTest(t)
-
-	created, err := service.Create("tester", &CreateConfigRequest{
-		Name:        "bom",
-		Items:       models.ConfigItems{{LotName: "CPU_A", Quantity: 1, UnitPrice: 1000}},
-		ServerCount: 1,
-	})
-	if err != nil {
-		t.Fatalf("create config: %v", err)
-	}
-
-	spec := localdb.VendorSpec{
-		{
-			VendorPartnumber: "PN-001",
-			Quantity:         2,
-			SortOrder:        10,
-			LotMappings: []localdb.VendorSpecLotMapping{
-				{LotName: "CPU_A", QuantityPerPN: 1},
-			},
-		},
-	}
-	if _, err := service.UpdateVendorSpecNoAuth(created.UUID, spec); err != nil {
-		t.Fatalf("update vendor spec: %v", err)
-	}
-
-	versions := loadVersions(t, local, created.UUID)
-	if len(versions) != 2 {
-		t.Fatalf("expected 2 versions after vendor spec change, got %d", len(versions))
-	}
-
-	cfg, err := local.GetConfigurationByUUID(created.UUID)
-	if err != nil {
-		t.Fatalf("load config after vendor spec update: %v", err)
-	}
-	if len(cfg.VendorSpec) != 1 || cfg.VendorSpec[0].VendorPartnumber != "PN-001" {
-		t.Fatalf("expected saved vendor spec, got %+v", cfg.VendorSpec)
-	}
-}
-
 func TestReorderProjectConfigurationsDoesNotCreateNewVersions(t *testing.T) {
 	service, local := newLocalConfigServiceForTest(t)
 

internal/services/project.go

@@ -5,7 +5,6 @@ import (
 	"errors"
 	"fmt"
 	"net/url"
-	"regexp"
 	"strings"
 	"time"
 
@@ -17,19 +16,12 @@ import (
 )
 
 var (
-	ErrProjectNotFound            = errors.New("project not found")
-	ErrProjectForbidden           = errors.New("access to project forbidden")
-	ErrProjectCodeExists          = errors.New("project code and variant already exist")
-	ErrCannotDeleteMainVariant    = errors.New("cannot delete main variant")
-	ErrReservedMainVariant        = errors.New("variant name 'main' is reserved")
-	ErrCannotRenameMainVariant    = errors.New("cannot rename main variant")
-	ErrProjectCodeInvalidChars    = errors.New("код опти содержит недопустимые символы (разрешены: буквы, цифры, дефис, точка, подчёркивание)")
-	ErrProjectVariantInvalidChars = errors.New("имя варианта содержит недопустимые символы (разрешены: буквы, цифры, дефис, точка, подчёркивание)")
+	ErrProjectNotFound         = errors.New("project not found")
+	ErrProjectForbidden        = errors.New("access to project forbidden")
+	ErrProjectCodeExists       = errors.New("project code and variant already exist")
+	ErrCannotDeleteMainVariant = errors.New("cannot delete main variant")
 )
 
-// projectCodeRe allows only URL-path-safe characters so project codes can appear directly in URLs.
-var projectCodeRe = regexp.MustCompile(`^[A-Za-z0-9._-]+$`)
-
 type ProjectService struct {
 	localDB *localdb.LocalDB
 }
@@ -70,13 +62,7 @@ func (s *ProjectService) Create(ownerUsername string, req *CreateProjectRequest)
 	if code == "" {
 		return nil, fmt.Errorf("project code is required")
 	}
-	if !projectCodeRe.MatchString(code) {
-		return nil, ErrProjectCodeInvalidChars
-	}
 	variant := strings.TrimSpace(req.Variant)
-	if err := validateProjectVariantName(variant); err != nil {
-		return nil, err
-	}
 	if err := s.ensureUniqueProjectCodeVariant("", code, variant); err != nil {
 		return nil, err
 	}
@@ -115,21 +101,10 @@ func (s *ProjectService) Update(projectUUID, ownerUsername string, req *UpdatePr
 		if code == "" {
 			return nil, fmt.Errorf("project code is required")
 		}
-		if !projectCodeRe.MatchString(code) {
-			return nil, ErrProjectCodeInvalidChars
-		}
 		localProject.Code = code
 	}
 	if req.Variant != nil {
-		newVariant := strings.TrimSpace(*req.Variant)
-		// Block renaming of the main variant (empty Variant) — there must always be a main.
-		if strings.TrimSpace(localProject.Variant) == "" && newVariant != "" {
-			return nil, ErrCannotRenameMainVariant
-		}
-		localProject.Variant = newVariant
-		if err := validateProjectVariantName(localProject.Variant); err != nil {
-			return nil, err
-		}
+		localProject.Variant = strings.TrimSpace(*req.Variant)
 	}
 	if err := s.ensureUniqueProjectCodeVariant(projectUUID, localProject.Code, localProject.Variant); err != nil {
 		return nil, err
@@ -191,16 +166,6 @@ func normalizeProjectVariant(variant string) string {
 	return strings.ToLower(strings.TrimSpace(variant))
 }
 
-func validateProjectVariantName(variant string) error {
-	if normalizeProjectVariant(variant) == "main" {
-		return ErrReservedMainVariant
-	}
-	if variant != "" && !projectCodeRe.MatchString(variant) {
-		return ErrProjectVariantInvalidChars
-	}
-	return nil
-}
-
 func (s *ProjectService) Archive(projectUUID, ownerUsername string) error {
 	return s.setProjectActive(projectUUID, ownerUsername, false)
 }
@@ -297,24 +262,6 @@ func (s *ProjectService) GetByUUID(projectUUID, ownerUsername string) (*models.P
 	return localdb.LocalToProject(localProject), nil
 }
 
-// GetByCode finds the main variant of a project by its code (case-insensitive).
-func (s *ProjectService) GetByCode(code string) (*models.Project, error) {
-	localProject, err := s.localDB.GetProjectByCode(code)
-	if err != nil {
-		return nil, ErrProjectNotFound
-	}
-	return localdb.LocalToProject(localProject), nil
-}
-
-// GetByCodeAndVariant finds a project by code + variant (both case-insensitive).
-func (s *ProjectService) GetByCodeAndVariant(code, variant string) (*models.Project, error) {
-	localProject, err := s.localDB.GetProjectByCodeAndVariant(code, variant)
-	if err != nil {
-		return nil, ErrProjectNotFound
-	}
-	return localdb.LocalToProject(localProject), nil
-}
-
 func (s *ProjectService) ListConfigurations(projectUUID, ownerUsername, status string) (*ProjectConfigurationsResult, error) {
 	project, err := s.GetByUUID(projectUUID, ownerUsername)
 	if err != nil {

internal/services/project_test.go

@@ -1,60 +0,0 @@
-package services
-
-import (
-	"errors"
-	"path/filepath"
-	"testing"
-
-	"git.mchus.pro/mchus/quoteforge/internal/localdb"
-)
-
-func TestProjectServiceCreateRejectsReservedMainVariant(t *testing.T) {
-	local, err := newProjectTestLocalDB(t)
-	if err != nil {
-		t.Fatalf("open localdb: %v", err)
-	}
-	service := NewProjectService(local)
-
-	_, err = service.Create("tester", &CreateProjectRequest{
-		Code:    "OPS-1",
-		Variant: "main",
-	})
-	if !errors.Is(err, ErrReservedMainVariant) {
-		t.Fatalf("expected ErrReservedMainVariant, got %v", err)
-	}
-}
-
-func TestProjectServiceUpdateRejectsReservedMainVariant(t *testing.T) {
-	local, err := newProjectTestLocalDB(t)
-	if err != nil {
-		t.Fatalf("open localdb: %v", err)
-	}
-	service := NewProjectService(local)
-
-	created, err := service.Create("tester", &CreateProjectRequest{
-		Code:    "OPS-1",
-		Variant: "Lenovo",
-	})
-	if err != nil {
-		t.Fatalf("create project: %v", err)
-	}
-
-	mainName := "main"
-	_, err = service.Update(created.UUID, "tester", &UpdateProjectRequest{
-		Variant: &mainName,
-	})
-	if !errors.Is(err, ErrReservedMainVariant) {
-		t.Fatalf("expected ErrReservedMainVariant, got %v", err)
-	}
-}
-
-func newProjectTestLocalDB(t *testing.T) (*localdb.LocalDB, error) {
-	t.Helper()
-	dbPath := filepath.Join(t.TempDir(), "project_test.db")
-	local, err := localdb.New(dbPath)
-	if err != nil {
-		return nil, err
-	}
-	t.Cleanup(func() { _ = local.Close() })
-	return local, nil
-}

internal/services/quote.go

@@ -19,6 +19,7 @@ var (
 
 type QuoteService struct {
 	componentRepo  *repository.ComponentRepository
+	statsRepo      *repository.StatsRepository
 	pricelistRepo  *repository.PricelistRepository
 	localDB        *localdb.LocalDB
 	pricingService priceResolver
@@ -33,12 +34,14 @@ type priceResolver interface {
 
 func NewQuoteService(
 	componentRepo *repository.ComponentRepository,
+	statsRepo *repository.StatsRepository,
 	pricelistRepo *repository.PricelistRepository,
 	localDB *localdb.LocalDB,
 	pricingService priceResolver,
 ) *QuoteService {
 	return &QuoteService{
 		componentRepo:  componentRepo,
+		statsRepo:      statsRepo,
 		pricelistRepo:  pricelistRepo,
 		localDB:        localDB,
 		pricingService: pricingService,
@@ -385,14 +388,13 @@ func (s *QuoteService) lookupPricesByPricelistID(pricelistID uint, lotNames []st
 		}
 	}
 
-	// Fallback path (usually offline): batch local lookup (single query via index).
+	// Fallback path (usually offline): local per-lot lookup.
 	if s.localDB != nil {
-		if localPL, err := s.localDB.GetLocalPricelistByServerID(pricelistID); err == nil {
-			if batchPrices, err := s.localDB.GetLocalPricesForLots(localPL.ID, missing); err == nil {
-				for lotName, price := range batchPrices {
-					result[lotName] = price
-					loaded[lotName] = price
-				}
+		for _, lotName := range missing {
+			price, found := s.lookupPriceByPricelistID(pricelistID, lotName)
+			if found && price > 0 {
+				result[lotName] = price
+				loaded[lotName] = price
 			}
 		}
 		s.updateCache(pricelistID, missing, loaded)
@@ -501,3 +503,18 @@ func (s *QuoteService) lookupPriceByPricelistID(pricelistID uint, lotName string
 	return 0, false
 }
 
+// RecordUsage records that components were used in a quote
+func (s *QuoteService) RecordUsage(items []models.ConfigItem) error {
+	if s.statsRepo == nil {
+		// Offline mode: usage stats are unavailable and should not block config saves.
+		return nil
+	}
+
+	for _, item := range items {
+		revenue := item.UnitPrice * float64(item.Quantity)
+		if err := s.statsRepo.IncrementUsage(item.LotName, item.Quantity, revenue); err != nil {
+			return err
+		}
+	}
+	return nil
+}

internal/services/quote_price_levels_test.go

@@ -13,7 +13,7 @@ import (
 func TestCalculatePriceLevels_WithMissingLevel(t *testing.T) {
 	db := newPriceLevelsTestDB(t)
 	repo := repository.NewPricelistRepository(db)
-	service := NewQuoteService(nil, repo, nil, nil)
+	service := NewQuoteService(nil, nil, repo, nil, nil)
 
 	estimate := seedPricelistWithItem(t, repo, "estimate", "CPU_X", 100)
 	_ = estimate
@@ -57,7 +57,7 @@ func TestCalculatePriceLevels_WithMissingLevel(t *testing.T) {
 func TestCalculatePriceLevels_UsesExplicitPricelistIDs(t *testing.T) {
 	db := newPriceLevelsTestDB(t)
 	repo := repository.NewPricelistRepository(db)
-	service := NewQuoteService(nil, repo, nil, nil)
+	service := NewQuoteService(nil, nil, repo, nil, nil)
 
 	olderEstimate := seedPricelistWithItem(t, repo, "estimate", "CPU_Y", 80)
 	seedPricelistWithItem(t, repo, "estimate", "CPU_Y", 90)

internal/services/sync/partnumber_books.go

@@ -1,7 +1,6 @@
 package sync
 
 import (
-	"encoding/json"
 	"fmt"
 	"log/slog"
 	"time"
@@ -24,14 +23,13 @@ func (s *Service) PullPartnumberBooks() (int, error) {
 	localBookRepo := repository.NewPartnumberBookRepository(s.localDB.DB())
 
 	type serverBook struct {
-		ID              int       `gorm:"column:id"`
-		Version         string    `gorm:"column:version"`
-		CreatedAt       time.Time `gorm:"column:created_at"`
-		IsActive        bool      `gorm:"column:is_active"`
-		PartnumbersJSON string    `gorm:"column:partnumbers_json"`
+		ID        int       `gorm:"column:id"`
+		Version   string    `gorm:"column:version"`
+		CreatedAt time.Time `gorm:"column:created_at"`
+		IsActive  bool      `gorm:"column:is_active"`
 	}
 	var serverBooks []serverBook
-	if err := mariaDB.Raw("SELECT id, version, created_at, is_active, partnumbers_json FROM qt_partnumber_books ORDER BY created_at DESC, id DESC").Scan(&serverBooks).Error; err != nil {
+	if err := mariaDB.Raw("SELECT id, version, created_at, is_active FROM qt_partnumber_books ORDER BY created_at DESC, id DESC").Scan(&serverBooks).Error; err != nil {
 		return 0, fmt.Errorf("querying server partnumber books: %w", err)
 	}
 	slog.Info("partnumber books found on server", "count", len(serverBooks))
@@ -40,28 +38,16 @@ func (s *Service) PullPartnumberBooks() (int, error) {
 	for _, sb := range serverBooks {
 		var existing localdb.LocalPartnumberBook
 		err := s.localDB.DB().Where("server_id = ?", sb.ID).First(&existing).Error
-		partnumbers, errPartnumbers := decodeServerPartnumbers(sb.PartnumbersJSON)
-		if errPartnumbers != nil {
-			slog.Error("failed to decode server partnumbers_json", "server_id", sb.ID, "error", errPartnumbers)
-			continue
-		}
 		if err == nil {
-			existing.Version = sb.Version
-			existing.CreatedAt = sb.CreatedAt
-			existing.IsActive = sb.IsActive
-			existing.PartnumbersJSON = partnumbers
-			if err := localBookRepo.SaveBook(&existing); err != nil {
-				slog.Error("failed to update local partnumber book header", "server_id", sb.ID, "error", err)
-				continue
-			}
-
+			// Header exists — check whether items were saved
 			localItemCount := localBookRepo.CountBookItems(existing.ID)
-			if localItemCount > 0 && localBookRepo.HasAllBookItems(existing.ID) {
+			if localItemCount > 0 {
 				slog.Debug("partnumber book already synced, skipping", "server_id", sb.ID, "version", sb.Version, "items", localItemCount)
 				continue
 			}
-			slog.Info("partnumber book header exists but catalog items are missing, re-pulling items", "server_id", sb.ID, "version", sb.Version)
-			n, err := pullBookItems(mariaDB, localBookRepo, existing.PartnumbersJSON)
+			// Items missing — re-pull them
+			slog.Info("partnumber book header exists but has no items, re-pulling items", "server_id", sb.ID, "version", sb.Version)
+			n, err := pullBookItems(mariaDB, localBookRepo, sb.ID, existing.ID)
 			if err != nil {
 				slog.Error("failed to re-pull items for existing book", "server_id", sb.ID, "error", err)
 			} else {
@@ -74,18 +60,17 @@ func (s *Service) PullPartnumberBooks() (int, error) {
 		slog.Info("pulling new partnumber book", "server_id", sb.ID, "version", sb.Version, "is_active", sb.IsActive)
 
 		localBook := &localdb.LocalPartnumberBook{
-			ServerID:        sb.ID,
-			Version:         sb.Version,
-			CreatedAt:       sb.CreatedAt,
-			IsActive:        sb.IsActive,
-			PartnumbersJSON: partnumbers,
+			ServerID:  sb.ID,
+			Version:   sb.Version,
+			CreatedAt: sb.CreatedAt,
+			IsActive:  sb.IsActive,
 		}
 		if err := localBookRepo.SaveBook(localBook); err != nil {
 			slog.Error("failed to save local partnumber book", "server_id", sb.ID, "error", err)
 			continue
 		}
 
-		n, err := pullBookItems(mariaDB, localBookRepo, localBook.PartnumbersJSON)
+		n, err := pullBookItems(mariaDB, localBookRepo, sb.ID, localBook.ID)
 		if err != nil {
 			slog.Error("failed to pull items for new book", "server_id", sb.ID, "error", err)
 			continue
@@ -99,39 +84,39 @@ func (s *Service) PullPartnumberBooks() (int, error) {
 	return pulled, nil
 }
 
-// pullBookItems fetches catalog items for a partnumber list from MariaDB and saves them to SQLite.
+// pullBookItems fetches items for a single book from MariaDB and saves them to SQLite.
 // Returns the number of items saved.
-func pullBookItems(mariaDB *gorm.DB, repo *repository.PartnumberBookRepository, partnumbers localdb.LocalStringList) (int, error) {
-	if len(partnumbers) == 0 {
-		return 0, nil
-	}
-
+func pullBookItems(mariaDB *gorm.DB, repo *repository.PartnumberBookRepository, serverBookID int, localBookID uint) (int, error) {
 	type serverItem struct {
 		Partnumber  string `gorm:"column:partnumber"`
-		LotsJSON    string `gorm:"column:lots_json"`
+		LotName     string `gorm:"column:lot_name"`
+		IsPrimaryPN bool   `gorm:"column:is_primary_pn"`
 		Description string `gorm:"column:description"`
 	}
+	// description column may not exist yet on older server schemas — query without it first,
+	// then retry with it to populate descriptions if available.
 	var serverItems []serverItem
-	err := mariaDB.Raw("SELECT partnumber, lots_json, description FROM qt_partnumber_book_items WHERE partnumber IN ?", []string(partnumbers)).Scan(&serverItems).Error
+	err := mariaDB.Raw("SELECT partnumber, lot_name, is_primary_pn, description FROM qt_partnumber_book_items WHERE book_id = ?", serverBookID).Scan(&serverItems).Error
 	if err != nil {
-		return 0, fmt.Errorf("querying items from server: %w", err)
+		slog.Warn("description column not available on server, retrying without it", "server_book_id", serverBookID, "error", err)
+		if err2 := mariaDB.Raw("SELECT partnumber, lot_name, is_primary_pn FROM qt_partnumber_book_items WHERE book_id = ?", serverBookID).Scan(&serverItems).Error; err2 != nil {
+			return 0, fmt.Errorf("querying items from server: %w", err2)
+		}
 	}
-	slog.Info("partnumber book items fetched from server", "count", len(serverItems), "requested_partnumbers", len(partnumbers))
+	slog.Info("partnumber book items fetched from server", "server_book_id", serverBookID, "count", len(serverItems))
 
 	if len(serverItems) == 0 {
-		slog.Warn("server returned 0 partnumber book items")
+		slog.Warn("server returned 0 items for book — check qt_partnumber_book_items on server", "server_book_id", serverBookID)
 		return 0, nil
 	}
 
 	localItems := make([]localdb.LocalPartnumberBookItem, 0, len(serverItems))
 	for _, si := range serverItems {
-		var lots localdb.LocalPartnumberBookLots
-		if err := json.Unmarshal([]byte(si.LotsJSON), &lots); err != nil {
-			return 0, fmt.Errorf("decode lots_json for %s: %w", si.Partnumber, err)
-		}
 		localItems = append(localItems, localdb.LocalPartnumberBookItem{
+			BookID:      localBookID,
 			Partnumber:  si.Partnumber,
-			LotsJSON:    lots,
+			LotName:     si.LotName,
+			IsPrimaryPN: si.IsPrimaryPN,
 			Description: si.Description,
 		})
 	}
@@ -140,14 +125,3 @@ func pullBookItems(mariaDB *gorm.DB, repo *repository.PartnumberBookRepository,
 	}
 	return len(localItems), nil
 }
-
-func decodeServerPartnumbers(raw string) (localdb.LocalStringList, error) {
-	if raw == "" {
-		return localdb.LocalStringList{}, nil
-	}
-	var items []string
-	if err := json.Unmarshal([]byte(raw), &items); err != nil {
-		return nil, err
-	}
-	return localdb.LocalStringList(items), nil
-}

internal/services/sync/partnumber_seen.go

@@ -1,31 +1,20 @@
 package sync
 
 import (
-	"encoding/json"
 	"fmt"
 	"log/slog"
-	"strings"
 	"time"
 )
 
 // SeenPartnumber represents an unresolved vendor partnumber to report.
 type SeenPartnumber struct {
-	Partnumber    string
-	Description   string
-	Ignored       bool
-	LotSuggestion []LotSuggestionEntry // optional; set when user manually mapped PN → LOT in UI
-}
-
-// LotSuggestionEntry is one suggested LOT mapping for a vendor partnumber.
-// JSON shape mirrors qt_partnumber_book_items.lots_json: {"lot_name", "qty"}.
-type LotSuggestionEntry struct {
-	LotName string `json:"lot_name"`
-	Qty     int    `json:"qty"`
+	Partnumber  string
+	Description string
+	Ignored     bool
 }
 
 // PushPartnumberSeen inserts unresolved vendor partnumbers into qt_vendor_partnumber_seen on MariaDB.
-// When LotSuggestion is provided the column is updated too; if the column does not exist yet
-// (migration pending) the write is retried without it and a warning is logged — the app never panics.
+// Uses INSERT ... ON DUPLICATE KEY UPDATE so existing rows are updated (last_seen_at) without error.
 func (s *Service) PushPartnumberSeen(items []SeenPartnumber) error {
 	if len(items) == 0 {
 		return nil
@@ -41,64 +30,22 @@ func (s *Service) PushPartnumberSeen(items []SeenPartnumber) error {
 		if item.Partnumber == "" {
 			continue
 		}
-
-		if len(item.LotSuggestion) > 0 {
-			suggJSON, marshalErr := json.Marshal(item.LotSuggestion)
-			if marshalErr != nil {
-				slog.Error("partnumber_seen: failed to marshal lot_suggestion, skipping suggestion",
-					"partnumber", item.Partnumber, "error", marshalErr)
-				suggJSON = nil
-			}
-
-			if suggJSON != nil {
-				err = mariaDB.Exec(`
-					INSERT INTO qt_vendor_partnumber_seen
-						(source_type, vendor, partnumber, description, is_ignored, last_seen_at, lot_suggestion)
-					VALUES
-						('manual', '', ?, ?, ?, ?, ?)
-					ON DUPLICATE KEY UPDATE
-						lot_suggestion = VALUES(lot_suggestion),
-						last_seen_at   = NOW(3)
-				`, item.Partnumber, item.Description, item.Ignored, now, string(suggJSON)).Error
-
-				if err == nil {
-					continue
-				}
-
-				// Column not yet migrated — fall through to insert without lot_suggestion.
-				if !isUnknownColumnError(err) {
-					slog.Error("partnumber_seen: failed to upsert with lot_suggestion",
-						"partnumber", item.Partnumber, "error", err)
-					continue
-				}
-				slog.Warn("partnumber_seen: lot_suggestion column missing (migration pending), inserting without it",
-					"partnumber", item.Partnumber)
-			}
-		}
-
-		// Insert without lot_suggestion (baseline behaviour or fallback).
-		err = mariaDB.Exec(`
+		err := mariaDB.Exec(`
 			INSERT INTO qt_vendor_partnumber_seen
 				(source_type, vendor, partnumber, description, is_ignored, last_seen_at)
 			VALUES
 				('manual', '', ?, ?, ?, ?)
 			ON DUPLICATE KEY UPDATE
-				partnumber = partnumber
+				last_seen_at = VALUES(last_seen_at),
+				is_ignored   = VALUES(is_ignored),
+				description  = COALESCE(NULLIF(VALUES(description), ''), description)
 		`, item.Partnumber, item.Description, item.Ignored, now).Error
 		if err != nil {
-			slog.Error("failed to insert partnumber_seen", "partnumber", item.Partnumber, "error", err)
+			slog.Error("failed to upsert partnumber_seen", "partnumber", item.Partnumber, "error", err)
+			// Continue with remaining items
 		}
 	}
 
 	slog.Info("partnumber_seen pushed to server", "count", len(items))
 	return nil
 }
-
-// isUnknownColumnError returns true when MariaDB reports that a column does not exist.
-func isUnknownColumnError(err error) bool {
-	if err == nil {
-		return false
-	}
-	msg := strings.ToLower(err.Error())
-	return strings.Contains(msg, "unknown column") || strings.Contains(msg, "1054")
-}

internal/services/sync/readiness.go

@@ -1,11 +1,13 @@
 package sync
 
 import (
-	"encoding/json"
+	"bufio"
+	"crypto/sha256"
+	"encoding/hex"
 	"errors"
 	"fmt"
 	"log/slog"
-	"os"
+	"strconv"
 	"strings"
 	"time"
 
@@ -77,11 +79,48 @@ func (s *Service) GetReadiness() (*SyncReadiness, error) {
 		)
 	}
 
-	s.schemaOnce.Do(func() {
-		if err := ensureClientSchemaStateTable(mariaDB); err != nil {
-			slog.Warn("qt_client_schema_state migration skipped (no DDL rights — run server migrate)", "error", err)
+	migrations, err := listActiveClientMigrations(mariaDB)
+	if err != nil {
+		return s.blockedReadiness(
+			now,
+			"REMOTE_MIGRATION_REGISTRY_UNAVAILABLE",
+			"Синхронизация заблокирована: не удалось проверить централизованные миграции локальной БД.",
+			nil,
+		)
+	}
+
+	for i := range migrations {
+		m := migrations[i]
+		if strings.TrimSpace(m.MinAppVersion) != "" {
+			if compareVersions(appmeta.Version(), m.MinAppVersion) < 0 {
+				min := m.MinAppVersion
+				return s.blockedReadiness(
+					now,
+					"MIN_APP_VERSION_REQUIRED",
+					fmt.Sprintf("Требуется обновление приложения до версии %s для безопасной синхронизации.", m.MinAppVersion),
+					&min,
+				)
+			}
 		}
-	})
+	}
+
+	if err := s.applyMissingRemoteMigrations(migrations); err != nil {
+		if strings.Contains(strings.ToLower(err.Error()), "checksum") {
+			return s.blockedReadiness(
+				now,
+				"REMOTE_MIGRATION_CHECKSUM_MISMATCH",
+				"Синхронизация заблокирована: контрольная сумма миграции не совпадает.",
+				nil,
+			)
+		}
+		return s.blockedReadiness(
+			now,
+			"LOCAL_MIGRATION_APPLY_FAILED",
+			"Синхронизация заблокирована: не удалось применить миграции локальной БД.",
+			nil,
+		)
+	}
+
 	if err := s.reportClientSchemaState(mariaDB, now); err != nil {
 		slog.Warn("failed to report client schema state", "error", err)
 	}
@@ -118,98 +157,76 @@ func (s *Service) isOnline() bool {
 	return s.connMgr.IsOnline()
 }
 
-func ensureClientSchemaStateTable(db *gorm.DB) error {
+type clientLocalMigration struct {
+	ID            string    `gorm:"column:id"`
+	Name          string    `gorm:"column:name"`
+	SQLText       string    `gorm:"column:sql_text"`
+	Checksum      string    `gorm:"column:checksum"`
+	MinAppVersion string    `gorm:"column:min_app_version"`
+	OrderNo       int       `gorm:"column:order_no"`
+	CreatedAt     time.Time `gorm:"column:created_at"`
+}
+
+func listActiveClientMigrations(db *gorm.DB) ([]clientLocalMigration, error) {
+	if strings.EqualFold(db.Dialector.Name(), "sqlite") {
+		return []clientLocalMigration{}, nil
+	}
+	if err := ensureClientMigrationRegistryTable(db); err != nil {
+		return nil, err
+	}
+
+	rows := make([]clientLocalMigration, 0)
+	if err := db.Raw(`
+		SELECT id, name, sql_text, checksum, COALESCE(min_app_version, '') AS min_app_version, order_no, created_at
+		FROM qt_client_local_migrations
+		WHERE is_active = 1
+		ORDER BY order_no ASC, created_at ASC, id ASC
+	`).Scan(&rows).Error; err != nil {
+		return nil, fmt.Errorf("load client local migrations: %w", err)
+	}
+
+	return rows, nil
+}
+
+func ensureClientMigrationRegistryTable(db *gorm.DB) error {
+	// Check if table exists instead of trying to create (avoids permission issues)
+	if !tableExists(db, "qt_client_local_migrations") {
+		if err := db.Exec(`
+			CREATE TABLE IF NOT EXISTS qt_client_local_migrations (
+				id VARCHAR(128) NOT NULL,
+				name VARCHAR(255) NOT NULL,
+				sql_text LONGTEXT NOT NULL,
+				checksum VARCHAR(128) NOT NULL,
+				min_app_version VARCHAR(64) NULL,
+				order_no INT NOT NULL DEFAULT 0,
+				is_active TINYINT(1) NOT NULL DEFAULT 1,
+				created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+				PRIMARY KEY (id),
+				INDEX idx_qt_client_local_migrations_active_order (is_active, order_no, created_at)
+			)
+		`).Error; err != nil {
+			return fmt.Errorf("create qt_client_local_migrations table: %w", err)
+		}
+	}
+
 	if !tableExists(db, "qt_client_schema_state") {
 		if err := db.Exec(`
 			CREATE TABLE IF NOT EXISTS qt_client_schema_state (
 				username VARCHAR(100) NOT NULL,
-				hostname VARCHAR(255) NOT NULL DEFAULT '',
+				last_applied_migration_id VARCHAR(128) NULL,
 				app_version VARCHAR(64) NULL,
-				last_sync_at DATETIME NULL,
-				last_sync_status VARCHAR(32) NULL,
-				pending_changes_count INT NOT NULL DEFAULT 0,
-				pending_errors_count INT NOT NULL DEFAULT 0,
-				configurations_count INT NOT NULL DEFAULT 0,
-				projects_count INT NOT NULL DEFAULT 0,
-				estimate_pricelist_version VARCHAR(128) NULL,
-				warehouse_pricelist_version VARCHAR(128) NULL,
-				competitor_pricelist_version VARCHAR(128) NULL,
-				last_sync_error_code VARCHAR(128) NULL,
-				last_sync_error_text TEXT NULL,
 				last_checked_at DATETIME NOT NULL,
 				updated_at DATETIME NOT NULL,
-				PRIMARY KEY (username, hostname),
+				PRIMARY KEY (username),
 				INDEX idx_qt_client_schema_state_checked (last_checked_at)
 			)
 		`).Error; err != nil {
 			return fmt.Errorf("create qt_client_schema_state table: %w", err)
 		}
 	}
-
-	if tableExists(db, "qt_client_schema_state") {
-		// Each ALTER is guarded by a column existence check so users without DDL
-		// rights don't get a permission error on every sync cycle — the server
-		// migration tool is the authoritative path for schema changes.
-		if !columnExists(db, "qt_client_schema_state", "hostname") {
-			if err := db.Exec(`
-				ALTER TABLE qt_client_schema_state
-				ADD COLUMN IF NOT EXISTS hostname VARCHAR(255) NOT NULL DEFAULT '' AFTER username
-			`).Error; err != nil {
-				return fmt.Errorf("add qt_client_schema_state.hostname: %w", err)
-			}
-			if err := db.Exec(`
-				ALTER TABLE qt_client_schema_state
-				DROP PRIMARY KEY,
-				ADD PRIMARY KEY (username, hostname)
-			`).Error; err != nil && !isDuplicatePrimaryKeyDefinition(err) {
-				return fmt.Errorf("set qt_client_schema_state primary key: %w", err)
-			}
-		}
-
-		type colMigration struct {
-			column string
-			stmt   string
-		}
-		migrations := []colMigration{
-			{"last_sync_at", "ALTER TABLE qt_client_schema_state ADD COLUMN IF NOT EXISTS last_sync_at DATETIME NULL AFTER app_version"},
-			{"last_sync_status", "ALTER TABLE qt_client_schema_state ADD COLUMN IF NOT EXISTS last_sync_status VARCHAR(32) NULL AFTER last_sync_at"},
-			{"pending_changes_count", "ALTER TABLE qt_client_schema_state ADD COLUMN IF NOT EXISTS pending_changes_count INT NOT NULL DEFAULT 0 AFTER last_sync_status"},
-			{"pending_errors_count", "ALTER TABLE qt_client_schema_state ADD COLUMN IF NOT EXISTS pending_errors_count INT NOT NULL DEFAULT 0 AFTER pending_changes_count"},
-			{"configurations_count", "ALTER TABLE qt_client_schema_state ADD COLUMN IF NOT EXISTS configurations_count INT NOT NULL DEFAULT 0 AFTER pending_errors_count"},
-			{"projects_count", "ALTER TABLE qt_client_schema_state ADD COLUMN IF NOT EXISTS projects_count INT NOT NULL DEFAULT 0 AFTER configurations_count"},
-			{"estimate_pricelist_version", "ALTER TABLE qt_client_schema_state ADD COLUMN IF NOT EXISTS estimate_pricelist_version VARCHAR(128) NULL AFTER projects_count"},
-			{"warehouse_pricelist_version", "ALTER TABLE qt_client_schema_state ADD COLUMN IF NOT EXISTS warehouse_pricelist_version VARCHAR(128) NULL AFTER estimate_pricelist_version"},
-			{"competitor_pricelist_version", "ALTER TABLE qt_client_schema_state ADD COLUMN IF NOT EXISTS competitor_pricelist_version VARCHAR(128) NULL AFTER warehouse_pricelist_version"},
-			{"last_sync_error_code", "ALTER TABLE qt_client_schema_state ADD COLUMN IF NOT EXISTS last_sync_error_code VARCHAR(128) NULL AFTER competitor_pricelist_version"},
-			{"last_sync_error_text", "ALTER TABLE qt_client_schema_state ADD COLUMN IF NOT EXISTS last_sync_error_text TEXT NULL AFTER last_sync_error_code"},
-			{"local_pricelist_count", "ALTER TABLE qt_client_schema_state ADD COLUMN IF NOT EXISTS local_pricelist_count INT NOT NULL DEFAULT 0 AFTER last_sync_error_text"},
-			{"pricelist_items_count", "ALTER TABLE qt_client_schema_state ADD COLUMN IF NOT EXISTS pricelist_items_count INT NOT NULL DEFAULT 0 AFTER local_pricelist_count"},
-			{"components_count", "ALTER TABLE qt_client_schema_state ADD COLUMN IF NOT EXISTS components_count INT NOT NULL DEFAULT 0 AFTER pricelist_items_count"},
-			{"db_size_bytes", "ALTER TABLE qt_client_schema_state ADD COLUMN IF NOT EXISTS db_size_bytes BIGINT NOT NULL DEFAULT 0 AFTER components_count"},
-		}
-		for _, m := range migrations {
-			if columnExists(db, "qt_client_schema_state", m.column) {
-				continue
-			}
-			if err := db.Exec(m.stmt).Error; err != nil {
-				return fmt.Errorf("expand qt_client_schema_state: %w", err)
-			}
-		}
-	}
 	return nil
 }
 
-func columnExists(db *gorm.DB, tableName, columnName string) bool {
-	var count int64
-	if err := db.Raw(`
-		SELECT COUNT(*) FROM information_schema.COLUMNS
-		WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = ? AND COLUMN_NAME = ?
-	`, tableName, columnName).Scan(&count).Error; err != nil {
-		return false
-	}
-	return count > 0
-}
-
 func tableExists(db *gorm.DB, tableName string) bool {
 	var count int64
 	// For MariaDB/MySQL, check information_schema
@@ -222,6 +239,110 @@ func tableExists(db *gorm.DB, tableName string) bool {
 	return count > 0
 }
 
+func (s *Service) applyMissingRemoteMigrations(migrations []clientLocalMigration) error {
+	for i := range migrations {
+		m := migrations[i]
+		computedChecksum := digestSQL(m.SQLText)
+		checksum := strings.TrimSpace(m.Checksum)
+		if checksum == "" {
+			checksum = computedChecksum
+		} else if !strings.EqualFold(checksum, computedChecksum) {
+			return fmt.Errorf("checksum mismatch for migration %s", m.ID)
+		}
+
+		applied, err := s.localDB.GetRemoteMigrationApplied(m.ID)
+		if err == nil {
+			if strings.TrimSpace(applied.Checksum) != checksum {
+				return fmt.Errorf("checksum mismatch for migration %s", m.ID)
+			}
+			continue
+		}
+		if !errors.Is(err, gorm.ErrRecordNotFound) {
+			return fmt.Errorf("check local applied migration %s: %w", m.ID, err)
+		}
+
+		if strings.TrimSpace(m.SQLText) == "" {
+			if err := s.localDB.UpsertRemoteMigrationApplied(m.ID, checksum, appmeta.Version(), time.Now().UTC()); err != nil {
+				return fmt.Errorf("mark empty migration %s as applied: %w", m.ID, err)
+			}
+			continue
+		}
+
+		statements := splitSQLStatementsLite(m.SQLText)
+		if err := s.localDB.DB().Transaction(func(tx *gorm.DB) error {
+			for _, stmt := range statements {
+				if err := tx.Exec(stmt).Error; err != nil {
+					return fmt.Errorf("apply migration %s statement %q: %w", m.ID, stmt, err)
+				}
+			}
+			return nil
+		}); err != nil {
+			return err
+		}
+
+		if err := s.localDB.UpsertRemoteMigrationApplied(m.ID, checksum, appmeta.Version(), time.Now().UTC()); err != nil {
+			return fmt.Errorf("record applied migration %s: %w", m.ID, err)
+		}
+	}
+	return nil
+}
+
+func splitSQLStatementsLite(script string) []string {
+	scanner := bufio.NewScanner(strings.NewReader(script))
+	scanner.Buffer(make([]byte, 1024), 1024*1024)
+
+	lines := make([]string, 0, 64)
+	for scanner.Scan() {
+		line := strings.TrimSpace(scanner.Text())
+		if line == "" || strings.HasPrefix(line, "--") {
+			continue
+		}
+		lines = append(lines, scanner.Text())
+	}
+	combined := strings.Join(lines, "\n")
+	raw := strings.Split(combined, ";")
+	stmts := make([]string, 0, len(raw))
+	for _, stmt := range raw {
+		trimmed := strings.TrimSpace(stmt)
+		if trimmed == "" {
+			continue
+		}
+		stmts = append(stmts, trimmed)
+	}
+	return stmts
+}
+
+func digestSQL(sqlText string) string {
+	hash := sha256.Sum256([]byte(sqlText))
+	return hex.EncodeToString(hash[:])
+}
+
+func compareVersions(left, right string) int {
+	leftParts := normalizeVersionParts(left)
+	rightParts := normalizeVersionParts(right)
+	maxLen := len(leftParts)
+	if len(rightParts) > maxLen {
+		maxLen = len(rightParts)
+	}
+	for i := 0; i < maxLen; i++ {
+		lv := 0
+		rv := 0
+		if i < len(leftParts) {
+			lv = leftParts[i]
+		}
+		if i < len(rightParts) {
+			rv = rightParts[i]
+		}
+		if lv < rv {
+			return -1
+		}
+		if lv > rv {
+			return 1
+		}
+	}
+	return 0
+}
+
 func (s *Service) reportClientSchemaState(mariaDB *gorm.DB, checkedAt time.Time) error {
 	if strings.EqualFold(mariaDB.Dialector.Name(), "sqlite") {
 		return nil
@@ -230,136 +351,47 @@ func (s *Service) reportClientSchemaState(mariaDB *gorm.DB, checkedAt time.Time)
 	if username == "" {
 		return nil
 	}
-	hostname, err := os.Hostname()
-	if err != nil {
-		hostname = ""
+	lastMigrationID := ""
+	if id, err := s.localDB.GetLatestAppliedRemoteMigrationID(); err == nil {
+		lastMigrationID = id
 	}
-	hostname = strings.TrimSpace(hostname)
-	lastSyncAt := s.localDB.GetLastSyncTime()
-	lastSyncStatus := ReadinessReady
-	pendingChangesCount := s.localDB.CountPendingChanges()
-	pendingErrorsCount := s.localDB.CountErroredChanges()
-	configurationsCount := s.localDB.CountConfigurations()
-	projectsCount := s.localDB.CountProjects()
-	estimateVersion := latestPricelistVersion(s.localDB, "estimate")
-	warehouseVersion := latestPricelistVersion(s.localDB, "warehouse")
-	competitorVersion := latestPricelistVersion(s.localDB, "competitor")
-	lastSyncErrorCode, lastSyncErrorText := latestSyncErrorState(s.localDB)
-	localPricelistCount := s.localDB.CountLocalPricelists()
-	pricelistItemsCount := s.localDB.CountAllPricelistItems()
-	componentsCount := s.localDB.CountComponents()
-	dbSizeBytes := s.localDB.DBFileSizeBytes()
 	return mariaDB.Exec(`
-		INSERT INTO qt_client_schema_state (
-			username, hostname, app_version,
-			last_sync_at, last_sync_status, pending_changes_count, pending_errors_count,
-			configurations_count, projects_count,
-			estimate_pricelist_version, warehouse_pricelist_version, competitor_pricelist_version,
-			last_sync_error_code, last_sync_error_text,
-			local_pricelist_count, pricelist_items_count, components_count, db_size_bytes,
-			last_checked_at, updated_at
-		)
-		VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+		INSERT INTO qt_client_schema_state (username, last_applied_migration_id, app_version, last_checked_at, updated_at)
+		VALUES (?, ?, ?, ?, ?)
 		ON DUPLICATE KEY UPDATE
+			last_applied_migration_id = VALUES(last_applied_migration_id),
 			app_version = VALUES(app_version),
-			last_sync_at = VALUES(last_sync_at),
-			last_sync_status = VALUES(last_sync_status),
-			pending_changes_count = VALUES(pending_changes_count),
-			pending_errors_count = VALUES(pending_errors_count),
-			configurations_count = VALUES(configurations_count),
-			projects_count = VALUES(projects_count),
-			estimate_pricelist_version = VALUES(estimate_pricelist_version),
-			warehouse_pricelist_version = VALUES(warehouse_pricelist_version),
-			competitor_pricelist_version = VALUES(competitor_pricelist_version),
-			last_sync_error_code = VALUES(last_sync_error_code),
-			last_sync_error_text = VALUES(last_sync_error_text),
-			local_pricelist_count = VALUES(local_pricelist_count),
-			pricelist_items_count = VALUES(pricelist_items_count),
-			components_count = VALUES(components_count),
-			db_size_bytes = VALUES(db_size_bytes),
 			last_checked_at = VALUES(last_checked_at),
 			updated_at = VALUES(updated_at)
-	`, username, hostname, appmeta.Version(),
-		lastSyncAt, lastSyncStatus, pendingChangesCount, pendingErrorsCount,
-		configurationsCount, projectsCount,
-		estimateVersion, warehouseVersion, competitorVersion,
-		lastSyncErrorCode, lastSyncErrorText,
-		localPricelistCount, pricelistItemsCount, componentsCount, dbSizeBytes,
-		checkedAt, checkedAt).Error
+	`, username, lastMigrationID, appmeta.Version(), checkedAt, checkedAt).Error
 }
 
-func isDuplicatePrimaryKeyDefinition(err error) bool {
-	if err == nil {
-		return false
+func normalizeVersionParts(v string) []int {
+	trimmed := strings.TrimSpace(v)
+	trimmed = strings.TrimPrefix(trimmed, "v")
+	chunks := strings.Split(trimmed, ".")
+	parts := make([]int, 0, len(chunks))
+	for _, chunk := range chunks {
+		clean := strings.TrimSpace(chunk)
+		if clean == "" {
+			parts = append(parts, 0)
+			continue
+		}
+		n := 0
+		for i := 0; i < len(clean); i++ {
+			if clean[i] < '0' || clean[i] > '9' {
+				clean = clean[:i]
+				break
+			}
+		}
+		if clean != "" {
+			if parsed, err := strconv.Atoi(clean); err == nil {
+				n = parsed
+			}
+		}
+		parts = append(parts, n)
 	}
-	msg := strings.ToLower(err.Error())
-	return strings.Contains(msg, "multiple primary key defined") ||
-		strings.Contains(msg, "duplicate key name 'primary'") ||
-		strings.Contains(msg, "duplicate entry")
-}
-
-func latestPricelistVersion(local *localdb.LocalDB, source string) *string {
-	if local == nil {
-		return nil
-	}
-	pl, err := local.GetLatestLocalPricelistBySource(source)
-	if err != nil || pl == nil {
-		return nil
-	}
-	version := strings.TrimSpace(pl.Version)
-	if version == "" {
-		return nil
-	}
-	return &version
-}
-
-func latestSyncErrorState(local *localdb.LocalDB) (*string, *string) {
-	if local == nil {
-		return nil, nil
-	}
-	if guard, err := local.GetSyncGuardState(); err == nil && guard != nil && strings.EqualFold(guard.Status, ReadinessBlocked) {
-		return optionalString(strings.TrimSpace(guard.ReasonCode)), optionalString(strings.TrimSpace(guard.ReasonText))
-	}
-
-	var errored []localdb.PendingChange
-	if err := local.DB().
-		Where("TRIM(COALESCE(last_error, '')) <> ''").
-		Order("id DESC").
-		Limit(20).
-		Find(&errored).Error; err != nil || len(errored) == 0 {
-		return nil, nil
-	}
-
-	type errorEntry struct {
-		Type     string `json:"type"`
-		UUID     string `json:"uuid"`
-		Op       string `json:"op"`
-		Attempts int    `json:"attempts"`
-		Error    string `json:"error"`
-	}
-	entries := make([]errorEntry, 0, len(errored))
-	for _, ch := range errored {
-		entries = append(entries, errorEntry{
-			Type:     ch.EntityType,
-			UUID:     ch.EntityUUID,
-			Op:       ch.Operation,
-			Attempts: ch.Attempts,
-			Error:    strings.TrimSpace(ch.LastError),
-		})
-	}
-	detail, jsonErr := json.Marshal(entries)
-	if jsonErr != nil {
-		return optionalString("PENDING_CHANGE_ERROR"), optionalString(strings.TrimSpace(errored[0].LastError))
-	}
-	return optionalString("PENDING_CHANGE_ERROR"), optionalString(string(detail))
-}
-
-func optionalString(value string) *string {
-	if strings.TrimSpace(value) == "" {
-		return nil
-	}
-	v := strings.TrimSpace(value)
-	return &v
+	return parts
 }
 
 func toReadinessFromState(state *localdb.LocalSyncGuardState) *SyncReadiness {

internal/services/sync/service.go

@@ -7,7 +7,6 @@ import (
 	"log/slog"
 	"sort"
 	"strings"
-	"sync"
 	"time"
 
 	"git.mchus.pro/mchus/quoteforge/internal/appmeta"
@@ -17,18 +16,15 @@ 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")
 
 // Service handles synchronization between MariaDB and local SQLite
 type Service struct {
-	connMgr     *db.ConnectionManager
-	localDB     *localdb.LocalDB
-	directDB    *gorm.DB
-	pricelistMu sync.Mutex // prevents concurrent pricelist syncs
-	schemaOnce  sync.Once  // ensures ensureClientSchemaStateTable runs at most once per process
+	connMgr  *db.ConnectionManager
+	localDB  *localdb.LocalDB
+	directDB *gorm.DB
 }
 
 // NewService creates a new sync service
@@ -49,15 +45,10 @@ func NewServiceWithDB(mariaDB *gorm.DB, localDB *localdb.LocalDB) *Service {
 
 // SyncStatus represents the current sync status
 type SyncStatus struct {
-	LastSyncAt             *time.Time `json:"last_sync_at"`
-	LastAttemptAt          *time.Time `json:"last_attempt_at,omitempty"`
-	LastSyncStatus         string     `json:"last_sync_status,omitempty"`
-	LastSyncError          string     `json:"last_sync_error,omitempty"`
-	ServerPricelists       int        `json:"server_pricelists"`
-	LocalPricelists        int        `json:"local_pricelists"`
-	NeedsSync              bool       `json:"needs_sync"`
-	IncompleteServerSync   bool       `json:"incomplete_server_sync"`
-	KnownServerChangesMiss bool       `json:"known_server_changes_missing"`
+	LastSyncAt       *time.Time `json:"last_sync_at"`
+	ServerPricelists int        `json:"server_pricelists"`
+	LocalPricelists  int        `json:"local_pricelists"`
+	NeedsSync        bool       `json:"needs_sync"`
 }
 
 type UserSyncStatus struct {
@@ -157,6 +148,9 @@ func (s *Service) ImportConfigurationsToLocal() (*ConfigImportResult, error) {
 				if localCfg.Line <= 0 && existing.Line > 0 {
 					localCfg.Line = existing.Line
 				}
+				// vendor_spec is local-only for BOM tab and is not stored on server.
+				// Preserve it during server pull updates.
+				localCfg.VendorSpec = existing.VendorSpec
 				result.Updated++
 			} else {
 				result.Imported++
@@ -224,7 +218,7 @@ func (s *Service) ImportProjectsToLocal() (*ProjectImportResult, error) {
 				existing.SyncStatus = "synced"
 				existing.SyncedAt = &now
 
-				if err := s.localDB.SaveProjectPreservingUpdatedAt(existing); err != nil {
+				if err := s.localDB.SaveProject(existing); err != nil {
 					return nil, fmt.Errorf("saving local project %s: %w", project.UUID, err)
 				}
 				result.Updated++
@@ -234,7 +228,7 @@ func (s *Service) ImportProjectsToLocal() (*ProjectImportResult, error) {
 			localProject := localdb.ProjectToLocal(&project)
 			localProject.SyncStatus = "synced"
 			localProject.SyncedAt = &now
-			if err := s.localDB.SaveProjectPreservingUpdatedAt(localProject); err != nil {
+			if err := s.localDB.SaveProject(localProject); err != nil {
 				return nil, fmt.Errorf("saving local project %s: %w", project.UUID, err)
 			}
 			result.Imported++
@@ -249,23 +243,30 @@ func (s *Service) ImportProjectsToLocal() (*ProjectImportResult, error) {
 // GetStatus returns the current sync status
 func (s *Service) GetStatus() (*SyncStatus, error) {
 	lastSync := s.localDB.GetLastSyncTime()
-	lastAttempt := s.localDB.GetLastPricelistSyncAttemptAt()
-	lastSyncStatus := s.localDB.GetLastPricelistSyncStatus()
-	lastSyncError := s.localDB.GetLastPricelistSyncError()
+
+	// Count server pricelists (only if already connected, don't reconnect)
+	serverCount := 0
+	connStatus := s.getConnectionStatus()
+	if connStatus.IsConnected {
+		if mariaDB, err := s.getDB(); err == nil && mariaDB != nil {
+			pricelistRepo := repository.NewPricelistRepository(mariaDB)
+			activeCount, err := pricelistRepo.CountActive()
+			if err == nil {
+				serverCount = int(activeCount)
+			}
+		}
+	}
+
+	// Count local pricelists
 	localCount := s.localDB.CountLocalPricelists()
-	hasFailedSync := strings.EqualFold(lastSyncStatus, "failed")
-	needsSync := lastSync == nil || hasFailedSync
+
+	needsSync, _ := s.NeedSync()
 
 	return &SyncStatus{
-		LastSyncAt:             lastSync,
-		LastAttemptAt:          lastAttempt,
-		LastSyncStatus:         lastSyncStatus,
-		LastSyncError:          lastSyncError,
-		ServerPricelists:       0,
-		LocalPricelists:        int(localCount),
-		NeedsSync:              needsSync,
-		IncompleteServerSync:   hasFailedSync,
-		KnownServerChangesMiss: hasFailedSync,
+		LastSyncAt:       lastSync,
+		ServerPricelists: serverCount,
+		LocalPricelists:  int(localCount),
+		NeedsSync:        needsSync,
 	}, nil
 }
 
@@ -274,62 +275,60 @@ func (s *Service) GetStatus() (*SyncStatus, error) {
 func (s *Service) NeedSync() (bool, error) {
 	lastSync := s.localDB.GetLastSyncTime()
 
-	// If never synced, always need sync.
+	// If never synced, need sync
 	if lastSync == nil {
 		return true, nil
 	}
 
-	// When online, compare actual server versions regardless of elapsed time.
-	// This prevents a stale "failed" status from the past from triggering
-	// endless sync retries when all pricelists are already up to date.
-	connStatus := s.getConnectionStatus()
-	if connStatus.IsConnected {
-		mariaDB, err := s.getDB()
-		if err == nil {
-			pricelistRepo := repository.NewPricelistRepository(mariaDB)
-			sources := []models.PricelistSource{
-				models.PricelistSourceEstimate,
-				models.PricelistSourceWarehouse,
-				models.PricelistSourceCompetitor,
-			}
-			allMatch := true
-			for _, source := range sources {
-				latestServer, err := pricelistRepo.GetLatestActiveBySource(string(source))
-				if err != nil {
-					continue
-				}
-				latestLocal, err := s.localDB.GetLatestLocalPricelistBySource(string(source))
-				if err != nil {
-					return true, nil
-				}
-				if latestServer.ID != latestLocal.ServerID {
-					return true, nil
-				}
-			}
-			if allMatch {
-				return false, nil
-			}
-		}
-	}
-
-	// Offline fallback: suggest sync if last successful sync was more than 1 hour ago.
+	// If last sync was more than 1 hour ago, suggest sync
 	if time.Since(*lastSync) > time.Hour {
 		return true, nil
 	}
 
+	// Check if there are new pricelists on server (only if already connected)
+	connStatus := s.getConnectionStatus()
+	if !connStatus.IsConnected {
+		// If offline, can't check server, no need to sync
+		return false, nil
+	}
+
+	mariaDB, err := s.getDB()
+	if err != nil {
+		// If offline, can't check server, no need to sync
+		return false, nil
+	}
+
+	pricelistRepo := repository.NewPricelistRepository(mariaDB)
+	sources := []models.PricelistSource{
+		models.PricelistSourceEstimate,
+		models.PricelistSourceWarehouse,
+		models.PricelistSourceCompetitor,
+	}
+	for _, source := range sources {
+		latestServer, err := pricelistRepo.GetLatestActiveBySource(string(source))
+		if err != nil {
+			// No active pricelist for this source yet.
+			continue
+		}
+
+		latestLocal, err := s.localDB.GetLatestLocalPricelistBySource(string(source))
+		if err != nil {
+			// No local pricelist for an existing source on server.
+			return true, nil
+		}
+
+		// If server has newer pricelist for this source, need sync.
+		if latestServer.ID != latestLocal.ServerID {
+			return true, nil
+		}
+	}
+
 	return false, nil
 }
 
 // SyncPricelists synchronizes all active pricelists from server to local SQLite
 func (s *Service) SyncPricelists() (int, error) {
-	s.pricelistMu.Lock()
-	defer s.pricelistMu.Unlock()
-	return s.syncPricelists()
-}
-
-func (s *Service) syncPricelists() (int, error) {
 	slog.Info("starting pricelist sync")
-	plSyncStart := time.Now()
 	if _, err := s.EnsureReadinessForSync(); err != nil {
 		return 0, err
 	}
@@ -337,24 +336,15 @@ func (s *Service) syncPricelists() (int, error) {
 	// Get database connection
 	mariaDB, err := s.getDB()
 	if err != nil {
-		s.recordPricelistSyncFailure(err)
-		s.localDB.AppendSyncLog("pricelists", "error", err.Error(), 0, plSyncStart, time.Since(plSyncStart).Milliseconds())
 		return 0, fmt.Errorf("database not available: %w", err)
 	}
 
-	defer func() {
-		if reportErr := s.reportClientSchemaState(mariaDB, time.Now().UTC()); reportErr != nil {
-			slog.Warn("failed to report client state after pricelist sync", "error", reportErr)
-		}
-	}()
-
 	// Create repository
 	pricelistRepo := repository.NewPricelistRepository(mariaDB)
 
 	// Get active pricelists from server (up to 100)
 	serverPricelists, _, err := pricelistRepo.ListActive(0, 100)
 	if err != nil {
-		s.recordPricelistSyncFailure(err)
 		return 0, fmt.Errorf("getting active server pricelists: %w", err)
 	}
 	serverPricelistIDs := make([]uint, 0, len(serverPricelists))
@@ -363,30 +353,14 @@ func (s *Service) syncPricelists() (int, error) {
 	}
 
 	synced := 0
-	var syncErr error
 	for _, pl := range serverPricelists {
 		// 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)
 				if err != nil {
-					if syncErr == nil {
-						syncErr = fmt.Errorf("sync items for existing pricelist %s: %w", pl.Version, err)
-					}
 					slog.Warn("failed to sync missing pricelist items for existing local pricelist", "version", pl.Version, "error", err)
 				} else {
 					slog.Info("synced missing pricelist items for existing local pricelist", "version", pl.Version, "items", itemCount)
@@ -406,15 +380,19 @@ func (s *Service) syncPricelists() (int, error) {
 			IsUsed:    false,
 		}
 
-		itemCount, err := s.syncNewPricelistSnapshot(localPL)
-		if err != nil {
-			if syncErr == nil {
-				syncErr = fmt.Errorf("sync new pricelist %s: %w", pl.Version, err)
-			}
-			slog.Warn("failed to sync pricelist snapshot", "version", pl.Version, "error", err)
+		if err := s.localDB.SaveLocalPricelist(localPL); err != nil {
+			slog.Warn("failed to save local pricelist", "version", pl.Version, "error", err)
 			continue
 		}
-		slog.Debug("synced pricelist with items", "version", pl.Version, "items", itemCount)
+
+		// Sync items for the newly created pricelist
+		itemCount, err := s.SyncPricelistItems(localPL.ID)
+		if err != nil {
+			slog.Warn("failed to sync pricelist items", "version", pl.Version, "error", err)
+			// Continue even if items sync fails - we have the pricelist metadata
+		} else {
+			slog.Debug("synced pricelist with items", "version", pl.Version, "items", itemCount)
+		}
 
 		synced++
 	}
@@ -429,123 +407,14 @@ func (s *Service) syncPricelists() (int, error) {
 	// Backfill lot_category for used pricelists (older local caches may miss the column values).
 	s.backfillUsedPricelistItemCategories(pricelistRepo, serverPricelistIDs)
 
-	if syncErr != nil {
-		s.recordPricelistSyncFailure(syncErr)
-		s.localDB.AppendSyncLog("pricelists", "error", syncErr.Error(), synced, plSyncStart, time.Since(plSyncStart).Milliseconds())
-		return synced, syncErr
-	}
-
 	// Update last sync time
-	now := time.Now()
-	s.localDB.SetLastSyncTime(now)
-	s.recordPricelistSyncSuccess(now)
-	s.localDB.AppendSyncLog("pricelists", "ok", "", synced, plSyncStart, time.Since(plSyncStart).Milliseconds())
+	s.localDB.SetLastSyncTime(time.Now())
+	s.RecordSyncHeartbeat()
 
 	slog.Info("pricelist sync completed", "synced", synced, "total", len(serverPricelists))
 	return synced, nil
 }
 
-func (s *Service) recordPricelistSyncSuccess(at time.Time) {
-	if s.localDB == nil {
-		return
-	}
-	if err := s.localDB.SetPricelistSyncResult("success", "", at); err != nil {
-		slog.Warn("failed to persist pricelist sync success state", "error", err)
-	}
-}
-
-func (s *Service) recordPricelistSyncFailure(syncErr error) {
-	if s.localDB == nil || syncErr == nil {
-		return
-	}
-	s.markConnectionBroken(syncErr)
-	if err := s.localDB.SetPricelistSyncResult("failed", syncErr.Error(), time.Now()); err != nil {
-		slog.Warn("failed to persist pricelist sync failure state", "error", err)
-	}
-}
-
-func (s *Service) markConnectionBroken(err error) {
-	if err == nil || s.connMgr == nil {
-		return
-	}
-
-	msg := strings.ToLower(err.Error())
-	switch {
-	case strings.Contains(msg, "i/o timeout"),
-		strings.Contains(msg, "invalid connection"),
-		strings.Contains(msg, "bad connection"),
-		strings.Contains(msg, "connection reset"),
-		strings.Contains(msg, "broken pipe"),
-		strings.Contains(msg, "unexpected eof"):
-		s.connMgr.MarkOffline(err)
-	}
-}
-
-func (s *Service) syncNewPricelistSnapshot(localPL *localdb.LocalPricelist) (int, error) {
-	if localPL == nil {
-		return 0, fmt.Errorf("local pricelist is nil")
-	}
-
-	localItems, err := s.fetchServerPricelistItems(localPL.ServerID)
-	if err != nil {
-		return 0, err
-	}
-
-	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 {
-			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)
-			}
-		}
-		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)
-		}
-		return nil
-	}); err != nil {
-		return 0, err
-	}
-
-	slog.Info("synced pricelist items", "pricelist_id", localPL.ID, "items", len(localItems))
-	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
@@ -623,29 +492,58 @@ func (s *Service) backfillUsedPricelistItemCategories(pricelistRepo *repository.
 	}
 }
 
-// ListUserSyncStatuses returns users who have recorded a client schema state check.
+// RecordSyncHeartbeat updates shared sync heartbeat for current DB user.
+// Only users with write rights are expected to be able to update this table.
+func (s *Service) RecordSyncHeartbeat() {
+	username := strings.TrimSpace(s.localDB.GetDBUser())
+	if username == "" {
+		return
+	}
+
+	mariaDB, err := s.getDB()
+	if err != nil || mariaDB == nil {
+		return
+	}
+
+	if err := ensureUserSyncStatusTable(mariaDB); err != nil {
+		slog.Warn("sync heartbeat: failed to ensure table", "error", err)
+		return
+	}
+
+	now := time.Now().UTC()
+	if err := mariaDB.Exec(`
+		INSERT INTO qt_pricelist_sync_status (username, last_sync_at, updated_at, app_version)
+		VALUES (?, ?, ?, ?)
+		ON DUPLICATE KEY UPDATE
+			last_sync_at = VALUES(last_sync_at),
+			updated_at = VALUES(updated_at),
+			app_version = VALUES(app_version)
+	`, username, now, now, appmeta.Version()).Error; err != nil {
+		slog.Debug("sync heartbeat: skipped", "username", username, "error", err)
+	}
+}
+
+// ListUserSyncStatuses returns users who have recorded sync heartbeat.
 func (s *Service) ListUserSyncStatuses(onlineThreshold time.Duration) ([]UserSyncStatus, error) {
 	mariaDB, err := s.getDB()
 	if err != nil || mariaDB == nil {
 		return nil, ErrOffline
 	}
 
+	if err := ensureUserSyncStatusTable(mariaDB); err != nil {
+		return nil, fmt.Errorf("ensure sync status table: %w", err)
+	}
+
 	type row struct {
-		Username      string    `gorm:"column:username"`
-		LastCheckedAt time.Time `gorm:"column:last_checked_at"`
-		AppVersion    string    `gorm:"column:app_version"`
+		Username   string    `gorm:"column:username"`
+		LastSyncAt time.Time `gorm:"column:last_sync_at"`
+		AppVersion string    `gorm:"column:app_version"`
 	}
 	var rows []row
 	if err := mariaDB.Raw(`
-		SELECT s.username, s.last_checked_at, COALESCE(s.app_version, '') AS app_version
-		FROM qt_client_schema_state s
-		INNER JOIN (
-			SELECT username, MAX(last_checked_at) AS max_checked
-			FROM qt_client_schema_state
-			GROUP BY username
-		) latest ON s.username = latest.username AND s.last_checked_at = latest.max_checked
-		GROUP BY s.username
-		ORDER BY s.last_checked_at DESC, s.username ASC
+		SELECT username, last_sync_at, COALESCE(app_version, '') AS app_version
+		FROM qt_pricelist_sync_status
+		ORDER BY last_sync_at DESC, username ASC
 	`).Scan(&rows).Error; err != nil {
 		return nil, fmt.Errorf("load sync status rows: %w", err)
 	}
@@ -665,7 +563,7 @@ func (s *Service) ListUserSyncStatuses(onlineThreshold time.Duration) ([]UserSyn
 			continue
 		}
 
-		isOnline := now.Sub(r.LastCheckedAt) <= onlineThreshold
+		isOnline := now.Sub(r.LastSyncAt) <= onlineThreshold
 		if _, connected := activeUsers[username]; connected {
 			isOnline = true
 			delete(activeUsers, username)
@@ -675,7 +573,7 @@ func (s *Service) ListUserSyncStatuses(onlineThreshold time.Duration) ([]UserSyn
 
 		result = append(result, UserSyncStatus{
 			Username:   username,
-			LastSyncAt: r.LastCheckedAt,
+			LastSyncAt: r.LastSyncAt,
 			AppVersion: appVersion,
 			IsOnline:   isOnline,
 		})
@@ -729,6 +627,36 @@ func (s *Service) listConnectedDBUsers(mariaDB *gorm.DB) (map[string]struct{}, e
 	return users, nil
 }
 
+func ensureUserSyncStatusTable(db *gorm.DB) error {
+	// Check if table exists instead of trying to create (avoids permission issues)
+	if !tableExists(db, "qt_pricelist_sync_status") {
+		if err := db.Exec(`
+			CREATE TABLE IF NOT EXISTS qt_pricelist_sync_status (
+				username VARCHAR(100) NOT NULL,
+				last_sync_at DATETIME NOT NULL,
+				updated_at DATETIME NOT NULL,
+				app_version VARCHAR(64) NULL,
+				PRIMARY KEY (username),
+				INDEX idx_qt_pricelist_sync_status_last_sync (last_sync_at)
+			)
+		`).Error; err != nil {
+			return fmt.Errorf("create qt_pricelist_sync_status table: %w", err)
+		}
+	}
+
+	// Backward compatibility for environments where table was created without app_version.
+	// Only try to add column if table exists.
+	if tableExists(db, "qt_pricelist_sync_status") {
+		if err := db.Exec(`
+			ALTER TABLE qt_pricelist_sync_status
+			ADD COLUMN IF NOT EXISTS app_version VARCHAR(64) NULL
+		`).Error; err != nil {
+			// Log but don't fail if alter fails (column might already exist)
+			slog.Debug("failed to add app_version column", "error", err)
+		}
+	}
+	return nil
+}
 
 // SyncPricelistItems synchronizes items for a specific pricelist
 func (s *Service) SyncPricelistItems(localPricelistID uint) (int, error) {
@@ -745,50 +673,33 @@ func (s *Service) SyncPricelistItems(localPricelistID uint) (int, error) {
 		return int(existingCount), nil
 	}
 
-	localItems, err := s.fetchServerPricelistItems(localPL.ServerID)
-	if err != nil {
-		return 0, err
-	}
-	for i := range localItems {
-		localItems[i].PricelistID = localPricelistID
-	}
-	if err := s.localDB.SaveLocalPricelistItems(localItems); err != nil {
-		return 0, fmt.Errorf("saving local pricelist items: %w", err)
-	}
-
-	slog.Info("synced pricelist items", "pricelist_id", localPricelistID, "items", len(localItems))
-	return len(localItems), nil
-}
-
-func (s *Service) fetchServerPricelistItems(serverPricelistID uint) ([]localdb.LocalPricelistItem, error) {
 	// Get database connection
 	mariaDB, err := s.getDB()
 	if err != nil {
-		return nil, fmt.Errorf("database not available: %w", err)
+		return 0, fmt.Errorf("database not available: %w", err)
 	}
 
 	// Create repository
 	pricelistRepo := repository.NewPricelistRepository(mariaDB)
 
 	// Get items from server
-	serverItems, _, err := pricelistRepo.GetItems(serverPricelistID, 0, 10000, "")
+	serverItems, _, err := pricelistRepo.GetItems(localPL.ServerID, 0, 10000, "")
 	if err != nil {
-		return nil, fmt.Errorf("getting server pricelist items: %w", err)
+		return 0, fmt.Errorf("getting server pricelist items: %w", err)
 	}
 
-	seen := make(map[string]struct{}, len(serverItems))
-	localItems := make([]localdb.LocalPricelistItem, 0, len(serverItems))
-	for i := range serverItems {
-		lotName := serverItems[i].LotName
-		if _, dup := seen[lotName]; dup {
-			slog.Warn("duplicate lot_name in server pricelist, skipping", "pricelist_id", serverPricelistID, "lot_name", lotName)
-			continue
-		}
-		seen[lotName] = struct{}{}
-		localItems = append(localItems, *localdb.PricelistItemToLocal(&serverItems[i], 0))
+	// Convert and save locally
+	localItems := make([]localdb.LocalPricelistItem, len(serverItems))
+	for i, item := range serverItems {
+		localItems[i] = *localdb.PricelistItemToLocal(&item, localPricelistID)
 	}
 
-	return localItems, nil
+	if err := s.localDB.SaveLocalPricelistItems(localItems); err != nil {
+		return 0, fmt.Errorf("saving local pricelist items: %w", err)
+	}
+
+	slog.Info("synced pricelist items", "pricelist_id", localPricelistID, "items", len(localItems))
+	return len(localItems), nil
 }
 
 // SyncPricelistItemsByServerID syncs items for a pricelist by its server ID
@@ -831,15 +742,9 @@ func (s *Service) GetPricelistForOffline(serverPricelistID uint) (*localdb.Local
 	return localPL, nil
 }
 
-// SyncPricelistsIfNeeded checks for new pricelists and syncs if needed.
-// If a sync is already in progress, returns immediately without blocking.
+// SyncPricelistsIfNeeded checks for new pricelists and syncs if needed
+// This should be called before creating a new configuration when online
 func (s *Service) SyncPricelistsIfNeeded() error {
-	if !s.pricelistMu.TryLock() {
-		slog.Debug("pricelist sync already in progress, skipping")
-		return nil
-	}
-	defer s.pricelistMu.Unlock()
-
 	needSync, err := s.NeedSync()
 	if err != nil {
 		slog.Warn("failed to check if sync needed", "error", err)
@@ -848,21 +753,11 @@ func (s *Service) SyncPricelistsIfNeeded() error {
 
 	if !needSync {
 		slog.Debug("pricelists are up to date, no sync needed")
-		// Clear stale "failed" status: if NeedSync confirmed all active server pricelists
-		// are present locally, any lingering failure flag is outdated.
-		if strings.EqualFold(s.localDB.GetLastPricelistSyncStatus(), "failed") {
-			now := time.Now()
-			if err := s.localDB.SetPricelistSyncResult("success", "", now); err != nil {
-				slog.Warn("failed to clear stale pricelist sync failure flag", "error", err)
-			} else {
-				s.localDB.SetLastSyncTime(now)
-			}
-		}
 		return nil
 	}
 
 	slog.Info("new pricelists detected, syncing...")
-	_, err = s.syncPricelists()
+	_, err = s.SyncPricelists()
 	if err != nil {
 		return fmt.Errorf("syncing pricelists: %w", err)
 	}
@@ -870,11 +765,6 @@ func (s *Service) SyncPricelistsIfNeeded() error {
 	return nil
 }
 
-// maxPendingChangeAttempts is the number of failed attempts after which a pending change
-// is considered unrecoverable and removed from the queue. Applies only to changes that
-// fail with a non-transient error (e.g. corrupt payload, unknown operation).
-const maxPendingChangeAttempts = 20
-
 // PushPendingChanges pushes all pending changes to the server
 func (s *Service) PushPendingChanges() (int, error) {
 	if _, err := s.EnsureReadinessForSync(); err != nil {
@@ -888,14 +778,6 @@ func (s *Service) PushPendingChanges() (int, error) {
 		slog.Info("purged orphan configuration pending changes", "removed", removed)
 	}
 
-	// Auto-repair locally-fixable problems (e.g. stale project references)
-	// before attempting to push, so that repaired changes succeed on this cycle.
-	if repaired, _, repairErr := s.localDB.RepairPendingChanges(); repairErr != nil {
-		slog.Warn("auto-repair of errored pending changes failed", "error", repairErr)
-	} else if repaired > 0 {
-		slog.Info("auto-repaired errored pending changes", "repaired", repaired)
-	}
-
 	changes, err := s.localDB.GetPendingChanges()
 	if err != nil {
 		return 0, fmt.Errorf("getting pending changes: %w", err)
@@ -907,30 +789,16 @@ func (s *Service) PushPendingChanges() (int, error) {
 	}
 
 	slog.Info("pushing pending changes", "count", len(changes))
-	pushStart := time.Now()
 	pushed := 0
-	failed := 0
-	var firstErr string
 	var syncedIDs []int64
 	sortedChanges := prioritizeProjectChanges(changes)
 
 	for _, change := range sortedChanges {
 		err := s.pushSingleChange(&change)
 		if err != nil {
-			s.markConnectionBroken(err)
 			slog.Warn("failed to push change", "id", change.ID, "type", change.EntityType, "operation", change.Operation, "error", err)
-			newAttempts := change.Attempts + 1
+			// Increment attempts
 			s.localDB.IncrementPendingChangeAttempts(change.ID, err.Error())
-			if firstErr == "" {
-				firstErr = err.Error()
-			}
-			failed++
-			if newAttempts >= maxPendingChangeAttempts {
-				slog.Error("abandoning pending change after max attempts",
-					"id", change.ID, "type", change.EntityType, "op", change.Operation,
-					"attempts", newAttempts, "last_error", err.Error())
-				syncedIDs = append(syncedIDs, change.ID)
-			}
 			continue
 		}
 
@@ -945,13 +813,7 @@ func (s *Service) PushPendingChanges() (int, error) {
 		}
 	}
 
-	if failed > 0 {
-		s.localDB.AppendSyncLog("changes", "error", firstErr, pushed, pushStart, time.Since(pushStart).Milliseconds())
-	} else {
-		s.localDB.AppendSyncLog("changes", "ok", "", pushed, pushStart, time.Since(pushStart).Milliseconds())
-	}
-
-	slog.Info("pending changes pushed", "pushed", pushed, "failed", failed)
+	slog.Info("pending changes pushed", "pushed", pushed, "failed", len(changes)-pushed)
 	return pushed, nil
 }
 
@@ -963,11 +825,7 @@ func (s *Service) pushSingleChange(change *localdb.PendingChange) error {
 	case "configuration":
 		return s.pushConfigurationChange(change)
 	default:
-		// Unknown entity type: this change was queued by a newer or different build
-		// and cannot be processed. Remove it from the queue.
-		slog.Warn("dropping pending change with unknown entity type",
-			"id", change.ID, "type", change.EntityType, "op", change.Operation)
-		return nil
+		return fmt.Errorf("unknown entity type: %s", change.EntityType)
 	}
 }
 
@@ -1045,7 +903,7 @@ func (s *Service) pushProjectChange(change *localdb.PendingChange) error {
 		localProject.SyncStatus = "synced"
 		now := time.Now()
 		localProject.SyncedAt = &now
-		_ = s.localDB.SaveProjectPreservingUpdatedAt(localProject)
+		_ = s.localDB.SaveProject(localProject)
 	}
 
 	return nil
@@ -1100,10 +958,7 @@ func (s *Service) pushConfigurationChange(change *localdb.PendingChange) error {
 	case "delete":
 		return s.pushConfigurationDelete(change)
 	default:
-		// Unknown operation: queued by a newer or different build. Drop from queue.
-		slog.Warn("dropping pending change with unknown operation",
-			"id", change.ID, "type", change.EntityType, "op", change.Operation)
-		return nil
+		return fmt.Errorf("unknown operation: %s", change.Operation)
 	}
 }
 
@@ -1303,30 +1158,24 @@ func (s *Service) ensureConfigurationProject(mariaDB *gorm.DB, cfg *models.Confi
 
 		localProject, localErr := s.localDB.GetProjectByUUID(*cfg.ProjectUUID)
 		if localErr != nil {
-			// Project not found locally either: stale reference (project was deleted).
-			// Fall through to system project so this configuration is not stuck forever.
-			slog.Warn("configuration references missing project, assigning to system project",
-				"cfg_uuid", cfg.UUID,
-				"project_uuid", *cfg.ProjectUUID,
-			)
-		} else {
-			modelProject := localdb.LocalToProject(localProject)
-			if modelProject.OwnerUsername == "" {
-				modelProject.OwnerUsername = cfg.OwnerUsername
-			}
-			if createErr := projectRepo.UpsertByUUID(modelProject); createErr != nil {
-				return createErr
-			}
-			if modelProject.ID > 0 {
-				serverID := modelProject.ID
-				localProject.ServerID = &serverID
-				localProject.SyncStatus = "synced"
-				now := time.Now()
-				localProject.SyncedAt = &now
-				_ = s.localDB.SaveProjectPreservingUpdatedAt(localProject)
-			}
-			return nil
+			return err
 		}
+		modelProject := localdb.LocalToProject(localProject)
+		if modelProject.OwnerUsername == "" {
+			modelProject.OwnerUsername = cfg.OwnerUsername
+		}
+		if createErr := projectRepo.UpsertByUUID(modelProject); createErr != nil {
+			return createErr
+		}
+		if modelProject.ID > 0 {
+			serverID := modelProject.ID
+			localProject.ServerID = &serverID
+			localProject.SyncStatus = "synced"
+			now := time.Now()
+			localProject.SyncedAt = &now
+			_ = s.localDB.SaveProject(localProject)
+		}
+		return nil
 	}
 
 	systemProject := &models.Project{}
@@ -1637,25 +1486,3 @@ func (s *Service) getConnectionStatus() db.ConnectionStatus {
 	}
 	return s.connMgr.GetStatus()
 }
-
-// SyncComponentsIfEmpty syncs components from MariaDB when local_components is empty.
-// Used by the background worker on first run to populate the catalog for new users.
-func (s *Service) SyncComponentsIfEmpty() error {
-	if s.localDB.CountComponents() > 0 {
-		return nil
-	}
-	mariaDB, err := s.getDB()
-	if err != nil {
-		_ = s.localDB.SetComponentSyncResult("error", err.Error(), time.Now())
-		return err
-	}
-	result, err := s.localDB.SyncComponents(mariaDB)
-	now := time.Now()
-	if err != nil {
-		_ = s.localDB.SetComponentSyncResult("error", err.Error(), now)
-		return err
-	}
-	_ = s.localDB.SetComponentSyncResult("ok", "", now)
-	slog.Info("background sync: initial component sync completed", "synced", result.TotalSynced)
-	return nil
-}

internal/services/sync/service_pricelist_category_backfill_test.go

@@ -17,6 +17,8 @@ func TestSyncPricelists_BackfillsLotCategoryForUsedPricelistItems(t *testing.T)
 		&models.Pricelist{},
 		&models.PricelistItem{},
 		&models.Lot{},
+		&models.LotPartnumber{},
+		&models.StockLog{},
 	); err != nil {
 		t.Fatalf("migrate server tables: %v", err)
 	}
@@ -102,3 +104,4 @@ func TestSyncPricelists_BackfillsLotCategoryForUsedPricelistItems(t *testing.T)
 		t.Fatalf("expected lot_category backfilled to CPU, got %q", items[0].LotCategory)
 	}
 }
+