Added full Italian localization

2026-06-19 09:35:40 +02:00
10 changed files with 119 additions and 720 deletions
--- a/CHANGELOG.de.md
+++ b/CHANGELOG.de.md
@@ -1,21 +1,5 @@
 # Changelog

-## [0.9.26] – 2026-06-21
-
-### Neu
- **Italienische Sprachunterstützung** (PR #66, @Alex_M). Die Bridge-UI ist jetzt vollständig auf Italienisch verfügbar.
-
-### Behoben
- **Kamera startete immer beim Druckbeginn** (Issue #50). `camera_on_print` fehlte in der `/api/state`-Antwort — JavaScript las `undefined` und startete die Kamera unabhängig vom Setting. Jetzt korrekt im State enthalten.
- **Auto-Leveling-Setting wurde im Moonraker-Druckpfad ignoriert** (Issue #57). `handle_print_start` las den Wert nur aus den Bridge-Args, nicht aus dem Request-Body — Dialog-Checkbox und Per-Print-Override hatten keine Wirkung. Verhält sich jetzt identisch zum direkten Druckpfad.
- **Filament-Mapping: Freitext-Felder durch Dropdowns ersetzt** (Issue #57). Falsch getippte Vendor/Name-Kombination brach das Profil-Matching ohne Fehlermeldung; Felder sind jetzt Dropdowns (Vendor → Profil, vendor-gefiltert), sodass nur gültige Kombinationen gespeichert werden können.
- **Dashboard zeigte generischen Materialtyp statt Profilname** (Issue #57). AMS-Slot-Karten zeigen jetzt den gemappten Profilnamen (z.B. „eSUN PLA-Basic") statt nur „PLA". Fallback auf generischen Typ wenn kein Profil gemappt ist.
- **Ghost-Profil auf leerem Slot** (Issue #57). Verwaiste Mappings für leere Slots wurden weiterhin angezeigt; leere Slots zeigen jetzt korrekt „–".
- **Skip-Objects-Panel fehlte im Orca-Upload-Flow** (Issue #57). Panel erscheint jetzt in allen Druckflows; bei frischem Upload fragt die Bridge `fileDetails` beim Drucker nach und pollt die Objektliste bis zu 6 Sekunden nach.
- **Banner und Dialog erschienen gleichzeitig** (Issue #57). Settings-Save setzt jetzt den Dialog-Cancel-State zurück, sodass der Slot-Mapper nach Wechsel des Start-Print-Verhaltens zuverlässig öffnet.
- **„Leeren" lud idle-Datei beim nächsten Poll nach** (Issue #57). Leeren setzt jetzt den lokalen State sofort zurück (`file_ready`, `filename`, `thumbnail`) und löscht alle Dialog-Sperren — Vorschaubild und Aktions-Buttons verschwinden sofort und kommen nicht zurück.
- **Material-Matching für „PLA Silk", „Matte PLA" etc.** (PR #64, @p2l). Modifier+Basis-Muster in beliebiger Wortreihenfolge werden jetzt auf den Basis-Typ normalisiert; Dash-Varianten (PLA-CF) bleiben weiterhin korrekt inkompatibel mit ihrem Basis-Typ.
-
 ## [0.9.25] – 2026-06-17

 ### Behoben
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,40 +1,5 @@
 # Changelog

-## [0.9.26] – 2026-06-21
-
-### New
- **Italian language support** (PR #66, @Alex_M). The bridge UI is now fully
-  available in Italian.
-
-### Fixed
- **Camera always started at print begin** (issue #50). `camera_on_print` was
-  missing from the `/api/state` response — JavaScript read `undefined` and started
-  the camera regardless of the setting. Now correctly exposed in state.
- **Auto-leveling setting ignored in Moonraker print path** (issue #57).
-  `handle_print_start` read the value only from bridge args, not from the request
-  body, so the dialog checkbox and the per-print override had no effect. Now
-  behaves identically to the direct print path.
- **Filament mapping free-text fields replaced by dropdowns** (issue #57). A
-  mistyped vendor/name broke profile matching silently; fields are now dropdowns
-  (vendor → profile, vendor-filtered) so only valid combinations can be saved.
- **Dashboard showed generic material type instead of profile name** (issue #57).
-  AMS slot cards now display the mapped profile name (e.g. "eSUN PLA-Basic")
-  instead of just "PLA". Falls back to the generic type when no profile is mapped.
- **Ghost profile shown on empty slot** (issue #57). Stale mappings for empty
-  slots were still rendered; empty slots now correctly show "–".
- **Skip-Objects panel missing in Orca upload flow** (issue #57). Panel now
-  appears in all print flows; on fresh upload the bridge requests `fileDetails`
-  from the printer and retries the object list for up to 6 s.
- **Banner and dialog appeared simultaneously** (issue #57). Settings save now
-  resets the dialog cancel state so the slot mapper reliably opens after toggling
-  Start Print Behavior.
- **"Clear" reloaded idle file on next poll** (issue #57). Clear now immediately
-  resets local state (`file_ready`, `filename`, `thumbnail`) and clears all dialog
-  locks — the preview and action buttons disappear instantly and do not return.
- **Material matching for "PLA Silk", "Matte PLA" etc.** (PR #64, @p2l).
-  Modifier+base patterns in any word order are now normalised to the base type;
-  dash-suffix variants (PLA-CF) remain correctly incompatible with their base.
-
 ## [0.9.25] – 2026-06-17

 ### Fixed
--- a/2
+++ b/2
@@ -1 +1 @@
-0.9.27-nightly1
+0.9.25
--- a/config_loader.py
+++ b/config_loader.py
@@ -13,7 +13,6 @@ _BASE = pathlib.Path(sys.executable).parent if getattr(sys, "frozen", False) els
 CONFIG_SECTION_CONNECTION = "connection"
 CONFIG_SECTION_PRINT      = "print"
 CONFIG_SECTION_BRIDGE     = "bridge"
-CONFIG_SECTION_SPOOLMAN   = "spoolman"


 def _find_config_file() -> pathlib.Path | None:
@@ -64,8 +63,6 @@ def _load_config_file(path: pathlib.Path):
        "WEB_UPLOAD_WARNING":   (CONFIG_SECTION_PRINT,   "web_upload_warning"),
        "PRINT_START_DIALOG":   (CONFIG_SECTION_PRINT,   "print_start_dialog"),
        "BRIDGE_PRINTER_NAME":  (CONFIG_SECTION_BRIDGE,  "printer_name"),
-        "SPOOLMAN_SERVER":      (CONFIG_SECTION_SPOOLMAN, "server"),
-        "SPOOLMAN_SYNC_RATE":   (CONFIG_SECTION_SPOOLMAN, "sync_rate"),
    }
    for env_key, (section, option) in mapping.items():
        if env_key not in os.environ:
@@ -320,5 +317,3 @@ AUTO_LEVELING    = int(get("AUTO_LEVELING","1"))
 CAMERA_ON_PRINT  = int(get("CAMERA_ON_PRINT","0"))
 WEB_UPLOAD_WARNING = int(get("WEB_UPLOAD_WARNING", "1"))
 PRINT_START_DIALOG = int(get("PRINT_START_DIALOG", get("FILE_READY_DIALOG", "1")))
-SPOOLMAN_SERVER    = get("SPOOLMAN_SERVER",    "")
-SPOOLMAN_SYNC_RATE = int(get("SPOOLMAN_SYNC_RATE", "0"))
--- a/docker-compose.nightly.yml
+++ b/docker-compose.nightly.yml
@@ -1,3 +0,0 @@
-services:
-  kx-bridge:
-    image: gitea.it-drui.de/viewit/kx-bridge:nightly
--- a/docker-compose.portainer-nightly.yml
+++ b/docker-compose.portainer-nightly.yml
@@ -1,25 +0,0 @@
-# KX-Bridge Nightly — Portainer Stack
-#
-# Paste this into Portainer → Stacks → Add stack → Web editor
-#
-# Uses the nightly build — may be unstable, for testing new features early.
-# For production use, see docker-compose.portainer.yml (:latest).
-
-services:
-  kx-bridge:
-    image: gitea.it-drui.de/viewit/kx-bridge:nightly
-    volumes:
-      - /mnt/dockerdata/kx-nightly/config:/app/config
-      - /mnt/dockerdata/kx-nightly/data:/app/data
-    ports:
-      # Port 7125 = first printer. Add 7126, 7127, … for each additional printer.
-      - "7125:7125"
-    restart: unless-stopped
-    logging:
-      driver: json-file
-      options:
-        max-size: "10m"
-        max-file: "3"
-
-# Verzeichnisse müssen auf dem Host existieren:
-# mkdir -p /mnt/dockerdata/kx-nightly/config /mnt/dockerdata/kx-nightly/data
--- a/env_loader.py
+++ b/env_loader.py
@@ -48,6 +48,4 @@ MODE_ID          = get("MODE_ID",          "")
 DEVICE_ID        = get("DEVICE_ID",        "")
 DEFAULT_AMS_SLOT = get("DEFAULT_AMS_SLOT", "auto")
 AUTO_LEVELING    = int(get("AUTO_LEVELING", "1"))
-CAMERA_ON_PRINT  = int(get("CAMERA_ON_PRINT", "0"))
-WEB_UPLOAD_WARNING = int(get("WEB_UPLOAD_WARNING", "1"))
 PRINT_START_DIALOG = int(get("PRINT_START_DIALOG", get("FILE_READY_DIALOG", "1")))
--- a/kobrax_moonraker_bridge.py
+++ b/kobrax_moonraker_bridge.py
@@ -733,40 +733,6 @@ class CameraCache:
            await asyncio.sleep(2.0)


-class SpoolmanClient:
-    """Thin synchronous HTTP client for Spoolman filament tracking.
-
-    Designed to be called from daemon threads (poll loop, _on_print callbacks).
-    Uses requests (already in requirements) so no event-loop dependency.
-    """
-
-    def __init__(self, server_url: str, sync_rate: int = 0):
-        self.server_url = server_url.rstrip("/")
-        self.sync_rate = sync_rate
-
-    def _req(self, method: str, path: str, **kwargs):
-        import requests
-        r = requests.request(method, f"{self.server_url}{path}", timeout=5, **kwargs)
-        r.raise_for_status()
-        return r.json()
-
-    def health_check(self) -> bool:
-        try:
-            self._req("GET", "/api/v1/health")
-            return True
-        except Exception:
-            return False
-
-    def list_spools(self) -> list:
-        return self._req("GET", "/api/v1/spool")
-
-    def use_filament(self, spool_id: int, use_length_mm: float) -> None:
-        """Report consumed filament length in mm. Spoolman converts to weight
-        using the spool's filament profile density."""
-        self._req("PUT", f"/api/v1/spool/{spool_id}/use",
-                  json={"use_length": round(use_length_mm, 2)})
-
-
 class KobraXBridge:
    def __init__(self, client: KobraXClient, args=None, store=None, printer_id: str = "1", all_bridges=None):
        self.client = client
@@ -827,7 +793,6 @@ class KobraXBridge:
          "file_ready":         "",
          "print_start_dialog": getattr(args, "print_start_dialog", 1),
          "filament_mode":      "toolhead",
-          "supplies_usage":     0,
          "ace_drying": {"status": 0, "target_temp": 0, "duration": 0, "remain_time": 0, "humidity": None, "current_temp": None},
        }
        self._ams_slots: list[dict] = []       # flat global list; each entry has global_index + box_id
@@ -854,18 +819,6 @@ class KobraXBridge:
        self._pending_preprint_skip: list[str] = []
        self._pending_preprint_skip_deadline: float = 0.0

-        # Spoolman filament tracking
-        _sm_url = (getattr(args, "spoolman_server", "") or "").strip()
-        self._spoolman: SpoolmanClient | None = (
-            SpoolmanClient(_sm_url, getattr(args, "spoolman_sync_rate", 0))
-            if _sm_url else None
-        )
-        self._spoolman_slot_spools: dict[int, int] = {}  # {ams_slot_idx: spoolman_spool_id}
-        self._spoolman_slot_usage: dict[int, float] = {}   # per-slot accumulated mm this print
-        self._spoolman_slot_reported: dict[int, float] = {}  # per-slot mm already sent to Spoolman
-        self._spoolman_last_usage: float = 0.0   # supplies_usage at last attribution tick
-        self._spoolman_last_sync: float = 0.0
-
        # Theme-Name prüfen (keine Sonderzeichen oder Umlaute)
        raw_theme = (getattr(args, "ui_theme", None) or "default").strip()
        if not _UI_THEME_NAME_RE.match(raw_theme):
@@ -884,139 +837,6 @@ class KobraXBridge:
        client.callbacks["light/report"]          = self._on_light
        client.callbacks["skip/report"]           = self._on_skip

-        if self._spoolman:
-            threading.Thread(
-                target=lambda: log.info(
-                    f"Spoolman: {'OK' if self._spoolman.health_check() else 'unreachable'} "
-                    f"at {self._spoolman.server_url}"
-                ),
-                daemon=True, name="spoolman-health",
-            ).start()
-
-    # ── Spoolman helpers ──────────────────────────────────────────────────────
-
-    def _spoolman_filament_mm(self) -> float:
-        """Total filament_used_mm for the current print file from the GCode DB."""
-        filename = self._state.get("filename", "")
-        if not filename:
-            return 0.0
-        try:
-            gf = self._store.get_file_by_name(filename)
-            return float(gf.get("filament_used_mm") or 0.0) if gf else 0.0
-        except Exception:
-            return 0.0
-
-    def _spoolman_attribute_tick(self, activity_map: dict) -> None:
-        """Attribute the supplies_usage delta since last tick to the active slot.
-
-        Skips attribution during loading/unloading transitions (tool changes +
-        purges) to avoid charging the wrong spool for purge material."""
-        if not self._spoolman or not self._spoolman_slot_spools:
-            return
-        if self._state.get("print_state") != "printing":
-            return
-        current = self._state.get("supplies_usage", 0)
-        delta = current - self._spoolman_last_usage
-        self._spoolman_last_usage = current
-        if delta <= 0:
-            return
-        loaded = self._ams_loaded_slot
-        if loaded < 0:
-            return
-        if activity_map.get(loaded):
-            return
-        self._spoolman_slot_usage[loaded] = self._spoolman_slot_usage.get(loaded, 0.0) + delta
-
-    def _spoolman_unreported(self) -> dict[int, float]:
-        """Return {slot_idx: mm} of usage not yet reported to Spoolman.
-
-        Falls back to equal split of total supplies_usage when per-slot
-        attribution data is absent (e.g. single-extruder with no AMS)."""
-        total_used = self._state.get("supplies_usage", 0)
-        if self._spoolman_slot_usage:
-            return {
-                slot: self._spoolman_slot_usage.get(slot, 0.0)
-                       - self._spoolman_slot_reported.get(slot, 0.0)
-                for slot in self._spoolman_slot_spools
-            }
-        n = len(self._spoolman_slot_spools)
-        already = sum(self._spoolman_slot_reported.values())
-        per = (total_used - already) / n if n else 0.0
-        return {slot: per for slot in self._spoolman_slot_spools}
-
-    def _spoolman_report(self, unreported: dict[int, float], min_mm: float = 0.1) -> None:
-        """Fire-and-forget report of unreported mm to each mapped spool."""
-        sm = self._spoolman
-        for slot_idx, mm in unreported.items():
-            if mm < min_mm:
-                continue
-            spool_id = self._spoolman_slot_spools.get(slot_idx)
-            if not spool_id:
-                continue
-            self._spoolman_slot_reported[slot_idx] = (
-                self._spoolman_slot_reported.get(slot_idx, 0.0) + mm
-            )
-            def _send(sid=spool_id, length=mm):
-                try:
-                    sm.use_filament(sid, length)
-                    log.info(f"Spoolman: {length:.1f} mm → spool {sid}")
-                except Exception as e:
-                    log.warning(f"Spoolman: report failed (spool {sid}): {e}")
-            threading.Thread(target=_send, daemon=True, name="spoolman-report").start()
-
-    def _spoolman_notify_end(self):
-        """Report remaining filament on print end."""
-        if not self._spoolman or not self._spoolman_slot_spools:
-            return
-        self._spoolman_report(self._spoolman_unreported())
-
-    def _spoolman_sync_midprint(self):
-        """Report incremental filament usage during a print (sync_rate interval)."""
-        if not self._spoolman or not self._spoolman_slot_spools:
-            return
-        self._spoolman_report(self._spoolman_unreported(), min_mm=10.0)
-
-    # ── Spoolman API handlers ─────────────────────────────────────────────────
-
-    async def handle_kx_spoolman_status(self, request):
-        """GET /kx/spoolman/status"""
-        return self._json_cors({
-            "configured":   bool(self._spoolman),
-            "server":       self._spoolman.server_url if self._spoolman else "",
-            "sync_rate":    self._spoolman.sync_rate if self._spoolman else 0,
-            "slot_spools":  {str(k): v for k, v in self._spoolman_slot_spools.items()},
-        })
-
-    async def handle_kx_spoolman_spools(self, request):
-        """GET /kx/spoolman/spools — proxied from Spoolman."""
-        if not self._spoolman:
-            return self._json_cors({"error": "Spoolman not configured"}, status=503)
-        try:
-            spools = await asyncio.get_event_loop().run_in_executor(
-                None, self._spoolman.list_spools
-            )
-            return self._json_cors({"spools": spools})
-        except Exception as e:
-            log.warning(f"Spoolman: list_spools failed: {e}")
-            return self._json_cors({"error": str(e)}, status=502)
-
-    async def handle_kx_spoolman_set_active(self, request):
-        """POST /kx/spoolman/active-spool
-        Body: {"slot_map": {"0": 42, "2": 17}}  — AMS slot index → Spoolman spool ID."""
-        try:
-            data = await request.json()
-        except Exception:
-            return self._json_cors({"error": "invalid JSON"}, status=400)
-        slot_map = data.get("slot_map") or {}
-        self._spoolman_slot_spools = {
-            int(k): int(v) for k, v in slot_map.items()
-            if str(v).isdigit() and int(v) > 0
-        }
-        self._spoolman_slot_usage = {}
-        self._spoolman_slot_reported = {}
-        self._spoolman_last_usage = 0.0
-        return self._json_cors({"slot_spools": {str(k): v for k, v in self._spoolman_slot_spools.items()}})
-
    def _default_ace_dry_presets(self) -> dict[str, dict]:
        return {
            "pla": {"temp": 45, "duration_sec": 4 * 3600},
@@ -1131,21 +951,15 @@ class KobraXBridge:
                        printer_id=self._printer_id,
                    )
                    log.info(f"Job started: {self._current_job_id} for {filename}")
-            self._spoolman_slot_usage = {}
-            self._spoolman_slot_reported = {}
-            self._spoolman_last_usage = 0.0
-            self._spoolman_last_sync = 0.0

        # Job-History: Druckende erkennen
        if kobra_state in ("finished",) and self._current_job_id:
            self._store.finish_job(self._current_job_id, status="completed")
            log.info(f"Job abgeschlossen: {self._current_job_id}")
-            self._spoolman_notify_end()
            self._current_job_id = ""
        elif kobra_state in ("stoped", "canceled") and self._current_job_id:
            self._store.finish_job(self._current_job_id, status="cancelled")
            log.info(f"Job abgebrochen: {self._current_job_id}")
-            self._spoolman_notify_end()
            self._current_job_id = ""

        # Nach Druckende das Upload-Banner verschwinden lassen (Issue #29): der
@@ -1162,7 +976,6 @@ class KobraXBridge:
            self._state["slicer_time"] = 0
            self._state["layer_height"] = 0.0
            self._state["first_layer_height"] = 0.0
-            self._state["supplies_usage"] = 0
            self._thumbnail_b64 = ""
        self._state["filename"]       = d.get("filename", self._state["filename"])
        if "progress" in d:
@@ -1177,8 +990,6 @@ class KobraXBridge:
            self._state["total_layers"] = d["total_layers"]
        if "taskid" in d:
            self._state["taskid"] = str(d["taskid"])
-        if "supplies_usage" in d:
-            self._state["supplies_usage"] = int(d["supplies_usage"])
        settings = d.get("settings") or {}
        if "print_speed_mode" in settings:
            self._state["print_speed_mode"] = int(settings["print_speed_mode"])
@@ -1266,25 +1077,6 @@ class KobraXBridge:
        if (not skipped and self._pending_preprint_skip
                and now <= self._pending_preprint_skip_deadline):
            return
-
-        # Während eines aktiven Drucks sind Skip-Zustände effektiv monoton.
-        # Manche Firmware-Reports kommen zwischenzeitlich leer/teilweise zurück;
-        # diese dürfen bereits bestätigte Skip-Objekte nicht aus der UI löschen.
-        existing_skipped = [str(n) for n in (self._skip_state.get("skipped") or []) if n]
-        existing_set = set(existing_skipped)
-        incoming_skipped = [str(n) for n in (skipped or []) if n]
-        incoming_set = set(incoming_skipped)
-        active_print = self._state.get("print_state") in ("printing", "paused")
-        if active_print and existing_set:
-            if not incoming_set:
-                skipped = list(existing_skipped)
-            elif not incoming_set.issuperset(existing_set):
-                merged = list(existing_skipped)
-                for n in incoming_skipped:
-                    if n not in existing_set:
-                        merged.append(n)
-                skipped = merged
-
        # Pending-Lock aufheben sobald Drucker die gewünschten Objekte bestätigt
        if self._pending_preprint_skip and set(skipped) >= set(self._pending_preprint_skip):
            self._pending_preprint_skip = []
@@ -1331,7 +1123,7 @@ class KobraXBridge:
            return False
        for i in range(max(1, int(retries))):
            try:
-                if self._state.get("print_state") not in ("printing", "paused"):
+                if self._state.get("kobra_state") != "printing":
                    time.sleep(max(0.1, float(delay_s)))
                    continue
                resp = self.client.skip_objects(wanted)
@@ -2661,18 +2453,6 @@ class KobraXBridge:
            names = json.loads(f.get("objects_skip_parts") or "[]")
        except Exception:
            names = []
-        # Noch keine Objekte im Store (frischer Orca-/Web-Upload): einmal aktiv
-        # file/fileDetails beim Drucker anfragen. _on_file() füllt den Store nach,
-        # das Frontend pollt diesen Endpoint und bekommt die Liste beim nächsten
-        # Versuch (Issue #57 — Skip-Parität auch außerhalb des File-Browsers).
-        if not names:
-            fn = f.get("filename") or ""
-            if fn:
-                try:
-                    self.client.publish("file", "fileDetails",
-                                        {"root": "local", "filename": fn}, timeout=0)
-                except Exception as e:
-                    log.debug(f"fileDetails-Nachfrage fehlgeschlagen: {e}")
        return self._json_cors({
            "result": {
                "names":   names,
@@ -2699,47 +2479,18 @@ class KobraXBridge:
            return self._json_cors({"error": str(e)}, status=502)
        return self._json_cors({"result": "ok", "names": names})

-    def _build_skip_state_result(self) -> dict:
-        """Baut den kombinierten Skip-State für UI-Endpunkte."""
-        filename = self._state.get("filename", "")
-        all_objects: list[str] = []
-        svg = ""
-        if filename:
-            try:
-                f = self._store.get_file_by_name(filename)
-                if f:
-                    all_objects = json.loads(f.get("objects_skip_parts") or "[]")
-                    svg = f.get("svg_image") or ""
-            except Exception as e:
-                log.warning(f"skip_state lookup failed: {e}")
-        return {
-            "objects":  all_objects,
-            "skipped":  list(self._skip_state.get("skipped", [])),
-            "svg_b64":  svg,
-            "ts":       self._skip_state.get("ts", 0),
-            "filename": filename,
-        }
-
    async def handle_kx_skip_query(self, request):
        """Druck-Objektliste vom Drucker neu abfragen.

-        POST /kx/skip/query  → triggert skip/query_obj, wartet kurz auf den
-        async skip/report und gibt den zusammengeführten Skip-State zurück.
+        POST /kx/skip/query  → triggert skip/query_obj, gibt zuletzt bekannten
+        Stand zurück (skip/report kommt async, Frontend pollt /kx/skip/state).
        """
-        prev_ts = int(self._skip_state.get("ts", 0) or 0)
        try:
            loop = asyncio.get_event_loop()
            await loop.run_in_executor(None, lambda: self.client.query_skip_objects())
        except Exception as e:
            return self._json_cors({"error": str(e)}, status=502)
-
-        deadline = time.time() + 1.5
-        while time.time() < deadline:
-            if int(self._skip_state.get("ts", 0) or 0) > prev_ts:
-                break
-            await asyncio.sleep(0.1)
-
-        return self._json_cors({"result": self._build_skip_state_result()})
+        return self._json_cors({"result": self._skip_state})

    async def handle_kx_skip_state(self, request):
        """Aktueller Skip-State.
@@ -2751,7 +2502,25 @@ class KobraXBridge:
          nicht die Gesamtliste.
        - Geskippt: aus self._skip_state (von skip/report aktualisiert).
        """
-        return self._json_cors({"result": self._build_skip_state_result()})
+        filename = self._state.get("filename", "")
+        all_objects: list[str] = []
+        svg = ""
+        if filename:
+            try:
+                f = self._store.get_file_by_name(filename)
+                if f:
+                    all_objects = json.loads(f.get("objects_skip_parts") or "[]")
+                    svg = f.get("svg_image") or ""
+            except Exception as e:
+                log.warning(f"skip_state lookup failed: {e}")
+        result = {
+            "objects":  all_objects,
+            "skipped":  list(self._skip_state.get("skipped", [])),
+            "svg_b64":  svg,
+            "ts":       self._skip_state.get("ts", 0),
+            "filename": filename,
+        }
+        return self._json_cors({"result": result})

    async def handle_kx_printers(self, request):
        # Aktive Drucker (mit IP) sammeln
@@ -2846,8 +2615,8 @@ class KobraXBridge:
            },
        }

-        # UI erst nach echter Drucker-Bestätigung als "geskippt" markieren.
-        self._skip_state = {"skipped": [], "ts": int(time.time())}
+        # Pre-Print-Skip sofort im UI-Status spiegeln
+        self._skip_state = {"skipped": list(excluded_objects), "ts": int(time.time())}
        if excluded_objects:
            self._pending_preprint_skip = [str(n) for n in excluded_objects if isinstance(n, str) and n]
            self._pending_preprint_skip_deadline = time.time() + 12.0
@@ -3156,10 +2925,10 @@ class KobraXBridge:
        if not file_data:
            return web.json_response({"error": "no file received"}, status=400)

-        # Nur druckbare Dateien zulassen (Issue #59) — der Kobra X akzeptiert
-        # ausschließlich .gcode und .bgcode; .3mf-Uploads werden vom Drucker
-        # nicht verarbeitet und daher abgelehnt (Issue #59, @gangoke).
-        _allowed_ext = (".gcode", ".bgcode")
+        # Nur druckbare Dateien zulassen (Issue #59) — verhindert dass z.B. ein
+        # JPG im File-Browser landet. OrcaSlicer-Uploads sind .gcode/.gcode.3mf,
+        # der Kobra X akzeptiert .gcode/.3mf/.bgcode.
+        _allowed_ext = (".gcode", ".gcode.3mf", ".3mf", ".bgcode")
        _fn_lower = (remote_filename or "").lower()
        if not _fn_lower.endswith(_allowed_ext):
            log.warning(f"Upload abgelehnt (kein GCode): {remote_filename}")
@@ -3370,8 +3139,7 @@ class KobraXBridge:
            ams_box_mapping = self._build_auto_ams_box_mapping()

        use_ams = len(ams_box_mapping) > 0
-        # Dialog-Checkbox (body) hat Vorrang, sonst Setting-Default (wie handle_kx_print).
-        auto_leveling = int(body.get("auto_leveling", getattr(self._args, "auto_leveling", 1)))
+        auto_leveling = getattr(self._args, "auto_leveling", 1)
        url = self._state.get("last_upload_url", "")
        filesize = self._state.get("last_upload_size", 0)
        md5 = self._state.get("last_upload_md5", "")
@@ -3401,15 +3169,6 @@ class KobraXBridge:
            },
        }

-        # UI erst nach echter Drucker-Bestätigung als "geskippt" markieren.
-        self._skip_state = {"skipped": [], "ts": int(time.time())}
-        if excluded_objects:
-            self._pending_preprint_skip = [str(n) for n in excluded_objects if isinstance(n, str) and n]
-            self._pending_preprint_skip_deadline = time.time() + 12.0
-        else:
-            self._pending_preprint_skip = []
-            self._pending_preprint_skip_deadline = 0.0
-
        log.info(
          f"print/start api=1 mode={self._filament_mode} "
          f"ams={len(ams_box_mapping)} slots assignments={filament_assignments is not None}"
@@ -3422,9 +3181,6 @@ class KobraXBridge:
        if result is None:
            return web.json_response({"error": "Keine Antwort vom Drucker"}, status=504)

-        if excluded_objects:
-            loop.run_in_executor(None, lambda: self._apply_preprint_skip_after_start(excluded_objects))
-
        return web.json_response({"result": "ok"})

    async def handle_print_pause(self, request):
@@ -4059,8 +3815,6 @@ class KobraXBridge:
            "camera_url":       s["camera_url"],
            "fan_speed":        s["fan_speed"],
            "print_speed_mode": s["print_speed_mode"],
-            "auto_leveling":    getattr(self._args, "auto_leveling", 1),
-            "camera_on_print":  getattr(self._args, "camera_on_print", 0),
            "web_upload_warning": getattr(self._args, "web_upload_warning", 1),
            "light_on":         s["light_on"],
            "light_brightness": s["light_brightness"],
@@ -4993,14 +4747,6 @@ class KobraXBridge:
                    print_r = self.client.publish("print", "query", timeout=3.0)
                    if print_r:
                        self._on_print(print_r)
-                    # Spoolman mid-print sync
-                    if (self._spoolman and self._spoolman.sync_rate > 0
-                            and self._spoolman_slot_spools
-                            and self._state.get("print_state") == "printing"):
-                        now = time.time()
-                        if now - self._spoolman_last_sync >= self._spoolman.sync_rate:
-                            self._spoolman_sync_midprint()
-                            self._spoolman_last_sync = now
                box = self.client.query_multicolor_box()
                if box:
                    data = box.get("data") or {}
@@ -5017,10 +4763,6 @@ class KobraXBridge:
                        if global_slots:
                            self._ams_slots = global_slots
                        self._ams_loaded_slot = global_loaded
-                        self._spoolman_attribute_tick(activity_map)
-                    else:
-                        # No multiColorBox data — still attribute (no transitions to skip)
-                        self._spoolman_attribute_tick({})
            except Exception as e:
                log.warning(f"Poll-Fehler: {e}")
                # Prüfen ob Drucker wirklich weg ist
@@ -5155,9 +4897,6 @@ def build_app(bridge: KobraXBridge) -> web.Application:
    r.add_post("/kx/skip",                 bridge.handle_kx_skip)
    r.add_post("/kx/skip/query",           bridge.handle_kx_skip_query)
    r.add_get("/kx/skip/state",            bridge.handle_kx_skip_state)
-    r.add_get("/kx/spoolman/status",       bridge.handle_kx_spoolman_status)
-    r.add_get("/kx/spoolman/spools",       bridge.handle_kx_spoolman_spools)
-    r.add_post("/kx/spoolman/active-spool", bridge.handle_kx_spoolman_set_active)
    r.add_route("OPTIONS", "/kx/{path:.*}", bridge.handle_kx_options)

    # Root + Printer-Routen (Single-Page, JS liest Pathname)
@@ -5323,10 +5062,6 @@ def main():
    parser.add_argument("--web-upload-warning", type=int, default=env_loader.WEB_UPLOAD_WARNING)
    parser.add_argument("--print-start-dialog", dest="print_start_dialog", type=int, default=env_loader.PRINT_START_DIALOG)
    parser.add_argument("--file-ready-dialog",  dest="print_start_dialog", type=int)
-    parser.add_argument("--spoolman-server",    default=env_loader.SPOOLMAN_SERVER,
-                        help="Spoolman URL (e.g. http://192.168.x.x:7912); leave empty to disable")
-    parser.add_argument("--spoolman-sync-rate", type=int, default=env_loader.SPOOLMAN_SYNC_RATE,
-                        help="Mid-print filament sync interval in seconds (0 = only on print end)")

    parser.add_argument("--host",            default="0.0.0.0",
                        help="Bind-Adresse für den Bridge-Server")
--- a/web/themes/default/app.js
+++ b/web/themes/default/app.js
@@ -9,10 +9,9 @@ var camOn=false;
 var camUserStopped=false; // user stopped camera manually — suppress auto-restart for this print
 var _camPollInterval=null; // snapshot-polling interval for Android (no MJPEG support)
 var _lastLoadedFile=null;  // zuletzt geladene/gedruckte Datei für Progress-Karten-Aktionen (Issue #55)
-var _idleCleared=false;    // User hat idle-Datei explizit „geleert" → kein Nachladen von s.filename (Issue #57)
 var _fdDialogOpen=false;          // Dialog ist gerade offen
-var _fdAutoOpenedFile=sessionStorage.getItem('fdAutoOpenedFile')||null;
-var _fdUserCancelled=sessionStorage.getItem('fdUserCancelled')==='1';
+var _fdAutoOpenedFile=null;       // Dateiname für den der Dialog auto-geöffnet wurde
+var _fdUserCancelled=false;       // User hat den Auto-Open-Dialog abgebrochen
 var currentStep=1;
 var currentPanel='dashboard';
 var aceAutoRefillPrefs=(function(){
@@ -44,62 +43,6 @@ var ACE_DRY_PRESETS={
  custom_3:{name:'Custom 3',temp:45,duration_sec:4*3600}
 };

-// Spoolman state
-var _spoolmanStatus={configured:false,server:'',sync_rate:0,slot_spools:{}};
-var _spoolmanSpools=[];
-var _slotSpoolMap={};  // {String(global_index): spoolman_spool_id} — last committed assignment
-
-function _loadSpoolmanStatus(){
-  fetch(_apiUrl('/kx/spoolman/status')).then(function(r){return r.json();}).then(function(d){
-    _spoolmanStatus=d;
-    _slotSpoolMap=d.slot_spools||{};
-  }).catch(function(){});
-}
-
-function _buildSpoolmanSection(){
-  var sec=document.getElementById('fd-spoolman-section');
-  var rows=document.getElementById('fd-spoolman-rows');
-  var loading=document.getElementById('fd-spoolman-loading');
-  if(!sec||!rows)return;
-  if(!_spoolmanStatus.configured){sec.style.display='none';return;}
-  sec.style.display='';
-  rows.innerHTML='';
-  if(loading)loading.style.display='';
-
-  var usedSlots={};
-  document.querySelectorAll('#fd-slots select').forEach(function(sel){
-    var idx=parseInt(sel.value);
-    if(idx>=0){
-      var slot=(_amsSlots||[]).find(function(s){return s.slot_index===idx;});
-      if(slot&&!usedSlots[idx])usedSlots[idx]=slot;
-    }
-  });
-
-  fetch(_apiUrl('/kx/spoolman/spools')).then(function(r){return r.json();}).then(function(d){
-    if(loading)loading.style.display='none';
-    _spoolmanSpools=d.spools||[];
-    var slotKeys=Object.keys(usedSlots).map(Number).sort(function(a,b){return a-b;});
-    if(!slotKeys.length){rows.innerHTML='<span style="font-size:11px;color:var(--txt2)">–</span>';return;}
-    rows.innerHTML=slotKeys.map(function(idx){
-      var slot=usedSlots[idx];
-      var col=(slot.color_hex||'#888');
-      var currentSpool=_slotSpoolMap[String(idx)]||'';
-      var opts='<option value="">–</option>'+_spoolmanSpools.map(function(sp){
-        var rem=sp.remaining_weight!=null?' ('+sp.remaining_weight.toFixed(0)+'g)':'';
-        var vendor=sp.filament&&sp.filament.vendor?sp.filament.vendor+' ':'';
-        var name=sp.filament&&sp.filament.name?sp.filament.name:'Spool';
-        return '<option value="'+sp.id+'"'+(sp.id==currentSpool?' selected':'')+'>'+
-               escHtml('#'+sp.id+' '+vendor+name+rem)+'</option>';
-      }).join('');
-      return '<div style="display:flex;align-items:center;gap:8px;font-size:12px">'+
-        '<span style="display:inline-block;width:14px;height:14px;border-radius:50%;background:'+col+';border:1px solid var(--border);flex-shrink:0"></span>'+
-        '<span style="color:var(--txt2);min-width:46px">Slot '+(idx+1)+'</span>'+
-        '<select data-spool-slot="'+idx+'" style="flex:1;padding:3px 6px;border-radius:6px;border:1px solid var(--border);background:var(--raised);color:var(--txt);font-size:12px">'+
-        opts+'</select></div>';
-    }).join('');
-  }).catch(function(){if(loading)loading.style.display='none';});
-}
-
 function _aceAutoRefillGet(aceId){return !!aceAutoRefillPrefs[String(aceId)];}
 function _aceAutoRefillSet(aceId,on){
  aceAutoRefillPrefs[String(aceId)]=!!on;
@@ -722,18 +665,10 @@ function applyState(){
    if(s.file_ready&&s.print_state==='standby'){
      document.getElementById('file-ready-name').textContent=s.file_ready;
      // Neue Datei → Abbruch-Sperre aufheben
-      if(_fdAutoOpenedFile&&_fdAutoOpenedFile!==s.file_ready){
-        _fdUserCancelled=false;
-        sessionStorage.removeItem('fdUserCancelled');
-        sessionStorage.removeItem('fdAutoOpenedFile');
-      }
-      if(shouldAutoOpen){
-        // Dialog-Modus: Banner niemals anzeigen.
-        frb.style.display='none';
-        if(!_fdDialogOpen&&!_fdUserCancelled&&_fdAutoOpenedFile!==s.file_ready){
-          _fdAutoOpenedFile=s.file_ready;
-          startReadyFileWithSlots(s.file_ready,true);
-        }
+      if(_fdAutoOpenedFile&&_fdAutoOpenedFile!==s.file_ready) _fdUserCancelled=false;
+      if(shouldAutoOpen&&!_fdDialogOpen&&!_fdUserCancelled&&_fdAutoOpenedFile!==s.file_ready){
+        _fdAutoOpenedFile=s.file_ready;
+        startReadyFileWithSlots(s.file_ready,true);
      } else {
        frb.style.display='flex';
        bannerVisible=true;
@@ -752,11 +687,8 @@ function applyState(){
  // Zuletzt geladene Datei merken (Issue #55): solange sie über den State
  // sichtbar ist. Beim Druckende/Abbruch leert die Bridge file_ready+filename
  // (Issue #29) — die gemerkte Referenz bleibt für die Karten-Aktionen.
-  // Echte ready-Datei oder laufender Druck hebt einen vorherigen „Clear" auf.
-  if(s.file_ready||printing) _idleCleared=false;
  if(s.file_ready) _lastLoadedFile=s.file_ready;
-  else if(s.filename && !_idleCleared) _lastLoadedFile=s.filename;
-  else if(_idleCleared) _lastLoadedFile=null;
+  else if(s.filename) _lastLoadedFile=s.filename;
  // Idle-Aktionen (Drucken/Slots/Leeren) nur wenn nicht gedruckt wird, eine
  // Datei bekannt ist und der grüne Banner nicht ohnehin schon dieselbe Aktion
  // anbietet.
@@ -933,13 +865,7 @@ function applyState(){
        var activity=(slot.activity||'');
        var pct=empty?T.ams_empty:(slot.consumables_percent!=null?slot.consumables_percent+'%':'–');
        var slotLabel=T.label_slot+' '+(globalIdx+1);
-        // Gemapptes Profil nur für belegte Slots verwenden — sonst zeigt ein
-        // verwaistes Mapping (Slot wurde geleert) ein „Geister"-Profil (Issue #57).
-        var profile=empty?null:(window._slotProfileMap||{})[globalIdx];
-        var genericType=(slot.type||slot.material_type||'–');
-        // Material-Label: bei belegtem Slot mit Mapping den konkreten Profilnamen
-        // (z.B. „eSUN PLA+") statt nur des generischen Typs zeigen (Issue #57 Punkt 4).
-        var materialLabel=empty?'–':((profile&&profile.name)?profile.name:genericType);
+        var profile=(window._slotProfileMap||{})[globalIdx];
        var vendorBadge='';
        if(!empty && profile && profile.vendor){
          var tt=(profile.name||'')+(profile.id?' ('+profile.id+')':'');
@@ -948,7 +874,7 @@ function applyState(){
        html+='<div class="ams-slot'+(active?' active':'')+(loaded?' loaded':'')+(activity?' '+activity:'')+(empty?' empty':'')
          +'" style="--slot-color:'+col+';opacity:'+(empty?0.4:1)+';cursor:pointer" onclick="openSlotEdit('+i+')">'
          +'<div class="slot-circle" style="background:'+col+'"></div>'
-          +'<div class="slot-material" title="'+(empty?'':genericType)+'">'+materialLabel+'</div>'
+          +'<div class="slot-material">'+(empty?'–':(slot.type||slot.material_type||'–'))+'</div>'
          +vendorBadge
          +'<div class="slot-label">'+slotLabel+'</div>'
          +'<div class="slot-label" style="font-size:10px;color:var(--txt2)">'+pct+'</div>'
@@ -970,7 +896,7 @@ function applyState(){
  if(co)co.style.display=(s.print_state==='printing'&&camOn)?'block':'none';

  // auto-start camera during print (unless user explicitly stopped it)
-  if(s.print_state==='printing'&&!camOn&&s.camera_url&&!camUserStopped&&s.camera_on_print){
+  if(s.print_state==='printing'&&!camOn&&s.camera_url&&!camUserStopped){
    camStart();
  }
  // reset user-stopped flag when print ends so next print auto-starts again
@@ -1086,11 +1012,6 @@ function onPollIntervalInput(){
 }

 // ── Filament-Profil-Mapping pro Slot ([filament_profiles]) ──
-// Pro Slot ein einzelnes Profil-Dropdown (vendor+name gemeinsam, gekeyt per
-// _profileKey). Kein Freitext mehr → das (vendor,name)→id-Matching kann nicht
-// mehr durch manuelle Eingabe brechen (Issue #57 Punkt 1). Optionen werden aus
-// /kx/filament/profiles geladen, nach Vendor gruppiert, User-Profile zuerst,
-// mit demselben Vendor-Sichtbarkeitsfilter wie das Slot-Edit-Dropdown.
 function renderFilamentMapping(map){
  var el=document.getElementById('filament-mapping-list');
  if(!el)return;
@@ -1100,61 +1021,21 @@ function renderFilamentMapping(map){
    var idHint=m.id?' <span style="color:var(--txt2);font-size:11px">('+m.id+')</span>':'';
    rows+='<div class="modal-field" style="margin-bottom:8px">'
      +'<label>Slot '+(i+1)+idHint+'</label>'
-      +'<select id="fmap-'+i+'" data-vendor="'+(m.vendor||'')+'" data-name="'+(m.name||'')+'" style="width:100%"></select>'
-      +'</div>';
+      +'<div style="display:flex;gap:6px;flex-wrap:wrap">'
+      +'<input type="text" id="fmap-'+i+'-vendor" placeholder="Vendor (z.B. Polymaker)" value="'+(m.vendor||'')+'" style="flex:1;min-width:120px">'
+      +'<input type="text" id="fmap-'+i+'-name" placeholder="Name (z.B. PolyTerra PLA)" value="'+(m.name||'')+'" style="flex:1;min-width:140px">'
+      +'</div></div>';
  }
  el.innerHTML=rows;
-  // Dropdowns befüllen (async, geteilter Profil-Cache + Vendor-Filter)
-  for(var j=0;j<4;j++){ _fillMappingDropdown(j); }
-}
-function _fillMappingDropdown(slot){
-  var sel=document.getElementById('fmap-'+slot);
-  if(!sel) return;
-  var wantKey=_profileKey(sel.dataset.vendor, sel.dataset.name);
-  _loadOrcaFilaments(function(profiles){
-    sel.innerHTML='<option value="">'+(tr('slot_edit_profile_default')||'Generic (Standard)')+'</option>';
-    var userProfs=profiles.filter(function(p){return p.is_user;});
-    var systemProfs=profiles.filter(function(p){return !p.is_user;});
-    function _opt(g,p){
-      var o=document.createElement('option');
-      o.value=_profileKey(p.vendor,p.name);
-      o.dataset.vendor=p.vendor; o.dataset.name=p.name; o.dataset.id=p.id||'';
-      o.textContent=(p.is_user?'★ ':'')+p.name+(p.vendor?' — '+p.vendor:'');
-      if(o.value===wantKey)o.selected=true;
-      g.appendChild(o);
-    }
-    if(userProfs.length){
-      var gUser=document.createElement('optgroup');
-      gUser.label='★ '+(tr('orca_profile_user_label')||'Eigene Profile');
-      userProfs.forEach(function(p){_opt(gUser,p);});
-      sel.appendChild(gUser);
-    }
-    _loadVisibleVendors(function(vis){
-      var filtered=systemProfs;
-      if(vis&&vis.length){
-        var allow={};vis.forEach(function(v){allow[v]=1;});allow['Generic']=1;
-        filtered=systemProfs.filter(function(p){return allow[p.vendor];});
-      }
-      var byVendor={};
-      filtered.forEach(function(p){(byVendor[p.vendor]=byVendor[p.vendor]||[]).push(p);});
-      Object.keys(byVendor).sort().forEach(function(v){
-        var g=document.createElement('optgroup');g.label=v;
-        byVendor[v].forEach(function(p){_opt(g,p);});
-        sel.appendChild(g);
-      });
-    });
-  });
 }
 function saveFilamentMapping(){
  // Nutzt den per-Slot-Endpoint (vendor,name → ID-Lookup im Backend).
-  // Leere Auswahl ("") = Mapping entfernen.
+  // Leere Felder = Mapping entfernen.
  var chain=Promise.resolve();
  for(var i=0;i<4;i++){
    (function(slot){
-      var sel=document.getElementById('fmap-'+slot);
-      var opt=sel?sel.options[sel.selectedIndex]:null;
-      var vendor=(opt&&opt.dataset.vendor)||'';
-      var name=(opt&&opt.dataset.name)||'';
+      var vendor=((document.getElementById('fmap-'+slot+'-vendor')||{}).value||'').trim();
+      var name=((document.getElementById('fmap-'+slot+'-name')||{}).value||'').trim();
      chain=chain.then(function(){
        return fetch(_apiUrl('/kx/filament/slots/'+slot+'/profile'),
          {method:'POST',headers:{'Content-Type':'application/json'},
@@ -1313,7 +1194,6 @@ function doProfileImportUpload(files){
 var _slotEditIndex=-1;
 var _slotEditLoaded=false;
 var _MAT_PRESETS=['PLA','PETG','ABS','ASA','TPU','PA','PC','HIPS'];
-var _BASE_MATERIAL_TYPES=['PLA','PETG','ABS','ASA','TPU','TPE','PA','PC','HIPS','PEI','PEEK'];
 function updateSlotEditFeedButton(){
  var btn=document.getElementById('btn-slot-edit-feed');
  if(!btn)return;
@@ -1450,39 +1330,23 @@ function slotEditFeed(){
 }
 function startReadyFile(filename){
  var fn=filename||S.file_ready;
-  function _doStartReadyFile(){
-    var btn=document.getElementById('file-ready-btn');
-    if(btn){btn.disabled=true;btn.textContent='…';}
-    post('/printer/print/start',{filename:fn})
-      .then(function(r){return r.json();})
-      .then(function(){
-        document.getElementById('file-ready-banner').style.display='none';
-        if(btn){btn.disabled=false;setText('file-ready-btn',T.file_ready_btn);}
-      })
-      .catch(function(e){
-        clog(tr('log_error')+' '+e,'msg-err');
-        if(btn){btn.disabled=false;setText('file-ready-btn',T.file_ready_btn);}
-      });
-  }
-  function _gateAndStart(fileObj){
-    if(fileObj && fileObj.web_unverified && webUploadWarningEnabled()){
-      maybeGateWebUpload(fileObj, function(){ startReadyFile(fn); });
-      return;
-    }
-    _doStartReadyFile();
-  }
  var currentFile=(storeFiles||[]).find(function(f){return f.filename===fn;});
-  if(currentFile){
-    _gateAndStart(currentFile);
+  if(currentFile && currentFile.web_unverified && webUploadWarningEnabled()){
+    maybeGateWebUpload(currentFile, function(){ startReadyFile(fn); });
    return;
  }
-  fetch(_apiUrl('/kx/files')).then(function(r){return r.json();}).then(function(d){
-    storeFiles=d.result||[];
-    var refreshed=(storeFiles||[]).find(function(f){return f.filename===fn;})||null;
-    _gateAndStart(refreshed);
-  }).catch(function(){
-    _doStartReadyFile();
-  });
+  var btn=document.getElementById('file-ready-btn');
+  if(btn){btn.disabled=true;btn.textContent='…';}
+  post('/printer/print/start',{filename:fn})
+    .then(function(r){return r.json();})
+    .then(function(r){
+      document.getElementById('file-ready-banner').style.display='none';
+      if(btn){btn.disabled=false;setText('file-ready-btn',T.file_ready_btn);}
+    })
+    .catch(function(e){
+      clog(tr('log_error')+' '+e,'msg-err');
+      if(btn){btn.disabled=false;setText('file-ready-btn',T.file_ready_btn);}
+    });
 }
 function cancelReadyFile(){
  post('/api/file_ready/clear',{})
@@ -1498,17 +1362,8 @@ function startIdleFileWithSlots(){
 }
 function clearIdleFile(){
  _lastLoadedFile=null;
-  _idleCleared=true;  // verhindert Nachladen von s.filename im nächsten poll() (Issue #57)
-  _fdAutoOpenedFile=null;  // nächster Upload derselben Datei soll Dialog wieder öffnen
-  _fdUserCancelled=false;
-  _fdDialogOpen=false;
-  sessionStorage.removeItem('fdAutoOpenedFile');
-  sessionStorage.removeItem('fdUserCancelled');
-  sessionStorage.removeItem('webVerifyCancelledFileId');
-  S.file_ready=''; S.filename=''; S.thumbnail='';  // sofort lokal leeren, kein Warten auf nächsten Poll
  var ib=document.getElementById('d-idle-btns');if(ib)ib.style.display='none';
  var fn=document.getElementById('d-fname');if(fn){fn.textContent='–';fn.title='';}
-  var thumb=document.getElementById('d-thumbnail');if(thumb){thumb.style.display='none';thumb.src='';}
  post('/api/file_ready/clear',{}).catch(function(){});
 }
 function selectMatPreset(m){
@@ -1607,11 +1462,6 @@ function saveSettings(){
  btn.disabled=true;btn.textContent='…';
  var webUploadWarning=(document.getElementById('s-web-upload-warning')||{}).checked?1:0;
  S.web_upload_warning=webUploadWarning;
-  // Start-Print-Behavior-Wechsel könnte den Auto-Open sonst dauerhaft blockieren
-  // (alter _fdUserCancelled bei gleicher file_ready) → Dialog-State zurücksetzen (Issue #57).
-  _fdUserCancelled=false;_fdAutoOpenedFile=null;
-  sessionStorage.removeItem('fdUserCancelled');sessionStorage.removeItem('fdAutoOpenedFile');
-  sessionStorage.removeItem('webVerifyCancelledFileId');
  post('/api/settings',{
    printer_name:     document.getElementById('s-printer-name').value,
    printer_ip:       document.getElementById('s-printer-ip').value,
@@ -2283,7 +2133,6 @@ var _filamentDialogMode='store'; // 'store' oder 'banner'
 var _pendingWebVerifyFileId=null;
 var _pendingWebVerifyFilename='';
 var _pendingWebVerifyAction=null;
-var _pendingWebVerifyAutoOpen=false;
 // GCode-Store-Dateiliste. MUSS deklariert sein – sonst ReferenceError, wenn
 // "Slots wählen" im Banner geklickt wird, bevor der Browser-Tab je geladen
 // wurde (Issue #29 / Theme-Auslagerung PR #27).
@@ -2351,8 +2200,7 @@ function clearWebUploadWarningFlag(fileId, onDone){
    });
 }

-function maybeGateWebUpload(fileObj, onContinue, opts){
-  opts=opts||{};
+function maybeGateWebUpload(fileObj, onContinue){
  if(!fileObj || !fileObj.web_unverified){
    if(onContinue) onContinue();
    return;
@@ -2361,20 +2209,15 @@ function maybeGateWebUpload(fileObj, onContinue, opts){
    if(onContinue) onContinue();
    return;
  }
-  var cancelledId=sessionStorage.getItem('webVerifyCancelledFileId')||'';
-  if(opts.autoOpen && cancelledId && cancelledId===String(fileObj.id||'')){
-    return;
-  }
  openWebVerifyDialog(fileObj.id, fileObj.filename, function(){
    clearWebUploadWarningFlag(fileObj.id, onContinue);
-  }, !!opts.autoOpen);
+  });
 }

-function openWebVerifyDialog(fileId, filename, onConfirm, autoOpen){
+function openWebVerifyDialog(fileId, filename, onConfirm){
  _pendingWebVerifyFileId=fileId;
  _pendingWebVerifyFilename=filename;
  _pendingWebVerifyAction=onConfirm||null;
-  _pendingWebVerifyAutoOpen=!!autoOpen;
  var status=document.getElementById('store-web-verify-status');
  if(status){status.textContent='';}
  openStoreWebVerifyDialog();
@@ -2388,13 +2231,9 @@ function openStoreWebVerifyDialog(){
 function closeStoreWebVerifyDialog(){
  var modal=document.getElementById('store-web-verify-dialog');
  if(modal){modal.classList.remove('open');}
-  if(_pendingWebVerifyAutoOpen && _pendingWebVerifyFileId){
-    sessionStorage.setItem('webVerifyCancelledFileId', String(_pendingWebVerifyFileId));
-  }
  _pendingWebVerifyFileId=null;
  _pendingWebVerifyFilename='';
  _pendingWebVerifyAction=null;
-  _pendingWebVerifyAutoOpen=false;
 }

 function confirmStoreWebVerify(){
@@ -2414,11 +2253,9 @@ function confirmStoreWebVerify(){
    .then(function(){
      var fileObj=(storeFiles||[]).find(function(f){return f.id===fileId;});
      if(fileObj){fileObj.web_unverified=false;}
-      sessionStorage.removeItem('webVerifyCancelledFileId');
      _pendingWebVerifyFileId=null;
      _pendingWebVerifyFilename='';
      _pendingWebVerifyAction=null;
-      _pendingWebVerifyAutoOpen=false;
      closeStoreWebVerifyDialog();
      loadStore();
      if(typeof action==='function') action();
@@ -2434,7 +2271,7 @@ function startReadyFileWithSlots(filename,_autoOpen){
  var fn=filename||S.file_ready;
  var currentFile=(storeFiles||[]).find(function(f){return f.filename===fn;});
  if(currentFile && currentFile.web_unverified && webUploadWarningEnabled()){
-    maybeGateWebUpload(currentFile, function(){ startReadyFileWithSlots(fn,_autoOpen); }, {autoOpen:!!_autoOpen});
+    maybeGateWebUpload(currentFile, function(){ startReadyFileWithSlots(fn); });
    return;
  }
  _filamentDialogMode='banner';
@@ -2455,31 +2292,23 @@ function startReadyFileWithSlots(filename,_autoOpen){
    });
  }

-  function _proceedWithFileObj(fileObj){
-    if(fileObj && fileObj.web_unverified && webUploadWarningEnabled()){
-      // Verify-Gate war beim ersten Lookup noch nicht aktiv (storeFiles leer) — jetzt prüfen.
-      if(_autoOpen){_fdDialogOpen=false;}
-      maybeGateWebUpload(fileObj, function(){ startReadyFileWithSlots(fn,_autoOpen); }, {autoOpen:!!_autoOpen});
-      return;
-    }
-    if(fileObj){
-      _storeFileId=fileObj.id;
-      _setGcodeFilamentsFromFileObj(fileObj);
-    }
-    openWithSlots();
-  }
-
  var fileObj=(storeFiles||[]).find(function(f){return f.filename===_storeFilename;});
  if(fileObj){
-    _proceedWithFileObj(fileObj);
+    _storeFileId=fileObj.id;
+    _setGcodeFilamentsFromFileObj(fileObj);
+    openWithSlots();
    return;
  }

  // Fallback: refresh file list, then resolve current file by filename.
  fetch(_apiUrl('/kx/files')).then(function(r){return r.json()}).then(function(d){
    storeFiles=d.result||[];
-    var refreshed=(storeFiles||[]).find(function(f){return f.filename===_storeFilename;})||null;
-    _proceedWithFileObj(refreshed);
+    var refreshed=(storeFiles||[]).find(function(f){return f.filename===_storeFilename;});
+    if(refreshed){
+      _storeFileId=refreshed.id;
+      _setGcodeFilamentsFromFileObj(refreshed);
+    }
+    openWithSlots();
  }).catch(function(){
    openWithSlots();
  });
@@ -2504,17 +2333,6 @@ function _normalizeMaterialKey(material){
  var key=(material||'').toUpperCase().replace(/[^A-Z0-9+]/g,'');
  // Orca often uses PLA for PLA+, while AMS may report PLA+.
  if(key==='PLA+'||key==='PLAPLUS') return 'PLA';
-  // Handle modifier+base patterns in either order: "Matte PLA", "Silk PETG",
-  // "PLA Silk", "PLA Matte". OrcaSlicer always writes the base type in GCode
-  // (filament_type = PLA), but users label slots with the full product-style name.
-  var trimmed=(material||'').trim();
-  if(trimmed.indexOf(' ')>=0){
-    var words=trimmed.toUpperCase().split(/\s+/);
-    for(var i=0;i<words.length;i++){
-      var w=words[i].replace(/[^A-Z0-9+]/g,'');
-      if(_BASE_MATERIAL_TYPES.indexOf(w)>=0) return w;
-    }
-  }
  return key;
 }
 function _materialsCompatible(a,b){
@@ -2550,7 +2368,6 @@ function openFilamentDialog(slots){
  _amsSlots=slots
    .filter(function(s){return s.status==='loaded';})
    .sort(function(a,b){return (a.slot_index||0)-(b.slot_index||0);});
-  _loadSpoolmanStatus();
  var dlg=document.getElementById('filament-dialog');
  var title=document.getElementById('fd-title');
  var body=document.getElementById('fd-slots');
@@ -2571,30 +2388,19 @@ function openFilamentDialog(slots){
  if(objBody)objBody.style.display='none';      // immer eingeklappt starten
  if(objArrow)objArrow.style.transform='';
  if(_storeFileId){
-    // Bei frischem Orca-/Web-Upload liefert der Drucker die Objektliste
-    // (objects_skip_parts) erst per fileDetails nach → ist im Store kurz leer.
-    // Daher mehrfach nachfragen, bis Objekte da sind (Issue #57 Skip-Parität).
-    var _objFid=_storeFileId;
-    var _objTries=0;
-    (function _loadObjects(){
-      if(_objFid!==_storeFileId) return; // Dialog wechselte Datei → abbrechen
-      fetch(_apiUrl('/kx/files/'+encodeURIComponent(_objFid)+'/objects'))
-        .then(function(r){return r.json()})
-        .then(function(d){
-          var names=(d.result&&d.result.names)||[];
-          var svg=(d.result&&d.result.svg_b64)||'';
-          if(names.length>=2){
-            _printObjectsSvg=svg;
-            _printObjects=names.map(function(n){return {name:n,skip:false};});
-            renderObjectChecklist(); renderObjectSvg();
-            var cnt=document.getElementById('fd-objects-count');
-            if(cnt)cnt.textContent='('+names.length+')';
-            if(objSection)objSection.style.display='block';
-          } else if(_objTries++ < 6){
-            setTimeout(_loadObjects, 1000); // bis ~6s auf fileDetails warten
-          }
-        }).catch(function(){});
-    })();
+    fetch(_apiUrl('/kx/files/'+encodeURIComponent(_storeFileId)+'/objects'))
+      .then(function(r){return r.json()})
+      .then(function(d){
+        var names=(d.result&&d.result.names)||[];
+        _printObjectsSvg=(d.result&&d.result.svg_b64)||'';
+        if(names.length>=2){
+          _printObjects=names.map(function(n){return {name:n,skip:false};});
+          renderObjectChecklist(); renderObjectSvg();
+          var cnt=document.getElementById('fd-objects-count');
+          if(cnt)cnt.textContent='('+names.length+')';
+          if(objSection)objSection.style.display='block';
+        }
+      }).catch(function(){});
  }

  // GCode-Kanäle: bevorzugt aus _gcodeFilaments, sonst aus belegten AMS-Slots ableiten
@@ -2680,19 +2486,13 @@ function openFilamentDialog(slots){
    }).join('');
  }
  if(dlg)dlg.classList.add('open');
-  // Spoolman-Section nach Slot-Render aufbauen (braucht die selects im DOM)
-  setTimeout(_buildSpoolmanSection, 0);
 }

 function closeFilamentDialog(){
  var dlg=document.getElementById('filament-dialog');
  if(dlg)dlg.classList.remove('open');
  _fdDialogOpen=false;
-  if(_fdAutoOpenedFile){
-    _fdUserCancelled=true;
-    sessionStorage.setItem('fdUserCancelled','1');
-    sessionStorage.setItem('fdAutoOpenedFile',_fdAutoOpenedFile);
-  }
+  if(_fdAutoOpenedFile) _fdUserCancelled=true;
 }

 function confirmFilamentPrint(){
@@ -2734,54 +2534,21 @@ function confirmFilamentPrint(){
  var excludedObjects=_printObjects.filter(function(o){return o.skip;}).map(function(o){return o.name;});
  var fdAlEl=document.getElementById('fd-auto-leveling');
  var fdAutoLeveling=fdAlEl?( fdAlEl.checked?1:0):(S.auto_leveling===undefined?1:S.auto_leveling?1:0);
-  // Spoolman: Slot→Spool-Mapping aus Dialog sammeln und senden
-  if(_spoolmanStatus.configured){
-    var slotMap={};
-    document.querySelectorAll('[data-spool-slot]').forEach(function(sel){
-      var idx=sel.dataset.spoolSlot;
-      var val=parseInt(sel.value);
-      if(val>0)slotMap[idx]=val;
-    });
-    _slotSpoolMap=slotMap;
-    post('/kx/spoolman/active-spool',{slot_map:slotMap}).catch(function(){});
-  }
  closeFilamentDialog();
  if(_filamentDialogMode==='banner'){
-    // Banner-Modus: /kx/print bevorzugen wenn _storeFileId bekannt (gleicher Pfad wie File-Browser).
+    // Banner-Modus: normaler print/start mit Slot-Override
    var btn=document.getElementById('file-ready-btn');
    if(btn){btn.disabled=true;btn.textContent='…';}
-    var startPromise;
-    if(_storeFileId){
-      startPromise=fetch(_apiUrl('/kx/print'),{
-        method:'POST',
-        headers:{'Content-Type':'application/json'},
-        body:JSON.stringify({
-          file_id:_storeFileId,
-          filament_assignments:assignments,
-          excluded_objects:excludedObjects,
-          auto_leveling:fdAutoLeveling
-        })
+    post('/printer/print/start',{filename:S.file_ready,filament_assignments:assignments,excluded_objects:excludedObjects,auto_leveling:fdAutoLeveling})
+      .then(function(r){return r.json();})
+      .then(function(){
+        document.getElementById('file-ready-banner').style.display='none';
+        if(btn){btn.disabled=false;setText('file-ready-btn',T.file_ready_btn);}
+      })
+      .catch(function(e){
+        clog(tr('log_error')+' '+e,'msg-err');
+        if(btn){btn.disabled=false;setText('file-ready-btn',T.file_ready_btn);}
      });
-    }else{
-      startPromise=post('/printer/print/start',{
-        filename:S.file_ready||_storeFilename,
-        filament_assignments:assignments,
-        excluded_objects:excludedObjects,
-        auto_leveling:fdAutoLeveling
-      });
-    }
-    startPromise.then(function(r){
-      if(!r.ok){return r.text().then(function(t){throw new Error(t||('HTTP '+r.status));});}
-      return r.json();
-    }).then(function(d){
-      if(d&&d.error) throw new Error(d.error);
-      if(d&&d.result&&d.result!=='ok') throw new Error(String(d.result));
-      document.getElementById('file-ready-banner').style.display='none';
-      if(btn){btn.disabled=false;setText('file-ready-btn',T.file_ready_btn);}
-    }).catch(function(e){
-      clog(tr('log_error')+' '+e,'msg-err');
-      if(btn){btn.disabled=false;setText('file-ready-btn',T.file_ready_btn);}
-    });
  } else {
    // Store-Modus: POST /kx/print
    fetch(_apiUrl('/kx/print'),{
@@ -2852,45 +2619,35 @@ function renderObjectSvg(){
 // ── Mid-Print Skip ──
 var _skipObjects=[]; // [{name, skipped, willSkip}]
 var _skipSvg='';
-var _skipPollTimer=null;
-function _applySkipDialogState(s){
-  s=s||{};
-  _skipSvg=s.svg_b64||'';
-  var skipped=s.skipped||[];
-  // Pending-Auswahl (willSkip) beim Refresh erhalten.
-  var prevWillSkip={};
-  (_skipObjects||[]).forEach(function(o){if(o&&o.name)prevWillSkip[o.name]=!!o.willSkip;});
-  _skipObjects=(s.objects||[]).map(function(n){
-    var isSkipped=(skipped.indexOf(n)>=0);
-    return {name:n, skipped:isSkipped, willSkip:isSkipped?false:!!prevWillSkip[n]};
-  });
-  renderSkipList(); renderSkipSvg();
-}
 function openSkipDialog(){
  document.getElementById('skip-status').textContent='';
  document.getElementById('skip-confirm').disabled=false;
  _refreshSkipDialog();
-  if(_skipPollTimer)clearInterval(_skipPollTimer);
-  _skipPollTimer=setInterval(function(){
-    var dlg=document.getElementById('skip-dialog');
-    if(!(dlg&&dlg.classList.contains('open')))return;
-    _refreshSkipDialog();
-  },2000);
  document.getElementById('skip-dialog').classList.add('open');
 }
 function _refreshSkipDialog(){
-  // query-Endpoint wartet intern auf frischen skip/report (bis 1.5s).
-  fetch(_apiUrl('/kx/skip/query'),{method:'POST'})
-    .then(function(r){return r.json();})
-    .then(function(d){_applySkipDialogState(d.result||{});})
-    .catch(function(){
-      fetch(_apiUrl('/kx/skip/state')).then(function(r){return r.json();}).then(function(d){
-        _applySkipDialogState(d.result||{});
-      }).catch(function(){});
+  // Erst aktueller State (mit DB-Objects + svg), dann query_obj für frischen skipped
+  fetch(_apiUrl('/kx/skip/state')).then(function(r){return r.json()}).then(function(d){
+    var s=d.result||{};
+    _skipSvg=s.svg_b64||'';
+    _skipObjects=(s.objects||[]).map(function(n){
+      return {name:n, skipped:(s.skipped||[]).indexOf(n)>=0, willSkip:false};
    });
+    renderSkipList(); renderSkipSvg();
+  });
+  // Frisch nachfragen (skipped-Liste aktualisieren)
+  fetch(_apiUrl('/kx/skip/query'),{method:'POST'}).then(function(r){return r.json()}).then(function(){
+    setTimeout(function(){
+      fetch(_apiUrl('/kx/skip/state')).then(function(r){return r.json()}).then(function(d){
+        var s=d.result||{};
+        var skipped=s.skipped||[];
+        _skipObjects.forEach(function(o){ o.skipped=skipped.indexOf(o.name)>=0; if(o.skipped)o.willSkip=false; });
+        renderSkipList(); renderSkipSvg();
+      });
+    }, 500);
+  }).catch(function(){});
 }
 function closeSkipDialog(){
-  if(_skipPollTimer){clearInterval(_skipPollTimer);_skipPollTimer=null;}
  document.getElementById('skip-dialog').classList.remove('open');
 }
 function _shortLabel(name){
--- a/web/themes/default/index.html
+++ b/web/themes/default/index.html
@@ -522,7 +522,7 @@
                  <option value="en">English</option>
                  <option value="es">Espanol</option>
                  <option value="fr">Français</option>
-                  <option value="it">Italiano</option>
+                  <option value="it">Italiano</option>                  
                  <option value="zh-cn">中文(简体)</option>
                </select>
              </div>
@@ -646,13 +646,6 @@
        <label for="fd-auto-leveling" style="margin:0;cursor:pointer;font-size:13px" id="fd-lbl-auto-leveling">Auto-Leveling</label>
      </div>
    </div>
-    <div id="fd-spoolman-section" style="display:none;margin-bottom:16px;border-top:1px solid var(--border);padding-top:12px">
-      <p style="font-size:12px;color:var(--txt2);margin-bottom:8px;display:flex;align-items:center;gap:6px">
-        <span id="fd-spoolman-lbl">🧵 Spoolman</span>
-        <span id="fd-spoolman-loading" style="display:none;font-size:10px">…</span>
-      </p>
-      <div id="fd-spoolman-rows" style="display:flex;flex-direction:column;gap:6px"></div>
-    </div>
    <div style="display:flex;gap:8px;justify-content:flex-end">
      <button id="fd-cancel" onclick="closeFilamentDialog()" style="padding:8px 16px;background:var(--raised);border:1px solid var(--border);border-radius:8px;color:var(--txt);cursor:pointer">Abbrechen</button>
      <button id="fd-print" onclick="confirmFilamentPrint()" style="padding:8px 18px;background:var(--accent);color:#fff;border:none;border-radius:8px;cursor:pointer;font-weight:600">▶ Drucken</button>