Grotti 3.0.0: Aufträge, Wartung, SSE, Ausschuss-Dialog, UI-Umbau.

Migrationen 003–009, Kundaufträge mit Lieferschein, Abräumen mit Urteil,
ntfy/Backup/Zeitfenster, Live-Stream und Mobile-Mehr-Menü.

.gitignore

@@ -2,6 +2,10 @@
 config.json
 data/
 
+# Slice-/Watch-Ordner: nur der Platzhalter im Git, Inhalt lokal
+slice/*
+!slice/.gitkeep
+
 .venv/
 __pycache__/
 *.pyc

CHANGELOG.md

@@ -4,6 +4,107 @@ Alle Änderungen an Grotti. Format nach [Keep a Changelog](https://keepachangelo
 
 ## [Unreleased]
 
+## [3.0.0] – 2026-10-18
+
+Major: neue Tabellen (Aufträge, Wartung), Projekte/Ideen → Aufträge, Navigation umgebaut, Dev-Server → waitress, Schema über Migrationen.
+
+**Vor dem Update:** `pg_dump` der Datenbank. Danach Grotti starten (Migrationen 003–009 laufen automatisch).
+
+### Neu
+
+- **Aufträge:** Kunden, Positionen (Datei × Menge), Fortschritt, Einreihen, Lieferschein; Migration aus Projekten/Ideen; API `/api/v1/kunden`, `/api/v1/auftraege`; MCP-Lesetools.
+- **Ausschuss-Pflicht:** Dialog beim „Platte geräumt“ (Urteil, Grund, Stückzahlen).
+- **Wartung:** Laufzähler und Verschleißteile, Seite `/wartung`.
+- **Bedarf:** Queue vs. Spulenrest (`GET /api/v1/bedarf`).
+- **ntfy** neben Telegram; **Backup**-ZIP (pg_dump + data/); **Zeitfenster** je Drucker; optional HT/NT-Tarif.
+- **SSE** Live-Stream `/api/v1/stream`, Verbindungsbanner, PWA-Manifest/Service-Worker.
+- Migrationen unter `grotti/migrations/`, Connection-Pool, Indizes, Sample-Retention.
+- Mobile-Nav mit „Mehr“-Sheet; Anleitungen Aufträge und Wartung.
+
+### Geändert
+
+- Server: waitress; Threads starten in `server.main()`.
+- Navigation: Aufträge statt Projekte/Ideen; Wartung; Dateien-/Statistik-Icons.
+- Kontrast `--faint`, `prefers-reduced-motion`, Touch-Ziele, Print-CSS.
+- Upload-Whitelist, Host-Validierung, ProxyFix, Settings-Lock, `?token=` nur Bilder.
+- Spulenabzug History ohne blinde Rate; Chargen-Locks; MCP `temp`/`percent`.
+
+### Behoben
+
+- Hängende Queue-Starts nach Neustart; Worker-Rollback; `snapshot()`-Exceptions.
+- Toast-Dedupe; ACE-Map bei Send-Vorbereitung; Spulenwarnung mit ACE.
+
+## [2.10.0] – 2026-10-18
+
+### Neu
+
+- Einstellungen: Slice-Ordner (`watch_dir`) setzen; Repo-Ordner `slice/` als Standard (Inhalt gitignored).
+- Orca-Nachbearbeitung: `scripts/orca_senden.py` lädt den Export nach Grotti und öffnet `/dateien?file=…` (Drucker, ACE, Einreihen in der UI); Anleitung unter Doku.
+- Bibliothek: Ordner unter dem Slice-Pfad anlegen und Watch-Dateien verschieben (ID/Projekt bleiben); API `…/dateien/ordner`, `…/verschieben`.
+- Bibliothek: Filter Material und Ordner, Sortierung (Neueste / Name / Material / Ordner / Druckzeit / Gewicht), Suche auch in Material und Projekt; Filter bleiben im Browser; Gruppenköpfe bei Sort Material/Ordner.
+- Cockpit: Verlauf (Temp/ED) des aktuellen oder letzten Drucks, Link zum Bericht; gemeinsame Chart-Hilfe in `api.js`.
+- Druckbericht-Verlauf: Zeitachse (links °C, rechts ED %), gestrichelte Soll-Linien, Einschaltdauer Düse/Bett; Aufheizen wird dichter erfasst.
+- Stromschätzung aus ED: Einstellungen → Düse-/Bett-Watt; Bericht zeigt kWh (ED oder pauschal).
+- Einstellungen → Dieser Browser: Zeitzone für Anzeigezeiten (Browser automatisch oder z. B. Europe/Berlin).
+
+### Geändert
+
+- Energie-Defaults: Grundlast 40 W (Elektronik), Düse 60 W, Bett 220 W; Hinweis in den Einstellungen, wenn Düse/Bett 0 (nur pauschal).
+- Druckbericht: Start/Ende als lesbare Ortszeit (`17.10.2026, 15:09 – 15:46`) statt ISO.
+- Sidebar **Läuft jetzt**: eine Zeile pro Drucker (Name · % · Fertig-Uhr), Fortschritt in der Zeile; Klick öffnet die Warteschlange, × bricht ab.
+- Spulenakte: KPI-Kacheln statt Fließtext; Druckzeilen mit Datum, Charge `D-…`, Kurzname, Gramm und Status.
+- Material-Spulenformular: Marke, Chargen und Technik unter „Weitere Angaben“ eingeklappt.
+- Druck-Etikett: „Soll … g“ statt „Ziel“ (Slicer-Filamentmenge, wie im Bericht).
+- Tasten-Grenze im Ablauf: dokumentierter Default 3 mm (kalt an der Düse sonst Fehlalarm); Anleitung und Technik-Notiz angepasst.
+- `requirements.txt` mit festen Versionen; `requirements-dev.txt` mit pytest.
+- Unbenutzte Helfer entfernt (`printers.load_printers`, Mesh-Vergleich 3×3, `fetch_bed_mesh`, `last_sample_at`, …).
+
+### Behoben
+
+- Druckbericht: Objekt-Etiketten kollidieren nicht mehr, wenn dieselbe Chargennummer schon an einem anderen Lauf hängt (Seite `/protokoll/<id>` lieferte 500).
+- Orca-Nachbearbeitung: Export unter dem Slice-Ordner (inkl. Unterordner) wird als Watch-Datei übernommen statt flachem Upload; Temp-Dateien `.gcode.pp` erkannt.
+- Material: Rest-Gramm im Spulenformular akzeptiert Dezimalwerte (Abzug lieferte z. B. 501,34 g — Browser blockierte bei `step=1`).
+
+
+## [2.5.1] – 2026-10-17
+
+### Neu
+
+- Cockpit-Steuerung: ACE-Trockner starten/stoppen (Temp, Dauer), nur wenn ein ACE hängt.
+- Cockpit-Steuerung: bestückte ACE-Plätze mit Sorte und Farbe aus Grotti an den Drucker schreiben.
+- Wand-Kacheln zeigen das Druck-Vorschaubild (Moonraker-Thumbnail) in der Job-Zeile.
+- **Druckbericht** `/protokoll/<id>`: Soll/Ist-Gramm, Spulenanteile, Temperaturverlauf, Ereignisse, Charge.
+- **Statistik** `/statistik`: Auslastung, Erfolg, Verbrauch, Ausschuss, Schätztreue; CSV-Export.
+- Spulenakte unter Material: verdruckte Gramm, Ausschuss, Leer-in aus dem Wochenverbrauch.
+- Etiketten pro Druck oder Objekt (`D-YYYYMMDD-nnnn`), QR auf den Bericht; Scan von `D-…` öffnet den Bericht.
+- Spulenabzug nach Ist (`filament_used`); Abbruch nur anteilig; Mehrfarb-Anteile als Schätzwert; Rest darf ins Minus.
+- Rollenwechsel während Druck/Pause (Einlegen) teilt den Verbrauch in Abschnitte.
+
+### Geändert
+
+- Statistik: Zeitraum per Knopf (Tag, Woche, Monat, Gestern, Letzte Woche, Letzter Monat, Alles); Bis-Datum zählt inklusiv; CSV übernimmt denselben Filter.
+- Druck-Charge `D-…` wieder während des Laufs (Protokoll, Wand-Etikett, Bericht); Adoption übernimmt die Nummer auf den History-Job. Ausschuss: gedruckte Bögen verwerfen, Charge bleibt.
+- Dateien → ACE-Zuordnung: Platz-Dropdown zeigt bei bekannter Spule Material, Farbe, Name und Restgramm.
+
+### Behoben
+
+- Spulenakte blieb leer: Abzug schrieb oft kein `run_spools` (hängende History-Läufe, Abzug vor Akte-Tabelle); Nachzug ohne erneuten Rest-Abzug, Abzug schreibt `run_spools` vor `deducted`.
+- Protokoll: keine Doppel-„druckt“-Zeilen mehr (Live + History); Watcher hängt am History-Job, sobald Moonraker ihn kennt; Liste blendet überzählige Live-Zeilen aus.
+- Platte geräumt: `needs_clear` nach Watcher-Ende und History-Sync (nur wenn kein Live-Druck); neuer Druckstart bricht alte Live-Läufe ab.
+- Druck-Etikett: Material schon während des Laufs (Send/ACE/Spule); QR bleibt im 70‑mm-Bogen.
+- Druckstart: Dateien mit altem `stored_path` (z. B. nach Umzug von `3DP/…/Uebersicht` nach Grotti) werden unter `data/eingang/<name>` wiedergefunden statt „liegt nicht mehr auf der Platte“.
+- Wand/Sidebar: Dateiname springt nicht mehr alle paar Sekunden, wenn Moonraker kurz keinen Namen liefert; 3D-Pfad-Caption flackert nicht mehr mit „wird gelesen …“.
+- Dateien: Hinweis zu fehlendem ACE-Trailer nur noch bei Mehrfarb (nicht als Warnung bei Monoteilen).
+- 3D-Pfad wirkte gesprenkelt: Ausdünnen behält ganze Schichten dicht (statt Stichproben entlang der Bahn); keine Parallel-Offsets.
+- Toolpath-API mit `Cache-Control: no-store`, damit der Browser keinen alten Pfad behält.
+- Senden: Dateinamen mit Nicht-ASCII (z. B. CJK) werden für Moonraker/Rinkhals auf ASCII normalisiert — sonst Fehler 10115 „gcode … not found“.
+
+## [2.2.2] – 2026-10-15
+
+### Behoben
+
+- 3D-Pfad: bei großen G-codes zerbrach das Ausdünnen die Segment-Paare — Viewer zeigte nur Objekt-Umrisse, keinen Druckfortschritt (grün/grau).
+
 ## [2.2.1] – 2026-10-15
 
 ### Geändert

README.md

@@ -30,7 +30,7 @@ copy config.example.json config.json
 | `host`, `port` | Wo die Oberfläche lauscht. Standard `127.0.0.1:8770`. |
 | `database_url` | PostgreSQL-Verbindung. |
 | `data_dir` | Uploads, Vorschaubilder, Cache. Standard `data`. |
-| `watch_dir` | Slice-Ordner, der beobachtet wird. Leer = nur Upload. |
+| `watch_dir` | Slice-Ordner (unter Einstellungen setzen). Leer = nur Upload. |
 | `token` | Wenn gesetzt, braucht die API `Authorization: Bearer <token>`. |
 | `fqdn` | Öffentliche Basis-URL für Spulen-Etiketten-QR. Leer = Request-Host. |
 | `energy` | Watt und Strompreis für die Kosten im Protokoll. |
@@ -39,6 +39,8 @@ copy config.example.json config.json
 
 Die Drucker stehen beim ersten Start in `drucker.json` und landen dann in der Datenbank. Danach werden sie unter Einstellungen gepflegt.
 
+Schema-Änderungen laufen beim Start über `grotti/migrations/` (Tabelle `schema_version`). Vor Major-Updates die Datenbank sichern (`pg_dump`).
+
 ```json
 [{ "name": "Kobra 3 da26", "host": "10.10.1.60" }]
 ```
@@ -75,17 +77,27 @@ Alles unter `/api/v1`, JSON. Auth: Session-Cookie (UI) oder `Authorization: Bear
 | `POST /auth/setup`, `/auth/login`, `/auth/logout` | Ersten Admin, Login, Logout |
 | `GET /me`, `/users`, `/tokens` | Konto, Benutzer (Admin), API-Tokens |
 | `GET /version` | Version |
+| `GET`/`PATCH /einstellungen`, `POST /telegram/test` | Config und Telegram-Probe |
 | `GET /drucker?live=1` | Drucker mit Live-Zustand, laufendem und wartendem Auftrag |
+| `POST /drucker` · `PATCH`/`DELETE /drucker/<id>` | Drucker anlegen/ändern (Admin) |
 | `POST /drucker/<host>/<aktion>` | Pause, Fortsetzen, Abbrechen, Fehler löschen |
-| `POST /drucker/<host>/steuern` | Temperatur, Speed, Flow, Lüfter |
+| `POST /drucker/<host>/steuern` | Temperatur, Speed, Flow, Lüfter, ACE |
-| `GET /dateien`, `POST /dateien` | Bibliothek, Upload |
+| `POST /drucker/<host>/abraeumen` | Platte geräumt (`confirm`) |
-| `POST /senden` | Datei an Drucker. `confirm: true` ist Pflicht. `when_free: true` reiht ein. |
+| `GET /kamera/<host>`, `/vorschau/<host>` | Snapshot / Job-Thumbnail |
-| `GET /druck-queue`, `POST /druck-queue`, `PATCH /druck-queue/<id>` | Warteschlange (`confirm` beim Einreihen) |
+| `GET`/`POST /dateien`, `PATCH`/`DELETE /dateien/<id>` | Bibliothek, Upload, Metadaten |
-| `POST /spulen/<id>/einlegen` | Spule an Drucker/Platz; alte Rolle dort ins Regal |
+| `POST /dateien/neu-lesen`, `/dateien/ordner`, `/dateien/<id>/verschieben` | Watch-Sync, Ordner, Verschieben |
-| `POST /ablauf` | Ablauf für Kobra 3 einreihen |
+| `POST /senden`, `GET /sende-auftraege` | Sofort senden (`confirm`), Fortschritt |
-| `GET /ereignisse?host=&kind=&since=&limit=` | Aktivität |
+| `GET`/`POST /druck-queue`, `PATCH /druck-queue/<id>` | Warteschlange (`confirm` beim Einreihen) |
-| `POST /ereignisse/gelesen` | Alerts als gelesen |
+| `GET /laeuft`, `/aufgaben` | Direktstarts und Platte-belegt |
-| `GET /spulen`, `GET /laeufe`, `GET /projekte` | Material, Protokoll, Projekte |
+| `POST /ablauf`, `/schieben-testen` | Ablauf Kobra 3 / Schieben-Test |
+| `GET /spulen`, `POST /spulen`, `POST /spulen/<id>/einlegen` | Spulen und Einlegen |
+| `GET /spulen/<id>/akte`, `/spulen/by-code` | Spulenakte, Scan `S-…` |
+| `GET`/`POST /materialien`, `/farben` | Sorten und Farbpalette |
+| `GET /laeufe`, `/laeufe/aktuell`, `/laeufe/<id>` | Protokoll und Druckbericht |
+| `GET /statistik`, `/statistik.csv` | Auslastung und CSV |
+| `GET`/`POST /projekte`, `/ideen` | Projekte und Ideen-Backlog |
+| `GET /ereignisse`, `POST /ereignisse/gelesen` | Aktivität und Alerts |
+| `POST /kalkulation` | Vorkalkulation Material+Strom |
 
 MCP: `python -m grotti.mcp_server` mit `GROTTI_URL` und `GROTTI_TOKEN` (siehe `docs/internal/MCP.md`).
 

config.example.json

@@ -2,7 +2,7 @@
   "host": "127.0.0.1",
   "port": 8770,
   "data_dir": "data",
-  "watch_dir": "",
+  "watch_dir": "slice",
   "database_url": "postgresql://[email protected]:5432/grotti",
   "token": "",
   "secret_key": "",
@@ -16,7 +16,9 @@
     "redirect_uri": ""
   },
   "energy": {
-    "watts": 120,
+    "watts": 40,
+    "nozzle_watts": 60,
+    "bed_watts": 220,
     "euro_per_kwh": 0.35,
     "dryer_watts": 0,
     "dry_hours": 0,
@@ -28,11 +30,18 @@
     "bot_token": "",
     "chat_id": ""
   },
+  "ntfy": {
+    "enabled": false,
+    "server": "https://ntfy.sh",
+    "topic": "",
+    "token": ""
+  },
   "alerts": {
     "fertig": true,
     "fehler": true,
     "offline": true,
     "queue": true,
+    "spule": true,
     "ablauf": false,
     "start": false
   }

docs/Anleitung-ACE.md

@@ -1,6 +1,6 @@
 # ACE und Spulen
 
-Stand **15.10.2026**. Mehrfarb-Drucke brauchen vor dem Start eine Zuordnung Datei-Farbe → ACE-Platz und eine passende Spule am Drucker.
+Stand **17.10.2026**. Mehrfarb-Drucke brauchen vor dem Start eine Zuordnung Datei-Farbe → ACE-Platz und eine passende Spule am Drucker.
 
 ![ACE-Zuordnung beim Senden](../web/static/doku/ace-zuordnung.png)
 
@@ -19,6 +19,7 @@ Etiketten mit QR: [Material und mehr](Anleitung-Material.md).
 Unter **Dateien → Optionen → ACE-Zuordnung**:
 
 - Jede Farbe aus der Datei (`paint_index`) einem **ACE-Platz** zuordnen
+- Liegt unter Material eine Spule auf dem Platz, zeigt die Liste Name, Farbe und Restgramm mit
 - Ohne passende Map schreibt der Drucker oft **„cannot parse the file“** und startet nicht
 - Grotti legt die Sidecar `*.gcode.acm` an und schickt sie mit
 

docs/Anleitung-Auftraege.md

@@ -0,0 +1,19 @@
+# Aufträge
+
+Stand **18.10.2026**. Kundenaufträge mit Positionen (Datei × Menge), Fortschritt und Lieferschein.
+
+## Seite Aufträge
+
+Unter **Aufträge** legst du Kunden und Aufträge an. Status: Idee → Angebot → Bestätigt → Druckt → Fertig → Geliefert → Bezahlt.
+
+Pro Position: Datei, Stückzahl, optional Preis und Material. **Einreihen** schickt die Position in die Warteschlange (`confirm`). Fertige gute Stücke aus dem Abräumen-Dialog zählen auf den Fortschritt „n von m“.
+
+## Lieferschein
+
+Im Auftrag **Lieferschein** öffnen: Positionen, Chargen `D-…`, druckbar. Danach Status auf **Geliefert** setzen.
+
+## Weiter
+
+- [Warteschlange](Anleitung-Warteschlange.md)
+- [Material](Anleitung-Material.md)
+- [Protokoll / Bericht](Anleitung-Oberflaeche.md)

docs/Anleitung-Dateien.md

@@ -1,18 +1,22 @@
 # Dateien senden
 
-Stand **15.10.2026**. Seite `/dateien` — Bibliothek links, Senden rechts.
+Stand **17.10.2026**. Seite `/dateien` — Bibliothek links, Senden rechts.
 
 ![Dateien: Bibliothek und Senden](../web/static/doku/dateien-flow.png)
 
 ## Bibliothek
 
-- Suche, Filter nach Maschine und Projekt
+- Suche nach Name, Material und Projekt
+- Filter: Maschine, Projekt, Material, Ordner (Unterordner unter dem Slice-Ordner; Uploads als „Upload“)
+- Sortierung: Neueste, Name, Material, Ordner, Druckzeit, Gewicht — bei Material/Ordner mit Gruppenköpfen
+- Auswahl der Filter bleibt im Browser merken
 - Vorschaubild, Material, Zeit, Gewicht, Schichthöhe
 - Info-Popup mit Slice-Metadaten (Kopf und Footer)
 - **Hochladen** per Knopf oder Drag & Drop
-- **Ordner neu lesen**, wenn `watch_dir` in der Config auf den Slice-Ordner zeigt
+- Mit gesetztem Slice-Ordner ([Einstellungen](Anleitung-Einstellungen.md)): **Ordner anlegen**, Watch-Dateien per Auswahl **verschieben** (Datei bleibt in der Bibliothek dieselbe, inkl. Projekt)
+- **Ordner neu lesen**, wenn unter Einstellungen ein Slice-Ordner gesetzt ist
 
-Ohne `watch_dir` geht nur manueller Upload — das reicht für den Alltag.
+Ohne Slice-Ordner geht nur manueller Upload — das reicht für den Alltag. Uploads liegen flach unter „Upload“ und lassen sich in der Bibliothek nicht in Slice-Ordner schieben.
 
 ## Senden: drei Schritte
 
@@ -43,7 +47,12 @@ Große Dateien brauchen oft **eine Minute**. In der Sidebar unter **Senden** sie
 - Bei „Wenn frei“: Eintrag unter [Warteschlange](Anleitung-Warteschlange.md)
 - Später unter **Protokoll** mit **Nochmal** (inkl. gespeicherter ACE-Map)
 
+## Aus Orca
+
+Nach dem G-code-Export kann Orca die Datei direkt nach Grotti laden und diese Seite mit der Datei öffnen — siehe [Orca an Grotti](Anleitung-Orca.md).
+
 ## Weiter
 
+- [Orca an Grotti](Anleitung-Orca.md)
 - [ACE und Spulen](Anleitung-ACE.md)
 - [Warteschlange](Anleitung-Warteschlange.md)

docs/Anleitung-Einrichtung.md

@@ -27,7 +27,7 @@ copy config.example.json config.json
 | `host`, `port` | Wo die Oberfläche lauscht. Standard `127.0.0.1:8770`. |
 | `database_url` | PostgreSQL-Verbindung. |
 | `data_dir` | Uploads, Vorschaubilder, Cache. Standard `data`. |
-| `watch_dir` | Slice-Ordner, den Grotti beobachtet. Leer = nur manueller Upload. |
+| `watch_dir` | Slice-Ordner (meist unter **Einstellungen** setzen). Leer = nur manueller Upload. Standard-Vorschlag: Ordner `slice` im Repo. |
 | `token` | Optionaler Shared-API-Token (Übergang). Mit Benutzerverwaltung nutzt du API-Tokens unter Einstellungen. |
 | `fqdn` | Öffentliche Basis-URL für QR auf Spulen-Etiketten. Leer = Request-Host. |
 | `auto_queue` | `false` stoppt neue „wenn frei“-Starts. |

docs/Anleitung-Einstellungen.md

@@ -1,17 +1,22 @@
 # Einstellungen
 
-Stand **15.10.2026**. Seite `/einstellungen` — Drucker, Automatik, Anzeige, Telegram, Energie.
+Stand **17.10.2026**. Seite `/einstellungen` — Drucker, Automatik, Anzeige, Telegram, Energie.
 
 ![Einstellungen: Drucker](../web/static/doku/einstellungen-drucker.png)
 
 ## Dieser Browser
 
 - **Desktop** oder **Regal (Touch)** — nur lokal im Browser, siehe [Oberfläche](Anleitung-Oberflaeche.md).
+- **Zeitzone** — Browser automatisch oder fest (z. B. Europe/Berlin) für Protokoll, Bericht und Aktivität.
 
 ## Automatik
 
 Checkbox **Automatik-Warteschlange** (`auto_queue`). Aus = keine neuen „wenn frei“-Starts. Laufende Abläufe und manuelle „Jetzt“-Starts bleiben möglich.
 
+## Slice-Ordner
+
+Pfad zum Ordner, den die Bibliothek beobachtet (Export aus Orca/Anycubic, **Ordner neu lesen**, Unterordner). **Standardordner** setzt `slice` im Grotti-Repo. Leer = nur Hochladen. Nur Admin; der Ordner wird beim Speichern angelegt, falls er fehlt.
+
 ## Drucker
 
 Tabelle: Name, Host, Familie, **gesperrt**.
@@ -36,7 +41,7 @@ MCP (optional): Token erzeugen, dann `python -m grotti.mcp_server` mit `GROTTI_U
 
 ## Energie
 
-Watt und Strompreis für die Kosten im **Protokoll**. Optional Trockner/Ausschuss/Auslastung für die Kalkulation.
+**Grundlast W** (Elektronik/Motion, nicht die Heizer) und Strompreis für die Kosten im **Protokoll**. **Düse W** / **Bett W** zusammen mit ED-Proben im Verlauf → Schätzung „aus ED“; stehen sie auf 0, bleibt es bei Dauer × Grundlast („pauschal“). Typisch Kobra: Grundlast ~40 W, Düse ~60 W, Bett ~200–300 W. Beim Speichern warnt die Seite, wenn Düse oder Bett noch 0 sind. Optional Trockner/Ausschuss/Auslastung für die Kalkulation.
 
 ## Weiter
 

docs/Anleitung-Material.md

@@ -1,6 +1,6 @@
 # Material und mehr
 
-Stand **15.10.2026**. Spulen, Etiketten, Projekte, Protokoll, Kameras, Aktivität und Ideen.
+Stand **17.10.2026**. Spulen, Etiketten, Projekte, Protokoll, Statistik, Kameras, Aktivität und Ideen.
 
 ![Material: Spulen](../web/static/doku/material-spule.png)
 
@@ -8,21 +8,29 @@ Stand **15.10.2026**. Spulen, Etiketten, Projekte, Protokoll, Kameras, Aktivitä
 
 Zwei Reiter: **Spulen** und **Sorten**.
 
-**Spulen:** Filter Alle / Am Drucker / Regal / Wenig Rest. Formular bei Auswahl oder „Neue Spule“. Ort = Drucker · ACE/extern oder Regal. Scan-Feld im Seitenkopf (QR vom Etikett).
+**Spulen:** Filter Alle / Am Drucker / Regal / Wenig Rest. Formular bei Auswahl oder „Neue Spule“. Ort = Drucker · ACE/extern oder Regal. Scan-Feld im Seitenkopf (QR vom Etikett). Unter der ausgewählten Spule die **Akte**: verdruckte Gramm, Ausschuss, Leer-in.
 
 **Sorten:** Profile (Dichte, Preis, Maschinen). „Spule damit anlegen“ wechselt zum Spulen-Reiter.
 
 ### Etikett und QR
 
-Pro Spule ein Etikett mit Chargennummer und QR. Der Code öffnet Material mit der Spule vorausgewählt. Dafür in den Einstellungen ggf. **FQDN** setzen (öffentliche URL), sonst gilt der Host aus dem Request.
+Pro Spule ein Etikett mit Chargennummer `S-…` und QR. Der Code öffnet Material mit der Spule vorausgewählt. Dafür in den Einstellungen ggf. **FQDN** setzen (öffentliche URL), sonst gilt der Host aus dem Request.
+
+Druck-Etiketten (`D-…`) kommen vom Druckbericht: ein Etikett für den ganzen Lauf oder je Objekt. Scan von `D-…` öffnet den Bericht.
 
 ## Projekte
 
 Unter **Projekte** Aufträge mit Notiz und Kalkulation. Dateien lassen sich einem Projekt zuweisen (Bibliothek / Senden).
 
-## Protokoll
+## Protokoll und Statistik
 
-Abgeschlossene Läufe: Dauer, Gramm, Kosten, Urteil. **Nochmal** startet denselben Job inkl. gespeicherter ACE-Map und Bettnetz-Option.
+Abgeschlossene Läufe: Dauer, Ist-Gramm, Kosten, Urteil. Zeile öffnet den **Druckbericht** (Soll/Ist, Spulen, Temperaturverlauf, Charge). **Nochmal** startet denselben Job inkl. gespeicherter ACE-Map und Bettnetz-Option.
+
+Unter **Statistik** Auslastung, Erfolg, Verbrauch und CSV-Export. Zeitraum per Knopf (Tag, Woche, Monat, Gestern, Letzte Woche, Letzter Monat) oder eigene Von/Bis-Daten.
+
+Druck-Etiketten (`D-…`) schon während des Drucks: an der Wand **Etikett**, im Druckbericht **Etikett Druck** / **Etiketten Objekte**. Auf dem Bogen steht das Sollgewicht aus dem Slicer (geplante Filamentmenge). Bei Ausschuss die gedruckten Bögen wegwerfen; die Charge bleibt im Protokoll.
+
+Abzug nach dem Druck nimmt das Ist aus `filament_used` (Abbruch nur anteilig). Mehrfarb-Anteile sind als Schätzwert gekennzeichnet. Restgramm darf unter 0 gehen.
 
 ## Kameras
 

docs/Anleitung-Oberflaeche.md

@@ -4,7 +4,7 @@ Stand **15.10.2026**. Wie die App aufgebaut ist — Menü, Live-Leiste, Desktop
 
 ## Navigation
 
-Links (Desktop): **Drucker**, **Dateien**, **Kameras**, **Aktivität**, **Warteschlange**, **Protokoll**, **Material**, **Projekte**. Darunter **Einstellungen**, **Ideen**, **Doku**. Fuß: Version (öffnet die Doku).
+Links (Desktop): **Drucker**, **Dateien**, **Kameras**, **Aktivität**, **Warteschlange**, **Protokoll**, **Statistik**, **Material**, **Projekte**. Darunter **Einstellungen**, **Ideen**, **Doku**. Fuß: Version (öffnet die Doku).
 
 Unter ca. 760 px: untere Leiste mit den wichtigsten Seiten. Das Seitenmenü lässt sich zur Icon-Rail einklappen.
 
@@ -16,7 +16,7 @@ Unter dem Menü, eigene Scrollfläche. Boxen auf- und zuklappbar (Merker im Brow
 
 | Box | Inhalt |
 | --- | --- |
-| **Läuft jetzt** | Laufende Aufträge und Abläufe, Schrittleiste, Abbrechen. Auch Direktstarts ohne Queue-Zeile. |
+| **Läuft jetzt** | Eine Zeile pro Drucker (Name · % · Fertig-Uhr); Klick öffnet die Warteschlange, × bricht ab. Auch Direktstarts ohne Queue-Zeile. |
 | **Wartet** | Wartende Aufträge: Priorität, Abbrechen. Gestoppte Abläufe mit Fortsetzen. |
 | **Aufgaben** | Platte belegt ohne laufenden Ablauf — **geräumt** (Zwei-Klick). |
 | **Senden** | Uploads mit MB-Fortschritt. |
@@ -28,6 +28,7 @@ Unter **Einstellungen → Dieser Browser**:
 
 - **Desktop** — normale Dichte
 - **Regal (Touch)** — größere Bedienelemente, kompaktere Nav, Sidebar oft eingeklappt
+- **Zeitzone** — Browser oder fest (z. B. Europe/Berlin) für Uhrzeiten in Protokoll und Bericht
 
 Shortcut in der URL: `?shelf=1` bzw. `?shelf=0`. Nur dieser Browser (`localStorage`).
 

docs/Anleitung-Orca.md

@@ -0,0 +1,55 @@
+# Orca an Grotti
+
+Stand **17.10.2026**. Nach dem Export in OrcaSlicer landet der G-code in der Bibliothek und die Seite [Dateien senden](Anleitung-Dateien.md) öffnet sich mit der Datei schon gewählt. Drucker, ACE-Platz und Einreihen wählst du dort wie gewohnt.
+
+## Einmal einrichten
+
+1. Grotti starten und im Browser anmelden (die Session bleibt für die Senden-Seite).
+2. Unter **Einstellungen → API-Token** ein Token anlegen (Rolle Operator reicht). Den Wert `grt_…` nur einmal sichtbar.
+3. Datei `data/orca-senden.json` anlegen (gleicher Ordner wie `config.json`):
+
+```json
+{
+  "url": "http://127.0.0.1:8770",
+  "token": "grt_…"
+}
+```
+
+`url` ist die Adresse, unter der du Grotti im Browser öffnest.
+
+4. Im **Prozessprofil** (Druckqualität, z. B. „0.20mm Standard“): **Sonstiges → Nachbearbeitungsskripte**, eine Zeile:
+
+```text
+D:\Projekte\Grotti\.venv\Scripts\python.exe D:\Projekte\Grotti\scripts\orca_senden.py
+```
+
+Gilt für **OrcaSlicer** und **AnycubicSlicerNext**. Pfade anpassen. Der Slicer hängt den Export-Pfad selbst an.
+
+Unter **Gerät / Drucker** keinen Print-Host (Moonraker) eintragen — sonst geht der Job am Grotti-Senden vorbei.
+
+## Ablauf
+
+1. In Orca slicen und **G-code exportieren** (Platte schreiben). Als Ziel den Slice-Ordner wählen — **Unterordner** (z. B. `slice\Gridfinity\…`) gehen: Grotti legt die Datei dort ab und liest den Watch neu. Export außerhalb des Slice-Ordners landet als Upload (ohne Ordner-Verschieben).
+2. Der Browser öffnet `/dateien?file=…` mit der neuen Datei.
+3. Drucker wählen, unter Optionen Farbe → ACE-Platz, **Jetzt** / **Wenn frei** / **Nächster freier**, dann **Starten**.
+
+Test ohne Orca:
+
+```powershell
+D:\Projekte\Grotti\.venv\Scripts\python.exe D:\Projekte\Grotti\scripts\orca_senden.py C:\pfad\datei.gcode
+```
+
+## Störungen
+
+| Symptom | Check |
+| --- | --- |
+| Meldungsfenster „Config fehlt“ | `data/orca-senden.json` anlegen |
+| „Grotti nicht erreichbar“ | Server läuft? `url` stimmt? |
+| „Token fehlt oder stimmt nicht“ | Token neu anlegen, in der JSON eintragen |
+| Browser ohne Datei / Login | Einmal anmelden; Deep-Link behält `?file=` nach dem Login |
+| Skript läuft nicht | Export wirklich speichern; Zeile im **Druckerprofil**; Python-Pfad prüfen |
+
+## Weiter
+
+- [Dateien senden](Anleitung-Dateien.md)
+- [ACE und Spulen](Anleitung-ACE.md)

docs/Anleitung-Stoerungen.md

@@ -45,6 +45,10 @@ Im Cockpit (nur bei aktivem Druck/Heizen). Danach oft **Strom aus und wieder an*
 
 Oft noch Verarbeitung auf dem Drucker. In der Sidebar unter **Senden** den Fortschritt beobachten. Nach einem Grotti-Update den Dienst einmal neu starten.
 
+## „gcode … not found“ (10115)
+
+Oft Dateinamen mit Nicht-ASCII-Zeichen (z. B. Chinesisch). Grotti normalisiert den Namen beim Senden auf ASCII. Nochmal senden; in der Bibliothek darf der Originalname bleiben.
+
 ## Wo nachschauen
 
 - Sidebar: Alerts, Läuft, Wartet, Senden

docs/Anleitung-Wand.md

@@ -36,8 +36,9 @@ Inhalt:
 
 - **Kamera** — nur wenn eine Webcam erreichbar ist; sonst bleibt der Platz weg
 - Status, Temps inkl. Bauraum wo verfügbar, Lüfter
-- **Steuerung:** Zieltemperaturen, Speed, Flow, Fan — fest vorgegebene Befehle, keine freie Konsole
+- **Steuerung:** Zieltemperaturen, Speed, Flow, Fan — fest vorgegebene Befehle, keine freie Konsole. Mit ACE zusätzlich Trockner (Temp, Dauer, Start/Stopp) und pro bestücktem Platz **an den Drucker** (Sorte und Farbe aus der Grotti-Spule)
 - **E-Stop** nur bei printing/paused/heating (Zwei-Klick). Danach oft Strom aus/an
+- **Verlauf** Temperatur und ED des aktuellen oder letzten Drucks; Link zum Druckbericht
 - **3D-Pfad** der laufenden oder gewählten Datei; Objekte ausschließen (mit Bestätigung)
 - **Bettnetz**-Heatmap, wenn vorhanden
 

docs/Anleitung-Warteschlange.md

@@ -16,7 +16,7 @@ Pro Auftrag:
 
 Unter **Läuft** siehst du auch Direktstarts ohne Queue-Zeile (Link zur Wand).
 
-Dieselbe Information steht kompakt in der Sidebar (**Läuft jetzt** / **Wartet**).
+Dieselbe Information steht kompakt in der Sidebar (**Läuft jetzt** / **Wartet**). Unter **Läuft jetzt** eine Zeile pro Drucker; Klick öffnet diese Seite, × bricht ab.
 
 ## Wann startet ein wartender Auftrag?
 
@@ -34,7 +34,7 @@ Drucken → Abkühlen → Schieben → Tasten → (Wiederholung)
 | --- | --- |
 | **Abkühlen** | Wartet, bis Bett und Düse unter der Grenze sind. PLA löst sich oft von selbst. |
 | **Schieben** | Extruder schiebt das Teil von hinten nach vorn in die Kiste. |
-| **Tasten** | LeviQ-Netz tippt; Maß aus `Result is z=`. Über 1 mm stoppt den Ablauf. |
+| **Tasten** | LeviQ-Netz tippt; Maß aus `Result is z=`. Über 3 mm stoppt den Ablauf (Default; enger geht unter Einstellungen/Ablauf). |
 
 Aktueller Schritt: auf der Druckerkarte und in der Sidebar. Abbrechen an beiden Stellen. Jeder Schritt landet unter **Aktivität**.
 

docs/Anleitung-Wartung.md

@@ -0,0 +1,12 @@
+# Wartung
+
+Stand **18.10.2026**. Druckstunden, Filament-Meter und Verschleißteile je Drucker.
+
+## Seite Wartung
+
+Unter **Wartung** siehst du je Drucker die Summe aus dem Protokoll (Stunden, Meter, Starts). Teile mit Soll-Lebensdauer (Stunden oder Meter) und Einbaudatum; bei Reset wird der Zählerstand protokolliert.
+
+## Weiter
+
+- [Einstellungen](Anleitung-Einstellungen.md)
+- [Statistik](Anleitung-Oberflaeche.md)

docs/internal/Abraeumen.md

@@ -17,7 +17,7 @@ Unter **Dateien** erscheint die Karte **Ablauf**, sobald mindestens eine Kobra 3
 - **Drucken** — Datei, Bettnetz (LeviQ) standardmäßig an
 - **Abkühlen** — Heizung aus, Lüfter an, Düse in die Bettmitte, warten bis Bett/Düse unter den Grenzen
 - **Schieben** — Bahn mit einstellbaren Zahlen, danach Lüfter aus
-- **Tasten** — kein `G28 Z`. **Mit aktivem LeviQ-Netz** (kein `BED_MESH_CLEAR`): `Result` = Höhe über der lokalen Platte. Bezugspunkt + Tastpunkt (x/y) einstellbar. Maß: letztes `Result is z=` aus dem Store. Über 1 mm = Restteil.
+- **Tasten** — kein `G28 Z`. **Mit aktivem LeviQ-Netz** (kein `BED_MESH_CLEAR`): `Result` = Höhe über der lokalen Platte. Bezugspunkt + Tastpunkt (x/y) einstellbar. Maß: letztes `Result is z=` aus dem Store. Über `max_delta_mm` (Default 3 mm) = Restteil. Enge 1 mm/2,5 mm-Werte aus alten Abläufen werden auf 3 mm angehoben (kalt an der Düse sonst Fehlalarm).
 
 Darunter **wie oft hintereinander**. Einreihen legt einen Eintrag in die Warteschlange „Wenn frei“. **Schieben testen** fährt die Bahn auf einer freien Kobra 3 (Bestätigung „Bett ist leer“). Werte merkt sich der Browser lokal.
 

docs/internal/Chargen-Etiketten-Viewer.md

@@ -1,6 +1,6 @@
 # Chargen, Etiketten und 3D-Viewer
 
-Stand 14.10.2026.
+Stand 17.10.2026.
 
 ## Spulen-Chargen
 
@@ -10,9 +10,15 @@ Scannen: auf Material den Code tippen oder per USB-Handscanner (Tastatur + Enter
 
 Etikett: `/etikett/<id>`, Druck über den Browser. QR per lokalem `qrcode.min.js` (`web/static/`). Basis-URL für den QR kommt aus Einstellungen → **FQDN** (`config.json` Key `fqdn`); leer = Host der aktuellen Anfrage. Beispiel: `https://grotti.example.de/material?spool=12`.
 
+## Druck-Chargen
+
+`D-YYYYMMDD-0001` vergibt der Watcher am aktiven Lauf (History-Job, sonst Live). Die nächste Nummer zählt Läufe und schon vergebene Objekt-Etiketten, damit eine Charge nicht doppelt entsteht. `adopt_live_run` übernimmt die Nummer nur auf einen fertigen History-Lauf ohne eigene Charge. Objekt-Etiketten (`D-…-01`) wandern nur mit, wenn der Ziel-Lauf dieselbe Charge behält; sonst fallen sie mit dem Live-Lauf weg und werden unter der verbleibenden Charge neu vergeben.
+
+Druck über `/etikett/lauf/<id>?mode=druck|objekt`. Auf dem Bogen: Charge, **Soll … g** (Slicer-Filamentmenge), Drucker, Material (Abzug oder Send/ACE/Lauf-Spule), QR 20 mm im 70‑mm-Bogen. Wand: Knopf **Etikett** bei Druck/Pause. Urteil Ausschuss ändert die Charge nicht — gedruckte Bögen verwerfen.
+
 ## 3D-Pfad
 
-`GET /api/v1/dateien/<id>/pfad` liefert einen gedünnten Toolpath (bis ca. 120 000 Punkte, plus `layer_breaks`, Cache-`version` 5) aus dem lokalen G-code. Die Dateien-Seite und das Cockpit zeichnen ihn mit Three.js.
+`GET /api/v1/dateien/<id>/pfad` liefert einen gedünnten Toolpath (bis ca. 220 000 Punkte, plus `layer_breaks`, Cache-`version` 8) aus dem lokalen G-code. Thinning behält ganze Z-Höhen dicht und lässt nur ganze Schichten weg (sonst gesprenkelte Wände). Die Dateien-Seite und das Cockpit zeichnen ihn mit Three.js.
 
 Darstellung: nur Extrusionswege. Preview = orange. Live: gedruckt leicht verdickt grün, offen grau; Schnitt nach `progress`. Parser akzeptiert `E.39`/`Z.6`. Bett: Gitter 10 mm, mm-Sprites, Legende.
 

docs/internal/Dateien-Metadaten.md

@@ -1,6 +1,8 @@
 # Grotti-Dateien Metadaten
 
-`stored_path` liegt nur in der DB und in Rohzeilen (`get_file_row`, `list_file_rows`). Die API-Antwort (`file_out` / `GET /api/v1/dateien`) enthält den Pfad bewusst nicht.
+`stored_path` liegt nur in der DB und in Rohzeilen (`get_file_row`, `list_file_rows`). Die API-Antwort (`file_out` / `GET /api/v1/dateien`) enthält den Pfad bewusst nicht — stattdessen berechnet `folder` den Relativ-Elternordner unter `watch_dir` (Uploads → `Upload`).
+
+Verschieben einer Watch-Datei: Dateisystem unter `watch_dir` + `UPDATE files.stored_path` über dieselbe ID (`library.move_file`), damit Projekt/Spule erhalten bleiben. Reiner Re-Scan nach manuellem Verschieben würde die ID verlieren.
 
 `POST /api/v1/dateien/neu-lesen` liest Watch-Ordner neu und ruft `refresh_file_meta` auf Rohzeilen auf — nicht auf `list_files`, sonst `KeyError: 'stored_path'`.
 

docs/internal/Druckbericht-Statistik.md

@@ -0,0 +1,26 @@
+# Druckbericht und Statistik
+
+Stand **17.10.2026**.
+
+## Tabellen
+
+- `runs`: zusätzlich `weight_planned_g`, `weight_used_g`, `weight_source`, `filament_used_mm`/`filament_total_mm`, `progress_last`, `estimated_s`, `chargen_nr`, `message`, `objects`
+- `run_spools`: Abzug je Spule (`is_estimate` bei Mehrfarb)
+- `run_segments`: Abschnitte bei Rollenwechsel (Einlegen während Druck/Pause)
+- `run_samples`: Temperatur/Soll/ED (`nozzle_power`/`bed_power`) — alle ~30 s, beim Aufheizen ~10 s; Proben schon vor `printing`, wenn Targets gesetzt und Auftrag/Live-Lauf bekannt
+- `run_labels`: Objekt-Chargen `D-…-01`
+- `events.run_id`: optionaler Bezug zum Lauf
+
+## Abzug
+
+`grotti/usage.py` rechnet Ist-Gramm aus `filament_used` / `filament_total` × Soll. Abbruch ohne Extrusion: 0. Ohne Zähler: Fortschritt × Soll (Schätzwert). Fertig ohne Messgröße: Soll bleibt, Quelle `estimate`.
+
+`apply_deduction` schreibt zuerst `run_spools`, dann `deducted`/`remaining_g` (auch unter 0); `ensure_run_chargen` oft schon während des Laufs. Ohne `run_spools` bleibt die Spulenakte leer.
+
+## Live
+
+`StateWatcher` hängt am offenen History-Job oder legt `live:…` an, schreibt Proben, vergibt `chargen_nr`, merkt Objektnamen. Vor neuem Start: `abandon_live_runs`. `sync_history` übernimmt Proben/Segmente (`adopt_live_run`, nicht auf ältere fertige Jobs derselben Datei). Die Live-Charge geht nur auf einen fertigen Lauf ohne Nummer über; Objekt-Etiketten nur zusammen mit dieser Charge. Sonst werden sie neu vergeben, statt eine fremde `D-…-01` zu blockieren.
+
+## Statistik-Filter
+
+`since` inklusiv, reines `until` als Datum (`YYYY-MM-DD`) inklusiv (intern Folgetag exklusiv). Presets in der UI setzen Von/Bis. CSV nutzt dieselben Query-Parameter.

docs/internal/Features-UI.md

@@ -1,55 +1,33 @@
 # Grotti: Alltag und Oberfläche
 
-Stand **14.10.2026**, v1.4.0.
+Stand **18.10.2026**, v3.0.0.
 
 ## Design
 
 - Dunkles UI mit Orange-Akzent, Lucide-ähnliche Stroke-Icons (SVG-Sprite in `layout.html`).
-- Kurze Seitenuntertitel; Technik-/Config-Hinweise liegen in der Doku, nicht als Fließtext in den Formularen.
+- Tokens in `grotti.css`; `--faint` lesbar; `prefers-reduced-motion`; Touch-Ziele bei `pointer: coarse`.
-- Einheitliche Seitenköpfe, Toolbar-Filter, kompakte Tabellen, Formularfelder mit kleinen Labels, Empty-States mit Icon.
+- **Anzeige pro Browser**: Desktop oder Regal (Touch); Zeitzone; Nav einklappbar.
-- **Anzeige pro Browser** (Einstellungen → Dieser Browser): `Desktop` oder `Regal (Touch)` in `localStorage grotti-display`. Shortcut `?shelf=1` / `?shelf=0`. Regal: größere Controls, kompakte Nav (Drucker/Kameras/Warteschlange), Sidebar default eingeklappt.
+- PWA: `manifest.webmanifest` + Service-Worker (Shell-Cache).
-- Seitenmenü einklappbar (Icon-Rail, `grotti-nav-collapsed`). Unter 760 px weiter Bottom-Nav.
+- Live: SSE `/api/v1/stream` plus Poll-Fallback; Verbindungsbanner.
 
 ## Seitenleiste
 
-- Hauptmenü: Drucker, Dateien, Kameras, Aktivität, Warteschlange, Protokoll, Material, Projekte. Darunter Einstellungen, Ideen, Doku (mit Icons); Fuß **© by dominic@gundel.dev** und Version (Changelog).
+- **Live:** Drucker, Dateien, Kameras, Warteschlange, Aufträge.
-- Live-Leiste, eigene Scrollfläche, Boxen auf- und zuklappbar (Zustand in `localStorage` `grotti-live-closed`):
+- **Rückschau:** Protokoll, Statistik, Aktivität.
-  - **Läuft jetzt**: laufende Aufträge und Abläufe mit Schrittleiste, Durchlauf `n/m`, aktueller Phase und ×-Abbrechen; auch Direktstarts ohne Queue.
+- **Verwalten:** Material, Wartung; Einstellungen, Doku.
-  - **Wartet**: wartende Aufträge mit Ziel, Priorität hoch/runter, Abbrechen; die letzten Fehler mit Fortsetzen/ausblenden.
+- Live-Panel: Läuft / Wartet / Aufgaben / Senden / Alerts.
-  - **Aufgaben**: Platte belegt ohne Ablauf — „geräumt“ per Zwei-Klick.
+- Mobile: Bottom-Nav Drucker · Dateien · Queue · Aktivität · **Mehr** (Sheet).
-  - **Senden**: laufende Uploads mit Fortschritt.
-  - **Alerts**: ungelesene wichtige Ereignisse, „gelesen“, Link auf Aktivität.
-- Aktualisierung: Senden 2 s, Queue 4 s, Aufgaben/Alerts 8 s.
 
-## Wand
+## Wand und Abräumen
 
-- Karte je Drucker: Zustandschip, Fertig-Uhrzeit groß, Fortschrittsbalken, drei Kacheln (Rest, Schicht, Läuft), Temperaturbalken Düse/Bett mit Ziel, Datei. Klick auf die Karte öffnet das Cockpit. Pause, Abbrechen, Fehler löschen und Platte geräumt bleiben auf der Karte (Zwei-Klick).
+- Karten + Cockpit wie bisher.
-- Laufender Ablauf als Streifen mit Schrittleiste und Abbrechen. Wartende Aufträge für diesen Drucker als Hinweis.
+- **Platte geräumt** öffnet Dialog: gut/Ausschuss, Grund, Stückzahlen.
-- Streifen „Fehler“ mit **Fehler löschen** und „Platte belegt“ mit **Platte geräumt** (während eines Ablaufs ausgeblendet, der räumt selbst).
-- **Cockpit** (Hash `/#<host>`): Kamera (Frame-Vorladen; zugeklappt oder ohne Kamera → eine Spalte, kein leeres 16:10), Status, Temps inkl. Bauraum wenn vorhanden, Lüfter-Icons, Steuerung, 3D-Pfad (Exclude-Object), Bettnetz. E-Stop nur bei printing/paused/heating, Zwei-Klick. Live vom Watcher.
 
-## Dateien und Senden
+## Aufträge und Wartung
 
-- Links Bibliothek: Suche, Filter Maschine/Projekt, Vorschaubild; Zeile zeigt Material, Zeit, Gewicht, Schichthöhe, Maschine, Projekt; Details per Info-Popup. Metadaten aus G-code-Kopf **und** Footer. Hochladen / Ordner neu lesen.
+- `/auftraege`: Kunden, Positionen, Einreihen, Lieferschein. `/projekte` und `/ideen` leiten um.
-- Rechts der Flow: Datei → Drucker (Live-Zustand, eingelegte Rolle) → Wann (Jetzt / Wenn frei / Nächster freier) oder Reiter Ablauf.
+- `/wartung`: Stunden/Meter und Verschleißteile.
-- Kein freies Spulen-Dropdown: Abzug nimmt die Rolle(n) am Ziel-Drucker zur Startzeit. ACE: Zuordnung Datei-Farbe → Platz. Warnung bei Material-Mismatch oder zu wenig Rest.
-- Startknopf mit Zwei-Klick bei „Jetzt“. Auswahl in `localStorage` `grotti-send-v1`.
 
-## Material
+## Dateien, Material, Statistik
 
-- Reiter **Spulen** / **Sorten**. Scan-Feld im Seitenkopf.
+- Unverändert im Kern (Bibliothek, Send-Flow, Spulen/Sorten, KPIs + Ausschuss-Gründe).
-- Spulen: Filter Alle / Am Drucker / Regal / Wenig Rest + Suche. Formular nur bei Auswahl oder „Neue Spule“ (× schließt). Ort = Drucker · ACE/extern bzw. Regal.
-- Sorten: Profile (Dichte, mm³/s, Preis, Maschinen). Anlegen/ändern/löschen; „Spule damit anlegen“ wechselt zum Spulen-Reiter.
-
-## Warteschlange
-
-- Seite `/warteschlange`: Filter Läuft / Wartet / Fehler / Historie. Priorität, Abbrechen, Fortsetzen.
-- Unter **Läuft** / **Alle aktiv** auch Direktstarts aus `/laeuft` (ohne Queue-Zeile), mit Fortschritt und Link zur Wand.
-
-## Aktivität
-
-- Zeitstrahl nach Tagen. Filter in der URL. Ungelesene Alerts markiert.
-
-## Kameras und Handy
-
-- Kamerakacheln mit Live-Zustand (`live=1`). Snapshot-Cache 2 s. Unter 760 px: Schnellmenü Drucker / Dateien / Aktivität.

docs/internal/Senden-Queue.md

@@ -18,7 +18,9 @@ Ab 12.10.2026: Start legt Hintergrund-Aufträge an (`pending` → `running` →
 
 ## Slice-Ordner / Upload
 
-`watch_dir` in `config.json` zeigt auf den Slice-Ordner der Bibliothek. Ohne Ordner geht Hochladen über die Dateien-Seite trotzdem.
+Slice-Ordner unter **Einstellungen** (persistiert als `watch_dir`). Ohne Ordner geht Hochladen über die Dateien-Seite trotzdem.
+
+**Dateinamen:** Moonraker-Multipart nutzt nur noch einen ASCII-`filename` (`moonraker.safe_upload_name`). Früher standen Nicht-ASCII-Zeichen in `filename*=UTF-8''…`, während `filename=` Unterstriche bekam — gklib speicherte A, Start suchte B → **10115 not found**.
 
 ## ACE / `.acm`
 

grotti/anycubic_lan.py

@@ -24,7 +24,7 @@ from cryptography.hazmat.primitives import padding
 from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
 
 CRED_TTL = 300
-INFO_TTL = 10
+INFO_TTL = 45
 FAIL_TTL = 45
 _CRED_CACHE = {}
 _INFO_CACHE = {}

grotti/backup.py

@@ -0,0 +1,92 @@
+"""Datenbank- und Datenordner-Backup."""
+
+from __future__ import annotations
+
+import os
+import re
+import subprocess
+import zipfile
+from datetime import datetime
+from pathlib import Path
+from urllib.parse import urlparse
+
+
+def backup_dir(cfg):
+    base = Path(cfg.get("data_dir") or "data")
+    path = base / "backup"
+    path.mkdir(parents=True, exist_ok=True)
+    return path
+
+
+def _safe_name(name):
+    name = re.sub(r"[^\w.\-]+", "_", name or "")
+    return name[:180] or "backup.zip"
+
+
+def create_backup(cfg):
+    """ZIP mit pg_dump (stdout) und data/ ohne toolpath/ und backup/."""
+    data_dir = Path(cfg.get("data_dir") or "data")
+    out_dir = backup_dir(cfg)
+    stamp = datetime.now().strftime("%Y%m%d-%H%M%S")
+    filename = _safe_name("grotti-%s.zip" % stamp)
+    dest = out_dir / filename
+
+    url = cfg.get("database_url") or ""
+    parsed = urlparse(url)
+    db_name = (parsed.path or "/grotti").lstrip("/") or "grotti"
+    env = {}
+    if parsed.password:
+        env["PGPASSWORD"] = parsed.password
+
+    cmd = ["pg_dump", "--no-owner", "--no-acl", db_name]
+    if parsed.hostname:
+        cmd[1:1] = ["-h", parsed.hostname]
+    if parsed.port:
+        cmd[1:1] = ["-p", str(parsed.port)]
+    if parsed.username:
+        cmd[1:1] = ["-U", parsed.username]
+
+    proc = subprocess.run(cmd, capture_output=True, env={**os.environ, **env})
+    if proc.returncode != 0:
+        err = (proc.stderr or b"").decode("utf-8", "replace").strip()
+        raise RuntimeError(err or "pg_dump fehlgeschlagen.")
+
+    skip_dirs = {"toolpath", "backup"}
+    with zipfile.ZipFile(dest, "w", compression=zipfile.ZIP_DEFLATED) as zf:
+        zf.writestr("database.sql", proc.stdout)
+        if data_dir.is_dir():
+            for path in sorted(data_dir.rglob("*")):
+                if not path.is_file():
+                    continue
+                rel = path.relative_to(data_dir)
+                if rel.parts and rel.parts[0] in skip_dirs:
+                    continue
+                zf.write(path, "data/" + rel.as_posix())
+    return {
+        "name": filename,
+        "path": str(dest),
+        "size": dest.stat().st_size,
+    }
+
+
+def list_backups(cfg):
+    out_dir = backup_dir(cfg)
+    items = []
+    for path in sorted(out_dir.glob("*.zip"), reverse=True):
+        try:
+            size = path.stat().st_size
+        except OSError:
+            size = 0
+        items.append({"name": path.name, "size": size})
+    return items
+
+
+def backup_path(cfg, name):
+    out_dir = backup_dir(cfg)
+    safe = _safe_name(name)
+    path = (out_dir / safe).resolve()
+    if not str(path).startswith(str(out_dir.resolve())):
+        return None
+    if not path.is_file():
+        return None
+    return path

grotti/bedarf.py

@@ -0,0 +1,76 @@
+"""Filament-Bedarf aus wartender Queue vs. Spulenrest."""
+
+from __future__ import annotations
+
+
+def _group_key(material_type, color):
+    return (
+        (material_type or "").strip().lower(),
+        (color or "").strip().lower(),
+    )
+
+
+def compute(conn):
+    """Wartende Jobs × Dateigewicht vs. Spulenrest, gruppiert nach Sorte/Farbe."""
+    queue_rows = conn.execute(
+        """
+        SELECT q.id, q.spool_id, q.repeat_total, q.repeat_done,
+               f.weight_g, f.material_type AS file_material, f.color AS file_color,
+               s.material_type AS spool_material, s.color AS spool_color
+        FROM print_queue q
+        JOIN files f ON f.id = q.file_id
+        LEFT JOIN spools s ON s.id = q.spool_id
+        WHERE q.status = 'waiting'
+        """
+    ).fetchall()
+
+    needed_map = {}
+    for row in queue_rows:
+        mat = (row.get("spool_material") or row.get("file_material") or "").strip()
+        color = (row.get("spool_color") or row.get("file_color") or "").strip()
+        key = _group_key(mat, color)
+        try:
+            repeats = max(1, int(row.get("repeat_total") or 1) - int(row.get("repeat_done") or 0))
+        except (TypeError, ValueError):
+            repeats = 1
+        weight = float(row.get("weight_g") or 0) * repeats
+        if key not in needed_map:
+            needed_map[key] = {
+                "material_type": mat,
+                "color": color,
+                "weight_g": 0.0,
+                "jobs": 0,
+            }
+        needed_map[key]["weight_g"] += weight
+        needed_map[key]["jobs"] += 1
+
+    spool_rows = conn.execute(
+        """
+        SELECT material_type, color, COALESCE(SUM(remaining_g), 0) AS remaining_g
+        FROM spools
+        GROUP BY material_type, color
+        """
+    ).fetchall()
+
+    stock_map = {}
+    for row in spool_rows:
+        key = _group_key(row.get("material_type"), row.get("color"))
+        stock_map[key] = stock_map.get(key, 0.0) + float(row.get("remaining_g") or 0)
+
+    needed = sorted(
+        needed_map.values(),
+        key=lambda x: (-x["weight_g"], x["material_type"], x["color"]),
+    )
+    shortfall = []
+    for item in needed:
+        key = _group_key(item["material_type"], item["color"])
+        have = stock_map.get(key, 0.0)
+        gap = item["weight_g"] - have
+        if gap > 0.5:
+            shortfall.append({
+                **item,
+                "remaining_g": have,
+                "shortfall_g": gap,
+            })
+    shortfall.sort(key=lambda x: (-x["shortfall_g"], x["material_type"], x["color"]))
+    return {"needed": needed, "shortfall": shortfall}

grotti/config.py

@@ -2,23 +2,61 @@
 
 import json
 import secrets
+import threading
 from pathlib import Path
 
+from grotti.errors import GrottiError
+
 ROOT = Path(__file__).resolve().parent.parent
 LOOPBACK = {"127.0.0.1", "::1", "localhost"}
 CONFIG_PATH = ROOT / "config.json"
+DEFAULT_WATCH_REL = "slice"
+_SETTINGS_LOCK = threading.Lock()
+
+
+def _tariff(raw):
+    tariff = raw.get("tariff") if isinstance(raw, dict) else None
+    if not isinstance(tariff, dict) or not tariff:
+        return None
+    try:
+        ht = float(tariff.get("ht_euro"))
+        nt = float(tariff.get("nt_euro"))
+    except (TypeError, ValueError):
+        return None
+    return {
+        "ht_euro": ht,
+        "nt_euro": nt,
+        "nt_from": str(tariff.get("nt_from") or "22:00").strip(),
+        "nt_to": str(tariff.get("nt_to") or "06:00").strip(),
+    }
 
 
 def _energy(raw):
     energy = raw.get("energy") or {}
-    return {
+    out = {
-        "watts": float(energy.get("watts", 120)),
+        "watts": float(energy.get("watts", 40)),
+        "nozzle_watts": float(energy.get("nozzle_watts", 60)),
+        "bed_watts": float(energy.get("bed_watts", 220)),
         "euro_per_kwh": float(energy.get("euro_per_kwh", 0.35)),
         "dryer_watts": float(energy.get("dryer_watts", 0)),
         "dry_hours": float(energy.get("dry_hours", 0)),
         "waste_percent": float(energy.get("waste_percent", 0)),
         "utilization": float(energy.get("utilization", 50)),
     }
+    tariff = _tariff(energy)
+    if tariff:
+        out["tariff"] = tariff
+    return out
+
+
+def _ntfy(raw):
+    ntfy = raw.get("ntfy") or {}
+    return {
+        "enabled": bool(ntfy.get("enabled")),
+        "server": str(ntfy.get("server") or "https://ntfy.sh").rstrip("/"),
+        "topic": str(ntfy.get("topic") or ""),
+        "token": str(ntfy.get("token") or ""),
+    }
 
 
 def _telegram(raw):
@@ -37,6 +75,7 @@ def _alerts(raw):
         "fehler": bool(alerts.get("fehler", True)),
         "offline": bool(alerts.get("offline", True)),
         "queue": bool(alerts.get("queue", True)),
+        "spule": bool(alerts.get("spule", True)),
         "ablauf": bool(alerts.get("ablauf", False)),
         "start": bool(alerts.get("start", False)),
     }
@@ -99,10 +138,7 @@ def load():
     data_dir = Path(raw.get("data_dir") or "data")
     if not data_dir.is_absolute():
         data_dir = ROOT / data_dir
-    watch = (raw.get("watch_dir") or "").strip()
+    watch_dir, _stored = parse_watch_dir(raw.get("watch_dir") or "", create=False, missing_ok=True)
-    watch_dir = Path(watch) if watch else None
-    if watch_dir and not watch_dir.is_absolute():
-        watch_dir = (ROOT / watch_dir).resolve()
     return {
         "host": host,
         "port": int(raw.get("port") or 8770),
@@ -116,6 +152,7 @@ def load():
         "printers_file": ROOT / "drucker.json",
         "energy": _energy(raw),
         "telegram": _telegram(raw),
+        "ntfy": _ntfy(raw),
         "alerts": _alerts(raw),
         "auto_queue": bool(raw.get("auto_queue", True)),
         "_raw": raw,
@@ -130,11 +167,48 @@ def mask_token(token):
     return token[:4] + "…" + token[-2:]
 
 
+def parse_watch_dir(value, *, create=False, missing_ok=False):
+    """Pfad aus Einstellungen/Config → (Path|None, gespeicherter String).
+
+    Relativ zum Repo-Root. Leer = aus. create legt den Ordner an.
+    """
+    text = str(value or "").strip()
+    if not text:
+        return None, ""
+    path = Path(text)
+    if not path.is_absolute():
+        path = (ROOT / path).resolve()
+    else:
+        path = path.resolve()
+    if path.exists() and not path.is_dir():
+        raise GrottiError("Der Slice-Ordner ist keine Ordner.", "watch")
+    if create:
+        try:
+            path.mkdir(parents=True, exist_ok=True)
+        except OSError as exc:
+            raise GrottiError("Slice-Ordner konnte nicht angelegt werden: %s" % exc, "watch") from exc
+    elif not path.is_dir():
+        if missing_ok:
+            return None, text
+        raise GrottiError("Slice-Ordner fehlt: %s" % path, "watch")
+    try:
+        stored = path.relative_to(ROOT.resolve()).as_posix()
+    except ValueError:
+        stored = str(path)
+    return path, stored
+
+
+def default_watch_suggestion():
+    """Absoluter Standardpfad (Repo/slice) für die Einstellungen."""
+    return str((ROOT / DEFAULT_WATCH_REL).resolve())
+
+
 def settings_public(cfg):
     tg = cfg.get("telegram") or {}
     oauth = cfg.get("oauth") or {}
     return {
         "watch_dir": str(cfg.get("watch_dir") or ""),
+        "watch_dir_default": default_watch_suggestion(),
         "auto_queue": bool(cfg.get("auto_queue", True)),
         "fqdn": str(cfg.get("fqdn") or ""),
         "legacy_token_set": bool(cfg.get("token")),
@@ -145,6 +219,13 @@ def settings_public(cfg):
             "bot_token_set": bool(tg.get("bot_token")),
             "chat_id": str(tg.get("chat_id") or ""),
         },
+        "ntfy": {
+            "enabled": bool((cfg.get("ntfy") or {}).get("enabled")),
+            "server": str((cfg.get("ntfy") or {}).get("server") or "https://ntfy.sh"),
+            "topic": str((cfg.get("ntfy") or {}).get("topic") or ""),
+            "token": mask_token((cfg.get("ntfy") or {}).get("token") or ""),
+            "token_set": bool((cfg.get("ntfy") or {}).get("token")),
+        },
         "alerts": dict(cfg.get("alerts") or {}),
         "oauth": {
             "enabled": bool(oauth.get("enabled")),
@@ -155,8 +236,40 @@ def settings_public(cfg):
     }
 
 
-def save_settings(cfg, energy=None, telegram=None, alerts=None, auto_queue=None, fqdn=None):
+def save_settings(
-    """Schreibt energy/telegram/alerts/auto_queue/fqdn zurück nach config.json und aktualisiert cfg."""
+    cfg,
+    energy=None,
+    telegram=None,
+    ntfy=None,
+    alerts=None,
+    auto_queue=None,
+    fqdn=None,
+    watch_dir=None,
+):
+    """Schreibt Einstellungen zurück nach config.json und aktualisiert cfg."""
+    with _SETTINGS_LOCK:
+        return _save_settings_locked(
+            cfg,
+            energy=energy,
+            telegram=telegram,
+            ntfy=ntfy,
+            alerts=alerts,
+            auto_queue=auto_queue,
+            fqdn=fqdn,
+            watch_dir=watch_dir,
+        )
+
+
+def _save_settings_locked(
+    cfg,
+    energy=None,
+    telegram=None,
+    ntfy=None,
+    alerts=None,
+    auto_queue=None,
+    fqdn=None,
+    watch_dir=None,
+):
     path = cfg.get("_path") or CONFIG_PATH
     raw = dict(cfg.get("_raw") or {})
     if path.exists():
@@ -167,19 +280,34 @@ def save_settings(cfg, energy=None, telegram=None, alerts=None, auto_queue=None,
     if auto_queue is not None:
         raw["auto_queue"] = bool(auto_queue)
         cfg["auto_queue"] = bool(auto_queue)
+    if watch_dir is not None:
+        resolved, stored = parse_watch_dir(watch_dir, create=True, missing_ok=False)
+        raw["watch_dir"] = stored
+        cfg["watch_dir"] = resolved
     if fqdn is not None:
         normalized = normalize_fqdn(fqdn)
         raw["fqdn"] = normalized
         cfg["fqdn"] = normalized
     if energy is not None:
-        raw["energy"] = {
+        raw_energy = {
-            "watts": float(energy.get("watts", 120)),
+            "watts": float(energy.get("watts", 40)),
+            "nozzle_watts": float(energy.get("nozzle_watts", 60)),
+            "bed_watts": float(energy.get("bed_watts", 220)),
             "euro_per_kwh": float(energy.get("euro_per_kwh", 0.35)),
             "dryer_watts": float(energy.get("dryer_watts", 0)),
             "dry_hours": float(energy.get("dry_hours", 0)),
             "waste_percent": float(energy.get("waste_percent", 0)),
             "utilization": float(energy.get("utilization", 50)),
         }
+        tariff_in = energy.get("tariff") if isinstance(energy.get("tariff"), dict) else None
+        if tariff_in is not None:
+            raw_energy["tariff"] = {
+                "ht_euro": float(tariff_in.get("ht_euro", raw_energy["euro_per_kwh"])),
+                "nt_euro": float(tariff_in.get("nt_euro", raw_energy["euro_per_kwh"])),
+                "nt_from": str(tariff_in.get("nt_from") or "22:00"),
+                "nt_to": str(tariff_in.get("nt_to") or "06:00"),
+            }
+        raw["energy"] = raw_energy
         cfg["energy"] = _energy(raw)
     if telegram is not None:
         current = _telegram(raw)
@@ -192,12 +320,25 @@ def save_settings(cfg, energy=None, telegram=None, alerts=None, auto_queue=None,
             "chat_id": str(telegram.get("chat_id", current["chat_id"]) or ""),
         }
         cfg["telegram"] = _telegram(raw)
+    if ntfy is not None:
+        current = _ntfy(raw)
+        token = ntfy.get("token")
+        if token is None or token == "" or "…" in str(token) or str(token).startswith("••••"):
+            token = current["token"]
+        raw["ntfy"] = {
+            "enabled": bool(ntfy.get("enabled", current["enabled"])),
+            "server": str(ntfy.get("server", current["server"]) or "https://ntfy.sh").rstrip("/"),
+            "topic": str(ntfy.get("topic", current["topic"]) or ""),
+            "token": str(token or ""),
+        }
+        cfg["ntfy"] = _ntfy(raw)
     if alerts is not None:
         raw["alerts"] = {
             "fertig": bool(alerts.get("fertig", True)),
             "fehler": bool(alerts.get("fehler", True)),
             "offline": bool(alerts.get("offline", True)),
             "queue": bool(alerts.get("queue", True)),
+            "spule": bool(alerts.get("spule", True)),
             "ablauf": bool(alerts.get("ablauf", False)),
             "start": bool(alerts.get("start", False)),
         }

grotti/cost.py

@@ -1,5 +1,9 @@
 """Dieselbe Rechnung wie in der Druckkalkulation."""
 
+from datetime import datetime, timedelta, timezone
+
+from grotti.time_window import _in_segment, _parse_hm
+
 
 def calculate(job, material):
     part_g = float(job.get("weight_g") or 0) * max(1, float(job.get("qty") or 1))
@@ -37,6 +41,177 @@ def calculate(job, material):
     }
 
 
-def energy_cost(duration_s, energy):
+def _parse_ts(value):
+    if value is None:
+        return None
+    if isinstance(value, datetime):
+        return value.timestamp()
+    text = str(value).strip()
+    if not text:
+        return None
+    try:
+        return datetime.fromisoformat(text.replace("Z", "+00:00")).timestamp()
+    except ValueError:
+        return None
+
+
+def _avg_power(a, b):
+    vals = [float(v) for v in (a, b) if isinstance(v, (int, float)) and not isinstance(v, bool)]
+    if not vals:
+        return 0.0
+    return max(0.0, min(1.0, sum(vals) / len(vals)))
+
+
+def _ed_print_kwh(samples, base_w, nozzle_w, bed_w):
+    """Trapez aus Grundlast + ED×Heizerleistung. None wenn zu wenig ED-Proben."""
+    if not samples or len(samples) < 2:
+        return None
+    total = 0.0
+    ed_steps = 0
+    # Max. Intervall: 3× Normal-Sample (90 s), damit Lücken nicht die ED fortschreiben
+    max_dt = 90.0
+    for i in range(len(samples) - 1):
+        a, b = samples[i], samples[i + 1]
+        t0 = _parse_ts(a.get("sampled_at"))
+        t1 = _parse_ts(b.get("sampled_at"))
+        if t0 is None or t1 is None or t1 <= t0:
+            continue
+        dt = min(t1 - t0, max_dt)
+        pn0, pn1 = a.get("nozzle_power"), b.get("nozzle_power")
+        pb0, pb1 = a.get("bed_power"), b.get("bed_power")
+        has_ed = any(
+            isinstance(v, (int, float)) and not isinstance(v, bool)
+            for v in (pn0, pn1, pb0, pb1)
+        )
+        if has_ed:
+            ed_steps += 1
+        ed_n = _avg_power(pn0, pn1)
+        ed_b = _avg_power(pb0, pb1)
+        watts = float(base_w) + float(nozzle_w) * ed_n + float(bed_w) * ed_b
+        total += (watts / 1000.0) * (dt / 3600.0)
+    if ed_steps < 1:
+        return None
+    return total
+
+
+def _is_nt_moment(moment, tariff):
+    start_t = _parse_hm(tariff.get("nt_from"))
+    end_t = _parse_hm(tariff.get("nt_to"))
+    if start_t is None or end_t is None:
+        return False
+    now_t = moment.timetz().replace(tzinfo=None)
+    return _in_segment(now_t, start_t, end_t)
+
+
+def effective_euro_per_kwh(duration_s, energy, end_dt=None):
+    energy = energy or {}
+    tariff = energy.get("tariff")
+    if not tariff or not duration_s or float(duration_s) <= 0:
+        return float(energy.get("euro_per_kwh") or 0)
+    end = end_dt if isinstance(end_dt, datetime) else datetime.now(timezone.utc).astimezone()
+    if end.tzinfo is None:
+        end = end.replace(tzinfo=timezone.utc)
+    start = end - timedelta(seconds=float(duration_s))
+    step = 300.0
+    t = start
+    nt_s = 0.0
+    total = 0.0
+    while t < end:
+        chunk = min(step, (end - t).total_seconds())
+        if _is_nt_moment(t, tariff):
+            nt_s += chunk
+        total += chunk
+        t += timedelta(seconds=chunk)
+    if total <= 0:
+        return float(energy.get("euro_per_kwh") or 0)
+    nt_frac = nt_s / total
+    ht = float(tariff.get("ht_euro") or energy.get("euro_per_kwh") or 0)
+    nt = float(tariff.get("nt_euro") or ht)
+    return nt_frac * nt + (1.0 - nt_frac) * ht
+
+
+def energy_estimate(duration_s, energy, samples=None, end_dt=None):
+    """Strom aus ED-Proben oder pauschal Dauer × Watt.
+
+    Quelle ``ed`` nur wenn Düse-/Bett-Watt gesetzt und Proben mit power vorliegen.
+    """
+    energy = energy or {}
+    euro = effective_euro_per_kwh(duration_s, energy, end_dt=end_dt)
+    dry_kwh = (float(energy.get("dryer_watts") or 0) / 1000) * float(energy.get("dry_hours") or 0)
+    base_w = float(energy.get("watts") or 0)
+    nozzle_w = float(energy.get("nozzle_watts") or 0)
+    bed_w = float(energy.get("bed_watts") or 0)
+
+    print_kwh = None
+    source = "flat"
+    if (nozzle_w > 0 or bed_w > 0) and samples:
+        print_kwh = _ed_print_kwh(samples, base_w, nozzle_w, bed_w)
+        if print_kwh is not None:
+            source = "ed"
+
+    if print_kwh is None:
         hours = float(duration_s or 0) / 3600
-    return (float(energy["watts"]) / 1000) * hours * float(energy["euro_per_kwh"])
+        print_kwh = (base_w / 1000) * hours
+        source = "flat"
+
+    kwh = print_kwh + dry_kwh
+    return {
+        "kwh": kwh,
+        "print_kwh": print_kwh,
+        "dry_kwh": dry_kwh,
+        "cost": kwh * euro,
+        "source": source,
+    }
+
+
+def energy_cost(duration_s, energy, samples=None, end_dt=None):
+    return energy_estimate(duration_s, energy, samples, end_dt=end_dt)["cost"]
+
+
+def offer_from_file(file_row, material_price, machine_rate_per_h, setup_min, margin):
+    """Angebots-Schätzung aus Datei-Gewicht und Druckzeit."""
+    weight_g = float((file_row or {}).get("weight_g") or 0)
+    est_s = float((file_row or {}).get("estimated_s") or 0)
+    hours = est_s / 3600.0 if est_s > 0 else 0.0
+    mat = float(material_price or 0)
+    rate = float(machine_rate_per_h or 0)
+    setup_h = float(setup_min or 0) / 60.0
+    material_cost = (weight_g / 1000.0) * mat
+    machine_cost = hours * rate + setup_h * rate
+    subtotal = material_cost + machine_cost
+    pct = float(margin or 0)
+    total = subtotal * (1.0 + pct / 100.0) if subtotal > 0 else 0.0
+    return {
+        "weight_g": weight_g,
+        "hours": hours,
+        "material_cost": material_cost,
+        "machine_cost": machine_cost,
+        "subtotal": subtotal,
+        "margin_percent": pct,
+        "total": total,
+    }
+
+
+def order_actuals(conn, order_id):
+    """Summe Kosten, Zeit und Ausschuss der verknüpften Läufe."""
+    row = conn.execute(
+        """
+        SELECT
+            COALESCE(SUM(r.filament_cost + r.energy_cost), 0) AS cost_total,
+            COALESCE(SUM(r.duration_s), 0) AS duration_s,
+            COALESCE(SUM(r.pieces_bad), 0) AS pieces_bad,
+            COALESCE(SUM(r.weight_g) FILTER (WHERE r.verdict = 'ausschuss'), 0) AS scrap_g,
+            COUNT(*) FILTER (WHERE r.verdict = 'ausschuss') AS scrap_runs
+        FROM order_items oi
+        JOIN runs r ON r.order_item_id = oi.id
+        WHERE oi.order_id = %s
+        """,
+        (order_id,),
+    ).fetchone()
+    return {
+        "cost_total": float(row["cost_total"] or 0),
+        "duration_s": float(row["duration_s"] or 0),
+        "pieces_bad": int(row["pieces_bad"] or 0),
+        "scrap_g": float(row["scrap_g"] or 0),
+        "scrap_runs": int(row["scrap_runs"] or 0),
+    }

grotti/db.py

@@ -1,6 +1,9 @@
-"""PostgreSQL-Verbindung und Schema."""
+"""PostgreSQL-Verbindung, Pool und Migrationen."""
+
+from __future__ import annotations
 
 import re
+import threading
 from contextlib import contextmanager
 from pathlib import Path
 from urllib.parse import urlparse, urlunparse
@@ -8,22 +11,105 @@ from urllib.parse import urlparse, urlunparse
 import psycopg
 from psycopg import sql
 from psycopg.rows import dict_row
+from psycopg_pool import ConnectionPool
 
-SCHEMA = (Path(__file__).parent / "schema.sql").read_text(encoding="utf-8")
+MIGRATIONS_DIR = Path(__file__).parent / "migrations"
+SCHEMA_LEGACY = Path(__file__).parent / "schema.sql"
+
+_pool: ConnectionPool | None = None
+_pool_lock = threading.Lock()
+_user_count_cache = {"n": None, "at": 0.0}
+_USER_COUNT_TTL = 5.0
 
 
 def database_name(url):
     name = urlparse(url).path.lstrip("/")
     if not re.fullmatch(r"[A-Za-z_][A-Za-z0-9_]*", name or ""):
-        raise SystemExit("Der Datenbankname in database_url darf nur Buchstaben, Zahlen und Unterstrich enthalten.")
+        raise SystemExit(
+            "Der Datenbankname in database_url darf nur Buchstaben, Zahlen und Unterstrich enthalten."
+        )
     return name
 
 
-def apply_schema(conn):
+def _migration_files():
-    for statement in SCHEMA.split(";"):
+    files = sorted(MIGRATIONS_DIR.glob("*.sql"))
+    out = []
+    for path in files:
+        match = re.match(r"^(\d+)_", path.name)
+        if not match:
+            continue
+        out.append((int(match.group(1)), path))
+    return out
+
+
+def _split_statements(text):
+    """Einfache Trennung an Semikolon — Migrationen ohne Funktionen mit ; im Körper."""
+    parts = []
+    for statement in text.split(";"):
         cleaned = statement.strip()
         if cleaned:
-            conn.execute(cleaned)
+            parts.append(cleaned)
+    return parts
+
+
+def _ensure_version_table(conn):
+    conn.execute(
+        """
+        CREATE TABLE IF NOT EXISTS schema_version (
+            version integer PRIMARY KEY,
+            name text NOT NULL,
+            applied_at timestamptz NOT NULL DEFAULT now()
+        )
+        """
+    )
+
+
+def _applied_versions(conn):
+    rows = conn.execute("SELECT version FROM schema_version ORDER BY version").fetchall()
+    return {int(row["version"] if isinstance(row, dict) else row[0]) for row in rows}
+
+
+def _legacy_schema_present(conn):
+    row = conn.execute(
+        """
+        SELECT 1 FROM information_schema.tables
+        WHERE table_schema = 'public' AND table_name = 'printers'
+        """
+    ).fetchone()
+    return bool(row)
+
+
+def apply_migrations(conn):
+    """Wendet fehlende Migrationen an. Bestehende Installationen ohne Version bekommen 001 gutgeschrieben."""
+    _ensure_version_table(conn)
+    applied = _applied_versions(conn)
+    migrations = _migration_files()
+    if not migrations and SCHEMA_LEGACY.exists():
+        # Fallback: altes schema.sql einmalig
+        for statement in _split_statements(SCHEMA_LEGACY.read_text(encoding="utf-8")):
+            conn.execute(statement)
+        return
+
+    if not applied and _legacy_schema_present(conn):
+        # Schema war schon da (vor Migrationssystem) → Basis als angewandt markieren.
+        base = next((m for m in migrations if m[0] == 1), None)
+        if base:
+            conn.execute(
+                "INSERT INTO schema_version (version, name) VALUES (%s, %s) ON CONFLICT DO NOTHING",
+                (1, base[1].name),
+            )
+            applied.add(1)
+
+    for version, path in migrations:
+        if version in applied:
+            continue
+        text = path.read_text(encoding="utf-8")
+        for statement in _split_statements(text):
+            conn.execute(statement)
+        conn.execute(
+            "INSERT INTO schema_version (version, name) VALUES (%s, %s)",
+            (version, path.name),
+        )
 
 
 def prepare(url):
@@ -31,14 +117,16 @@ def prepare(url):
     admin = urlunparse(urlparse(url)._replace(path="/postgres"))
     try:
         with psycopg.connect(admin, autocommit=True, connect_timeout=5) as conn:
-            exists = conn.execute("SELECT 1 FROM pg_database WHERE datname = %s", (name,)).fetchone()
+            exists = conn.execute(
+                "SELECT 1 FROM pg_database WHERE datname = %s", (name,)
+            ).fetchone()
             if not exists:
                 conn.execute(sql.SQL("CREATE DATABASE {}").format(sql.Identifier(name)))
-    except psycopg.Error:
+    except psycopg.Error as exc:
-        pass
+        print("Datenbank anlegen: %s" % exc, flush=True)
     try:
-        with psycopg.connect(url, connect_timeout=5) as conn:
+        with psycopg.connect(url, row_factory=dict_row, connect_timeout=5) as conn:
-            apply_schema(conn)
+            apply_migrations(conn)
             conn.commit()
     except psycopg.Error as exc:
         raise SystemExit(
@@ -50,9 +138,50 @@ def prepare(url):
         ) from exc
 
 
+def init_pool(url, min_size=2, max_size=16):
+    global _pool
+    with _pool_lock:
+        if _pool is not None:
+            return _pool
+        _pool = ConnectionPool(
+            conninfo=url,
+            min_size=min_size,
+            max_size=max_size,
+            kwargs={"row_factory": dict_row, "connect_timeout": 5},
+            open=True,
+            name="grotti",
+        )
+        return _pool
+
+
+def close_pool():
+    global _pool
+    with _pool_lock:
+        if _pool is not None:
+            _pool.close()
+            _pool = None
+
+
+def get_pool():
+    if _pool is None:
+        raise RuntimeError("Datenbank-Pool ist nicht gestartet.")
+    return _pool
+
+
 @contextmanager
-def connect(url):
+def connect(url=None):
-    conn = psycopg.connect(url, row_factory=dict_row)
+    """Verbindung aus dem Pool, sonst einmalig direkt (Tests / prepare)."""
+    if _pool is not None:
+        with _pool.connection() as conn:
+            try:
+                yield conn
+            except Exception:
+                conn.rollback()
+                raise
+        return
+    if not url:
+        raise RuntimeError("Keine database_url und kein Pool.")
+    conn = psycopg.connect(url, row_factory=dict_row, connect_timeout=5)
     try:
         yield conn
     except Exception:
@@ -60,3 +189,35 @@ def connect(url):
         raise
     finally:
         conn.close()
+
+
+def cached_user_count(conn):
+    """Zählt Benutzer mit kurzem Cache — vermeidet count(*) bei jedem Request."""
+    import time
+
+    now = time.monotonic()
+    cached = _user_count_cache["n"]
+    if cached is not None and (now - _user_count_cache["at"]) < _USER_COUNT_TTL:
+        return cached
+    n = int(conn.execute("SELECT COUNT(*) AS n FROM users").fetchone()["n"])
+    _user_count_cache["n"] = n
+    _user_count_cache["at"] = now
+    return n
+
+
+def invalidate_user_count():
+    _user_count_cache["n"] = None
+    _user_count_cache["at"] = 0.0
+
+
+def prune_run_samples(conn, keep_days=90):
+    """Alte Temperaturproben löschen (Retention)."""
+    days = max(7, int(keep_days))
+    row = conn.execute(
+        """
+        DELETE FROM run_samples
+        WHERE sampled_at < now() - (%s || ' days')::interval
+        """,
+        (str(days),),
+    )
+    return row.rowcount if row is not None else 0

grotti/eject.py

@@ -55,8 +55,8 @@ DEFAULT_SWEEP = {
 # Ein Punkt in der Bettmitte — kein LeviQ, kein 3×3, kein Heizen.
 DEFAULT_CHECK = {
     "type": "check",
-    # Result is z= gegen Grenze. Temporär 3 mm — kalter Kunststoff an der Düse
+    # Result is z= gegen Grenze. 3 mm: kalter Kunststoff an der Düse
-    # tastet sonst oft 1–2 mm und meldet Restteil. Später wieder straffen.
+    # tastet sonst oft 1–2 mm und meldet Restteil.
     "max_delta_mm": 3.0,
     "timeout_min": 2,
     "x": 125.0,
@@ -454,11 +454,6 @@ def sweep_lower_to_push_script(sweep):
     ])
 
 
-def sweep_probe_height_script(sweep):
-    """Kompatibel: hoch, hinten, langsam auf z_push."""
-    return sweep_go_back_high_script(sweep) + "\n" + sweep_lower_to_push_script(sweep)
-
-
 def assert_clear_before_lower(live, sweep, min_z_mm=15.0):
     """Vor dem Senken: Toolhead muss noch klar über dem Bett stehen."""
     pos = (live or {}).get("position") or []
@@ -562,100 +557,6 @@ def check_lift_script(check):
     ])
 
 
-def _axis_coords(lo, hi, count):
-    if count <= 1:
-        return [(lo + hi) / 2.0]
-    return [lo + (hi - lo) * i / (count - 1) for i in range(count)]
-
-
-def _matrix_ok(matrix):
-    if not isinstance(matrix, list) or not matrix:
-        return False
-    width = None
-    for row in matrix:
-        if not isinstance(row, list) or not row:
-            return False
-        if width is None:
-            width = len(row)
-        if len(row) != width:
-            return False
-        for value in row:
-            if not isinstance(value, (int, float)):
-                return False
-    return True
-
-
-def interpolate_mesh_z(mesh, x, y):
-    """Bilinear aus Roh-probed_matrix. Klipper: Zeile 0 = mesh_min Y."""
-    matrix = mesh.get("matrix") if isinstance(mesh, dict) else None
-    if not _matrix_ok(matrix):
-        return None
-    mesh_min = mesh.get("mesh_min") or [0, 0]
-    mesh_max = mesh.get("mesh_max") or [0, 0]
-    try:
-        x0, y0 = float(mesh_min[0]), float(mesh_min[1])
-        x1, y1 = float(mesh_max[0]), float(mesh_max[1])
-    except (TypeError, ValueError, IndexError):
-        return None
-    rows = len(matrix)
-    cols = len(matrix[0])
-    if cols < 1 or rows < 1:
-        return None
-    if abs(x1 - x0) < 1e-9 or abs(y1 - y0) < 1e-9:
-        return float(matrix[0][0])
-    tx = 0.0 if cols == 1 else (float(x) - x0) / (x1 - x0) * (cols - 1)
-    ty = 0.0 if rows == 1 else (float(y) - y0) / (y1 - y0) * (rows - 1)
-    tx = max(0.0, min(float(cols - 1), tx))
-    ty = max(0.0, min(float(rows - 1), ty))
-    c0 = int(tx)
-    r0 = int(ty)
-    c1 = min(cols - 1, c0 + 1)
-    r1 = min(rows - 1, r0 + 1)
-    fx = tx - c0
-    fy = ty - r0
-    z00 = float(matrix[r0][c0])
-    z10 = float(matrix[r0][c1])
-    z01 = float(matrix[r1][c0])
-    z11 = float(matrix[r1][c1])
-    z0 = z00 * (1 - fx) + z10 * fx
-    z1 = z01 * (1 - fx) + z11 * fx
-    return z0 * (1 - fy) + z1 * fy
-
-
-def mesh_delta_mm(baseline, measured):
-    """Max |Δ| und Mittel |Δ|: Messpunkte gegen interpoliertes Baseline-Netz."""
-    if not isinstance(baseline, dict) or not _matrix_ok(baseline.get("matrix")):
-        raise GrottiError("Kein Bettnetz zum Vergleich — vorher nivellieren.", "mesh")
-    if not isinstance(measured, dict) or not _matrix_ok(measured.get("matrix")):
-        raise GrottiError("Neues Bettnetz fehlt nach dem Antasten.", "mesh")
-    matrix = measured["matrix"]
-    mesh_min = measured.get("mesh_min") or [0, 0]
-    mesh_max = measured.get("mesh_max") or [0, 0]
-    try:
-        x0, y0 = float(mesh_min[0]), float(mesh_min[1])
-        x1, y1 = float(mesh_max[0]), float(mesh_max[1])
-    except (TypeError, ValueError, IndexError) as exc:
-        raise GrottiError("Messnetz ohne gültigen Bereich.", "mesh") from exc
-    rows = len(matrix)
-    cols = len(matrix[0])
-    xs = _axis_coords(x0, x1, cols)
-    ys = _axis_coords(y0, y1, rows)
-    deltas = []
-    for ri, y in enumerate(ys):
-        for ci, x in enumerate(xs):
-            expected = interpolate_mesh_z(baseline, x, y)
-            if expected is None:
-                raise GrottiError("Baseline-Netz lässt sich nicht interpolieren.", "mesh")
-            deltas.append(abs(float(matrix[ri][ci]) - expected))
-    if not deltas:
-        raise GrottiError("Keine Messpunkte zum Vergleich.", "mesh")
-    return {
-        "max_delta_mm": max(deltas),
-        "mean_delta_mm": sum(deltas) / len(deltas),
-        "points": len(deltas),
-    }
-
-
 def step_label(step):
     if not isinstance(step, dict):
         return ""

grotti/events_bus.py

@@ -0,0 +1,42 @@
+"""Thread-sicherer Pub/Sub für Server-Sent Events (Live-UI)."""
+
+from __future__ import annotations
+
+import threading
+from queue import Empty, Queue
+
+_lock = threading.Lock()
+_subscribers: list[Queue] = []
+
+
+def subscribe() -> Queue:
+    q: Queue = Queue(maxsize=256)
+    with _lock:
+        _subscribers.append(q)
+    return q
+
+
+def unsubscribe(q: Queue) -> None:
+    with _lock:
+        try:
+            _subscribers.remove(q)
+        except ValueError:
+            pass
+
+
+def publish(kind: str, payload: dict | None = None) -> None:
+    msg = {"kind": kind or "message", "payload": payload if payload is not None else {}}
+    with _lock:
+        targets = list(_subscribers)
+    for q in targets:
+        try:
+            q.put_nowait(msg)
+        except Exception:
+            pass
+
+
+def wait_event(q: Queue, timeout_s: float) -> dict | None:
+    try:
+        return q.get(timeout=timeout_s)
+    except Empty:
+        return None

grotti/jobs.py

@@ -5,7 +5,7 @@ import urllib.error
 from concurrent.futures import ThreadPoolExecutor
 from datetime import datetime, timezone
 
-from grotti import acm, eject, library, moonraker, store
+from grotti import acm, eject, library, moonraker, store, usage
 from grotti.cost import energy_cost
 from grotti.errors import GrottiError
 from grotti.parse import content_has_ace_trailer, prepare_rinkhals_gcode
@@ -15,17 +15,7 @@ TERMINAL = {"completed", "cancelled", "error", "interrupted"}
 
 
 def weight_of(metadata):
-    raw = (metadata or {}).get("filament_weight_total")
+    return usage.weight_sum(metadata)
-    if isinstance(raw, list):
-        return sum(float(item or 0) for item in raw)
-    if isinstance(raw, (int, float)):
-        return float(raw)
-    if isinstance(raw, str):
-        try:
-            return float(raw.replace(",", "."))
-        except ValueError:
-            return 0.0
-    return 0.0
 
 
 def material_of(metadata):
@@ -35,18 +25,48 @@ def material_of(metadata):
     return str(raw).split(";")[0].strip()
 
 
+def _ace_map_of(sent):
+    if not sent:
+        return []
+    raw = sent.get("ace_map")
+    if isinstance(raw, list):
+        return acm.normalize_mapping(raw)
+    if isinstance(raw, str):
+        try:
+            return acm.normalize_mapping(json.loads(raw))
+        except json.JSONDecodeError:
+            return []
+    return []
+
+
+def _targets_from_ace(conn, host, ace):
+    targets = []
+    for item in ace:
+        slot = int(item["ams_index"]) + 1
+        row = store.spool_at_slot(conn, host, slot)
+        if row:
+            targets.append(row)
+    return targets
+
+
 def unix_to_dt(value):
     if not value:
         return None
     return datetime.fromtimestamp(float(value), timezone.utc)
 
 
-def choose_spool(conn, host, material, hinted_id):
+def choose_spool(conn, host, material, hinted_id, ended_at=None):
+    """Spule für History-Abzug. Ohne Hint nur Rollen, die vor Druckende existierten."""
     if hinted_id:
         row = store.get_spool_row(conn, hinted_id)
-        if row:
+        if row and _spool_valid_for_end(row, ended_at):
             return row
-    rows = store.spools_for_printer(conn, host)
+        if row and not _spool_valid_for_end(row, ended_at):
+            return None
+    rows = [
+        row for row in store.spools_for_printer(conn, host)
+        if _spool_valid_for_end(row, ended_at)
+    ]
     if len(rows) == 1:
         return rows[0]
     if material:
@@ -56,6 +76,24 @@ def choose_spool(conn, host, material, hinted_id):
     return None
 
 
+def _spool_valid_for_end(spool, ended_at):
+    """Verhindert Abzug alter Moonraker-Jobs auf neu eingelegte Spulen."""
+    if ended_at is None or not spool:
+        return True
+    created = spool.get("created_at")
+    if created is None:
+        return True
+    end = ended_at
+    if getattr(created, "tzinfo", None) is None and getattr(end, "tzinfo", None) is not None:
+        created = created.replace(tzinfo=timezone.utc)
+    if getattr(end, "tzinfo", None) is None and getattr(created, "tzinfo", None) is not None:
+        end = end.replace(tzinfo=timezone.utc)
+    try:
+        return created <= end
+    except TypeError:
+        return True
+
+
 def file_material_types(file_row):
     types = []
     for item in (file_row or {}).get("filaments") or []:
@@ -72,14 +110,7 @@ def resolve_spools_at_host(conn, host, ace_map=None):
     if mapping:
         for item in mapping:
             slot = int(item["ams_index"]) + 1
-            row = conn.execute(
+            row = store.spool_at_slot(conn, host, slot)
-                """
-                SELECT * FROM spools
-                WHERE printer_host = %s AND ace_slot = %s
-                ORDER BY id LIMIT 1
-                """,
-                (host, slot),
-            ).fetchone()
             if row:
                 found.append(row)
         return found
@@ -128,50 +159,153 @@ def assert_spool_at_host(conn, spool_id, host):
         )
 
 
-def apply_deduction(conn, run, energy):
+def apply_deduction(conn, run, energy, metadata=None):
-    if run["deducted"] or run["weight_g"] <= 0 or run["state"] not in TERMINAL:
+    if run["deducted"] or run["state"] not in TERMINAL:
         return False
-    weight = float(run["weight_g"] or 0)
+    planned = float(run.get("weight_planned_g") or run.get("weight_g") or 0)
-    # ACE: Abzug anteilig auf die Plätze der letzten Sendung
+    used = float(run.get("weight_used_g") or 0)
+    source = run.get("weight_source") or ""
+    if used <= 0 and planned > 0 and source != "none":
+        used, source = usage.resolve_used_grams(
+            planned,
+            run.get("filament_used_mm") or 0,
+            run.get("filament_total_mm") or 0,
+            run.get("progress_last") or 0,
+            run["state"],
+            run.get("duration_s") or 0,
+        )
+    if used <= 0:
+        return False
+
     sent = store.latest_send(conn, run["printer_host"], run.get("filename") or "")
-    ace = []
+    ace = _ace_map_of(sent)
-    if sent:
+    meta = metadata or {}
-        raw = sent.get("ace_map")
+    if not meta and run.get("file_id"):
-        if isinstance(raw, list):
+        file_row = store.get_file_row(conn, run["file_id"]) if hasattr(store, "get_file_row") else None
-            ace = raw
+        if file_row:
-        elif isinstance(raw, str):
+            meta = {"filament_weight_total": file_row.get("weight_g") or planned}
-            try:
+
-                ace = json.loads(raw)
+    store.close_open_segments(conn, run["id"], None, run.get("filament_used_mm") or 0)
-            except json.JSONDecodeError:
+    segments = store.list_run_segments(conn, run["id"])
-                ace = []
+
-    targets = []
+    entries = []
-    if ace:
+    targets = _targets_from_ace(conn, run["printer_host"], ace) if ace else []
-        for item in acm.normalize_mapping(ace):
-            slot = int(item["ams_index"]) + 1
-            row = conn.execute(
-                """
-                SELECT * FROM spools
-                WHERE printer_host = %s AND ace_slot = %s
-                ORDER BY id LIMIT 1
-                """,
-                (run["printer_host"], slot),
-            ).fetchone()
-            if row:
-                targets.append(row)
     if not targets and run.get("spool_id"):
         spool = store.get_spool_row(conn, run["spool_id"])
         if spool:
             targets = [spool]
-    if not targets:
+    # Abschnitte ohne ACE-Map: externe Rollen nacheinander
+    if segments and not ace:
+        final_mm = float(run.get("filament_used_mm") or 0)
+        total_mm = float(run.get("filament_total_mm") or 0)
+        deltas = usage.segment_deltas(segments, final_mm)
+        for spool_id, ace_slot, delta_mm in deltas:
+            spool = store.get_spool_row(conn, spool_id)
+            if not spool:
+                continue
+            grams = usage.grams_from_mm(delta_mm, total_mm, planned)
+            cost = (grams / 1000.0) * float(spool.get("price_per_kg") or 0)
+            entries.append({
+                "spool_id": spool_id,
+                "ace_slot": ace_slot,
+                "weight_g": grams,
+                "weight_planned_g": planned / max(1, len(deltas)),
+                "cost": cost,
+                "is_estimate": source != "measured",
+            })
+    elif targets:
+        shares = usage.planned_shares(meta, ace, len(targets))
+        parts, is_estimate = usage.split_used(used, shares, multi=len(targets) > 1)
+        if source != "measured":
+            is_estimate = True
+        # ACE-Rollenwechsel: Anteil der gewechselten Farbe nach mm aufteilen
+        by_slot = {}
+        if segments and ace:
+            final_mm = float(run.get("filament_used_mm") or 0)
+            for spool_id, ace_slot, delta_mm in usage.segment_deltas(segments, final_mm):
+                by_slot.setdefault(ace_slot, []).append((spool_id, delta_mm))
+        for index, spool in enumerate(targets):
+            plan = shares[index] if index < len(shares) else 0
+            grams = parts[index] if index < len(parts) else 0
+            slot = spool.get("ace_slot")
+            slot_segs = by_slot.get(slot) or []
+            if len(slot_segs) > 1:
+                mm_sum = sum(d for _, d in slot_segs) or 1.0
+                for seg_spool_id, delta_mm in slot_segs:
+                    seg_spool = store.get_spool_row(conn, seg_spool_id)
+                    if not seg_spool:
+                        continue
+                    share_g = grams * (delta_mm / mm_sum)
+                    cost = (share_g / 1000.0) * float(seg_spool.get("price_per_kg") or 0)
+                    entries.append({
+                        "spool_id": seg_spool_id,
+                        "ace_slot": slot,
+                        "weight_g": share_g,
+                        "weight_planned_g": plan / len(slot_segs),
+                        "cost": cost,
+                        "is_estimate": True,
+                    })
+            else:
+                cost = (grams / 1000.0) * float(spool.get("price_per_kg") or 0)
+                entries.append({
+                    "spool_id": spool["id"],
+                    "ace_slot": slot,
+                    "weight_g": grams,
+                    "weight_planned_g": plan,
+                    "cost": cost,
+                    "is_estimate": is_estimate,
+                })
+    elif segments:
+        # Fallback: Abschnitte ohne aktuelle Targets
+        final_mm = float(run.get("filament_used_mm") or 0)
+        total_mm = float(run.get("filament_total_mm") or 0)
+        for spool_id, ace_slot, delta_mm in usage.segment_deltas(segments, final_mm):
+            spool = store.get_spool_row(conn, spool_id)
+            if not spool:
+                continue
+            grams = usage.grams_from_mm(delta_mm, total_mm, planned)
+            cost = (grams / 1000.0) * float(spool.get("price_per_kg") or 0)
+            entries.append({
+                "spool_id": spool_id,
+                "ace_slot": ace_slot,
+                "weight_g": grams,
+                "weight_planned_g": 0,
+                "cost": cost,
+                "is_estimate": source != "measured",
+            })
+    else:
         return False
-    share = weight / len(targets)
+
-    filament = sum((share / 1000) * float(spool["price_per_kg"] or 0) for spool in targets)
+    if not entries:
-    power = energy_cost(run["duration_s"], energy)
+        return False
-    marked = store.mark_deducted(conn, run["id"], targets[0]["id"], filament, power)
+    used_total = sum(item["weight_g"] for item in entries)
+    filament = sum(item["cost"] for item in entries)
+    samples = store.list_run_samples(conn, run["id"])
+    power = energy_cost(run["duration_s"], energy, samples)
+    # run_spools vor deducted=true, sonst bleibt die Akte leer bei Abbruch dazwischen
+    store.replace_run_spools(conn, run["id"], entries)
+    marked = store.mark_deducted(
+        conn,
+        run["id"],
+        entries[0]["spool_id"],
+        filament,
+        power,
+        weight_used_g=used_total,
+        weight_source=source or ("estimate" if any(e["is_estimate"] for e in entries) else "measured"),
+    )
     if not marked:
+        store.replace_run_spools(conn, run["id"], [])
         return False
-    for spool in targets:
+    for item in entries:
-        store.deduct_spool(conn, spool["id"], share)
+        store.deduct_spool(conn, item["spool_id"], item["weight_g"])
+    store.ensure_run_chargen(conn, run["id"], used_total)
+    objects = run.get("objects")
+    if isinstance(objects, str):
+        try:
+            objects = json.loads(objects)
+        except json.JSONDecodeError:
+            objects = []
+    store.ensure_run_labels(conn, run["id"], objects or [], qty=1)
     return True
 
 
@@ -190,20 +324,45 @@ def sync_history(conn, cfg):
     deducted = 0
     for printer, job in collected:
         job_id = str(job.get("job_id") or "")
-        if not job_id:
+        if not job_id or str(job_id).startswith("live:"):
             continue
         filename = job.get("filename") or ""
         metadata = job.get("metadata") or {}
-        weight = weight_of(metadata)
+        planned = weight_of(metadata)
         material = material_of(metadata)
         state = job.get("status") or ""
+        used_mm = usage.filament_used_mm(job)
+        total_mm = usage.filament_total_mm(metadata, job)
+        estimated = float(metadata.get("estimated_time") or 0)
         sent = store.latest_send(conn, printer["host"], filename)
         known = store.file_by_name(conn, filename)
         file_id = (sent or {}).get("file_id") or (known or {}).get("id")
         project_id = (sent or {}).get("project_id") or (known or {}).get("project_id")
         hinted = (sent or {}).get("spool_id") or (known or {}).get("spool_id")
-        spool = choose_spool(conn, printer["host"], material, hinted)
+        ended_at = unix_to_dt(job.get("end_time"))
+        # Ohne Send-Eintrag keine Rate — sonst zieht eine neue Spule alle alten Jobs ab.
+        if not sent and not hinted:
+            spool = None
+        else:
+            spool = choose_spool(conn, printer["host"], material, hinted, ended_at=ended_at)
         terminal = state in TERMINAL
+        live = store.find_live_run(conn, printer["host"], filename)
+        progress = float((live or {}).get("progress_last") or 0)
+        if used_mm <= 0 and live:
+            used_mm = float(live.get("filament_used_mm") or 0)
+        if total_mm <= 0 and live:
+            total_mm = float(live.get("filament_total_mm") or 0)
+        if planned <= 0 and live:
+            planned = float(live.get("weight_planned_g") or 0)
+        objects = (live or {}).get("objects") or []
+        if isinstance(objects, str):
+            try:
+                objects = json.loads(objects)
+            except json.JSONDecodeError:
+                objects = []
+        used_g, source = usage.resolve_used_grams(
+            planned, used_mm, total_mm, progress, state, job.get("print_duration") or 0
+        )
         row = store.upsert_run(conn, {
             "printer_host": printer["host"],
             "printer_name": printer["name"],
@@ -215,13 +374,33 @@ def sync_history(conn, cfg):
             "started_at": unix_to_dt(job.get("start_time")),
             "ended_at": unix_to_dt(job.get("end_time")),
             "duration_s": float(job.get("print_duration") or job.get("total_duration") or 0),
-            "weight_g": weight,
+            "weight_g": planned,
+            "weight_planned_g": planned,
+            "weight_used_g": used_g,
+            "weight_source": source,
+            "filament_used_mm": used_mm,
+            "filament_total_mm": total_mm,
+            "progress_last": progress,
+            "estimated_s": estimated,
             "energy_cost": energy_cost(job.get("print_duration") or job.get("total_duration") or 0, cfg["energy"]),
             "moonraker_job_id": job_id,
-            "needs_spool": bool(terminal and weight > 0 and not spool),
+            "needs_spool": bool(terminal and used_g > 0 and not spool),
             "material_type": material,
+            "message": (job.get("message") or "") if state == "error" else "",
+            "objects": objects,
         })
-        if apply_deduction(conn, row, cfg["energy"]):
+        # Live sofort auf History hängen — auch solange noch in_progress (eine Protokoll-Zeile)
+        store.adopt_live_run(conn, printer["host"], filename, row["id"])
+        row = store.get_run_row(conn, row["id"])
+        if terminal:
+            # Nachzug nicht während eines neuen Live-Drucks — sonst „Platte belegt“ zu Unrecht
+            active = store.find_live_run(conn, printer["host"])
+            if not active:
+                ended = row.get("ended_at") or unix_to_dt(job.get("end_time"))
+                store.ensure_bed_after_print(
+                    conn, printer["host"], ended_at=ended, message=filename or state
+                )
+        if apply_deduction(conn, row, cfg["energy"], metadata=metadata):
             deducted += 1
     return {"gelesen": len(collected), "abgezogen": deducted}
 
@@ -339,7 +518,7 @@ def send_file(
     progress("pruefen", 15, "Drucker prüfen…")
     try:
         live = moonraker.query(host)
-    except (urllib.error.URLError, TimeoutError, json.JSONDecodeError, KeyError) as exc:
+    except (urllib.error.URLError, TimeoutError, json.JSONDecodeError, KeyError, OSError, ValueError) as exc:
         raise GrottiError("Der Drucker ist nicht erreichbar.", "offline") from exc
     if live.get("state") in ("printing", "paused"):
         raise GrottiError("Der Drucker druckt schon.", "belegt", 409)
@@ -373,7 +552,11 @@ def send_file(
         filaments = [{"type": "PLA", "color": ""}]
 
     progress("vorbereiten", 30, "Datei vorbereiten…")
-    filename, content, plate = library.printer_file(row)
+    filename, content, plate = library.printer_file(
+        row, conn=conn, data_dir=(cfg or {}).get("data_dir")
+    )
+    # CJK/Unicode im Namen → Rinkhals 10115 not found (Upload ≠ Start-Name)
+    filename = moonraker.safe_upload_name(filename)
     ace_tools = [item.get("paint_index") for item in mapping] if mapping else None
     if (row.get("kind") or "") == "gcode" and str(filename).endswith(".gcode"):
         content = prepare_rinkhals_gcode(content, tools=ace_tools)
@@ -484,6 +667,33 @@ def steuern(conn, host, action, params=None):
     printer = store.printer_by_host(conn, host)
     if not printer:
         raise GrottiError("Diesen Drucker kennt Grotti nicht.", "drucker", 404)
+    params = dict(params) if isinstance(params, dict) else {}
+    if action == "slot_setzen":
+        try:
+            ace_slot = int(params.get("ace_slot"))
+        except (TypeError, ValueError) as exc:
+            raise GrottiError("ACE-Platz muss 1–8 sein.", "platz") from exc
+        spool = None
+        for row in store.spools_for_printer(conn, host):
+            raw_slot = row.get("ace_slot")
+            if raw_slot in (None, ""):
+                continue
+            try:
+                if int(raw_slot) == ace_slot:
+                    spool = row
+                    break
+            except (TypeError, ValueError):
+                continue
+        if not spool:
+            raise GrottiError("Auf diesem Platz liegt keine Spule in Grotti.", "spule")
+        material = (spool.get("material_type") or "").strip()
+        if not material:
+            raise GrottiError("Die Spule braucht eine Sorte.", "material")
+        color = moonraker.spool_rgb(spool)
+        if not color:
+            raise GrottiError("Die Spule braucht eine Farbe.", "farbe")
+        hub_id, index = moonraker.ace_hub_index(ace_slot)
+        params = {"id": hub_id, "index": index, "type": material, "color": color}
     try:
         moonraker.steuern(host, action, params)
     except moonraker.PrinterError as exc:

grotti/library.py

@@ -1,5 +1,7 @@
 """Watch-Ordner, Upload und Vorschaubild."""
 
+import re
+import shutil
 import time
 import zipfile
 from pathlib import Path
@@ -10,6 +12,8 @@ from grotti.parse import embedded_png, inspect_file, safe_zip_name
 
 _LAST_WATCH_SYNC = 0.0
 _WATCH_MIN_INTERVAL_S = 20
+_FOLDER_PART = re.compile(r"^[A-Za-z0-9._\- äöüÄÖÜß]+$")
+_MAX_FOLDER_DEPTH = 6
 
 
 def skip_path(path, data_dir):
@@ -36,7 +40,7 @@ def sync_watch(conn, cfg, force=False):
     global _LAST_WATCH_SYNC
     folder = cfg["watch_dir"]
     if folder is None:
-        return {"gelesen": 0, "hinweis": "In config.json watch_dir auf den Slice-Ordner setzen."}
+        return {"gelesen": 0, "hinweis": "Unter Einstellungen den Slice-Ordner setzen."}
     if not folder.exists():
         return {"gelesen": 0, "hinweis": "Der Watch-Ordner fehlt: %s" % folder}
     now = time.monotonic()
@@ -96,7 +100,10 @@ def refresh_file_meta(conn, force=False):
 
 def safe_filename(name):
     base = Path(name).name.replace("\\", "_").replace("/", "_").replace('"', "")
-    return base or "datei.gcode"
+    base = base.strip().strip(".")
+    if not base or base in (".", ".."):
+        return "datei.gcode"
+    return base
 
 
 def unique_path(directory, filename):
@@ -113,6 +120,138 @@ def unique_path(directory, filename):
     return candidate
 
 
+def require_watch_dir(cfg):
+    folder = cfg.get("watch_dir")
+    if not folder:
+        raise GrottiError("Kein Slice-Ordner gesetzt — unter Einstellungen festlegen.", "watch")
+    root = Path(folder).resolve()
+    if not root.is_dir():
+        raise GrottiError("Der Slice-Ordner fehlt: %s" % root, "watch")
+    return root
+
+
+def normalize_folder(rel):
+    """Relativpfad unter watch_dir; leer = Wurzel. Kein .., begrenzte Tiefe."""
+    text = str(rel or "").strip().replace("\\", "/").strip("/")
+    if not text:
+        return ""
+    parts = []
+    for part in text.split("/"):
+        part = part.strip()
+        if not part or part in (".", ".."):
+            raise GrottiError("Ungültiger Ordnername.", "ordner")
+        if not _FOLDER_PART.match(part):
+            raise GrottiError(
+                "Ordnername nur Buchstaben, Ziffern, Leerzeichen, . _ -.",
+                "ordner",
+            )
+        parts.append(part)
+    if len(parts) > _MAX_FOLDER_DEPTH:
+        raise GrottiError("Ordner zu tief verschachtelt (max. %s)." % _MAX_FOLDER_DEPTH, "ordner")
+    return "/".join(parts)
+
+
+def path_under_watch(watch_dir, rel_folder, name=None):
+    """Absoluter Pfad unter watch_dir; wirft bei Escape."""
+    root = Path(watch_dir).resolve()
+    folder = normalize_folder(rel_folder)
+    target = root if not folder else (root / folder)
+    if name:
+        target = target / safe_filename(name)
+    resolved = target.resolve()
+    if resolved != root and root not in resolved.parents:
+        raise GrottiError("Pfad außerhalb des Slice-Ordners.", "ordner")
+    return resolved
+
+
+def list_folders(cfg):
+    """Unterordner unter watch_dir (auch leer), relativ, sortiert."""
+    try:
+        root = require_watch_dir(cfg)
+    except GrottiError:
+        return []
+    data_dir = cfg.get("data_dir")
+    found = set()
+    for path in root.rglob("*"):
+        if not path.is_dir():
+            continue
+        if data_dir is not None and skip_path(path, data_dir):
+            continue
+        try:
+            rel = path.resolve().relative_to(root).as_posix()
+        except ValueError:
+            continue
+        if rel and rel != ".":
+            found.add(rel)
+    return sorted(found, key=lambda s: s.lower())
+
+
+def create_folder(cfg, rel):
+    root = require_watch_dir(cfg)
+    folder = normalize_folder(rel)
+    if not folder:
+        raise GrottiError("Ordnername fehlt.", "ordner")
+    target = path_under_watch(root, folder)
+    target.mkdir(parents=True, exist_ok=True)
+    return folder
+
+
+def delete_folder(cfg, rel):
+    root = require_watch_dir(cfg)
+    folder = normalize_folder(rel)
+    if not folder:
+        raise GrottiError("Die Wurzel lässt sich nicht löschen.", "ordner")
+    target = path_under_watch(root, folder)
+    if not target.is_dir():
+        raise GrottiError("Der Ordner fehlt.", "ordner", 404)
+    try:
+        next(target.iterdir())
+        raise GrottiError("Ordner ist nicht leer.", "ordner")
+    except StopIteration:
+        pass
+    target.rmdir()
+    return folder
+
+
+def move_file(conn, cfg, file_id, folder):
+    """Watch-Datei in Unterordner (oder Wurzel) verschieben; ID bleibt."""
+    root = require_watch_dir(cfg)
+    folder = normalize_folder(folder)
+    row = store.get_file_row(conn, file_id)
+    if not row:
+        raise GrottiError("Die Datei fehlt.", "datei", 404)
+    if row.get("source") != "watch":
+        raise GrottiError(
+            "Nur Dateien aus dem Slice-Ordner lassen sich verschieben.",
+            "watch",
+        )
+    src = Path(row.get("stored_path") or "")
+    if not src.is_file():
+        raise GrottiError("Die Datei liegt nicht mehr auf der Platte.", "datei", 404)
+    dest_dir = path_under_watch(root, folder)
+    dest_dir.mkdir(parents=True, exist_ok=True)
+    dest = dest_dir / src.name
+    if dest.resolve() == src.resolve():
+        return store.file_out(row, watch_dir=root)
+    if dest.exists():
+        dest = unique_path(dest_dir, src.name)
+    try:
+        shutil.move(str(src), str(dest))
+    except OSError as exc:
+        raise GrottiError("Verschieben fehlgeschlagen: %s" % exc, "ordner") from exc
+    stat = dest.stat()
+    store.update_file_location(
+        conn,
+        file_id,
+        str(dest.resolve()),
+        name=dest.name,
+        size_bytes=stat.st_size,
+        mtime=stat.st_mtime,
+    )
+    row = store.get_file_row(conn, file_id)
+    return store.file_out(row, watch_dir=root)
+
+
 def save_upload(conn, filename, content, cfg, project_id=None):
     directory = cfg["data_dir"] / "eingang"
     directory.mkdir(parents=True, exist_ok=True)
@@ -142,8 +281,30 @@ def ensure_library_gcode(conn, cfg, host, filename):
     return save_upload(conn, name, content, cfg)
 
 
-def printer_file(row):
+def resolve_stored_path(conn, row, data_dir=None):
-    path = Path(row["stored_path"])
+    """Gespeicherter Pfad, ggf. nach Umzug von data_dir unter eingang/<name> wiederfinden."""
+    stored = (row or {}).get("stored_path") or ""
+    path = Path(stored) if stored else None
+    if path and path.is_file():
+        return path
+    name = (row or {}).get("name") or (path.name if path else "")
+    if not name or data_dir is None:
+        return None
+    candidate = Path(data_dir) / "eingang" / name
+    if not candidate.is_file():
+        return None
+    resolved = str(candidate.resolve())
+    file_id = (row or {}).get("id")
+    if file_id and conn is not None:
+        conn.execute("UPDATE files SET stored_path = %s WHERE id = %s", (resolved, file_id))
+    row["stored_path"] = resolved
+    return candidate.resolve()
+
+
+def printer_file(row, conn=None, data_dir=None):
+    path = resolve_stored_path(conn, row, data_dir) if (conn is not None or data_dir is not None) else Path(row["stored_path"])
+    if path is None:
+        path = Path(row.get("stored_path") or "")
     if not path.is_file():
         raise GrottiError("Die Datei liegt nicht mehr auf der Platte.", "datei", 404)
     if row["kind"] == "gcode":
@@ -153,9 +314,9 @@ def printer_file(row):
     return path.name, path.read_bytes(), row["plate"] or ""
 
 
-def preview_png(row):
+def preview_png(row, conn=None, data_dir=None):
-    path = Path(row["stored_path"])
+    path = resolve_stored_path(conn, row, data_dir) if (conn is not None or data_dir is not None) else Path(row["stored_path"])
-    if not path.is_file():
+    if path is None or not path.is_file():
         return None
     entry = row["thumb_entry"]
     if row["kind"] == "gcode":

grotti/maintenance.py

@@ -0,0 +1,156 @@
+"""Wartungs-Teile und Laufzähler aus dem Protokoll."""
+
+from __future__ import annotations
+
+def _baseline(conn, host, part_key):
+    row = conn.execute(
+        """
+        SELECT hours_at, meters_at FROM maintenance_log
+        WHERE printer_host = %s AND part_key = %s AND event IN ('install', 'reset')
+        ORDER BY created_at DESC, id DESC
+        LIMIT 1
+        """,
+        (host, part_key),
+    ).fetchone()
+    if not row:
+        return 0.0, 0.0
+    return float(row.get("hours_at") or 0), float(row.get("meters_at") or 0)
+
+
+def counters_for_host(conn, host):
+    """Summe Druckzeit, Filament und Anzahl Läufe für einen Host."""
+    host = (host or "").strip()
+    if not host:
+        return {"hours": 0.0, "meters": 0.0, "runs": 0}
+    row = conn.execute(
+        """
+        SELECT
+            COALESCE(SUM(duration_s), 0) AS duration_s,
+            COALESCE(SUM(filament_used_mm), 0) AS meters,
+            COUNT(*) AS runs
+        FROM runs
+        WHERE printer_host = %s AND state = 'completed'
+        """,
+        (host,),
+    ).fetchone()
+    if not row:
+        return {"hours": 0.0, "meters": 0.0, "runs": 0}
+    return {
+        "hours": float(row.get("duration_s") or 0) / 3600.0,
+        "meters": float(row.get("meters") or 0),
+        "runs": int(row.get("runs") or 0),
+    }
+
+
+def part_out(row, counters=None, conn=None):
+    counters = counters or {}
+    life_h = float(row.get("life_hours") or 0)
+    life_m = float(row.get("life_meters") or 0)
+    hours_total = float(counters.get("hours") or 0)
+    meters_total = float(counters.get("meters") or 0)
+    host = row["printer_host"]
+    part_key = row["part_key"]
+    base_h, base_m = (0.0, 0.0)
+    if conn is not None:
+        base_h, base_m = _baseline(conn, host, part_key)
+    hours_since = max(0.0, hours_total - base_h)
+    meters_since = max(0.0, meters_total - base_m)
+    installed = row.get("installed_at")
+    return {
+        "id": row["id"],
+        "printer_host": host,
+        "part_key": part_key,
+        "label": row.get("label") or "",
+        "installed_at": installed.isoformat() if hasattr(installed, "isoformat") else str(installed or ""),
+        "life_hours": life_h,
+        "life_meters": life_m,
+        "note": row.get("note") or "",
+        "hours_since": hours_since,
+        "meters_since": meters_since,
+        "overdue_hours": life_h > 0 and hours_since >= life_h,
+        "overdue_meters": life_m > 0 and meters_since >= life_m,
+    }
+
+
+def list_for_api(conn, printers):
+    out = []
+    for printer in printers or []:
+        host = printer.get("host") or ""
+        counters = counters_for_host(conn, host)
+        rows = conn.execute(
+            "SELECT * FROM maintenance_parts WHERE printer_host = %s ORDER BY label, part_key, id",
+            (host,),
+        ).fetchall()
+        out.append({
+            "host": host,
+            "name": printer.get("name") or host,
+            "counters": counters,
+            "parts": [part_out(r, counters, conn=conn) for r in rows],
+        })
+    return out
+
+
+def create_part(conn, printer_host, part_key, label="", life_hours=0, life_meters=0, note=""):
+    printer_host = (printer_host or "").strip()
+    part_key = (part_key or "").strip()
+    if not printer_host or not part_key:
+        raise ValueError("Drucker und part_key nötig.")
+    row = conn.execute(
+        """
+        INSERT INTO maintenance_parts (printer_host, part_key, label, life_hours, life_meters, note)
+        VALUES (%s, %s, %s, %s, %s, %s)
+        RETURNING *
+        """,
+        (
+            printer_host,
+            part_key,
+            (label or part_key).strip(),
+            float(life_hours or 0),
+            float(life_meters or 0),
+            (note or "").strip(),
+        ),
+    ).fetchone()
+    counters = counters_for_host(conn, printer_host)
+    conn.execute(
+        """
+        INSERT INTO maintenance_log (printer_host, part_key, event, hours_at, meters_at, note)
+        VALUES (%s, %s, 'install', %s, %s, %s)
+        """,
+        (printer_host, part_key, counters["hours"], counters["meters"], (note or "").strip()),
+    )
+    return part_out(row, counters, conn=conn)
+
+
+def reset_part(conn, part_id):
+    row = conn.execute(
+        "SELECT * FROM maintenance_parts WHERE id = %s",
+        (int(part_id),),
+    ).fetchone()
+    if not row:
+        return None
+    host = row["printer_host"]
+    counters = counters_for_host(conn, host)
+    conn.execute(
+        """
+        INSERT INTO maintenance_log (printer_host, part_key, event, hours_at, meters_at, note)
+        VALUES (%s, %s, 'reset', %s, %s, %s)
+        """,
+        (
+            host,
+            row["part_key"],
+            counters["hours"],
+            counters["meters"],
+            row.get("note") or "",
+        ),
+    )
+    updated = conn.execute(
+        """
+        UPDATE maintenance_parts
+        SET installed_at = now()
+        WHERE id = %s
+        RETURNING *
+        """,
+        (int(part_id),),
+    ).fetchone()
+    fresh_counters = counters_for_host(conn, host)
+    return part_out(updated, fresh_counters, conn=conn)

grotti/mcp_server.py

@@ -124,6 +124,27 @@ def main():
         """Spulen / Materialbestand."""
         return json.dumps(_api("GET", "/spulen"), ensure_ascii=False, indent=2)
 
+    @server.tool()
+    def auftraege_lesen(limit: int = 30, status: str = "") -> str:
+        """Aufträge (optional nach Status filtern)."""
+        st = (status or "").strip().lower()
+        q = "?status=" + urllib.parse.quote(st) if st else ""
+        rows = _api("GET", "/auftraege" + q) or []
+        cap = max(1, min(limit, 200))
+        if len(rows) > cap:
+            rows = rows[:cap]
+        return json.dumps(rows, ensure_ascii=False, indent=2)
+
+    @server.tool()
+    def bedarf_lesen() -> str:
+        """Filament-Bedarf (Queue vs. Spulenrest)."""
+        return json.dumps(_api("GET", "/bedarf"), ensure_ascii=False, indent=2)
+
+    @server.tool()
+    def wartung_lesen() -> str:
+        """Wartungsteile und Zählerstände."""
+        return json.dumps(_api("GET", "/wartung"), ensure_ascii=False, indent=2)
+
     @server.tool()
     def get_version() -> str:
         """Grotti-Version."""
@@ -220,11 +241,11 @@ def main():
         out = []
         if nozzle is not None:
             out.append(_api("POST", "/drucker/%s/steuern" % urllib.parse.quote(host), {
-                "action": "nozzle", "value": nozzle,
+                "action": "nozzle", "temp": nozzle,
             }))
         if bed is not None:
             out.append(_api("POST", "/drucker/%s/steuern" % urllib.parse.quote(host), {
-                "action": "bed", "value": bed,
+                "action": "bed", "temp": bed,
             }))
         if not out:
             raise RuntimeError("nozzle und/oder bed angeben.")
@@ -236,7 +257,7 @@ def main():
         _write_guard()
         return json.dumps(
             _api("POST", "/drucker/%s/steuern" % urllib.parse.quote(host), {
-                "action": "speed", "value": speed,
+                "action": "speed", "percent": speed,
             }),
             ensure_ascii=False,
         )
@@ -247,7 +268,7 @@ def main():
         _write_guard()
         return json.dumps(
             _api("POST", "/drucker/%s/steuern" % urllib.parse.quote(host), {
-                "action": "fan", "value": fan,
+                "action": "fan", "percent": fan,
             }),
             ensure_ascii=False,
         )

grotti/migrations/001_base.sql

@@ -0,0 +1,305 @@
+CREATE TABLE IF NOT EXISTS projects (
+    id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    name text NOT NULL,
+    notes text NOT NULL DEFAULT '',
+    status text NOT NULL DEFAULT 'idee',
+    quote jsonb NOT NULL DEFAULT '{}'::jsonb,
+    created_at timestamptz NOT NULL DEFAULT now()
+);
+
+CREATE TABLE IF NOT EXISTS spools (
+    id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    name text NOT NULL,
+    brand text NOT NULL DEFAULT '',
+    material_type text NOT NULL DEFAULT '',
+    color text NOT NULL DEFAULT '',
+    price_per_kg double precision NOT NULL DEFAULT 0,
+    density double precision NOT NULL DEFAULT 1.24,
+    volumetric double precision NOT NULL DEFAULT 12,
+    remaining_g double precision NOT NULL DEFAULT 1000,
+    printer_host text NOT NULL DEFAULT '',
+    created_at timestamptz NOT NULL DEFAULT now()
+);
+
+CREATE TABLE IF NOT EXISTS files (
+    id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    project_id bigint REFERENCES projects (id) ON DELETE SET NULL,
+    spool_id bigint REFERENCES spools (id) ON DELETE SET NULL,
+    name text NOT NULL,
+    stored_path text NOT NULL,
+    source text NOT NULL,
+    kind text NOT NULL,
+    printer_family text NOT NULL DEFAULT '',
+    filaments jsonb NOT NULL DEFAULT '[]'::jsonb,
+    weight_g double precision NOT NULL DEFAULT 0,
+    estimated_s double precision NOT NULL DEFAULT 0,
+    thumb_entry text NOT NULL DEFAULT '',
+    plate text NOT NULL DEFAULT '',
+    size_bytes bigint NOT NULL DEFAULT 0,
+    mtime double precision NOT NULL DEFAULT 0,
+    created_at timestamptz NOT NULL DEFAULT now(),
+    UNIQUE (source, stored_path)
+);
+
+ALTER TABLE files ADD COLUMN IF NOT EXISTS slice_meta jsonb NOT NULL DEFAULT '{}'::jsonb;
+
+CREATE TABLE IF NOT EXISTS sends (
+    id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    printer_host text NOT NULL,
+    filename text NOT NULL,
+    file_id bigint REFERENCES files (id) ON DELETE SET NULL,
+    project_id bigint REFERENCES projects (id) ON DELETE SET NULL,
+    spool_id bigint REFERENCES spools (id) ON DELETE SET NULL,
+    created_at timestamptz NOT NULL DEFAULT now()
+);
+
+ALTER TABLE sends ADD COLUMN IF NOT EXISTS ace_map jsonb NOT NULL DEFAULT '[]'::jsonb;
+ALTER TABLE sends ADD COLUMN IF NOT EXISTS bed_leveling boolean NOT NULL DEFAULT false;
+
+CREATE TABLE IF NOT EXISTS runs (
+    id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    printer_host text NOT NULL,
+    printer_name text NOT NULL DEFAULT '',
+    filename text NOT NULL DEFAULT '',
+    file_id bigint REFERENCES files (id) ON DELETE SET NULL,
+    project_id bigint REFERENCES projects (id) ON DELETE SET NULL,
+    spool_id bigint REFERENCES spools (id) ON DELETE SET NULL,
+    state text NOT NULL DEFAULT '',
+    started_at timestamptz,
+    ended_at timestamptz,
+    duration_s double precision NOT NULL DEFAULT 0,
+    weight_g double precision NOT NULL DEFAULT 0,
+    filament_cost double precision NOT NULL DEFAULT 0,
+    energy_cost double precision NOT NULL DEFAULT 0,
+    moonraker_job_id text NOT NULL,
+    deducted boolean NOT NULL DEFAULT false,
+    needs_spool boolean NOT NULL DEFAULT false,
+    verdict text NOT NULL DEFAULT '',
+    material_type text NOT NULL DEFAULT '',
+    UNIQUE (printer_host, moonraker_job_id)
+);
+
+CREATE INDEX IF NOT EXISTS files_project ON files (project_id);
+
+CREATE INDEX IF NOT EXISTS runs_started ON runs (started_at DESC);
+
+CREATE TABLE IF NOT EXISTS printers (
+    id uuid PRIMARY KEY,
+    name text NOT NULL,
+    host text NOT NULL UNIQUE,
+    family text NOT NULL DEFAULT '',
+    created_at timestamptz NOT NULL DEFAULT now()
+);
+
+ALTER TABLE printers ADD COLUMN IF NOT EXISTS locked boolean NOT NULL DEFAULT false;
+
+CREATE TABLE IF NOT EXISTS ideas (
+    id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    title text NOT NULL,
+    body text NOT NULL DEFAULT '',
+    status text NOT NULL DEFAULT 'offen',
+    created_at timestamptz NOT NULL DEFAULT now()
+);
+
+CREATE TABLE IF NOT EXISTS materials (
+    id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    name text NOT NULL UNIQUE,
+    brand text NOT NULL DEFAULT '',
+    material_type text NOT NULL DEFAULT '',
+    density double precision NOT NULL,
+    volumetric double precision NOT NULL,
+    volumetric_s1 double precision,
+    machines text NOT NULL DEFAULT 'beide',
+    price_per_kg double precision NOT NULL DEFAULT 0,
+    note text NOT NULL DEFAULT ''
+);
+
+ALTER TABLE spools ADD COLUMN IF NOT EXISTS colors jsonb NOT NULL DEFAULT '[]'::jsonb;
+ALTER TABLE spools ADD COLUMN IF NOT EXISTS ace_slot smallint;
+ALTER TABLE spools ADD COLUMN IF NOT EXISTS material_id bigint REFERENCES materials (id) ON DELETE SET NULL;
+ALTER TABLE spools ADD COLUMN IF NOT EXISTS chargen_nr text;
+ALTER TABLE spools ADD COLUMN IF NOT EXISTS hersteller_charge text NOT NULL DEFAULT '';
+ALTER TABLE spools ADD COLUMN IF NOT EXISTS code text;
+
+CREATE UNIQUE INDEX IF NOT EXISTS spools_chargen_nr ON spools (chargen_nr) WHERE chargen_nr IS NOT NULL AND chargen_nr <> '';
+CREATE UNIQUE INDEX IF NOT EXISTS spools_code ON spools (code) WHERE code IS NOT NULL AND code <> '';
+-- Ein ACE-Platz gehört höchstens einer Spule.
+CREATE UNIQUE INDEX IF NOT EXISTS spools_host_slot
+    ON spools (printer_host, ace_slot)
+    WHERE printer_host <> '' AND ace_slot IS NOT NULL;
+
+CREATE TABLE IF NOT EXISTS events (
+    id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    host text NOT NULL DEFAULT '',
+    printer text NOT NULL DEFAULT '',
+    kind text NOT NULL,
+    message text NOT NULL DEFAULT '',
+    filename text NOT NULL DEFAULT '',
+    created_at timestamptz NOT NULL DEFAULT now(),
+    read_at timestamptz
+);
+
+CREATE INDEX IF NOT EXISTS events_unread ON events (read_at, created_at DESC);
+
+CREATE TABLE IF NOT EXISTS print_queue (
+    id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    file_id bigint NOT NULL REFERENCES files (id) ON DELETE CASCADE,
+    host text NOT NULL DEFAULT '',
+    family text NOT NULL DEFAULT '',
+    priority integer NOT NULL DEFAULT 100,
+    status text NOT NULL DEFAULT 'waiting',
+    spool_id bigint REFERENCES spools (id) ON DELETE SET NULL,
+    ace_map jsonb NOT NULL DEFAULT '[]'::jsonb,
+    bed_leveling boolean NOT NULL DEFAULT false,
+    override_machine boolean NOT NULL DEFAULT false,
+    message text NOT NULL DEFAULT '',
+    steps jsonb NOT NULL DEFAULT '[]'::jsonb,
+    step_index integer NOT NULL DEFAULT 0,
+    repeat_total integer NOT NULL DEFAULT 1,
+    repeat_done integer NOT NULL DEFAULT 0,
+    phase text NOT NULL DEFAULT '',
+    phase_started_at timestamptz,
+    created_at timestamptz NOT NULL DEFAULT now(),
+    updated_at timestamptz NOT NULL DEFAULT now()
+);
+
+ALTER TABLE print_queue ADD COLUMN IF NOT EXISTS steps jsonb NOT NULL DEFAULT '[]'::jsonb;
+ALTER TABLE print_queue ADD COLUMN IF NOT EXISTS step_index integer NOT NULL DEFAULT 0;
+ALTER TABLE print_queue ADD COLUMN IF NOT EXISTS repeat_total integer NOT NULL DEFAULT 1;
+ALTER TABLE print_queue ADD COLUMN IF NOT EXISTS repeat_done integer NOT NULL DEFAULT 0;
+ALTER TABLE print_queue ADD COLUMN IF NOT EXISTS phase text NOT NULL DEFAULT '';
+ALTER TABLE print_queue ADD COLUMN IF NOT EXISTS phase_started_at timestamptz;
+
+CREATE INDEX IF NOT EXISTS print_queue_waiting ON print_queue (status, priority, id);
+CREATE INDEX IF NOT EXISTS print_queue_running_host ON print_queue (host, status) WHERE status = 'running';
+
+-- Nach dem Druck: Platte manuell quittieren, bevor „wenn frei“ den nächsten Job startet.
+CREATE TABLE IF NOT EXISTS bed_status (
+    host text PRIMARY KEY,
+    needs_clear boolean NOT NULL DEFAULT false,
+    cleared_at timestamptz,
+    message text NOT NULL DEFAULT ''
+);
+
+CREATE TABLE IF NOT EXISTS users (
+    id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    username text NOT NULL UNIQUE,
+    password_hash text NOT NULL,
+    role text NOT NULL DEFAULT 'operator',
+    active boolean NOT NULL DEFAULT true,
+    created_at timestamptz NOT NULL DEFAULT now(),
+    last_login timestamptz
+);
+
+CREATE TABLE IF NOT EXISTS api_tokens (
+    id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    user_id bigint NOT NULL REFERENCES users (id) ON DELETE CASCADE,
+    name text NOT NULL DEFAULT '',
+    token_hash text NOT NULL UNIQUE,
+    token_prefix text NOT NULL DEFAULT '',
+    role text NOT NULL DEFAULT 'operator',
+    created_at timestamptz NOT NULL DEFAULT now(),
+    last_used timestamptz,
+    revoked_at timestamptz,
+    expires_at timestamptz
+);
+
+CREATE INDEX IF NOT EXISTS api_tokens_user ON api_tokens (user_id) WHERE revoked_at IS NULL;
+
+-- OIDC später: Identitäten an lokale User binden.
+CREATE TABLE IF NOT EXISTS oauth_identities (
+    id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    user_id bigint NOT NULL REFERENCES users (id) ON DELETE CASCADE,
+    provider text NOT NULL,
+    subject text NOT NULL,
+    created_at timestamptz NOT NULL DEFAULT now(),
+    UNIQUE (provider, subject)
+);
+
+-- Druckbericht: Soll/Ist, Charge, Live-Fortschritt
+ALTER TABLE runs ADD COLUMN IF NOT EXISTS weight_planned_g double precision NOT NULL DEFAULT 0;
+ALTER TABLE runs ADD COLUMN IF NOT EXISTS weight_used_g double precision NOT NULL DEFAULT 0;
+ALTER TABLE runs ADD COLUMN IF NOT EXISTS weight_source text NOT NULL DEFAULT '';
+ALTER TABLE runs ADD COLUMN IF NOT EXISTS filament_used_mm double precision NOT NULL DEFAULT 0;
+ALTER TABLE runs ADD COLUMN IF NOT EXISTS filament_total_mm double precision NOT NULL DEFAULT 0;
+ALTER TABLE runs ADD COLUMN IF NOT EXISTS progress_last double precision NOT NULL DEFAULT 0;
+ALTER TABLE runs ADD COLUMN IF NOT EXISTS estimated_s double precision NOT NULL DEFAULT 0;
+ALTER TABLE runs ADD COLUMN IF NOT EXISTS chargen_nr text;
+ALTER TABLE runs ADD COLUMN IF NOT EXISTS message text NOT NULL DEFAULT '';
+ALTER TABLE runs ADD COLUMN IF NOT EXISTS objects jsonb NOT NULL DEFAULT '[]'::jsonb;
+
+CREATE UNIQUE INDEX IF NOT EXISTS runs_chargen_nr
+    ON runs (chargen_nr) WHERE chargen_nr IS NOT NULL AND chargen_nr <> '';
+
+ALTER TABLE events ADD COLUMN IF NOT EXISTS run_id bigint REFERENCES runs (id) ON DELETE SET NULL;
+CREATE INDEX IF NOT EXISTS events_run ON events (run_id) WHERE run_id IS NOT NULL;
+
+-- Abzug je Spule (Messwert oder Schätzwert)
+CREATE TABLE IF NOT EXISTS run_spools (
+    id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    run_id bigint NOT NULL REFERENCES runs (id) ON DELETE CASCADE,
+    spool_id bigint NOT NULL REFERENCES spools (id) ON DELETE RESTRICT,
+    ace_slot smallint,
+    weight_g double precision NOT NULL DEFAULT 0,
+    weight_planned_g double precision NOT NULL DEFAULT 0,
+    cost double precision NOT NULL DEFAULT 0,
+    is_estimate boolean NOT NULL DEFAULT false,
+    UNIQUE (run_id, spool_id, ace_slot)
+);
+
+CREATE INDEX IF NOT EXISTS run_spools_spool ON run_spools (spool_id);
+CREATE INDEX IF NOT EXISTS run_spools_run ON run_spools (run_id);
+
+-- Abschnitte bei Rollenwechsel mitten im Druck
+CREATE TABLE IF NOT EXISTS run_segments (
+    id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    run_id bigint NOT NULL REFERENCES runs (id) ON DELETE CASCADE,
+    spool_id bigint NOT NULL REFERENCES spools (id) ON DELETE RESTRICT,
+    ace_slot smallint,
+    mm_start double precision NOT NULL DEFAULT 0,
+    mm_end double precision,
+    created_at timestamptz NOT NULL DEFAULT now(),
+    closed_at timestamptz
+);
+
+CREATE INDEX IF NOT EXISTS run_segments_run ON run_segments (run_id);
+CREATE INDEX IF NOT EXISTS run_segments_open
+    ON run_segments (run_id) WHERE mm_end IS NULL;
+
+-- Temperatur / Fortschritt während des Drucks
+CREATE TABLE IF NOT EXISTS run_samples (
+    id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    run_id bigint NOT NULL REFERENCES runs (id) ON DELETE CASCADE,
+    sampled_at timestamptz NOT NULL DEFAULT now(),
+    nozzle double precision,
+    nozzle_target double precision,
+    bed double precision,
+    bed_target double precision,
+    chamber double precision,
+    fan double precision,
+    speed_factor double precision,
+    extrude_factor double precision,
+    layer integer,
+    progress double precision,
+    filament_used_mm double precision,
+    mmu_tool smallint,
+    nozzle_power double precision,
+    bed_power double precision
+);
+
+CREATE INDEX IF NOT EXISTS run_samples_run_time ON run_samples (run_id, sampled_at);
+
+ALTER TABLE run_samples ADD COLUMN IF NOT EXISTS nozzle_power double precision;
+ALTER TABLE run_samples ADD COLUMN IF NOT EXISTS bed_power double precision;
+
+-- Objekt-Chargen für Etiketten
+CREATE TABLE IF NOT EXISTS run_labels (
+    id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    run_id bigint NOT NULL REFERENCES runs (id) ON DELETE CASCADE,
+    object_name text NOT NULL DEFAULT '',
+    chargen_nr text NOT NULL,
+    excluded boolean NOT NULL DEFAULT false,
+    UNIQUE (run_id, object_name)
+);
+
+CREATE UNIQUE INDEX IF NOT EXISTS run_labels_chargen ON run_labels (chargen_nr);

grotti/migrations/002_indexes.sql

@@ -0,0 +1,6 @@
+-- Heiße Abfragepfade für Sends, Läufe, Dateien und Ereignisse.
+CREATE INDEX IF NOT EXISTS sends_host_filename ON sends (printer_host, filename);
+CREATE INDEX IF NOT EXISTS sends_host_file ON sends (printer_host, file_id);
+CREATE INDEX IF NOT EXISTS runs_host_state ON runs (printer_host, state);
+CREATE INDEX IF NOT EXISTS files_name ON files (name);
+CREATE INDEX IF NOT EXISTS events_host_kind_created ON events (host, kind, created_at DESC);

grotti/migrations/003_ausschuss.sql

@@ -0,0 +1,3 @@
+ALTER TABLE runs ADD COLUMN IF NOT EXISTS verdict_reason text NOT NULL DEFAULT '';
+ALTER TABLE runs ADD COLUMN IF NOT EXISTS pieces_ok int NOT NULL DEFAULT 0;
+ALTER TABLE runs ADD COLUMN IF NOT EXISTS pieces_bad int NOT NULL DEFAULT 0;

grotti/migrations/004_wartung.sql

@@ -0,0 +1,25 @@
+CREATE TABLE IF NOT EXISTS maintenance_parts (
+    id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    printer_host text NOT NULL,
+    part_key text NOT NULL,
+    label text NOT NULL DEFAULT '',
+    installed_at timestamptz NOT NULL DEFAULT now(),
+    life_hours double precision NOT NULL DEFAULT 0,
+    life_meters double precision NOT NULL DEFAULT 0,
+    note text NOT NULL DEFAULT ''
+);
+
+CREATE INDEX IF NOT EXISTS maintenance_parts_host ON maintenance_parts (printer_host);
+
+CREATE TABLE IF NOT EXISTS maintenance_log (
+    id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    printer_host text NOT NULL,
+    part_key text NOT NULL,
+    event text NOT NULL DEFAULT '',
+    hours_at double precision NOT NULL DEFAULT 0,
+    meters_at double precision NOT NULL DEFAULT 0,
+    created_at timestamptz NOT NULL DEFAULT now(),
+    note text NOT NULL DEFAULT ''
+);
+
+CREATE INDEX IF NOT EXISTS maintenance_log_host ON maintenance_log (printer_host, created_at DESC);

grotti/migrations/008_zeitfenster.sql

@@ -0,0 +1 @@
+ALTER TABLE printers ADD COLUMN IF NOT EXISTS start_window jsonb NOT NULL DEFAULT '{}'::jsonb;

grotti/migrations/009_auftraege.sql

@@ -0,0 +1,63 @@
+CREATE TABLE IF NOT EXISTS customers (
+    id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    name text NOT NULL,
+    email text NOT NULL DEFAULT '',
+    notes text NOT NULL DEFAULT '',
+    created_at timestamptz NOT NULL DEFAULT now()
+);
+
+CREATE TABLE IF NOT EXISTS orders (
+    id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    customer_id bigint REFERENCES customers (id) ON DELETE SET NULL,
+    title text NOT NULL,
+    status text NOT NULL DEFAULT 'idee',
+    due_at date,
+    notes text NOT NULL DEFAULT '',
+    quote jsonb NOT NULL DEFAULT '{}'::jsonb,
+    created_at timestamptz NOT NULL DEFAULT now(),
+    updated_at timestamptz NOT NULL DEFAULT now()
+);
+
+CREATE TABLE IF NOT EXISTS order_items (
+    id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    order_id bigint NOT NULL REFERENCES orders (id) ON DELETE CASCADE,
+    file_id bigint REFERENCES files (id) ON DELETE SET NULL,
+    qty int NOT NULL DEFAULT 1,
+    unit_price double precision NOT NULL DEFAULT 0,
+    material_type text NOT NULL DEFAULT '',
+    color text NOT NULL DEFAULT '',
+    done_ok int NOT NULL DEFAULT 0,
+    done_bad int NOT NULL DEFAULT 0,
+    note text NOT NULL DEFAULT ''
+);
+
+ALTER TABLE print_queue ADD COLUMN IF NOT EXISTS order_item_id bigint REFERENCES order_items (id) ON DELETE SET NULL;
+ALTER TABLE runs ADD COLUMN IF NOT EXISTS order_item_id bigint REFERENCES order_items (id) ON DELETE SET NULL;
+
+INSERT INTO orders (title, status, notes, quote, created_at)
+SELECT
+    p.name,
+    CASE p.status
+        WHEN 'bereit' THEN 'angebot'
+        WHEN 'druckt' THEN 'druckt'
+        WHEN 'fertig' THEN 'fertig'
+        ELSE 'idee'
+    END,
+    p.notes,
+    p.quote,
+    p.created_at
+FROM projects p
+WHERE NOT EXISTS (SELECT 1 FROM orders o WHERE o.title = p.name AND o.created_at = p.created_at);
+
+INSERT INTO orders (title, status, notes, created_at)
+SELECT
+    i.title,
+    CASE i.status WHEN 'erledigt' THEN 'fertig' ELSE 'idee' END,
+    i.body,
+    i.created_at
+FROM ideas i
+WHERE NOT EXISTS (SELECT 1 FROM orders o WHERE o.title = i.title AND o.created_at = i.created_at);
+
+CREATE INDEX IF NOT EXISTS orders_status ON orders (status, updated_at DESC);
+CREATE INDEX IF NOT EXISTS order_items_order ON order_items (order_id);
+CREATE INDEX IF NOT EXISTS runs_order_item ON runs (order_item_id) WHERE order_item_id IS NOT NULL;

grotti/moonraker.py

@@ -17,6 +17,16 @@ SLOT_CACHE = {}
 MESH_CACHE = {}
 OBJECT_CACHE = {}
 THUMB_RE_LIMIT = 180_000
+_CACHE_MAX = 128
+
+
+def _trim_cache(cache, max_items=_CACHE_MAX):
+    """Einfache Größenbegrenzung (älteste Keys zuerst bei dict-Reihenfolge)."""
+    while len(cache) > max_items:
+        try:
+            cache.pop(next(iter(cache)))
+        except StopIteration:
+            break
 
 
 def matrix_rows(points):
@@ -50,31 +60,6 @@ def _raw_matrix(points):
     return []
 
 
-def fetch_bed_mesh(host):
-    """Roh-Bettnetz von Moonraker (ohne UI-Spiegelung)."""
-    url = "http://%s/printer/objects/query?bed_mesh" % host
-    payload = fetch_json(url, timeout=10)
-    status = (payload.get("result") or {}).get("status") or {}
-    mesh = status.get("bed_mesh") or {}
-    matrix = _raw_matrix(mesh.get("probed_matrix"))
-    if not matrix:
-        matrix = _raw_matrix(mesh.get("mesh_matrix"))
-    mesh_min = mesh.get("mesh_min")
-    mesh_max = mesh.get("mesh_max")
-    if not (isinstance(mesh_min, (list, tuple)) and len(mesh_min) >= 2):
-        mesh_min = None
-    if not (isinstance(mesh_max, (list, tuple)) and len(mesh_max) >= 2):
-        mesh_max = None
-    if not matrix or mesh_min is None or mesh_max is None:
-        return None
-    return {
-        "matrix": matrix,
-        "mesh_min": [float(mesh_min[0]), float(mesh_min[1])],
-        "mesh_max": [float(mesh_max[0]), float(mesh_max[1])],
-        "profile": mesh.get("profile_name") or "",
-    }
-
-
 def store_mesh(host, shown, profile=""):
     if not shown:
         return
@@ -118,11 +103,6 @@ class PrinterError(Exception):
         self.message = message
 
 
-def is_timeout(exc):
-    text = (getattr(exc, "message", None) or str(exc) or "").lower()
-    return "zu lange nicht geantwortet" in text or "timed out" in text
-
-
 def fetch_json(url, timeout=4):
     request = urllib.request.Request(url, headers={"Accept": "application/json"})
     with urllib.request.urlopen(request, timeout=timeout) as response:
@@ -165,18 +145,53 @@ def post_json(host, path, payload, timeout=20):
         raise PrinterError("Der Drucker ist nicht erreichbar.") from exc
 
 
+def safe_upload_name(filename):
+    """Dateiname für Moonraker/Rinkhals/gklib — nur ASCII.
+
+    `filename` vs. `filename*` mit CJK führte zu Upload unter `_` und Start
+    unter dem Originalnamen → Fehler 10115 „gcode … not found“.
+    """
+    raw = (filename or "").replace("\\", "/")
+    parts = [part for part in raw.split("/") if part]
+    base = parts[-1] if parts else "job.gcode"
+    out = []
+    for ch in base:
+        if ch.isascii() and ch not in '"\\':
+            out.append(ch if ch not in " \t" else "_")
+        else:
+            out.append("_")
+    text = "".join(out)
+    while "__" in text:
+        text = text.replace("__", "_")
+    while "_-" in text or "-_" in text:
+        text = text.replace("_-", "-").replace("-_", "-")
+    text = text.strip("._-") or "job"
+    lower = text.lower()
+    if not (lower.endswith(".gcode") or lower.endswith(".gcode.3mf") or lower.endswith(".3mf") or lower.endswith(".acm")):
+        # Suffix vom Original behalten, falls nur der Stamm zerstört wurde
+        if base.lower().endswith(".gcode.3mf"):
+            text += ".gcode.3mf"
+        elif base.lower().endswith(".gcode"):
+            text += ".gcode"
+        elif base.lower().endswith(".acm"):
+            text += ".acm"
+    if parts:
+        parts[-1] = text
+        return "/".join(parts)
+    return text
+
+
 def multipart(filename, content):
     boundary = "----GrottiBoundary7f3a"
-    ascii_name = "".join(ch if ch.isascii() and ch not in '"\\' else "_" for ch in filename) or "job.gcode"
+    name = safe_upload_name(filename)
-    quoted = urllib.parse.quote(filename)
     fields = (
         "--%s\r\nContent-Disposition: form-data; name=\"root\"\r\n\r\ngcodes\r\n" % boundary
     ).encode("ascii")
     head = (
         "--%s\r\n"
-        "Content-Disposition: form-data; name=\"file\"; filename=\"%s\"; filename*=UTF-8''%s\r\n"
+        "Content-Disposition: form-data; name=\"file\"; filename=\"%s\"\r\n"
         "Content-Type: application/octet-stream\r\n\r\n"
-    ) % (boundary, ascii_name, quoted)
+    ) % (boundary, name)
     tail = ("\r\n--%s--\r\n" % boundary).encode("ascii")
     return boundary, fields + head.encode("ascii") + content + tail
 
@@ -217,6 +232,7 @@ def upload_timeout(size):
 
 
 def upload(host, filename, content, on_progress=None):
+    filename = safe_upload_name(filename)
     boundary, body = multipart(filename, content)
     stream = _UploadBody(body, on_progress=on_progress)
     request = urllib.request.Request(
@@ -236,7 +252,8 @@ def upload(host, filename, content, on_progress=None):
     except (urllib.error.URLError, TimeoutError) as exc:
         raise PrinterError("Hochladen ist fehlgeschlagen.") from exc
     item = (payload.get("result") or {}).get("item") or {}
-    return item.get("path") or filename
+    # Immer denselben ASCII-Namen nutzen, den wir hochgeladen haben
+    return safe_upload_name(item.get("path") or filename)
 
 
 def start_print(host, filename, bed_leveling=False, ams_settings=None):
@@ -336,6 +353,11 @@ def steuern(host, action, params=None):
     """Whitelist-Steuerung ohne freie Konsole."""
     params = params if isinstance(params, dict) else {}
     action = (action or "").strip()
+    # MCP und ältere Clients schicken "value" statt temp/percent.
+    if "temp" not in params and params.get("value") is not None and action in ("nozzle", "bed", "dryer_start"):
+        params = {**params, "temp": params["value"]}
+    if "percent" not in params and params.get("value") is not None and action in ("speed", "flow", "fan"):
+        params = {**params, "percent": params["value"]}
 
     def pct(key, default=100, lo=0, hi=200):
         try:
@@ -381,6 +403,64 @@ def steuern(host, action, params=None):
         if not re.fullmatch(r"[A-Za-z0-9._+\-]+", name):
             raise PrinterError("Ungültiger Objektname.")
         return gcode_script(host, "EXCLUDE_OBJECT NAME=%s" % name, timeout=20)
+    if action == "dryer_start":
+        try:
+            unit = int(params.get("id"))
+        except (TypeError, ValueError) as exc:
+            raise PrinterError("ACE-Box muss 0 oder 1 sein.") from exc
+        if unit not in (0, 1):
+            raise PrinterError("ACE-Box muss 0 oder 1 sein.")
+        try:
+            temp = int(round(float(params.get("temp"))))
+            duration = int(round(float(params.get("duration"))))
+        except (TypeError, ValueError) as exc:
+            raise PrinterError("Temperatur und Dauer müssen Zahlen sein.") from exc
+        if temp < 35 or temp > 65:
+            raise PrinterError("Trockner-Temperatur außerhalb 35–65 °C.")
+        if duration < 1 or duration > 720:
+            raise PrinterError("Trockner-Dauer außerhalb 1–720 Minuten.")
+        return post_json(
+            host,
+            "/server/filament_hub/start_drying",
+            {"id": unit, "temp": temp, "duration": duration, "fan_speed": 0},
+            timeout=15,
+        )
+    if action == "dryer_stop":
+        try:
+            unit = int(params.get("id"))
+        except (TypeError, ValueError) as exc:
+            raise PrinterError("ACE-Box muss 0 oder 1 sein.") from exc
+        if unit not in (0, 1):
+            raise PrinterError("ACE-Box muss 0 oder 1 sein.")
+        return post_json(host, "/server/filament_hub/stop_drying", {"id": unit}, timeout=15)
+    if action == "slot_setzen":
+        hub_id = _int_or_none(params.get("id"))
+        index = _int_or_none(params.get("index"))
+        if hub_id not in (0, 1) or index is None or index < 0 or index > 3:
+            raise PrinterError("ACE-Platz ungültig.")
+        material = str(params.get("type") or "").strip()
+        if not material:
+            raise PrinterError("Die Spule braucht eine Sorte.")
+        color = params.get("color")
+        if not isinstance(color, dict):
+            raise PrinterError("Die Spule braucht eine Farbe.")
+        try:
+            red = max(0, min(255, int(color.get("R"))))
+            green = max(0, min(255, int(color.get("G"))))
+            blue = max(0, min(255, int(color.get("B"))))
+        except (TypeError, ValueError) as exc:
+            raise PrinterError("Die Spule braucht eine Farbe.") from exc
+        return post_json(
+            host,
+            "/printer/filament_hub/set_filament_info",
+            {
+                "id": hub_id,
+                "index": index,
+                "type": material,
+                "color": {"R": red, "G": green, "B": blue},
+            },
+            timeout=15,
+        )
     if action == "firmware_restart":
         # GoKlipper/Rinkhals: FIRMWARE_RESTART deadlocked gklib (Rinkhals #32).
         raise PrinterError(
@@ -427,6 +507,7 @@ def metadata(host, path):
     except (urllib.error.URLError, TimeoutError, json.JSONDecodeError, KeyError):
         data = {}
     META_CACHE[key] = (now, data)
+    _trim_cache(META_CACHE)
     return data
 
 
@@ -453,9 +534,11 @@ def embedded_preview(host, path):
             text = response.read().decode("utf-8", "replace")
     except (urllib.error.URLError, TimeoutError):
         EMBEDDED[key] = None
+        _trim_cache(EMBEDDED)
         return None
     png = embedded_png(text)
     EMBEDDED[key] = png
+    _trim_cache(EMBEDDED)
     return png
 
 
@@ -563,6 +646,80 @@ def extract_slots(status):
     return found[:8]
 
 
+def _int_or_none(value):
+    if isinstance(value, bool) or not isinstance(value, (int, float)):
+        return None
+    return int(value)
+
+
+def extract_dryers(status):
+    """Echte ACE-Boxen aus mmu_machine (num_gates > 0), Dummy-Unit bleibt weg."""
+    machine = (status or {}).get("mmu_machine")
+    if not isinstance(machine, dict):
+        return []
+    found = []
+    for unit_id in (0, 1):
+        unit = machine.get("unit_%d" % unit_id)
+        if not isinstance(unit, dict):
+            continue
+        gates = _int_or_none(unit.get("num_gates"))
+        if gates is None or gates < 1:
+            continue
+        found.append({
+            "id": unit_id,
+            "status": str(unit.get("dryer_status") or "stop"),
+            "temp": _int_or_none(unit.get("dryer_temp")) or 0,
+            "target": _int_or_none(unit.get("dryer_target_temp")) or 0,
+            "remain": _int_or_none(unit.get("dryer_remaining")) or 0,
+            "humidity": _int_or_none(unit.get("dryer_humidity")) or 0,
+            "gates": gates,
+        })
+    return found
+
+
+def ace_hub_index(ace_slot):
+    """Grotti-Platz 1–8 → Moonraker id (0/1) und index in der Box (0–3)."""
+    try:
+        slot = int(ace_slot)
+    except (TypeError, ValueError) as exc:
+        raise PrinterError("ACE-Platz muss 1–8 sein.") from exc
+    if slot < 1 or slot > 8:
+        raise PrinterError("ACE-Platz muss 1–8 sein.")
+    return (slot - 1) // 4, (slot - 1) % 4
+
+
+def spool_rgb(spool):
+    """Erste Farbe der Spule als RGB-Dict für set_filament_info."""
+    colors = (spool or {}).get("colors") or []
+    if isinstance(colors, str):
+        try:
+            colors = json.loads(colors)
+        except (json.JSONDecodeError, TypeError):
+            colors = []
+    hex_value = ""
+    if isinstance(colors, list):
+        for item in colors:
+            if isinstance(item, dict) and item.get("hex"):
+                hex_value = str(item["hex"]).strip()
+                break
+            if isinstance(item, str) and item.strip():
+                hex_value = item.strip()
+                break
+    if not hex_value:
+        hex_value = str((spool or {}).get("color") or "").strip()
+    if hex_value.startswith("#"):
+        hex_value = hex_value[1:]
+    if len(hex_value) == 8:
+        hex_value = hex_value[:6]
+    if len(hex_value) != 6 or any(ch not in "0123456789abcdefABCDEF" for ch in hex_value):
+        return None
+    return {
+        "R": int(hex_value[0:2], 16),
+        "G": int(hex_value[2:4], 16),
+        "B": int(hex_value[4:6], 16),
+    }
+
+
 def slots(host, status=None):
     if status is not None:
         found = extract_slots(status)
@@ -607,6 +764,16 @@ def fan_values(status):
     return speed, rpm
 
 
+def _heater_power(entry):
+    """Klipper-Einschaltdauer 0…1 (ED), sonst None."""
+    if not isinstance(entry, dict):
+        return None
+    power = entry.get("power")
+    if isinstance(power, (int, float)) and not isinstance(power, bool):
+        return max(0.0, min(1.0, float(power)))
+    return None
+
+
 def _object_names(host):
     now = time.time()
     cached = OBJECT_CACHE.get(host)
@@ -831,6 +998,8 @@ def query(host):
     extras = []
     if "probe" in names:
         extras.append("probe")
+    if "mmu_machine" in names:
+        extras.append("mmu_machine")
     url = "http://%s/printer/objects/query?%s" % (host, "&".join([base] + extras))
     payload = fetch_json(url)
     status = payload["result"]["status"]
@@ -838,6 +1007,21 @@ def query(host):
     card = status.get("virtual_sdcard") or {}
     extruder = status.get("extruder") or {}
     bed = status.get("heater_bed") or {}
+    mmu = status.get("mmu") or {}
+    mmu_tool = mmu.get("tool")
+    if not isinstance(mmu_tool, (int, float)) or isinstance(mmu_tool, bool):
+        mmu_tool = mmu.get("gate")
+    if isinstance(mmu_tool, (int, float)) and not isinstance(mmu_tool, bool):
+        mmu_tool = int(mmu_tool)
+        if mmu_tool < 0:
+            mmu_tool = None
+    else:
+        mmu_tool = None
+    filament_used = stats.get("filament_used")
+    if not isinstance(filament_used, (int, float)) or isinstance(filament_used, bool):
+        filament_used = None
+    else:
+        filament_used = float(filament_used)
     raw_name = stats.get("filename") or ""
     filename = raw_name.replace("\\", "/").rsplit("/", 1)[-1] if raw_name else ""
     meta = metadata(host, raw_name) if raw_name else {}
@@ -892,12 +1076,21 @@ def query(host):
         "elapsed": stats.get("print_duration") or 0,
         "nozzle": extruder.get("temperature"),
         "nozzle_target": extruder.get("target"),
+        "nozzle_power": _heater_power(extruder),
         "bed": bed.get("temperature"),
         "bed_target": bed.get("target"),
+        "bed_power": _heater_power(bed),
         "chamber": chamber,
         "chamber_target": chamber_target,
+        "filament_used": filament_used,
+        "filament_total": meta.get("filament_total") or 0,
+        "mmu_tool": mmu_tool,
         "material": card.get("filament_type") or meta.get("filament_type") or "",
-        "weight": meta.get("filament_weight_total") or 0,
+        "weight": (
+            sum(float(x or 0) for x in meta["filament_weight_total"])
+            if isinstance(meta.get("filament_weight_total"), list)
+            else (meta.get("filament_weight_total") or 0)
+        ),
         "height": meta.get("object_height") or 0,
         "layer_height": meta.get("layer_height") or card.get("layer_height") or 0,
         "estimated": meta.get("estimated_time") or 0,
@@ -915,6 +1108,7 @@ def query(host):
         "speed_factor": speed_factor,
         "extrude_factor": extrude_factor,
         "slots": slots(host, status),
+        "dryers": extract_dryers(status),
         "exclude": exclude_status(host),
         "anycubic_task": _anycubic_task_field(host),
     }
@@ -941,7 +1135,9 @@ def snapshot(printers):
         }
         try:
             card.update(query(printer["host"]))
-        except (urllib.error.URLError, TimeoutError, json.JSONDecodeError, KeyError) as error:
+        except Exception as error:
+            # Auch RemoteDisconnected / IncompleteRead / ValueError — sonst fällt der ganze Tick aus.
+            print("snapshot %s: %s" % (printer.get("host"), error), flush=True)
             card.update({
                 "ok": False,
                 "state": "offline",
@@ -956,6 +1152,7 @@ def snapshot(printers):
                 "speed_factor": None,
                 "extrude_factor": None,
                 "slots": [],
+                "dryers": [],
                 "anycubic_task": None,
             })
             card.update(mesh_fields(printer["host"]))

grotti/notify.py

@@ -1,8 +1,9 @@
-"""Telegram-Benachrichtigungen (Bot API)."""
+"""Telegram- und ntfy-Benachrichtigungen."""
 
 from __future__ import annotations
 
 import json
+import threading
 import urllib.error
 import urllib.parse
 import urllib.request
@@ -43,11 +44,52 @@ def alert_enabled(cfg, kind):
     return bool(alerts.get(key, key not in DEFAULT_OFF))
 
 
-def record(conn, cfg, host, printer, kind, message, filename="", dedupe_s=60):
+def ntfy_configured(cfg):
-    """Ereignis immer speichern; Telegram nur einmal pro Art und Drucker im Zeitfenster."""
+    ntfy = (cfg or {}).get("ntfy") or {}
+    return bool(ntfy.get("enabled") and ntfy.get("topic"))
+
+
+def send_ntfy(cfg, text):
+    if not ntfy_configured(cfg):
+        return False
+    ntfy = cfg["ntfy"]
+    server = str(ntfy.get("server") or "https://ntfy.sh").rstrip("/")
+    topic = str(ntfy.get("topic") or "").strip()
+    if not topic:
+        return False
+    url = "%s/%s" % (server, urllib.parse.quote(topic, safe=""))
+    headers = {"Title": "Grotti", "Priority": "default"}
+    token = str(ntfy.get("token") or "").strip()
+    if token:
+        headers["Authorization"] = "Bearer %s" % token
+    request = urllib.request.Request(
+        url,
+        data=text[:4000].encode("utf-8"),
+        method="POST",
+        headers=headers,
+    )
+    try:
+        with urllib.request.urlopen(request, timeout=12) as response:
+            return 200 <= response.status < 300
+    except (urllib.error.URLError, TimeoutError, OSError):
+        return False
+
+
+def _push_alerts(cfg, message):
+    send_telegram(cfg, message)
+    send_ntfy(cfg, message)
+
+
+def record(conn, cfg, host, printer, kind, message, filename="", dedupe_s=60, run_id=None):
+    """Ereignis immer speichern; Telegram/ntfy nur einmal pro Art und Drucker im Zeitfenster."""
     from grotti import store
 
     recent = store.recent_event_kind(conn, host, kind, within_s=dedupe_s)
-    store.add_event(conn, host, printer, kind, message, filename or "")
+    store.add_event(conn, host, printer, kind, message, filename or "", run_id=run_id)
     if not recent and alert_enabled(cfg, kind):
-        send_telegram(cfg, message)
+        threading.Thread(
+            target=_push_alerts,
+            args=(cfg, message),
+            name="grotti-notify",
+            daemon=True,
+        ).start()

grotti/orders.py

@@ -0,0 +1,460 @@
+"""Aufträge, Kunden und Positionen."""
+
+from __future__ import annotations
+
+from datetime import date
+
+from psycopg.types.json import Json
+
+from grotti import store
+
+ORDER_STATUSES = frozenset({
+    "idee",
+    "angebot",
+    "bestaetigt",
+    "druckt",
+    "fertig",
+    "geliefert",
+    "bezahlt",
+})
+
+PROJECT_TO_ORDER = {
+    "idee": "idee",
+    "bereit": "angebot",
+    "druckt": "druckt",
+    "fertig": "fertig",
+}
+
+IDEA_TO_ORDER = {
+    "offen": "idee",
+    "spaeter": "idee",
+    "erledigt": "fertig",
+}
+
+
+def normalize_status(value):
+    s = (value or "idee").strip().lower()
+    if s not in ORDER_STATUSES:
+        raise ValueError("Unbekannter Auftragsstatus.")
+    return s
+
+
+def customer_out(row):
+    return {
+        "id": row["id"],
+        "name": row["name"],
+        "email": row.get("email") or "",
+        "notes": row.get("notes") or "",
+        "created_at": store.iso(row["created_at"]),
+    }
+
+
+def order_item_out(row, file_name=None):
+    return {
+        "id": row["id"],
+        "order_id": row["order_id"],
+        "file_id": row.get("file_id"),
+        "file_name": file_name or "",
+        "qty": int(row.get("qty") or 1),
+        "unit_price": float(row.get("unit_price") or 0),
+        "material_type": row.get("material_type") or "",
+        "color": row.get("color") or "",
+        "done_ok": int(row.get("done_ok") or 0),
+        "done_bad": int(row.get("done_bad") or 0),
+        "note": row.get("note") or "",
+    }
+
+
+def order_out(row, customer=None, items=None, progress=None):
+    data = {
+        "id": row["id"],
+        "customer_id": row.get("customer_id"),
+        "title": row["title"],
+        "status": row["status"],
+        "due_at": row["due_at"].isoformat() if row.get("due_at") else None,
+        "notes": row.get("notes") or "",
+        "quote": row.get("quote") or {},
+        "created_at": store.iso(row["created_at"]),
+        "updated_at": store.iso(row.get("updated_at") or row["created_at"]),
+    }
+    if customer is not None:
+        data["customer"] = customer
+    if items is not None:
+        data["items"] = items
+    if progress is not None:
+        data["progress"] = progress
+    return data
+
+
+def order_progress(conn, order_id):
+    row = conn.execute(
+        """
+        SELECT
+            COALESCE(SUM(qty), 0) AS target,
+            COALESCE(SUM(LEAST(done_ok, qty)), 0) AS done_ok,
+            COALESCE(SUM(done_bad), 0) AS done_bad
+        FROM order_items
+        WHERE order_id = %s
+        """,
+        (order_id,),
+    ).fetchone()
+    target = int(row["target"] or 0)
+    done = int(row["done_ok"] or 0)
+    return {
+        "target": target,
+        "done": done,
+        "done_bad": int(row["done_bad"] or 0),
+        "label": "%d von %d" % (done, target) if target else "0 von 0",
+    }
+
+
+def list_customers(conn):
+    rows = conn.execute(
+        "SELECT * FROM customers ORDER BY name, id"
+    ).fetchall()
+    return [customer_out(r) for r in rows]
+
+
+def get_customer(conn, customer_id):
+    row = conn.execute("SELECT * FROM customers WHERE id = %s", (customer_id,)).fetchone()
+    return customer_out(row) if row else None
+
+
+def create_customer(conn, name, email="", notes=""):
+    row = conn.execute(
+        """
+        INSERT INTO customers (name, email, notes)
+        VALUES (%s, %s, %s)
+        RETURNING *
+        """,
+        (name.strip(), (email or "").strip(), (notes or "").strip()),
+    ).fetchone()
+    return customer_out(row)
+
+
+def update_customer(conn, customer_id, fields):
+    sets = []
+    values = []
+    for key in ("name", "email", "notes"):
+        if key in fields:
+            sets.append("%s = %%s" % key)
+            values.append(fields[key])
+    if not sets:
+        return get_customer(conn, customer_id)
+    values.append(customer_id)
+    row = conn.execute(
+        "UPDATE customers SET %s WHERE id = %%s RETURNING *" % ", ".join(sets),
+        values,
+    ).fetchone()
+    return customer_out(row) if row else None
+
+
+def delete_customer(conn, customer_id):
+    row = conn.execute(
+        "DELETE FROM customers WHERE id = %s RETURNING id",
+        (customer_id,),
+    ).fetchone()
+    return bool(row)
+
+
+def list_orders(conn, status=None):
+    where = ""
+    params = []
+    if status:
+        where = "WHERE o.status = %s"
+        params.append(status)
+    rows = conn.execute(
+        """
+        SELECT o.*, c.name AS customer_name
+        FROM orders o
+        LEFT JOIN customers c ON c.id = o.customer_id
+        %s
+        ORDER BY o.updated_at DESC, o.id DESC
+        """ % where,
+        params,
+    ).fetchall()
+    out = []
+    for row in rows:
+        prog = order_progress(conn, row["id"])
+        customer = None
+        if row.get("customer_id"):
+            customer = {"id": row["customer_id"], "name": row.get("customer_name") or ""}
+        out.append(order_out(row, customer=customer, progress=prog))
+    return out
+
+
+def get_order(conn, order_id):
+    row = conn.execute(
+        """
+        SELECT o.*, c.name AS customer_name, c.email AS customer_email
+        FROM orders o
+        LEFT JOIN customers c ON c.id = o.customer_id
+        WHERE o.id = %s
+        """,
+        (order_id,),
+    ).fetchone()
+    if not row:
+        return None
+    items_rows = conn.execute(
+        """
+        SELECT oi.*, f.name AS file_name
+        FROM order_items oi
+        LEFT JOIN files f ON f.id = oi.file_id
+        WHERE oi.order_id = %s
+        ORDER BY oi.id
+        """,
+        (order_id,),
+    ).fetchall()
+    items = [order_item_out(r, r.get("file_name")) for r in items_rows]
+    customer = None
+    if row.get("customer_id"):
+        customer = {
+            "id": row["customer_id"],
+            "name": row.get("customer_name") or "",
+            "email": row.get("customer_email") or "",
+        }
+    return order_out(
+        row,
+        customer=customer,
+        items=items,
+        progress=order_progress(conn, order_id),
+    )
+
+
+def create_order(conn, title, status="idee", customer_id=None, due_at=None, notes="", quote=None):
+    status = normalize_status(status)
+    due = None
+    if due_at:
+        if isinstance(due_at, date):
+            due = due_at
+        else:
+            due = date.fromisoformat(str(due_at)[:10])
+    row = conn.execute(
+        """
+        INSERT INTO orders (customer_id, title, status, due_at, notes, quote)
+        VALUES (%s, %s, %s, %s, %s, %s)
+        RETURNING *
+        """,
+        (
+            customer_id,
+            title.strip(),
+            status,
+            due,
+            (notes or "").strip(),
+            Json(quote if isinstance(quote, dict) else {}),
+        ),
+    ).fetchone()
+    return get_order(conn, row["id"])
+
+
+def update_order(conn, order_id, fields):
+    sets = ["updated_at = now()"]
+    values = []
+    if "title" in fields:
+        sets.append("title = %s")
+        values.append(fields["title"])
+    if "status" in fields:
+        sets.append("status = %s")
+        values.append(normalize_status(fields["status"]))
+    if "customer_id" in fields:
+        sets.append("customer_id = %s")
+        values.append(fields["customer_id"])
+    if "due_at" in fields:
+        sets.append("due_at = %s")
+        due = fields["due_at"]
+        if due in ("", None):
+            values.append(None)
+        elif isinstance(due, date):
+            values.append(due)
+        else:
+            values.append(date.fromisoformat(str(due)[:10]))
+    if "notes" in fields:
+        sets.append("notes = %s")
+        values.append(fields["notes"] or "")
+    if "quote" in fields:
+        sets.append("quote = %s")
+        values.append(Json(fields["quote"] if isinstance(fields["quote"], dict) else {}))
+    if len(sets) <= 1:
+        return get_order(conn, order_id)
+    values.append(order_id)
+    row = conn.execute(
+        "UPDATE orders SET %s WHERE id = %%s RETURNING id" % ", ".join(sets),
+        values,
+    ).fetchone()
+    return get_order(conn, row["id"]) if row else None
+
+
+def delete_order(conn, order_id):
+    row = conn.execute("DELETE FROM orders WHERE id = %s RETURNING id", (order_id,)).fetchone()
+    return bool(row)
+
+
+def create_order_item(conn, order_id, file_id=None, qty=1, unit_price=0, material_type="", color="", note=""):
+    if not conn.execute("SELECT 1 FROM orders WHERE id = %s", (order_id,)).fetchone():
+        return None
+    try:
+        qty_n = max(1, int(qty))
+    except (TypeError, ValueError):
+        qty_n = 1
+    row = conn.execute(
+        """
+        INSERT INTO order_items (
+            order_id, file_id, qty, unit_price, material_type, color, note
+        )
+        VALUES (%s, %s, %s, %s, %s, %s, %s)
+        RETURNING *
+        """,
+        (
+            order_id,
+            file_id,
+            qty_n,
+            float(unit_price or 0),
+            (material_type or "").strip(),
+            (color or "").strip(),
+            (note or "").strip(),
+        ),
+    ).fetchone()
+    conn.execute("UPDATE orders SET updated_at = now() WHERE id = %s", (order_id,))
+    file_name = ""
+    if file_id:
+        f = store.get_file_row(conn, file_id)
+        file_name = (f or {}).get("name") or ""
+    return order_item_out(row, file_name)
+
+
+def get_order_item(conn, item_id):
+    row = conn.execute(
+        """
+        SELECT oi.*, f.name AS file_name
+        FROM order_items oi
+        LEFT JOIN files f ON f.id = oi.file_id
+        WHERE oi.id = %s
+        """,
+        (item_id,),
+    ).fetchone()
+    return order_item_out(row, row.get("file_name")) if row else None
+
+
+def update_order_item(conn, item_id, fields):
+    sets = []
+    values = []
+    for key in ("file_id", "material_type", "color", "note"):
+        if key in fields:
+            sets.append("%s = %%s" % key)
+            values.append(fields[key])
+    if "qty" in fields:
+        try:
+            qty_n = max(1, int(fields["qty"]))
+        except (TypeError, ValueError):
+            qty_n = 1
+        sets.append("qty = %s")
+        values.append(qty_n)
+    if "unit_price" in fields:
+        sets.append("unit_price = %s")
+        values.append(float(fields["unit_price"] or 0))
+    if not sets:
+        return get_order_item(conn, item_id)
+    values.append(item_id)
+    row = conn.execute(
+        """
+        UPDATE order_items SET %s
+        WHERE id = %%s
+        RETURNING order_id
+        """ % ", ".join(sets),
+        values,
+    ).fetchone()
+    if not row:
+        return None
+    conn.execute("UPDATE orders SET updated_at = now() WHERE id = %s", (row["order_id"],))
+    return get_order_item(conn, item_id)
+
+
+def delete_order_item(conn, item_id):
+    row = conn.execute(
+        "DELETE FROM order_items WHERE id = %s RETURNING order_id",
+        (item_id,),
+    ).fetchone()
+    if row:
+        conn.execute("UPDATE orders SET updated_at = now() WHERE id = %s", (row["order_id"],))
+    return bool(row)
+
+
+def apply_verdict_delta(conn, order_item_id, old_ok, old_bad, new_ok, new_bad):
+    """Erhöht done_ok/done_bad an der Position — nur Delta zum vorherigen Lauf-Stand."""
+    if not order_item_id:
+        return
+    d_ok = int(new_ok or 0) - int(old_ok or 0)
+    d_bad = int(new_bad or 0) - int(old_bad or 0)
+    if d_ok == 0 and d_bad == 0:
+        return
+    conn.execute(
+        """
+        UPDATE order_items
+        SET done_ok = done_ok + %s, done_bad = done_bad + %s
+        WHERE id = %s
+        """,
+        (d_ok, d_bad, order_item_id),
+    )
+    item = conn.execute(
+        "SELECT order_id FROM order_items WHERE id = %s",
+        (order_item_id,),
+    ).fetchone()
+    if item:
+        conn.execute("UPDATE orders SET updated_at = now() WHERE id = %s", (item["order_id"],))
+
+
+def enqueue_order_item(
+    conn,
+    order_id,
+    item_id,
+    host="",
+    family="",
+    priority=100,
+    spool_id=None,
+    ace_map=None,
+    bed_leveling=False,
+    override=False,
+):
+    item = conn.execute(
+        "SELECT * FROM order_items WHERE id = %s AND order_id = %s",
+        (item_id, order_id),
+    ).fetchone()
+    if not item:
+        raise ValueError("Position fehlt.")
+    file_id = item.get("file_id")
+    if not file_id:
+        raise ValueError("Position ohne Datei.")
+    if not store.get_file_row(conn, file_id):
+        raise ValueError("Datei fehlt.")
+    row = store.enqueue_print(
+        conn,
+        file_id,
+        host or "",
+        family or "",
+        priority,
+        spool_id,
+        ace_map if isinstance(ace_map, list) else [],
+        bool(bed_leveling),
+        bool(override),
+        order_item_id=item["id"],
+    )
+    conn.execute("UPDATE orders SET updated_at = now(), status = CASE WHEN status IN ('idee', 'angebot', 'bestaetigt') THEN 'druckt' ELSE status END WHERE id = %s", (order_id,))
+    return row
+
+
+def attach_order_item_to_live_run(conn, host, filename, order_item_id):
+    """Verknüpft gestarteten Lauf mit Auftragsposition."""
+    if not order_item_id or not host:
+        return
+    base = (filename or "").replace("\\", "/").rsplit("/", 1)[-1]
+    conn.execute(
+        """
+        UPDATE runs
+        SET order_item_id = COALESCE(order_item_id, %s)
+        WHERE printer_host = %s
+          AND (filename = %s OR filename LIKE %s)
+          AND state IN ('printing', 'paused', 'in_progress', 'completed')
+          AND ended_at IS NULL
+        """,
+        (order_item_id, host, base, "%/" + base),
+    )

grotti/print_queue.py

@@ -13,6 +13,14 @@ from datetime import datetime, timezone
 from grotti import eject, jobs, moonraker, notify, store
 from grotti.db import connect
 from grotti.errors import GrottiError
+from grotti import time_window
+
+WINDOW_WAIT_MSG = "Wartet auf Zeitfenster…"
+from grotti.events_bus import publish as publish_live
+
+
+def _notify_queue():
+    publish_live("queue", {})
 
 FREE = {"standby", "complete", "cancelled"}
 BUSY = {"printing", "paused", "heating", "error"}
@@ -20,6 +28,8 @@ BUSY = {"printing", "paused", "heating", "error"}
 KEEPALIVE_S = 120
 # Nach Start ohne print_active: Upload/MQTT/LeviQ brauchen Zeit, aber nicht ewig
 PRINT_START_TIMEOUT_S = 600
+# Einfacher Queue-Start ohne Worker (typisch Grotti-Neustart)
+SIMPLE_START_STUCK_S = 45
 
 
 def _ablauf_needs_motors(item):
@@ -120,6 +130,41 @@ class PrintQueueDispatcher:
             thread = self._workers.get(item_id)
             return bool(thread and thread.is_alive())
 
+    def _item_phase_age_s(self, item):
+        """Alter von phase_started_at, sonst updated_at (für hängende Starts nach Neustart)."""
+        started = item.get("phase_started_at")
+        if started:
+            if getattr(started, "tzinfo", None) is None:
+                started = started.replace(tzinfo=timezone.utc)
+            return (datetime.now(timezone.utc) - started).total_seconds()
+        updated = item.get("updated_at")
+        if updated:
+            if getattr(updated, "tzinfo", None) is None:
+                updated = updated.replace(tzinfo=timezone.utc)
+            return (datetime.now(timezone.utc) - updated).total_seconds()
+        return 0
+
+    def _fail_stuck_simple_start(self, conn, item, printer):
+        host = printer["host"]
+        store.update_print_queue(
+            conn,
+            item["id"],
+            {
+                "status": "error",
+                "message": "Start abgebrochen (Neustart)",
+                "phase": "",
+                "phase_started_at": None,
+            },
+        )
+        self._event(
+            conn,
+            host,
+            printer["name"],
+            "queue",
+            "%s: Start abgebrochen (Neustart)" % printer["name"],
+            item.get("filename") or "",
+        )
+
     def _spawn_worker(self, item_id, target, *args):
         with self._worker_lock:
             existing = self._workers.get(item_id)
@@ -129,7 +174,10 @@ class PrintQueueDispatcher:
             def run():
                 try:
                     target(*args)
+                except Exception as exc:
+                    print("Queue-Worker %s: %s" % (item_id, exc), flush=True)
                 finally:
+                    _notify_queue()
                     with self._worker_lock:
                         self._workers.pop(item_id, None)
 
@@ -143,6 +191,12 @@ class PrintQueueDispatcher:
             return True
 
     def tick(self):
+        try:
+            self._tick_once()
+        finally:
+            _notify_queue()
+
+    def _tick_once(self):
         with connect(self.database_url) as conn:
             printers = store.list_printers(conn)
             if not printers:
@@ -190,13 +244,36 @@ class PrintQueueDispatcher:
                     continue
                 if state not in FREE:
                     continue
-                if store.running_print_on_host(conn, host):
+                running = store.running_print_on_host(conn, host)
+                if running:
+                    if (
+                        not _has_ablauf(running)
+                        and (running.get("phase") or "").lower() == "starting"
+                        and not self._worker_busy(running["id"])
+                        and self._item_phase_age_s(running) > SIMPLE_START_STUCK_S
+                    ):
+                        self._fail_stuck_simple_start(conn, running, printer)
+                        conn.commit()
                     continue
                 if store.bed_needs_clear(conn, host):
                     continue
                 waiting = store.next_waiting_print(conn, host=host, family=printer.get("family") or "")
                 if not waiting:
                     continue
+                sw = printer.get("start_window") or {}
+                if sw and not time_window.allowed_now(sw):
+                    if (waiting.get("message") or "") != WINDOW_WAIT_MSG:
+                        store.update_print_queue(conn, waiting["id"], {"message": WINDOW_WAIT_MSG})
+                    continue
+                est_s = 0
+                if waiting.get("file_id"):
+                    file_row = store.get_file_row(conn, waiting["file_id"])
+                    if file_row:
+                        est_s = float(file_row.get("estimated_s") or 0)
+                if sw and not time_window.job_fits_overnight(sw, est_s):
+                    if (waiting.get("message") or "") != WINDOW_WAIT_MSG:
+                        store.update_print_queue(conn, waiting["id"], {"message": WINDOW_WAIT_MSG})
+                    continue
                 claimed = store.claim_print_queue(conn, waiting["id"], host)
                 if not claimed:
                     continue
@@ -255,6 +332,11 @@ class PrintQueueDispatcher:
                         bed_leveling=bed_leveling,
                     )
                     name = (result or {}).get("filename") or ""
+                    oid = item.get("order_item_id")
+                    if oid:
+                        from grotti import orders
+
+                        orders.attach_order_item_to_live_run(wconn, host, name, oid)
                     store.update_print_queue(
                         wconn,
                         item_id,
@@ -276,6 +358,7 @@ class PrintQueueDispatcher:
                     )
                     wconn.commit()
                 except GrottiError as exc:
+                    wconn.rollback()
                     store.update_print_queue(
                         wconn,
                         item_id,
@@ -291,6 +374,7 @@ class PrintQueueDispatcher:
                     )
                     wconn.commit()
                 except Exception as exc:
+                    wconn.rollback()
                     store.update_print_queue(
                         wconn,
                         item_id,
@@ -684,10 +768,12 @@ class PrintQueueDispatcher:
                     self._step_event(wconn, row, printer_copy, "druckt %s" % name)
                     wconn.commit()
                 except GrottiError as exc:
+                    wconn.rollback()
                     row = store.get_print_queue_row(wconn, item_id) or item
                     self._fail_ablauf(wconn, row, printer_copy, exc.message)
                     wconn.commit()
                 except Exception as exc:
+                    wconn.rollback()
                     row = store.get_print_queue_row(wconn, item_id) or item
                     self._fail_ablauf(wconn, row, printer_copy, str(exc) or "Druckstart fehlgeschlagen.")
                     wconn.commit()
@@ -742,6 +828,7 @@ class PrintQueueDispatcher:
         return state
 
     def _start_cool_step(self, conn, item, printer, step):
+        # TODO: _try_cool_park (bis 60 s G-code) blockiert tick() — ggf. in Worker auslagern.
         host = printer["host"]
         cool = eject.normalize_cool(step)
         try:
@@ -908,14 +995,17 @@ class PrintQueueDispatcher:
                     self._next_step(wconn, row, printer_copy, {"state": "standby", "ok": True})
                     wconn.commit()
                 except GrottiError as exc:
+                    wconn.rollback()
                     row = store.get_print_queue_row(wconn, item_id) or item
                     self._fail_ablauf(wconn, row, printer_copy, exc.message)
                     wconn.commit()
                 except moonraker.PrinterError as exc:
+                    wconn.rollback()
                     row = store.get_print_queue_row(wconn, item_id) or item
                     self._fail_ablauf(wconn, row, printer_copy, eject.explain_printer_error(exc.message))
                     wconn.commit()
                 except Exception as exc:
+                    wconn.rollback()
                     row = store.get_print_queue_row(wconn, item_id) or item
                     self._fail_ablauf(wconn, row, printer_copy, "Schieben: %s" % exc)
                     wconn.commit()
@@ -1013,14 +1103,17 @@ class PrintQueueDispatcher:
                     self._next_step(wconn, row, printer_copy, {"state": "standby", "ok": True})
                     wconn.commit()
                 except GrottiError as exc:
+                    wconn.rollback()
                     row = store.get_print_queue_row(wconn, item_id) or item
                     self._fail_ablauf(wconn, row, printer_copy, exc.message)
                     wconn.commit()
                 except moonraker.PrinterError as exc:
+                    wconn.rollback()
                     row = store.get_print_queue_row(wconn, item_id) or item
                     self._fail_ablauf(wconn, row, printer_copy, eject.explain_printer_error(exc.message))
                     wconn.commit()
                 except Exception as exc:
+                    wconn.rollback()
                     row = store.get_print_queue_row(wconn, item_id) or item
                     self._fail_ablauf(wconn, row, printer_copy, "Tasten: %s" % exc)
                     wconn.commit()

grotti/printers.py

@@ -1,7 +1,5 @@
 """Die Drucker: Familie aus dem Namen, die Liste selbst liegt in PostgreSQL."""
 
-import json
-
 FAMILY_LABELS = {"kobra_s1": "Kobra S1", "kobra_3": "Kobra 3"}
 
 
@@ -21,24 +19,3 @@ def family_from_text(text):
     if "kobra 3" in low or "kobra3" in low:
         return "kobra_3"
     return ""
-
-
-def load_printers(path):
-    rows = json.loads(path.read_text(encoding="utf-8"))
-    printers = []
-    for row in rows:
-        family = row.get("family") or family_from_name(row["name"])
-        printers.append({
-            "name": row["name"],
-            "host": row["host"],
-            "family": family,
-            "family_label": FAMILY_LABELS.get(family, family),
-        })
-    return printers
-
-
-def printer_by_host(path, host):
-    for printer in load_printers(path):
-        if printer["host"] == host:
-            return printer
-    return None

grotti/schema.sql

@@ -1,3 +1,6 @@
+-- Referenz-Schema. Laufende Migrationen liegen in grotti/migrations/*.sql
+-- (001_base.sql entspricht diesem Stand, danach nummerierte Änderungen).
+
 CREATE TABLE IF NOT EXISTS projects (
     id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
     name text NOT NULL,
@@ -215,3 +218,155 @@ CREATE TABLE IF NOT EXISTS oauth_identities (
     created_at timestamptz NOT NULL DEFAULT now(),
     UNIQUE (provider, subject)
 );
+
+-- Druckbericht: Soll/Ist, Charge, Live-Fortschritt
+ALTER TABLE runs ADD COLUMN IF NOT EXISTS weight_planned_g double precision NOT NULL DEFAULT 0;
+ALTER TABLE runs ADD COLUMN IF NOT EXISTS weight_used_g double precision NOT NULL DEFAULT 0;
+ALTER TABLE runs ADD COLUMN IF NOT EXISTS weight_source text NOT NULL DEFAULT '';
+ALTER TABLE runs ADD COLUMN IF NOT EXISTS filament_used_mm double precision NOT NULL DEFAULT 0;
+ALTER TABLE runs ADD COLUMN IF NOT EXISTS filament_total_mm double precision NOT NULL DEFAULT 0;
+ALTER TABLE runs ADD COLUMN IF NOT EXISTS progress_last double precision NOT NULL DEFAULT 0;
+ALTER TABLE runs ADD COLUMN IF NOT EXISTS estimated_s double precision NOT NULL DEFAULT 0;
+ALTER TABLE runs ADD COLUMN IF NOT EXISTS chargen_nr text;
+ALTER TABLE runs ADD COLUMN IF NOT EXISTS message text NOT NULL DEFAULT '';
+ALTER TABLE runs ADD COLUMN IF NOT EXISTS objects jsonb NOT NULL DEFAULT '[]'::jsonb;
+
+CREATE UNIQUE INDEX IF NOT EXISTS runs_chargen_nr
+    ON runs (chargen_nr) WHERE chargen_nr IS NOT NULL AND chargen_nr <> '';
+
+ALTER TABLE events ADD COLUMN IF NOT EXISTS run_id bigint REFERENCES runs (id) ON DELETE SET NULL;
+CREATE INDEX IF NOT EXISTS events_run ON events (run_id) WHERE run_id IS NOT NULL;
+
+-- Abzug je Spule (Messwert oder Schätzwert)
+CREATE TABLE IF NOT EXISTS run_spools (
+    id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    run_id bigint NOT NULL REFERENCES runs (id) ON DELETE CASCADE,
+    spool_id bigint NOT NULL REFERENCES spools (id) ON DELETE RESTRICT,
+    ace_slot smallint,
+    weight_g double precision NOT NULL DEFAULT 0,
+    weight_planned_g double precision NOT NULL DEFAULT 0,
+    cost double precision NOT NULL DEFAULT 0,
+    is_estimate boolean NOT NULL DEFAULT false,
+    UNIQUE (run_id, spool_id, ace_slot)
+);
+
+CREATE INDEX IF NOT EXISTS run_spools_spool ON run_spools (spool_id);
+CREATE INDEX IF NOT EXISTS run_spools_run ON run_spools (run_id);
+
+-- Abschnitte bei Rollenwechsel mitten im Druck
+CREATE TABLE IF NOT EXISTS run_segments (
+    id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    run_id bigint NOT NULL REFERENCES runs (id) ON DELETE CASCADE,
+    spool_id bigint NOT NULL REFERENCES spools (id) ON DELETE RESTRICT,
+    ace_slot smallint,
+    mm_start double precision NOT NULL DEFAULT 0,
+    mm_end double precision,
+    created_at timestamptz NOT NULL DEFAULT now(),
+    closed_at timestamptz
+);
+
+CREATE INDEX IF NOT EXISTS run_segments_run ON run_segments (run_id);
+CREATE INDEX IF NOT EXISTS run_segments_open
+    ON run_segments (run_id) WHERE mm_end IS NULL;
+
+-- Temperatur / Fortschritt während des Drucks
+CREATE TABLE IF NOT EXISTS run_samples (
+    id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    run_id bigint NOT NULL REFERENCES runs (id) ON DELETE CASCADE,
+    sampled_at timestamptz NOT NULL DEFAULT now(),
+    nozzle double precision,
+    nozzle_target double precision,
+    bed double precision,
+    bed_target double precision,
+    chamber double precision,
+    fan double precision,
+    speed_factor double precision,
+    extrude_factor double precision,
+    layer integer,
+    progress double precision,
+    filament_used_mm double precision,
+    mmu_tool smallint,
+    nozzle_power double precision,
+    bed_power double precision
+);
+
+CREATE INDEX IF NOT EXISTS run_samples_run_time ON run_samples (run_id, sampled_at);
+
+ALTER TABLE run_samples ADD COLUMN IF NOT EXISTS nozzle_power double precision;
+ALTER TABLE run_samples ADD COLUMN IF NOT EXISTS bed_power double precision;
+
+-- Objekt-Chargen für Etiketten
+CREATE TABLE IF NOT EXISTS run_labels (
+    id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    run_id bigint NOT NULL REFERENCES runs (id) ON DELETE CASCADE,
+    object_name text NOT NULL DEFAULT '',
+    chargen_nr text NOT NULL,
+    excluded boolean NOT NULL DEFAULT false,
+    UNIQUE (run_id, object_name)
+);
+
+CREATE UNIQUE INDEX IF NOT EXISTS run_labels_chargen ON run_labels (chargen_nr);
+
+ALTER TABLE runs ADD COLUMN IF NOT EXISTS verdict_reason text NOT NULL DEFAULT '';
+ALTER TABLE runs ADD COLUMN IF NOT EXISTS pieces_ok int NOT NULL DEFAULT 0;
+ALTER TABLE runs ADD COLUMN IF NOT EXISTS pieces_bad int NOT NULL DEFAULT 0;
+
+CREATE TABLE IF NOT EXISTS maintenance_parts (
+    id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    printer_host text NOT NULL,
+    part_key text NOT NULL,
+    label text NOT NULL DEFAULT '',
+    installed_at timestamptz NOT NULL DEFAULT now(),
+    life_hours double precision NOT NULL DEFAULT 0,
+    life_meters double precision NOT NULL DEFAULT 0,
+    note text NOT NULL DEFAULT ''
+);
+
+CREATE TABLE IF NOT EXISTS maintenance_log (
+    id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    printer_host text NOT NULL,
+    part_key text NOT NULL,
+    event text NOT NULL DEFAULT '',
+    hours_at double precision NOT NULL DEFAULT 0,
+    meters_at double precision NOT NULL DEFAULT 0,
+    created_at timestamptz NOT NULL DEFAULT now(),
+    note text NOT NULL DEFAULT ''
+);
+
+ALTER TABLE printers ADD COLUMN IF NOT EXISTS start_window jsonb NOT NULL DEFAULT '{}'::jsonb;
+
+CREATE TABLE IF NOT EXISTS customers (
+    id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    name text NOT NULL,
+    email text NOT NULL DEFAULT '',
+    notes text NOT NULL DEFAULT '',
+    created_at timestamptz NOT NULL DEFAULT now()
+);
+
+CREATE TABLE IF NOT EXISTS orders (
+    id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    customer_id bigint REFERENCES customers (id) ON DELETE SET NULL,
+    title text NOT NULL,
+    status text NOT NULL DEFAULT 'idee',
+    due_at date,
+    notes text NOT NULL DEFAULT '',
+    quote jsonb NOT NULL DEFAULT '{}'::jsonb,
+    created_at timestamptz NOT NULL DEFAULT now(),
+    updated_at timestamptz NOT NULL DEFAULT now()
+);
+
+CREATE TABLE IF NOT EXISTS order_items (
+    id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    order_id bigint NOT NULL REFERENCES orders (id) ON DELETE CASCADE,
+    file_id bigint REFERENCES files (id) ON DELETE SET NULL,
+    qty int NOT NULL DEFAULT 1,
+    unit_price double precision NOT NULL DEFAULT 0,
+    material_type text NOT NULL DEFAULT '',
+    color text NOT NULL DEFAULT '',
+    done_ok int NOT NULL DEFAULT 0,
+    done_bad int NOT NULL DEFAULT 0,
+    note text NOT NULL DEFAULT ''
+);
+
+ALTER TABLE print_queue ADD COLUMN IF NOT EXISTS order_item_id bigint REFERENCES order_items (id) ON DELETE SET NULL;
+ALTER TABLE runs ADD COLUMN IF NOT EXISTS order_item_id bigint REFERENCES order_items (id) ON DELETE SET NULL;

grotti/send_queue.py

@@ -11,18 +11,26 @@ from queue import Empty, Queue
 from grotti import jobs
 from grotti.db import connect
 from grotti.errors import GrottiError
+from grotti.events_bus import publish as publish_live
 
 
 class SendQueue:
     def __init__(self, database_url, cfg, workers=4):
         self.database_url = database_url
         self.cfg = cfg
+        self._workers_n = max(1, int(workers))
         self._lock = threading.Lock()
         self._pending = Queue()
         self._jobs = {}
         self._order = deque(maxlen=60)
         self._threads = []
-        for index in range(max(1, int(workers))):
+        self._stop = threading.Event()
+
+    def start(self):
+        if self._threads:
+            return
+        self._stop.clear()
+        for index in range(self._workers_n):
             thread = threading.Thread(
                 target=self._worker,
                 name="grotti-send-queue-%s" % (index + 1),
@@ -31,6 +39,14 @@ class SendQueue:
             thread.start()
             self._threads.append(thread)
 
+    def stop(self):
+        self._stop.set()
+        for _ in self._threads:
+            try:
+                self._pending.put_nowait(None)
+            except Exception:
+                pass
+
     def enqueue(
         self,
         conn,
@@ -82,9 +98,14 @@ class SendQueue:
         want_level = bool(bed_leveling)
         created = []
         for host in unique:
-            printer, row, chosen = jobs.prepare_send(conn, file_id, host, True, override, spool_id)
+            # Mapping zuerst, damit Materialprüfung die ACE-Spulen sieht.
+            mapping = ace_maps.get(host) or []
+            printer, row, chosen = jobs.prepare_send(
+                conn, file_id, host, True, override, spool_id, ace_map=mapping
+            )
+            if not mapping:
+                mapping = ace_maps.get(printer["name"]) or []
             job_id = uuid.uuid4().hex[:12]
-            mapping = ace_maps.get(host) or ace_maps.get(printer["name"]) or []
             job = {
                 "id": job_id,
                 "status": "pending",
@@ -141,13 +162,16 @@ class SendQueue:
                 return
             job.update(fields)
             job["updated_at"] = time.time()
+        publish_live("senden", {})
 
     def _worker(self):
-        while True:
+        while not self._stop.is_set():
             try:
                 item = self._pending.get(timeout=1)
             except Empty:
                 continue
+            if item is None:
+                break
             self._run(item)
 
     def _run(self, item):

grotti/time_window.py

@@ -0,0 +1,72 @@
+"""Start-Zeitfenster pro Drucker (Nachtdruck)."""
+
+from __future__ import annotations
+
+from datetime import datetime, time, timedelta
+
+
+def _parse_hm(text):
+    text = str(text or "").strip()
+    if not text or ":" not in text:
+        return None
+    parts = text.split(":", 1)
+    try:
+        h, m = int(parts[0]), int(parts[1])
+    except (TypeError, ValueError):
+        return None
+    if not (0 <= h <= 23 and 0 <= m <= 59):
+        return None
+    return time(h, m)
+
+
+def _in_segment(now_t, start_t, end_t):
+    if start_t <= end_t:
+        return start_t <= now_t <= end_t
+    return now_t >= start_t or now_t <= end_t
+
+
+def allowed_now(start_window, now=None):
+    """True wenn kein Fenster gesetzt oder die aktuelle Uhrzeit erlaubt ist."""
+    window = start_window or {}
+    if not isinstance(window, dict):
+        return True
+    allowed = window.get("allowed")
+    if not allowed:
+        return True
+    if not isinstance(allowed, list):
+        return True
+    now_dt = now if isinstance(now, datetime) else datetime.now().astimezone()
+    now_t = now_dt.timetz().replace(tzinfo=None)
+    for entry in allowed:
+        if not isinstance(entry, dict):
+            continue
+        start_t = _parse_hm(entry.get("from"))
+        end_t = _parse_hm(entry.get("to"))
+        if start_t is None or end_t is None:
+            continue
+        if _in_segment(now_t, start_t, end_t):
+            return True
+    return False
+
+
+def overnight_max_hours(start_window):
+    window = start_window or {}
+    if not isinstance(window, dict):
+        return None
+    try:
+        val = float(window.get("max_hours_overnight") or 0)
+    except (TypeError, ValueError):
+        return None
+    return val if val > 0 else None
+
+
+def job_fits_overnight(start_window, estimated_s, now=None):
+    """Optional: Job darf max_hours_overnight nicht überschreiten (nur wenn gesetzt)."""
+    max_h = overnight_max_hours(start_window)
+    if max_h is None:
+        return True
+    if not estimated_s or float(estimated_s) <= 0:
+        return True
+    if allowed_now(start_window, now=now):
+        return float(estimated_s) <= max_h * 3600
+    return True

grotti/toolpath.py

@@ -8,8 +8,8 @@ MOVE = re.compile(r"^(?:G0|G00|G1|G01)\b(.*)$", re.IGNORECASE)
 # Auch E.39 / Z.6 ohne führende Null (Anycubic/Prusa-Stil)
 AXIS = re.compile(r"([XYZE])\s*(-?\d*\.?\d+)", re.IGNORECASE)
 
-# Cache-/Viewer-Version: Segment-IDs, kein Sehnen-Thinning
+# Cache-/Viewer-Version: ganze Z-Höhen dicht behalten (keine gesprenkelten Stichproben)
-TOOLPATH_VERSION = 5
+TOOLPATH_VERSION = 8
 
 
 def _gcode_text(path: Path) -> str:
@@ -28,48 +28,89 @@ def _gcode_text(path: Path) -> str:
     return path.read_text(encoding="utf-8", errors="replace")
 
 
+def _z_key(z):
+    return round(float(z), 2)
+
+
 def _thin_points(points, layer_breaks, max_points):
-    """Extrusions-Segmente stichprobenartig behalten — nie Endpunkte einer Bahn
+    """Pfad kürzen, ohne Wände zu sprenkeln.
-    weglassen und die Nachbarn verbinden (sonst Sehnen statt Infill)."""
+
+    Strategie: ganze Z-Höhen (Druckschichten) vollständig behalten und nur
+    ganze Höhen weglassen. Stichproben entlang der Bahn erzeugen Lücken.
+    """
     if len(points) <= max_points:
         return points, layer_breaks
 
-    extrude_ends = [i for i in range(1, len(points)) if points[i][3]]
+    # Nur Z-Höhen mit Extrusion — Z-Hops allein zählen nicht
-    keep = {0, len(points) - 1}
+    z_order = []
-    for break_i in layer_breaks:
+    seen = set()
-        keep.add(max(0, min(len(points) - 1, break_i)))
+    for point in points:
-        if break_i > 0:
+        if not point[3]:
-            keep.add(break_i - 1)
+            continue
+        key = _z_key(point[2])
+        if key not in seen:
+            seen.add(key)
+            z_order.append(key)
+    if not z_order:
+        return points[:max_points], [0]
 
-    # Budget für Segment-Endpunkte (jedes Segment braucht 2 Indizes, viele teilen sich)
+    def keep_for_zs(keep_zs):
-    target_segs = max(2000, max_points // 2)
+        keep = {0, len(points) - 1}
-    step = max(1, (len(extrude_ends) + target_segs - 1) // target_segs)
+        for i, point in enumerate(points):
-    for j, end_i in enumerate(extrude_ends):
+            if _z_key(point[2]) in keep_zs:
-        if j % step == 0:
+                keep.add(i)
+                if i > 0:
+                    keep.add(i - 1)
+        return sorted(keep)
+
+    # So viele Höhen wie ins Budget passen (Schätzung über mittlere Punkte/Höhe)
+    per_z = max(1, len(points) // max(1, len(z_order)))
+    max_zs = max(2, min(len(z_order), max_points // per_z))
+    stride = max(1, (len(z_order) + max_zs - 1) // max_zs)
+
+    def pick_zs(step):
+        chosen = {z_order[0], z_order[-1]}
+        for i in range(0, len(z_order), step):
+            chosen.add(z_order[i])
+        return chosen
+
+    step = stride
+    ordered = keep_for_zs(pick_zs(step))
+    while len(ordered) > max_points and step < len(z_order):
+        step += 1
+        ordered = keep_for_zs(pick_zs(step))
+
+    # Immer noch zu groß: innerhalb behaltener Höhen jedes n-te Extrusionssegment
+    if len(ordered) > max_points:
+        keep_zs = pick_zs(step)
+        segs = [
+            i
+            for i in range(1, len(points))
+            if points[i][3] and _z_key(points[i][2]) in keep_zs
+        ]
+        budget = max(1, (max_points - 4) // 2)
+        seg_step = max(1, (len(segs) + budget - 1) // budget)
+        keep = {0, len(points) - 1}
+        for end_i in segs[::seg_step]:
             keep.add(end_i - 1)
             keep.add(end_i)
-
         ordered = sorted(keep)
-    # Falls immer noch zu groß: Segmente grober
-    if len(ordered) > max_points:
-        step2 = max(1, (len(ordered) + max_points - 1) // max_points)
-        ordered = ordered[::step2]
-        if ordered[-1] != len(points) - 1:
-            ordered.append(len(points) - 1)
 
     index_map = {old: new for new, old in enumerate(ordered)}
     kept = [points[i] for i in ordered]
-    new_breaks = sorted({
+    new_breaks = []
-        index_map[b]
+    last_z = None
-        for b in layer_breaks
+    for new_i, point in enumerate(kept):
-        if b in index_map
+        z = _z_key(point[2])
-    })
+        if last_z is None or abs(z - last_z) > 0.01:
+            new_breaks.append(new_i)
+            last_z = z
     if not new_breaks:
         new_breaks = [0]
     return kept, new_breaks
 
 
-def build_toolpath(path: Path, max_points=120000):
+def build_toolpath(path: Path, max_points=220000):
     text = _gcode_text(path)
     if not text:
         return {

grotti/usage.py

@@ -0,0 +1,164 @@
+"""Ist-Gramm aus Moonraker-Filamentzählern und Spulenanteilen."""
+
+from __future__ import annotations
+
+
+def as_float(value, default=0.0):
+    if value is None or value is False:
+        return float(default)
+    if isinstance(value, bool):
+        return float(default)
+    if isinstance(value, (int, float)):
+        return float(value)
+    if isinstance(value, str):
+        try:
+            return float(value.replace(",", ".").strip())
+        except ValueError:
+            return float(default)
+    if isinstance(value, list):
+        return sum(as_float(item) for item in value)
+    return float(default)
+
+
+def weight_list(metadata):
+    """Gramm je Farbe aus filament_weight_total (Zahl oder Liste)."""
+    raw = (metadata or {}).get("filament_weight_total")
+    if isinstance(raw, list):
+        return [as_float(item) for item in raw]
+    total = as_float(raw)
+    return [total] if total > 0 else []
+
+
+def weight_sum(metadata):
+    return sum(weight_list(metadata))
+
+
+def filament_total_mm(metadata, job=None):
+    raw = (metadata or {}).get("filament_total")
+    if raw in (None, "", [], 0, 0.0) and isinstance(job, dict):
+        raw = job.get("filament_total")
+    if isinstance(raw, list):
+        return sum(as_float(item) for item in raw)
+    return as_float(raw)
+
+
+def filament_used_mm(job):
+    if not isinstance(job, dict):
+        return 0.0
+    return as_float(job.get("filament_used"))
+
+
+def planned_shares(metadata, ace_map, target_count):
+    """Geplante Gramm je Ziel-Spule. Index entspricht targets-Reihenfolge."""
+    weights = weight_list(metadata)
+    mapping = ace_map if isinstance(ace_map, list) else []
+    if weights and mapping and len(weights) >= len(mapping) and target_count == len(mapping):
+        shares = []
+        for item in mapping:
+            paint = item.get("paint_index")
+            try:
+                index = int(paint)
+            except (TypeError, ValueError):
+                index = len(shares)
+            if 0 <= index < len(weights):
+                shares.append(weights[index])
+            else:
+                shares.append(0.0)
+        if sum(shares) > 0:
+            return shares
+    if weights and target_count == len(weights):
+        return list(weights)
+    total = sum(weights) if weights else 0.0
+    if target_count <= 0:
+        return []
+    if total <= 0:
+        return [0.0] * target_count
+    each = total / target_count
+    return [each] * target_count
+
+
+def resolve_used_grams(planned_g, used_mm, total_mm, progress, state, duration_s):
+    """
+    Ist-Gramm und Herkunft.
+    measured = filament_used, estimate = Fortschritt oder Soll, none = nichts.
+    """
+    planned = max(0.0, as_float(planned_g))
+    used = max(0.0, as_float(used_mm))
+    total = max(0.0, as_float(total_mm))
+    prog = max(0.0, min(1.0, as_float(progress)))
+    duration = max(0.0, as_float(duration_s))
+    terminal_abort = state in ("cancelled", "error", "interrupted")
+
+    if used > 0.5 and total > 0:
+        grams = planned * (used / total) if planned > 0 else 0.0
+        if grams <= 0 and used > 0.5:
+            # Länge ohne Gewicht: grob 1.24 g/cm³ · 1.75 mm → ~3 g/m
+            grams = used * 0.003
+        return max(0.0, grams), "measured"
+
+    if used > 0.5 and planned > 0 and total <= 0:
+        # Millimeter da, Gesamtlänge fehlt — Fortschritt oder Dauer helfen nicht
+        return used * 0.003, "estimate"
+
+    if terminal_abort and used <= 0.5:
+        if prog > 0.005 and planned > 0:
+            return planned * prog, "estimate"
+        return 0.0, "none"
+
+    if planned > 0:
+        if prog > 0.005 and prog < 0.995 and state != "completed":
+            return planned * prog, "estimate"
+        return planned, "estimate" if state == "completed" else "none"
+
+    return 0.0, "none"
+
+
+def split_used(used_g, planned_shares_list, multi):
+    """
+    Ist-Gramm auf Spulen verteilen.
+    multi=True → Anteile sind Schätzwerte, Summe bleibt used_g.
+    """
+    used = max(0.0, as_float(used_g))
+    shares = [max(0.0, as_float(s)) for s in (planned_shares_list or [])]
+    if not shares:
+        return [], False
+    total_plan = sum(shares)
+    if total_plan <= 0:
+        each = used / len(shares)
+        parts = [each] * len(shares)
+    else:
+        parts = [used * (share / total_plan) for share in shares]
+    is_estimate = bool(multi) and len(shares) > 1
+    return parts, is_estimate
+
+
+def segment_deltas(segments, final_mm):
+    """
+    Abschnitte mit mm_start/mm_end → Delta-mm je (spool_id, ace_slot).
+    Offene Abschnitte schließen auf final_mm.
+    """
+    end = max(0.0, as_float(final_mm))
+    totals = {}
+    order = []
+    for seg in segments or []:
+        start = max(0.0, as_float(seg.get("mm_start")))
+        raw_end = seg.get("mm_end")
+        stop = end if raw_end is None else max(0.0, as_float(raw_end))
+        delta = max(0.0, stop - start)
+        key = (seg.get("spool_id"), seg.get("ace_slot"))
+        if key not in totals:
+            totals[key] = 0.0
+            order.append(key)
+        totals[key] += delta
+    return [(key[0], key[1], totals[key]) for key in order]
+
+
+def grams_from_mm(delta_mm, total_mm, planned_g):
+    delta = max(0.0, as_float(delta_mm))
+    total = max(0.0, as_float(total_mm))
+    planned = max(0.0, as_float(planned_g))
+    if delta <= 0:
+        return 0.0
+    if total > 0 and planned > 0:
+        return planned * (delta / total)
+    return delta * 0.003

grotti/verdict.py

@@ -0,0 +1,33 @@
+"""Urteil und Ausschuss-Gründe beim Abräumen."""
+
+VERDICT_REASONS = frozenset({
+    "haftung",
+    "warping",
+    "spaghetti",
+    "layer_shift",
+    "verstopfung",
+    "farbe",
+    "sonstiges",
+})
+
+
+def normalize_abraeumen_verdict(verdict, verdict_reason, pieces_ok, pieces_bad):
+    v = (verdict or "").strip().lower()
+    if not v:
+        v = "gut"
+    if v not in ("gut", "ausschuss"):
+        raise ValueError("Urteil muss gut oder ausschuss sein.")
+    reason = (verdict_reason or "").strip().lower()
+    if v == "gut":
+        reason = ""
+        pieces_bad = 0
+    elif reason and reason not in VERDICT_REASONS:
+        raise ValueError("Unbekannter Ausschuss-Grund.")
+    try:
+        ok_n = max(0, int(pieces_ok or 0))
+        bad_n = max(0, int(pieces_bad or 0))
+    except (TypeError, ValueError) as exc:
+        raise ValueError("Stückzahlen müssen ganze Zahlen sein.") from exc
+    if v == "ausschuss" and bad_n <= 0 and ok_n <= 0:
+        bad_n = 1
+    return v, reason, ok_n, bad_n

grotti/version.py

@@ -1,3 +1,3 @@
 """Version von Grotti (SemVer). Bei jeder Änderung CHANGELOG.md mitführen."""
 
-__version__ = "2.2.1"
+__version__ = "3.0.0"

grotti/watcher.py

@@ -4,10 +4,15 @@ from __future__ import annotations
 
 import threading
 import time
+from datetime import datetime, timezone
 
-from grotti import moonraker, notify, store
+from grotti import moonraker, notify, store, usage
+from grotti.events_bus import publish as publish_live
 from grotti.db import connect
 
+SAMPLE_EVERY_S = 30
+SAMPLE_HEAT_S = 10
+
 
 class StateWatcher:
     def __init__(self, database_url, cfg, interval=10):
@@ -21,6 +26,7 @@ class StateWatcher:
         self._updated_at = 0.0
         self._stop = threading.Event()
         self._thread = None
+        self._last_sample = {}
 
     def start(self):
         if self._thread and self._thread.is_alive():
@@ -57,6 +63,7 @@ class StateWatcher:
             self._stop.wait(self.interval)
 
     def tick(self):
+        try:
             with connect(self.database_url) as conn:
                 printers = store.list_printers(conn)
                 if not printers:
@@ -69,6 +76,8 @@ class StateWatcher:
                 for live in lives:
                     self._one(conn, live)
                 conn.commit()
+        finally:
+            publish_live("drucker", {"at": datetime.now(timezone.utc).isoformat()})
 
     def _one(self, conn, live):
         host = live.get("host") or ""
@@ -79,6 +88,7 @@ class StateWatcher:
         prev = self._prev.get(host) or {}
         prev_state = (prev.get("state") or "").lower()
         prev_offline = bool(prev.get("offline"))
+        run_id = None
 
         if offline:
             hits = self._offline_hits.get(host, 0) + 1
@@ -89,16 +99,51 @@ class StateWatcher:
             return
 
         self._offline_hits[host] = 0
+        starting = (
+            bool(prev_state)
+            and prev_state not in ("printing", "paused")
+            and state == "printing"
+        )
+        if starting:
+            # Aufheiz-Proben behalten: Live-Lauf gleicher Datei nicht verwerfen
+            keep = None
+            existing = store.find_live_run(conn, host)
+            if existing:
+                same = (
+                    not filename
+                    or not existing.get("filename")
+                    or existing.get("filename") == filename
+                )
+                if same:
+                    keep = existing["id"]
+                    if filename and existing.get("filename") != filename:
+                        conn.execute(
+                            "UPDATE runs SET filename = %s WHERE id = %s",
+                            (filename, keep),
+                        )
+            store.abandon_live_runs(conn, host, keep_id=keep)
+        sample_now = self._should_sample(conn, host, live, state)
+        heating = sample_now and state not in ("printing", "paused")
+        if sample_now:
+            force = starting or (heating and not prev.get("heating"))
+            run = self._track_print(conn, host, name, filename, live, state, force_sample=force)
+            run_id = run["id"] if run else None
+
         if prev_offline:
-            self._emit(conn, host, name, "offline", "%s ist wieder erreichbar." % name, filename)
+            self._emit(conn, host, name, "offline", "%s ist wieder erreichbar." % name, filename, run_id)
-        elif prev_state and prev_state not in ("printing", "paused") and state == "printing":
+        elif starting:
-            self._emit(conn, host, name, "start", "%s druckt %s" % (name, filename or "einen Auftrag"), filename)
+            self._emit(
+                conn, host, name, "start",
+                "%s druckt %s" % (name, filename or "einen Auftrag"),
+                filename, run_id,
+            )
+            self._ensure_start_segment(conn, host, filename, live, run_id)
         elif prev_state == "printing" and state == "paused":
-            self._emit(conn, host, name, "start", "%s pausiert." % name, filename)
+            self._emit(conn, host, name, "start", "%s pausiert." % name, filename, run_id)
         elif prev_state == "paused" and state == "printing":
-            self._emit(conn, host, name, "start", "%s druckt weiter." % name, filename)
+            self._emit(conn, host, name, "start", "%s druckt weiter." % name, filename, run_id)
         elif prev_state == "printing" and state == "complete":
-            store.set_bed_needs_clear(conn, host, True, filename or "fertig")
+            store.ensure_bed_after_print(conn, host, message=filename or "fertig")
             self._emit(
                 conn,
                 host,
@@ -106,8 +151,8 @@ class StateWatcher:
                 "fertig",
                 "%s fertig: %s" % (name, filename or "Druck"),
                 filename,
+                run_id or (prev.get("run_id")),
             )
-            # Protokoll und Spulenabzug nicht erst nach manuellem Knopf
             try:
                 from grotti import jobs
 
@@ -115,7 +160,7 @@ class StateWatcher:
             except Exception as exc:
                 print("Watcher Abgleich %s: %s" % (host, exc), flush=True)
         elif prev_state in ("printing", "paused") and state in ("cancelled", "standby"):
-            store.set_bed_needs_clear(conn, host, True, filename or state)
+            store.ensure_bed_after_print(conn, host, message=filename or state)
             self._emit(
                 conn,
                 host,
@@ -123,10 +168,17 @@ class StateWatcher:
                 "abbruch",
                 "%s: Druck abgebrochen (%s)" % (name, filename or "ohne Datei"),
                 filename,
+                run_id or prev.get("run_id"),
             )
+            try:
+                from grotti import jobs
+
+                jobs.sync_history(conn, self.cfg)
+            except Exception as exc:
+                print("Watcher Abgleich %s: %s" % (host, exc), flush=True)
         elif state == "error" and prev_state != "error":
             if prev_state == "printing" or prev_state == "paused":
-                store.set_bed_needs_clear(conn, host, True, filename or "Fehler")
+                store.ensure_bed_after_print(conn, host, message=filename or "Fehler")
             msg = (live.get("message") or "").strip()
             if not msg or msg.lower() in ("error", "fehler"):
                 msg = "Ursache unbekannt — in Mainsail prüfen"
@@ -138,18 +190,19 @@ class StateWatcher:
                 "fehler",
                 "%s: %s · Heizung aus" % (name, msg),
                 filename,
+                run_id or prev.get("run_id"),
             )
+            try:
+                from grotti import jobs
+
+                jobs.sync_history(conn, self.cfg)
+            except Exception as exc:
+                print("Watcher Abgleich %s: %s" % (host, exc), flush=True)
         elif state == "error":
-            # Schon im Fehler, Heizer laufen noch → aus
             if (live.get("nozzle_target") or 0) > 0 or (live.get("bed_target") or 0) > 0:
                 self._cool_heaters(host)
-        elif state == "complete":
+        elif state == "complete" and (not prev_state or prev_offline):
-            known = conn.execute(
+            store.ensure_bed_after_print(conn, host, message=filename or "fertig")
-                "SELECT 1 FROM bed_status WHERE host = %s", (host,)
-            ).fetchone()
-            if not known:
-                # Erster Stand nach Deploy: fertiger Druck ohne Quittierung
-                store.set_bed_needs_clear(conn, host, True, filename or "fertig")
 
         spool_warn = bool(prev.get("spool_warn"))
         if state == "printing" and not spool_warn:
@@ -158,10 +211,150 @@ class StateWatcher:
         self._prev[host] = {
             "state": state,
             "offline": False,
+            "heating": heating,
             "filename": filename,
             "spool_warn": spool_warn if state == "printing" else False,
+            "run_id": run_id or (prev.get("run_id") if state in ("printing", "paused") or heating else None),
         }
 
+    def _should_sample(self, conn, host, live, state):
+        """Proben bei Druck/Pause und beim Aufheizen mit Bezug zu einem Auftrag."""
+        if state in ("printing", "paused"):
+            return True
+        if state in ("error", "offline", ""):
+            return False
+        nozzle_t = usage.as_float(live.get("nozzle_target"))
+        bed_t = usage.as_float(live.get("bed_target"))
+        if nozzle_t <= 40 and bed_t <= 30:
+            return False
+        if live.get("filename"):
+            return True
+        if store.running_print_on_host(conn, host):
+            return True
+        return bool(store.find_live_run(conn, host))
+
+    def _track_print(self, conn, host, name, filename, live, state, force_sample=False):
+        if not filename:
+            running = store.running_print_on_host(conn, host)
+            if running:
+                filename = running.get("filename") or ""
+            if not filename:
+                existing = store.find_live_run(conn, host)
+                if existing:
+                    filename = existing.get("filename") or ""
+        if not filename and state not in ("printing", "paused"):
+            return None
+        sent = store.latest_send(conn, host, filename) if filename else None
+        spool_id = (sent or {}).get("spool_id")
+        run = store.ensure_live_run(conn, host, name, filename, spool_id=spool_id)
+        objects = self._merge_objects(run.get("objects"), live.get("exclude"))
+        planned = usage.as_float(live.get("weight"))
+        total_mm = usage.as_float(live.get("filament_total"))
+        used_mm = usage.as_float(live.get("filament_used"))
+        progress = usage.as_float(live.get("progress"))
+        estimated = usage.as_float(live.get("estimated"))
+        store.update_run_progress(conn, run["id"], {
+            "state": "paused" if state == "paused" else "in_progress",
+            "progress_last": progress,
+            "filament_used_mm": used_mm,
+            "filament_total_mm": total_mm,
+            "weight_planned_g": planned,
+            "estimated_s": estimated,
+            "message": (live.get("message") or "") if state == "error" else "",
+            "objects": objects,
+            "duration_s": usage.as_float(live.get("elapsed")),
+        })
+        store.ensure_run_chargen(conn, run["id"])
+        self._maybe_sample(conn, run["id"], live, used_mm, force=force_sample)
+        return store.get_run_row(conn, run["id"])
+
+    def _merge_objects(self, current, exclude):
+        known = {}
+        if isinstance(current, str):
+            try:
+                import json
+                current = json.loads(current)
+            except Exception:
+                current = []
+        for item in current or []:
+            if isinstance(item, dict) and item.get("name"):
+                known[item["name"]] = {
+                    "name": item["name"],
+                    "excluded": bool(item.get("excluded")),
+                }
+        exclude = exclude or {}
+        excluded = set(exclude.get("excluded") or [])
+        for item in exclude.get("objects") or []:
+            name = (item.get("name") if isinstance(item, dict) else str(item)).strip()
+            if not name:
+                continue
+            known[name] = {"name": name, "excluded": name in excluded}
+        for name in excluded:
+            if name not in known:
+                known[name] = {"name": name, "excluded": True}
+        return list(known.values())
+
+    def _heat_gap(self, live):
+        """Abstand Ist↔Soll — während Aufheizen dichter samplen."""
+        gaps = []
+        for key, tkey in (("nozzle", "nozzle_target"), ("bed", "bed_target")):
+            target = usage.as_float(live.get(tkey))
+            if target <= 0:
+                continue
+            gaps.append(abs(usage.as_float(live.get(key)) - target))
+        return max(gaps) if gaps else 0
+
+    def _maybe_sample(self, conn, run_id, live, used_mm, force=False):
+        now = time.monotonic()
+        last = self._last_sample.get(run_id, 0)
+        interval = SAMPLE_HEAT_S if self._heat_gap(live) > 3 else SAMPLE_EVERY_S
+        if not force and now - last < interval:
+            return
+        self._last_sample[run_id] = now
+        store.add_run_sample(conn, run_id, {
+            "sampled_at": datetime.now(timezone.utc),
+            "nozzle": live.get("nozzle"),
+            "nozzle_target": live.get("nozzle_target"),
+            "bed": live.get("bed"),
+            "bed_target": live.get("bed_target"),
+            "chamber": live.get("chamber"),
+            "fan": live.get("fan"),
+            "speed_factor": live.get("speed_factor"),
+            "extrude_factor": live.get("extrude_factor"),
+            "layer": live.get("layer") or 0,
+            "progress": live.get("progress"),
+            "filament_used_mm": used_mm,
+            "mmu_tool": live.get("mmu_tool"),
+            "nozzle_power": live.get("nozzle_power"),
+            "bed_power": live.get("bed_power"),
+        })
+
+    def _ensure_start_segment(self, conn, host, filename, live, run_id):
+        """Nur externe Einzelspule: ein Abschnitt. ACE-Farben ohne Wechsel → Anteil-Split."""
+        if not run_id:
+            return
+        existing = store.list_run_segments(conn, run_id)
+        if existing:
+            return
+        sent = store.latest_send(conn, host, filename) if filename else None
+        ace = (sent or {}).get("ace_map") or []
+        from grotti import acm
+
+        mapping = acm.normalize_mapping(ace) if ace else []
+        if mapping:
+            return
+        used_mm = usage.as_float(live.get("filament_used"))
+        rows = conn.execute(
+            """
+            SELECT id FROM spools
+            WHERE printer_host = %s AND ace_slot IS NULL
+            ORDER BY id LIMIT 1
+            """,
+            (host,),
+        ).fetchone()
+        if rows:
+            store.open_segment(conn, run_id, rows["id"], None, used_mm)
+
     def _cool_heaters(self, host):
         try:
             moonraker.heaters_off(host)
@@ -173,25 +366,36 @@ class StateWatcher:
         if need <= 0 or not filename:
             return False
         sent = store.latest_send(conn, host, filename)
+        ace = (sent or {}).get("ace_map") or []
+        from grotti import jobs as grotti_jobs
+
+        at_host = grotti_jobs.resolve_spools_at_host(conn, host, ace)
+        if not at_host:
             spool_id = (sent or {}).get("spool_id")
-        if not spool_id:
+            if spool_id:
+                row = store.get_spool_row(conn, spool_id)
+                if row:
+                    at_host = [row]
+        if not at_host:
             return False
-        spool = store.get_spool_row(conn, spool_id)
+        left = sum(float(s.get("remaining_g") or 0) for s in at_host)
-        if not spool:
-            return False
-        left = float(spool["remaining_g"] or 0)
         if left + 0.5 >= need:
             return False
+        label = " / ".join(s.get("name") or "?" for s in at_host[:3])
         self._emit(
             conn,
             host,
             name,
             "spule",
-            "%s: Spule „%s“ hat nur %.0f g, Druck braucht %.0f g."
+            "%s: %s hat nur %.0f g, Druck braucht %.0f g."
-            % (name, spool["name"], left, need),
+            % (name, label, left, need),
             filename,
         )
         return True
 
-    def _emit(self, conn, host, printer, kind, message, filename):
+    def _emit(self, conn, host, printer, kind, message, filename, run_id=None):
-        notify.record(conn, self.cfg, host, printer, kind, message, filename, dedupe_s=60)
+        notify.record(
+            conn, self.cfg, host, printer, kind, message, filename,
+            dedupe_s=60, run_id=run_id,
+        )
+        publish_live("ereignis", {})

requirements-dev.txt

@@ -0,0 +1,2 @@
+-r requirements.txt
+pytest==9.1.1

requirements.txt

@@ -1,6 +1,8 @@
-flask>=3.1
+flask==3.1.3
-psycopg[binary]>=3.2
+psycopg[binary]==3.3.6
-paho-mqtt>=2.1
+psycopg-pool==3.3.3
-cryptography>=42
+paho-mqtt==2.1.0
-markdown>=3.6
+cryptography==50.0.2
+markdown==3.11.1
 mcp>=1.2
+waitress==3.0.2

scripts/__init__.py

@@ -0,0 +1 @@
+"""Hilfsskripte (Orca-Nachbearbeitung u. a.)."""

scripts/orca_senden.py

@@ -0,0 +1,332 @@
+#!/usr/bin/env python3
+"""Orca/Anycubic-Nachbearbeitung: G-code nach Grotti laden und Senden-Seite öffnen.
+
+Wenn SLIC3R_PP_OUTPUT_NAME unter dem Slice-Ordner liegt (auch Unterordner),
+wird die Datei dorthin geschrieben und der Watch neu gelesen — nicht als Upload.
+Sonst: Upload über die API.
+
+Config: data/orca-senden.json mit url und token (grt_…).
+"""
+
+from __future__ import annotations
+
+import json
+import mimetypes
+import os
+import shutil
+import sys
+import uuid
+import webbrowser
+from pathlib import Path
+from typing import Any
+from urllib.error import HTTPError, URLError
+from urllib.request import Request, urlopen
+
+REPO_ROOT = Path(__file__).resolve().parent.parent
+CONFIG_PATH = REPO_ROOT / "data" / "orca-senden.json"
+DEBUG_LOG = REPO_ROOT / "data" / "orca-senden-last.log"
+ALLOWED_SUFFIXES = (".gcode", ".gcode.3mf", ".3mf", ".gcode.pp", ".pp")
+
+
+def show_error(message: str) -> None:
+    text = str(message or "Unbekannter Fehler.")
+    if sys.platform == "win32":
+        try:
+            import ctypes
+
+            ctypes.windll.user32.MessageBoxW(0, text, "Grotti · Orca senden", 0x10)
+            return
+        except Exception:
+            pass
+    print(text, file=sys.stderr)
+
+
+def write_debug(argv: list[str], extra: str = "") -> None:
+    try:
+        DEBUG_LOG.parent.mkdir(parents=True, exist_ok=True)
+        lines = [
+            "argv:",
+            *[repr(item) for item in argv],
+            "",
+            "env:",
+            "SLIC3R_PP_HOST=%s" % (os.environ.get("SLIC3R_PP_HOST") or ""),
+            "SLIC3R_PP_OUTPUT_NAME=%s" % (os.environ.get("SLIC3R_PP_OUTPUT_NAME") or ""),
+            "",
+            extra,
+        ]
+        DEBUG_LOG.write_text("\n".join(lines), encoding="utf-8")
+    except OSError:
+        pass
+
+
+def load_config(path: Path = CONFIG_PATH) -> dict[str, str]:
+    if not path.is_file():
+        raise FileNotFoundError(
+            "Config fehlt: %s\nLege url und token (Einstellungen → API-Token) an." % path
+        )
+    try:
+        data = json.loads(path.read_text(encoding="utf-8"))
+    except (OSError, json.JSONDecodeError) as exc:
+        raise ValueError("Config ungültig: %s" % exc) from exc
+    if not isinstance(data, dict):
+        raise ValueError("Config muss ein JSON-Objekt sein.")
+    url = str(data.get("url") or "").strip().rstrip("/")
+    token = str(data.get("token") or "").strip()
+    if not url:
+        raise ValueError("Config: url fehlt (z. B. http://127.0.0.1:8770).")
+    if not token:
+        raise ValueError("Config: token fehlt (grt_… aus Einstellungen).")
+    return {"url": url, "token": token}
+
+
+def is_gcode_path(path: Path) -> bool:
+    name = path.name.lower()
+    return any(name.endswith(suffix) for suffix in ALLOWED_SUFFIXES)
+
+
+def output_target() -> Path | None:
+    env_name = (os.environ.get("SLIC3R_PP_OUTPUT_NAME") or "").strip().strip('"')
+    if not env_name:
+        return None
+    return Path(env_name)
+
+
+def upload_name_for(path: Path) -> str:
+    """Schöner Dateiname: SLIC3R_PP_OUTPUT_NAME, sonst Pfad ohne .pp."""
+    target = output_target()
+    if target is not None and target.name:
+        base = target.name
+        if not is_gcode_path(Path(base)) and path.name.lower().endswith(".pp"):
+            if not base.lower().endswith((".gcode", ".3mf")):
+                base = base + ".gcode"
+        return base
+    name = path.name
+    if name.lower().endswith(".pp"):
+        name = name[:-3]
+        if not name.lower().endswith((".gcode", ".3mf")):
+            name = name + ".gcode"
+    return name
+
+
+def find_gcode_arg(argv: list[str]) -> Path:
+    """Pfad aus argv oder SLIC3R_PP_OUTPUT_NAME; Temp-Dateien enden oft auf .pp."""
+    candidates: list[Path] = []
+    for raw in argv[1:]:
+        text = (raw or "").strip().strip('"')
+        if not text or text.startswith("-"):
+            continue
+        candidates.append(Path(text))
+    for candidate in reversed(candidates):
+        if not is_gcode_path(candidate):
+            continue
+        if candidate.is_file():
+            return candidate.resolve()
+        raise FileNotFoundError("Datei fehlt: %s" % candidate)
+    for candidate in reversed(candidates):
+        if candidate.is_file():
+            return candidate.resolve()
+    env_path = output_target()
+    if env_path is not None and env_path.is_file():
+        return env_path.resolve()
+    detail = "argv=%s" % (argv[1:] or ["(leer)"])
+    raise ValueError(
+        "Kein G-code-Pfad in den Argumenten.\n"
+        "G-code exportieren (nicht nur slicen).\n"
+        "%s\nDetails: data/orca-senden-last.log" % detail
+    )
+
+
+def send_page_url(base_url: str, file_id: int) -> str:
+    return "%s/dateien?file=%s" % (base_url.rstrip("/"), int(file_id))
+
+
+def _api_json(
+    base_url: str,
+    token: str,
+    method: str,
+    path: str,
+    *,
+    data: bytes | None = None,
+    headers: dict[str, str] | None = None,
+    timeout: float = 120.0,
+) -> Any:
+    hdrs = {
+        "Authorization": "Bearer %s" % token,
+        "Accept": "application/json",
+    }
+    if headers:
+        hdrs.update(headers)
+    request = Request(
+        "%s/api/v1%s" % (base_url.rstrip("/"), path),
+        data=data,
+        method=method,
+        headers=hdrs,
+    )
+    try:
+        with urlopen(request, timeout=timeout) as response:
+            raw = response.read()
+            if not raw:
+                return None
+            return json.loads(raw.decode("utf-8"))
+    except HTTPError as exc:
+        detail = ""
+        try:
+            detail = json.loads(exc.read().decode("utf-8")).get("error") or ""
+        except Exception:
+            detail = str(exc.reason or exc)
+        raise RuntimeError("API %s fehlgeschlagen (%s): %s" % (path, exc.code, detail or exc)) from exc
+    except URLError as exc:
+        raise RuntimeError(
+            "Grotti nicht erreichbar (%s). Läuft der Server?" % (exc.reason or exc)
+        ) from exc
+
+
+def fetch_watch_dir(base_url: str, token: str) -> Path | None:
+    payload = _api_json(base_url, token, "GET", "/einstellungen")
+    if not isinstance(payload, dict):
+        return None
+    text = str(payload.get("watch_dir") or "").strip()
+    if not text:
+        return None
+    path = Path(text)
+    return path if path.is_dir() else None
+
+
+def under_watch(watch_dir: Path, target: Path) -> tuple[str, str] | None:
+    """(folder_relativ, dateiname) wenn target unter watch_dir liegt."""
+    try:
+        rel = target.resolve().relative_to(watch_dir.resolve())
+    except ValueError:
+        return None
+    parts = rel.parts
+    if not parts:
+        return None
+    name = parts[-1]
+    folder = "/".join(parts[:-1]) if len(parts) > 1 else ""
+    return folder, name
+
+
+def place_in_watch(src: Path, dest: Path) -> Path:
+    dest.parent.mkdir(parents=True, exist_ok=True)
+    shutil.copyfile(str(src), str(dest))
+    return dest.resolve()
+
+
+def rescan(base_url: str, token: str) -> None:
+    _api_json(base_url, token, "POST", "/dateien/neu-lesen", data=b"{}", headers={"Content-Type": "application/json"})
+
+
+def find_library_file(base_url: str, token: str, *, name: str, folder: str) -> dict[str, Any] | None:
+    rows = _api_json(base_url, token, "GET", "/dateien")
+    if not isinstance(rows, list):
+        return None
+    folder_key = folder or ""
+    matches = []
+    for row in rows:
+        if not isinstance(row, dict):
+            continue
+        if (row.get("name") or "") != name:
+            continue
+        row_folder = row.get("folder") or ""
+        if row.get("source") == "watch":
+            if row_folder == folder_key or (not folder_key and row_folder in ("", None)):
+                matches.append(row)
+        elif not folder_key and row_folder in ("", "Upload"):
+            matches.append(row)
+    if not matches:
+        # Name reicht, neueste ID
+        matches = [row for row in rows if isinstance(row, dict) and (row.get("name") or "") == name]
+    if not matches:
+        return None
+    return max(matches, key=lambda row: int(row.get("id") or 0))
+
+
+def _multipart_body(filename: str, content: bytes, field: str = "file") -> tuple[bytes, str]:
+    boundary = "----GrottiOrca%s" % uuid.uuid4().hex
+    guessed = mimetypes.guess_type(filename)[0] or "application/octet-stream"
+    head = (
+        "--%s\r\n"
+        'Content-Disposition: form-data; name="%s"; filename="%s"\r\n'
+        "Content-Type: %s\r\n"
+        "\r\n"
+    ) % (boundary, field, filename.replace('"', ""), guessed)
+    tail = "\r\n--%s--\r\n" % boundary
+    body = head.encode("utf-8") + content + tail.encode("ascii")
+    return body, "multipart/form-data; boundary=%s" % boundary
+
+
+def upload_file(
+    base_url: str,
+    token: str,
+    path: Path,
+    filename: str | None = None,
+    timeout: float = 120.0,
+) -> dict[str, Any]:
+    content = path.read_bytes()
+    name = filename or upload_name_for(path)
+    body, content_type = _multipart_body(name, content)
+    payload = _api_json(
+        base_url,
+        token,
+        "POST",
+        "/dateien",
+        data=body,
+        headers={"Content-Type": content_type},
+        timeout=timeout,
+    )
+    if not isinstance(payload, dict) or "id" not in payload:
+        raise RuntimeError("Unerwartete Antwort vom Upload.")
+    return payload
+
+
+def open_browser(url: str) -> None:
+    webbrowser.open(url)
+
+
+def deliver(base_url: str, token: str, src: Path) -> int:
+    """Datei in Slice-Unterordner legen oder hochladen; gibt file_id zurück."""
+    watch = fetch_watch_dir(base_url, token)
+    target = output_target()
+    if watch is not None and target is not None:
+        placed = under_watch(watch, target)
+        if placed is not None:
+            folder, name = placed
+            dest = place_in_watch(src, target if target.suffix else target.with_suffix(".gcode"))
+            # Name aus Zielpfad, falls ohne Endung
+            if dest.name:
+                name = dest.name
+            rescan(base_url, token)
+            found = find_library_file(base_url, token, name=name, folder=folder)
+            if not found:
+                raise RuntimeError(
+                    "Datei liegt unter %s, aber Grotti kennt sie noch nicht. "
+                    "Unter Dateien „Ordner neu lesen“." % dest
+                )
+            return int(found["id"])
+    saved = upload_file(base_url, token, src, filename=upload_name_for(src))
+    return int(saved["id"])
+
+
+def main(argv: list[str] | None = None) -> int:
+    argv = list(sys.argv if argv is None else argv)
+    write_debug(argv)
+    try:
+        config = load_config()
+        path = find_gcode_arg(argv)
+        write_debug(
+            argv,
+            "chosen=%s\nupload_as=%s\noutput=%s"
+            % (path, upload_name_for(path), output_target() or ""),
+        )
+        file_id = deliver(config["url"], config["token"], path)
+        write_debug(argv, "file_id=%s" % file_id)
+        open_browser(send_page_url(config["url"], file_id))
+    except Exception as exc:
+        write_debug(argv, "error=%s" % exc)
+        show_error(str(exc))
+        return 1
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())

server.py

@@ -1,19 +1,26 @@
 """Grotti starten. Kern und Seiten liegen daneben."""
 
+import atexit
+import signal
 import threading
+import time
 
-from grotti import jobs, library, store
+from waitress import serve
+
+from grotti import db, jobs, library, store
 from grotti.config import load
-from grotti.db import connect, prepare
 from web.app import create_app
 
 
 def background(cfg):
     def work():
         try:
-            with connect(cfg["database_url"]) as conn:
+            with db.connect(cfg["database_url"]) as conn:
                 library.sync_watch(conn, cfg, force=False)
                 jobs.sync_history(conn, cfg)
+                deleted = db.prune_run_samples(conn, keep_days=90)
+                if deleted:
+                    print("Proben gelöscht: %s" % deleted, flush=True)
                 conn.commit()
         except Exception as exc:
             print("Abgleich: %s" % exc, flush=True)
@@ -21,19 +28,79 @@ def background(cfg):
     threading.Thread(target=work, name="grotti-abgleich", daemon=True).start()
 
 
+def _retention_loop(cfg, stop_event):
+    """Nächtlich alte run_samples entfernen."""
+    while not stop_event.wait(3600):
+        hour = time.localtime().tm_hour
+        if hour != 3:
+            continue
+        try:
+            with db.connect(cfg["database_url"]) as conn:
+                n = db.prune_run_samples(conn, keep_days=90)
+                conn.commit()
+                if n:
+                    print("Retention: %s Proben gelöscht." % n, flush=True)
+        except Exception as exc:
+            print("Retention: %s" % exc, flush=True)
+        stop_event.wait(3600)
+
+
 def main():
     cfg = load()
     cfg["data_dir"].mkdir(parents=True, exist_ok=True)
     (cfg["data_dir"] / "eingang").mkdir(exist_ok=True)
-    prepare(cfg["database_url"])
+    db.prepare(cfg["database_url"])
-    with connect(cfg["database_url"]) as conn:
+    db.init_pool(cfg["database_url"], min_size=2, max_size=16)
+    with db.connect(cfg["database_url"]) as conn:
         store.seed_printers(conn, cfg["printers_file"])
         store.seed_materials(conn)
         conn.commit()
+
     app = create_app(cfg)
+    watcher = app.extensions["watcher"]
+    dispatcher = app.extensions["print_queue"]
+    send_queue = app.extensions["send_queue"]
+    watcher.start()
+    dispatcher.start()
+    if hasattr(send_queue, "start"):
+        send_queue.start()
+
+    stop_event = threading.Event()
+    retention = threading.Thread(
+        target=_retention_loop,
+        args=(cfg, stop_event),
+        name="grotti-retention",
+        daemon=True,
+    )
+    retention.start()
     background(cfg)
+
+    def shutdown(*_args):
+        stop_event.set()
+        try:
+            watcher.stop()
+        except Exception:
+            pass
+        try:
+            dispatcher.stop()
+        except Exception:
+            pass
+        try:
+            if hasattr(send_queue, "stop"):
+                send_queue.stop()
+        except Exception:
+            pass
+        db.close_pool()
+
+    atexit.register(shutdown)
+    for sig in (signal.SIGINT, signal.SIGTERM):
+        try:
+            signal.signal(sig, lambda *_: shutdown())
+        except (ValueError, OSError):
+            pass
+
     print("Grotti: http://%s:%s/" % (cfg["host"], cfg["port"]), flush=True)
-    app.run(host=cfg["host"], port=cfg["port"], threaded=True, use_reloader=False)
+    serve(app, host=cfg["host"], port=cfg["port"], threads=16, channel_timeout=120)
 
 
 if __name__ == "__main__":

tests/test_ace_steer.py

@@ -0,0 +1,103 @@
+"""ACE-Trockner und Platz-Schreiben: Grenzen und Mapping."""
+
+import pytest
+
+from grotti.moonraker import (
+    PrinterError,
+    ace_hub_index,
+    extract_dryers,
+    spool_rgb,
+    steuern,
+)
+
+
+def test_extract_dryers_skips_dummy_unit():
+    status = {
+        "mmu_machine": {
+            "num_units": 1,
+            "unit_0": {
+                "num_gates": 4,
+                "dryer_status": "drying",
+                "dryer_temp": 44,
+                "dryer_target_temp": 45,
+                "dryer_remaining": 120,
+                "dryer_humidity": 20,
+            },
+            "unit_1": {
+                "num_gates": 0,
+                "dryer_status": "stop",
+            },
+        }
+    }
+    dryers = extract_dryers(status)
+    assert len(dryers) == 1
+    assert dryers[0]["id"] == 0
+    assert dryers[0]["status"] == "drying"
+    assert dryers[0]["target"] == 45
+    assert dryers[0]["remain"] == 120
+
+
+def test_extract_dryers_empty_without_machine():
+    assert extract_dryers({}) == []
+    assert extract_dryers({"mmu_machine": {}}) == []
+
+
+def test_ace_hub_index():
+    assert ace_hub_index(1) == (0, 0)
+    assert ace_hub_index(4) == (0, 3)
+    assert ace_hub_index(5) == (1, 0)
+    assert ace_hub_index(8) == (1, 3)
+    with pytest.raises(PrinterError):
+        ace_hub_index(0)
+    with pytest.raises(PrinterError):
+        ace_hub_index(9)
+
+
+def test_spool_rgb_from_colors():
+    assert spool_rgb({"colors": [{"name": "Blau", "hex": "#002B49"}]}) == {
+        "R": 0, "G": 43, "B": 73,
+    }
+    assert spool_rgb({"colors": [], "color": "Weiß"}) is None
+    assert spool_rgb({"color": "#ff00aa"}) == {"R": 255, "G": 0, "B": 170}
+
+
+def test_dryer_start_bounds(monkeypatch):
+    calls = []
+
+    def fake_post(host, path, payload, timeout=20):
+        calls.append((host, path, payload))
+        return {"result": "ok"}
+
+    monkeypatch.setattr("grotti.moonraker.post_json", fake_post)
+    steuern("10.10.1.60", "dryer_start", {"id": 0, "temp": 45, "duration": 240})
+    assert calls[0][1] == "/server/filament_hub/start_drying"
+    assert calls[0][2]["fan_speed"] == 0
+
+    with pytest.raises(PrinterError):
+        steuern("10.10.1.60", "dryer_start", {"id": 2, "temp": 45, "duration": 60})
+    with pytest.raises(PrinterError):
+        steuern("10.10.1.60", "dryer_start", {"id": 0, "temp": 20, "duration": 60})
+    with pytest.raises(PrinterError):
+        steuern("10.10.1.60", "dryer_start", {"id": 0, "temp": 45, "duration": 0})
+
+
+def test_slot_setzen_payload(monkeypatch):
+    calls = []
+
+    def fake_post(host, path, payload, timeout=20):
+        calls.append((host, path, payload))
+        return {"result": "ok"}
+
+    monkeypatch.setattr("grotti.moonraker.post_json", fake_post)
+    steuern(
+        "10.10.1.60",
+        "slot_setzen",
+        {"id": 0, "index": 2, "type": "PLA", "color": {"R": 1, "G": 2, "B": 3}},
+    )
+    assert calls[0][1] == "/printer/filament_hub/set_filament_info"
+    assert calls[0][2] == {
+        "id": 0,
+        "index": 2,
+        "type": "PLA",
+        "color": {"R": 1, "G": 2, "B": 3},
+    }

tests/test_ausschuss.py

@@ -0,0 +1,27 @@
+"""Urteil beim Abräumen (reine Hilfslogik ohne DB)."""
+
+import unittest
+
+from grotti.verdict import normalize_abraeumen_verdict
+
+
+class AbraeumenVerdictTests(unittest.TestCase):
+    def test_gut_clears_reason(self):
+        v, reason, ok, bad = normalize_abraeumen_verdict("gut", "warping", 2, 1)
+        self.assertEqual(v, "gut")
+        self.assertEqual(reason, "")
+        self.assertEqual(bad, 0)
+
+    def test_ausschuss_requires_known_reason_if_set(self):
+        with self.assertRaises(ValueError):
+            normalize_abraeumen_verdict("ausschuss", "xyz", 0, 0)
+
+    def test_ausschuss_defaults_bad_piece(self):
+        v, reason, ok, bad = normalize_abraeumen_verdict("ausschuss", "spaghetti", 0, 0)
+        self.assertEqual(v, "ausschuss")
+        self.assertEqual(reason, "spaghetti")
+        self.assertEqual(bad, 1)
+
+
+if __name__ == "__main__":
+    unittest.main()

tests/test_bedarf.py

@@ -0,0 +1,70 @@
+"""Filament-Bedarf aus Queue und Spulen."""
+
+import unittest
+from unittest.mock import MagicMock
+
+
+from grotti.bedarf import compute
+
+
+class BedarfTests(unittest.TestCase):
+    def _rows(self, *lists):
+        mocks = []
+        for rows in lists:
+            m = MagicMock()
+            m.fetchall.return_value = rows
+            mocks.append(m)
+        return mocks
+
+    def test_shortfall_when_queue_exceeds_stock(self):
+        conn = MagicMock()
+        conn.execute.side_effect = self._rows(
+            [
+                {
+                    "id": 1,
+                    "spool_id": 10,
+                    "repeat_total": 2,
+                    "repeat_done": 0,
+                    "weight_g": 50.0,
+                    "file_material": "PLA",
+                    "file_color": "Schwarz",
+                    "spool_material": "PLA",
+                    "spool_color": "Schwarz",
+                },
+            ],
+            [
+                {"material_type": "PLA", "color": "Schwarz", "remaining_g": 40.0},
+            ],
+        )
+        out = compute(conn)
+        self.assertEqual(len(out["needed"]), 1)
+        self.assertAlmostEqual(out["needed"][0]["weight_g"], 100.0)
+        self.assertEqual(len(out["shortfall"]), 1)
+        self.assertAlmostEqual(out["shortfall"][0]["shortfall_g"], 60.0)
+
+    def test_no_shortfall_when_enough_filament(self):
+        conn = MagicMock()
+        conn.execute.side_effect = self._rows(
+            [
+                {
+                    "id": 1,
+                    "spool_id": None,
+                    "repeat_total": 1,
+                    "repeat_done": 0,
+                    "weight_g": 20.0,
+                    "file_material": "PETG",
+                    "file_color": "",
+                    "spool_material": None,
+                    "spool_color": None,
+                },
+            ],
+            [
+                {"material_type": "PETG", "color": "", "remaining_g": 500.0},
+            ],
+        )
+        out = compute(conn)
+        self.assertEqual(out["shortfall"], [])
+
+
+if __name__ == "__main__":
+    unittest.main()

tests/test_config_watch.py

@@ -0,0 +1,49 @@
+"""Slice-Ordner (watch_dir) in config."""
+
+from __future__ import annotations
+
+import tempfile
+import unittest
+from pathlib import Path
+from unittest.mock import patch
+
+from grotti import config
+from grotti.errors import GrottiError
+
+
+class WatchDirTest(unittest.TestCase):
+    def test_empty(self):
+        path, stored = config.parse_watch_dir("")
+        self.assertIsNone(path)
+        self.assertEqual(stored, "")
+
+    def test_relative_under_root(self):
+        with tempfile.TemporaryDirectory() as tmp:
+            root = Path(tmp)
+            target = root / "slice"
+            target.mkdir()
+            with patch.object(config, "ROOT", root):
+                path, stored = config.parse_watch_dir("slice", create=False)
+            self.assertEqual(path, target.resolve())
+            self.assertEqual(stored, "slice")
+
+    def test_create(self):
+        with tempfile.TemporaryDirectory() as tmp:
+            root = Path(tmp)
+            with patch.object(config, "ROOT", root):
+                path, stored = config.parse_watch_dir("slice", create=True)
+            self.assertTrue(path.is_dir())
+            self.assertEqual(stored, "slice")
+
+    def test_file_rejected(self):
+        with tempfile.TemporaryDirectory() as tmp:
+            root = Path(tmp)
+            file_path = root / "not-a-dir"
+            file_path.write_text("x", encoding="utf-8")
+            with patch.object(config, "ROOT", root):
+                with self.assertRaises(GrottiError):
+                    config.parse_watch_dir(str(file_path), create=False)
+
+
+if __name__ == "__main__":
+    unittest.main()

tests/test_cost_ed.py

@@ -0,0 +1,51 @@
+"""ED-Stromschätzung."""
+
+import unittest
+from datetime import datetime, timezone
+
+from grotti.cost import energy_estimate
+
+
+def sample_at(offset_s, np=None, bp=None):
+    base = datetime(2026, 10, 17, 15, 0, tzinfo=timezone.utc).timestamp()
+    at = datetime.fromtimestamp(base + offset_s, tz=timezone.utc).isoformat()
+    return {"sampled_at": at, "nozzle_power": np, "bed_power": bp}
+
+
+class EnergyEdTests(unittest.TestCase):
+    def test_flat_without_heater_watts(self):
+        est = energy_estimate(3600, {"watts": 100, "euro_per_kwh": 0.5}, [
+            sample_at(0, np=1.0, bp=1.0),
+            sample_at(1800, np=1.0, bp=1.0),
+        ])
+        self.assertEqual(est["source"], "flat")
+        self.assertAlmostEqual(est["kwh"], 0.1)
+        self.assertAlmostEqual(est["cost"], 0.05)
+
+    def test_ed_caps_long_gaps(self):
+        # 60 min Lücke → nur 90 s werden gezählt
+        samples = [sample_at(0, np=0.5, bp=0.0), sample_at(3600, np=0.5, bp=0.0)]
+        est = energy_estimate(3600, {
+            "watts": 0,
+            "nozzle_watts": 100,
+            "bed_watts": 0,
+            "euro_per_kwh": 1,
+        }, samples)
+        self.assertEqual(est["source"], "ed")
+        self.assertAlmostEqual(est["print_kwh"], (100 * 0.5 / 1000) * (90 / 3600), places=6)
+
+    def test_ed_dense_samples_full_hour(self):
+        samples = [sample_at(i * 30, np=1.0, bp=0.0) for i in range(0, 121)]
+        est = energy_estimate(3600, {
+            "watts": 0,
+            "nozzle_watts": 200,
+            "bed_watts": 0,
+            "euro_per_kwh": 2,
+        }, samples)
+        self.assertEqual(est["source"], "ed")
+        self.assertAlmostEqual(est["print_kwh"], 0.2, places=3)
+        self.assertAlmostEqual(est["cost"], 0.4, places=3)
+
+
+if __name__ == "__main__":
+    unittest.main()

tests/test_eject.py

@@ -61,7 +61,10 @@ class EjectTests(unittest.TestCase):
         self.assertFalse(eject.cool_parked({"position": [250, 220, 50]}, before_z=10, lift_mm=40))
 
     def test_sweep_does_not_lower_before_back(self):
-        script = eject.sweep_probe_height_script(eject.normalize_sweep({}))
+        sweep = eject.normalize_sweep({})
+        back = eject.sweep_go_back_high_script(sweep)
+        lower = eject.sweep_lower_to_push_script(sweep)
+        script = back + "\n" + lower
         # Y hinten (Default 250) vor dem Senken auf z_push
         y_idx = script.find("Y250")
         z_push_idx = script.find("Z2.00")

tests/test_jobs_spool.py

@@ -0,0 +1,65 @@
+"""Unit-Tests für Spulenwahl und Steuer-Parameter-Aliase."""
+
+import unittest
+from datetime import datetime, timedelta, timezone
+from unittest.mock import MagicMock, patch
+
+from grotti import jobs
+from grotti import moonraker
+
+
+class ChooseSpoolTests(unittest.TestCase):
+    def test_rejects_spool_created_after_print_end(self):
+        end = datetime(2026, 10, 1, 12, 0, tzinfo=timezone.utc)
+        old = {
+            "id": 1,
+            "material_type": "PLA",
+            "created_at": end - timedelta(days=2),
+        }
+        new = {
+            "id": 2,
+            "material_type": "PLA",
+            "created_at": end + timedelta(hours=1),
+        }
+        conn = MagicMock()
+        with patch("grotti.jobs.store.spools_for_printer", return_value=[new]):
+            with patch("grotti.jobs.store.get_spool_row", return_value=new):
+                self.assertIsNone(jobs.choose_spool(conn, "h", "PLA", 2, ended_at=end))
+        with patch("grotti.jobs.store.spools_for_printer", return_value=[old]):
+            self.assertEqual(jobs.choose_spool(conn, "h", "PLA", None, ended_at=end)["id"], 1)
+
+    def test_spool_valid_for_end_naive(self):
+        end = datetime(2026, 10, 1, 12, 0, tzinfo=timezone.utc)
+        spool = {"created_at": datetime(2026, 9, 1, 12, 0)}
+        self.assertTrue(jobs._spool_valid_for_end(spool, end))
+
+
+class SteuernAliasTests(unittest.TestCase):
+    @patch("grotti.moonraker.gcode_script", return_value={"ok": True})
+    def test_value_alias_for_temp(self, gcode):
+        moonraker.steuern("10.0.0.1", "nozzle", {"value": 210})
+        script = gcode.call_args[0][1]
+        self.assertIn("TARGET=210.0", script)
+
+    @patch("grotti.moonraker.gcode_script", return_value={"ok": True})
+    def test_percent_alias_for_speed(self, gcode):
+        moonraker.steuern("10.0.0.1", "speed", {"value": 120})
+        script = gcode.call_args[0][1]
+        self.assertIn("M220 S120", script)
+
+
+class HostValidationTests(unittest.TestCase):
+    def test_validate_printer_host(self):
+        from web.app import validate_printer_host
+        from grotti.errors import GrottiError
+
+        self.assertEqual(validate_printer_host("10.10.1.60"), "10.10.1.60")
+        self.assertEqual(validate_printer_host("kobra.local:80"), "kobra.local:80")
+        with self.assertRaises(GrottiError):
+            validate_printer_host("http://evil")
+        with self.assertRaises(GrottiError):
+            validate_printer_host("../etc/passwd")
+
+
+if __name__ == "__main__":
+    unittest.main()

tests/test_library_safe.py

@@ -0,0 +1,21 @@
+"""Pfad- und Dateiname-Grenzen."""
+
+import unittest
+
+from grotti import library
+from grotti.errors import GrottiError
+
+
+class SafeFilenameTests(unittest.TestCase):
+    def test_rejects_dotdot(self):
+        self.assertEqual(library.safe_filename(".."), "datei.gcode")
+        self.assertEqual(library.safe_filename("../x.gcode"), "x.gcode")
+
+    def test_normalize_folder_blocks_escape(self):
+        with self.assertRaises(GrottiError):
+            library.normalize_folder("../secret")
+        self.assertEqual(library.normalize_folder("Gridfinity/A"), "Gridfinity/A")
+
+
+if __name__ == "__main__":
+    unittest.main()

tests/test_maintenance.py

@@ -0,0 +1,28 @@
+"""Wartungs-Zähler."""
+
+import unittest
+from unittest.mock import MagicMock
+
+from grotti.maintenance import counters_for_host
+
+
+class MaintenanceCounterTests(unittest.TestCase):
+    def test_counters_from_aggregate_row(self):
+        conn = MagicMock()
+        conn.execute.return_value.fetchone.return_value = {
+            "duration_s": 7200.0,
+            "meters": 150000.0,
+            "runs": 12,
+        }
+        out = counters_for_host(conn, "10.0.0.1")
+        self.assertAlmostEqual(out["hours"], 2.0)
+        self.assertAlmostEqual(out["meters"], 150000.0)
+        self.assertEqual(out["runs"], 12)
+
+    def test_empty_host(self):
+        out = counters_for_host(MagicMock(), "")
+        self.assertEqual(out, {"hours": 0.0, "meters": 0.0, "runs": 0})
+
+
+if __name__ == "__main__":
+    unittest.main()

tests/test_moonraker_names.py

@@ -0,0 +1,25 @@
+"""ASCII-Dateinamen für Moonraker-Upload."""
+
+from grotti.moonraker import multipart, safe_upload_name
+
+
+def test_safe_upload_strips_cjk():
+    name = "1015-2159-虎钳式强力夹子_plate(01)_PLA_0.2_53m57s.gcode"
+    safe = safe_upload_name(name)
+    assert safe.isascii()
+    assert safe.endswith(".gcode")
+    assert "plate(01)" in safe
+    assert "虎" not in safe
+
+
+def test_multipart_single_ascii_filename():
+    name = "模型_test.gcode"
+    _boundary, body = multipart(name, b"G28\n")
+    head = body.split(b"G28\n", 1)[0].decode("ascii")
+    assert "filename*=UTF-8" not in head
+    assert 'filename="test.gcode"' in head
+    assert all(ord(ch) < 128 for ch in head)
+
+
+def test_safe_upload_preserves_path():
+    assert safe_upload_name("subdir/foo.gcode") == "subdir/foo.gcode"

tests/test_orca_senden.py

@@ -0,0 +1,103 @@
+"""Tests für scripts/orca_senden.py ohne laufenden Server."""
+
+from __future__ import annotations
+
+import json
+import sys
+import tempfile
+import unittest
+from pathlib import Path
+from unittest.mock import patch
+
+ROOT = Path(__file__).resolve().parents[1]
+if str(ROOT) not in sys.path:
+    sys.path.insert(0, str(ROOT))
+
+from scripts import orca_senden as orca  # noqa: E402
+
+
+class OrcaSendenHelpersTest(unittest.TestCase):
+    def test_send_page_url(self):
+        self.assertEqual(
+            orca.send_page_url("http://127.0.0.1:8770/", 42),
+            "http://127.0.0.1:8770/dateien?file=42",
+        )
+
+    def test_find_gcode_arg_last_matching(self):
+        with tempfile.TemporaryDirectory() as tmp:
+            folder = Path(tmp)
+            gcode = folder / "teil.gcode"
+            gcode.write_text("; test\n", encoding="utf-8")
+            other = folder / "notes.txt"
+            other.write_text("x", encoding="utf-8")
+            found = orca.find_gcode_arg(["orca_senden.py", str(other), str(gcode)])
+            self.assertEqual(found, gcode.resolve())
+
+    def test_find_gcode_arg_pp_temp(self):
+        with tempfile.TemporaryDirectory() as tmp:
+            pp = Path(tmp) / "platte.gcode.pp"
+            pp.write_text("; temp\n", encoding="utf-8")
+            found = orca.find_gcode_arg(["orca_senden.py", str(pp)])
+            self.assertEqual(found, pp.resolve())
+            self.assertEqual(orca.upload_name_for(pp), "platte.gcode")
+
+    def test_under_watch_subfolder(self):
+        with tempfile.TemporaryDirectory() as tmp:
+            root = Path(tmp) / "slice"
+            dest = root / "Gridfinity" / "teil.gcode"
+            dest.parent.mkdir(parents=True)
+            dest.write_text("; x\n", encoding="utf-8")
+            placed = orca.under_watch(root, dest)
+            self.assertEqual(placed, ("Gridfinity", "teil.gcode"))
+
+    def test_under_watch_outside(self):
+        with tempfile.TemporaryDirectory() as tmp:
+            root = Path(tmp) / "slice"
+            root.mkdir()
+            other = Path(tmp) / "elsewhere" / "teil.gcode"
+            other.parent.mkdir()
+            other.write_text("; x\n", encoding="utf-8")
+            self.assertIsNone(orca.under_watch(root, other))
+
+    def test_find_gcode_arg_missing(self):
+        with self.assertRaises(ValueError):
+            orca.find_gcode_arg(["orca_senden.py"])
+
+    def test_find_gcode_arg_file_gone(self):
+        with self.assertRaises(FileNotFoundError):
+            orca.find_gcode_arg(["orca_senden.py", r"C:\gibt\es\nicht.gcode"])
+
+    def test_load_config_ok(self):
+        with tempfile.TemporaryDirectory() as tmp:
+            path = Path(tmp) / "orca-senden.json"
+            path.write_text(
+                json.dumps({"url": "http://127.0.0.1:8770/", "token": "grt_abc"}),
+                encoding="utf-8",
+            )
+            cfg = orca.load_config(path)
+            self.assertEqual(cfg["url"], "http://127.0.0.1:8770")
+            self.assertEqual(cfg["token"], "grt_abc")
+
+    def test_load_config_missing(self):
+        with tempfile.TemporaryDirectory() as tmp:
+            path = Path(tmp) / "fehlt.json"
+            with self.assertRaises(FileNotFoundError):
+                orca.load_config(path)
+
+    def test_load_config_empty_token(self):
+        with tempfile.TemporaryDirectory() as tmp:
+            path = Path(tmp) / "orca-senden.json"
+            path.write_text(json.dumps({"url": "http://x", "token": ""}), encoding="utf-8")
+            with self.assertRaises(ValueError):
+                orca.load_config(path)
+
+    def test_main_shows_error_without_config(self):
+        with patch.object(orca, "CONFIG_PATH", Path("/tmp/does-not-exist-orca.json")):
+            with patch.object(orca, "show_error") as shown:
+                code = orca.main(["orca_senden.py", "x.gcode"])
+        self.assertEqual(code, 1)
+        self.assertTrue(shown.called)
+
+
+if __name__ == "__main__":
+    unittest.main()

tests/test_orders.py

@@ -0,0 +1,48 @@
+"""Auftrags-Status und Angebotsrechnung."""
+
+import unittest
+from pathlib import Path
+import sys
+
+ROOT = Path(__file__).resolve().parents[1]
+sys.path.insert(0, str(ROOT))
+
+from grotti.cost import offer_from_file
+from grotti.orders import ORDER_STATUSES, IDEA_TO_ORDER, PROJECT_TO_ORDER, normalize_status
+
+
+class OrderStatusTests(unittest.TestCase):
+    def test_all_status_values(self):
+        for s in ("idee", "angebot", "bestaetigt", "druckt", "fertig", "geliefert", "bezahlt"):
+            self.assertIn(s, ORDER_STATUSES)
+            self.assertEqual(normalize_status(s), s)
+
+    def test_unknown_status(self):
+        with self.assertRaises(ValueError):
+            normalize_status("xyz")
+
+    def test_legacy_project_map(self):
+        self.assertEqual(PROJECT_TO_ORDER["bereit"], "angebot")
+        self.assertEqual(PROJECT_TO_ORDER["druckt"], "druckt")
+
+    def test_legacy_idea_map(self):
+        self.assertEqual(IDEA_TO_ORDER["erledigt"], "fertig")
+        self.assertEqual(IDEA_TO_ORDER["spaeter"], "idee")
+
+
+class OfferFromFileTests(unittest.TestCase):
+    def test_basic_offer(self):
+        file_row = {"weight_g": 50, "estimated_s": 3600}
+        out = offer_from_file(file_row, material_price=20, machine_rate_per_h=10, setup_min=15, margin=20)
+        self.assertAlmostEqual(out["material_cost"], 1.0)
+        self.assertAlmostEqual(out["hours"], 1.0)
+        self.assertAlmostEqual(out["machine_cost"], 10 + 2.5)
+        self.assertAlmostEqual(out["total"], out["subtotal"] * 1.2)
+
+    def test_empty_file(self):
+        out = offer_from_file({}, 0, 0, 0, 0)
+        self.assertEqual(out["total"], 0.0)
+
+
+if __name__ == "__main__":
+    unittest.main()

tests/test_time_window.py

@@ -0,0 +1,24 @@
+"""Start-Zeitfenster."""
+
+import unittest
+from datetime import datetime
+from zoneinfo import ZoneInfo
+
+from grotti.time_window import allowed_now
+
+
+class TimeWindowTests(unittest.TestCase):
+    def test_overnight_window(self):
+        window = {"allowed": [{"from": "22:00", "to": "06:00"}]}
+        inside = datetime(2026, 10, 18, 23, 0, tzinfo=ZoneInfo("Europe/Berlin"))
+        outside = datetime(2026, 10, 18, 12, 0, tzinfo=ZoneInfo("Europe/Berlin"))
+        self.assertTrue(allowed_now(window, now=inside))
+        self.assertFalse(allowed_now(window, now=outside))
+
+    def test_empty_allows_always(self):
+        self.assertTrue(allowed_now({}))
+        self.assertTrue(allowed_now(None))
+
+
+if __name__ == "__main__":
+    unittest.main()

tests/test_toolpath.py

@@ -0,0 +1,55 @@
+"""Toolpath-Thinning: ganze Schichten dicht, keine gesprenkelten Stichproben."""
+
+from grotti.toolpath import TOOLPATH_VERSION, _thin_points, build_toolpath
+
+
+def _fake_points(layers=40, per_layer=800):
+    points = []
+    breaks = []
+    seq = 0
+    for layer in range(layers):
+        z = 0.2 + layer * 0.2
+        breaks.append(len(points))
+        for i in range(per_layer):
+            extrude = 1 if i > 0 else 0
+            points.append([float(i), float(layer), z, extrude, seq])
+            seq += 1
+    return points, breaks
+
+
+def test_thin_keeps_consecutive_extrude_pairs():
+    points, breaks = _fake_points()
+    kept, new_breaks = _thin_points(points, breaks, max_points=8_000)
+    assert len(kept) <= 8_000
+    assert new_breaks
+    consec = 0
+    for i in range(1, len(kept)):
+        if kept[i][3] and kept[i][4] == kept[i - 1][4] + 1:
+            consec += 1
+    assert consec > 500, "Thinning darf keine zeichnbaren Segmente übrig lassen"
+
+
+def test_thin_keeps_solid_layers():
+    points, breaks = _fake_points(layers=50, per_layer=600)
+    kept, _ = _thin_points(points, breaks, max_points=10_000)
+    # Pro behaltener Z-Höhe: hoher Anteil aufeinanderfolgender Extrusionen
+    by_z = {}
+    for i in range(1, len(kept)):
+        if not (kept[i][3] and kept[i][4] == kept[i - 1][4] + 1):
+            continue
+        z = round(kept[i][2], 2)
+        by_z[z] = by_z.get(z, 0) + 1
+    assert by_z, "keine Extrusionssegmente"
+    assert max(by_z.values()) >= 40, "behaltene Schichten sollen dicht sein"
+
+
+def test_toolpath_version():
+    assert TOOLPATH_VERSION >= 8
+
+
+def test_build_empty(tmp_path):
+    path = tmp_path / "empty.gcode"
+    path.write_text("; nix\n", encoding="utf-8")
+    data = build_toolpath(path)
+    assert data["points"] == []
+    assert data["version"] == TOOLPATH_VERSION

tests/test_usage.py

@@ -0,0 +1,75 @@
+"""Ist-Gramm und Spulenanteile ohne Datenbank."""
+
+import unittest
+from pathlib import Path
+import sys
+
+ROOT = Path(__file__).resolve().parents[1]
+sys.path.insert(0, str(ROOT))
+
+from grotti import usage
+
+
+class ResolveUsedTests(unittest.TestCase):
+    def test_measured_from_mm(self):
+        grams, source = usage.resolve_used_grams(100, 500, 1000, 0, "cancelled", 60)
+        self.assertAlmostEqual(grams, 50)
+        self.assertEqual(source, "measured")
+
+    def test_abort_before_extrude(self):
+        grams, source = usage.resolve_used_grams(100, 0, 1000, 0, "cancelled", 5)
+        self.assertEqual(grams, 0)
+        self.assertEqual(source, "none")
+
+    def test_abort_progress_estimate(self):
+        grams, source = usage.resolve_used_grams(100, 0, 0, 0.25, "cancelled", 120)
+        self.assertAlmostEqual(grams, 25)
+        self.assertEqual(source, "estimate")
+
+    def test_completed_keeps_planned_without_mm(self):
+        grams, source = usage.resolve_used_grams(80, 0, 0, 1, "completed", 3600)
+        self.assertAlmostEqual(grams, 80)
+        self.assertEqual(source, "estimate")
+
+    def test_overshoot_no_cap(self):
+        grams, source = usage.resolve_used_grams(100, 1200, 1000, 1, "completed", 3600)
+        self.assertAlmostEqual(grams, 120)
+        self.assertEqual(source, "measured")
+
+
+class SplitTests(unittest.TestCase):
+    def test_single_is_measured(self):
+        parts, estimate = usage.split_used(50, [100], multi=False)
+        self.assertEqual(parts, [50])
+        self.assertFalse(estimate)
+
+    def test_multi_is_estimate(self):
+        parts, estimate = usage.split_used(90, [30, 60], multi=True)
+        self.assertAlmostEqual(parts[0], 30)
+        self.assertAlmostEqual(parts[1], 60)
+        self.assertTrue(estimate)
+
+
+class SegmentTests(unittest.TestCase):
+    def test_deltas(self):
+        segs = [
+            {"spool_id": 1, "ace_slot": None, "mm_start": 0, "mm_end": 400},
+            {"spool_id": 2, "ace_slot": None, "mm_start": 400, "mm_end": None},
+        ]
+        deltas = usage.segment_deltas(segs, 1000)
+        self.assertEqual(deltas[0], (1, None, 400))
+        self.assertEqual(deltas[1], (2, None, 600))
+
+    def test_grams_from_mm(self):
+        self.assertAlmostEqual(usage.grams_from_mm(250, 1000, 80), 20)
+
+
+class WeightListTests(unittest.TestCase):
+    def test_list_and_sum(self):
+        meta = {"filament_weight_total": [10, 20, 5]}
+        self.assertEqual(usage.weight_list(meta), [10, 20, 5])
+        self.assertEqual(usage.weight_sum(meta), 35)
+
+
+if __name__ == "__main__":
+    unittest.main()

web/static/api.js

@@ -12,7 +12,8 @@ function escapeHtml(value) {
     .replaceAll("&", "&")
     .replaceAll("<", "&lt;")
     .replaceAll(">", "&gt;")
-    .replaceAll('"', "&quot;");
+    .replaceAll('"', "&quot;")
+    .replaceAll("'", "&#39;");
 }
 
 async function api(path, options = {}) {
@@ -89,7 +90,126 @@ function clockOf(iso) {
   if (!iso) return "";
   const at = new Date(iso);
   if (Number.isNaN(at.getTime())) return "";
-  return at.toLocaleTimeString("de-DE", { hour: "2-digit", minute: "2-digit" });
+  return at.toLocaleTimeString("de-DE", { hour: "2-digit", minute: "2-digit", timeZone: appTimeZone() });
+}
+
+const TZ_KEY = "grotti-timezone";
+
+function appTimeZone() {
+  try {
+    const value = localStorage.getItem(TZ_KEY);
+    if (value && value !== "auto") return value;
+  } catch (error) { /* Browser */ }
+  return undefined;
+}
+
+function formatDateTime(iso, opts) {
+  if (!iso) return "—";
+  const at = new Date(iso);
+  if (Number.isNaN(at.getTime())) return "—";
+  const options = {
+    day: "2-digit",
+    month: "2-digit",
+    year: "numeric",
+    hour: "2-digit",
+    minute: "2-digit",
+    timeZone: appTimeZone(),
+    ...(opts || {}),
+  };
+  return at.toLocaleString("de-DE", options);
+}
+
+function formatDateRange(startIso, endIso) {
+  const start = startIso ? new Date(startIso) : null;
+  const end = endIso ? new Date(endIso) : null;
+  if (start && Number.isNaN(start.getTime())) return "—";
+  if (!start && !end) return "—";
+  if (start && !end) return formatDateTime(startIso) + " → …";
+  if (!start && end) return "… → " + formatDateTime(endIso);
+  const sameDay = start.toDateString() === end.toDateString();
+  const left = formatDateTime(startIso);
+  if (sameDay) {
+    const right = end.toLocaleTimeString("de-DE", {
+      hour: "2-digit",
+      minute: "2-digit",
+      timeZone: appTimeZone(),
+    });
+    return left + " – " + right;
+  }
+  return left + " – " + formatDateTime(endIso);
+}
+
+function tempChartHtml(samples) {
+  if (!samples || samples.length < 2) {
+    return '<p class="tiny">Noch zu wenig Proben für den Verlauf.</p>';
+  }
+  const times = samples.map((s) => new Date(s.sampled_at).getTime());
+  const t0 = times[0];
+  const t1 = times[times.length - 1];
+  const span = Math.max(1, t1 - t0);
+  const temps = samples.flatMap((s) => [s.nozzle, s.bed, s.chamber, s.nozzle_target, s.bed_target].filter((v) => v != null));
+  const minT = Math.min(...temps, 0);
+  const maxT = Math.max(...temps, 100);
+  const hasEd = samples.some((s) => s.nozzle_power != null || s.bed_power != null);
+  const w = 640;
+  const h = 210;
+  const padL = 44;
+  const padR = hasEd ? 44 : 28;
+  const padT = 22;
+  const padB = 30;
+  const x = (ms) => padL + ((ms - t0) / span) * (w - padL - padR);
+  const yT = (v) => padT + (1 - (Number(v) - minT) / Math.max(1, maxT - minT)) * (h - padT - padB);
+  const yEd = (v) => padT + (1 - Math.max(0, Math.min(1, Number(v) || 0))) * (h - padT - padB);
+
+  function poly(key, color, dashed, scaleEd) {
+    const pts = [];
+    samples.forEach((s, i) => {
+      const v = s[key];
+      if (v == null) return;
+      const yy = scaleEd ? yEd(Number(v)) : yT(v);
+      pts.push(`${x(times[i]).toFixed(1)},${yy.toFixed(1)}`);
+    });
+    if (pts.length < 2) return "";
+    const dash = dashed ? ' stroke-dasharray="5 4"' : "";
+    return `<polyline fill="none" stroke="${color}" stroke-width="${dashed ? 1.2 : 1.7}"${dash} points="${pts.join(" ")}" />`;
+  }
+
+  const tickCount = Math.min(5, samples.length);
+  const timeTicks = [];
+  for (let i = 0; i < tickCount; i++) {
+    const ms = t0 + (span * i) / Math.max(1, tickCount - 1);
+    const label = new Date(ms).toLocaleTimeString("de-DE", {
+      hour: "2-digit",
+      minute: "2-digit",
+      timeZone: appTimeZone(),
+    });
+    timeTicks.push(`<text x="${x(ms).toFixed(1)}" y="${h - 6}" text-anchor="middle" class="chart-label">${escapeHtml(label)}</text>`);
+  }
+  const midY = (padT + h - padB) / 2;
+
+  return `<svg class="temp-chart" viewBox="0 0 ${w} ${h}" role="img" aria-label="Temperatur links in °C, Einschaltdauer rechts in Prozent">
+    ${poly("nozzle_target", "#fdba74", true, false)}
+    ${poly("bed_target", "#93c5fd", true, false)}
+    ${poly("nozzle", "#ea580c", false, false)}
+    ${poly("bed", "#2563eb", false, false)}
+    ${poly("chamber", "#16a34a", false, false)}
+    ${hasEd ? poly("nozzle_power", "#c084fc", false, true) : ""}
+    ${hasEd ? poly("bed_power", "#22d3ee", false, true) : ""}
+    <text x="10" y="${midY}" class="chart-axis" transform="rotate(-90 10 ${midY})">Temp °C</text>
+    <text x="${padL}" y="14" class="chart-label">${Math.round(maxT)}</text>
+    <text x="${padL}" y="${h - padB + 2}" class="chart-label">${Math.round(minT)}</text>
+    ${hasEd ? `<text x="${w - 10}" y="${midY}" class="chart-axis" text-anchor="middle" transform="rotate(90 ${w - 10} ${midY})">ED %</text>` : ""}
+    ${hasEd ? `<text x="${w - padR}" y="14" text-anchor="end" class="chart-label">100</text>` : ""}
+    ${hasEd ? `<text x="${w - padR}" y="${h - padB + 2}" text-anchor="end" class="chart-label">0</text>` : ""}
+    ${timeTicks.join("")}
+  </svg>
+  <p class="tiny chart-legend">
+    <span class="leg nozzle">Düse</span>
+    <span class="leg bed">Bett</span>
+    <span class="leg chamber">Kammer</span>
+    ${hasEd ? '<span class="leg ed-n">ED Düse</span><span class="leg ed-b">ED Bett</span>' : ""}
+    · links °C · rechts % · gestrichelt ≈ Soll
+  </p>`;
 }
 
 function showNote(id, error, ok) {
@@ -158,10 +278,16 @@ function toast(message, kind) {
     host.setAttribute("aria-live", "polite");
     document.body.appendChild(host);
   }
+  const text = String(message ?? "");
+  host.querySelectorAll(".toast").forEach((node) => {
+    const body = node.querySelector("div");
+    if (body && body.textContent === text) node.remove();
+  });
+  while (host.children.length >= 3) host.firstElementChild?.remove();
   const node = document.createElement("div");
   node.className = "toast " + (kind || "good");
   node.innerHTML = icon(kind === "bad" ? "alert" : "check", "lg") + "<div></div>";
-  node.querySelector("div").textContent = message;
+  node.querySelector("div").textContent = text;
   host.appendChild(node);
   const ttl = kind === "bad" ? 7000 : 4000;
   setTimeout(() => {

web/static/gcode-viewer.js

@@ -10,8 +10,8 @@ window.GrottiGcodeViewer = (function () {
   const COLOR_OBJ_EX = 0xef4444;
   const COLOR_OBJ_CUR = 0xfbbf24;
   const GRID_STEP = 10;
-  // Nur leichte Doppelung — starke Offsets + Punkte wirkten wie Vollkörper mit Löchern
+  // Keine Parallel-Offsets: bei ausgedünnten Pfaden wirkten sie gesprenkelt
-  const FAT_OFFSETS = [0, -0.22, 0.22];
+  const FAT_OFFSETS = [0];
 
   function create(canvas) {
     const wrap = document.createElement("div");

web/static/grotti.css

@@ -5,7 +5,7 @@
   --bg: #0a0a0c;
   --ink: #f0f0f2;
   --muted: #9a9aa3;
-  --faint: #6b6b75;
+  --faint: #8d8d97;
   --line: rgba(255, 255, 255, 0.08);
   --line-strong: rgba(255, 255, 255, 0.14);
   --card: #141418;
@@ -374,6 +374,47 @@ body.shelf [data-role="hero"] { font-size: 1.35rem; }
 }
 .queue-item.running { border-color: rgba(61, 206, 124, 0.28); background: linear-gradient(180deg, rgba(61, 206, 124, 0.07), rgba(255, 255, 255, 0.02)); }
 .queue-item.error { border-color: rgba(248, 113, 113, 0.3); background: var(--st-error-soft); }
+.queue-item.run-line {
+  display: flex;
+  align-items: center;
+  gap: 0.2rem;
+  padding: 0.2rem 0.3rem 0.2rem 0.2rem;
+  background: rgba(255, 255, 255, 0.03);
+}
+.queue-item.run-line.running {
+  background: rgba(61, 206, 124, 0.04);
+}
+.run-line-link {
+  position: relative;
+  flex: 1;
+  min-width: 0;
+  display: flex;
+  align-items: center;
+  padding: 0.28rem 0.45rem;
+  border-radius: 7px;
+  overflow: hidden;
+}
+.run-line-fill {
+  position: absolute;
+  inset: 0 auto 0 0;
+  width: calc(var(--pct, 0) * 1%);
+  max-width: 100%;
+  background: rgba(61, 206, 124, 0.22);
+  pointer-events: none;
+  transition: width 0.35s ease;
+}
+.run-line-text {
+  position: relative;
+  z-index: 1;
+  color: var(--ink);
+  font-size: var(--t-xs);
+  font-weight: 650;
+  font-variant-numeric: tabular-nums;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.queue-link.run-line-link:hover .run-line-text { color: var(--accent); }
 .queue-row { display: flex; align-items: center; gap: 0.4rem; min-width: 0; }
 .queue-row .grow { flex: 1; min-width: 0; }
 .queue-link { color: inherit; text-decoration: none; }
@@ -405,6 +446,36 @@ body.shelf [data-role="hero"] { font-size: 1.35rem; }
   padding: 0.25rem 0.35rem;
   font-size: 0.82rem;
 }
+.steer-ace,
+.steer-ace-slots {
+  display: grid;
+  gap: 0.35rem;
+  padding-top: 0.35rem;
+  border-top: 1px solid var(--line);
+}
+.steer-ace-head {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 0.35rem 0.65rem;
+  align-items: baseline;
+  font-size: 0.78rem;
+}
+.steer-ace-head b { font-weight: 650; }
+.steer-slot-row {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 0.35rem 0.55rem;
+  align-items: center;
+  font-size: 0.78rem;
+}
+.steer-slot-row .dot {
+  width: 0.85rem;
+  height: 0.85rem;
+  border-radius: 99px;
+  flex: none;
+  border: 1px solid rgba(255, 255, 255, 0.15);
+}
+.steer-slot-row .grow { min-width: 0; overflow-wrap: anywhere; }
 .queue-name { color: var(--ink); font-size: var(--t-sm); font-weight: 650; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; display: block; }
 .queue-msg { color: var(--muted); font-size: var(--t-xs); line-height: 1.3; overflow-wrap: anywhere; }
 .queue-sub { color: var(--faint); font-size: 0.66rem; font-variant-numeric: tabular-nums; flex: none; }
@@ -413,6 +484,7 @@ body.shelf [data-role="hero"] { font-size: 1.35rem; }
 .icon-btn.done-btn { color: var(--st-printing); border-color: rgba(61, 206, 124, 0.35); border-radius: 99px !important; }
 .icon-btn.done-btn:hover { color: var(--st-printing); background: rgba(61, 206, 124, 0.12); }
 .icon-btn.done-btn.confirm-armed { width: auto; padding: 0 0.5rem !important; font-size: 0.66rem; font-weight: 700; background: rgba(61, 206, 124, 0.18); }
+.icon-btn.confirm-armed { width: auto; padding: 0 0.5rem !important; font-size: 0.7rem; font-weight: 700; }
 .queue-tools { display: flex; gap: 0.1rem; flex-wrap: nowrap; flex: none; }
 .send-progress { margin-top: 0.75rem; display: grid; gap: 0.55rem; }
 .send-job { display: grid; gap: 0.3rem; }
@@ -467,12 +539,16 @@ body.shelf [data-role="hero"] { font-size: 1.35rem; }
 .ace-printer-name { margin: 0; font-size: 0.82rem; font-weight: 650; color: var(--ink); }
 .ace-row {
   display: grid;
-  grid-template-columns: 0.85rem minmax(0, 1fr) minmax(7rem, 0.9fr);
+  grid-template-columns: 0.85rem minmax(0, 1fr) minmax(12rem, 1.4fr);
   gap: 0.45rem;
   align-items: center;
   margin: 0;
   font-size: 0.82rem;
 }
+.ace-row select {
+  min-width: 0;
+  width: 100%;
+}
 .ace-swatch {
   width: 0.85rem;
   height: 0.85rem;
@@ -514,6 +590,23 @@ h2 { font-size: 0.95rem; margin: 0 0 0.65rem; letter-spacing: -0.02em; font-weig
   border-radius: var(--radius-sm);
   min-height: var(--control-h);
 }
+.page-tools .date-field {
+  width: auto;
+  min-width: 9.5rem;
+  max-width: 11rem;
+  flex: 0 0 auto;
+}
+.page-tools .period-presets {
+  width: auto;
+  max-width: 100%;
+  flex: 1 1 100%;
+  grid-auto-columns: auto;
+  overflow-x: auto;
+}
+.page-tools .period-presets button {
+  padding: 0.4rem 0.55rem;
+  white-space: nowrap;
+}
 .lead, .tiny, .summary { color: var(--muted); }
 .summary { margin: 0.3rem 0 0; }
 .tiny { font-size: 0.8rem; margin: 0.2rem 0 0; line-height: 1.4; max-width: 52ch; }
@@ -620,12 +713,44 @@ article.machine.offline:hover { opacity: 1; }
 .job-line {
   display: flex;
   align-items: center;
-  gap: 0.45rem;
+  gap: 0.55rem;
   min-width: 0;
   color: var(--muted);
   font-size: var(--t-sm);
+  padding: 0.45rem 0.5rem;
+  border-radius: 10px;
+  background: rgba(255, 255, 255, 0.03);
+  border: 1px solid var(--line);
+}
+.job-thumb {
+  width: 4.5rem;
+  height: 4.5rem;
+  object-fit: contain;
+  border-radius: 9px;
+  border: 1px solid var(--line);
+  background: var(--card-2);
+  flex: none;
+}
+.job-thumb[hidden] { display: none; }
+.job-ico { display: inline-flex; flex: none; color: var(--faint); }
+.job-ico .ico { width: 1.1rem; height: 1.1rem; }
+.job-line.has-thumb .job-ico { display: none; }
+.job-meta {
+  min-width: 0;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  gap: 0.3rem;
+  align-items: flex-start;
+}
+.job-line .name {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  max-width: 100%;
+  color: var(--ink);
+  font-weight: 650;
 }
-.job-line .name { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; flex: 1; min-width: 0; color: var(--ink); }
 .job-line .swatches { padding: 0; min-height: 0; flex: none; }
 .badge {
   font-size: 0.65rem;
@@ -1131,14 +1256,16 @@ button.swatch.on { border-color: var(--accent); background: var(--accent-soft);
 }
 .mat-color-cap { color: var(--faint); font-size: var(--t-xs); }
 .mat-form { position: sticky; top: 0.75rem; }
-.mat-color {
+.mat-color,
+.mat-more {
   margin: 0.75rem 0 0;
   border: 1px solid var(--line);
   border-radius: 10px;
   background: rgba(255, 255, 255, 0.02);
   overflow: hidden;
 }
-.mat-color > summary {
+.mat-color > summary,
+.mat-more > summary {
   list-style: none;
   display: flex;
   align-items: center;
@@ -1150,11 +1277,16 @@ button.swatch.on { border-color: var(--accent); background: var(--accent-soft);
   font-size: var(--t-sm);
   font-weight: 650;
 }
-.mat-color > summary::-webkit-details-marker { display: none; }
+.mat-color > summary::-webkit-details-marker,
-.mat-color > summary .caret { transition: transform 0.2s var(--ease); opacity: 0.6; }
+.mat-more > summary::-webkit-details-marker { display: none; }
-.mat-color:not([open]) > summary .caret { transform: rotate(-90deg); }
+.mat-color > summary .caret,
-.mat-color > summary .grow { flex: 1; color: var(--ink); }
+.mat-more > summary .caret { transition: transform 0.2s var(--ease); opacity: 0.6; }
-.mat-color-body { padding: 0 0.7rem 0.75rem; }
+.mat-color:not([open]) > summary .caret,
+.mat-more:not([open]) > summary .caret { transform: rotate(-90deg); }
+.mat-color > summary .grow,
+.mat-more > summary .grow { flex: 1; color: var(--ink); }
+.mat-color-body,
+.mat-more-body { padding: 0 0.7rem 0.75rem; }
 .mat-color-body .color-grid { margin-bottom: 0.35rem; }
 .mat-color-body .picked { min-height: 1.4rem; margin-bottom: 0.45rem; }
 .viewer-card { margin-top: 1rem; }
@@ -1544,6 +1676,13 @@ body.desk-on main {
 }
 .desk-tool-mesh .mesh { margin-top: 0; }
 .desk-tool-mesh .gridmesh { width: 100%; max-width: 22rem; }
+.desk-verlauf .temp-chart { max-width: none; }
+.desk-verlauf-head {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+  margin-bottom: 0.45rem;
+}
 .desk-empty { margin: 0.35rem 0 0; color: var(--faint); }
 
 .ablauf-card { margin-top: 1rem; }
@@ -1821,6 +1960,31 @@ body.desk-on main {
 .tabs button:hover { color: var(--ink); filter: none; }
 .tabs button.on { color: var(--ink); border-bottom-color: var(--accent); }
 
+.conn-banner {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  z-index: 120;
+  padding: 0.45rem 1rem;
+  text-align: center;
+  font-size: var(--t-sm);
+  font-weight: 500;
+  box-shadow: 0 4px 16px rgba(0, 0, 0, 0.35);
+  pointer-events: none;
+}
+.conn-banner[hidden] { display: none !important; }
+.conn-banner.bad {
+  background: rgba(127, 29, 29, 0.92);
+  color: #fecaca;
+  border-bottom: 1px solid rgba(248, 113, 113, 0.45);
+}
+.conn-banner.ok {
+  background: rgba(20, 83, 45, 0.92);
+  color: #bbf7d0;
+  border-bottom: 1px solid rgba(61, 206, 124, 0.45);
+}
+
 .toast-host {
   position: fixed;
   right: 1rem;
@@ -1874,7 +2038,6 @@ body.desk-on main {
 .summary-text b { color: var(--ink); }
 .page-head-side { display: flex; align-items: center; gap: 0.75rem 1rem; flex-wrap: wrap; }
 .page-head-side .check { margin: 0; font-size: var(--t-sm); color: var(--muted); }
-.job-line > .ico { color: var(--faint); }
 .job-line[hidden] { display: none; }
 article.machine.flash { animation: flash 2s var(--ease); }
 @keyframes flash { 0%, 40% { box-shadow: 0 0 0 2px var(--accent), var(--shadow); } }
@@ -1899,6 +2062,17 @@ article.machine.flash { animation: flash 2s var(--ease); }
 }
 .lib-tools input[type="search"] { flex: 1 1 12rem; margin: 0; }
 .lib-tools select { flex: 0 1 11rem; width: auto; margin: 0; }
+.lib-group {
+  font-size: var(--t-xs);
+  font-weight: 650;
+  color: var(--muted);
+  text-transform: uppercase;
+  letter-spacing: 0.04em;
+  padding: 0.55rem 0.35rem 0.15rem;
+  margin-top: 0.25rem;
+  border-bottom: 1px solid var(--line);
+}
+.lib-group:first-child { margin-top: 0; padding-top: 0.15rem; }
 .lib-list { display: grid; gap: 0.35rem; max-height: 70vh; overflow-y: auto; margin: 0 -0.3rem; padding: 0 0.3rem; }
 .lib-item {
   display: grid;
@@ -1922,6 +2096,13 @@ article.machine.flash { animation: flash 2s var(--ease); }
 .lib-item .t { display: block; font-size: var(--t-sm); font-weight: 650; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; color: var(--ink); }
 .lib-item .m { display: flex; flex-wrap: wrap; gap: 0.15rem 0.6rem; font-size: var(--t-xs); color: var(--muted); margin-top: 0.12rem; font-variant-numeric: tabular-nums; }
 .lib-item .side { display: flex; gap: 0.25rem; align-items: center; }
+.lib-move {
+  max-width: 7.5rem;
+  margin: 0;
+  padding: 0.2rem 0.35rem;
+  font-size: var(--t-xs);
+  border-radius: 6px;
+}
 .lib-info { position: relative; }
 .lib-info > summary { list-style: none; }
 .lib-info > summary::-webkit-details-marker { display: none; }
@@ -2274,3 +2455,186 @@ label.button:hover { background: rgba(255, 255, 255, 0.04); }
   .nav-secondary a { padding: 0.4rem; }
   .nav-main a.on { box-shadow: none; border-radius: 9px; padding-left: 0.55rem; }
 }
+
+/* Druckbericht & Statistik */
+.bericht { display: grid; gap: 0.85rem; }
+.bericht-head { display: grid; gap: 0.5rem; }
+.bericht-meta p { margin: 0.2rem 0; }
+.temp-chart {
+  width: 100%;
+  max-width: 40rem;
+  height: auto;
+  background: #0c0c10;
+  border-radius: 10px;
+  border: 1px solid var(--line);
+}
+.chart-label { fill: var(--muted); font-size: 11px; }
+.chart-axis { fill: var(--faint); font-size: 10px; font-weight: 650; letter-spacing: 0.04em; }
+.chart-legend { display: flex; gap: 0.75rem; flex-wrap: wrap; margin-top: 0.35rem; }
+.chart-legend .leg::before {
+  content: "";
+  display: inline-block;
+  width: 0.65rem;
+  height: 0.65rem;
+  border-radius: 50%;
+  margin-right: 0.3rem;
+  vertical-align: -0.05rem;
+}
+.chart-legend .nozzle::before { background: #ea580c; }
+.chart-legend .bed::before { background: #2563eb; }
+.chart-legend .chamber::before { background: #16a34a; }
+.chart-legend .ed-n::before { background: #c084fc; }
+.chart-legend .ed-b::before { background: #22d3ee; }
+.tag {
+  display: inline-block;
+  font-size: 0.72rem;
+  font-weight: 650;
+  padding: 0.05rem 0.35rem;
+  border-radius: 6px;
+  background: var(--accent-soft);
+  color: var(--accent);
+}
+.kpi-row {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(8.5rem, 1fr));
+  gap: 0.65rem;
+  margin-bottom: 0.85rem;
+}
+.kpi {
+  background: var(--card);
+  border: 1px solid var(--line);
+  border-radius: 12px;
+  padding: 0.7rem 0.8rem;
+}
+.kpi-val {
+  font-size: 1.25rem;
+  font-weight: 750;
+  letter-spacing: -0.02em;
+}
+.kpi-label { color: var(--muted); font-size: 0.78rem; font-weight: 650; }
+.spool-akte {
+  margin-top: 1rem;
+  padding-top: 0.85rem;
+  border-top: 1px solid var(--line);
+}
+.spool-akte h3 { margin: 0 0 0.55rem; font-size: 0.95rem; }
+.akte-kpis {
+  margin-bottom: 0.65rem;
+  grid-template-columns: repeat(auto-fill, minmax(5.5rem, 1fr));
+  gap: 0.45rem;
+}
+.akte-kpis .kpi {
+  padding: 0.45rem 0.55rem;
+  border-radius: 10px;
+}
+.akte-kpis .kpi-val { font-size: 0.98rem; }
+.akte-runs { display: flex; flex-direction: column; gap: 0; }
+.akte-run {
+  display: grid;
+  grid-template-columns: 5.6rem minmax(5.5rem, auto) minmax(0, 1fr) auto auto;
+  gap: 0.35rem 0.55rem;
+  align-items: center;
+  padding: 0.38rem 0;
+  border-bottom: 1px solid var(--line);
+  font-size: 0.86rem;
+}
+.akte-run:last-child { border-bottom: 0; }
+.akte-when { color: var(--muted); white-space: nowrap; }
+.akte-charge { font-size: 0.72rem; text-decoration: none; }
+.akte-file {
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.akte-g { font-variant-numeric: tabular-nums; white-space: nowrap; font-weight: 650; }
+.akte-state { color: var(--muted); white-space: nowrap; text-align: right; }
+@media (max-width: 520px) {
+  .akte-run {
+    grid-template-columns: 1fr auto;
+    grid-template-areas:
+      "when g"
+      "charge state"
+      "file file";
+  }
+  .akte-when { grid-area: when; }
+  .akte-charge { grid-area: charge; }
+  .akte-file { grid-area: file; }
+  .akte-g { grid-area: g; }
+  .akte-state { grid-area: state; }
+}
+ul.plain { list-style: none; margin: 0; padding: 0; }
+ul.plain li { padding: 0.2rem 0; border-bottom: 1px solid var(--line); }
+ul.plain li:last-child { border-bottom: 0; }
+.grid-2 { display: grid; gap: 0.85rem; }
+@media (min-width: 800px) {
+  .grid-2 { grid-template-columns: 1fr 1fr; }
+}
+
+/* Abräumen-Dialog + Mobile „Mehr“ */
+.abraeumen-dlg,
+.mobile-more-sheet {
+  border: 1px solid var(--line-strong);
+  border-radius: var(--radius);
+  padding: 1rem 1.1rem;
+  background: var(--card);
+  color: var(--ink);
+  max-width: min(22rem, calc(100vw - 2rem));
+  box-shadow: var(--shadow);
+}
+.abraeumen-dlg::backdrop,
+.mobile-more-sheet::backdrop {
+  background: rgba(0, 0, 0, 0.55);
+}
+.abraeumen-form h2 { margin: 0 0 0.35rem; font-size: var(--t-lg); }
+.abraeumen-form .actions { margin-top: 0.85rem; display: flex; gap: 0.5rem; flex-wrap: wrap; }
+.mobile-more-sheet nav {
+  display: grid;
+  gap: 0.35rem;
+  margin-bottom: 0.75rem;
+}
+.mobile-more-sheet a {
+  display: block;
+  padding: 0.65rem 0.75rem;
+  border-radius: var(--radius-sm);
+  color: var(--ink);
+  text-decoration: none;
+  background: var(--card-2);
+  border: 1px solid var(--line);
+}
+.mobile-nav .mobile-more-btn {
+  appearance: none;
+  background: transparent;
+  border: 0;
+  color: inherit;
+  font: inherit;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 0.15rem;
+  padding: 0.35rem 0.5rem;
+  cursor: pointer;
+}
+
+@media (prefers-reduced-motion: reduce) {
+  *, *::before, *::after {
+    animation-duration: 0.01ms !important;
+    animation-iteration-count: 1 !important;
+    transition-duration: 0.01ms !important;
+  }
+}
+
+@media (pointer: coarse) {
+  .icon-btn, .tiny-btn, .fchip, button, .mobile-nav a, .mobile-nav button {
+    min-height: 2.75rem;
+    min-width: 2.75rem;
+  }
+}
+
+@media print {
+  .sidebar, .mobile-nav, .conn-banner, .toast-host, .nav-toggle { display: none !important; }
+  .app-shell { display: block; }
+  .app-main { margin: 0; }
+  body { background: #fff; color: #111; }
+  .card, article { box-shadow: none; border-color: #ccc; }
+}

web/static/manifest.webmanifest

@@ -0,0 +1,23 @@
+{
+  "name": "Grotti",
+  "short_name": "Grotti",
+  "description": "3D-Druck-Farm steuern",
+  "start_url": "/",
+  "display": "standalone",
+  "background_color": "#0a0a0c",
+  "theme_color": "#0a0a0c",
+  "lang": "de",
+  "icons": [
+    {
+      "src": "/static/brand/favicon.png",
+      "sizes": "512x512",
+      "type": "image/png",
+      "purpose": "any"
+    },
+    {
+      "src": "/static/brand/apple-touch-icon.png",
+      "sizes": "180x180",
+      "type": "image/png"
+    }
+  ]
+}

web/static/sw.js

@@ -0,0 +1,27 @@
+/* Minimaler Service-Worker: App-Shell-Cache für Offline-Hinweis. */
+const CACHE = "grotti-shell-v1";
+const SHELL = ["/", "/static/grotti.css?v=54", "/static/api.js?v=28", "/static/ui.js?v=2"];
+
+self.addEventListener("install", (event) => {
+  event.waitUntil(caches.open(CACHE).then((c) => c.addAll(SHELL).catch(() => undefined)));
+  self.skipWaiting();
+});
+
+self.addEventListener("activate", (event) => {
+  event.waitUntil(
+    caches.keys().then((keys) =>
+      Promise.all(keys.filter((k) => k !== CACHE).map((k) => caches.delete(k)))
+    )
+  );
+  self.clients.claim();
+});
+
+self.addEventListener("fetch", (event) => {
+  const req = event.request;
+  if (req.method !== "GET") return;
+  const url = new URL(req.url);
+  if (url.pathname.startsWith("/api/")) return;
+  event.respondWith(
+    fetch(req).catch(() => caches.match(req).then((hit) => hit || caches.match("/")))
+  );
+});

web/static/ui.js

@@ -0,0 +1,208 @@
+/** Live-UI: Verbindungsbanner, Poller, gemeinsame Zustands-Labels. */
+
+const RUN_STATES = {
+  completed: "fertig",
+  cancelled: "abgebrochen",
+  error: "Fehler",
+  in_progress: "druckt",
+  printing: "druckt",
+  paused: "pausiert",
+  interrupted: "unterbrochen",
+  standby: "bereit",
+  heating: "heizt",
+  complete: "fertig",
+  offline: "offline",
+  waiting: "wartet",
+  running: "läuft",
+};
+
+let connBannerOk = true;
+let connBannerTimer = 0;
+
+function setConnectionBanner(ok, text) {
+  let el = document.getElementById("conn-banner");
+  if (!el) {
+    el = document.createElement("div");
+    el.id = "conn-banner";
+    el.className = "conn-banner";
+    el.setAttribute("role", "status");
+    el.hidden = true;
+    document.body.prepend(el);
+  }
+  clearTimeout(connBannerTimer);
+  if (ok) {
+    const wasBad = !connBannerOk;
+    connBannerOk = true;
+    if (wasBad && text) {
+      el.textContent = text;
+      el.className = "conn-banner ok";
+      el.hidden = false;
+      connBannerTimer = setTimeout(() => {
+        el.hidden = true;
+        el.textContent = "";
+      }, 2800);
+      return;
+    }
+    el.hidden = true;
+    el.textContent = "";
+    el.className = "conn-banner";
+    return;
+  }
+  connBannerOk = false;
+  el.textContent = text || "Keine Verbindung zum Server.";
+  el.className = "conn-banner bad";
+  el.hidden = false;
+}
+
+/**
+ * @param {() => void | Promise<void>} fn
+ * @param {number} intervalMs
+ * @returns {{ start: () => void, stop: () => void }}
+ */
+function createPoller(fn, intervalMs) {
+  const base = Math.max(1000, Number(intervalMs) || 5000);
+  const maxMs = 60000;
+  let timer = 0;
+  let busy = false;
+  let delay = base;
+  let fails = 0;
+  let running = false;
+
+  function schedule() {
+    if (!running) return;
+    clearTimeout(timer);
+    timer = setTimeout(tick, delay);
+  }
+
+  async function tick() {
+    if (!running || document.hidden || busy) {
+      schedule();
+      return;
+    }
+    busy = true;
+    try {
+      await fn();
+      delay = base;
+      fails = 0;
+      if (!connBannerOk) setConnectionBanner(true, "Wieder verbunden.");
+      else setConnectionBanner(true, "");
+    } catch (error) {
+      fails += 1;
+      delay = Math.min(maxMs, Math.max(base, delay * 2));
+      if (fails >= 2) {
+        setConnectionBanner(false, (error && error.message) || "Daten konnten nicht geladen werden.");
+      }
+    } finally {
+      busy = false;
+      schedule();
+    }
+  }
+
+  function onVis() {
+    if (!document.hidden && running) tick();
+  }
+
+  return {
+    start() {
+      if (running) return;
+      running = true;
+      document.addEventListener("visibilitychange", onVis);
+      tick();
+    },
+    stop() {
+      running = false;
+      document.removeEventListener("visibilitychange", onVis);
+      clearTimeout(timer);
+      timer = 0;
+    },
+  };
+}
+
+const VERDICT_REASON_LABELS = {
+  haftung: "Haftung",
+  warping: "Warping",
+  spaghetti: "Spaghetti",
+  layer_shift: "Layer-Shift",
+  verstopfung: "Verstopfung",
+  farbe: "Farbe",
+  sonstiges: "Sonstiges",
+};
+
+/**
+ * Dialog vor „Platte geräumt“: Urteil, optional Grund und Stückzahlen.
+ * @returns {Promise<object|null>} Payload für /abraeumen oder null bei Abbruch
+ */
+function promptAbraeumen(hostLabel) {
+  return new Promise((resolve) => {
+    const existing = document.getElementById("abraeumen-dlg");
+    if (existing) existing.remove();
+    const dlg = document.createElement("dialog");
+    dlg.id = "abraeumen-dlg";
+    dlg.className = "abraeumen-dlg";
+    const reasons = Object.entries(VERDICT_REASON_LABELS)
+      .map(([k, label]) => `<option value="${k}">${label}</option>`)
+      .join("");
+    dlg.innerHTML = `
+      <form method="dialog" class="abraeumen-form">
+        <h2>Platte geräumt</h2>
+        <p class="tiny">${escapeHtml(hostLabel || "Drucker")}</p>
+        <div class="field"><label for="ab-verdict">Urteil</label>
+          <select id="ab-verdict" name="verdict">
+            <option value="gut">gut</option>
+            <option value="ausschuss">Ausschuss</option>
+          </select>
+        </div>
+        <div class="field" id="ab-reason-wrap" hidden>
+          <label for="ab-reason">Grund</label>
+          <select id="ab-reason">${reasons}</select>
+        </div>
+        <div class="grid-2" id="ab-pieces" hidden>
+          <div class="field"><label for="ab-ok">Stück gut</label><input id="ab-ok" type="number" min="0" step="1" value="0"></div>
+          <div class="field"><label for="ab-bad">Stück schlecht</label><input id="ab-bad" type="number" min="0" step="1" value="1"></div>
+        </div>
+        <div class="actions">
+          <button type="submit" value="ok" class="btn-primary">Quittieren</button>
+          <button type="button" class="ghost" id="ab-cancel">Abbrechen</button>
+        </div>
+      </form>`;
+    document.body.appendChild(dlg);
+    const verdict = dlg.querySelector("#ab-verdict");
+    const reasonWrap = dlg.querySelector("#ab-reason-wrap");
+    const pieces = dlg.querySelector("#ab-pieces");
+    function sync() {
+      const scrap = verdict.value === "ausschuss";
+      reasonWrap.hidden = !scrap;
+      pieces.hidden = !scrap;
+    }
+    verdict.addEventListener("change", sync);
+    sync();
+    dlg.querySelector("#ab-cancel").addEventListener("click", () => {
+      dlg.close();
+      dlg.remove();
+      resolve(null);
+    });
+    dlg.addEventListener("close", () => {
+      if (dlg.returnValue !== "ok") {
+        dlg.remove();
+        resolve(null);
+        return;
+      }
+      const payload = {
+        confirm: true,
+        verdict: verdict.value,
+        verdict_reason: verdict.value === "ausschuss" ? dlg.querySelector("#ab-reason").value : "",
+        pieces_ok: Number(dlg.querySelector("#ab-ok").value) || 0,
+        pieces_bad: Number(dlg.querySelector("#ab-bad").value) || 0,
+      };
+      dlg.remove();
+      resolve(payload);
+    });
+    dlg.showModal();
+  });
+}
+
+window.RUN_STATES = RUN_STATES;
+window.setConnectionBanner = setConnectionBanner;
+window.createPoller = createPoller;
+window.promptAbraeumen = promptAbraeumen;
+window.VERDICT_REASON_LABELS = VERDICT_REASON_LABELS;

web/templates/auftraege.html

@@ -0,0 +1,320 @@
+{% extends "layout.html" %}
+{% block body %}
+<div class="page-head">
+  <div>
+    <h1>Aufträge</h1>
+    <p class="tiny">Kunden, Angebote, Positionen und Fortschritt.</p>
+  </div>
+  <div class="actions">
+    <a class="ghost" id="lieferschein-link" href="#" hidden target="_blank" rel="noopener">Lieferschein</a>
+  </div>
+</div>
+<div class="split">
+  <section class="card">
+    <div class="field inline">
+      <label for="filter-status">Status</label>
+      <select id="filter-status">
+        <option value="">alle</option>
+        <option value="idee">Idee</option>
+        <option value="angebot">Angebot</option>
+        <option value="bestaetigt">bestätigt</option>
+        <option value="druckt">druckt</option>
+        <option value="fertig">fertig</option>
+        <option value="geliefert">geliefert</option>
+        <option value="bezahlt">bezahlt</option>
+      </select>
+    </div>
+    <div class="table-wrap">
+      <table>
+        <thead><tr><th>Titel</th><th>Status</th><th>Fortschritt</th></tr></thead>
+        <tbody id="order-rows"></tbody>
+      </table>
+    </div>
+  </section>
+  <section class="card">
+    <h2 id="order-title">Neuer Auftrag</h2>
+    <form id="order-form">
+      <input id="order-id" type="hidden">
+      <div class="field"><label for="order-title-in">Titel</label><input id="order-title-in" required></div>
+      <div class="grid-2">
+        <div class="field"><label for="order-status">Status</label>
+          <select id="order-status">
+            <option value="idee">Idee</option>
+            <option value="angebot">Angebot</option>
+            <option value="bestaetigt">bestätigt</option>
+            <option value="druckt">druckt</option>
+            <option value="fertig">fertig</option>
+            <option value="geliefert">geliefert</option>
+            <option value="bezahlt">bezahlt</option>
+          </select>
+        </div>
+        <div class="field"><label for="order-due">Fällig</label><input id="order-due" type="date"></div>
+      </div>
+      <div class="field"><label for="order-customer">Kunde</label>
+        <select id="order-customer"><option value="">— keiner —</option></select>
+      </div>
+      <div class="field"><label for="order-notes">Notiz</label><textarea id="order-notes"></textarea></div>
+      <div class="actions">
+        <button type="submit">Merken</button>
+        <button type="button" class="ghost" id="order-new">Neu</button>
+        <button type="button" class="warn" id="order-delete" hidden>Löschen</button>
+      </div>
+    </form>
+    <p id="order-note" class="tiny"></p>
+    <p class="tiny" id="order-progress"></p>
+    <p class="tiny" id="order-actuals"></p>
+
+    <h2 class="section-gap">Positionen</h2>
+    <div class="table-wrap">
+      <table>
+        <thead><tr><th>Datei</th><th class="num">Stk</th><th class="num">fertig</th><th></th></tr></thead>
+        <tbody id="item-rows"></tbody>
+      </table>
+    </div>
+    <form id="item-form" class="section-gap">
+      <div class="grid-2">
+        <div class="field"><label for="item-file">Datei</label><select id="item-file"><option value="">—</option></select></div>
+        <div class="field"><label for="item-qty">Stück</label><input id="item-qty" type="number" min="1" step="1" value="1"></div>
+        <div class="field"><label for="item-price">Preis/Stk €</label><input id="item-price" type="number" min="0" step="0.01" value="0"></div>
+        <div class="field"><label for="item-material">Material</label><input id="item-material"></div>
+      </div>
+      <div class="actions"><button type="submit">Position hinzufügen</button></div>
+    </form>
+    <details class="section-gap">
+      <summary>Kunde anlegen</summary>
+      <form id="customer-form">
+        <div class="field"><label for="cust-name">Name</label><input id="cust-name" required></div>
+        <div class="field"><label for="cust-email">E-Mail</label><input id="cust-email" type="email"></div>
+        <button type="submit">Kunde speichern</button>
+      </form>
+    </details>
+  </section>
+</div>
+{% endblock %}
+{% block script %}
+<script>
+const STATUS_LABEL = {
+  idee: "Idee", angebot: "Angebot", bestaetigt: "bestätigt", druckt: "druckt",
+  fertig: "fertig", geliefert: "geliefert", bezahlt: "bezahlt",
+};
+let orders = [];
+let customers = [];
+let files = [];
+let current = null;
+
+function fillCustomers() {
+  const sel = document.getElementById("order-customer");
+  const val = sel.value;
+  sel.innerHTML = '<option value="">— keiner —</option>';
+  customers.forEach((c) => {
+    const o = document.createElement("option");
+    o.value = c.id;
+    o.textContent = c.name;
+    sel.appendChild(o);
+  });
+  if (val) sel.value = val;
+}
+
+function fillFiles() {
+  const sel = document.getElementById("item-file");
+  sel.innerHTML = '<option value="">—</option>';
+  files.slice(0, 400).forEach((f) => {
+    const o = document.createElement("option");
+    o.value = f.id;
+    o.textContent = f.name;
+    sel.appendChild(o);
+  });
+}
+
+function paintActuals(order) {
+  const el = document.getElementById("order-actuals");
+  const a = order.actuals;
+  if (!a) { el.textContent = ""; return; }
+  el.textContent = "Ist: " + euro(a.cost_total) + " · " + (hours(a.duration_s) || "0 min") + " · Ausschuss " + a.pieces_bad + " Stk";
+}
+
+function fillOrder(order) {
+  current = order;
+  document.getElementById("order-id").value = order ? order.id : "";
+  document.getElementById("order-title-in").value = order ? order.title : "";
+  document.getElementById("order-status").value = order ? order.status : "idee";
+  document.getElementById("order-due").value = order && order.due_at ? order.due_at.slice(0, 10) : "";
+  document.getElementById("order-customer").value = order && order.customer_id ? order.customer_id : "";
+  document.getElementById("order-notes").value = order ? order.notes : "";
+  document.getElementById("order-title").textContent = order ? order.title : "Neuer Auftrag";
+  document.getElementById("order-delete").hidden = !order;
+  const link = document.getElementById("lieferschein-link");
+  if (order) {
+    link.href = "/auftraege/" + order.id + "/lieferschein";
+    link.hidden = false;
+  } else {
+    link.hidden = true;
+  }
+  const prog = order && order.progress;
+  document.getElementById("order-progress").textContent = prog ? "Fortschritt: " + prog.label : "";
+  paintActuals(order || {});
+  renderItems(order && order.items ? order.items : []);
+}
+
+function renderItems(items) {
+  const body = document.getElementById("item-rows");
+  body.innerHTML = "";
+  if (!items.length) {
+    body.innerHTML = '<tr><td colspan="4" class="empty">Keine Positionen.</td></tr>';
+    return;
+  }
+  items.forEach((item) => {
+    const tr = document.createElement("tr");
+    tr.innerHTML = "<td></td><td class=\"num\"></td><td class=\"num\"></td><td class=\"actions\"></td>";
+    tr.children[0].textContent = item.file_name || ("#" + (item.file_id || "—"));
+    tr.children[1].textContent = item.qty;
+    tr.children[2].textContent = item.done_ok + (item.done_bad ? " (−" + item.done_bad + ")" : "");
+    const btn = document.createElement("button");
+    btn.type = "button";
+    btn.className = "ghost tiny-btn";
+    btn.textContent = "Einreihen";
+    btn.disabled = !item.file_id || !current;
+    btn.addEventListener("click", () => einreihen(item.id));
+    tr.children[3].appendChild(btn);
+    body.appendChild(tr);
+  });
+}
+
+async function einreihen(itemId) {
+  if (!current) return;
+  try {
+    await api("/auftraege/" + current.id + "/einreihen", {
+      method: "POST",
+      json: { item_id: itemId, when_free: true, confirm: true },
+    });
+    toast("In Warteschlange.");
+    const full = await api("/auftraege/" + current.id);
+    fillOrder(full);
+    await loadList();
+  } catch (error) {
+    showNote("order-note", error);
+  }
+}
+
+function renderList() {
+  const body = document.getElementById("order-rows");
+  body.innerHTML = "";
+  if (!orders.length) {
+    body.innerHTML = '<tr><td colspan="3" class="empty">Noch kein Auftrag.</td></tr>';
+    return;
+  }
+  orders.forEach((order) => {
+    const tr = document.createElement("tr");
+    tr.className = "pick";
+    tr.innerHTML = "<td></td><td></td><td></td>";
+    tr.children[0].textContent = order.title;
+    tr.children[1].textContent = STATUS_LABEL[order.status] || order.status;
+    tr.children[2].textContent = (order.progress && order.progress.label) || "";
+    tr.addEventListener("click", async () => {
+      const full = await api("/auftraege/" + order.id);
+      fillOrder(full);
+    });
+    body.appendChild(tr);
+  });
+}
+
+async function loadList() {
+  const st = document.getElementById("filter-status").value;
+  const q = st ? "?status=" + encodeURIComponent(st) : "";
+  orders = await api("/auftraege" + q);
+  renderList();
+}
+
+async function loadBase() {
+  [customers, files] = await Promise.all([
+    api("/kunden").catch(() => []),
+    api("/dateien").catch(() => []),
+  ]);
+  fillCustomers();
+  fillFiles();
+  await loadList();
+  fillOrder(null);
+}
+
+document.getElementById("filter-status").addEventListener("change", () => loadList().catch((e) => showNote("order-note", e)));
+
+document.getElementById("order-form").addEventListener("submit", async (event) => {
+  event.preventDefault();
+  const id = document.getElementById("order-id").value;
+  const payload = {
+    title: document.getElementById("order-title-in").value,
+    status: document.getElementById("order-status").value,
+    notes: document.getElementById("order-notes").value,
+    due_at: document.getElementById("order-due").value || null,
+    customer_id: document.getElementById("order-customer").value || null,
+  };
+  try {
+    const saved = id
+      ? await api("/auftraege/" + id, { method: "PATCH", json: payload })
+      : await api("/auftraege", { method: "POST", json: payload });
+    showNote("order-note", null);
+    document.getElementById("order-note").textContent = "Gemerkt.";
+    await loadList();
+    fillOrder(saved);
+  } catch (error) {
+    showNote("order-note", error);
+  }
+});
+
+document.getElementById("order-new").addEventListener("click", () => fillOrder(null));
+document.getElementById("order-delete").addEventListener("click", (event) => {
+  const id = document.getElementById("order-id").value;
+  if (!id) return;
+  armButton(event.currentTarget, "Auftrag wirklich löschen?", async () => {
+    await api("/auftraege/" + id, { method: "DELETE" });
+    toast("Gelöscht.");
+    fillOrder(null);
+    loadList();
+  });
+});
+
+document.getElementById("item-form").addEventListener("submit", async (event) => {
+  event.preventDefault();
+  if (!current) {
+    showNote("order-note", new Error("Zuerst Auftrag speichern."));
+    return;
+  }
+  const payload = {
+    file_id: document.getElementById("item-file").value || null,
+    qty: Number(document.getElementById("item-qty").value),
+    unit_price: Number(document.getElementById("item-price").value),
+    material_type: document.getElementById("item-material").value,
+  };
+  try {
+    await api("/auftraege/" + current.id + "/positionen", { method: "POST", json: payload });
+    const full = await api("/auftraege/" + current.id);
+    fillOrder(full);
+  } catch (error) {
+    showNote("order-note", error);
+  }
+});
+
+document.getElementById("customer-form").addEventListener("submit", async (event) => {
+  event.preventDefault();
+  try {
+    const row = await api("/kunden", {
+      method: "POST",
+      json: {
+        name: document.getElementById("cust-name").value,
+        email: document.getElementById("cust-email").value,
+      },
+    });
+    customers.push(row);
+    fillCustomers();
+    document.getElementById("order-customer").value = row.id;
+    document.getElementById("cust-name").value = "";
+    document.getElementById("cust-email").value = "";
+    toast("Kunde angelegt.");
+  } catch (error) {
+    showNote("order-note", error);
+  }
+});
+
+loadBase().catch((error) => showNote("order-note", error));
+</script>
+{% endblock %}

web/templates/bericht.html

@@ -0,0 +1,126 @@
+{% extends "layout.html" %}
+{% block body %}
+<div class="page-head">
+  <div>
+    <h1>Druckbericht</h1>
+    <p class="tiny" id="bericht-sub">Lauf wird geladen …</p>
+  </div>
+  <div class="page-head-side">
+    <a class="ghost" href="/protokoll">← Protokoll</a>
+    <a class="ghost" id="etikett-druck" href="#" hidden>Etikett Druck</a>
+    <a class="ghost" id="etikett-objekt" href="#" hidden>Etiketten Objekte</a>
+  </div>
+</div>
+<p id="bericht-note"></p>
+<div id="bericht" class="bericht"></div>
+{% endblock %}
+{% block script %}
+<script>
+const runId = Number(location.pathname.split("/").pop());
+const states = {
+  completed: "fertig", cancelled: "abgebrochen", error: "Fehler",
+  in_progress: "druckt", printing: "druckt", paused: "pausiert", interrupted: "unterbrochen",
+};
+
+function sourceLabel(source, estimate) {
+  if (estimate) return "Schätzwert";
+  if (source === "measured") return "Messwert";
+  if (source === "estimate") return "Schätzwert";
+  return source || "";
+}
+
+function render(data) {
+  const run = data.run;
+  const name = (run.filename || "").split("/").pop() || "ohne Datei";
+  document.getElementById("bericht-sub").textContent =
+    (run.printer_name || run.printer_host) + " · " + name
+    + (run.chargen_nr ? " · " + run.chargen_nr : "");
+
+  const planned = Number(run.weight_planned_g) || 0;
+  const used = Number(run.weight_used_g) || 0;
+  const diff = Math.round(used) - Math.round(planned);
+  const energy = data.energy || {};
+  const energyEuro = energy.cost != null ? Number(energy.cost) : Number(run.energy_cost || 0);
+  const cost = Number(run.filament_cost || 0) + energyEuro;
+  const energyHint = energy.source === "ed"
+    ? (Number(energy.kwh) || 0).toLocaleString("de-DE", { maximumFractionDigits: 2 }) + " kWh aus ED"
+    : (energy.kwh != null
+      ? (Number(energy.kwh) || 0).toLocaleString("de-DE", { maximumFractionDigits: 2 }) + " kWh pauschal"
+      : "");
+
+  const spoolRows = (data.spools || []).map((s) => `
+    <tr>
+      <td>${escapeHtml(s.name)}${s.ace_slot ? " · ACE " + s.ace_slot : ""}</td>
+      <td>${escapeHtml(s.material_type || "")}</td>
+      <td class="num">${grams(s.weight_planned_g)}</td>
+      <td class="num">${grams(s.weight_g)}${s.is_estimate ? ' <span class="tag">Schätzwert</span>' : ""}</td>
+      <td class="num">${euro(s.cost)}</td>
+      <td class="nowrap">${escapeHtml(s.chargen_nr || "")}</td>
+    </tr>`).join("") || '<tr><td class="empty" colspan="6">Keine Spule zugeordnet.</td></tr>';
+
+  const events = (data.events || []).map((e) =>
+    `<li><span class="tiny">${escapeHtml(formatDateTime(e.created_at))}</span> ${escapeHtml(e.message || e.kind)}</li>`
+  ).join("") || "<li class=\"tiny\">Keine Ereignisse.</li>";
+
+  const labels = (data.labels || []).filter((l) => !l.excluded);
+  const labelBits = labels.length
+    ? labels.map((l) => `<li id="objekt-${encodeURIComponent(l.object_name || "")}"><code>${escapeHtml(l.chargen_nr)}</code> ${escapeHtml(l.object_name || "Druck")}</li>`).join("")
+    : (run.chargen_nr ? `<li><code>${escapeHtml(run.chargen_nr)}</code> gesamter Druck</li>` : "<li class=\"tiny\">Noch keine Charge.</li>");
+
+  const segments = (data.segments || []).map((s) => {
+    const end = s.mm_end == null ? "…" : Math.round(s.mm_end);
+    return `<li>${escapeHtml(s.spool_name)} · ${Math.round(s.mm_start)}–${end} mm${s.ace_slot ? " · Platz " + s.ace_slot : ""}</li>`;
+  }).join("");
+
+  document.getElementById("bericht").innerHTML = `
+    <div class="card bericht-head">
+      <div class="bericht-meta">
+        <p><b>${escapeHtml(states[run.state] || run.state)}</b>${run.verdict ? " · Urteil " + escapeHtml(run.verdict) : ""}</p>
+        <p class="tiny">${escapeHtml(formatDateRange(run.started_at, run.ended_at))}</p>
+        <p>Dauer <b>${hours(run.duration_s)}</b>${run.estimated_s ? " · Soll " + hours(run.estimated_s) : ""}</p>
+        <p>Material <b>${grams(used)}</b> von ${grams(planned)}${planned ? " (" + (diff > 0 ? "+" : "") + diff + " g)" : ""}
+          ${run.weight_source ? ' · <span class="tag">' + sourceLabel(run.weight_source) + "</span>" : ""}</p>
+        <p>Kosten <b>${euro(cost)}</b> (Filament ${euro(run.filament_cost)} · Strom ${euro(energyEuro)}${energyHint ? " · " + energyHint : ""})</p>
+        ${run.message ? "<p class=\"msg\">" + escapeHtml(run.message) + "</p>" : ""}
+        ${data.project ? "<p class=\"tiny\">Projekt: " + escapeHtml(data.project.name) + "</p>" : ""}
+      </div>
+    </div>
+    <div class="card">
+      <h2>Spulen</h2>
+      <div class="table-wrap"><table>
+        <thead><tr><th>Spule</th><th>Sorte</th><th>Soll</th><th>Ist</th><th>Kosten</th><th>Charge</th></tr></thead>
+        <tbody>${spoolRows}</tbody>
+      </table></div>
+      ${segments ? "<h3>Abschnitte</h3><ul class=\"plain\">" + segments + "</ul>" : ""}
+    </div>
+    <div class="card">
+      <h2>Verlauf</h2>
+      ${tempChartHtml(data.samples)}
+    </div>
+    <div class="card grid-2">
+      <div>
+        <h2>Chargen</h2>
+        <ul class="plain">${labelBits}</ul>
+      </div>
+      <div>
+        <h2>Ereignisse</h2>
+        <ul class="plain">${events}</ul>
+      </div>
+    </div>`;
+
+  const druck = document.getElementById("etikett-druck");
+  const objekt = document.getElementById("etikett-objekt");
+  if (run.chargen_nr) {
+    druck.hidden = false;
+    druck.href = "/etikett/lauf/" + run.id + "?mode=druck";
+    objekt.hidden = false;
+    objekt.href = "/etikett/lauf/" + run.id + "?mode=objekt&qty=1";
+  } else {
+    druck.hidden = true;
+    objekt.hidden = true;
+  }
+}
+
+api("/laeufe/" + runId).then(render).catch((error) => showNote("bericht-note", error));
+</script>
+{% endblock %}

web/templates/dateien.html

@@ -11,6 +11,7 @@
     </select>
     <label class="button ghost" for="upload-file"><svg class="ico"><use href="#i-upload"/></svg>Hochladen</label>
     <input id="upload-file" type="file" accept=".gcode,.3mf,.gcode.3mf" multiple hidden>
+    <button type="button" class="ghost" id="folder-create" hidden><svg class="ico"><use href="#i-folder"/></svg>Ordner anlegen</button>
     <button type="button" class="ghost" id="rescan"><svg class="ico"><use href="#i-refresh"/></svg>Ordner neu lesen</button>
   </div>
 </div>
@@ -22,7 +23,7 @@
       <span class="count" id="lib-count">0</span>
     </div>
     <div class="lib-tools">
-      <input id="file-search" type="search" placeholder="Datei suchen…" autocomplete="off">
+      <input id="file-search" type="search" placeholder="Name, Material, Projekt…" autocomplete="off">
       <select id="file-filter-family">
         <option value="">Alle Maschinen</option>
         <option value="kobra_3">Kobra 3</option>
@@ -31,6 +32,20 @@
       <select id="file-filter-project">
         <option value="">Alle Projekte</option>
       </select>
+      <select id="file-filter-material" title="Material">
+        <option value="">Alle Materialien</option>
+      </select>
+      <select id="file-filter-folder" title="Ordner">
+        <option value="">Alle Ordner</option>
+      </select>
+      <select id="file-sort" title="Sortierung">
+        <option value="mtime">Neueste</option>
+        <option value="name">Name A–Z</option>
+        <option value="material">Material</option>
+        <option value="folder">Ordner</option>
+        <option value="time">Druckzeit</option>
+        <option value="weight">Gewicht</option>
+      </select>
     </div>
     <p id="file-note" class="tiny"></p>
     <div class="lib-list" id="lib-list">
@@ -103,7 +118,7 @@
         <select id="send-project"><option value="">keins</option></select>
         <div id="ace-box" class="ace-box" hidden>
           <h3>ACE-Zuordnung <span class="tip" title="Datei-Farbe auf ACE-Platz. Ohne Zuordnung startet der ACE oft nicht."><svg class="ico"><use href="#i-info"/></svg></span></h3>
-          <p class="tiny msg" id="ace-trailer-warn" hidden>Für Auto-Feed fehlen Slicer-Metadaten in der Datei.</p>
+          <p class="tiny" id="ace-trailer-warn" hidden>Mehrfarb ohne Slicer-Trailer — Grotti ergänzt `; referenced_tools` beim Senden.</p>
           <div id="ace-maps"></div>
         </div>
       </div>
@@ -146,14 +161,17 @@
 {% endblock %}
 {% block script %}
 <script src="{{ url_for('static', filename='three.min.js') }}?v=1"></script>
-<script src="{{ url_for('static', filename='gcode-viewer.js') }}?v=8"></script>
+<script src="{{ url_for('static', filename='gcode-viewer.js') }}?v=10"></script>
 <script src="{{ url_for('static', filename='sweep-viewer.js') }}?v=1"></script>
 <script>
 const families = { kobra_s1: "Kobra S1", kobra_3: "Kobra 3" };
 const ABLAUF_KEY = "grotti-ablauf-v2";
 const SEND_KEY = "grotti-send-v1";
+const LIB_KEY = "grotti-lib-v1";
 const STEP_TITLES = { print: "Drucken", cool: "Abkühlen", sweep: "Schieben", check: "Tasten" };
 let files = [];
+let knownFolders = [];
+let hasWatchDir = false;
 let printers = [];
 let spools = [];
 let projects = [];
@@ -198,7 +216,7 @@ async function showToolpath(file, progress) {
   if (viewerFileId !== file.id) {
     meta.textContent = "Pfad wird gelesen …";
     try {
-      const data = await api("/dateien/" + file.id + "/pfad");
+      const data = await api("/dateien/" + file.id + "/pfad?tp=8");
       viewer.setPath(data);
       viewerFileId = file.id;
       meta.textContent = (data.count || 0).toLocaleString("de-DE") + " Punkte";
@@ -252,13 +270,41 @@ function loadSendMemory() {
 
 /* ---------- ACE / Spule ---------- */
 
-function slotLabel(slot) {
+function spoolAtSlot(host, place) {
+  return spoolsOnHost(host).find((s) => Number(s.ace_slot) === Number(place)) || null;
+}
+
+function slotLabel(host, slot) {
   const place = Number(slot.index) + 1;
   const box = place <= 4 ? "ACE 1 · " + place : "ACE 2 · " + (place - 4);
+  const spool = spoolAtSlot(host, place);
+  if (spool) {
+    const bits = [box];
+    const kind = spool.material_type || slot.type || "";
+    if (kind) bits.push(kind);
+    if (spool.color) bits.push(spool.color);
+    if (spool.name) bits.push(spool.name);
+    bits.push(grams(spool.remaining_g));
+    return bits.join(" · ");
+  }
   const kind = slot.type ? " · " + slot.type : "";
   return box + kind;
 }
 
+function slotTitle(host, slot) {
+  const place = Number(slot.index) + 1;
+  const spool = spoolAtSlot(host, place);
+  if (!spool) return slot.type ? String(slot.type) : "";
+  const bits = [];
+  if (spool.brand) bits.push(spool.brand);
+  if (spool.name) bits.push(spool.name);
+  if (spool.material_type) bits.push(spool.material_type);
+  if (spool.color) bits.push(spool.color);
+  bits.push(grams(spool.remaining_g) + " Rest");
+  if (spool.chargen_nr) bits.push(spool.chargen_nr);
+  return bits.join(" · ");
+}
+
 function filamentLabel(filament, index) {
   const kind = filament.type || "Filament";
   const color = filament.color ? " · " + filament.color : "";
@@ -369,7 +415,10 @@ function renderAceMaps(force) {
   const paints = filePaints(file);
   box.hidden = false;
   document.getElementById("options").open = true;
-  if (trailerWarn) trailerWarn.hidden = !!file.ace_trailer;
+  // Mono: Trailer fehlt oft und ist kein Fehler — Grotti setzt ihn beim Senden mit ACE-Map.
+  if (trailerWarn) {
+    trailerWarn.hidden = !!file.ace_trailer || paints.length <= 1;
+  }
   root.innerHTML = "";
   chosen.forEach((printer) => {
     const block = document.createElement("div");
@@ -393,10 +442,15 @@ function renderAceMaps(force) {
       printer.slots.forEach((slot) => {
         const option = document.createElement("option");
         option.value = String(slot.index);
-        option.textContent = slotLabel(slot);
+        option.textContent = slotLabel(printer.host, slot);
-        if (slot.color) option.style.borderLeft = "4px solid " + slot.color;
+        option.title = slotTitle(printer.host, slot);
-        // einfache Vorauswahl: gleiche Sorte, sonst Platz in Reihenfolge
+        const spool = spoolAtSlot(printer.host, Number(slot.index) + 1);
-        if (!select.dataset.picked && filament.type && slot.type && filament.type.toLowerCase() === String(slot.type).toLowerCase()) {
+        const hex = (spool && spool.colors && spool.colors[0] && spool.colors[0].hex) || slot.color || "";
+        if (hex) option.style.borderLeft = "4px solid " + hex;
+        const spoolType = (spool && spool.material_type) || slot.type || "";
+        // Vorauswahl: gleiche Sorte (Grotti-Spule bevorzugt), sonst Platz in Reihenfolge
+        if (!select.dataset.picked && filament.type && spoolType
+            && filament.type.toLowerCase() === String(spoolType).toLowerCase()) {
           option.selected = true;
           select.dataset.picked = "1";
         }
@@ -434,17 +488,101 @@ function collectAceMaps() {
 
 /* ---------- Bibliothek ---------- */
 
+function projectNameOf(file) {
+  const project = projects.find((p) => String(p.id) === String(file.project_id));
+  return project ? project.name : "";
+}
+
+function materialKey(file) {
+  return materialText(file) || "";
+}
+
+function folderKey(file) {
+  const folder = file.folder;
+  if (folder === "Upload") return "Upload";
+  if (folder) return folder;
+  return "";
+}
+
+function folderLabel(folder) {
+  if (folder === "Upload") return "Upload";
+  if (folder) return folder;
+  return "Wurzel";
+}
+
+function saveLibMemory() {
+  try {
+    localStorage.setItem(LIB_KEY, JSON.stringify({
+      search: document.getElementById("file-search").value || "",
+      family: document.getElementById("file-filter-family").value || "",
+      project: document.getElementById("file-filter-project").value || "",
+      material: document.getElementById("file-filter-material").value || "",
+      folder: document.getElementById("file-filter-folder").value || "",
+      sort: document.getElementById("file-sort").value || "mtime",
+    }));
+  } catch (error) { /* ignore */ }
+}
+
+function loadLibMemory() {
+  try {
+    const data = JSON.parse(localStorage.getItem(LIB_KEY) || "{}");
+    const set = (id, value) => {
+      const node = document.getElementById(id);
+      if (!node || value == null) return;
+      node.value = value;
+    };
+    set("file-search", data.search || "");
+    set("file-filter-family", data.family || "");
+    set("file-filter-project", data.project || "");
+    set("file-filter-material", data.material || "");
+    set("file-filter-folder", data.folder || "");
+    set("file-sort", data.sort || "mtime");
+  } catch (error) { /* ignore */ }
+}
+
 function filteredFiles() {
   const q = (document.getElementById("file-search").value || "").trim().toLowerCase();
   const family = document.getElementById("file-filter-family").value;
   const project = document.getElementById("file-filter-project").value;
-  return files.filter((file) => {
+  const material = document.getElementById("file-filter-material").value;
+  const folder = document.getElementById("file-filter-folder").value;
+  const sort = document.getElementById("file-sort").value || "mtime";
+  const shown = files.filter((file) => {
     if (family && file.printer_family !== family) return false;
     if (project === "none" && file.project_id) return false;
     if (project && project !== "none" && String(file.project_id) !== project) return false;
+    if (material === "none" && materialKey(file)) return false;
+    if (material && material !== "none") {
+      const types = ((file.filaments) || []).map((f) => f.type).filter(Boolean);
+      if (!types.includes(material)) return false;
+    }
+    if (folder === "root" && folderKey(file)) return false;
+    if (folder && folder !== "root" && folderKey(file) !== folder) return false;
     if (!q) return true;
-    return String(file.name || "").toLowerCase().includes(q);
+    const hay = [
+      file.name || "",
+      materialKey(file),
+      projectNameOf(file),
+      folderKey(file),
+    ].join(" ").toLowerCase();
+    return hay.includes(q);
   });
+  const cmpStr = (a, b) => String(a || "").localeCompare(String(b || ""), "de", { sensitivity: "base" });
+  shown.sort((a, b) => {
+    if (sort === "name") return cmpStr(a.name, b.name) || (Number(b.mtime) || 0) - (Number(a.mtime) || 0);
+    if (sort === "material") {
+      return cmpStr(materialKey(a) || "\uffff", materialKey(b) || "\uffff")
+        || cmpStr(a.name, b.name);
+    }
+    if (sort === "folder") {
+      return cmpStr(folderLabel(folderKey(a)), folderLabel(folderKey(b)))
+        || cmpStr(a.name, b.name);
+    }
+    if (sort === "time") return (Number(b.estimated_s) || 0) - (Number(a.estimated_s) || 0) || cmpStr(a.name, b.name);
+    if (sort === "weight") return (Number(b.weight_g) || 0) - (Number(a.weight_g) || 0) || cmpStr(a.name, b.name);
+    return (Number(b.mtime) || 0) - (Number(a.mtime) || 0) || cmpStr(a.name, b.name);
+  });
+  return shown;
 }
 
 function fillProjectFilter() {
@@ -460,6 +598,70 @@ function fillProjectFilter() {
   if ([...select.options].some((o) => o.value === current)) select.value = current;
 }
 
+function fillMaterialFilter() {
+  const select = document.getElementById("file-filter-material");
+  const current = select.value;
+  const types = [...new Set(files.flatMap((f) => ((f.filaments) || []).map((x) => x.type).filter(Boolean)))];
+  types.sort((a, b) => a.localeCompare(b, "de", { sensitivity: "base" }));
+  select.innerHTML = '<option value="">Alle Materialien</option><option value="none">Ohne Material</option>';
+  types.forEach((type) => {
+    const option = document.createElement("option");
+    option.value = type;
+    option.textContent = type;
+    select.appendChild(option);
+  });
+  if ([...select.options].some((o) => o.value === current)) select.value = current;
+}
+
+function allFolderNames() {
+  const fromFiles = files.map((f) => folderKey(f)).filter((f) => f && f !== "Upload");
+  return [...new Set([...knownFolders, ...fromFiles])]
+    .sort((a, b) => folderLabel(a).localeCompare(folderLabel(b), "de", { sensitivity: "base" }));
+}
+
+function fillFolderFilter() {
+  const select = document.getElementById("file-filter-folder");
+  const current = select.value;
+  const folders = allFolderNames();
+  select.innerHTML = '<option value="">Alle Ordner</option><option value="root">Wurzel</option>';
+  folders.forEach((folder) => {
+    const option = document.createElement("option");
+    option.value = folder;
+    option.textContent = folderLabel(folder);
+    select.appendChild(option);
+  });
+  if ([...select.options].some((o) => o.value === current)) select.value = current;
+}
+
+function moveSelectHtml(file) {
+  if (!hasWatchDir || file.source !== "watch") return "";
+  const current = folderKey(file);
+  const opts = [
+    `<option value="" selected disabled>Verschieben…</option>`,
+    `<option value="__root__">Wurzel</option>`,
+    ...allFolderNames().map((folder) =>
+      `<option value="${escapeHtml(folder)}"${folder === current ? " disabled" : ""}>${escapeHtml(folderLabel(folder))}</option>`
+    ),
+    `<option value="__new__">Neuer Ordner…</option>`,
+  ];
+  return `<select class="lib-move" data-move="${file.id}" title="In Ordner verschieben" onclick="event.stopPropagation()">${opts.join("")}</select>`;
+}
+
+async function promptCreateFolder() {
+  const name = window.prompt("Neuer Ordner unter dem Slice-Pfad (z. B. PETG oder PLA/tests):", "");
+  if (name == null) return null;
+  const trimmed = String(name).trim();
+  if (!trimmed) {
+    toast("Ordnername fehlt.", "bad");
+    return null;
+  }
+  const result = await api("/dateien/ordner", { method: "POST", json: { folder: trimmed } });
+  knownFolders = result.folders || [];
+  fillFolderFilter();
+  toast("Ordner „" + (result.folder || trimmed) + "“ angelegt.", "good");
+  return result.folder || trimmed;
+}
+
 function fillProjects() {
   const opts = projects.map((row) =>
     `<option value="${escapeHtml(row.id)}">${escapeHtml(row.name)}</option>`
@@ -549,9 +751,21 @@ function thumbHtml(file) {
     : `<span class="ph">${icon("cube")}</span>`;
 }
 
+function libItemHtml(file) {
+  const project = projects.find((p) => String(p.id) === String(file.project_id));
+  const del = file.source === "upload"
+    ? `<button type="button" class="icon-btn" data-delete="${file.id}" title="Hochgeladene Datei löschen">${icon("x")}</button>` : "";
+  return `<div class="lib-item ${String(file.id) === String(sel.fileId) ? "on" : ""}" role="button" tabindex="0" data-file="${file.id}">
+    ${thumbHtml(file)}
+    <span style="min-width:0"><span class="t" title="${escapeHtml(file.name)}">${escapeHtml(file.name)}</span><span class="m">${alwaysMeta(file, project)}</span></span>
+    <span class="side">${moveSelectHtml(file)}${infoPopupHtml(file)}${del}</span>
+  </div>`;
+}
+
 function renderLibrary() {
   const list = document.getElementById("lib-list");
   const shown = filteredFiles();
+  const sort = document.getElementById("file-sort").value || "mtime";
   document.getElementById("lib-count").textContent = shown.length === files.length ? String(files.length) : shown.length + "/" + files.length;
   if (!files.length) {
     list.innerHTML = '<div class="picked-empty">' + icon("file") + '<span>Noch keine Datei.</span><span class="tiny">Hochladen oder Slice-Ordner in den Einstellungen setzen.</span></div>';
@@ -561,16 +775,19 @@ function renderLibrary() {
     list.innerHTML = '<div class="picked-empty">' + icon("search") + '<span>Keine Datei passt.</span></div>';
     return;
   }
-  list.innerHTML = shown.map((file) => {
+  const parts = [];
-    const project = projects.find((p) => String(p.id) === String(file.project_id));
+  let lastGroup = null;
-    const del = file.source === "upload"
+  shown.forEach((file) => {
-      ? `<button type="button" class="icon-btn" data-delete="${file.id}" title="Hochgeladene Datei löschen">${icon("x")}</button>` : "";
+    let group = null;
-    return `<div class="lib-item ${String(file.id) === String(sel.fileId) ? "on" : ""}" role="button" tabindex="0" data-file="${file.id}">
+    if (sort === "material") group = materialKey(file) || "Ohne Material";
-      ${thumbHtml(file)}
+    else if (sort === "folder") group = folderLabel(folderKey(file));
-      <span style="min-width:0"><span class="t" title="${escapeHtml(file.name)}">${escapeHtml(file.name)}</span><span class="m">${alwaysMeta(file, project)}</span></span>
+    if (group != null && group !== lastGroup) {
-      <span class="side">${infoPopupHtml(file)}${del}</span>
+      parts.push(`<div class="lib-group">${escapeHtml(group)}</div>`);
-    </div>`;
+      lastGroup = group;
-  }).join("");
+    }
+    parts.push(libItemHtml(file));
+  });
+  list.innerHTML = parts.join("");
 }
 
 /* ---------- Flow rechts ---------- */
@@ -759,18 +976,23 @@ function selectFile(id) {
 /* ---------- Laden ---------- */
 
 async function load() {
-  const [settings, fileRows, printerRows, spoolRows, projectRows, defaults] = await Promise.all([
+  const [settings, fileRows, printerRows, spoolRows, projectRows, defaults, folderPayload] = await Promise.all([
     api("/einstellungen"),
     api("/dateien"),
     api("/drucker?live=1"),
     api("/spulen"),
     api("/projekte").catch(() => []),
     api("/abraeumen-defaults").catch(() => null),
+    api("/dateien/ordner").catch(() => ({ folders: [] })),
   ]);
-  document.getElementById("watch").textContent = settings.watch_dir
+  hasWatchDir = !!(settings.watch_dir);
+  document.getElementById("watch").textContent = hasWatchDir
     ? "Slice-Ordner: " + settings.watch_dir
     : "Kein Slice-Ordner — Dateien hier hochladen.";
+  const createBtn = document.getElementById("folder-create");
+  if (createBtn) createBtn.hidden = !hasWatchDir;
   files = fileRows;
+  knownFolders = (folderPayload && folderPayload.folders) || [];
   printers = printerRows;
   spools = spoolRows;
   projects = projectRows || [];
@@ -780,11 +1002,26 @@ async function load() {
   if (sel.fileId && !selectedFile()) sel.fileId = null;
   fillProjects();
   fillProjectFilter();
+  fillMaterialFilter();
+  fillFolderFilter();
+  loadLibMemory();
+  fillProjectFilter();
+  fillMaterialFilter();
+  fillFolderFilter();
   renderLibrary();
   renderTabs();
   refreshFlow();
   const file = selectedFile();
   if (file) showToolpath(file, 0);
+  // Deep-Link von Orca /orca_senden: Senden in den Blick, Optionen offen für ACE
+  if (new URLSearchParams(location.search).get("file") && file) {
+    sel.tab = "send";
+    renderTabs();
+    const opts = document.getElementById("options");
+    if (opts) opts.open = true;
+    const panel = document.querySelector(".send-panel");
+    if (panel) panel.scrollIntoView({ behavior: "smooth", block: "start" });
+  }
 }
 
 async function refreshPrinters() {
@@ -1125,6 +1362,10 @@ async function doAblauf() {
 /* ---------- Ereignisse ---------- */
 
 document.getElementById("lib-list").addEventListener("click", (event) => {
+  if (event.target.closest(".lib-move")) {
+    event.stopPropagation();
+    return;
+  }
   const del = event.target.closest("[data-delete]");
   if (del) {
     event.stopPropagation();
@@ -1143,6 +1384,29 @@ document.getElementById("lib-list").addEventListener("click", (event) => {
   const item = event.target.closest("[data-file]");
   if (item) selectFile(item.dataset.file);
 });
+
+document.getElementById("lib-list").addEventListener("change", async (event) => {
+  const select = event.target.closest("select.lib-move");
+  if (!select) return;
+  event.stopPropagation();
+  const fileId = select.dataset.move;
+  let folder = select.value;
+  select.value = "";
+  if (!folder || !fileId) return;
+  try {
+    if (folder === "__new__") {
+      folder = await promptCreateFolder();
+      if (!folder) return;
+    } else if (folder === "__root__") {
+      folder = "";
+    }
+    await api("/dateien/" + fileId + "/verschieben", { method: "POST", json: { folder } });
+    toast(folder ? ("Nach „" + folder + "“ verschoben.") : "In die Wurzel verschoben.", "good");
+    await load();
+  } catch (error) {
+    toast(error.message || String(error), "bad");
+  }
+});
 document.getElementById("lib-list").addEventListener("keydown", (event) => {
   const item = event.target.closest("[data-file]");
   if (item && (event.key === "Enter" || event.key === " ")) {
@@ -1150,9 +1414,22 @@ document.getElementById("lib-list").addEventListener("keydown", (event) => {
     selectFile(item.dataset.file);
   }
 });
-["file-search", "file-filter-family", "file-filter-project"].forEach((id) => {
+[
-  document.getElementById(id).addEventListener("input", renderLibrary);
+  "file-search",
-  document.getElementById(id).addEventListener("change", renderLibrary);
+  "file-filter-family",
+  "file-filter-project",
+  "file-filter-material",
+  "file-filter-folder",
+  "file-sort",
+].forEach((id) => {
+  const node = document.getElementById(id);
+  if (!node) return;
+  const onChange = () => {
+    saveLibMemory();
+    renderLibrary();
+  };
+  node.addEventListener("input", onChange);
+  node.addEventListener("change", onChange);
 });
 
 document.getElementById("targets").addEventListener("click", (event) => {
@@ -1287,6 +1564,14 @@ const libCard = document.getElementById("lib-card");
 }));
 libCard.addEventListener("drop", (event) => uploadFiles(event.dataTransfer.files));
 
+document.getElementById("folder-create")?.addEventListener("click", async () => {
+  try {
+    await promptCreateFolder();
+  } catch (error) {
+    toast(error.message || String(error), "bad");
+  }
+});
+
 document.getElementById("rescan").addEventListener("click", async () => {
   try {
     const result = await api("/dateien/neu-lesen", { method: "POST" });

web/templates/einstellungen.html

@@ -18,6 +18,17 @@
     </select>
   </div>
   <p class="hint">Regal: größere Bedienelemente, kompakte Navigation — ideal für ~1024×860 Touch am Regal. Shortcut: <code>?shelf=1</code></p>
+  <div class="field" style="max-width:16rem; margin-top:0.85rem">
+    <label for="tz-mode">Zeitzone</label>
+    <select id="tz-mode">
+      <option value="auto">Browser (automatisch)</option>
+      <option value="Europe/Berlin">Europe/Berlin</option>
+      <option value="Europe/Vienna">Europe/Vienna</option>
+      <option value="Europe/Zurich">Europe/Zurich</option>
+      <option value="UTC">UTC</option>
+    </select>
+  </div>
+  <p class="hint">Für Protokoll, Bericht und Aktivitätszeiten. Nur dieser Browser.</p>
   <p id="display-note" class="ok" hidden>Gespeichert — gilt sofort.</p>
 </section>
 
@@ -29,6 +40,20 @@
   <p id="auto-note"></p>
 </section>
 
+<section class="card admin-only">
+  <h2>Slice-Ordner</h2>
+  <p class="hint">Ordner, den Grotti für die Bibliothek beobachtet (Orca-Export, „Ordner neu lesen“). Leer = nur manueller Upload. Standard: Ordner <code>slice</code> im Grotti-Repo.</p>
+  <div class="field" style="max-width:36rem">
+    <label for="watch-dir">Pfad</label>
+    <input id="watch-dir" type="text" autocomplete="off" placeholder="D:\Projekte\Grotti\slice" spellcheck="false">
+  </div>
+  <div class="actions">
+    <button type="button" id="watch-save">Speichern</button>
+    <button type="button" class="ghost" id="watch-default">Standardordner</button>
+  </div>
+  <p id="watch-note"></p>
+</section>
+
 <section class="card admin-only">
   <h2>Öffentliche Adresse</h2>
   <p class="hint">FQDN bzw. Basis-URL für QR-Codes auf Spulen-Etiketten. Leer = Host der aktuellen Anfrage (z.&nbsp;B. localhost).</p>
@@ -101,17 +126,53 @@
   <p id="tg-note"></p>
 </section>
 
+<section class="card admin-only">
+  <h2>ntfy</h2>
+  <label class="check"><input type="checkbox" id="ntfy-enabled"> Push über ntfy</label>
+  <div class="grid-2" style="margin-top:0.75rem">
+    <div class="field">
+      <label for="ntfy-server">Server</label>
+      <input id="ntfy-server" placeholder="https://ntfy.sh" autocomplete="off">
+    </div>
+    <div class="field">
+      <label for="ntfy-topic">Topic</label>
+      <input id="ntfy-topic" placeholder="grotti-werkstatt" autocomplete="off">
+    </div>
+    <div class="field" style="grid-column:1/-1">
+      <label for="ntfy-token">Token (optional)</label>
+      <input id="ntfy-token" type="password" autocomplete="off" placeholder="Bearer-Token">
+    </div>
+  </div>
+  <p class="hint">Gleiche Meldungen wie Telegram — unabhängig abschaltbar.</p>
+  <div class="actions"><button type="button" id="ntfy-save">Speichern</button></div>
+  <p id="ntfy-note"></p>
+</section>
+
+<section class="card admin-only">
+  <h2>Backup</h2>
+  <p class="hint">PostgreSQL-Dump und Datenordner (ohne toolpath/ und alte Backups).</p>
+  <div class="actions">
+    <button type="button" id="backup-now">Backup jetzt</button>
+  </div>
+  <ul id="backup-list" class="tiny"></ul>
+  <p id="backup-note"></p>
+</section>
+
 <section class="card admin-only">
   <h2>Energie</h2>
-  <p class="hint">Für Kosten im Protokoll. Filament zählt erst mit zugeordneter Spule.</p>
+  <p class="hint">Kosten im Protokoll. Mit Düse-/Bett-Watt und ED-Proben schätzt Grotti den Verbrauch; sonst Dauer × Grundlast. Filament braucht eine Spule.</p>
   <div class="grid-2">
-    <div class="field"><label for="en-watts">Drucker W</label><input id="en-watts" type="number" step="1"></div>
+    <div class="field"><label for="en-watts">Grundlast W</label><input id="en-watts" type="number" step="1" title="Elektronik/Motion — nicht die Heizer"></div>
     <div class="field"><label for="en-kwh">€ / kWh</label><input id="en-kwh" type="number" step="0.01"></div>
+    <div class="field"><label for="en-nozzle">Düse W</label><input id="en-nozzle" type="number" step="1" placeholder="z. B. 60"></div>
+    <div class="field"><label for="en-bed">Bett W</label><input id="en-bed" type="number" step="1" placeholder="z. B. 220"></div>
     <div class="field"><label for="en-dryer">Trockner W</label><input id="en-dryer" type="number" step="1"></div>
     <div class="field"><label for="en-dryh">Trockenstunden</label><input id="en-dryh" type="number" step="0.1"></div>
     <div class="field"><label for="en-waste">Ausschuss %</label><input id="en-waste" type="number" step="0.1"></div>
     <div class="field"><label for="en-util">Auslastung %</label><input id="en-util" type="number" step="1"></div>
   </div>
+  <p class="hint">Grundlast = Elektronik/Motion (nicht ganzer Drucker). Düse/Bett 0 = nur pauschal. Typisch Kobra: Düse ~60 W, Bett ~200–300 W.</p>
+  <p id="en-ed-hint" class="hint" hidden></p>
   <div class="actions"><button type="button" id="en-save">Speichern</button></div>
   <p id="en-note"></p>
 </section>
@@ -330,6 +391,11 @@ async function load() {
   ]);
   if (isAdmin) renderPrinters(printers);
   document.getElementById("auto-queue").checked = settings.auto_queue !== false;
+  const watchDir = document.getElementById("watch-dir");
+  if (watchDir) {
+    watchDir.value = settings.watch_dir || "";
+    watchDir.dataset.default = settings.watch_dir_default || "";
+  }
   const fqdn = document.getElementById("fqdn");
   if (fqdn) fqdn.value = settings.fqdn || "";
   const tgEnabled = document.getElementById("tg-enabled");
@@ -347,17 +413,28 @@ async function load() {
     document.getElementById("al-queue").checked = alerts.queue !== false;
     document.getElementById("al-ablauf").checked = !!alerts.ablauf;
     document.getElementById("al-start").checked = !!alerts.start;
+    const ntfy = settings.ntfy || {};
+    document.getElementById("ntfy-enabled").checked = !!ntfy.enabled;
+    document.getElementById("ntfy-server").value = ntfy.server || "https://ntfy.sh";
+    document.getElementById("ntfy-topic").value = ntfy.topic || "";
+    document.getElementById("ntfy-token").value = "";
+    document.getElementById("ntfy-token").placeholder = ntfy.token_set
+      ? ("gesetzt: " + (ntfy.token || "••••"))
+      : "optional";
     const en = settings.energy || {};
-    document.getElementById("en-watts").value = en.watts ?? 120;
+    document.getElementById("en-watts").value = en.watts ?? 40;
+    document.getElementById("en-nozzle").value = en.nozzle_watts ?? 60;
+    document.getElementById("en-bed").value = en.bed_watts ?? 220;
     document.getElementById("en-kwh").value = en.euro_per_kwh ?? 0.35;
     document.getElementById("en-dryer").value = en.dryer_watts ?? 0;
     document.getElementById("en-dryh").value = en.dry_hours ?? 0;
     document.getElementById("en-waste").value = en.waste_percent ?? 0;
     document.getElementById("en-util").value = en.utilization ?? 50;
+    updateEnergyEdHint();
   }
   const legacy = document.getElementById("legacy-token-hint");
   if (legacy) legacy.hidden = !settings.legacy_token_set;
-  await Promise.all([loadUsers(), loadTokens()]);
+  await Promise.all([loadUsers(), loadTokens(), loadBackups()]);
 }
 
 document.getElementById("user-add")?.addEventListener("submit", async (event) => {
@@ -417,6 +494,30 @@ document.getElementById("auto-save").addEventListener("click", async () => {
   }
 });
 
+document.getElementById("watch-default")?.addEventListener("click", () => {
+  const input = document.getElementById("watch-dir");
+  if (input) input.value = input.dataset.default || "";
+});
+
+document.getElementById("watch-save")?.addEventListener("click", async () => {
+  try {
+    const out = await api("/einstellungen", {
+      method: "PATCH",
+      json: { watch_dir: document.getElementById("watch-dir").value.trim() },
+    });
+    document.getElementById("watch-dir").value = out.watch_dir || "";
+    showNote(
+      "watch-note",
+      null,
+      out.watch_dir
+        ? "Slice-Ordner aktiv: " + out.watch_dir
+        : "Kein Slice-Ordner — nur manueller Upload."
+    );
+  } catch (error) {
+    showNote("watch-note", error);
+  }
+});
+
 document.getElementById("fqdn-save").addEventListener("click", async () => {
   try {
     const out = await api("/einstellungen", {
@@ -481,6 +582,49 @@ document.getElementById("tg-save").addEventListener("click", async () => {
   }
 });
 
+document.getElementById("ntfy-save")?.addEventListener("click", async () => {
+  const token = document.getElementById("ntfy-token").value.trim();
+  const payload = {
+    ntfy: {
+      enabled: document.getElementById("ntfy-enabled").checked,
+      server: document.getElementById("ntfy-server").value.trim() || "https://ntfy.sh",
+      topic: document.getElementById("ntfy-topic").value.trim(),
+    },
+  };
+  if (token) payload.ntfy.token = token;
+  try {
+    await api("/einstellungen", { method: "PATCH", json: payload });
+    showNote("ntfy-note", null, "ntfy gespeichert.");
+    load();
+  } catch (error) {
+    showNote("ntfy-note", error);
+  }
+});
+
+async function loadBackups() {
+  const list = document.getElementById("backup-list");
+  if (!list) return;
+  try {
+    const out = await api("/backup");
+    list.innerHTML = (out.items || []).slice(0, 8).map((item) => {
+      const mb = ((item.size || 0) / (1024 * 1024)).toLocaleString("de-DE", { maximumFractionDigits: 1 });
+      return `<li><a href="/backup/${encodeURIComponent(item.name)}" download>${escapeHtml(item.name)}</a> · ${mb} MB</li>`;
+    }).join("") || "<li>Noch kein Backup.</li>";
+  } catch (error) {
+    list.innerHTML = "<li>Liste nicht verfügbar.</li>";
+  }
+}
+
+document.getElementById("backup-now")?.addEventListener("click", async () => {
+  try {
+    const out = await api("/backup", { method: "POST", json: {} });
+    showNote("backup-note", null, "Backup erstellt: " + (out.name || ""));
+    loadBackups();
+  } catch (error) {
+    showNote("backup-note", error);
+  }
+});
+
 document.getElementById("tg-test").addEventListener("click", async () => {
   try {
     await api("/telegram/test", { method: "POST", json: {} });
@@ -490,13 +634,36 @@ document.getElementById("tg-test").addEventListener("click", async () => {
   }
 });
 
+function updateEnergyEdHint() {
+  const hint = document.getElementById("en-ed-hint");
+  if (!hint) return;
+  const nozzle = Number(document.getElementById("en-nozzle").value) || 0;
+  const bed = Number(document.getElementById("en-bed").value) || 0;
+  if (nozzle > 0 && bed > 0) {
+    hint.hidden = true;
+    hint.textContent = "";
+    return;
+  }
+  hint.hidden = false;
+  hint.textContent = "Düse oder Bett noch 0 — Bericht bleibt „pauschal“. Für ED z. B. Düse 60 W und Bett 220 W setzen.";
+}
+
+["en-nozzle", "en-bed"].forEach((id) => {
+  const node = document.getElementById(id);
+  if (node) node.addEventListener("input", updateEnergyEdHint);
+});
+
 document.getElementById("en-save").addEventListener("click", async () => {
   try {
+    const nozzle = Number(document.getElementById("en-nozzle").value) || 0;
+    const bed = Number(document.getElementById("en-bed").value) || 0;
     await api("/einstellungen", {
       method: "PATCH",
       json: {
         energy: {
           watts: Number(document.getElementById("en-watts").value),
+          nozzle_watts: nozzle,
+          bed_watts: bed,
           euro_per_kwh: Number(document.getElementById("en-kwh").value),
           dryer_watts: Number(document.getElementById("en-dryer").value),
           dry_hours: Number(document.getElementById("en-dryh").value),
@@ -505,7 +672,17 @@ document.getElementById("en-save").addEventListener("click", async () => {
         },
       },
     });
+    updateEnergyEdHint();
+    if (nozzle <= 0 || bed <= 0) {
+      const note = document.getElementById("en-note");
+      if (note) {
+        note.textContent = "Gespeichert. Düse/Bett 0 → nur pauschal. Für ED z. B. 60 / 220 W setzen.";
+        note.className = "msg";
+      }
+      toast("Energie gespeichert — ED noch aus (Düse/Bett 0).", "bad");
+    } else {
       showNote("en-note", null, "Energie gespeichert.");
+    }
   } catch (error) {
     showNote("en-note", error);
   }
@@ -534,6 +711,26 @@ document.getElementById("en-save").addEventListener("click", async () => {
   });
 })();
 
+(function initTimeZone() {
+  const sel = document.getElementById("tz-mode");
+  if (!sel) return;
+  const known = ["auto", "Europe/Berlin", "Europe/Vienna", "Europe/Zurich", "UTC"];
+  try {
+    const value = localStorage.getItem(TZ_KEY) || "auto";
+    sel.value = known.includes(value) ? value : "auto";
+  } catch (error) {
+    sel.value = "auto";
+  }
+  sel.addEventListener("change", () => {
+    try { localStorage.setItem(TZ_KEY, sel.value || "auto"); } catch (error) {}
+    const note = document.getElementById("display-note");
+    if (note) {
+      note.hidden = false;
+      setTimeout(() => { note.hidden = true; }, 2500);
+    }
+  });
+})();
+
 load().catch((error) => showNote("printer-note", error));
 </script>
 {% endblock %}

web/templates/etikett.html

@@ -41,14 +41,17 @@
     border: 1px solid #ccc;
     border-radius: 4px;
     display: grid;
-    grid-template-columns: 1fr 22mm;
+    grid-template-columns: 1fr 20mm;
-    gap: 3mm;
+    gap: 2.5mm;
     align-items: center;
+    overflow: hidden;
   }
+  .meta { min-width: 0; }
   .meta h1 {
     margin: 0 0 2mm;
     font-size: 4.2mm;
     letter-spacing: -0.02em;
+    overflow-wrap: anywhere;
   }
   .meta p { margin: 0 0 1.2mm; font-size: 3.1mm; color: #333; }
   .meta .code { font-weight: 700; font-variant-numeric: tabular-nums; }
@@ -61,7 +64,19 @@
     margin-left: -1mm;
   }
   .dot:first-child { margin-left: 0; }
-  #qr { width: 20mm; height: 20mm; }
+  .qr-wrap {
+    width: 20mm;
+    height: 20mm;
+    overflow: hidden;
+    flex-shrink: 0;
+  }
+  .qr-wrap canvas {
+    display: block;
+    width: 20mm !important;
+    height: 20mm !important;
+    max-width: 100%;
+    max-height: 100%;
+  }
   @media print {
     body { background: #fff; }
     .toolbar { display: none; }
@@ -99,14 +114,20 @@
     <p>Hersteller: {{ spool.hersteller_charge }}</p>
     {% endif %}
   </div>
-  <canvas id="qr" width="120" height="120"></canvas>
+  <div class="qr-wrap">
+    <canvas id="qr" width="80" height="80"></canvas>
+  </div>
 </div>
 <script src="{{ url_for('static', filename='qrcode.min.js') }}?v=1"></script>
 <script>
 QRCode.toCanvas(document.getElementById("qr"), {{ qr_url|tojson }}, {
-  width: 120,
+  width: 80,
   margin: 1,
   color: { dark: "#111111", light: "#ffffff" }
+}, () => {
+  const node = document.getElementById("qr");
+  node.style.width = "20mm";
+  node.style.height = "20mm";
 });
 </script>
 </body>

web/templates/etikett_lauf.html

@@ -0,0 +1,126 @@
+<!DOCTYPE html>
+<html lang="de">
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<title>{{ title }}</title>
+<style>
+  :root { color-scheme: light; }
+  * { box-sizing: border-box; }
+  body {
+    margin: 0;
+    font: 14px/1.35 "Segoe UI", system-ui, sans-serif;
+    color: #111;
+    background: #f3f3f3;
+  }
+  .toolbar {
+    display: flex;
+    gap: 0.6rem;
+    padding: 0.8rem 1rem;
+    background: #1a1a1a;
+    color: #eee;
+  }
+  .toolbar a, .toolbar button {
+    color: #111;
+    background: #f97316;
+    border: 0;
+    border-radius: 8px;
+    padding: 0.4rem 0.85rem;
+    font: inherit;
+    font-weight: 650;
+    text-decoration: none;
+    cursor: pointer;
+  }
+  .toolbar a.ghost { background: transparent; color: #eee; border: 1px solid #555; }
+  .sheet {
+    width: 70mm;
+    min-height: 40mm;
+    margin: 1.2rem auto;
+    padding: 3.5mm;
+    background: #fff;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    display: grid;
+    grid-template-columns: 1fr 20mm;
+    gap: 2.5mm;
+    align-items: center;
+    overflow: hidden;
+    page-break-after: always;
+  }
+  .sheet:last-child { page-break-after: auto; }
+  .meta { min-width: 0; }
+  .meta h1 {
+    margin: 0 0 2mm;
+    font-size: 4.2mm;
+    letter-spacing: -0.02em;
+    overflow-wrap: anywhere;
+  }
+  .meta p { margin: 0 0 1.2mm; font-size: 3.1mm; color: #333; }
+  .meta .code { font-weight: 700; font-variant-numeric: tabular-nums; }
+  .qr-wrap {
+    width: 20mm;
+    height: 20mm;
+    overflow: hidden;
+    flex-shrink: 0;
+  }
+  .qr-wrap canvas,
+  .qr-wrap img {
+    display: block;
+    width: 20mm !important;
+    height: 20mm !important;
+    max-width: 100%;
+    max-height: 100%;
+  }
+  @media print {
+    body { background: #fff; }
+    .toolbar { display: none; }
+    .sheet {
+      margin: 0;
+      border: 0;
+      border-radius: 0;
+      page-break-inside: avoid;
+    }
+  }
+</style>
+</head>
+<body>
+<div class="toolbar">
+  <button type="button" onclick="window.print()">Drucken</button>
+  <a class="ghost" href="/protokoll/{{ run.id }}">Zurück</a>
+</div>
+{% for sheet in sheets %}
+<div class="sheet">
+  <div class="meta">
+    <h1>{{ sheet.object_name or (run.filename.split('/')[-1] if run.filename else 'Druck') }}</h1>
+    <p class="code">{{ sheet.chargen_nr }}</p>
+    {% set soll = sheet.target_g if sheet.target_g is defined else target_g %}
+    {% if soll %}
+    <p>Soll {{ '%.0f'|format(soll) }} g</p>
+    {% endif %}
+    <p>{{ run.printer_name }} · {{ (run.ended_at or run.started_at or '')[:10] }}</p>
+    {% for spool in spools %}
+    <p>{% if spool.material_type %}{{ spool.material_type }}{% endif %}{% if spool.brand %} · {{ spool.brand }}{% endif %}{% if spool.name %} · {{ spool.name }}{% endif %}{% if spool.chargen_nr %} · {{ spool.chargen_nr }}{% endif %}{% if spool.hersteller_charge %} · H: {{ spool.hersteller_charge }}{% endif %}</p>
+    {% else %}
+    <p class="code" style="font-weight:500;color:#666">kein Material zugeordnet</p>
+    {% endfor %}
+  </div>
+  <div class="qr-wrap">
+    <canvas class="qr" id="qr-{{ loop.index0 }}" width="80" height="80" data-url="{{ sheet.qr_url }}"></canvas>
+  </div>
+</div>
+{% endfor %}
+<script src="{{ url_for('static', filename='qrcode.min.js') }}?v=1"></script>
+<script>
+document.querySelectorAll("canvas.qr").forEach((node) => {
+  QRCode.toCanvas(node, node.dataset.url, {
+    width: 80,
+    margin: 1,
+    color: { dark: "#111111", light: "#ffffff" }
+  }, () => {
+    node.style.width = "20mm";
+    node.style.height = "20mm";
+  });
+});
+</script>
+</body>
+</html>

web/templates/layout.html

@@ -9,7 +9,9 @@
 <link rel="icon" type="image/png" sizes="32x32" href="{{ url_for('static', filename='brand/favicon-32.png') }}">
 <link rel="icon" type="image/png" sizes="512x512" href="{{ url_for('static', filename='brand/favicon.png') }}">
 <link rel="apple-touch-icon" href="{{ url_for('static', filename='brand/apple-touch-icon.png') }}">
-<link rel="stylesheet" href="{{ url_for('static', filename='grotti.css') }}?v=39">
+<link rel="stylesheet" href="{{ url_for('static', filename='grotti.css') }}?v=54">
+<link rel="manifest" href="{{ url_for('static', filename='manifest.webmanifest') }}">
+<meta name="theme-color" content="#0a0a0c">
 <script>
 (function () {
   try {
@@ -38,6 +40,7 @@
 </script>
 </head>
 <body class="app-shell">
+<div id="conn-banner" class="conn-banner" hidden role="status"></div>
 <svg width="0" height="0" style="position:absolute" aria-hidden="true">
   <symbol id="i-printer" viewBox="0 0 24 24"><path d="M6 18H4a2 2 0 0 1-2-2v-5a2 2 0 0 1 2-2h16a2 2 0 0 1 2 2v5a2 2 0 0 1-2 2h-2"/><path d="M6 9V3h12v6"/><rect x="6" y="14" width="12" height="8" rx="1"/></symbol>
   <symbol id="i-camera" viewBox="0 0 24 24"><path d="M14.5 4h-5L7 7H4a2 2 0 0 0-2 2v9a2 2 0 0 0 2 2h16a2 2 0 0 0 2-2V9a2 2 0 0 0-2-2h-3l-2.5-3z"/><circle cx="12" cy="13" r="3"/></symbol>
@@ -96,13 +99,15 @@
   </div>
   <nav class="nav-main" aria-label="Hauptmenü">
     <a href="/" class="{{ 'on' if page == 'wand' else '' }}" title="Drucker"><svg class="ico"><use href="#i-printer"/></svg><span>Drucker</span></a>
-    <a href="/dateien" class="{{ 'on' if page == 'dateien' else '' }} nav-desk" title="Dateien"><svg class="ico"><use href="#i-send"/></svg><span>Dateien</span></a>
+    <a href="/dateien" class="{{ 'on' if page == 'dateien' else '' }} nav-desk" title="Dateien"><svg class="ico"><use href="#i-file"/></svg><span>Dateien</span></a>
     <a href="/kameras" class="{{ 'on' if page == 'kameras' else '' }}" title="Kameras"><svg class="ico"><use href="#i-camera"/></svg><span>Kameras</span></a>
-    <a href="/aktivitaet" class="{{ 'on' if page == 'aktivitaet' else '' }} nav-desk" title="Aktivität"><svg class="ico"><use href="#i-activity"/></svg><span>Aktivität</span></a>
     <a href="/warteschlange" class="{{ 'on' if page == 'warteschlange' else '' }}" title="Warteschlange"><svg class="ico"><use href="#i-queue"/></svg><span>Warteschlange</span></a>
-    <a href="/protokoll" class="{{ 'on' if page == 'protokoll' else '' }} nav-desk" title="Protokoll"><svg class="ico"><use href="#i-list"/></svg><span>Protokoll</span></a>
+    <a href="/auftraege" class="{{ 'on' if page == 'auftraege' else '' }} nav-desk" title="Aufträge"><svg class="ico"><use href="#i-folder"/></svg><span>Aufträge</span></a>
+    <a href="/protokoll" class="{{ 'on' if page == 'protokoll' or page == 'bericht' else '' }} nav-desk" title="Protokoll"><svg class="ico"><use href="#i-list"/></svg><span>Protokoll</span></a>
+    <a href="/statistik" class="{{ 'on' if page == 'statistik' else '' }} nav-desk" title="Statistik"><svg class="ico"><use href="#i-grid"/></svg><span>Statistik</span></a>
+    <a href="/aktivitaet" class="{{ 'on' if page == 'aktivitaet' else '' }} nav-desk" title="Aktivität"><svg class="ico"><use href="#i-activity"/></svg><span>Aktivität</span></a>
     <a href="/material" class="{{ 'on' if page == 'material' else '' }} nav-desk" title="Material"><svg class="ico"><use href="#i-spool"/></svg><span>Material</span></a>
-    <a href="/projekte" class="{{ 'on' if page == 'projekte' else '' }} nav-desk" title="Projekte"><svg class="ico"><use href="#i-folder"/></svg><span>Projekte</span></a>
+    <a href="/wartung" class="{{ 'on' if page == 'wartung' else '' }} nav-desk" title="Wartung"><svg class="ico"><use href="#i-nozzle"/></svg><span>Wartung</span></a>
   </nav>
   <div class="live-panel" id="live-panel">
     <details class="queue-box" data-box="run" id="run-box" open hidden>
@@ -130,7 +135,6 @@
   </div>
   <nav class="nav-secondary" aria-label="Weitere Seiten">
     <a href="/einstellungen" class="{{ 'on' if page == 'einstellungen' else '' }}" title="Einstellungen"><svg class="ico"><use href="#i-settings"/></svg><span>Einstellungen</span></a>
-    <a href="/ideen" class="{{ 'on' if page == 'ideen' else '' }}" title="Ideen"><svg class="ico"><use href="#i-bulb"/></svg><span>Ideen</span></a>
     <a href="/doku" class="{{ 'on' if page == 'doku' else '' }}" title="Doku"><svg class="ico"><use href="#i-book"/></svg><span>Doku</span></a>
   </nav>
   <div class="side-foot">
@@ -151,12 +155,26 @@
 </div>
 <nav class="mobile-nav" aria-label="Schnellmenü">
   <a href="/" class="{{ 'on' if page == 'wand' else '' }}"><svg class="ico"><use href="#i-printer"/></svg><span>Drucker</span></a>
-  <a href="/dateien" class="{{ 'on' if page == 'dateien' else '' }} nav-desk"><svg class="ico"><use href="#i-send"/></svg><span>Dateien</span></a>
+  <a href="/dateien" class="{{ 'on' if page == 'dateien' else '' }}"><svg class="ico"><use href="#i-file"/></svg><span>Dateien</span></a>
-  <a href="/kameras" class="{{ 'on' if page == 'kameras' else '' }} nav-shelf"><svg class="ico"><use href="#i-camera"/></svg><span>Kameras</span></a>
+  <a href="/warteschlange" class="{{ 'on' if page == 'warteschlange' else '' }}"><svg class="ico"><use href="#i-queue"/></svg><span>Queue</span></a>
-  <a href="/warteschlange" class="{{ 'on' if page == 'warteschlange' else '' }} nav-shelf"><svg class="ico"><use href="#i-queue"/></svg><span>Warteschlange</span></a>
+  <a href="/aktivitaet" class="{{ 'on' if page == 'aktivitaet' else '' }}"><svg class="ico"><use href="#i-activity"/></svg><span>Aktivität</span></a>
-  <a href="/aktivitaet" class="{{ 'on' if page == 'aktivitaet' else '' }} nav-desk"><svg class="ico"><use href="#i-activity"/></svg><span>Aktivität</span></a>
+  <button type="button" class="mobile-more-btn" id="mobile-more" aria-expanded="false" aria-controls="mobile-more-sheet"><svg class="ico"><use href="#i-menu"/></svg><span>Mehr</span></button>
 </nav>
-<script src="{{ url_for('static', filename='api.js') }}?v=24"></script>
+<dialog id="mobile-more-sheet" class="mobile-more-sheet">
+  <nav aria-label="Weitere Seiten">
+    <a href="/kameras">Kameras</a>
+    <a href="/auftraege">Aufträge</a>
+    <a href="/protokoll">Protokoll</a>
+    <a href="/statistik">Statistik</a>
+    <a href="/material">Material</a>
+    <a href="/wartung">Wartung</a>
+    <a href="/einstellungen">Einstellungen</a>
+    <a href="/doku">Doku</a>
+  </nav>
+  <form method="dialog"><button class="ghost">Schließen</button></form>
+</dialog>
+<script src="{{ url_for('static', filename='api.js') }}?v=28"></script>
+<script src="{{ url_for('static', filename='ui.js') }}?v=2"></script>
 <script>
 document.getElementById("logout-btn")?.addEventListener("click", async () => {
   try { await api("/auth/logout", { method: "POST", json: {} }); } catch (e) {}
@@ -240,21 +258,44 @@ async function cancelQueueItem(job, button) {
 }
 window.cancelQueueItem = cancelQueueItem;
 
-function runItemHtml(job) {
+function ablaufStepFrac(job) {
-  const rep = repeatText(job);
+  if (!job || !job.is_ablauf || !job.step_labels || !job.step_labels.length) return "";
-  const steps = job.is_ablauf ? stepsHtml(job.step_labels, job.display_step_index != null ? job.display_step_index : job.step_index, true) : "";
+  const idx = Number(job.display_step_index != null ? job.display_step_index : job.step_index) || 0;
-  return `<li class="queue-item running">
+  return (idx + 1) + "/" + job.step_labels.length;
-    <div class="queue-row">
+}
-      <a class="queue-link grow" href="/#${encodeURIComponent(job.host || "")}"><span class="queue-name">${escapeHtml(queueTarget(job))}</span></a>
+
-      ${rep ? `<span class="queue-sub">${escapeHtml(rep)}</span>` : ""}
+function runLineHtml({ name, progress, remain, filename, tipExtra, cancelId }) {
-      <span class="queue-tools"><button type="button" class="icon-btn danger" data-cancel-q="${job.id}" title="Abbrechen">${icon("x")}</button></span>
+  const pct = Math.max(0, Math.min(100, Math.round((Number(progress) || 0) * 100)));
-    </div>
+  const finish = remain > 0 ? finishClock(remain) : "";
-    ${steps}
+  const bits = [name];
-    <span class="queue-msg">${escapeHtml(phaseText(job))}</span>
+  if (pct > 0 || remain > 0) bits.push(pct + " %");
-    <span class="queue-sub">${escapeHtml(jobLabel(job.filename))}</span>
+  if (finish) bits.push(finish);
+  if (tipExtra) bits.push(tipExtra);
+  const tip = [
+    filename ? jobLabel(filename) : "",
+    remain > 0 ? "noch " + hours(remain) : "",
+    tipExtra ? "Schritt " + tipExtra : "",
+  ].filter(Boolean).join(" · ");
+  return `<li class="queue-item running run-line" style="--pct:${pct}">
+    <a class="queue-link run-line-link" href="/warteschlange" title="${escapeHtml(tip || "Zur Warteschlange")}">
+      <span class="run-line-fill" aria-hidden="true"></span>
+      <span class="run-line-text">${escapeHtml(bits.join(" · "))}</span>
+    </a>
+    ${cancelId != null ? `<span class="queue-tools"><button type="button" class="icon-btn danger" data-cancel-q="${cancelId}" title="Abbrechen">${icon("x")}</button></span>` : ""}
   </li>`;
 }
 
+function runItemHtml(job) {
+  return runLineHtml({
+    name: queueTarget(job),
+    progress: job.progress,
+    remain: job.remain,
+    filename: job.filename,
+    tipExtra: ablaufStepFrac(job),
+    cancelId: job.id,
+  });
+}
+
 function waitItemHtml(job, index, total) {
   const isError = job.status === "error";
   const label = job.is_ablauf ? "Ablauf · " + jobLabel(job.filename) : jobLabel(job.filename);
@@ -275,20 +316,40 @@ function waitItemHtml(job, index, total) {
 }
 
 function directItemHtml(p) {
-  const pct = Math.round((Number(p.progress) || 0) * 100);
+  return runLineHtml({
-  const eta = p.remain > 0 ? "noch " + hours(p.remain) + " · fertig " + finishClock(p.remain) : "";
+    name: p.name || p.host,
-  return `<li class="queue-item running">
+    progress: p.progress,
-    <div class="queue-row">
+    remain: p.remain,
-      <a class="queue-link grow" href="/#${encodeURIComponent(p.host)}"><span class="queue-name">${escapeHtml(p.name || p.host)}</span></a>
+    filename: p.filename,
-      <span class="queue-sub">${pct} %</span>
+  });
-    </div>
-    <span class="bar slim live"><span style="width:${pct}%"></span></span>
-    <span class="queue-msg">${escapeHtml(STATE_LABELS[p.state] || p.state)}${eta ? " · " + escapeHtml(eta) : ""}</span>
-    <span class="queue-sub">${escapeHtml(jobLabel(p.filename))}</span>
-  </li>`;
 }
 
 let queueCache = [];
+const lastLiveFilename = Object.create(null);
+
+function setListHtml(el, html) {
+  if (!el) return;
+  if (el._html === html) return;
+  el._html = html;
+  el.innerHTML = html;
+}
+
+function stickyLiveFilename(host, filename, state) {
+  const next = filename || "";
+  if (next) {
+    lastLiveFilename[host] = next;
+    return next;
+  }
+  const prev = lastLiveFilename[host] || "";
+  if (prev && ["printing", "paused", "heating", "complete"].includes(String(state || "").toLowerCase())) {
+    return prev;
+  }
+  if (!["printing", "paused", "heating"].includes(String(state || "").toLowerCase())) {
+    delete lastLiveFilename[host];
+  }
+  return prev && ["complete"].includes(String(state || "").toLowerCase()) ? prev : "";
+}
+
 async function refreshPrintQueue() {
   let jobs;
   let active = [];
@@ -296,9 +357,23 @@ async function refreshPrintQueue() {
     [jobs, active] = await Promise.all([api("/druck-queue"), api("/laeuft").catch(() => [])]);
   } catch (error) { return; }
   queueCache = jobs || [];
-  const running = queueCache.filter((job) => job.status === "running");
+  const liveByHost = Object.create(null);
+  (active || []).forEach((p) => { if (p.host) liveByHost[p.host] = p; });
+  const running = queueCache.filter((job) => job.status === "running").map((job) => {
+    const live = liveByHost[job.host];
+    if (!live) return job;
+    return {
+      ...job,
+      progress: live.progress,
+      remain: live.remain,
+      filename: stickyLiveFilename(job.host, live.filename || job.filename, live.state) || job.filename,
+    };
+  });
   const queuedHosts = new Set(running.map((job) => job.host));
-  const direct = (active || []).filter((p) => !queuedHosts.has(p.host));
+  const direct = (active || []).filter((p) => !queuedHosts.has(p.host)).map((p) => ({
+    ...p,
+    filename: stickyLiveFilename(p.host, p.filename, p.state),
+  }));
   const waiting = queueCache.filter((job) => job.status === "waiting");
   const errors = queueCache
     .filter((job) => job.status === "error")
@@ -308,15 +383,21 @@ async function refreshPrintQueue() {
   const runBox = document.getElementById("run-box");
   runBox.hidden = !(running.length || direct.length);
   document.getElementById("run-count").textContent = running.length + direct.length;
-  document.getElementById("run-list").innerHTML = running.map(runItemHtml).join("") + direct.map(directItemHtml).join("");
+  setListHtml(
+    document.getElementById("run-list"),
+    running.map(runItemHtml).join("") + direct.map(directItemHtml).join(""),
+  );
 
   const waitList = document.getElementById("wait-list");
   document.getElementById("wait-count").textContent = waiting.length;
   document.getElementById("wait-count").className = "count" + (errors.length ? " bad" : waiting.length ? " hot" : "");
   document.getElementById("wait-empty").hidden = !!(waiting.length || errors.length);
   document.getElementById("wait-box").classList.toggle("is-empty", !(waiting.length || errors.length));
-  waitList.innerHTML = errors.map((job) => waitItemHtml(job, 0, 1)).join("")
+  setListHtml(
-    + waiting.map((job, i) => waitItemHtml(job, i, waiting.length)).join("");
+    waitList,
+    errors.map((job) => waitItemHtml(job, 0, 1)).join("")
+      + waiting.map((job, i) => waitItemHtml(job, i, waiting.length)).join(""),
+  );
 
   const panel = document.getElementById("live-panel");
   panel.querySelectorAll("[data-cancel-q]").forEach((btn) => {
@@ -412,16 +493,26 @@ async function refreshTasks() {
       ${p.filename ? `<span class="queue-sub" title="${escapeHtml(p.filename)}">${escapeHtml(jobLabel(p.filename))}</span>` : ""}
     </li>`).join("");
   list.querySelectorAll("[data-cleared]").forEach((btn) => {
-    btn.onclick = () => armButton(btn, "leer?", async () => {
+    btn.onclick = async () => {
+      const host = btn.dataset.cleared;
+      const payload = await promptAbraeumen(btn.closest("li")?.querySelector(".queue-name")?.textContent || host);
+      if (!payload) return;
       btn.disabled = true;
       try {
-        await api("/drucker/" + encodeURIComponent(btn.dataset.cleared) + "/abraeumen", { method: "POST", json: { confirm: true } });
+        await api("/drucker/" + encodeURIComponent(host) + "/abraeumen", { method: "POST", json: payload });
         toast("Platte frei.");
       } catch (error) { toast(error.message, "bad"); }
       refreshTasks();
       if (typeof window.onQueueChanged === "function") window.onQueueChanged();
+      btn.disabled = false;
+    };
   });
+}
+document.getElementById("mobile-more")?.addEventListener("click", () => {
+  document.getElementById("mobile-more-sheet")?.showModal();
 });
+if ("serviceWorker" in navigator) {
+  navigator.serviceWorker.register("/static/sw.js").catch(() => {});
 }
 
 document.getElementById("events-clear").addEventListener("click", async (event) => {
@@ -438,10 +529,52 @@ refreshPrintQueue();
 refreshEvents();
 refreshTasks();
 window.refreshTasks = refreshTasks;
-setInterval(refreshTasks, 8000);
+
-setInterval(refreshSendQueue, 2000);
+(function liveUpdates() {
-setInterval(refreshPrintQueue, 4000);
+  const sseKinds = {
-setInterval(refreshEvents, 8000);
+    queue: () => refreshPrintQueue(),
+    senden: () => refreshSendQueue(),
+    ereignis: () => refreshEvents(),
+    aufgaben: () => refreshTasks(),
+    drucker: () => {
+      refreshPrintQueue();
+      refreshTasks();
+      if (typeof window.onDruckerLive === "function") window.onDruckerLive();
+    },
+  };
+
+  if (typeof EventSource !== "undefined") {
+    let es;
+    let retryMs = 2000;
+    const retryMax = 60000;
+    let hadStream = false;
+
+    function connectStream() {
+      es = new EventSource("/api/v1/stream", { withCredentials: true });
+      es.addEventListener("open", () => {
+        retryMs = 2000;
+        if (hadStream) setConnectionBanner(true, "Live-Verbindung wieder da.");
+        hadStream = true;
+      });
+      es.addEventListener("error", () => {
+        es.close();
+        setConnectionBanner(false, "Live-Verbindung unterbrochen — Fallback-Polling läuft.");
+        setTimeout(connectStream, retryMs);
+        retryMs = Math.min(retryMax, retryMs * 2);
+      });
+      Object.keys(sseKinds).forEach((kind) => {
+        es.addEventListener(kind, () => sseKinds[kind]());
+      });
+      es.addEventListener("ping", () => {});
+    }
+    connectStream();
+  }
+
+  createPoller(refreshPrintQueue, 8000).start();
+  createPoller(refreshSendQueue, 4000).start();
+  createPoller(refreshEvents, 12000).start();
+  createPoller(refreshTasks, 12000).start();
+})();
 </script>
 {% block script %}{% endblock %}
 </body>

web/templates/lieferschein.html

@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+<html lang="de">
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<title>{{ title }}</title>
+<style>
+  :root { color-scheme: light; }
+  * { box-sizing: border-box; }
+  body { margin: 0; font: 14px/1.4 "Segoe UI", system-ui, sans-serif; color: #111; background: #f3f3f3; }
+  .toolbar { display: flex; gap: 0.6rem; padding: 0.8rem 1rem; background: #1a1a1a; color: #eee; }
+  .toolbar a, .toolbar button {
+    color: #111; background: #f97316; border: 0; border-radius: 8px;
+    padding: 0.4rem 0.85rem; font: inherit; font-weight: 650; text-decoration: none; cursor: pointer;
+  }
+  .toolbar a.ghost { background: transparent; color: #eee; border: 1px solid #555; }
+  .sheet {
+    max-width: 210mm; margin: 1.2rem auto; padding: 14mm;
+    background: #fff; border: 1px solid #ccc; border-radius: 4px;
+  }
+  h1 { margin: 0 0 4mm; font-size: 18px; }
+  .meta { margin-bottom: 8mm; color: #333; font-size: 13px; }
+  table { width: 100%; border-collapse: collapse; font-size: 13px; }
+  th, td { border-bottom: 1px solid #ddd; padding: 3mm 2mm; text-align: left; }
+  th.num, td.num { text-align: right; font-variant-numeric: tabular-nums; }
+  @media print {
+    body { background: #fff; }
+    .toolbar { display: none; }
+    .sheet { margin: 0; border: 0; border-radius: 0; }
+  }
+</style>
+</head>
+<body>
+<div class="toolbar">
+  <button type="button" onclick="window.print()">Drucken</button>
+  <a class="ghost" href="/auftraege">Zurück</a>
+</div>
+<article class="sheet">
+  <h1>Lieferschein — Auftrag #{{ order.id }}</h1>
+  <div class="meta">
+    {% if order.customer %}<p><strong>Kunde:</strong> {{ order.customer.name }}{% if order.customer.email %} · {{ order.customer.email }}{% endif %}</p>{% endif %}
+    <p><strong>Titel:</strong> {{ order.title }}</p>
+    {% if order.due_at %}<p><strong>Fällig:</strong> {{ order.due_at }}</p>{% endif %}
+    <p><strong>Status:</strong> {{ order.status }}</p>
+    {% if order.notes %}<p>{{ order.notes }}</p>{% endif %}
+  </div>
+  <table>
+    <thead>
+      <tr><th>Position</th><th class="num">Menge</th><th class="num">geliefert</th><th class="num">€/Stk</th></tr>
+    </thead>
+    <tbody>
+      {% for item in order.items %}
+      <tr>
+        <td>{{ item.file_name or item.note or ('Datei #' ~ item.file_id) }}</td>
+        <td class="num">{{ item.qty }}</td>
+        <td class="num">{{ item.done_ok }}</td>
+        <td class="num">{{ '%.2f'|format(item.unit_price) }}</td>
+      </tr>
+      {% else %}
+      <tr><td colspan="4">Keine Positionen.</td></tr>
+      {% endfor %}
+    </tbody>
+  </table>
+  {% if order.progress %}
+  <p class="meta" style="margin-top:8mm">Fortschritt gesamt: {{ order.progress.label }}</p>
+  {% endif %}
+</article>
+</body>
+</html>

web/templates/material.html

@@ -61,35 +61,6 @@
           <input id="spool-name" required>
         </div>
         <div class="grid-2">
-          <div class="field"><label for="spool-brand">Marke</label><input id="spool-brand"></div>
-          <div class="field"><label for="spool-type">Typ</label><input id="spool-type" placeholder="PLA"></div>
-        </div>
-        <div class="grid-2">
-          <div class="field">
-            <label for="spool-chargen">Grotti-Charge</label>
-            <input id="spool-chargen" readonly placeholder="wird vergeben">
-          </div>
-          <div class="field">
-            <label for="spool-hersteller">Hersteller-Charge</label>
-            <input id="spool-hersteller" placeholder="vom Rollenetikett">
-          </div>
-        </div>
-
-        <details class="mat-color" id="color-box">
-          <summary>
-            <svg class="ico caret"><use href="#i-down"/></svg>
-            <span class="grow">Farbe</span>
-            <span class="tiny" id="color-sum">noch keine</span>
-          </summary>
-          <div class="mat-color-body">
-            <div id="color-picked" class="picked"></div>
-            <div id="color-solids" class="color-grid"></div>
-            <div id="color-multi" class="color-grid"></div>
-            <label class="mix check"><input id="color-mix" type="checkbox"> Eigene Mischung</label>
-          </div>
-        </details>
-
-        <div class="grid-2" style="margin-top:0.55rem">
           <div class="field">
             <label for="spool-printer">Drucker</label>
             <select id="spool-printer"></select>
@@ -108,11 +79,47 @@
               <option value="8">ACE 2 · Platz 4</option>
             </select>
           </div>
+          <div class="field"><label for="spool-left">Rest gramm</label><input id="spool-left" type="number" step="0.1" value="1000"></div>
+        </div>
+
+        <details class="mat-color" id="color-box">
+          <summary>
+            <svg class="ico caret"><use href="#i-down"/></svg>
+            <span class="grow">Farbe</span>
+            <span class="tiny" id="color-sum">noch keine</span>
+          </summary>
+          <div class="mat-color-body">
+            <div id="color-picked" class="picked"></div>
+            <div id="color-solids" class="color-grid"></div>
+            <div id="color-multi" class="color-grid"></div>
+            <label class="mix check"><input id="color-mix" type="checkbox"> Eigene Mischung</label>
+          </div>
+        </details>
+
+        <details class="mat-more" id="spool-more">
+          <summary>
+            <svg class="ico caret"><use href="#i-down"/></svg>
+            <span class="grow">Weitere Angaben</span>
+          </summary>
+          <div class="mat-more-body">
+            <div class="grid-2">
+              <div class="field"><label for="spool-brand">Marke</label><input id="spool-brand"></div>
+              <div class="field"><label for="spool-type">Typ</label><input id="spool-type" placeholder="PLA"></div>
+              <div class="field">
+                <label for="spool-chargen">Grotti-Charge</label>
+                <input id="spool-chargen" readonly placeholder="wird vergeben">
+              </div>
+              <div class="field">
+                <label for="spool-hersteller">Hersteller-Charge</label>
+                <input id="spool-hersteller" placeholder="vom Rollenetikett">
+              </div>
               <div class="field"><label for="spool-price">€ pro kg</label><input id="spool-price" type="number" min="0" step="0.01" value="0"></div>
-          <div class="field"><label for="spool-left">Rest gramm</label><input id="spool-left" type="number" step="1" value="1000"></div>
               <div class="field"><label for="spool-density">Dichte g/cm³</label><input id="spool-density" type="number" min="0.1" step="0.01" value="1.24"></div>
               <div class="field"><label for="spool-vol">Volumen mm³/s</label><input id="spool-vol" type="number" min="0.1" step="0.1" value="12"></div>
             </div>
+          </div>
+        </details>
+
         <div class="actions">
           <button type="submit">Merken</button>
           <button type="button" class="ghost" id="spool-shelf" hidden>Ins Regal</button>
@@ -120,6 +127,11 @@
           <button type="button" class="warn" id="spool-delete" hidden><svg class="ico"><use href="#i-trash"/></svg>Löschen</button>
         </div>
       </form>
+      <div id="spool-akte" class="spool-akte" hidden>
+        <h3>Akte</h3>
+        <div class="kpi-row akte-kpis" id="akte-kpis"></div>
+        <div class="akte-runs" id="akte-runs"></div>
+      </div>
       <p id="spool-note"></p>
     </section>
   </div>
@@ -424,6 +436,83 @@ function payload() {
   };
 }
 
+const akteStates = {
+  completed: "fertig", cancelled: "abgebrochen", error: "Fehler",
+  in_progress: "druckt", printing: "druckt", paused: "pausiert",
+  interrupted: "unterbrochen",
+};
+
+function akteWhen(iso) {
+  if (!iso) return "—";
+  const text = formatDateTime(iso, { year: undefined });
+  return text === "—" ? "—" : text.replace(/,\s*/, " ");
+}
+
+function akteFile(name) {
+  const base = (name || "").split("/").pop() || "";
+  if (!base) return "Druck";
+  if (base.length <= 42) return base;
+  return base.slice(0, 39) + "…";
+}
+
+function akteStatus(run) {
+  if (run.verdict === "ausschuss") return "Ausschuss";
+  if (run.verdict === "gut") return "gut";
+  return akteStates[run.state] || run.state || "";
+}
+
+function akteKpi(label, value) {
+  return '<div class="kpi"><div class="kpi-val">' + escapeHtml(value) + '</div><div class="kpi-label">' + escapeHtml(label) + "</div></div>";
+}
+
+async function loadAkte(spoolId) {
+  const box = document.getElementById("spool-akte");
+  if (!spoolId) {
+    box.hidden = true;
+    return;
+  }
+  try {
+    const data = await api("/spulen/" + spoolId + "/akte");
+    const stats = data.stats || {};
+    const fillPct = Math.round(Number(stats.fill_pct) || 0);
+    let leer = "—";
+    if (stats.empty_in_days == null) leer = "kein Verbrauch";
+    else if (stats.empty_in_days <= 0) leer = "leer";
+    else leer = "~" + Math.round(stats.empty_in_days) + " Tage";
+    document.getElementById("akte-kpis").innerHTML =
+      akteKpi("Verdruckt", grams(stats.total_g))
+      + akteKpi("Ausschuss", grams(stats.scrap_g))
+      + akteKpi("Kosten", euro(stats.total_cost))
+      + akteKpi("Füllstand", fillPct + " %")
+      + akteKpi("Leer-in", leer);
+    const list = document.getElementById("akte-runs");
+    const runs = data.runs || [];
+    if (!runs.length) {
+      list.innerHTML = '<p class="tiny">Noch kein Druck auf dieser Spule.</p>';
+    } else {
+      list.innerHTML = runs.slice(0, 12).map((run) => {
+        const href = "/protokoll/" + run.id;
+        const charge = run.chargen_nr
+          ? '<a class="tag akte-charge" href="' + href + '">' + escapeHtml(run.chargen_nr) + "</a>"
+          : '<span class="akte-charge tiny">—</span>';
+        const file = '<a class="akte-file" href="' + href + '" title="' + escapeHtml((run.filename || "").split("/").pop() || "") + '">'
+          + escapeHtml(akteFile(run.filename)) + "</a>";
+        const gramsTxt = grams(run.spool_weight_g) + (run.spool_is_estimate ? " ≈" : "");
+        return '<div class="akte-run">'
+          + '<span class="akte-when tiny">' + escapeHtml(akteWhen(run.started_at)) + "</span>"
+          + charge
+          + file
+          + '<span class="akte-g">' + escapeHtml(gramsTxt) + "</span>"
+          + '<span class="akte-state tiny">' + escapeHtml(akteStatus(run)) + "</span>"
+          + "</div>";
+      }).join("");
+    }
+    box.hidden = false;
+  } catch (error) {
+    box.hidden = true;
+  }
+}
+
 function fill(spool) {
   openSpoolPanel();
   document.getElementById("spool-id").value = spool ? spool.id : "";
@@ -435,7 +524,9 @@ function fill(spool) {
   document.getElementById("spool-printer").value = spool ? spool.printer_host : "";
   document.getElementById("spool-slot").value = spool && spool.ace_slot ? String(spool.ace_slot) : "";
   document.getElementById("spool-price").value = spool ? spool.price_per_kg : 0;
-  document.getElementById("spool-left").value = spool ? spool.remaining_g : 1000;
+  document.getElementById("spool-left").value = spool
+    ? Math.round((Number(spool.remaining_g) || 0) * 10) / 10
+    : 1000;
   document.getElementById("spool-density").value = spool ? spool.density : 1.24;
   document.getElementById("spool-vol").value = spool ? spool.volumetric : 12;
   document.getElementById("spool-material").value = spool && spool.material_id ? String(spool.material_id) : "";
@@ -451,6 +542,7 @@ function fill(spool) {
   showHint();
   renderPalette();
   renderSpools();
+  loadAkte(spool ? spool.id : null);
   document.getElementById("spool-panel").scrollIntoView({ block: "nearest", behavior: "smooth" });
 }
 
@@ -580,6 +672,7 @@ function renderSpools() {
     const rest = Number(spool.remaining_g) || 0;
     tr.children[5].textContent = grams(rest);
     if (rest < 100) tr.children[5].classList.add("msg");
+    if (rest < 0) tr.children[5].title = "Überzogen — Rest korrigieren";
     tr.addEventListener("click", () => fill(spool));
     body.appendChild(tr);
   });
@@ -806,7 +899,14 @@ async function openByCode(raw) {
       const match = code.match(/[?&]spool=(\d+)/);
       if (match) spool = spools.find((row) => String(row.id) === match[1]) || null;
     }
-    if (!spool) spool = await api("/spulen/by-code/" + encodeURIComponent(code));
+    if (!spool) {
+      const found = await api("/spulen/by-code/" + encodeURIComponent(code));
+      if (found && found.kind === "lauf" && found.redirect) {
+        location.href = found.redirect;
+        return;
+      }
+      spool = found;
+    }
     setView("spools");
     fill(spool);
     setScanNote("Spule " + (spool.chargen_nr || spool.name) + " geöffnet.", true);

web/templates/protokoll.html

@@ -24,7 +24,7 @@
 <p id="run-note"></p>
 <div class="card table-wrap">
   <table>
-    <thead><tr><th>Drucker</th><th>Datei</th><th>Zustand</th><th>Dauer</th><th>Gramm</th><th>Kosten</th><th>Urteil</th><th>Spule</th><th></th></tr></thead>
+    <thead><tr><th>Drucker</th><th>Datei</th><th>Zustand</th><th>Dauer</th><th>Ist</th><th>Kosten</th><th>Urteil</th><th>Spule</th><th></th></tr></thead>
     <tbody id="run-rows"></tbody>
   </table>
 </div>
@@ -80,12 +80,31 @@ function render() {
   }
   shown.forEach((run) => {
     const tr = document.createElement("tr");
+    tr.className = "pick";
     tr.innerHTML = "<td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>";
     tr.children[0].textContent = run.printer_name;
-    tr.children[1].textContent = (run.filename || "").split("/").pop();
+    const fileCell = tr.children[1];
+    const link = document.createElement("a");
+    link.href = "/protokoll/" + run.id;
+    link.textContent = (run.filename || "").split("/").pop() || ("#" + run.id);
+    fileCell.appendChild(link);
+    if (run.chargen_nr) {
+      const code = document.createElement("div");
+      code.className = "tiny";
+      code.textContent = run.chargen_nr;
+      fileCell.appendChild(code);
+    }
     tr.children[2].textContent = states[run.state] || run.state;
     tr.children[3].textContent = hours(run.duration_s);
-    tr.children[4].textContent = run.weight_g ? grams(run.weight_g) : "";
+    const used = Number(run.weight_used_g) || Number(run.weight_g) || 0;
+    const planned = Number(run.weight_planned_g) || Number(run.weight_g) || 0;
+    tr.children[4].textContent = used ? grams(used) : "";
+    if (used && planned && Math.abs(used - planned) > 0.5) {
+      tr.children[4].title = "Soll " + grams(planned);
+    }
+    if (run.weight_source === "estimate" || (run.weight_source === "measured" && false)) {
+      tr.children[4].textContent += run.weight_source === "estimate" ? " ≈" : "";
+    }
     const cost = Number(run.filament_cost || 0) + Number(run.energy_cost || 0);
     tr.children[5].textContent = cost ? euro(cost) : "";
     const verdict = document.createElement("select");

web/templates/statistik.html

@@ -0,0 +1,227 @@
+{% extends "layout.html" %}
+{% block body %}
+<div class="page-head">
+  <div>
+    <h1>Statistik</h1>
+    <p class="tiny">Auslastung, Verbrauch und Erfolgsquote aus dem Protokoll.</p>
+  </div>
+  <div class="page-head-side">
+    <a class="ghost" id="csv-link" href="/api/v1/statistik.csv">CSV</a>
+  </div>
+</div>
+<div class="page-tools">
+  <div class="segmented period-presets" id="period" role="group" aria-label="Zeitraum">
+    <button type="button" data-period="all" class="on">Alles</button>
+    <button type="button" data-period="day">Tag</button>
+    <button type="button" data-period="week">Woche</button>
+    <button type="button" data-period="month">Monat</button>
+    <button type="button" data-period="yesterday">Gestern</button>
+    <button type="button" data-period="last_week">Letzte Woche</button>
+    <button type="button" data-period="last_month">Letzter Monat</button>
+  </div>
+  <input type="date" id="since" title="Von" class="date-field">
+  <input type="date" id="until" title="Bis" class="date-field">
+  <select id="host"><option value="">Alle Drucker</option></select>
+  <input type="text" id="material" placeholder="Sorte" size="10">
+  <input type="text" id="brand" placeholder="Marke" size="10">
+  <button type="button" id="reload">Aktualisieren</button>
+</div>
+<p id="stat-note"></p>
+<div id="stat" class="statistik"></div>
+{% endblock %}
+{% block script %}
+<script>
+function kpi(label, value, hint) {
+  return `<div class="kpi"><div class="kpi-val">${value}</div><div class="kpi-label">${escapeHtml(label)}</div>${hint ? '<div class="tiny">' + escapeHtml(hint) + "</div>" : ""}</div>`;
+}
+
+function isoDate(date) {
+  const y = date.getFullYear();
+  const m = String(date.getMonth() + 1).padStart(2, "0");
+  const d = String(date.getDate()).padStart(2, "0");
+  return y + "-" + m + "-" + d;
+}
+
+function startOfWeek(date) {
+  const day = date.getDay();
+  const mondayOffset = day === 0 ? -6 : 1 - day;
+  const start = new Date(date.getFullYear(), date.getMonth(), date.getDate() + mondayOffset);
+  return start;
+}
+
+function periodRange(key) {
+  const today = new Date();
+  today.setHours(0, 0, 0, 0);
+  if (key === "all") return { since: "", until: "" };
+  if (key === "day") return { since: isoDate(today), until: isoDate(today) };
+  if (key === "yesterday") {
+    const day = new Date(today);
+    day.setDate(day.getDate() - 1);
+    return { since: isoDate(day), until: isoDate(day) };
+  }
+  if (key === "week") {
+    const start = startOfWeek(today);
+    const end = new Date(start);
+    end.setDate(end.getDate() + 6);
+    return { since: isoDate(start), until: isoDate(end) };
+  }
+  if (key === "last_week") {
+    const start = startOfWeek(today);
+    start.setDate(start.getDate() - 7);
+    const end = new Date(start);
+    end.setDate(end.getDate() + 6);
+    return { since: isoDate(start), until: isoDate(end) };
+  }
+  if (key === "month") {
+    const start = new Date(today.getFullYear(), today.getMonth(), 1);
+    const end = new Date(today.getFullYear(), today.getMonth() + 1, 0);
+    return { since: isoDate(start), until: isoDate(end) };
+  }
+  if (key === "last_month") {
+    const start = new Date(today.getFullYear(), today.getMonth() - 1, 1);
+    const end = new Date(today.getFullYear(), today.getMonth(), 0);
+    return { since: isoDate(start), until: isoDate(end) };
+  }
+  return { since: "", until: "" };
+}
+
+function setPeriodActive(key) {
+  document.querySelectorAll("#period [data-period]").forEach((btn) => {
+    btn.classList.toggle("on", btn.dataset.period === key);
+  });
+}
+
+function clearPeriodActive() {
+  document.querySelectorAll("#period [data-period]").forEach((btn) => btn.classList.remove("on"));
+}
+
+function fillPrinters(rows) {
+  const select = document.getElementById("host");
+  const current = select.value;
+  const known = new Set([...select.options].map((o) => o.value));
+  (rows || []).forEach((row) => {
+    if (!row.printer_host || known.has(row.printer_host)) return;
+    const opt = document.createElement("option");
+    opt.value = row.printer_host;
+    opt.textContent = row.printer_name || row.printer_host;
+    select.appendChild(opt);
+    known.add(row.printer_host);
+  });
+  if ([...select.options].some((o) => o.value === current)) select.value = current;
+}
+
+function render(data) {
+  fillPrinters(data.by_printer);
+  const o = data.overview || {};
+  const jobs = o.jobs || 0;
+  const success = jobs ? Math.round(100 * (o.completed || 0) / jobs) : 0;
+  const scrap = jobs ? Math.round(100 * (o.scrap || 0) / jobs) : 0;
+  const ratio = data.estimate_ratio != null
+    ? (data.estimate_ratio * 100).toFixed(0) + " %"
+    : "—";
+
+  const printers = (data.by_printer || []).map((p) => `
+    <tr>
+      <td>${escapeHtml(p.printer_name || p.printer_host)}</td>
+      <td class="num">${p.jobs}</td>
+      <td class="num">${hours(p.duration_s)}</td>
+      <td class="num">${grams(p.weight_g)}</td>
+      <td class="num">${euro(p.cost)}</td>
+      <td class="num">${p.completed}</td>
+    </tr>`).join("") || '<tr><td class="empty" colspan="6">Keine Daten.</td></tr>';
+
+  const reasons = (data.scrap_reasons || []).map((r) => `
+    <tr>
+      <td>${escapeHtml(r.reason || "—")}</td>
+      <td class="num">${r.count}</td>
+    </tr>`).join("") || '<tr><td class="empty" colspan="2">Kein Ausschuss im Zeitraum.</td></tr>';
+
+  const materials = (data.by_material || []).map((m) => `
+    <tr>
+      <td>${escapeHtml(m.material_type || "—")}</td>
+      <td>${escapeHtml(m.brand || "")}</td>
+      <td class="num">${grams(m.weight_g)}</td>
+      <td class="num">${euro(m.cost)}</td>
+      <td class="num">${m.jobs}</td>
+    </tr>`).join("") || '<tr><td class="empty" colspan="5">Kein Spulenabzug im Zeitraum.</td></tr>';
+
+  document.getElementById("stat").innerHTML = `
+    <div class="kpi-row">
+      ${kpi("Läufe", String(jobs))}
+      ${kpi("Druckzeit", hours(o.duration_s))}
+      ${kpi("Verbrauch", grams(o.weight_g))}
+      ${kpi("Kosten", euro(o.cost))}
+      ${kpi("Erfolg", success + " %", (o.completed || 0) + " fertig · " + (o.failed || 0) + " abgebrochen")}
+      ${kpi("Ausschuss", scrap + " %", (o.scrap || 0) + " mit Urteil Ausschuss")}
+      ${kpi("Schätztreue", ratio, data.estimate_count ? data.estimate_count + " Läufe mit Soll-Zeit" : "keine Soll-Zeit")}
+    </div>
+    <div class="card">
+      <h2>Nach Drucker</h2>
+      <div class="table-wrap"><table>
+        <thead><tr><th>Drucker</th><th>Läufe</th><th>Zeit</th><th>Gramm</th><th>Kosten</th><th>Fertig</th></tr></thead>
+        <tbody>${printers}</tbody>
+      </table></div>
+    </div>
+    <div class="card">
+      <h2>Ausschuss-Gründe</h2>
+      <div class="table-wrap"><table>
+        <thead><tr><th>Grund</th><th>Anzahl</th></tr></thead>
+        <tbody>${reasons}</tbody>
+      </table></div>
+    </div>
+    <div class="card">
+      <h2>Nach Material</h2>
+      <div class="table-wrap"><table>
+        <thead><tr><th>Sorte</th><th>Marke</th><th>Gramm</th><th>Kosten</th><th>Läufe</th></tr></thead>
+        <tbody>${materials}</tbody>
+      </table></div>
+    </div>`;
+}
+
+async function load() {
+  const params = new URLSearchParams();
+  const since = document.getElementById("since").value;
+  const until = document.getElementById("until").value;
+  const host = document.getElementById("host").value;
+  const material = document.getElementById("material").value.trim();
+  const brand = document.getElementById("brand").value.trim();
+  if (since) params.set("since", since);
+  if (until) params.set("until", until);
+  if (host) params.set("host", host);
+  if (material) params.set("material", material);
+  if (brand) params.set("brand", brand);
+  const q = params.toString();
+  document.getElementById("csv-link").href = "/api/v1/statistik.csv" + (q ? "?" + q : "");
+  const data = await api("/statistik" + (q ? "?" + q : ""));
+  render(data);
+}
+
+function applyPeriod(key) {
+  const range = periodRange(key);
+  document.getElementById("since").value = range.since;
+  document.getElementById("until").value = range.until;
+  setPeriodActive(key);
+  load().catch((error) => showNote("stat-note", error));
+}
+
+document.getElementById("period").addEventListener("click", (event) => {
+  const button = event.target.closest("[data-period]");
+  if (!button) return;
+  applyPeriod(button.dataset.period);
+});
+
+document.getElementById("reload").addEventListener("click", () => {
+  load().catch((error) => showNote("stat-note", error));
+});
+["since", "until"].forEach((id) => {
+  document.getElementById(id).addEventListener("change", () => {
+    clearPeriodActive();
+    load().catch((error) => showNote("stat-note", error));
+  });
+});
+document.getElementById("host").addEventListener("change", () => {
+  load().catch((error) => showNote("stat-note", error));
+});
+load().catch((error) => showNote("stat-note", error));
+</script>
+{% endblock %}

web/templates/wand.html

@@ -61,6 +61,12 @@
     </aside>
   </div>
   <div class="desk-tools">
+    <details class="desk-fold desk-tool" data-fold="verlauf" open>
+      <summary class="desk-fold-sum"><svg class="ico caret"><use href="#i-down"/></svg><span class="grow">Verlauf</span><span class="tiny" data-role="verlauf-caption"></span></summary>
+      <div class="desk-fold-body desk-verlauf" data-role="verlauf">
+        <p class="tiny">Lade Verlauf …</p>
+      </div>
+    </details>
     <details class="desk-fold desk-tool" data-fold="path">
       <summary class="desk-fold-sum"><svg class="ico caret"><use href="#i-down"/></svg><span class="grow">3D-Pfad</span><span class="tiny" data-role="path-caption"></span></summary>
       <div class="desk-fold-body">
@@ -86,7 +92,7 @@
 {% endblock %}
 {% block script %}
 <script src="{{ url_for('static', filename='three.min.js') }}?v=1"></script>
-<script src="{{ url_for('static', filename='gcode-viewer.js') }}?v=8"></script>
+<script src="{{ url_for('static', filename='gcode-viewer.js') }}?v=10"></script>
 <script>
 const labels = STATE_LABELS;
 const rank = { printing: 0, paused: 1, error: 2, heating: 3, complete: 4, cancelled: 5, standby: 6, offline: 7 };
@@ -98,9 +104,22 @@ let wallSpools = [];
 let deskViewer = null;
 let deskCamFails = 0;
 let deskViewerFileId = null;
+let deskSyncGen = 0;
 let deskExcludeSelected = "";
+let deskVerlaufAt = 0;
+let deskVerlaufHtml = "";
+let deskVerlaufHost = "";
 const wallPullTried = new Set();
 const toolpathCache = new Map();
+
+/** Kurzes leeres filename vom Drucker nicht übernehmen — sonst springt der Name alle paar Sekunden. */
+function stickyFilename(printer, previous) {
+  const next = (printer && printer.filename) || "";
+  if (next) return next;
+  const state = shownState(printer || {});
+  if (previous && ["printing", "paused", "heating", "complete"].includes(state)) return previous;
+  return "";
+}
 const cardNodes = new Map();
 const runningJobs = new Map();
 const printerCache = new Map();
@@ -208,6 +227,14 @@ function setHtml(el, html) {
   }
 }
 
+function setText(el, text) {
+  if (!el) return;
+  const next = text == null ? "" : String(text);
+  if (el._text === next) return;
+  el._text = next;
+  el.textContent = next;
+}
+
 function tempbarHtml(label, value, target, scale, iconName) {
   if (value == null) return "";
   const now = Math.round(value);
@@ -265,12 +292,19 @@ function swatchesHtml(printer) {
   }).join("");
 }
 
-function actionsHtml(state) {
+function etikettHtml(printer) {
+  const runId = printer && printer.live_run_id;
+  if (!runId) return "";
+  return `<a class="ghost" href="/etikett/lauf/${runId}?mode=druck" target="_blank" rel="noopener">Etikett</a>`;
+}
+
+function actionsHtml(state, printer) {
+  const label = (state === "printing" || state === "paused") ? etikettHtml(printer) : "";
   if (state === "printing") {
-    return `<button type="button" class="ghost" data-cmd="pause">${icon("pause")}Pause</button><button type="button" class="warn" data-cmd="abbrechen">${icon("stop")}Abbrechen</button>`;
+    return `${label}<button type="button" class="ghost" data-cmd="pause">${icon("pause")}Pause</button><button type="button" class="warn" data-cmd="abbrechen">${icon("stop")}Abbrechen</button>`;
   }
   if (state === "paused") {
-    return `<button type="button" data-cmd="fortsetzen">${icon("play")}Weiter</button><button type="button" class="warn" data-cmd="abbrechen">${icon("stop")}Abbrechen</button>`;
+    return `${label}<button type="button" data-cmd="fortsetzen">${icon("play")}Weiter</button><button type="button" class="warn" data-cmd="abbrechen">${icon("stop")}Abbrechen</button>`;
   }
   return "";
 }
@@ -327,13 +361,107 @@ function stripsHtml(printer, state) {
   return bits.join("");
 }
 
+function dryerLabel(status) {
+  if (status === "drying") return "trocknet";
+  if (status === "heater_err") return "Fehler";
+  return "aus";
+}
+
+function dryerDefaultTemp(dryer) {
+  if (dryer.target > 0) return dryer.target;
+  if (dryer.temp > 0) return dryer.temp;
+  return 45;
+}
+
+function aceSteerKey(printer) {
+  const dryers = printer.dryers || [];
+  const dryerPart = dryers.map((d) => String(d.id)).join(",");
+  const slots = wallSpools
+    .filter((s) => s.printer_host === printer.host && s.ace_slot)
+    .map((s) => Number(s.ace_slot))
+    .sort((a, b) => a - b)
+    .join(",");
+  return dryerPart + "|" + slots;
+}
+
+function spoolHex(spool) {
+  const colors = spool && spool.colors;
+  if (Array.isArray(colors)) {
+    for (const item of colors) {
+      if (item && item.hex) return item.hex;
+      if (typeof item === "string" && item.trim()) return item.trim();
+    }
+  }
+  const label = spool && spool.color;
+  if (typeof label === "string" && /^#?[0-9a-fA-F]{6}([0-9a-fA-F]{2})?$/.test(label.trim())) {
+    return label.trim().startsWith("#") ? label.trim() : "#" + label.trim();
+  }
+  return "";
+}
+
+function aceSlotLabel(slot) {
+  const n = Number(slot);
+  if (n <= 4) return "ACE 1 · " + n;
+  return "ACE 2 · " + (n - 4);
+}
+
+function aceSteerHtml(printer) {
+  const dryers = printer.dryers || [];
+  if (!dryers.length) return "";
+  const bits = [];
+  dryers.forEach((dryer) => {
+    const id = Number(dryer.id);
+    const label = "ACE " + (id + 1);
+    const status = dryerLabel(dryer.status);
+    const temp = dryer.temp || 0;
+    const target = dryer.target || 0;
+    const remain = dryer.remain || 0;
+    const dur = remain > 0 ? remain : 240;
+    const hot = dryerDefaultTemp(dryer);
+    const info = [
+      status,
+      temp || target ? temp + "°" + (target ? " / " + target + "°" : "") : "",
+      remain > 0 ? "noch " + remain + " min" : "",
+    ].filter(Boolean).join(" · ");
+    bits.push(`<div class="steer-ace" data-dryer-id="${id}">
+      <div class="steer-ace-head"><b>${escapeHtml(label)} Trockner</b><span class="tiny" data-dryer-info>${escapeHtml(info)}</span></div>
+      <div class="steer-row">
+        <label>Temp °C <input type="number" data-steer="dryer-temp-${id}" min="35" max="65" value="${escapeHtml(String(hot))}"></label>
+        <label>Dauer min <input type="number" data-steer="dryer-dur-${id}" min="1" max="720" value="${escapeHtml(String(dur))}"></label>
+        <button type="button" data-steer-go="dryer_start" data-dryer-id="${id}">Start</button>
+        <button type="button" class="ghost" data-steer-go="dryer_stop" data-dryer-id="${id}">Stopp</button>
+      </div>
+    </div>`);
+  });
+  const loaded = wallSpools
+    .filter((s) => s.printer_host === printer.host && s.ace_slot)
+    .slice()
+    .sort((a, b) => Number(a.ace_slot) - Number(b.ace_slot));
+  if (loaded.length) {
+    bits.push(`<div class="steer-ace-slots"><div class="steer-ace-head"><b>Plätze</b><span class="tiny">Sorte und Farbe aus Grotti</span></div>`);
+    loaded.forEach((spool) => {
+      const slot = Number(spool.ace_slot);
+      const hex = spoolHex(spool) || "#555";
+      const kind = spool.material_type || "—";
+      bits.push(`<div class="steer-slot-row">
+        <span class="dot" style="background:${escapeHtml(hex)}"></span>
+        <span class="grow"><b>${escapeHtml(aceSlotLabel(slot))}</b> · ${escapeHtml(kind)} · ${escapeHtml(spool.name || "")}</span>
+        <button type="button" class="ghost" data-steer-go="slot_setzen" data-ace-slot="${slot}">an den Drucker</button>
+      </div>`);
+    });
+    bits.push(`</div>`);
+  }
+  return bits.join("");
+}
+
 function steerPanelHtml(printer) {
   const n = printer.nozzle_target != null ? Math.round(printer.nozzle_target) : "";
   const b = printer.bed_target != null ? Math.round(printer.bed_target) : "";
   const sp = typeof printer.speed_factor === "number" ? Math.round(printer.speed_factor * 100) : 100;
   const flow = typeof printer.extrude_factor === "number" ? Math.round(printer.extrude_factor * 100) : 100;
   const fan = typeof printer.fan === "number" ? Math.round(printer.fan * 100) : 0;
-  return `<div class="steer" data-steer-host="${escapeHtml(printer.host)}">
+  const aceKey = aceSteerKey(printer);
+  return `<div class="steer" data-steer-host="${escapeHtml(printer.host)}" data-ace-key="${escapeHtml(aceKey)}">
     <div class="steer-row">
       <label>${icon("nozzle")} Düse <input type="number" data-steer="nozzle" data-steer-action="nozzle" min="0" max="350" value="${escapeHtml(String(n))}"></label>
       <label>${icon("bed")} Bett <input type="number" data-steer="bed" data-steer-action="bed" min="0" max="150" value="${escapeHtml(String(b))}"></label>
@@ -345,6 +473,7 @@ function steerPanelHtml(printer) {
       <label>Flow % <input type="number" data-steer="flow" data-steer-action="flow" min="50" max="150" value="${escapeHtml(String(flow))}"></label>
       <label>${icon("fan")} Fan % <input type="number" data-steer="fan" data-steer-action="fan" min="0" max="100" value="${escapeHtml(String(fan))}"></label>
     </div>
+    ${aceSteerHtml(printer)}
     <p class="tiny">Enter im Feld setzt nur diesen Wert.</p>
   </div>`;
 }
@@ -447,8 +576,9 @@ function anycubicTaskLine(printer) {
   return "<span>Anycubic <b>" + escapeHtml(bits.join(" · ")) + "</b></span>";
 }
 
-function jobLineVisible(printer, state) {
+function jobLineVisible(printer, state, filename) {
-  return !!printer.filename && state !== "standby" && state !== "offline";
+  const name = filename != null ? filename : (printer && printer.filename);
+  return !!name && state !== "standby" && state !== "offline";
 }
 
 function shortName(name) {
@@ -490,7 +620,14 @@ function buildCard(printer) {
         <div data-role="bar"></div>
         <div class="stats" data-role="stats"></div>
         <div data-role="temps"></div>
-        <div class="job-line" data-role="jobline">${icon("cube")}<span class="name" data-role="job"></span><span class="swatches" data-role="swatches"></span></div>
+        <div class="job-line" data-role="jobline">
+          <img class="job-thumb" data-role="thumb" alt="" hidden>
+          <span class="job-ico" data-role="jobico">${icon("cube")}</span>
+          <div class="job-meta">
+            <span class="name" data-role="job"></span>
+            <span class="swatches" data-role="swatches"></span>
+          </div>
+        </div>
         <div data-role="flow"></div>
         <div data-role="strips"></div>
         <div class="card-actions" data-role="controls"></div>
@@ -510,11 +647,13 @@ function patchSteerValues(root, printer) {
   if (steerHasFocus(root)) return;
   const steer = root.querySelector("[data-role=steer]");
   if (!steer) return;
-  const nozzle = steer.querySelector('[data-steer="nozzle"]');
+  const panel = steer.querySelector(".steer");
-  const bed = steer.querySelector('[data-steer="bed"]');
+  if (!panel) return;
-  const speed = steer.querySelector('[data-steer="speed"]');
+  const nozzle = panel.querySelector('[data-steer="nozzle"]');
-  const flow = steer.querySelector('[data-steer="flow"]');
+  const bed = panel.querySelector('[data-steer="bed"]');
-  const fan = steer.querySelector('[data-steer="fan"]');
+  const speed = panel.querySelector('[data-steer="speed"]');
+  const flow = panel.querySelector('[data-steer="flow"]');
+  const fan = panel.querySelector('[data-steer="fan"]');
   if (nozzle && document.activeElement !== nozzle) {
     nozzle.value = printer.nozzle_target != null ? Math.round(printer.nozzle_target) : "";
   }
@@ -530,13 +669,39 @@ function patchSteerValues(root, printer) {
   if (fan && document.activeElement !== fan && typeof printer.fan === "number") {
     fan.value = Math.round(printer.fan * 100);
   }
+  (printer.dryers || []).forEach((dryer) => {
+    const id = Number(dryer.id);
+    const box = panel.querySelector(`[data-dryer-id="${id}"]`);
+    if (!box) return;
+    const info = box.querySelector("[data-dryer-info]");
+    if (info) {
+      const status = dryerLabel(dryer.status);
+      const temp = dryer.temp || 0;
+      const target = dryer.target || 0;
+      const remain = dryer.remain || 0;
+      info.textContent = [
+        status,
+        temp || target ? temp + "°" + (target ? " / " + target + "°" : "") : "",
+        remain > 0 ? "noch " + remain + " min" : "",
+      ].filter(Boolean).join(" · ");
+    }
+    const tempInput = box.querySelector(`[data-steer="dryer-temp-${id}"]`);
+    const durInput = box.querySelector(`[data-steer="dryer-dur-${id}"]`);
+    if (tempInput && document.activeElement !== tempInput && dryer.status === "drying" && dryer.target > 0) {
+      tempInput.value = dryer.target;
+    }
+    if (durInput && document.activeElement !== durInput && dryer.remain > 0) {
+      durInput.value = dryer.remain;
+    }
+  });
 }
 
 function patchCard(article, printer) {
   const state = shownState(printer);
   const clearNow = needsClear(printer);
+  const shownFile = stickyFilename(printer, article.dataset.filename || "");
   article.dataset.state = state;
-  article.dataset.filename = printer.filename || "";
+  article.dataset.filename = shownFile;
   article.dataset.progress = String(printer.progress || 0);
   article.dataset.family = printer.family || "";
   article.dataset.needsClear = clearNow ? "1" : "";
@@ -551,16 +716,45 @@ function patchCard(article, printer) {
   setHtml(role("stats"), statsHtml(printer, state));
   setHtml(role("temps"), tempbarsHtml(printer, state));
   const jobline = role("jobline");
-  if (jobline) jobline.hidden = !jobLineVisible(printer, state);
+  const jobVisible = jobLineVisible(printer, state, shownFile);
+  const hasThumb = !!(jobVisible && printer.preview);
+  if (jobline) {
+    jobline.hidden = !jobVisible;
+    jobline.classList.toggle("has-thumb", hasThumb);
+  }
+  const thumb = role("thumb");
+  const jobico = role("jobico");
+  if (thumb) {
+    if (hasThumb) {
+      const next = withToken(printer.preview);
+      if (thumb.dataset.srcKey !== next) {
+        thumb.dataset.srcKey = next;
+        thumb.src = next;
+      }
+      thumb.hidden = false;
+      thumb.onerror = () => {
+        thumb.hidden = true;
+        thumb.dataset.srcKey = "";
+        if (jobline) jobline.classList.remove("has-thumb");
+        if (jobico) jobico.hidden = false;
+      };
+      if (jobico) jobico.hidden = true;
+    } else {
+      thumb.hidden = true;
+      thumb.removeAttribute("src");
+      thumb.dataset.srcKey = "";
+      if (jobico) jobico.hidden = false;
+    }
+  }
   const job = role("job");
   if (job) {
-    job.textContent = jobName(printer.filename) || "";
+    setText(job, jobName(shownFile) || "");
-    job.title = printer.filename || "";
+    job.title = shownFile || "";
   }
   setHtml(role("swatches"), swatchesHtml(printer));
   setHtml(role("flow"), flowHtml(printer));
   setHtml(role("strips"), stripsHtml(printer, state));
-  setHtml(role("controls"), actionsHtml(state));
+  setHtml(role("controls"), actionsHtml(state, printer));
 }
 
 function refreshDeskCamera(printer) {
@@ -651,9 +845,10 @@ function patchDesk(printer) {
   if (!printer || printer.host !== deskHost) return;
   const state = shownState(printer);
   const prevFile = deskEl.dataset.filename || "";
-  const fileChanged = prevFile !== (printer.filename || "");
+  const shownFile = stickyFilename(printer, prevFile);
+  const fileChanged = prevFile !== shownFile;
   deskEl.dataset.host = printer.host;
-  deskEl.dataset.filename = printer.filename || "";
+  deskEl.dataset.filename = shownFile;
   deskEl.dataset.progress = String(printer.progress || 0);
   deskEl.classList.remove(...DESK_STATES);
   deskEl.classList.add(state);
@@ -676,11 +871,12 @@ function patchDesk(printer) {
   setHtml(role("temps"), tempbarsHtml(printer, state));
 
   const jobline = role("jobline");
-  if (jobline) jobline.hidden = !jobLineVisible(printer, state) && !printer.preview;
+  const jobVisible = jobLineVisible(printer, state, shownFile);
+  if (jobline) jobline.hidden = !jobVisible && !printer.preview;
   const job = role("job");
   if (job) {
-    job.textContent = jobName(printer.filename) || (jobLineVisible(printer, state) ? "" : "Kein Auftrag");
+    setText(job, jobName(shownFile) || (jobVisible ? "" : "Kein Auftrag"));
-    job.title = printer.filename || "";
+    job.title = shownFile || "";
   }
   const preview = role("preview");
   if (preview) {
@@ -696,7 +892,7 @@ function patchDesk(printer) {
   setHtml(role("facts"), factsHtml(printer));
   setHtml(role("flow"), flowHtml(printer));
   setHtml(role("strips"), stripsHtml(printer, state));
-  setHtml(role("controls"), actionsHtml(state));
+  setHtml(role("controls"), actionsHtml(state, printer));
   const estop = role("estop");
   if (estop) {
     const showStop = state === "printing" || state === "paused" || state === "heating";
@@ -709,15 +905,74 @@ function patchDesk(printer) {
   }
 
   const steer = role("steer");
-  if (steer && (!steer.querySelector(".steer") || fileChanged)) {
+  if (steer) {
+    const panel = steer.querySelector(".steer");
+    const nextKey = aceSteerKey(printer);
+    if (!panel || fileChanged || panel.dataset.aceKey !== nextKey) {
       setHtml(steer, steerPanelHtml(printer));
     } else {
       patchSteerValues(deskEl, printer);
     }
+  }
   setHtml(role("mesh"), heatMapHtml(printer));
 
   // Kamera nur über Timer aktualisieren — sonst doppelter Reload + Layout-Ruckler
   syncDeskViewer(printer).catch(() => {});
+  refreshDeskVerlauf(false);
+}
+
+async function refreshDeskVerlauf(force) {
+  if (!deskHost || deskEl.hidden) return;
+  const now = Date.now();
+  if (!force && deskVerlaufHost === deskHost && now - deskVerlaufAt < 20000) return;
+  const host = deskHost;
+  deskVerlaufAt = now;
+  deskVerlaufHost = host;
+  const box = deskEl.querySelector('[data-role="verlauf"]');
+  const caption = deskEl.querySelector('[data-role="verlauf-caption"]');
+  if (!box) return;
+  try {
+    const data = await api("/laeufe/aktuell?host=" + encodeURIComponent(host));
+    if (deskHost !== host) return;
+    const run = data.run;
+    if (!run) {
+      const empty = '<p class="desk-empty"><svg class="ico"><use href="#i-activity"/></svg><span>Noch kein Verlauf</span></p>';
+      if (deskVerlaufHtml !== empty) {
+        deskVerlaufHtml = empty;
+        box.innerHTML = empty;
+      }
+      if (caption) caption.textContent = "";
+      return;
+    }
+    const active = ["in_progress", "printing", "paused"].includes(run.state);
+    const energy = data.energy || {};
+    const kwh = energy.kwh != null
+      ? (Number(energy.kwh) || 0).toLocaleString("de-DE", { maximumFractionDigits: 2 }) + " kWh"
+        + (energy.source === "ed" ? " ED" : "")
+      : "";
+    const bits = [
+      active ? "läuft" : "letzter Druck",
+      formatDateRange(run.started_at, run.ended_at),
+      kwh,
+    ].filter(Boolean);
+    if (caption) caption.textContent = bits.join(" · ");
+    const head = `<div class="desk-verlauf-head">
+      <span class="tiny grow">${escapeHtml(jobLabel(run.filename) || "Druck")}${run.chargen_nr ? " · " + escapeHtml(run.chargen_nr) : ""}</span>
+      <a class="ghost tiny-btn" href="/protokoll/${run.id}">Bericht →</a>
+    </div>`;
+    const html = head + tempChartHtml(data.samples || []);
+    if (deskVerlaufHtml !== html) {
+      deskVerlaufHtml = html;
+      box.innerHTML = html;
+    }
+  } catch (error) {
+    if (deskHost !== host) return;
+    const fail = '<p class="tiny msg">' + escapeHtml(error.message || "Verlauf nicht geladen") + "</p>";
+    if (deskVerlaufHtml !== fail) {
+      deskVerlaufHtml = fail;
+      box.innerHTML = fail;
+    }
+  }
 }
 
 async function syncDeskViewer(printer) {
@@ -725,8 +980,9 @@ async function syncDeskViewer(printer) {
   const canvas = deskEl.querySelector('[data-role="path-canvas"]');
   const caption = deskEl.querySelector('[data-role="path-caption"]');
   if (!canvas || !window.GrottiGcodeViewer || !window.THREE) return;
-  const filename = printer.filename || "";
+  const filename = stickyFilename(printer, deskEl.dataset.filename || "");
   const progress = Number(printer.progress || 0);
+  const gen = ++deskSyncGen;
   if (!deskViewer) {
     deskViewer = GrottiGcodeViewer.create(canvas);
     deskViewer.setExcludeObjects({ objects: [], excluded: [], current: null }, {
@@ -741,45 +997,55 @@ async function syncDeskViewer(printer) {
   let file = matchLibraryFile(filename);
   if (!file && filename && !wallPullTried.has(deskHost + "|" + filename)) {
     wallPullTried.add(deskHost + "|" + filename);
-    if (caption) caption.textContent = "lade vom Drucker …";
+    setText(caption, "lade vom Drucker …");
     try {
       const saved = await api("/dateien/von-drucker", {
         method: "POST",
         json: { host: deskHost, filename },
       });
+      if (gen !== deskSyncGen) return;
       libraryFiles = await api("/dateien");
+      if (gen !== deskSyncGen) return;
       file = saved || matchLibraryFile(filename);
     } catch (error) {
       /* bleibt leer */
     }
   }
   if (!file) {
+    // Kurz leerer filename: Pfad und Caption nicht verwerfen (sonst Flackern alle 5 s).
+    if (!filename && deskViewerFileId) return;
     deskViewer.setPath({ points: [] });
     deskViewerFileId = null;
-    if (caption) caption.textContent = filename ? "Datei nicht in Grotti" : "kein Auftrag";
+    setText(caption, filename ? "Datei nicht in Grotti" : "kein Auftrag");
     renderExcludePanel(printer);
     return;
   }
   try {
     let data = toolpathCache.get(file.id);
-    const needLoad = !data || data.version !== 5 || deskViewerFileId !== file.id;
+    const cachedOk = data && Number(data.version) === 8;
-    if (needLoad) {
+    const needFetch = !cachedOk;
-      if (caption) caption.textContent = "wird gelesen …";
+    const needSetPath = deskViewerFileId !== file.id;
-      data = await api("/dateien/" + file.id + "/pfad");
+    if (needFetch) {
+      if (needSetPath) setText(caption, "wird gelesen …");
+      data = await api("/dateien/" + file.id + "/pfad?tp=8");
+      if (gen !== deskSyncGen) return;
       toolpathCache.set(file.id, data);
-      const sameFile = deskViewerFileId === file.id;
+    }
-      deskViewer.setPath(data, { keepView: sameFile });
+    if (needFetch || needSetPath) {
+      deskViewer.setPath(data, { keepView: deskViewerFileId === file.id });
       deskViewerFileId = file.id;
     }
     if (!(data.points && data.points.length)) {
-      if (caption) caption.textContent = "leer in Datei";
+      setText(caption, "leer in Datei");
       return;
     }
   } catch (error) {
     // File-Id behalten — sonst setzt der nächste Poll die 3D-Ansicht zurück
-    if (caption) caption.textContent = error.message || "fehlgeschlagen";
+    if (gen !== deskSyncGen) return;
+    setText(caption, error.message || "fehlgeschlagen");
     return;
   }
+  if (gen !== deskSyncGen) return;
   deskViewer.setProgress(progress, {
     layer: printer.layer,
     layers: printer.layers,
@@ -800,7 +1066,7 @@ async function syncDeskViewer(printer) {
   const layerTxt = printer.layers
     ? " · Schicht " + (printer.layer || 0) + "/" + printer.layers
     : "";
-  if (caption) caption.textContent = file.name + " · " + Math.round(progress * 100) + " %" + layerTxt;
+  setText(caption, jobName(file.name) + " · " + Math.round(progress * 100) + " %" + layerTxt);
 }
 
 function renderExcludePanel(printer) {
@@ -866,10 +1132,15 @@ function openDesk(host, opts) {
   const prev = deskHost;
   deskHost = host;
   setDeskVisible(true);
-  if (prev !== host) destroyDeskViewer();
+  if (prev !== host) {
+    destroyDeskViewer();
+    deskVerlaufHtml = "";
+    deskVerlaufAt = 0;
+  }
   const steer = deskEl.querySelector("[data-role=steer]");
   if (!same || !steer.querySelector(".steer")) setHtml(steer, steerPanelHtml(printer));
   patchDesk(printer);
+  refreshDeskVerlauf(true);
   startCameraTimer();
   if (!same) {
     const back = document.getElementById("desk-back");
@@ -885,6 +1156,8 @@ function openDesk(host, opts) {
 function closeDesk(opts) {
   if (!deskHost && deskEl.hidden) return;
   deskHost = "";
+  deskVerlaufHtml = "";
+  deskVerlaufHost = "";
   stopCameraTimer();
   destroyDeskViewer();
   setDeskVisible(false);
@@ -1000,8 +1273,8 @@ async function refresh() {
   if (!libraryFiles.length) {
     try { libraryFiles = await api("/dateien"); } catch (error) { libraryFiles = []; }
   }
-  if (!wallSpools.length) {
+  if (!wallSpools.length || deskHost) {
-    try { wallSpools = await api("/spulen"); } catch (error) { wallSpools = []; }
+    try { wallSpools = await api("/spulen"); } catch (error) { /* behalten */ }
   }
   const all = await api("/drucker");
   const printers = sortPrinters(all.slice());
@@ -1223,11 +1496,35 @@ async function handleWallClick(event) {
           method: "POST", json: { action: "fan", percent: 0 },
         });
         toast("Heizung und Lüfter aus.");
+      } else if (go === "dryer_start") {
+        const id = Number(steerBtn.dataset.dryerId);
+        const temp = val("dryer-temp-" + id);
+        const duration = val("dryer-dur-" + id);
+        await api("/drucker/" + encodeURIComponent(host) + "/steuern", {
+          method: "POST",
+          json: { action: "dryer_start", id, temp, duration },
+        });
+        toast("Trockner gestartet.");
+      } else if (go === "dryer_stop") {
+        const id = Number(steerBtn.dataset.dryerId);
+        await api("/drucker/" + encodeURIComponent(host) + "/steuern", {
+          method: "POST",
+          json: { action: "dryer_stop", id },
+        });
+        toast("Trockner gestoppt.");
+      } else if (go === "slot_setzen") {
+        const aceSlot = Number(steerBtn.dataset.aceSlot);
+        await api("/drucker/" + encodeURIComponent(host) + "/steuern", {
+          method: "POST",
+          json: { action: "slot_setzen", ace_slot: aceSlot },
+        });
+        toast("Platz an den Drucker geschrieben.");
       }
       showNote("note", null);
       refresh();
     } catch (error) {
       showNote("note", error);
+      toast(error.message, "bad");
     } finally {
       steerBtn.disabled = false;
     }
@@ -1265,19 +1562,21 @@ async function handleWallClick(event) {
       return;
     }
     if (button.dataset.cmd === "abraeumen") {
-      armButton(button, "Platte frei?", async () => {
+      (async () => {
+        const payload = await promptAbraeumen(host);
+        if (!payload) return;
         button.disabled = true;
         try {
           await api("/drucker/" + encodeURIComponent(host) + "/abraeumen", {
             method: "POST",
-            json: { confirm: true },
+            json: payload,
           });
           toast("Platte quittiert — der nächste Job darf starten.");
           refresh();
           if (window.refreshTasks) window.refreshTasks();
         } catch (error) { toast(error.message, "bad"); }
         finally { button.disabled = false; }
-      });
+      })();
       return;
     }
     button.disabled = true;

web/templates/wartung.html

@@ -0,0 +1,93 @@
+{% extends "layout.html" %}
+{% block body %}
+<div class="page-head">
+  <div>
+    <h1>Wartung</h1>
+    <p class="tiny">Laufstunden und Filament je Drucker — Verschleißteile im Blick.</p>
+  </div>
+</div>
+<div id="wartung-root"></div>
+<p id="wartung-note"></p>
+{% endblock %}
+{% block script %}
+<script>
+function partRow(part) {
+  const overdue = part.overdue_hours || part.overdue_meters;
+  return `<tr class="${overdue ? "warn" : ""}">
+    <td>${escapeHtml(part.label || part.part_key)}</td>
+    <td class="num">${(part.hours_since || 0).toLocaleString("de-DE", { maximumFractionDigits: 1 })} h</td>
+    <td class="num">${Math.round(part.meters_since || 0).toLocaleString("de-DE")} mm</td>
+    <td class="num">${part.life_hours ? part.life_hours + " h" : "—"}</td>
+    <td class="num">${part.life_meters ? Math.round(part.life_meters) + " mm" : "—"}</td>
+    <td><button type="button" class="ghost sm" data-reset="${part.id}">Zurücksetzen</button></td>
+  </tr>`;
+}
+
+function printerCard(block) {
+  const c = block.counters || {};
+  const parts = (block.parts || []).map(partRow).join("")
+    || '<tr><td colspan="6" class="empty">Noch keine Teile.</td></tr>';
+  return `<section class="card">
+    <h2>${escapeHtml(block.name || block.host)}</h2>
+    <p class="hint">${escapeHtml(block.host)} · ${(c.hours || 0).toLocaleString("de-DE", { maximumFractionDigits: 1 })} h gesamt · ${Math.round(c.meters || 0).toLocaleString("de-DE")} mm · ${c.runs || 0} Läufe</p>
+    <div class="table-wrap"><table>
+      <thead><tr><th>Teil</th><th>Seit Reset</th><th>Seit Reset</th><th>Intervall h</th><th>Intervall mm</th><th></th></tr></thead>
+      <tbody>${parts}</tbody>
+    </table></div>
+    <form class="grid-2 wartung-add" data-host="${escapeHtml(block.host)}" style="margin-top:0.75rem">
+      <div class="field"><label>Schlüssel</label><input name="part_key" required placeholder="nozzle"></div>
+      <div class="field"><label>Bezeichnung</label><input name="label" placeholder="Düse 0.4"></div>
+      <div class="field"><label>Intervall h</label><input name="life_hours" type="number" step="1" min="0" value="0"></div>
+      <div class="field"><label>Intervall mm</label><input name="life_meters" type="number" step="1000" min="0" value="0"></div>
+      <div class="field" style="grid-column:1/-1"><label>Notiz</label><input name="note"></div>
+      <div class="actions"><button type="submit">Teil anlegen</button></div>
+    </form>
+  </section>`;
+}
+
+async function load() {
+  const data = await api("/wartung");
+  document.getElementById("wartung-root").innerHTML = (data || []).map(printerCard).join("")
+    || '<p class="empty">Keine Drucker angelegt.</p>';
+}
+
+document.getElementById("wartung-root").addEventListener("submit", async (event) => {
+  const form = event.target.closest("form.wartung-add");
+  if (!form) return;
+  event.preventDefault();
+  const fd = new FormData(form);
+  try {
+    await api("/wartung/teile", {
+      method: "POST",
+      json: {
+        printer_host: form.dataset.host,
+        part_key: fd.get("part_key"),
+        label: fd.get("label"),
+        life_hours: Number(fd.get("life_hours") || 0),
+        life_meters: Number(fd.get("life_meters") || 0),
+        note: fd.get("note"),
+      },
+    });
+    form.reset();
+    showNote("wartung-note", null, "Teil gespeichert.");
+    load();
+  } catch (error) {
+    showNote("wartung-note", error);
+  }
+});
+
+document.getElementById("wartung-root").addEventListener("click", async (event) => {
+  const btn = event.target.closest("[data-reset]");
+  if (!btn) return;
+  try {
+    await api("/wartung/teile/" + btn.dataset.reset + "/reset", { method: "POST", json: {} });
+    showNote("wartung-note", null, "Teil zurückgesetzt.");
+    load();
+  } catch (error) {
+    showNote("wartung-note", error);
+  }
+});
+
+load();
+</script>
+{% endblock %}