Kiosk: auto-discover on setup, LAN OTA, English-only GitHub triage.

Auto-run LAN discovery on server step; serve kiosk updates from releases/ via kiosk_update API; check LAN before GitHub for OTA in-place upgrades. Docker CI retries hub timeouts. Remove non-English feature issue comments; triage script English-only. Co-authored-by: Cursor <cursoragent@cursor.com>
Fix kiosk LAN discovery and improve OTA update detection.
2026-06-11 05:46:12 +00:00 · 2026-06-11 05:40:41 +00:00 · 2026-06-11 05:34:56 +00:00 · 2026-06-08 15:01:43 +00:00 · 2026-06-08 14:54:20 +00:00 · 2026-06-08 12:32:10 +00:00
33 changed files with 2329 additions and 546 deletions
@@ -0,0 +1,5 @@
+node_modules/
+.git/
+dist/
+build/
+*.log
@@ -37,8 +37,10 @@ jobs:
        id: version
        run: |
          VERSION=$(grep 'versionName' evershelf-kiosk/app/build.gradle.kts | grep -oP '"\K[^"]+')
+          VCODE=$(grep 'versionCode' evershelf-kiosk/app/build.gradle.kts | grep -oP '\d+')
          echo "name=$VERSION" >> "$GITHUB_OUTPUT"
-          echo "Kiosk version: $VERSION"
+          echo "code=$VCODE" >> "$GITHUB_OUTPUT"
+          echo "Kiosk version: $VERSION (versionCode $VCODE)"

      - name: Build debug APK
        run: gradle assembleDebug --no-daemon
@@ -75,7 +77,21 @@ jobs:
          sleep 3
          gh release create kiosk-latest \
            --title "EverShelf Kiosk Latest" \
-            --notes "Alias automatico → kiosk-${{ steps.version.outputs.name }}" \
+            --notes "Auto alias → kiosk-${{ steps.version.outputs.name }} (versionCode ${{ steps.version.outputs.code }})" \
            --prerelease \
            artifacts/evershelf-kiosk.apk

+      - name: Publish APK to releases/ for LAN OTA
+        env:
+          GH_TOKEN: ${{ secrets.WORKFLOW_PAT || secrets.GITHUB_TOKEN }}
+        run: |
+          cp artifacts/evershelf-kiosk.apk releases/evershelf-kiosk.apk
+          printf '{"version":"%s","version_code":%s}\n' \
+            "${{ steps.version.outputs.name }}" "${{ steps.version.outputs.code }}" \
+            > releases/kiosk-version.json
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git add releases/evershelf-kiosk.apk releases/kiosk-version.json
+          git diff --staged --quiet || git commit -m "chore(kiosk): publish APK v${{ steps.version.outputs.name }} for LAN OTA"
+          git push origin HEAD:${{ github.ref_name }}
+
@@ -43,7 +43,18 @@ jobs:
      - uses: actions/checkout@v6

      - name: Build Docker image
-        run: docker build -t evershelf-test .
+        run: |
+          set -e
+          for attempt in 1 2 3; do
+            echo "Docker build attempt $attempt/3..."
+            if docker build -t evershelf-test .; then
+              exit 0
+            fi
+            echo "Attempt $attempt failed — retrying in 20s..."
+            sleep 20
+          done
+          echo "Docker build failed after 3 attempts"
+          exit 1

      - name: Test container starts
        run: |
@@ -52,3 +52,4 @@ data/food_facts_cache.json
 data/category_ai_cache.json
 assets/img/logo/*_backup.*
 logs/*.log
+assets/vendor/transformers/Xenova/
@@ -14,8 +14,9 @@ RewriteEngine On
    Require all denied
 </FilesMatch>

-# Force HTTPS
+# Force HTTPS (skip when terminated TLS is forwarded — Traefik, Caddy, NPM, …)
 RewriteCond %{HTTPS} !=on
+RewriteCond %{HTTP:X-Forwarded-Proto} !^https$ [NC]
 RewriteRule ^(.*)$ https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]

 # API routing
@@ -11,6 +11,34 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 - **Recipe scraps tips** — During cooking steps, detect "waste" generated (peels, cores, bones, eggshells, coffee grounds, citrus zest, etc.) and surface AI-powered tips on how to reuse them (compost, natural cleaner, broth, candied peel, etc.). Could be shown as an optional collapsible hint card below the step that generates the scrap.

+## [1.7.41] - 2026-06-08
+
+### Fixed
+- **Docker/Traefik “Impossibile contattare il server”** — PHP 8.2 deprecation notices (`LoggingPDO::prepare`) were emitted as HTML before JSON, breaking `fetch().json()` on the startup health check; API bootstrap now suppresses HTML error output in production.
+- **Traefik HTTPS redirect loop** — `.htaccess` skips the HTTPS redirect when `X-Forwarded-Proto: https` is already set (compatible with Traefik `sslheader` middleware); no need to disable `.htaccess` manually.
+- **LoggingPDO PHP 8.2** — `#[\ReturnTypeWillChange]` on `prepare()` to eliminate deprecation noise in error logs.
+
+## [1.7.40] - 2026-06-08
+
+### Added
+- **Qty unit badges** — Quantity inputs show the active unit (g, ml, conf, pz, …) on use, add, recipe-use, edit and throw modals; scale live label “Inserimento in …”.
+- **Recipe shopping suggestions** — AI recipes can list optional missing ingredients with one-tap add to Bring!/shopping list.
+- **Recipe frozen badge** — Freezer items flagged in pantry lines and recipe UI; prompt rule for cooking from frozen.
+- **Health check `db_writable`** — Startup diagnostic detects non-writable SQLite file (common Docker volume issue).
+- **`scripts/triage-open-issues.php`** — Maintenance helper to comment/close GitHub issues via encrypted token.
+- **Ops CLI scripts** — `audit-finished-shopping.php`, `backfill-finished-shopping.php`, `sync-shopping-bring.php`, `install-transformers-model.sh` (offline Xenova classifier bootstrap).
+
+### Fixed
+- **SQLite database locked** — `PRAGMA busy_timeout` 10s + `dbWithRetry()` on `inventory_update` under cron/PWA contention.
+- **Barcode duplicate on save** — `saveProduct` merges or returns 409 instead of HTTP 500 on UNIQUE barcode.
+- **EverLog CLI crash** — Safe cast of `REQUEST_METHOD` when null (kiosk/cron).
+- **Spesa scan crash** — `currentPage` → `_currentPageId` in `_applySpesaScanUI`.
+- **Recipe quantities** — Piece products use 1 pc base; serving caps for onions, leafy greens, minestrone; pantry-only post-processing; conf/g display fixes.
+- **Smart shopping purchased block** — Server-side blocklist + spesa mode sync prevents cron from re-adding bought items.
+
+### Changed
+- **Docker behind Traefik** — Apache `SetEnvIf X-Forwarded-Proto https HTTPS=on` to avoid redirect loops.
+
 ## [1.7.39] - 2026-06-06

 ### Added
@@ -33,7 +33,9 @@ RUN [ ! -f /var/www/html/.env ] && cp /var/www/html/.env.example /var/www/html/.
 RUN echo '<Directory /var/www/html>\n\
    AllowOverride All\n\
    Require all granted\n\
-</Directory>' > /etc/apache2/conf-available/evershelf.conf \
+</Directory>\n\
+# Traefik / reverse-proxy: treat forwarded HTTPS as on so .htaccess does not redirect-loop\n\
+SetEnvIf X-Forwarded-Proto "https" HTTPS=on' > /etc/apache2/conf-available/evershelf.conf \
    && a2enconf evershelf

 # Expose port 80
@@ -25,7 +25,7 @@
 [![SQLite](https://img.shields.io/badge/SQLite-3-blue.svg)](https://www.sqlite.org/)
 [![Docker](https://img.shields.io/badge/Docker-Ready-2496ED.svg)](Dockerfile)
 [![i18n](https://img.shields.io/badge/i18n-IT%20%7C%20EN%20%7C%20DE%20%7C%20FR%20%7C%20ES-orange.svg)](translations/)
-[![Version](https://img.shields.io/badge/version-1.7.39-brightgreen.svg)](CHANGELOG.md)
+[![Version](https://img.shields.io/badge/version-1.7.41-brightgreen.svg)](CHANGELOG.md)
 [![GitHub stars](https://img.shields.io/github/stars/dadaloop82/EverShelf?style=social)](https://github.com/dadaloop82/EverShelf/stargazers)
 [![Last commit](https://img.shields.io/github/last-commit/dadaloop82/EverShelf/main)](https://github.com/dadaloop82/EverShelf/commits/main)
 [![Contributors](https://img.shields.io/github/contributors/dadaloop82/EverShelf)](https://github.com/dadaloop82/EverShelf/graphs/contributors)
@@ -2,6 +2,11 @@
 /**
 * EverShelf API bootstrap — shared by HTTP router and cron.
 */
+// Never emit HTML notices before JSON API responses (breaks fetch().json() in the PWA).
+if (!defined('CRON_MODE') && (getenv('DISPLAY_ERRORS') ?: '') !== '1') {
+    ini_set('display_errors', '0');
+    ini_set('html_errors', '0');
+}
 require_once __DIR__ . '/lib/env.php';
 require_once __DIR__ . '/lib/constants.php';
 require_once __DIR__ . '/lib/github.php';
@@ -38,8 +38,24 @@ function _ensureDataDir(): void {
    }
 }

+/** Ensure the SQLite DB and WAL sidecar files are writable (Docker volume first-boot). */
+function _ensureDbWritable(): void {
+    if (!file_exists(DB_PATH)) {
+        return;
+    }
+    if (!is_writable(DB_PATH)) {
+        @chmod(DB_PATH, 0664);
+    }
+    foreach ([DB_PATH . '-wal', DB_PATH . '-shm'] as $sidecar) {
+        if (file_exists($sidecar) && !is_writable($sidecar)) {
+            @chmod($sidecar, 0664);
+        }
+    }
+}
+
 function getDB(): PDO {
    _ensureDataDir();
+    _ensureDbWritable();
    // logger.php is required by index.php before getDB() is called.
    // In cron context it may not be loaded yet — guard with class_exists.
    $useLogging = class_exists('LoggingPDO', false);
@@ -53,7 +69,7 @@ function getDB(): PDO {
    $db->setAttribute(PDO::ATTR_TIMEOUT, 5); // PDO::ATTR_TIMEOUT is in seconds for MySQL, but not directly for SQLite.
                                             // For SQLite, we use PRAGMA busy_timeout.
    $db->exec('PRAGMA journal_mode = WAL;');
-    $db->exec('PRAGMA busy_timeout = 5000;'); // 5000 milliseconds = 5 seconds
+    $db->exec('PRAGMA busy_timeout = 10000;'); // 10 s — cron + PWA writes can contend under WAL

    $db->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);
    $db->exec("PRAGMA journal_mode=WAL");
@@ -72,6 +88,29 @@ function getDB(): PDO {
    return $db;
 }

+/**
+ * Retry a DB write when SQLite returns "database is locked" (concurrent cron + API).
+ *
+ * @template T
+ * @param callable(): T $fn
+ * @return T
+ */
+function dbWithRetry(callable $fn, int $maxAttempts = 4): mixed {
+    $attempt = 0;
+    while (true) {
+        try {
+            return $fn();
+        } catch (\PDOException $e) {
+            $attempt++;
+            $locked = str_contains($e->getMessage(), 'database is locked');
+            if (!$locked || $attempt >= $maxAttempts) {
+                throw $e;
+            }
+            usleep(150000 * $attempt); // 150 ms, 300 ms, 450 ms …
+        }
+    }
+}
+
 function initializeDB(PDO $db): void {
    $db->exec("
        CREATE TABLE IF NOT EXISTS products (
@@ -335,6 +335,7 @@ class LoggingPDOStatement {
 // Type hint: use PDO in all functions (LoggingPDO extends PDO).
 // ═══════════════════════════════════════════════════════════════════════════
 class LoggingPDO extends \PDO {
+    #[\ReturnTypeWillChange]
    public function prepare(string $query, array $options = []): LoggingPDOStatement|false {
        $stmt = parent::prepare($query, $options);
        if ($stmt === false) {
@@ -1847,6 +1847,41 @@ body.server-offline .bottom-nav {
    border-color: var(--primary);
 }

+.qty-control-with-unit {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    flex-wrap: wrap;
+}
+
+.qty-control-with-unit .qty-control {
+    flex: 0 0 auto;
+}
+
+.qty-unit-badge {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    min-width: 52px;
+    height: 50px;
+    padding: 0 12px;
+    border-radius: var(--radius-sm);
+    background: var(--primary);
+    color: #fff;
+    font-size: 1rem;
+    font-weight: 800;
+    letter-spacing: 0.02em;
+    text-transform: lowercase;
+    white-space: nowrap;
+    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12);
+}
+
+.qty-unit-badge.qty-unit-muted {
+    background: var(--bg-card);
+    color: var(--primary);
+    border: 2px solid var(--primary);
+}
+
 /* ===== USE OPTIONS ===== */
 .use-options {
    display: flex;
@@ -497,7 +497,8 @@ function _scaleUpdateLiveBox(msg) {
        }
        if (valEl) valEl.textContent = displayVal + stIcon;
        if (lblEl) {
-            lblEl.textContent = '';
+            const targetLbl = getUnitDisplayLabel(getActiveUseUnitLabel());
+            lblEl.textContent = targetLbl ? ((t('qty.enter_in') || 'Inserimento in') + ' ' + targetLbl) : '';
        }
    }
 }
@@ -985,6 +986,7 @@ function _scaleShowReadingModal(targetInputId, unit) {
        <div style="padding:16px;text-align:center">
            <p style="margin-bottom:16px">${t('scale.place_on_scale')}</p>
            <div id="scale-reading-live" class="scale-reading-live">— — —</div>
+            <p style="margin-top:8px;font-weight:700;color:var(--primary)">${escapeHtml((t('qty.enter_in') || 'Inserimento in') + ' ' + getUnitDisplayLabel(unit))}</p>
            <p class="settings-hint" style="margin-top:12px">${t('scale.waiting_stable')}</p>
        </div>
    `;
@@ -6357,6 +6359,76 @@ function formatQuantity(qty, unit, defaultQty, packageUnit) {
    return result;
 }

+/** Human-readable unit label for quantity inputs (pz, g, ml, conf…). */
+function getUnitDisplayLabel(unit) {
+    const u = (unit || 'pz').toLowerCase();
+    const map = {
+        pz: t('units.pz') || 'pz',
+        g: 'g',
+        ml: 'ml',
+        conf: t('units.conf') || 'conf',
+        kg: 'kg',
+        l: 'l',
+    };
+    return map[u] || u;
+}
+
+/** Wrap qty input with a visible unit badge if missing. */
+function ensureQtyUnitBadge(inputId) {
+    const input = document.getElementById(inputId);
+    if (!input) return null;
+    let badge = document.getElementById(inputId + '-unit');
+    if (badge) return badge;
+    const control = input.closest('.qty-control');
+    if (!control) return null;
+    let wrap = control.closest('.qty-control-with-unit');
+    if (!wrap) {
+        wrap = document.createElement('div');
+        wrap.className = 'qty-control-with-unit';
+        control.parentNode.insertBefore(wrap, control);
+        wrap.appendChild(control);
+    }
+    badge = document.createElement('span');
+    badge.className = 'qty-unit-badge';
+    badge.id = inputId + '-unit';
+    badge.setAttribute('aria-live', 'polite');
+    badge.textContent = '—';
+    wrap.appendChild(badge);
+    return badge;
+}
+
+function setQtyInputUnitLabel(inputId, unit, muted = false) {
+    const badge = ensureQtyUnitBadge(inputId) || document.getElementById(inputId + '-unit');
+    if (!badge) return;
+    badge.textContent = getUnitDisplayLabel(unit);
+    badge.classList.toggle('qty-unit-muted', !!muted);
+    badge.title = (t('qty.unit_for_input') || 'Unità di misura') + ': ' + badge.textContent;
+}
+
+function getActiveUseUnitLabel() {
+    if (_useConfMode) {
+        if (_useConfMode._activeUnit === 'conf') return 'conf';
+        return _useConfMode.subLabel || _useConfMode.packageUnit || 'g';
+    }
+    return _useNormalUnit || 'pz';
+}
+
+function getActiveRecipeUseUnitLabel() {
+    if (_recipeUseConfMode) {
+        if (_recipeUseConfMode._activeUnit === 'conf') return 'conf';
+        return _recipeUseConfMode.subLabel || _recipeUseConfMode.packageUnit || 'g';
+    }
+    return _recipeUseNormalUnit || 'pz';
+}
+
+function syncUseQtyUnitBadge() {
+    setQtyInputUnitLabel('use-quantity', getActiveUseUnitLabel());
+}
+
+function syncRecipeUseQtyUnitBadge() {
+    setQtyInputUnitLabel('ruse-quantity', getActiveRecipeUseUnitLabel());
+}
+
 // Structured quantity display for inventory cards.
 // Returns { mainQty: '10', unitLabel: 'conf', packageDetail: 'da 36g', fraction: '¼' }
 function formatQuantityParts(qty, unit, defaultQty, packageUnit) {
@@ -6387,7 +6459,8 @@ function formatQuantityParts(qty, unit, defaultQty, packageUnit) {
    
    let packageDetail = '';
    let fraction = '';
-    if (unit !== 'conf' && defaultQty && defaultQty > 1) {
+    // pz = piece count only; default_quantity may hold legacy avg weight — ignore for display
+    if (unit !== 'conf' && unit !== 'pz' && defaultQty && defaultQty > 1) {
        const d = parseFloat(defaultQty);
        const ratio = n / d;
        const remainder = ratio - Math.floor(ratio);
@@ -6894,11 +6967,14 @@ function editInventoryItem(id) {
        <form class="form" onsubmit="submitEditInventory(event, ${id}, ${item.product_id})">
            <div class="form-group">
                <label>📦 ${t('inventory.label_quantity').replace('📦 ', '')}</label>
+                <div class="qty-control-with-unit">
                    <div class="qty-control">
                        <button type="button" class="qty-btn" onclick="adjustQty('edit-qty', -1)">−</button>
                        <input type="number" id="edit-qty" value="${item.quantity}" min="0" step="any" class="qty-input">
                        <button type="button" class="qty-btn" onclick="adjustQty('edit-qty', 1)">+</button>
                    </div>
+                    <span class="qty-unit-badge" id="edit-qty-unit" aria-live="polite">${escapeHtml(getUnitDisplayLabel(item.unit || 'pz'))}</span>
+                </div>
                ${scaleEditReady ? `
                <div id="edit-scale-section" style="display:none;text-align:center;padding:10px;background:linear-gradient(135deg,#f3e8ff,#ede9fe);border-radius:10px;margin-top:8px">
                    <div style="font-size:1.8rem;font-weight:bold;color:#5b21b6" id="edit-scale-reading">— — —</div>
@@ -6951,10 +7027,12 @@ function editInventoryItem(id) {
    `;
    document.getElementById('modal-overlay').style.display = 'flex';
    _initExpiryManualTracking('edit-expiry', item);
+    setQtyInputUnitLabel('edit-qty', item.unit || 'pz');
 }

 function onEditUnitChange() {
    const unit = document.getElementById('edit-unit').value;
+    setQtyInputUnitLabel('edit-qty', unit);
    const confGroup = document.getElementById('edit-conf-size-group');
    if (confGroup) confGroup.style.display = unit === 'conf' ? 'block' : 'none';
    if (unit === 'conf') {
@@ -8847,11 +8925,14 @@ function editActionInventoryItem(inventoryId) {
        <form class="form" onsubmit="submitActionEditInventory(event, ${inventoryId}, ${item.product_id})">
            <div class="form-group">
                <label>${t('add.quantity_label')}</label>
+                <div class="qty-control-with-unit">
                    <div class="qty-control">
                        <button type="button" class="qty-btn" onclick="adjustQty('action-edit-qty', -1)">−</button>
                        <input type="number" id="action-edit-qty" value="${item.quantity}" min="0" step="any" class="qty-input">
                        <button type="button" class="qty-btn" onclick="adjustQty('action-edit-qty', 1)">+</button>
                    </div>
+                    <span class="qty-unit-badge" id="action-edit-qty-unit" aria-live="polite">${escapeHtml(getUnitDisplayLabel(item.unit || 'pz'))}</span>
+                </div>
            </div>
            <div class="form-group">
                <label>${t('product.unit_label')}</label>
@@ -8899,10 +8980,12 @@ function editActionInventoryItem(inventoryId) {
    `;
    document.getElementById('modal-overlay').style.display = 'flex';
    _initExpiryManualTracking('action-edit-expiry', item);
+    setQtyInputUnitLabel('action-edit-qty', item.unit || 'pz');
 }

 function onActionEditUnitChange() {
    const unit = document.getElementById('action-edit-unit').value;
+    setQtyInputUnitLabel('action-edit-qty', unit);
    const confGroup = document.getElementById('action-edit-conf-group');
    if (confGroup) confGroup.style.display = unit === 'conf' ? 'block' : 'none';
 }
@@ -8997,11 +9080,14 @@ function showThrowForm() {
                </div>
                <div class="form-group">
                    <label>${t('use.throw_qty_label')}</label>
+                    <div class="qty-control-with-unit">
                        <div class="qty-control">
                            <button type="button" class="qty-btn" onclick="adjustQty('throw-quantity', -1)">−</button>
                            <input type="number" id="throw-quantity" value="1" min="0.1" step="any" class="qty-input">
                            <button type="button" class="qty-btn" onclick="adjustQty('throw-quantity', 1)">+</button>
                        </div>
+                        <span class="qty-unit-badge" id="throw-quantity-unit" aria-live="polite">${escapeHtml(getUnitDisplayLabel(items[0]?.unit || 'pz'))}</span>
+                    </div>
                </div>
                <button class="btn btn-large btn-warning full-width" onclick="throwPartial()">
                    ${t('use.throw_partial_btn')}
@@ -9541,6 +9627,7 @@ function onAddUnitChange() {

    // Show/hide scale read button based on new unit
    updateScaleReadButtons();
+    setQtyInputUnitLabel('add-quantity', unit, true);
 }

 function updateAddQtyStep() {
@@ -9552,6 +9639,7 @@ function updateAddQtyStep() {
    } else {
        qtyInput.min = '1';
    }
+    setQtyInputUnitLabel('add-quantity', unit, true);
 }

 function markAddQtyManuallySet() {
@@ -9838,26 +9926,28 @@ async function submitAdd(e) {
                }
            }
            showToast(t('add.product_added').replace('{name}', currentProduct.name).replace('{qty}', qtyInfo), 'success');
+            if (!(await spesaModeAfterAdd(result))) {
                if (result.removed_from_bring) {
+                    _applyShoppingListRemovals(result.removed_names || []);
                    setTimeout(() => showToast(t('toast.removed_from_shopping'), 'info'), 1500);
-            } else if (shoppingItems.length > 0 && shoppingListUUID) {
-                // PHP matching may have missed the item (custom name / no catalog match) —
-                // try a client-side fuzzy remove using the already-loaded shoppingItems
-                const match = _findSimilarItem(currentProduct.name, shoppingItems);
-                if (match) {
+                } else if (shoppingListUUID) {
+                    const generic = currentProduct.shopping_name || currentProduct.name;
+                    const match = _findSimilarItem(generic, shoppingItems) || _findSimilarItem(currentProduct.name, shoppingItems);
                    api('shopping_remove', {}, 'POST', {
-                        name: match.name,
-                        rawName: match.rawName || '',
-                        listUUID: shoppingListUUID
+                        name: match?.name || generic,
+                        rawName: match?.rawName || '',
+                        listUUID: shoppingListUUID,
                    }).then(r => {
-                        if (r && r.success) {
-                            shoppingItems = shoppingItems.filter(i => i !== match);
+                        if (r?.success) {
+                            _applyShoppingListRemovals([match?.name || generic, match?.rawName].filter(Boolean));
                            setTimeout(() => showToast(t('toast.removed_from_shopping'), 'info'), 1500);
                        }
                    }).catch(() => {});
                }
+                showPage('dashboard');
+            } else if (result.removed_from_bring) {
+                setTimeout(() => showToast(t('toast.removed_from_shopping'), 'info'), 1500);
            }
-            if (!(await spesaModeAfterAdd())) showPage('dashboard');

            // Submit extra batches (different expiry dates) in the background, silently
            if ((window._addExtraBatches || []).length > 0) {
@@ -9911,6 +10001,7 @@ function showUseForm() {
    loadUseInventoryInfo();
    showPage('use');
    updateScaleReadButtons();
+    syncUseQtyUnitBadge();
 }

 function renderUsePreview() {
@@ -10179,6 +10270,7 @@ async function loadUseInventoryInfo() {

            // Trigger a live-box refresh with the latest reading if on scale
            if (_scaleLatestWeight) _scaleAutoFillUse(_scaleLatestWeight);
+            syncUseQtyUnitBadge();
        } else {
            // --- NORMAL MODE ---
            _useConfMode = null;
@@ -10216,6 +10308,7 @@ async function loadUseInventoryInfo() {
                    </div>`;
                document.querySelector('#page-use .use-partial').appendChild(fracDiv);
            }
+            syncUseQtyUnitBadge();
        }
    } catch(e) {
        console.error(e);
@@ -10254,6 +10347,7 @@ function switchUseUnit(mode) {
        hint.textContent = t('recipes.packs_of_have', { size: `${_useConfMode.packageSize}${_useConfMode.subLabel}`, count: _useConfMode.totalConf.toFixed(1) });
        if (confFracBtns) confFracBtns.style.display = '';
    }
+    syncUseQtyUnitBadge();
 }

 function setConfFraction(f) {
@@ -11857,6 +11951,15 @@ function _isBringPurchased(name, urgency) {
    });
 }

+/** Drop smart-shopping rows the user already bought (blocklist from spesa). */
+function _filterPurchasedSmartItems(items) {
+    if (!Array.isArray(items) || !items.length) return items || [];
+    return items.filter(item => {
+        const names = [item.shopping_name, item.name].filter(Boolean);
+        return !names.some(n => _isBringPurchased(n, item.urgency));
+    });
+}
+
 async function autoAddCriticalItems() {
    // Time-based guard: run at most once every 5 minutes
    const lastRun = parseInt(localStorage.getItem('_autoAddedCriticalTs') || '0');
@@ -12025,19 +12128,11 @@ async function syncShoppingPriceTotal(forceRefresh = false) {
 function _buildPricePayload() {
    return shoppingItems.map((item) => {
        const smart = _matchBringToSmart(item.name, smartShoppingItems);
-        if (smart?.suggested_qty > 0) {
-            return {
-                name: item.name,
-                quantity: smart.suggested_qty,
-                unit: smart.suggested_unit || smart.unit || 'conf',
-                default_quantity: smart.default_qty || 0,
-                package_unit: smart.package_unit || '',
-            };
-        }
        if (smart) {
            const unit = smart.unit || 'conf';
            const defQty = parseFloat(smart.default_qty) || 0;
            const pkgUnit = smart.package_unit || '';
+            // One shopping-list line ≈ one retail purchase (not 14-day restock qty).
            if (unit === 'conf' && defQty > 0 && pkgUnit) {
                return {
                    name: item.name,
@@ -12047,6 +12142,25 @@ function _buildPricePayload() {
                    package_unit: pkgUnit,
                };
            }
+            if (unit === 'pz') {
+                const gramsPerPiece = defQty >= 20 ? defQty : 200;
+                return {
+                    name: item.name,
+                    quantity: 2,
+                    unit: 'pz',
+                    default_quantity: gramsPerPiece,
+                    package_unit: 'g',
+                };
+            }
+            if ((unit === 'g' || unit === 'ml') && defQty > 0) {
+                return {
+                    name: item.name,
+                    quantity: defQty,
+                    unit,
+                    default_quantity: defQty,
+                    package_unit: pkgUnit,
+                };
+            }
        }
        return { name: item.name, quantity: 1, unit: 'conf', default_quantity: 0, package_unit: '' };
    });
@@ -12605,7 +12719,7 @@ async function loadSmartShopping() {
            const prevCriticalNames = new Set(
                smartShoppingItems.filter(i => i.urgency === 'critical').map(i => i.name)
            );
-            smartShoppingItems = data.items;
+            smartShoppingItems = _filterPurchasedSmartItems(data.items);
            _smartShoppingLastFetch = Date.now();
            // NOTE: do NOT clear _cachedPrices here — qty validation (_qty/_unit metadata)
            // handles stale entries automatically item by item.
@@ -13197,6 +13311,7 @@ async function renderShoppingItems() {
        return { item, idx, smartData, urgency, sec };
    });
    const enriched = _dedupeShoppingByGeneric(enrichedRaw);
+    const pantryRows = enriched;

    countEl.textContent = enriched.length;
    const tabCount = document.getElementById('tab-count-acquisto');
@@ -13313,7 +13428,7 @@ async function renderShoppingItems() {
    // ── PANTRY HINTS: show "already at home: X" for each shopping item ──────
    // Load inventory once, then decorate all items asynchronously.
    _getShoppingInventoryCache().then(invItems => {
-        for (const { item, idx, smartData, urgency } of enriched) {
+        for (const { item, idx, smartData, urgency } of pantryRows) {
            const matches = _shoppingFamilyInventoryRows(item, smartData, invItems);
            if (matches.length === 0) continue;
            // Don't show "already at home" when the item is flagged urgent — stock is clearly insufficient.
@@ -14320,6 +14435,7 @@ function viewArchivedRecipe(idx) {
 }

 let _cachedRecipe = null;
+let _recipeShoppingSuggestions = [];
 let _generatedTodayTitles = []; // client-side list, robust vs race conditions
 let _recipeVariationCount = {}; // { 'pranzo': 0, 'cena': 1, ... }
 let _rejectedRecipeIngredients = []; // ingredient names from previously rejected recipes
@@ -14419,6 +14535,14 @@ function _normalizeRecipeIngQtyNumber(ing) {
    const pkgUnit = (ing.package_unit || '').toLowerCase();
    const isConfSub = unit === 'conf' && pkgSize > 0 && (pkgUnit === 'g' || pkgUnit === 'ml');
    let useQty = parseFloat(ing.qty_number) || 0;
+    const stockPieces = parseFloat(ing.inventory_qty_total ?? ing.inventory_qty) || 0;
+
+    if (unit === 'pz') {
+        useQty = _recipeResolvePieceQty(useQty, recipeVal, recipeUnit, stockPieces);
+        ing.qty_number = Math.round(useQty * 1000) / 1000;
+        ing.qty = _recipeFormatPieceQtyLabel(useQty);
+        return useQty;
+    }

    if (isConfSub && recipeVal > 0 && recipeUnit === pkgUnit) {
        useQty = recipeVal;
@@ -14435,17 +14559,84 @@ function _normalizeRecipeIngQtyNumber(ing) {
    return useQty;
 }

+function _recipeRoundPieceQty(n) {
+    return Math.max(0.25, Math.round(n * 4) / 4);
+}
+
+function _recipeFormatPieceQtyLabel(n) {
+    const whole = Math.floor(n);
+    const frac = Math.round((n - whole) * 4) / 4;
+    const fracMap = { 0.25: '¼', 0.5: '½', 0.75: '¾' };
+    const fracStr = fracMap[frac] || '';
+    if (whole === 0) return (fracStr || '0') + ' pz';
+    return whole + fracStr + ' pz';
+}
+
+/** Piece inventory only — never derive count from default_quantity / grams. */
+function _recipeResolvePieceQty(rawQty, recipeVal, recipeUnit, stockPieces) {
+    stockPieces = Math.max(0, stockPieces);
+    if (recipeUnit === 'pz' && recipeVal > 0) {
+        return _recipeRoundPieceQty(Math.min(recipeVal, stockPieces > 0 ? stockPieces : recipeVal));
+    }
+    if (rawQty >= 0.25 && rawQty <= Math.min(stockPieces > 0 ? stockPieces : 50, 50)) {
+        return _recipeRoundPieceQty(rawQty);
+    }
+    if (rawQty >= 20 && (stockPieces <= 0 || rawQty > stockPieces)) {
+        return _recipeRoundPieceQty(Math.min(1, stockPieces > 0 ? stockPieces : 1));
+    }
+    if (recipeVal >= 0.25 && recipeVal <= 50 && !['g', 'ml', 'kg', 'l'].includes(recipeUnit)) {
+        return _recipeRoundPieceQty(Math.min(recipeVal, stockPieces > 0 ? stockPieces : recipeVal));
+    }
+    return _recipeRoundPieceQty(Math.min(1, stockPieces > 0 ? stockPieces : 1));
+}
+
+function _recipeGetServingCapForIngredient(name, unit, persons) {
+    if (!persons || persons <= 0) return null;
+    const n = (name || '').toLowerCase().replace(/\s+/g, ' ');
+    if (unit === 'pz') {
+        if (/\b(cipoll\w*|porr\w*|scalog\w*)\b/.test(n)) return persons;
+        if (/\b(peperon\w*|melanzan\w*|zucchin\w*|finocchi\w*|melone)\b/.test(n)) return persons;
+        if (/\b(limon\w*|aranc\w*|limett\w*)\b/.test(n)) return Math.max(1, Math.ceil(0.5 * persons));
+        if (/\b(dado|brodo)\b/.test(n)) return Math.min(persons, 1);
+        if (/\b(baulett\w*|panin\w*|toast|piadin\w*|grissin\w*)\b/.test(n)) return Math.min(2, persons);
+        return null;
+    }
+    if (unit === 'g' || unit === 'ml') {
+        if (/\b(spinac\w*|bietol\w*|rucol\w*|lattug\w*|valerian\w*|songin\w*|misticanz\w*|indivi\w*|radicchi\w*|cicori\w*)\b/.test(n)) return 150 * persons;
+        if (/\b(minestr\w*|verdure)\b/.test(n)) return 200 * persons;
+        if (/\b(pane\s*gratt|grattugi\w*|pangratt)\b/.test(n)) return 30 * persons;
+        if (/\b(zucchin\w*|melanzan\w*|peperon\w*|carot\w*|sedan\w*|finocchi\w*|cavolf\w*|broccol\w*|zucc\w*|pomodor\w*|verdur\w*)\b/.test(n)) return 150 * persons;
+    }
+    return null;
+}
+
+function _recipeClampQtyForServings(ing, persons) {
+    if (!persons || persons <= 0) return;
+    const unit = ing.inventory_unit || 'pz';
+    let qty = parseFloat(ing.qty_number) || 0;
+    if (qty <= 0) return;
+    const cap = _recipeGetServingCapForIngredient(ing.name, unit, persons);
+    if (cap === null || qty <= cap) return;
+    ing.qty_number = Math.round(cap * 100) / 100;
+    if (unit === 'pz') ing.qty = _recipeFormatPieceQtyLabel(cap);
+    else if (unit === 'g' || unit === 'ml') ing.qty = Math.round(cap) + ' ' + unit;
+    delete ing.use_all_suggested;
+    if (ing.stock_have != null) ing.stock_remain = Math.max(0, Math.round((ing.stock_have - cap) * 100) / 100);
+}
+
 function _recipeGetClosedProductBaseQty(ing) {
    const unit = ing.inventory_unit || 'pz';
    const pkgSize = parseFloat(ing.default_quantity) || 0;
    const pkgUnit = (ing.package_unit || '').toLowerCase();
+    // Countable items: one piece = one unit — ignore default_quantity weight in grams
+    if (unit === 'pz') return 1;
    if (unit === 'conf' && pkgSize > 0 && (pkgUnit === 'g' || pkgUnit === 'ml')) {
        return pkgSize;
    }
    if (unit === 'conf' && pkgSize > 0) {
        return pkgSize;
    }
-    if (pkgSize > 0 && (unit === 'g' || unit === 'ml' || unit === 'pz')) {
+    if (pkgSize > 0 && (unit === 'g' || unit === 'ml')) {
        return pkgSize;
    }
    if (unit === 'conf') {
@@ -14495,7 +14686,9 @@ function _computeRecipeIngStockHint(ing, totalStockQty) {
            ing.qty = Math.round(useDisp) + ' ' + pkgUnit;
        } else {
            ing.qty_number = Math.round(totalStockQty * 1000) / 1000;
-            ing.qty = (unit === 'pz' ? (Math.round(totalStockQty * 100) / 100) : Math.round(totalStockQty)) + ' ' + (unit === 'pz' ? t('units.pz') : unit);
+            ing.qty = unit === 'pz'
+                ? _recipeFormatPieceQtyLabel(totalStockQty)
+                : Math.round(totalStockQty) + ' ' + unit;
        }
    } else {
        delete ing.use_all_suggested;
@@ -14551,6 +14744,7 @@ async function enrichRecipeIngredientsStock(recipe) {
                ing.package_unit = pick.package_unit;
            }
            _computeRecipeIngStockHint(ing, totalStock);
+            _recipeClampQtyForServings(ing, Math.max(1, parseInt(recipe.persons, 10) || 1));
        }
    } catch (e) {
        console.warn('enrichRecipeIngredientsStock:', e);
@@ -14659,11 +14853,14 @@ async function useRecipeIngredient(idx, productId, location, qtyNumber, btn, rec
                    <button type="button" class="use-unit-btn" id="ruse-unit-conf" onclick="switchRecipeUseUnit('conf')">${t('recipes.packs_label')}</button>
                </div>
                <p id="ruse-hint" style="font-size:0.85rem;color:var(--text-muted);margin-bottom:8px">${t('recipes.quantity_in_total').replace('{unit}', subLabel).replace('{total}', Math.round(totalSub) + subLabel)}</p>
+                <div class="qty-control-with-unit">
                    <div class="qty-control">
                        <button type="button" class="qty-btn" onclick="adjustRecipeUseQty(-1)">−</button>
                        <input type="number" id="ruse-quantity" value="${defaultQtyValue}" min="${step}" step="${step}" class="qty-input"
                               oninput="_scaleRecipeAutoFillPaused=true; _cancelScaleAutoConfirm(false); var h=document.getElementById('ruse-scale-hint'); if(h) h.style.display='none';">
                        <button type="button" class="qty-btn" onclick="adjustRecipeUseQty(1)">+</button>
+                    </div>
+                    <span class="qty-unit-badge" id="ruse-quantity-unit" aria-live="polite">${escapeHtml(subLabel)}</span>
                </div>`;
        } else {
            _recipeUseNormalUnit = unit;
@@ -14671,12 +14868,15 @@ async function useRecipeIngredient(idx, productId, location, qtyNumber, btn, rec
            const unitLabel = unitLabels[unit] || unit;
            const inputMin = '0.1';
            qtySection = `
-                <p style="font-size:0.85rem;color:var(--text-muted);margin-bottom:8px">${t('recipes.amount_label')} (${unitLabel}):</p>
+                <p style="font-size:0.85rem;color:var(--text-muted);margin-bottom:8px">${t('recipes.amount_label')}:</p>
+                <div class="qty-control-with-unit">
                    <div class="qty-control">
                        <button type="button" class="qty-btn" onclick="adjustRecipeUseQty(-1)">−</button>
                        <input type="number" id="ruse-quantity" value="${defaultQtyValue}" min="${inputMin}" step="any" class="qty-input"
                               oninput="_scaleRecipeAutoFillPaused=true; _cancelScaleAutoConfirm(false); var h=document.getElementById('ruse-scale-hint'); if(h) h.style.display='none';">
                        <button type="button" class="qty-btn" onclick="adjustRecipeUseQty(1)">+</button>
+                    </div>
+                    <span class="qty-unit-badge" id="ruse-quantity-unit" aria-live="polite">${escapeHtml(unitLabel)}</span>
                </div>`;
        }
        
@@ -14733,6 +14933,7 @@ async function useRecipeIngredient(idx, productId, location, qtyNumber, btn, rec
            </div>
        `;
        document.getElementById('modal-overlay').style.display = 'flex';
+        syncRecipeUseQtyUnitBadge();
        
    } catch (err) {
        console.error('useRecipeIngredient error:', err);
@@ -14771,6 +14972,7 @@ function switchRecipeUseUnit(mode) {
        qtyInput.min = 0.5;
        hint.textContent = t('recipes.packs_of_have').replace('{size}', `${_recipeUseConfMode.packageSize}${_recipeUseConfMode.subLabel}`).replace('{count}', _recipeUseConfMode.totalConf.toFixed(1));
    }
+    syncRecipeUseQtyUnitBadge();
 }

 function adjustRecipeUseQty(direction) {
@@ -15047,6 +15249,30 @@ function scaleRecipePersons(delta) {
    _updateRecipeStockHintsAfterScale(ratio);
 }

+async function addRecipeShoppingSuggestions() {
+    const items = (_recipeShoppingSuggestions || []).filter(s => s && s.name);
+    if (!items.length) return;
+    try {
+        const payload = {
+            items: items.map(s => ({
+                name: s.name,
+                specification: s.qty ? `Da ricetta · ${s.qty}` : 'Da ricetta',
+            })),
+            listUUID: typeof shoppingListUUID !== 'undefined' ? shoppingListUUID : undefined,
+        };
+        const data = await api('shopping_add', {}, 'POST', payload);
+        if (data.success) {
+            showToast(t('recipes.shopping_suggestions_added'), 'success');
+            if (typeof loadShoppingCount === 'function') loadShoppingCount();
+        } else {
+            showToast(data.error || t('error.bring_add'), 'error');
+        }
+    } catch (e) {
+        console.error('addRecipeShoppingSuggestions:', e);
+        showToast(t('error.bring_add'), 'error');
+    }
+}
+
 async function renderRecipe(r) {
    await enrichRecipeIngredientsStock(r);
    // Reset regen choice panel (hide choice, show button)
@@ -15093,6 +15319,20 @@ async function renderRecipe(r) {
        html += `<div class="recipe-tools-banner">🔧 <strong>${escapeHtml(t('recipes.tools_title'))}:</strong> ${tools.map(tool => `<span class="recipe-tool-chip">${escapeHtml(tool)}</span>`).join('')}</div>`;
    }

+    // Optional shopping suggestions (ingredients removed because not in pantry)
+    const shopSug = r.shopping_suggestions || [];
+    if (shopSug.length > 0) {
+        const items = shopSug.map(s => `<li><strong>${escapeHtml(s.name)}</strong>${s.qty ? ': ' + escapeHtml(s.qty) : ''}</li>`).join('');
+        html += `<div class="recipe-shopping-suggestions" id="recipe-shopping-suggestions">
+            <p>🛒 ${escapeHtml(t('recipes.shopping_suggestions_intro'))}</p>
+            <ul>${items}</ul>
+            <button type="button" class="btn btn-sm btn-success" onclick="addRecipeShoppingSuggestions()">${escapeHtml(t('recipes.shopping_suggestions_add'))}</button>
+        </div>`;
+        _recipeShoppingSuggestions = shopSug;
+    } else {
+        _recipeShoppingSuggestions = [];
+    }
+
    // Ingredients
    html += `<h3>${t('recipes.ingredients_title')}</h3><ul class="recipe-ingredients">`;
    (r.ingredients || []).forEach((ing, idx) => {
@@ -15106,6 +15346,9 @@ async function renderRecipe(r) {
            let details = [];
            const ingredientLocLabels = Object.fromEntries(Object.entries(LOCATIONS).map(([k,v]) => [k, `${v.icon} ${v.label}`]));
            details.push(ingredientLocLabels[ing.location] || ('📍 ' + ing.location));
+            if (ing.location === 'freezer') {
+                details.push(t('recipes.frozen_badge') || '❄️ Surgelato');
+            }
            if (ing.expiry_date) {
                const exp = new Date(ing.expiry_date);
                const now = new Date(); now.setHours(0,0,0,0);
@@ -15125,10 +15368,8 @@ async function renderRecipe(r) {
                html += `<button class="btn-use-ingredient" onclick="useRecipeIngredient(${idx}, ${ing.product_id}, '${loc}', ${qtyNum}, this, '${(ing.qty || '').replace(/'/g, "&apos;")}')" title="${t('cooking.ingredient_deduct_title')}">${t('cooking.ingredient_use_btn')}</button>`;
            }
            html += `</li>`;
-        } else {
-            const pantryIcon = ing.from_pantry ? ' ✅' : ' 🛒';
-            html += `<li class="recipe-ingredient" data-base-qty="${ing.qty_number || 0}" data-base-qty-str="${escapeHtml(ing.qty || '')}"><span class="recipe-ing-text"><strong>${escapeHtml(ing.name)}</strong>: <span class="recipe-ing-qty">${escapeHtml(ing.qty)}</span>${pantryIcon}</span></li>`;
        }
+        // Non-pantry ingredients are stripped server-side; nothing to render here.
    });
    html += '</ul>';

@@ -18300,8 +18541,28 @@ function _applySpesaScanUI() {
    _updateScanAiButton();
 }

+/** Drop purchased items from in-memory Bring list (by Italian or catalog name). */
+function _applyShoppingListRemovals(removedNames) {
+    if (!removedNames?.length) return;
+    const keys = new Set();
+    for (const n of removedNames) {
+        const low = String(n || '').trim().toLowerCase();
+        if (low) keys.add(low);
+        const tok = _nameTokens(low)[0];
+        if (tok) keys.add(tok);
+    }
+    if (!keys.size) return;
+    shoppingItems = (shoppingItems || []).filter(item => {
+        const nameLow = (item.name || '').toLowerCase();
+        const rawLow = (item.rawName || '').toLowerCase();
+        const first = _nameTokens(nameLow)[0] || '';
+        return !keys.has(nameLow) && !keys.has(rawLow) && !(first && keys.has(first));
+    });
+    loadShoppingCount();
+}
+
 // Called after successful add — returns true if spesa mode handled navigation
-async function spesaModeAfterAdd() {
+async function spesaModeAfterAdd(addResult) {
    if (!_spesaMode) return false;
    if (currentProduct) {
        _spesaSession.push({
@@ -18311,7 +18572,7 @@ async function spesaModeAfterAdd() {
        });
        updateSpesaBanner();
        _shoppingInventoryCache = null;
-        await _spesaRemovePurchasedFromList(currentProduct);
+        await _spesaRemovePurchasedFromList(currentProduct, addResult);
        const addLoc = document.getElementById('add-location')?.value || 'dispensa';
        _showFamilySiblingSuggest(currentProduct.id, addLoc);
    }
@@ -18320,27 +18581,34 @@ async function spesaModeAfterAdd() {
 }

 /** Remove matching shopping-list / Bring entry after a spesa-mode purchase. */
-async function _spesaRemovePurchasedFromList(product) {
+async function _spesaRemovePurchasedFromList(product, addResult) {
    const namesToMark = [product.name];
    if (product.shopping_name) namesToMark.push(product.shopping_name);
-    if (shoppingListUUID && shoppingItems.length > 0) {
+
+    if (addResult?.removed_names?.length) {
+        _applyShoppingListRemovals(addResult.removed_names);
+        namesToMark.push(...addResult.removed_names);
+    }
+
    const generic = product.shopping_name || product.name;
-        const match = _findSimilarItem(generic, shoppingItems) || _findSimilarItem(product.name, shoppingItems);
-        if (match) {
+    if (!addResult?.removed_from_bring) {
        try {
+            const match = _findSimilarItem(generic, shoppingItems) || _findSimilarItem(product.name, shoppingItems);
            const r = await api('shopping_remove', {}, 'POST', {
-                    name: match.name,
-                    rawName: match.rawName || '',
-                    listUUID: shoppingListUUID,
+                name: match?.name || generic,
+                rawName: match?.rawName || '',
+                listUUID: shoppingListUUID || undefined,
            });
            if (r?.success) {
-                    shoppingItems = shoppingItems.filter(i => i !== match);
-                    namesToMark.push(match.name);
+                _applyShoppingListRemovals([match?.name || generic, match?.rawName].filter(Boolean));
+                if (match?.name) namesToMark.push(match.name);
            }
        } catch (_) { /* best effort */ }
    }
-    }
+
    _markBringPurchased(namesToMark);
+    loadShoppingList._bgCall = true;
+    loadShoppingList();
 }

 const _FAMILY_SIBLING_CONFIRM_TTL = 24 * 60 * 60 * 1000;
@@ -18936,27 +19204,6 @@ function _heartbeatRetry() {
 * Returns true if the app can proceed, false if a critical check failed.
 */
 async function _runStartupCheck() {
-    const spinnerEl  = document.getElementById('preloader-spinner');
-    const wrapEl     = document.getElementById('preloader-progress-wrap');
-    const barEl      = document.getElementById('preloader-bar');
-    const labelEl    = document.getElementById('preloader-check-label');
-    const warningsEl = document.getElementById('preloader-warnings');
-    const errorEl    = document.getElementById('preloader-error-msg');
-    const retryBtn   = document.getElementById('preloader-retry-btn');
-
-    if (!wrapEl) return true; // preloader already removed
-
-    const tl = (key, fallback) => {
-        const full = 'startup.' + key;
-        const v = typeof t === 'function' ? t(full) : full;
-        return (v === full) ? fallback : v;
-    };
-
-    // Switch from spinner to progress bar
-    if (spinnerEl) spinnerEl.style.display = 'none';
-    wrapEl.style.display = '';
-
-    // Helper: set progress bar + crossfade status text (function decl avoids TDZ if called early)
    let _curPct = 0;
    function setProgress(pct, label, state) {
        _curPct = pct;
@@ -18981,6 +19228,26 @@ async function _runStartupCheck() {
        el.textContent = cleanLabel;
    }

+    const spinnerEl  = document.getElementById('preloader-spinner');
+    const wrapEl     = document.getElementById('preloader-progress-wrap');
+    const barEl      = document.getElementById('preloader-bar');
+    const labelEl    = document.getElementById('preloader-check-label');
+    const warningsEl = document.getElementById('preloader-warnings');
+    const errorEl    = document.getElementById('preloader-error-msg');
+    const retryBtn   = document.getElementById('preloader-retry-btn');
+
+    if (!wrapEl) return true; // preloader already removed
+
+    const tl = (key, fallback) => {
+        const full = 'startup.' + key;
+        const v = typeof t === 'function' ? t(full) : full;
+        return (v === full) ? fallback : v;
+    };
+
+    // Switch from spinner to progress bar
+    if (spinnerEl) spinnerEl.style.display = 'none';
+    wrapEl.style.display = '';
+
    // Auto-provision API token for same-origin browser sessions
    if (typeof ensureApiToken === 'function') {
        setProgress(5, tl('token_autoconfig', 'Configurazione accesso...'), 'ok');
@@ -11,8 +11,8 @@ android {
        applicationId = "it.dadaloop.evershelf.kiosk"
        minSdk = 24
        targetSdk = 35
-        versionCode = 18
-        versionName = "1.7.17"
+        versionCode = 20
+        versionName = "1.7.19"
    }

    signingConfigs {
@@ -643,6 +643,79 @@ class KioskActivity : AppCompatActivity() {
                    webView.evaluateJavascript("$jsCallback($escaped)", null)
                }
            }
+
+            val currentKiosk = try {
+                packageManager.getPackageInfo(packageName, 0).versionName ?: ""
+            } catch (_: Exception) { "" }
+
+            val installedVc: Long = try {
+                val pi = packageManager.getPackageInfo(packageName, 0)
+                if (Build.VERSION.SDK_INT >= 28) pi.longVersionCode
+                else @Suppress("DEPRECATION") pi.versionCode.toLong()
+            } catch (_: Exception) { -1L }
+
+            fun semverNewer(remote: String, local: String): Boolean {
+                val r = remote.split(".").map { it.filter(Char::isDigit).toIntOrNull() ?: 0 }
+                val l = local.split(".").map  { it.filter(Char::isDigit).toIntOrNull() ?: 0 }
+                for (i in 0 until maxOf(r.size, l.size)) {
+                    val rv = r.getOrElse(i) { 0 }
+                    val lv = l.getOrElse(i) { 0 }
+                    if (rv != lv) return rv > lv
+                }
+                return false
+            }
+
+            fun needsUpdate(remoteVersion: String, remoteVc: Long): Boolean = when {
+                remoteVc > 0 && installedVc >= 0 -> remoteVc > installedVc
+                currentKiosk.isNotEmpty() && remoteVersion.matches(Regex("\\d+\\.\\d+.*")) ->
+                    semverNewer(remoteVersion, currentKiosk)
+                else -> false
+            }
+
+            fun applyUpdate(remoteVersion: String, apkUrl: String) {
+                val result = JSONObject()
+                    .put("has_update", true)
+                    .put("current", currentKiosk)
+                    .put("latest", remoteVersion)
+                    .put("apk_url", apkUrl)
+                notifyJs(result)
+                prefs.edit()
+                    .putString(KEY_PENDING_UPDATE_VERSION, remoteVersion)
+                    .putString(KEY_PENDING_UPDATE_URL, apkUrl)
+                    .apply()
+                runOnUiThread { showNativeUpdateBanner("🔄 Kiosk $currentKiosk → $remoteVersion", apkUrl) }
+            }
+
+            // 1) Prefer LAN/self-hosted update (no GitHub required)
+            val baseUrl = (prefs.getString(KEY_URL, "") ?: "").trim().trimEnd('/')
+            if (baseUrl.isNotEmpty()) {
+                try {
+                    val localApi = "$baseUrl/api/index.php?action=kiosk_update"
+                    val conn = openTrustedConnection(localApi)
+                    conn.connectTimeout = 5000
+                    conn.readTimeout = 5000
+                    if (conn.responseCode == 200) {
+                        val localJson = JSONObject(conn.inputStream.bufferedReader().readText())
+                        conn.disconnect()
+                        if (localJson.optBoolean("success")) {
+                            val remoteVersion = localJson.optString("version", "")
+                            val remoteVc = localJson.optLong("version_code", -1L)
+                            val apkUrl = localJson.optString("apk_url", "")
+                            if (apkUrl.isNotEmpty() && needsUpdate(remoteVersion, remoteVc)) {
+                                applyUpdate(remoteVersion, apkUrl)
+                                return@Thread
+                            }
+                            if (!needsUpdate(remoteVersion, remoteVc)) {
+                                notifyJs(JSONObject().put("has_update", false).put("source", "local"))
+                                prefs.edit().remove(KEY_PENDING_UPDATE_VERSION).remove(KEY_PENDING_UPDATE_URL).apply()
+                                return@Thread
+                            }
+                        }
+                    } else conn.disconnect()
+                } catch (_: Exception) { /* fall through to GitHub */ }
+            }
+
+            // 2) GitHub release fallback (requires internet)
            try {
                val conn = URL(GITHUB_RELEASES_API).openConnection() as java.net.HttpURLConnection
                conn.setRequestProperty("Accept", "application/vnd.github+json")
@@ -657,43 +730,16 @@ class KioskActivity : AppCompatActivity() {
                val body = conn.inputStream.bufferedReader().readText()
                conn.disconnect()
                val json = JSONObject(body)
-                val latestTag = json.optString("tag_name", "")
-                if (latestTag.isEmpty()) {
-                    notifyJs(JSONObject().put("has_update", false).put("error", "no tag"))
-                    return@Thread
-                }
-
-                val currentKiosk = try {
-                    packageManager.getPackageInfo(packageName, 0).versionName ?: ""
-                } catch (_: Exception) { "" }
-
-                // The kiosk-latest release uses a non-semver tag ("kiosk-latest").
-                // Extract the actual kiosk version from the release body text.
-                // Body format: "Alias automatico → kiosk-X.Y.Z" or just "kiosk-X.Y.Z".
-                // Fall back to stripping the tag prefix if body parsing fails.
                val bodyText = json.optString("body", "")
                val norm = { v: String -> v.replace(Regex("^[^0-9]*"), "") }
                val remoteKioskVersion = Regex("""kiosk-v?(\d+\.\d+(?:\.\d+)?)""")
                    .find(bodyText)?.groupValues?.get(1)
                    ?.takeIf { it.isNotEmpty() }
-                    ?: norm(latestTag)
+                    ?: norm(json.optString("tag_name", ""))

-                // Compare semver: returns true if `remote` is strictly greater than `local`
-                fun semverNewer(remote: String, local: String): Boolean {
-                    val r = remote.split(".").map { it.filter(Char::isDigit).toIntOrNull() ?: 0 }
-                    val l = local.split(".").map  { it.filter(Char::isDigit).toIntOrNull() ?: 0 }
-                    val len = maxOf(r.size, l.size)
-                    for (i in 0 until len) {
-                        val rv = r.getOrElse(i) { 0 }
-                        val lv = l.getOrElse(i) { 0 }
-                        if (rv != lv) return rv > lv
-                    }
-                    return false
-                }
+                val remoteVc = Regex("""versionCode[=:\s(]+(\d+)""", RegexOption.IGNORE_CASE)
+                    .find(bodyText)?.groupValues?.get(1)?.toLongOrNull() ?: -1L

-                val isSemver = remoteKioskVersion.matches(Regex("\\d+\\.\\d+.*"))
-
-                // Get APK URL from assets; fall back to the hardcoded KIOSK_DOWNLOAD_URL
                val assets = json.optJSONArray("assets")
                var kioskApkUrl = ""
                if (assets != null) {
@@ -707,38 +753,35 @@ class KioskActivity : AppCompatActivity() {
                }
                if (kioskApkUrl.isEmpty()) kioskApkUrl = KIOSK_DOWNLOAD_URL

-                // Only flag an update when the remote version is parseable as semver AND
-                // strictly greater than the installed version.
-                val kioskNeedsUpdate = currentKiosk.isNotEmpty() && isSemver &&
-                    semverNewer(remoteKioskVersion, currentKiosk)
-
-                val result = JSONObject()
-                    .put("has_update", kioskNeedsUpdate)
-                    .put("current",    currentKiosk)
-                    .put("latest",     remoteKioskVersion)
-                    .put("apk_url",    kioskApkUrl)
-
-                notifyJs(result)
-
-                if (!kioskNeedsUpdate) {
-                    // Clear any stale pending update if the current version is now up to date
+                if (!needsUpdate(remoteKioskVersion, remoteVc)) {
+                    notifyJs(JSONObject().put("has_update", false))
                    prefs.edit().remove(KEY_PENDING_UPDATE_VERSION).remove(KEY_PENDING_UPDATE_URL).apply()
                    return@Thread
                }
-
-                // Persist the pending update so the banner reappears after a crash/restart
-                prefs.edit()
-                    .putString(KEY_PENDING_UPDATE_VERSION, remoteKioskVersion)
-                    .putString(KEY_PENDING_UPDATE_URL, kioskApkUrl)
-                    .apply()
-
-                runOnUiThread { showNativeUpdateBanner("🔄 Kiosk $currentKiosk → $remoteKioskVersion", kioskApkUrl) }
+                applyUpdate(remoteKioskVersion, kioskApkUrl)
            } catch (e: Exception) {
                notifyJs(JSONObject().put("has_update", false).put("error", e.message ?: "network error"))
            }
        }.start()
    }

+    /** HTTPS with self-signed cert support (LAN servers). */
+    private fun openTrustedConnection(urlStr: String): java.net.HttpURLConnection {
+        val conn = URL(urlStr).openConnection()
+        if (conn is javax.net.ssl.HttpsURLConnection) {
+            val trustAll = arrayOf<javax.net.ssl.TrustManager>(object : javax.net.ssl.X509TrustManager {
+                override fun checkClientTrusted(c: Array<java.security.cert.X509Certificate>?, t: String?) {}
+                override fun checkServerTrusted(c: Array<java.security.cert.X509Certificate>?, t: String?) {}
+                override fun getAcceptedIssuers(): Array<java.security.cert.X509Certificate> = arrayOf()
+            })
+            val sc = javax.net.ssl.SSLContext.getInstance("TLS")
+            sc.init(null, trustAll, java.security.SecureRandom())
+            conn.sslSocketFactory = sc.socketFactory
+            conn.hostnameVerifier = javax.net.ssl.HostnameVerifier { _, _ -> true }
+        }
+        return conn as java.net.HttpURLConnection
+    }
+
    /**
     * On resume: if a previous session detected an available update and saved it to prefs,
     * restore the update banner immediately without a network round-trip.
@@ -540,6 +540,11 @@ class SetupActivity : AppCompatActivity() {
        // Cancel auto-discover when leaving server step
        if (step != 3) discoverCancelled.set(true)

+        // Auto-discover when entering server step (empty URL only)
+        if (step == 3 && urlEdit.text.toString().trim().isEmpty()) {
+            autoDiscover()
+        }
+
        // Scroll to top
        try { findViewById<ScrollView>(R.id.setupScrollView).scrollTo(0, 0) } catch (_: Exception) {}
    }
@@ -697,6 +702,58 @@ class SetupActivity : AppCompatActivity() {
        })
    }

+    private fun normalizeDiscoveredBase(urlStr: String): String {
+        var base = urlStr.substringBefore("/api/")
+        if (base.endsWith(":443")) base = base.removeSuffix(":443")
+        if (base.endsWith(":80"))  base = base.removeSuffix(":80")
+        return if (base.endsWith("/")) base else "$base/"
+    }
+
+    private fun probeEverShelfEndpoint(urlStr: String): String? {
+        return try {
+            val conn = openConn(urlStr) ?: return null
+            val code = conn.responseCode
+            if (code !in 200..399) {
+                conn.disconnect()
+                return null
+            }
+            val body = conn.inputStream.bufferedReader().readText()
+            conn.disconnect()
+            if (body.contains("gemini_key_set") || body.contains("\"success\"") || body.contains("\"ok\"")) {
+                normalizeDiscoveredBase(urlStr)
+            } else null
+        } catch (_: Exception) {
+            null
+        }
+    }
+
+    private fun probeEverShelfHost(ip: String, port: Int): String? {
+        val reachable = try {
+            Socket().use { s -> s.connect(InetSocketAddress(ip, port), 800); true }
+        } catch (_: Exception) {
+            false
+        }
+        if (!reachable) return null
+
+        val scheme = if (port == 443 || port == 8443) "https" else "http"
+        val portInUrl = when {
+            scheme == "https" && port == 443  -> ""
+            scheme == "http"  && port == 80   -> ""
+            else -> ":$port"
+        }
+        val paths = listOf(
+            "/dispensa/api/index.php?action=ping",
+            "/api/index.php?action=ping",
+            "/dispensa/api/index.php?action=get_settings",
+            "/api/index.php?action=get_settings",
+            "/evershelf/api/index.php?action=get_settings",
+        )
+        for (path in paths) {
+            probeEverShelfEndpoint("$scheme://$ip$portInUrl$path")?.let { return it }
+        }
+        return null
+    }
+
    private fun openConn(urlStr: String): HttpURLConnection? {
        return try {
            val conn = URL(urlStr).openConnection()
@@ -772,9 +829,52 @@ class SetupActivity : AppCompatActivity() {
            runOnUiThread { discoverStatus.text = "📡  $detectedLabel" }

            val ports = listOf(443, 80, 8080, 8443)
+
+            // ── 1b. Fast path: likely hosts on Wi-Fi subnet (incl. .128) before full sweep ─
+            val priorityIps = linkedSetOf<String>()
+            try {
+                val ifaces = NetworkInterface.getNetworkInterfaces()
+                while (ifaces != null && ifaces.hasMoreElements()) {
+                    val intf = ifaces.nextElement()
+                    if (!intf.isUp || intf.isLoopback) continue
+                    for (addr in intf.interfaceAddresses) {
+                        val ip = addr.address
+                        if (ip is java.net.Inet4Address && !ip.isLoopbackAddress) {
+                            priorityIps.add(ip.hostAddress ?: continue)
+                        }
+                    }
+                }
+            } catch (_: Exception) {}
+            for (subnet in wifiSubnets.ifEmpty { subnets.take(1) }) {
+                for (last in listOf(1, 128, 100, 10, 50, 254)) {
+                    priorityIps.add("$subnet.$last")
+                }
+            }
+
+            runOnUiThread { discoverStatus.text = "🔍  ${getString(R.string.setup_discovering_detail)}" }
+            for (ip in priorityIps) {
+                if (discoverCancelled.get()) break
+                for (port in ports) {
+                    val hit = probeEverShelfHost(ip, port)
+                    if (hit != null) {
+                        runOnUiThread {
+                            urlEdit.setText(hit)
+                            discoverStatus.text = "✅ ${getString(R.string.setup_server_found)}: $hit"
+                            discoverStatus.setTextColor(0xFF34d399.toInt())
+                            showUrlStatus("✅ ${getString(R.string.setup_server_found)}", true)
+                            btnDiscover.isEnabled = true
+                            btnDiscover.text = getString(R.string.setup_discover_btn)
+                        }
+                        return@Thread
+                    }
+                }
+            }
+
            val paths = listOf(
-                "/api/index.php?action=get_settings",
+                "/dispensa/api/index.php?action=ping",
+                "/api/index.php?action=ping",
                "/dispensa/api/index.php?action=get_settings",
+                "/api/index.php?action=get_settings",
                "/evershelf/api/index.php?action=get_settings",
            )

@@ -819,30 +919,24 @@ class SetupActivity : AppCompatActivity() {

                    // Full HTTP probe on reachable host
                    val scheme = if (port == 443 || port == 8443) "https" else "http"
+                    val portInUrl = when {
+                        scheme == "https" && port == 443  -> ""
+                        scheme == "http"  && port == 80   -> ""
+                        else -> ":$port"
+                    }
                    for (path in paths) {
                        if (discoverCancelled.get() || found.get()) break
-                        val urlStr = "$scheme://$ip:$port$path"
-                        try {
-                            val conn = openConn(urlStr) ?: continue
-                            val code = conn.responseCode
-                            if (code in 200..399) {
-                                val body = conn.inputStream.bufferedReader().readText()
-                                conn.disconnect()
-                                if (body.contains("gemini_key_set") || body.contains("\"success\"")) {
-                                    return@submit urlStr.substringBefore("/api/") + "/"
-                                }
-                            } else conn.disconnect()
-                        } catch (_: Exception) {}
+                        probeEverShelfEndpoint("$scheme://$ip$portInUrl$path")?.let { return@submit it }
                    }
                    null
                }
            }

-            // ── 3. Collect results as they complete (not in submission order) ────
+            // ── 3. Collect results until all tasks finish or a server is found ────
            var result: String? = null
            var collected = 0
-            while (collected < total && !discoverCancelled.get()) {
-                val future = cs.poll(3, TimeUnit.SECONDS) ?: break
+            while (collected < total && !discoverCancelled.get() && result == null) {
+                val future = cs.poll(500, TimeUnit.MILLISECONDS) ?: continue
                collected++
                val r = try { future.get() } catch (_: Exception) { null }
                if (r != null && found.compareAndSet(false, true)) {
@@ -1101,9 +1195,9 @@ class SetupActivity : AppCompatActivity() {
                            val lanIp = getDeviceLanIp() ?: "127.0.0.1"
                            append(",\"scale_enabled\":true,\"scale_gateway_url\":\"ws://$lanIp:8765\"")
                        }
-                        if (geminiKey.isNotEmpty())    append(",\"gemini_api_key\":\"${geminiKey.replace("\"", "\\\"\")}\"")
-                        if (bringEmail.isNotEmpty())   append(",\"bring_email\":\"${bringEmail.replace("\"", "\\\"\")}\"")
-                        if (bringPassword.isNotEmpty()) append(",\"bring_password\":\"${bringPassword.replace("\"", "\\\"\")}\"")
+                        if (geminiKey.isNotEmpty())    append(",\"gemini_api_key\":\"${geminiKey.replace("\"", "\\\"")}\"")
+                        if (bringEmail.isNotEmpty())   append(",\"bring_email\":\"${bringEmail.replace("\"", "\\\"")}\"")
+                        if (bringPassword.isNotEmpty()) append(",\"bring_password\":\"${bringPassword.replace("\"", "\\\"")}\"")
                        append("}")
                    }
                    val conn = (java.net.URL(url).openConnection() as java.net.HttpURLConnection).apply {
@@ -49,7 +49,7 @@
    <string name="install_error_download">Download fehlgeschlagen</string>
    <string name="install_error_download_detail">Verbindung prüfen und erneut versuchen.</string>
    <string name="install_error_install">Installation fehlgeschlagen</string>
-    <string name="install_perm_detail">Aktiviere 'Unbekannte Apps installieren' in den Einstellungen, dann komm zurück.</string>
+    <string name="install_perm_detail">Aktiviere \'Unbekannte Apps installieren\' in den Einstellungen, dann komm zurück.</string>
    <string name="install_btn_retry">↩  Nochmal versuchen</string>
    <string name="btn_back">Zurück</string>
    <string name="btn_launch">🚀  EverShelf starten</string>
@@ -72,15 +72,11 @@
    <string name="setup_zerowaste_toggle_label">Zero-Waste-Tipps</string>
    <string name="setup_zerowaste_toggle_hint">Beim Kochen Tipps zur Wiederverwendung von Resten anzeigen (Schalen, Kochwasser usw.).</string>
    <string name="setup_gemini_title">Google Gemini AI</string>
-    <string name="setup_gemini_desc">EverShelf nutzt Google Gemini AI für Rezeptvorschläge, smarte Einkaufsschätzungen und mehr.
-
-Zum Aktivieren den kostenlosen Gemini API-Schlüssel eingeben.</string>
-    <string name="setup_gemini_how">Kostenlosen Schlüssel unter: aistudio.google.com → "API-Schlüssel erhalten"</string>
+    <string name="setup_gemini_desc">EverShelf nutzt Google Gemini AI für Rezeptvorschläge, smarte Einkaufsschätzungen und mehr.\n\nZum Aktivieren den kostenlosen Gemini API-Schlüssel eingeben.</string>
+    <string name="setup_gemini_how">Kostenlosen Schlüssel unter: aistudio.google.com → \"API-Schlüssel erhalten\"</string>
    <string name="setup_gemini_hint">API-Schlüssel einfügen (beginnt mit AIza…)</string>
    <string name="setup_bring_title">Bring! Einkaufsliste</string>
-    <string name="setup_bring_desc">EverShelf kann die Einkaufsliste mit der Bring!-App synchronisieren.
-
-Bring!-Zugangsdaten eingeben, um die Integration zu aktivieren.</string>
+    <string name="setup_bring_desc">EverShelf kann die Einkaufsliste mit der Bring!-App synchronisieren.\n\nBring!-Zugangsdaten eingeben, um die Integration zu aktivieren.</string>
    <string name="setup_bring_email_hint">Bring!-E-Mail-Adresse</string>
    <string name="setup_bring_pass_hint">Bring!-Passwort</string>
    <string name="setup_done_title">Alles bereit!</string>
@@ -49,7 +49,7 @@
    <string name="install_error_download">Descarga fallida</string>
    <string name="install_error_download_detail">Comprueba la conexión e inténtalo de nuevo.</string>
    <string name="install_error_install">Instalación fallida</string>
-    <string name="install_perm_detail">Habilita 'Instalar apps desconocidas' en los ajustes y vuelve aquí.</string>
+    <string name="install_perm_detail">Habilita \'Instalar apps desconocidas\' en los ajustes y vuelve aquí.</string>
    <string name="install_btn_retry">↩  Reintentar</string>
    <string name="btn_back">Atrás</string>
    <string name="btn_launch">🚀  Iniciar EverShelf</string>
@@ -72,15 +72,11 @@
    <string name="setup_zerowaste_toggle_label">Consejos zero-waste</string>
    <string name="setup_zerowaste_toggle_hint">Muestra consejos para reutilizar restos (cáscaras, agua de cocción, etc.) al cocinar.</string>
    <string name="setup_gemini_title">Google Gemini AI</string>
-    <string name="setup_gemini_desc">EverShelf usa Google Gemini AI para sugerencias de recetas, estimaciones inteligentes de la compra y más.
-
-Para activarla, introduce tu clave API de Gemini gratuita.</string>
-    <string name="setup_gemini_how">Obtén tu clave gratuita en: aistudio.google.com → "Obtener clave API"</string>
+    <string name="setup_gemini_desc">EverShelf usa Google Gemini AI para sugerencias de recetas, estimaciones inteligentes de la compra y más.\n\nPara activarla, introduce tu clave API de Gemini gratuita.</string>
+    <string name="setup_gemini_how">Obtén tu clave gratuita en: aistudio.google.com → \"Obtener clave API\"</string>
    <string name="setup_gemini_hint">Pega la clave API aquí (empieza por AIza…)</string>
    <string name="setup_bring_title">Bring! Lista de la compra</string>
-    <string name="setup_bring_desc">EverShelf puede sincronizar tu lista de la compra con la app Bring!.
-
-Introduce tus credenciales de Bring! para activar la integración.</string>
+    <string name="setup_bring_desc">EverShelf puede sincronizar tu lista de la compra con la app Bring!.\n\nIntroduce tus credenciales de Bring! para activar la integración.</string>
    <string name="setup_bring_email_hint">Correo electrónico de Bring!</string>
    <string name="setup_bring_pass_hint">Contraseña de Bring!</string>
    <string name="setup_done_title">¡Todo listo!</string>
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <string name="app_name">EverShelf Kiosk</string>
-    <string name="setup_enter_url">Veuillez d'abord saisir une URL</string>
+    <string name="setup_enter_url">Veuillez d\'abord saisir une URL</string>
    <string name="setup_testing">Test de connexion…</string>
    <string name="setup_server_found">Serveur EverShelf trouvé et API active !</string>
    <string name="setup_api_not_found">Serveur accessible mais API EverShelf introuvable. Vérifiez le chemin.</string>
-    <string name="setup_unreachable">Impossible d'atteindre le serveur</string>
+    <string name="setup_unreachable">Impossible d\'atteindre le serveur</string>
    <string name="setup_discover_btn">🔍  Rechercher sur le réseau local</string>
    <string name="setup_perms_granted_next">✅ Permissions accordées — Continuer →</string>
    <string name="setup_discovering">Analyse en cours…</string>
    <string name="setup_discovering_detail">Recherche de serveurs EverShelf sur le réseau local…</string>
-    <string name="setup_discover_not_found">Aucun serveur EverShelf trouvé automatiquement. Entrez l'URL manuellement.</string>
+    <string name="setup_discover_not_found">Aucun serveur EverShelf trouvé automatiquement. Entrez l\'URL manuellement.</string>
    <string name="setup_exit_title">Quitter la configuration ?</string>
-    <string name="setup_exit_message">Vous pouvez terminer la configuration plus tard en rouvrant l'app.</string>
+    <string name="setup_exit_message">Vous pouvez terminer la configuration plus tard en rouvrant l\'app.</string>
    <string name="setup_exit_confirm">Quitter</string>
    <string name="setup_exit_cancel">Continuer</string>
    <string name="setup_step_back">← Retour</string>
@@ -22,20 +22,20 @@
    <string name="wizard_step3_title">Balance intelligente</string>
    <string name="wizard_step3_description">EverShelf Kiosk inclut une passerelle Bluetooth intégrée — aucune app externe nécessaire. Sélectionnez votre balance ci-dessous.</string>
    <string name="wizard_step3_question">Avez-vous une balance intelligente Bluetooth ?</string>
-    <string name="wizard_step3_yes">✅  Oui, j'ai une balance</string>
+    <string name="wizard_step3_yes">✅  Oui, j\'ai une balance</string>
    <string name="wizard_step3_no">➡️  Non, ignorer cette étape</string>
    <string name="ble_scanning">🔍 Scan en cours…</string>
    <string name="ble_connected">Connecté ! Posez un objet sur la balance…</string>
    <string name="ble_disconnected">Connexion perdue. Réessayer.</string>
-    <string name="ble_no_scale_found">Aucune balance trouvée. Vérifiez qu'elle est allumée et à proximité, puis réessayez.</string>
+    <string name="ble_no_scale_found">Aucune balance trouvée. Vérifiez qu\'elle est allumée et à proximité, puis réessayez.</string>
    <string name="ble_select_from_list">Sélectionnez votre balance dans la liste.</string>
    <string name="ble_not_confirmed">Balance non confirmée. Relancer le scan.</string>
    <string name="ble_scan_again">🔄  Scanner à nouveau</string>
-    <string name="ble_weight_received">Poids reçu — correspond-il à l'affichage de la balance ?</string>
+    <string name="ble_weight_received">Poids reçu — correspond-il à l\'affichage de la balance ?</string>
    <string name="wizard_gateway_installed">Balance enregistrée ✅</string>
    <string name="wizard_gateway_installed_detail">La passerelle BLE intégrée se connectera automatiquement au démarrage.</string>
    <string name="wizard_gateway_not_installed">Aucune balance sélectionnée</string>
-    <string name="wizard_gateway_not_installed_detail">Scannez les balances BLE à proximité et appuyez sur l'une d'elles pour la sélectionner.</string>
+    <string name="wizard_gateway_not_installed_detail">Scannez les balances BLE à proximité et appuyez sur l\'une d\'elles pour la sélectionner.</string>
    <string name="wizard_gateway_checking">Scan des balances BLE en cours…</string>
    <string name="wizard_gateway_up_to_date">Service BLE de la balance prêt.</string>
    <string name="wizard_gateway_update_available">Balance BLE trouvée</string>
@@ -43,13 +43,13 @@
    <string name="install_downloading">Téléchargement en cours…</string>
    <string name="install_downloading_detail">Veuillez patienter, le fichier est en cours de téléchargement.</string>
    <string name="install_installing">Installation en cours…</string>
-    <string name="install_confirm_detail">Confirmez l'installation dans la boîte de dialogue ouverte.</string>
+    <string name="install_confirm_detail">Confirmez l\'installation dans la boîte de dialogue ouverte.</string>
    <string name="install_success">Installé avec succès !</string>
-    <string name="install_success_detail">L'app a été mise à jour.</string>
+    <string name="install_success_detail">L\'app a été mise à jour.</string>
    <string name="install_error_download">Téléchargement échoué</string>
    <string name="install_error_download_detail">Vérifiez la connexion et réessayez.</string>
    <string name="install_error_install">Installation échouée</string>
-    <string name="install_perm_detail">Activez 'Installer des apps inconnues' dans les paramètres, puis revenez ici.</string>
+    <string name="install_perm_detail">Activez \'Installer des apps inconnues\' dans les paramètres, puis revenez ici.</string>
    <string name="install_btn_retry">↩  Réessayer</string>
    <string name="btn_back">Retour</string>
    <string name="btn_launch">🚀  Lancer EverShelf</string>
@@ -58,13 +58,13 @@
    <string name="btn_update_gateway">📥  Mettre à jour Scale Gateway</string>
    <string name="wizard_server_checking">Vérification de la connexion au serveur…</string>
    <string name="wizard_server_ok">Serveur accessible ✅</string>
-    <string name="wizard_server_ok_detail">Rapport d'erreurs actif — les échecs d'installation seront envoyés automatiquement aux GitHub Issues.</string>
+    <string name="wizard_server_ok_detail">Rapport d\'erreurs actif — les échecs d\'installation seront envoyés automatiquement aux GitHub Issues.</string>
    <string name="wizard_server_error">Serveur inaccessible ⚠️</string>
-    <string name="wizard_server_error_detail">Les erreurs n'atteindront pas GitHub Issues. Vérifiez l'URL saisie à l'étape 2.</string>
+    <string name="wizard_server_error_detail">Les erreurs n\'atteindront pas GitHub Issues. Vérifiez l\'URL saisie à l\'étape 2.</string>
    <string name="setup_features_title">Fonctionnalités</string>
    <string name="setup_features_desc">Activez les fonctions que vous souhaitez utiliser. Vous pourrez les modifier plus tard dans les paramètres du serveur.</string>
    <string name="setup_screensaver_toggle_label">Horloge écran de veille</string>
-    <string name="setup_screensaver_toggle_hint">Affiche une horloge après 5 min d'inactivité.</string>
+    <string name="setup_screensaver_toggle_hint">Affiche une horloge après 5 min d\'inactivité.</string>
    <string name="setup_prices_toggle_label">Prix liste de courses</string>
    <string name="setup_prices_toggle_hint">Estimation automatique du coût de chaque article via IA.</string>
    <string name="setup_mealplan_toggle_label">Plan de repas</string>
@@ -72,15 +72,11 @@
    <string name="setup_zerowaste_toggle_label">Conseils zéro déchet</string>
    <string name="setup_zerowaste_toggle_hint">Affiche des conseils pour réutiliser les restes (peaux, eau de cuisson, etc.) pendant la cuisson.</string>
    <string name="setup_gemini_title">Google Gemini AI</string>
-    <string name="setup_gemini_desc">EverShelf utilise Google Gemini AI pour les suggestions de recettes, les estimations intelligentes des courses et plus encore.
-
-Pour l'activer, entrez votre clé API Gemini gratuite.</string>
-    <string name="setup_gemini_how">Obtenez votre clé gratuite sur : aistudio.google.com → "Obtenir une clé API"</string>
+    <string name="setup_gemini_desc">EverShelf utilise Google Gemini AI pour les suggestions de recettes, les estimations intelligentes des courses et plus encore.\n\nPour l\'activer, entrez votre clé API Gemini gratuite.</string>
+    <string name="setup_gemini_how">Obtenez votre clé gratuite sur : aistudio.google.com → \"Obtenir une clé API\"</string>
    <string name="setup_gemini_hint">Collez la clé API ici (commence par AIza…)</string>
    <string name="setup_bring_title">Bring! Liste de courses</string>
-    <string name="setup_bring_desc">EverShelf peut synchroniser votre liste de courses avec l'app Bring!.
-
-Entrez vos identifiants Bring! pour activer l'intégration.</string>
+    <string name="setup_bring_desc">EverShelf peut synchroniser votre liste de courses avec l\'app Bring!.\n\nEntrez vos identifiants Bring! pour activer l\'intégration.</string>
    <string name="setup_bring_email_hint">Adresse e-mail Bring!</string>
    <string name="setup_bring_pass_hint">Mot de passe Bring!</string>
    <string name="setup_done_title">Tout est prêt !</string>
@@ -10,9 +10,9 @@
    <string name="setup_perms_granted_next">✅ Permessi concessi — Continua →</string>
    <string name="setup_discovering">Scansione in corso…</string>
    <string name="setup_discovering_detail">Ricerca server EverShelf nella rete locale…</string>
-    <string name="setup_discover_not_found">Nessun server EverShelf trovato automaticamente. Inserisci l'URL manualmente.</string>
+    <string name="setup_discover_not_found">Nessun server EverShelf trovato automaticamente. Inserisci l\'URL manualmente.</string>
    <string name="setup_exit_title">Uscire dalla configurazione?</string>
-    <string name="setup_exit_message">Puoi completare la configurazione più tardi riaprendo l'app.</string>
+    <string name="setup_exit_message">Puoi completare la configurazione più tardi riaprendo l\'app.</string>
    <string name="setup_exit_confirm">Esci</string>
    <string name="setup_exit_cancel">Continua</string>
    <string name="setup_step_back">← Indietro</string>
@@ -28,28 +28,28 @@
    <string name="ble_connected">Connesso! Posiziona un oggetto sulla bilancia…</string>
    <string name="ble_disconnected">Connessione persa. Riprova.</string>
    <string name="ble_no_scale_found">Nessuna bilancia trovata. Assicurati che sia accesa e vicina, poi riprova.</string>
-    <string name="ble_select_from_list">Seleziona la tua bilancia dall'elenco.</string>
+    <string name="ble_select_from_list">Seleziona la tua bilancia dall\'elenco.</string>
    <string name="ble_not_confirmed">Bilancia non confermata. Riprova la scansione.</string>
    <string name="ble_scan_again">🔄  Scansiona di nuovo</string>
    <string name="ble_weight_received">Peso ricevuto — coincide con quello sulla bilancia?</string>
    <string name="wizard_gateway_installed">Bilancia salvata ✅</string>
-    <string name="wizard_gateway_installed_detail">Il gateway BLE integrato si collegherà automaticamente all'avvio.</string>
+    <string name="wizard_gateway_installed_detail">Il gateway BLE integrato si collegherà automaticamente all\'avvio.</string>
    <string name="wizard_gateway_not_installed">Nessuna bilancia selezionata</string>
    <string name="wizard_gateway_not_installed_detail">Scansiona le bilance BLE nelle vicinanze e tocca una per selezionarla.</string>
    <string name="wizard_gateway_checking">Scansione bilance BLE in corso…</string>
    <string name="wizard_gateway_up_to_date">Servizio BLE bilancia pronto.</string>
    <string name="wizard_gateway_update_available">Bilancia BLE trovata</string>
-    <string name="wizard_gateway_update_detail">Tocca la bilancia nell'elenco per connettersi.</string>
+    <string name="wizard_gateway_update_detail">Tocca la bilancia nell\'elenco per connettersi.</string>
    <string name="install_downloading">Scaricamento in corso…</string>
    <string name="install_downloading_detail">Attendi, il file viene scaricato.</string>
    <string name="install_installing">Installazione in corso…</string>
-    <string name="install_confirm_detail">Conferma l'installazione nel dialog che si è aperto.</string>
+    <string name="install_confirm_detail">Conferma l\'installazione nel dialog che si è aperto.</string>
    <string name="install_success">Installato con successo!</string>
-    <string name="install_success_detail">L'app è stata aggiornata.</string>
+    <string name="install_success_detail">L\'app è stata aggiornata.</string>
    <string name="install_error_download">Download fallito</string>
    <string name="install_error_download_detail">Controlla la connessione e riprova.</string>
    <string name="install_error_install">Installazione fallita</string>
-    <string name="install_perm_detail">Abilita 'Installa app sconosciute' nelle impostazioni, poi torna qui.</string>
+    <string name="install_perm_detail">Abilita \'Installa app sconosciute\' nelle impostazioni, poi torna qui.</string>
    <string name="install_btn_retry">↩  Riprova</string>
    <string name="btn_back">Indietro</string>
    <string name="btn_launch">🚀  Avvia EverShelf</string>
@@ -60,11 +60,11 @@
    <string name="wizard_server_ok">Server raggiungibile ✅</string>
    <string name="wizard_server_ok_detail">Segnalazione errori attiva — i problemi di installazione vengono inviati automaticamente alle GitHub Issues.</string>
    <string name="wizard_server_error">Server non raggiungibile ⚠️</string>
-    <string name="wizard_server_error_detail">Gli errori non raggiungeranno GitHub Issues. Verifica l'URL inserito al passaggio 2.</string>
+    <string name="wizard_server_error_detail">Gli errori non raggiungeranno GitHub Issues. Verifica l\'URL inserito al passaggio 2.</string>
    <string name="setup_features_title">Funzionalità</string>
    <string name="setup_features_desc">Attiva le funzioni che vuoi usare. Puoi sempre cambiarle in seguito dalle impostazioni del server.</string>
    <string name="setup_screensaver_toggle_label">Salvaschermo orologio</string>
-    <string name="setup_screensaver_toggle_hint">Mostra l'overlay orologio dopo 5 min di inattività.</string>
+    <string name="setup_screensaver_toggle_hint">Mostra l\'overlay orologio dopo 5 min di inattività.</string>
    <string name="setup_prices_toggle_label">Prezzi lista spesa</string>
    <string name="setup_prices_toggle_hint">Stima automatica del costo di ogni articolo in lista tramite AI.</string>
    <string name="setup_mealplan_toggle_label">Piano pasti</string>
@@ -72,15 +72,11 @@
    <string name="setup_zerowaste_toggle_label">Suggerimenti zero-waste</string>
    <string name="setup_zerowaste_toggle_hint">Durante la cottura mostra consigli per riutilizzare scarti (bucce, acqua di cottura, ecc.).</string>
    <string name="setup_gemini_title">Google Gemini AI</string>
-    <string name="setup_gemini_desc">EverShelf usa Google Gemini AI per suggerimenti di ricette, stime intelligenti della spesa e altro ancora.
-
-Per abilitarla, inserisci la tua chiave API Gemini gratuita.</string>
-    <string name="setup_gemini_how">Ottieni la chiave gratuita su: aistudio.google.com → "Ottieni chiave API"</string>
+    <string name="setup_gemini_desc">EverShelf usa Google Gemini AI per suggerimenti di ricette, stime intelligenti della spesa e altro ancora.\n\nPer abilitarla, inserisci la tua chiave API Gemini gratuita.</string>
+    <string name="setup_gemini_how">Ottieni la chiave gratuita su: aistudio.google.com → \"Ottieni chiave API\"</string>
    <string name="setup_gemini_hint">Incolla la chiave API (inizia con AIza…)</string>
    <string name="setup_bring_title">Bring! Lista della spesa</string>
-    <string name="setup_bring_desc">EverShelf può sincronizzare la lista della spesa con l'app Bring!.
-
-Inserisci le credenziali del tuo account Bring! per abilitare l'integrazione.</string>
+    <string name="setup_bring_desc">EverShelf può sincronizzare la lista della spesa con l\'app Bring!.\n\nInserisci le credenziali del tuo account Bring! per abilitare l\'integrazione.</string>
    <string name="setup_bring_email_hint">Email Bring!</string>
    <string name="setup_bring_pass_hint">Password Bring!</string>
    <string name="setup_done_title">Tutto pronto!</string>
@@ -94,7 +94,7 @@
        <div id="preloader-warnings" class="preloader-warnings" style="display:none"></div>
        <div id="preloader-error-msg" class="preloader-error-msg" style="display:none"></div>
        <button id="preloader-retry-btn" class="preloader-retry-btn" style="display:none" onclick="_startupRetry()">🔄 <span data-i18n="startup.retry">Riprova</span></button>
-        <span class="app-preloader-version" id="preloader-version">v1.7.39</span>
+        <span class="app-preloader-version" id="preloader-version">v1.7.41</span>
    </div>
 </div>

@@ -107,7 +107,7 @@
        <!-- Title — left-aligned; grows to fill space -->
        <div class="header-title-wrap">
            <h1 class="header-title" onclick="showPage('dashboard')">
-                <img src="assets/img/logo/logo_icon.png" alt="" class="header-logo-icon" aria-hidden="true" /><span data-i18n="nav.title">EverShelf</span><span class="header-version">v1.7.39</span>
+                <img src="assets/img/logo/logo_icon.png" alt="" class="header-logo-icon" aria-hidden="true" /><span data-i18n="nav.title">EverShelf</span><span class="header-version">v1.7.41</span>
            </h1>
            <!-- Update badge — shown alongside title, never replaces it -->
            <span class="header-update-badge" id="header-update-badge" style="display:none"></span>
@@ -420,6 +420,7 @@
                        <input type="number" id="add-quantity" value="1" min="0.1" step="any" class="qty-input">
                        <button type="button" class="qty-btn" onclick="adjustAddQty(1)">+</button>
                    </div>
+                    <span class="qty-unit-badge qty-unit-muted" id="add-quantity-unit" aria-live="polite">pz</span>
                    <select id="add-unit" class="form-input unit-select" onchange="onAddUnitChange()">
                        <option value="pz">pz</option>
                        <option value="conf">conf</option>
@@ -499,12 +500,15 @@
                    </button>
                    <div class="use-partial">
                        <p id="use-partial-hint" data-i18n="use.partial_hint">Oppure specifica la quantità usata:</p>
+                        <div class="qty-control-with-unit">
                            <div class="qty-control">
                                <button type="button" class="qty-btn" id="use-qty-minus" onclick="adjustUseQty(-1)">−</button>
                                <input type="number" id="use-quantity" value="1" min="0.1" step="any" class="qty-input"
                                       oninput="_scaleUserDismissed=true; _cancelScaleTimersOnly();">
                                <button type="button" class="qty-btn" id="use-qty-plus" onclick="adjustUseQty(1)">+</button>
                            </div>
+                            <span class="qty-unit-badge" id="use-quantity-unit" aria-live="polite">—</span>
+                        </div>
                        <button type="submit" id="btn-use-submit" class="btn btn-large btn-warning full-width mt-2 move-countdown-btn" data-i18n="use.submit">📤 Usa questa quantità</button>
                    </div>
                </div>
@@ -1985,6 +1989,6 @@
    </div>
 </div>

-<script src="assets/js/app.js?v=20260606n"></script>
+<script src="assets/js/app.js?v=20260606z"></script>
 </body>
 </html>
@@ -2,7 +2,7 @@
    "name": "EverShelf",
    "short_name": "EverShelf",
    "description": "Gestione completa della dispensa di casa con scansione barcode",
-    "version": "1.7.39",
+    "version": "1.7.41",
    "start_url": "/evershelf/",
    "display": "standalone",
    "background_color": "#f0f4e8",
@@ -0,0 +1,4 @@
+{
+    "version": "1.7.19",
+    "version_code": 20
+}
@@ -0,0 +1,163 @@
+#!/usr/bin/env php
+<?php
+/**
+ * Audit: products depleted in last N days vs shopping list / Bring / smart shopping.
+ * Usage: php scripts/audit-finished-shopping.php [days]
+ */
+define('CRON_MODE', true);
+require_once __DIR__ . '/../api/bootstrap.php';
+require_once __DIR__ . '/../api/index.php';
+
+$days = max(1, (int)($argv[1] ?? 30));
+$db = getDB();
+
+// Recompute smart shopping fresh
+ob_start();
+smartShopping($db);
+$smartJson = ob_get_clean();
+$smartData = json_decode($smartJson, true);
+$smartItems = $smartData['items'] ?? [];
+$smartByPid = [];
+$smartByName = [];
+foreach ($smartItems as $si) {
+    foreach ($si['variants'] ?? [] as $v) {
+        $smartByPid[(int)$v['product_id']] = $si;
+    }
+    $smartByPid[(int)$si['product_id']] = $si;
+    $sn = strtolower(trim($si['shopping_name'] ?? $si['name'] ?? ''));
+    if ($sn !== '') $smartByName[$sn] = $si;
+}
+
+// Bring list
+$bringNames = [];
+$bringSpecs = [];
+$auth = bringAuth();
+if ($auth && !empty($auth['bringListUUID'])) {
+    $listData = bringRequest('GET', "https://api.getbring.com/rest/v2/bringlists/{$auth['bringListUUID']}");
+    if ($listData && isset($listData['purchase'])) {
+        foreach ($listData['purchase'] as $bi) {
+            $k = mb_strtolower($bi['name'] ?? '');
+            $bringNames[$k] = $bi['name'] ?? '';
+            $bringSpecs[$k] = $bi['specification'] ?? '';
+        }
+    }
+}
+
+// Internal shopping list
+$shopNames = [];
+$shopRows = $db->query("SELECT name, specification FROM shopping_list")->fetchAll(PDO::FETCH_ASSOC);
+foreach ($shopRows as $r) {
+    $shopNames[mb_strtolower($r['name'])] = $r;
+}
+
+// Products with zero stock, last activity in window
+$rows = $db->query("
+    SELECT p.id, p.name, p.brand, p.shopping_name, p.unit,
+           COALESCE((SELECT SUM(i.quantity) FROM inventory i WHERE i.product_id = p.id), 0) AS stock_qty,
+           (SELECT MAX(t.created_at) FROM transactions t
+            WHERE t.product_id = p.id AND t.undone = 0
+              AND t.type IN ('out','waste','in')
+              AND t.created_at >= datetime('now', '-{$days} days')) AS last_activity,
+           (SELECT MAX(t.created_at) FROM transactions t
+            WHERE t.product_id = p.id AND t.undone = 0
+              AND t.type IN ('out','waste')
+              AND t.created_at >= datetime('now', '-{$days} days')) AS last_out,
+           (SELECT COUNT(*) FROM transactions t
+            WHERE t.product_id = p.id AND t.undone = 0 AND t.type IN ('out','waste')) AS use_count,
+           (SELECT COUNT(*) FROM transactions t
+            WHERE t.product_id = p.id AND t.undone = 0 AND t.type = 'in') AS buy_count
+    FROM products p
+    WHERE COALESCE((SELECT SUM(i.quantity) FROM inventory i WHERE i.product_id = p.id), 0) <= 0.001
+      AND (SELECT MAX(t.created_at) FROM transactions t
+           WHERE t.product_id = p.id AND t.undone = 0
+             AND t.type IN ('out','waste','in')
+             AND t.created_at >= datetime('now', '-{$days} days')) IS NOT NULL
+    ORDER BY last_activity DESC
+")->fetchAll(PDO::FETCH_ASSOC);
+
+$missing = [];
+$onList = [];
+$suppressed = [];
+
+foreach ($rows as $r) {
+    $pid = (int)$r['id'];
+    $generic = trim($r['shopping_name'] ?? '') ?: computeShoppingName($r['name'], '', $r['brand'] ?? '');
+    $bringKey = mb_strtolower(italianToBring($generic));
+    $shopKey = mb_strtolower($generic);
+
+    $smart = $smartByPid[$pid] ?? $smartByName[mb_strtolower($generic)] ?? null;
+    $onBring = isset($bringNames[$bringKey]);
+    $onShop = isset($shopNames[$shopKey]);
+    $inSmart = $smart !== null && ($smart['urgency'] ?? 'none') !== 'none';
+
+    $entry = [
+        'id' => $pid,
+        'name' => $r['name'],
+        'brand' => $r['brand'],
+        'generic' => $generic,
+        'last_activity' => $r['last_activity'],
+        'last_out' => $r['last_out'],
+        'use_count' => (int)$r['use_count'],
+        'buy_count' => (int)$r['buy_count'],
+        'on_bring' => $onBring,
+        'on_shop' => $onShop,
+        'in_smart' => $inSmart,
+        'smart_urgency' => $smart['urgency'] ?? null,
+        'smart_reasons' => $smart['reasons'] ?? [],
+        'bring_spec' => $bringSpecs[$bringKey] ?? '',
+    ];
+
+    if (!$onBring && !$onShop && !$inSmart) {
+        $missing[] = $entry;
+    } elseif ($onBring || $onShop) {
+        $onList[] = $entry;
+    } elseif ($inSmart) {
+        $suppressed[] = $entry; // in smart but not synced yet
+    } else {
+        $missing[] = $entry;
+    }
+}
+
+echo "=== Audit prodotti esauriti (ultimi {$days} giorni) ===\n";
+echo 'Totale esauriti con attività recente: ' . count($rows) . "\n";
+echo 'Già in lista/Bring: ' . count($onList) . "\n";
+echo 'In smart shopping ma non in lista: ' . count($suppressed) . "\n";
+echo 'MANCANTI (né lista né Bring né smart): ' . count($missing) . "\n\n";
+
+if ($missing) {
+    echo "--- MANCANTI ---\n";
+    foreach ($missing as $m) {
+        echo sprintf(
+            "- [%d] %s%s → generico: %s | usi:%d acquisti:%d | ultimo:%s\n",
+            $m['id'],
+            $m['name'],
+            $m['brand'] ? " ({$m['brand']})" : '',
+            $m['generic'],
+            $m['use_count'],
+            $m['buy_count'],
+            $m['last_activity']
+        );
+    }
+    echo "\n";
+}
+
+if ($suppressed) {
+    echo "--- IN SMART MA NON IN LISTA/BRING ---\n";
+    foreach ($suppressed as $m) {
+        echo sprintf(
+            "- [%d] %s → %s | urgenza:%s | %s\n",
+            $m['id'],
+            $m['name'],
+            $m['generic'],
+            $m['smart_urgency'] ?? '?',
+            implode(', ', $m['smart_reasons'] ?? [])
+        );
+    }
+}
+
+// Export JSON for fix script
+file_put_contents(
+    __DIR__ . '/../data/audit_finished_missing.json',
+    json_encode(['days' => $days, 'missing' => $missing, 'suppressed' => $suppressed], JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT)
+);
+echo "\nReport salvato in data/audit_finished_missing.json\n";
@@ -0,0 +1,65 @@
+#!/usr/bin/env php
+<?php
+/**
+ * Backfill Bring!/shopping list for products depleted in the last N days.
+ * Usage: php scripts/backfill-finished-shopping.php [days]
+ */
+define('CRON_MODE', true);
+require_once __DIR__ . '/../api/bootstrap.php';
+require_once __DIR__ . '/../api/index.php';
+
+$days = max(1, (int)($argv[1] ?? RECENTLY_EXHAUSTED_DAYS));
+$db = getDB();
+
+$rows = $db->query("
+    SELECT p.id, p.name, p.shopping_name
+    FROM products p
+    WHERE COALESCE((SELECT SUM(i.quantity) FROM inventory i WHERE i.product_id = p.id), 0) <= 0.001
+      AND (
+        SELECT MAX(t.created_at) FROM transactions t
+        WHERE t.product_id = p.id AND t.undone = 0 AND t.type IN ('out','waste')
+      ) >= datetime('now', '-{$days} days')
+    ORDER BY (
+        SELECT MAX(t.created_at) FROM transactions t
+        WHERE t.product_id = p.id AND t.undone = 0 AND t.type IN ('out','waste')
+    ) DESC
+")->fetchAll(PDO::FETCH_ASSOC);
+
+echo '[' . date('Y-m-d H:i:s') . "] Backfill {$days}d — " . count($rows) . " prodotti esauriti\n";
+
+$added = 0;
+$updated = 0;
+$skipped = 0;
+foreach ($rows as $r) {
+    $res = bringAddDepletedProduct($db, (int)$r['id']);
+    if (!empty($res['added'])) {
+        $added++;
+        echo "  + {$r['name']} → {$res['generic_name']}\n";
+    } elseif (!empty($res['updated'])) {
+        $updated++;
+        echo "  ~ {$r['name']} → {$res['generic_name']}\n";
+    } else {
+        $skipped++;
+    }
+}
+
+ob_start();
+smartShopping($db);
+$json = ob_get_clean();
+$decoded = json_decode($json, true);
+if ($decoded && !empty($decoded['success'])) {
+    $decoded['cached_at'] = date('c');
+    $decoded['cached_ts'] = time();
+    file_put_contents(
+        __DIR__ . '/../data/smart_shopping_cache.json',
+        json_encode($decoded, JSON_UNESCAPED_UNICODE)
+    );
+}
+
+ob_start();
+bringSyncFull($db, false);
+$sync = json_decode(ob_get_clean(), true);
+$auto = $sync['auto_add'] ?? [];
+
+echo '[' . date('Y-m-d H:i:s') . "] bringAddDepleted: added={$added} updated={$updated} skipped={$skipped}\n";
+echo '[' . date('Y-m-d H:i:s') . '] bringSync auto_add: ' . json_encode($auto, JSON_UNESCAPED_UNICODE) . "\n";
@@ -0,0 +1,79 @@
+#!/usr/bin/env php
+<?php
+/** Delete all comments on open feature/enhancement backlog issues (English-only tracker policy). */
+declare(strict_types=1);
+
+define('CRON_MODE', true);
+require_once __DIR__ . '/../api/bootstrap.php';
+require_once __DIR__ . '/../api/lib/github.php';
+require_once __DIR__ . '/../api/lib/constants.php';
+
+$token = _ghToken();
+if ($token === '') {
+    fwrite(STDERR, "ERROR: GH_ISSUE_TOKEN not configured\n");
+    exit(1);
+}
+
+function ghRequest(string $token, string $method, string $url, ?array $body = null): array {
+    $ch = curl_init($url);
+    $headers = [
+        'Authorization: token ' . $token,
+        'Accept: application/vnd.github+json',
+        'X-GitHub-Api-Version: 2022-11-28',
+        'User-Agent: EverShelf-Triage/1.0',
+    ];
+    curl_setopt_array($ch, [
+        CURLOPT_RETURNTRANSFER => true,
+        CURLOPT_HTTPHEADER     => $headers,
+        CURLOPT_TIMEOUT        => 30,
+    ]);
+    if ($method === 'DELETE') {
+        curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE');
+    } elseif ($method === 'GET') {
+        // default
+    }
+    if ($body !== null) {
+        $headers[] = 'Content-Type: application/json';
+        curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+        curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($body));
+    }
+    $raw  = curl_exec($ch);
+    $code = (int)curl_getinfo($ch, CURLINFO_HTTP_CODE);
+    curl_close($ch);
+    return ['code' => $code, 'body' => $raw];
+}
+
+$issues = [122, 121, 120, 119, 118, 117, 116, 115, 114, 106, 105, 104, 103, 102, 101, 97, 93, 81, 80, 79, 69, 67, 65];
+$deleted = 0;
+
+foreach ($issues as $num) {
+    $page = 1;
+    while (true) {
+        $url = 'https://api.github.com/repos/' . GH_REPO . "/issues/$num/comments?per_page=100&page=$page";
+        $r = ghRequest($token, 'GET', $url);
+        if ($r['code'] !== 200) {
+            fwrite(STDERR, "#$num list comments HTTP {$r['code']}\n");
+            break;
+        }
+        $comments = json_decode($r['body'], true);
+        if (!is_array($comments) || empty($comments)) {
+            break;
+        }
+        foreach ($comments as $c) {
+            $id = (int)($c['id'] ?? 0);
+            if ($id <= 0) continue;
+            $dr = ghRequest($token, 'DELETE', 'https://api.github.com/repos/' . GH_REPO . "/issues/comments/$id");
+            if ($dr['code'] === 204) {
+                $deleted++;
+                echo "deleted comment $id on #$num\n";
+            } else {
+                fwrite(STDERR, "FAIL delete comment $id on #$num HTTP {$dr['code']}\n");
+            }
+            usleep(200000);
+        }
+        if (count($comments) < 100) break;
+        $page++;
+    }
+}
+
+echo "Done. Deleted $deleted comments.\n";
@@ -0,0 +1,26 @@
+#!/bin/bash
+# Download @xenova/transformers runtime + all-MiniLM-L6-v2 for offline category classification.
+set -euo pipefail
+
+ROOT="$(cd "$(dirname "$0")/.." && pwd)"
+VENDOR="$ROOT/assets/vendor/transformers"
+MODEL="$VENDOR/Xenova/all-MiniLM-L6-v2"
+ONNX="$MODEL/onnx"
+BASE="https://huggingface.co/Xenova/all-MiniLM-L6-v2/resolve/main"
+
+mkdir -p "$ONNX"
+
+echo "→ transformers.min.js"
+curl -fsSL "https://cdn.jsdelivr.net/npm/@xenova/transformers@2.17.2/dist/transformers.min.js" \
+  -o "$VENDOR/transformers.min.js"
+
+for f in config.json tokenizer.json tokenizer_config.json; do
+  echo "→ $f"
+  curl -fsSL "$BASE/$f" -o "$MODEL/$f"
+done
+
+echo "→ onnx/model_quantized.onnx (~22 MB)"
+curl -fsSL "$BASE/onnx/model_quantized.onnx" -o "$ONNX/model_quantized.onnx"
+
+chown -R www-data:www-data "$VENDOR" 2>/dev/null || true
+echo "Done. Model installed under assets/vendor/transformers/"
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Full Bring! sync: recompute smart shopping, migrate names, dedupe generics,
+ * fix specs, remove obsolete items, add missing critical/high.
+ *
+ * Usage: php scripts/sync-shopping-bring.php
+ */
+
+if (PHP_SAPI !== 'cli') {
+    http_response_code(403);
+    exit('Forbidden');
+}
+
+define('CRON_MODE', true);
+require_once __DIR__ . '/../api/bootstrap.php';
+require_once __DIR__ . '/../api/index.php';
+
+$db = getDB();
+
+echo '[' . date('Y-m-d H:i:s') . "] Starting full Bring! sync…\n";
+
+ob_start();
+bringSyncFull($db, true);
+$json = ob_get_clean();
+$result = json_decode($json, true);
+
+if (!$result || empty($result['success'])) {
+    echo '[' . date('Y-m-d H:i:s') . '] ERROR: ' . ($result['error'] ?? $json) . "\n";
+    exit(1);
+}
+
+echo '[' . date('Y-m-d H:i:s') . '] Smart items: ' . ($result['smart_items'] ?? '?') . "\n";
+echo '[' . date('Y-m-d H:i:s') . '] Migrate: ' . json_encode($result['migrate'] ?? [], JSON_UNESCAPED_UNICODE) . "\n";
+echo '[' . date('Y-m-d H:i:s') . '] Dedupe: ' . json_encode($result['dedupe'] ?? [], JSON_UNESCAPED_UNICODE) . "\n";
+echo '[' . date('Y-m-d H:i:s') . '] Specs: ' . json_encode($result['specs'] ?? [], JSON_UNESCAPED_UNICODE) . "\n";
+echo '[' . date('Y-m-d H:i:s') . '] Cleanup: ' . json_encode($result['cleanup'] ?? [], JSON_UNESCAPED_UNICODE) . "\n";
+echo '[' . date('Y-m-d H:i:s') . '] Auto-add: ' . json_encode($result['auto_add'] ?? [], JSON_UNESCAPED_UNICODE) . "\n";
+if (!empty($result['dedupe_final'])) {
+    echo '[' . date('Y-m-d H:i:s') . '] Dedupe (final): ' . json_encode($result['dedupe_final'], JSON_UNESCAPED_UNICODE) . "\n";
+}
+if (!empty($result['cache_restored'])) {
+    echo '[' . date('Y-m-d H:i:s') . '] Cache restored: ' . $result['cache_restored'] . " items\n";
+}
+echo '[' . date('Y-m-d H:i:s') . "] Done.\n";
@@ -0,0 +1,98 @@
+#!/usr/bin/env php
+<?php
+/**
+ * Triage resolved auto-report bugs only (English comments).
+ * Feature/enhancement backlog issues are never bulk-closed here.
+ * Usage: php scripts/triage-open-issues.php [--dry-run]
+ */
+declare(strict_types=1);
+
+define('CRON_MODE', true);
+require_once __DIR__ . '/../api/bootstrap.php';
+require_once __DIR__ . '/../api/lib/github.php';
+require_once __DIR__ . '/../api/lib/constants.php';
+
+$dryRun = in_array('--dry-run', $argv ?? [], true);
+$repo   = GH_REPO;
+$token  = _ghToken();
+
+if ($token === '') {
+    fwrite(STDERR, "ERROR: GH_ISSUE_TOKEN not configured\n");
+    exit(1);
+}
+
+function ghApi(string $token, string $method, string $url, array $payload = []): array {
+    $ch = curl_init($url);
+    $headers = [
+        'Authorization: token ' . $token,
+        'Accept: application/vnd.github+json',
+        'X-GitHub-Api-Version: 2022-11-28',
+        'User-Agent: EverShelf-Triage/1.0',
+        'Content-Type: application/json',
+    ];
+    curl_setopt_array($ch, [
+        CURLOPT_RETURNTRANSFER => true,
+        CURLOPT_HTTPHEADER     => $headers,
+        CURLOPT_TIMEOUT        => 20,
+    ]);
+    if ($method === 'PATCH') {
+        curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PATCH');
+        curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($payload));
+    } elseif ($method === 'POST') {
+        curl_setopt($ch, CURLOPT_POST, true);
+        curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($payload));
+    }
+    $raw  = curl_exec($ch);
+    $code = (int)curl_getinfo($ch, CURLINFO_HTTP_CODE);
+    curl_close($ch);
+    return ['http_code' => $code, 'body' => json_decode($raw ?: '{}', true) ?: []];
+}
+
+function commentIssue(string $token, string $repo, int $num, string $body, bool $dryRun): bool {
+    if ($dryRun) {
+        echo "[dry-run] comment #$num\n";
+        return true;
+    }
+    $r = ghApi($token, 'POST', "https://api.github.com/repos/$repo/issues/$num/comments", ['body' => $body]);
+    if ($r['http_code'] >= 200 && $r['http_code'] < 300) {
+        echo "OK comment #$num\n";
+        return true;
+    }
+    fwrite(STDERR, "FAIL comment #$num HTTP {$r['http_code']}: " . json_encode($r['body']) . "\n");
+    return false;
+}
+
+function closeIssue(string $token, string $repo, int $num, bool $dryRun): bool {
+    if ($dryRun) {
+        echo "[dry-run] close #$num\n";
+        return true;
+    }
+    $r = ghApi($token, 'PATCH', "https://api.github.com/repos/$repo/issues/$num", ['state' => 'closed']);
+    if ($r['http_code'] >= 200 && $r['http_code'] < 300) {
+        echo "OK close #$num\n";
+        return true;
+    }
+    fwrite(STDERR, "FAIL close #$num HTTP {$r['http_code']}: " . json_encode($r['body']) . "\n");
+    return false;
+}
+
+$bugs = [
+    198 => 'Fixed in develop: `PRAGMA busy_timeout` raised to 10s and `dbWithRetry()` on `updateInventory` retries SQLITE_BUSY when cron and PWA write in parallel.',
+    199 => 'Duplicate of #198 — same event (`inventory_update` → database locked). Fix: retry + longer busy_timeout.',
+    196 => 'Fixed in v1.7.38+: `saveProduct` handles duplicate barcodes (merge or 409 JSON) instead of HTTP 500.',
+    197 => 'PWA side-effect of PHP crash #196 — fixed with duplicate barcode handling in `saveProduct`.',
+    195 => 'Fixed: `EverLog::request()` always receives strings — `(string)($_SERVER[\'REQUEST_METHOD\'] ?? \'GET\')`.',
+    193 => 'Same root cause as #195 (TypeError when method was null from CLI).',
+    194 => 'Fixed: `_applySpesaScanUI` referenced `currentPage` → corrected to `_currentPageId`.',
+    192 => 'Fixed: TDZ on `enriched` in `renderShoppingItems`.',
+    191 => 'Fixed: TDZ on `setProgress` / `barEl` in `_runStartupCheck`.',
+    134 => 'Auto-report for non-writable Docker volume. Mitigations: `_ensureDataDir()`, `_ensureDbWritable()`, Dockerfile chown.',
+    184 => 'Related to #134: SQLite readonly when `data/` is not writable.',
+];
+
+foreach ($bugs as $num => $msg) {
+    commentIssue($token, $repo, $num, $msg . "\n\n_Closed after triage — fix shipped in develop._", $dryRun);
+    closeIssue($token, $repo, $num, $dryRun);
+}
+
+echo "Done.\n";
@@ -427,6 +427,11 @@
    "regen_save_new": "💾 Save to archive & generate a new one",
    "close_btn": "✅ Close",
    "ingredients_title": "🧾 Ingredients",
+    "shopping_suggestions_intro": "For an alternative version you'd need (not in pantry — optional):",
+    "shopping_suggestions_add": "Add to shopping list",
+    "shopping_suggestions_added": "Added to shopping list",
+    "unit_for_input": "Unit of measure",
+    "enter_in": "Enter value in",
    "tools_title": "Equipment needed",
    "steps_title": "👨‍🍳 Steps",
    "no_steps": "No steps available",
@@ -427,6 +427,12 @@
    "regen_save_new": "💾 Salva nell'archivio e genera una nuova",
    "close_btn": "✅ Chiudi",
    "ingredients_title": "🧾 Ingredienti",
+    "shopping_suggestions_intro": "Per una variante servirebbe (non in dispensa — opzionale):",
+    "shopping_suggestions_add": "Aggiungi alla lista spesa",
+    "shopping_suggestions_added": "Aggiunto alla lista spesa",
+    "frozen_badge": "surgelato — dal freezer",
+    "unit_for_input": "Unità di misura",
+    "enter_in": "Inserimento in",
    "tools_title": "Strumenti necessari",
    "steps_title": "👨‍🍳 Procedimento",
    "no_steps": "Nessun procedimento disponibile",
Author	SHA1	Message	Date
dadaloop82	eb19265586	Kiosk: auto-discover on setup, LAN OTA, English-only GitHub triage. Auto-run LAN discovery on server step; serve kiosk updates from releases/ via kiosk_update API; check LAN before GitHub for OTA in-place upgrades. Docker CI retries hub timeouts. Remove non-English feature issue comments; triage script English-only. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-06-11 05:46:12 +00:00
dadaloop82	8a69e6d941	Fix kiosk LAN discovery and improve OTA update detection. Discovery no longer aborts after 3s idle, probes priority hosts (.128, gateway) first, accepts ping API and normalizes HTTPS URLs. OTA compares versionCode from release notes; bump kiosk to 1.7.18. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-06-11 05:40:41 +00:00
dadaloop82	c5b0dbcf42	Fix inflated shopping price estimates and restore feature issues workflow. Price each list line as one retail purchase instead of 14-day restock qty; convert €/kg AI prices to estimated piece weight; cap smart-shopping suggested conf/pz counts. Stop triage script from bulk-closing feature backlog. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-06-11 05:34:56 +00:00
dadaloop82	338bd7ff66	Fix Kotlin string escaping in SetupActivity finishSetup JSON. Correct broken replace() literals that prevented compileDebugKotlin from building. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-06-08 15:01:43 +00:00
dadaloop82	c7532f90cd	Fix kiosk locale strings for Android resource compiler. Escape apostrophes and normalize multiline strings in de/es/fr/it so assembleDebug no longer fails with invalid unicode escape sequences. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-06-08 14:54:20 +00:00
dadaloop82	5831e3bcea	Release v1.7.41: fix Traefik startup and clean JSON API responses. PHP 8.2 deprecations no longer corrupt health_check JSON; .htaccess respects X-Forwarded-Proto behind reverse proxies. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-06-08 12:32:10 +00:00
dadaloop82	ec1aae2a25	docs: note ops scripts in CHANGELOG 1.7.40 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-06-08 06:04:09 +00:00
dadaloop82	4f9f44e230	Add ops scripts and offline transformers bootstrap. Maintenance CLI for finished-product/shopping audit, Bring sync, and install-transformers-model.sh to fetch the Xenova classifier (model gitignored). Co-authored-by: Cursor <cursoragent@cursor.com>	2026-06-08 06:03:24 +00:00
dadaloop82	9be8fb5cf3	Release v1.7.40: recipe fixes, DB lock retry, and Docker Traefik support. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-06-08 06:00:54 +00:00