fix(system): make retiring a library connection race-free and cheap

Review round for the cross-thread close fix:

- cursor() now records its cursor under the lock _close_now copies the
  cursor set under, and refuses once the connection is retired; a cursor
  opened while the connection closed raised "Set changed size during
  iteration" out of retire() on Python 3.10-3.12. retire() never raises,
  retire_connections keeps going when one connection fails, and the mover
  never reports a completed switch as failed because retiring or awaiting
  old connections did.
- The restore's backup target is marked in use (ManagedConnection.using),
  and in_transaction and create_function are guarded.
- Iterating a cursor marks the connection in use once per fetchmany(128)
  chunk instead of once per row: a 1000-row scan costs 1.10x a plain
  cursor instead of 2.7x (3.14) / 3.8x (3.10).
- Document what an interrupt does not end, the statements a retired
  connection cannot hold back, close() from another thread returning
  before the file is closed, and the await timeout ending as old-in-use.

.github/branch-protection.json

@@ -2,15 +2,18 @@
   "required_status_checks": {
     "strict": true,
     "contexts": [
+      "py3.10 on ubuntu-latest",
+      "py3.11 on ubuntu-latest",
       "py3.12 on ubuntu-latest",
       "py3.13 on ubuntu-latest",
-      "py3.14 on ubuntu-latest",
+      "py3.10 on windows-latest",
+      "py3.11 on windows-latest",
       "py3.12 on windows-latest",
       "py3.13 on windows-latest",
-      "py3.14 on windows-latest",
+      "py3.10 on macos-latest",
+      "py3.11 on macos-latest",
       "py3.12 on macos-latest",
       "py3.13 on macos-latest",
-      "py3.14 on macos-latest",
       "coverage gate (85%)",
       "black and flake8",
       "frontend modules",

.github/workflows/code-quality.yml

@@ -19,17 +19,14 @@ jobs:
   security:
     name: bandit (high severity)
     runs-on: ubuntu-latest
-    # ceil(1.5 x slowest of three green main runs) + 3, never under 5 (test.yml): runs 40257217665,
-    # 40254137380, 40240706583 took 23s / 16s / 23s -> 5 min.
-    timeout-minutes: 5
 
     steps:
       - uses: actions/checkout@v7
 
-      - name: Set up Python 3.12
+      - name: Set up Python 3.10
         uses: actions/setup-python@v7
         with:
-          python-version: "3.12"
+          python-version: "3.10"
 
       - name: Install bandit
         run: pip install bandit[toml]

.github/workflows/test.yml

@@ -19,28 +19,15 @@ concurrency:
 env:
   PYTHONFAULTHANDLER: "1"
 
-# Every job has a time limit: ceil(1.5 x the slowest of three recent green runs on main) + 3
-# minutes, never under 5. The 3 minutes leave room for the Python runner's watchdog (120 s, see
-# tests/run_suite.py) to print its stack dump before GitHub cancels the job. A limit changes only
-# with new measurements written here (TESTING.md "Time limits and hangs").
-# Measured 2026-10-26 on runs 40257217681 (3be0ada), 40240706568 (fb9134f), 40228167328 (f9835aa):
-#   py matrix, slowest py3.10 on windows-latest: 12m43s / 15m54s / 14m53s -> 27 min
-#     (ubuntu 5m27s-6m27s, macos 6m14s-8m30s, windows 11m42s-15m54s)
-#     3.10 and 3.11 left the matrix and 3.14 joined it in #356; re-measure after three green main runs.
-#   real ComfyUI compatibility: 13m32s / 8m55s / 11m46s -> 24 min
-#   coverage gate (85%): 7m26s / 7m22s / 7m54s -> 15 min
-#   perf budget 30s / 29s / 27s, black and flake8 39s / 37s / 39s,
-#   frontend modules 23s / 19s / 29s -> 5 min (the floor)
 jobs:
   test:
     name: py${{ matrix.python-version }} on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 27
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        python-version: ["3.12", "3.13", "3.14"]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
 
     steps:
       - uses: actions/checkout@v7
@@ -58,12 +45,12 @@ jobs:
           pip install -r requirements-dev.txt
 
       - name: Run tests
-        run: python -m tests.run_suite -v
+        run: python -m unittest discover -s tests -v
 
   comfyui:
     name: real ComfyUI compatibility
     runs-on: ubuntu-latest
-    timeout-minutes: 24
+    timeout-minutes: 25
     steps:
       - uses: actions/checkout@v7
         with:
@@ -140,7 +127,6 @@ jobs:
   coverage:
     name: coverage gate (85%)
     runs-on: ubuntu-latest
-    timeout-minutes: 15
     steps:
       - uses: actions/checkout@v7
 
@@ -157,7 +143,7 @@ jobs:
 
       - name: Measure coverage
         run: |
-          python -m coverage run -m tests.run_suite
+          python -m coverage run -m unittest discover -s tests
           python -m coverage combine
           python -m coverage report --fail-under=85
 
@@ -168,7 +154,6 @@ jobs:
     name: perf budget
     if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
     runs-on: ubuntu-latest
-    timeout-minutes: 5
     steps:
       - uses: actions/checkout@v7
 
@@ -191,7 +176,6 @@ jobs:
   lint:
     name: black and flake8
     runs-on: ubuntu-latest
-    timeout-minutes: 5
     steps:
       - uses: actions/checkout@v7
       - uses: actions/setup-python@v7
@@ -204,7 +188,6 @@ jobs:
   js-test:
     name: frontend modules
     runs-on: ubuntu-latest
-    timeout-minutes: 5
     steps:
       - uses: actions/checkout@v7
 

.pre-commit-config.yaml

@@ -22,7 +22,7 @@ repos:
 
       - id: tests
         name: tests
-        entry: python -m tests.run_suite -q
+        entry: python -m unittest discover tests/ -v
         language: system
         pass_filenames: false
         stages: [pre-push]

README.md

@@ -1,7 +1,7 @@
 # ComfyUI Prompt Manager
 
 ![License](https://img.shields.io/badge/license-MIT-blue.svg)
-![Python](https://img.shields.io/badge/python-3.12%2B-blue.svg)
+![Python](https://img.shields.io/badge/python-3.10%2B-blue.svg)
 ![ComfyUI](https://img.shields.io/badge/ComfyUI-compatible-green.svg)
 ![Tests](https://github.com/ComfyAssets/ComfyUI_PromptManager/workflows/Tests/badge.svg)
 ![Code Quality](https://github.com/ComfyAssets/ComfyUI_PromptManager/workflows/Code%20Quality/badge.svg)
@@ -483,15 +483,11 @@ If you use [ComfyUI-Lora-Manager](https://github.com/willmiao/ComfyUI-Lora-Manag
 
 Click **Import LoRA Data** in the settings panel to start the import. A progress popup shows real-time status as each LoRA is processed:
 
-- Reads LoRA Manager's own settings the way LoRA Manager does: from the folder in `LORA_MANAGER_SETTINGS_DIR`, from the plugin's `settings.json` in portable mode, or from your user config folder, and only the keys that say where its files are
-- Finds each LoRA's metadata in both storage modes: beside the model (the default) or in the central sidecar folder, and imports only LoRAs whose model file still exists in a LoRA folder (the review says how many metadata files it skipped)
-- Links LoRA Manager's preview (including `.preview.webp` and video previews) and every downloaded example image and video where they are, without copying them
-- Downloads example images from CivitAI as 512px thumbnails only for LoRAs that have no local image
+- Scans all LoRA directories (including `extra_model_paths.yaml` paths) for metadata
+- Downloads example images from CivitAI as 512px thumbnails
 - Creates a prompt entry for each LoRA with trigger words, example prompts, and preview images
 - All imported LoRAs are tagged with `lora-manager` category for easy filtering
 
-The System › Integrations review names the settings it read (source, storage mode and LoRA Manager library) and counts metadata files, LoRAs and LoRAs with local images. If LoRA Manager's settings cannot be used, it says why and nothing is changed.
-
 ![LoRA Results](images/pm-lora-filtered.png)
 
 After import, filter by the `lora-manager` category to browse your LoRA collection.
@@ -505,8 +501,6 @@ To add your key:
 2. Paste it into the **CivitAI API Key** field in the Integrations settings
 3. Save and re-import to download any previously skipped images
 
-The key is sent only over HTTPS to CivitAI's own hosts. CivitAI serves images through a redirect to its storage host; PromptManager follows such a redirect only over HTTPS to a host on CivitAI's own `civitai.com`, `civitai.red` or `civitai.green` domains, at most three hops, and never sends the key with it. When downloads fail, the import's status line says how many; when none could be downloaded, it starts with a warning. The server log has one warning per failed image with the reason (HTTP status, refused redirect, size cap, unreadable image, timeout or network error).
-
 > **Note:** Re-importing is safe — PromptManager skips LoRAs that were already imported. To do a fresh import, the previous `lora-manager` data is cleared automatically before re-scanning.
 
 ### 🌐 Web Interface Features
@@ -781,23 +775,6 @@ serve `__` system folders. Thumbnails stay in `output/thumbnails`.
 - **An explicit `database.default_path`** in `config.json` and `PROMPT_MANAGER_CONFIG_PATH`
   keep working as before (described below); such a library is not offered a move.
 
-### Thumbnails
-
-Previews in `output/thumbnails` are written as **WebP, quality 80, 512 px** by default
-(System › Appearance › Thumbnails sets the format, quality and size limit for every
-preview). Previews from older versions keep their old format (usually PNG) until you
-run **Convert outdated** (System › Overview or Appearance): it rewrites each one from
-its original and then removes the old file. Nothing converts on its own.
-
-**JPEG XL** (smaller still) can be chosen once the server has an encoder. Install one
-of these, then restart ComfyUI:
-
-- `pip install pillow-jxl-plugin` in ComfyUI's Python environment (simplest), or
-- an `ffmpeg` on PATH built with `libjxl`, or
-- `cjxl` from [libjxl](https://github.com/libjxl/libjxl) on PATH.
-
-Browsers that cannot show JPEG XL see the original images in the grid instead.
-
 ### Database Settings
 
 You can customize the database path by creating a `config.json` file in the library's
@@ -928,12 +905,12 @@ db.model.backup_database("backup_prompts.db")
 ```bash
 cd ComfyUI_PromptManager
 pip install -r requirements-dev.txt
-python -m tests.run_suite                      # Python (what CI runs: unittest discovery plus a hang watchdog)
+python -m unittest discover -s tests          # Python (what CI runs)
 node --test tests/js/*.test.js                 # frontend pure modules
-python -m coverage run -m tests.run_suite && python -m coverage combine && python -m coverage report
+python -m coverage run -m unittest discover -s tests && python -m coverage combine && python -m coverage report
 ```
 
-CI runs the suite on Linux, Windows and macOS for Python 3.12 to 3.14 with an 85% coverage gate. `python -m unittest discover -s tests` still works; see `TESTING.md` ("Time limits and hangs") for the watchdog. Tests that delete a database file first check that nothing in the process still holds it open (`tests/open_handles.py`), so a connection leak fails on Linux the way it would on Windows.
+CI runs the suite on Linux, Windows and macOS for Python 3.10 to 3.12 with an 85% coverage gate. Tests that delete a database file first check that nothing in the process still holds it open (`tests/open_handles.py`), so a connection leak fails on Linux the way it would on Windows.
 
 ### Code Style
 

__init__.py

@@ -87,24 +87,10 @@ try:
     routes = config.routes
     api = PromptManagerAPI()
     api.add_routes(routes)
-    # Temp files of preview writes a crash interrupted (#317), off the
-    # import path: the walk may cover a large thumbnails folder.
-    import threading
-
-    threading.Thread(
-        target=api.sweep_thumbnail_temps,
-        name="PromptManagerPreviewTempSweep",
-        daemon=True,
-    ).start()
     host_app = getattr(config.server_instance, "app", None)
     if host_app is not None and hasattr(host_app, "on_cleanup"):
         host_app.on_cleanup.append(api.cleanup_history_reads)
         host_app.on_cleanup.append(api.cleanup_annotation_captures)
-        host_app.on_cleanup.append(api.cleanup_gallery_listings)
-    if host_app is not None and hasattr(host_app, "on_startup"):
-        # Build each output root's Images listing once the server's loop runs,
-        # so the first open does not wait for the walk (#348).
-        host_app.on_startup.append(api.warm_gallery_listings)
     if host_app is not None and hasattr(host_app, "on_shutdown"):
         # Open Needs review change streams end before the server waits on them.
         host_app.on_shutdown.append(api.close_review_events)
@@ -149,9 +135,6 @@ try:
         # Every settled output's preview is queued for the API's background
         # worker (#249): the workspace never asks to generate thumbnails.
         _global_image_monitor.set_thumbnail_queue(_review_api.queue_capture_thumbnail)
-        # Every settled output walks its Images listing again (#348): the
-        # API hops from the monitor's thread onto the server's loop.
-        _global_image_monitor.set_output_listener(_review_api.notify_output_settled)
         _review_host = getattr(config.server_instance, "app", None)
         if _review_host is not None and hasattr(_review_host, "on_cleanup"):
 
@@ -160,7 +143,6 @@ try:
             ):
                 monitor.set_review_recorder(None)
                 monitor.set_thumbnail_queue(None)
-                monitor.set_output_listener(None)
                 api.close_auto_thumbnails(final=True)
 
             _review_host.on_cleanup.insert(0, _stop_review_recording)

database/category_import.py

@@ -1,201 +0,0 @@
-"""Atomic replacement of one imported category (#221, #249 System S10).
-
-The LoRA reference import used to delete its whole category and then save
-each record in its own transaction, so a failure part way left the previous
-collection deleted and the new one partial. ``replace_category_prompts``
-does both in one ``BEGIN IMMEDIATE`` transaction: the category's current
-prompts (with their tags and image links) are replaced by the staged
-records, or, on any error, nothing changes.
-
-A staged record is ``{text, hash, tags, images}``. A record whose hash a
-prompt outside the category already has links its images to that prompt
-(the legacy import did the same); a second record with the hash of an
-earlier one links its images to that one. Neither is a new prompt.
-"""
-
-from typing import Any, Dict, List, Optional, Sequence
-
-try:
-    from .maintenance import PlanChanged
-    from .pairs import PairDependencyError
-    from .workflow_documents import documents_of_rows, release_documents
-except ImportError:  # pragma: no cover - flat test imports
-    from database.maintenance import PlanChanged
-    from database.pairs import PairDependencyError
-    from database.workflow_documents import documents_of_rows, release_documents
-
-
-class EmptyReplacement(ValueError):
-    """The replacement has no record and would remove every current import."""
-
-
-# The category's prompt ids, as a subquery (one bound parameter).
-_IN_CATEGORY = "SELECT id FROM prompts WHERE category = ?"
-
-# Each record's outcome and the result counter it adds to.
-_COUNTERS = {"imported": "imported", "linked": "linked", "duplicate": "duplicates"}
-
-
-def _placeholders(values: Sequence[Any]) -> str:
-    return ",".join("?" * len(values))
-
-
-class CategoryImportOperations:
-    """Read the state of an imported category and replace it atomically."""
-
-    def category_import_state(self, category: str) -> Dict[str, Any]:
-        """``{ids, paired}``: the category's prompt ids (ascending) and how
-        many of them a saved pair uses (those block a replacement)."""
-        with self.model.get_connection() as conn:
-            ids = [
-                row[0]
-                for row in conn.execute(
-                    "SELECT id FROM prompts WHERE category = ? ORDER BY id",
-                    (category,),
-                ).fetchall()
-            ]
-            paired = conn.execute(
-                "SELECT COUNT(*) FROM prompts WHERE category = ? AND id IN "
-                "(SELECT positive_prompt_id FROM prompt_pairs UNION "
-                "SELECT negative_prompt_id FROM prompt_pairs)",
-                (category,),
-            ).fetchone()[0]
-        return {"ids": ids, "paired": paired}
-
-    def existing_prompt_hashes(
-        self, hashes: Sequence[str], exclude_category: str
-    ) -> set:
-        """The given hashes a prompt outside ``exclude_category`` already has."""
-        found = set()
-        wanted = list(dict.fromkeys(hashes))
-        with self.model.get_connection() as conn:
-            for start in range(0, len(wanted), 500):
-                chunk = wanted[start : start + 500]
-                rows = conn.execute(
-                    f"SELECT hash FROM prompts WHERE hash IN ({_placeholders(chunk)}) "
-                    "AND (category IS NULL OR category != ?)",
-                    [*chunk, exclude_category],
-                ).fetchall()
-                found.update(row[0] for row in rows)
-        return found
-
-    def replace_category_prompts(
-        self,
-        category: str,
-        records: List[Dict[str, Any]],
-        *,
-        expected_ids: Optional[List[int]] = None,
-        allow_empty: bool = False,
-    ) -> Dict[str, Any]:
-        """Replace every prompt of ``category`` with ``records`` in one transaction.
-
-        Raises (and changes nothing): ``PlanChanged`` when ``expected_ids`` is
-        given and the category's prompt ids differ from it;
-        ``PairDependencyError`` when a saved pair uses one of its prompts;
-        ``EmptyReplacement`` when ``records`` is empty while the category has
-        prompts, unless ``allow_empty`` (an empty replacement that was
-        reviewed). Any other error rolls everything back too.
-
-        Returns ``{removed, imported, linked, duplicates, images, rows}``:
-        prompts removed and created, records linked to an existing prompt or
-        to an earlier record with the same text, image links added, and per
-        record ``{name, outcome}`` (``imported``/``linked``/``duplicate``).
-        """
-        with self._pair_transaction() as conn:
-            ids = [
-                row[0]
-                for row in conn.execute(
-                    "SELECT id FROM prompts WHERE category = ? ORDER BY id",
-                    (category,),
-                ).fetchall()
-            ]
-            if expected_ids is not None and ids != list(expected_ids):
-                raise PlanChanged("The imported prompts changed since the review")
-            if not records and ids and not allow_empty:
-                raise EmptyReplacement(
-                    "Nothing to import; the previous imports were kept"
-                )
-            self._ensure_category_unpaired(conn, category)
-            removed = self._delete_category_rows(conn, category, ids)
-            result = {
-                "removed": removed,
-                "imported": 0,
-                "linked": 0,
-                "duplicates": 0,
-                "images": 0,
-                "rows": [],
-            }
-            created = {}
-            for record in records:
-                self._import_record(conn, category, record, created, result)
-            return result
-
-    def _delete_category_rows(self, conn, category: str, ids: List[int]) -> int:
-        """Delete the category's prompts with their image links and tags.
-
-        No commit. The rows are selected by category (just verified against
-        ``ids`` under the write lock), so no statement binds one parameter per
-        prompt and SQLite's variable limit never caps a collection.
-        """
-        if not ids:
-            return 0
-        documents = documents_of_rows(conn, "prompt_id", ids)  # chunked
-        conn.execute(
-            f"DELETE FROM generated_images WHERE prompt_id IN ({_IN_CATEGORY})",
-            (category,),
-        )
-        release_documents(conn, documents)
-        conn.execute(
-            f"DELETE FROM prompt_tags WHERE prompt_id IN ({_IN_CATEGORY})",
-            (category,),
-        )
-        return conn.execute(
-            "DELETE FROM prompts WHERE category = ?", (category,)
-        ).rowcount
-
-    @staticmethod
-    def _ensure_category_unpaired(conn, category: str) -> None:
-        """Raise PairDependencyError when a saved pair uses a category prompt."""
-        row = conn.execute(
-            f"SELECT id FROM prompt_pairs WHERE positive_prompt_id IN ({_IN_CATEGORY}) "
-            f"OR negative_prompt_id IN ({_IN_CATEGORY}) LIMIT 1",
-            (category, category),
-        ).fetchone()
-        if row:
-            raise PairDependencyError(
-                f"Prompt belongs to saved pair {row[0]}; delete the pair first "
-                "or save changed text as a new prompt"
-            )
-
-    def _import_record(self, conn, category, record, created, result) -> None:
-        """Save one staged record on ``conn``, or link it to the prompt it repeats."""
-        prompt_hash = record["hash"]
-        name = record.get("name") or record["text"]
-        if prompt_hash in created:
-            prompt_id, outcome = created[prompt_hash], "duplicate"
-        else:
-            row = conn.execute(
-                "SELECT id FROM prompts WHERE hash = ?", (prompt_hash,)
-            ).fetchone()
-            if row is not None:
-                prompt_id, outcome = row[0], "linked"
-            else:
-                prompt_id = self._insert_prompt(
-                    conn,
-                    record["text"],
-                    category,
-                    list(record.get("tags") or []),
-                    None,
-                    None,
-                    prompt_hash,
-                )
-                outcome = "imported"
-            created[prompt_hash] = prompt_id
-        result[_COUNTERS[outcome]] += 1
-        # Linked last to first: every workspace list shows a prompt's media
-        # newest link first, so the record's first image (the LoRA cover,
-        # #355) is the one a Library card shows.
-        for image in reversed(record.get("images") or []):
-            if self._insert_image_link(conn, prompt_id, image):
-                result["images"] += 1
-        result["rows"].append({"name": name, "outcome": outcome})

database/execution_outputs.py

@@ -4,8 +4,6 @@ import sqlite3
 from contextlib import ExitStack
 from typing import Callable, ContextManager
 
-from .run_attribution import notify_outputs_sealed
-
 try:
     from ..utils.execution_history_events import RunFinish, encode_command
     from ..utils.execution_outputs import OutputBundle, validate_output_bundle
@@ -115,10 +113,6 @@ class ExecutionOutputOperations:
                     "VALUES(?,?,?,?,?,?,?,?)",
                     [(run_id, *reference) for reference in prepared],
                 )
-        # Committed: images waiting for this run may now be attributed (#342)
-        notify_outputs_sealed(
-            run_id, [dict(zip(_REFERENCE_FIELDS, row)) for row in prepared]
-        )
         return True
 
     def get_execution_outputs(self, run_id: str) -> dict:

database/models.py

@@ -9,6 +9,7 @@ import math
 import sqlite3
 import os
 import threading
+import tempfile
 import weakref
 from contextlib import closing
 from pathlib import Path
@@ -19,7 +20,6 @@ from .managed_connection import (
     await_closed,
     retire_connections,
 )
-from . import restore_stage
 from .library_schema import library_schema_error, migrate_library_state
 from .image_favorites import image_favorites_schema_error, migrate_image_favorites
 from .annotation_schema import annotation_schema_error, migrate_annotation_state
@@ -39,6 +39,7 @@ from .workflow_documents import (
 from .execution_history_schema import (
     history_schema_error,
     migrate_execution_history,
+    rotate_history_epoch,
 )
 
 # Import logging system
@@ -554,10 +555,7 @@ class PromptModel:
             "WHERE pp.positive_prompt_id IS NOT gi.prompt_id LIMIT 1"
         ).fetchone():
             return "Image pair association has a different positive prompt owner"
-        # fetchone, not iteration: a managed connection's cursor prefetches
-        # ITER_CHUNK rows when iterated, and each provenance may be ~4 MB.
-        cursor = conn.execute("SELECT provenance FROM image_prompt_pairs")
-        while (row := cursor.fetchone()) is not None:
+        for row in conn.execute("SELECT provenance FROM image_prompt_pairs"):
             error = pair_provenance_error(row[0])
             if error:
                 return error
@@ -1134,7 +1132,7 @@ class PromptModel:
 
     @staticmethod
     def verify_database_file(
-        path: str, *, require_library_state: bool = False, documents: bool = True
+        path: str, *, require_library_state: bool = False
     ) -> Tuple[bool, str]:
         """
         Check that a file is a healthy prompts database before restoring it.
@@ -1148,9 +1146,6 @@ class PromptModel:
                 database has (Library state, image favorites, saved views,
                 image annotations and the review queue), as a migrated
                 restore stage must; old backups may lack them.
-            documents: Read every workflow document and refuse a damaged
-                one. A restore checks its upload without it and repairs
-                damaged documents on the stage (``database/restore_stage.py``).
 
         Returns:
             (ok, reason): reason is "ok" when the file is acceptable, otherwise
@@ -1226,7 +1221,7 @@ class PromptModel:
             if review_error:
                 return False, review_error
             documents_error = workflow_documents_schema_error(
-                conn, allow_missing=not require_library_state, documents=documents
+                conn, allow_missing=not require_library_state, documents=True
             )
             if documents_error:
                 return False, documents_error
@@ -1260,43 +1255,17 @@ class PromptModel:
         finally:
             source.close()
 
-    def stage_restore(self, src_path: str):
-        """Stage ``src_path`` beside this database for a restore (blocking).
-
-        Returns a ``StagedRestore`` (``database/restore_stage.py``): a
-        migrated, repaired and verified copy in the library's folder, its
-        digest and what it holds. Neither the live database nor the source
-        is touched. Raises ValueError when either does not verify.
-        """
-        return restore_stage.stage_restore(PromptModel, self.db_path, src_path)
-
-    def publish_staged(self, staged) -> str:
-        """Replace the live database with ``staged``; return the safety backup.
-
-        See ``restore_stage.publish_staged``: the staged bytes are rechecked,
-        the current database is kept as ``<db_path>.backup_<stamp>`` and the
-        WAL is truncated afterwards.
-        """
-        backup_path = restore_stage.publish_staged(self, staged)
-        self.logger.info("Database restored from a staged copy")
-        from .execution_history import notify_history_restore
-
-        notify_history_restore(self.db_path)
-        return backup_path
-
     def restore_from_file(self, src_path: str) -> str:
         """
         Replace the live database with the file at src_path.
 
-        ``stage_restore`` then ``publish_staged``: a disposable copy of the
-        source is migrated, repaired and verified in the library's folder
-        first. Only then is the current database backed up next to itself as
-        ``<db_path>.backup_<YYYYmmdd_HHMMSS_ffffff>`` (WAL content included),
-        and the staged pages replace the live pages through SQLite's backup
-        API. Staging failures never replace live content or modify the
-        source. An online replacement failure leaves the live database intact
-        and propagates; the completed safety backup remains available. The
-        stage is removed either way.
+        A disposable SQLite backup of the source is migrated and verified first.
+        Only then is the current database backed up next to itself as
+        ``<db_path>.backup_<YYYYmmdd_HHMMSS>`` (WAL content included), and the
+        staged pages replace the live pages through SQLite's backup API.
+        Migration failures never replace live content or modify the source.
+        An online replacement failure leaves the live database intact and
+        propagates; the completed safety backup remains available.
 
         Args:
             src_path: SQLite file to restore
@@ -1306,14 +1275,55 @@ class PromptModel:
             there was no database to back up.
 
         Raises:
-            ValueError: If the source or its migrated copy does not verify
-            SafetyBackupFailed: If the previous database could not be backed up
+            RuntimeError: If the previous database could not be backed up
             sqlite3.OperationalError: If SQLite refuses online replacement
         """
-        staged = self.stage_restore(src_path)
-        try:
-            backup_path = self.publish_staged(staged)
-        finally:
-            staged.discard()
-        self.logger.info(f"Database restored from {src_path}")
-        return backup_path
+        ok, reason = self.verify_database_file(src_path)
+        if not ok:
+            raise ValueError(reason)
+        with tempfile.TemporaryDirectory(prefix="prompt-manager-restore-") as directory:
+            staged_path = str(Path(directory) / "staged.db")
+            source = sqlite3.connect(
+                Path(src_path).resolve().as_uri() + "?mode=ro", uri=True
+            )
+            try:
+                with closing(sqlite3.connect(staged_path)) as destination:
+                    source.backup(destination)
+            finally:
+                source.close()
+            staged = None
+            try:
+                staged = PromptModel(staged_path)
+                rotate_history_epoch(staged.get_connection())
+                ok, reason = self.verify_database_file(
+                    staged_path, require_library_state=True
+                )
+                if not ok:
+                    raise ValueError(reason)
+                staged.close_all()
+                backup_path = ""
+                if os.path.exists(self.db_path):
+                    timestamp = datetime.datetime.now().strftime("%Y%m%d_%H%M%S")
+                    backup_path = f"{self.db_path}.backup_{timestamp}"
+                    if not self.backup_database(backup_path):
+                        raise RuntimeError("Could not back up the current database")
+                    self.logger.info(f"Current database backed up to: {backup_path}")
+                try:
+                    self._replace_contents_from(staged_path)
+                except sqlite3.OperationalError as exc:
+                    exc._prompt_manager_restore_backup_created = bool(backup_path)
+                    raise
+                with PromptModel._init_lock:
+                    PromptModel._initialized_paths.add(self._schema_key())
+                self.logger.info(f"Database restored from {src_path}")
+                from .execution_history import notify_history_restore
+
+                notify_history_restore(self.db_path)
+                return backup_path
+            finally:
+                if staged is not None:
+                    staged.close_all()
+                with PromptModel._init_lock:
+                    PromptModel._initialized_paths.discard(
+                        os.path.normcase(os.path.realpath(staged_path))
+                    )

database/operations.py

@@ -26,7 +26,6 @@ from .history_reads import HistoryReadOperations
 from .health import HealthOperations, iter_consistency_issues
 from .duplicate_copies import DuplicateCopyOperations
 from .workflow_storage import WorkflowStorageOperations
-from .category_import import CategoryImportOperations, EmptyReplacement  # noqa: F401
 from .workflow_documents import (
     DocumentReader,
     documents_of_rows,
@@ -367,7 +366,6 @@ class PromptDatabase(
     MaintenanceOperations,
     DuplicateCopyOperations,
     WorkflowStorageOperations,
-    CategoryImportOperations,
 ):
     """Database operations class for managing prompts."""
 
@@ -457,9 +455,26 @@ class PromptDatabase(
 
         try:
             with self.model.get_connection() as conn:
-                prompt_id = self._insert_prompt(
-                    conn, text, category, tags, rating, notes, prompt_hash
+                cursor = conn.execute(
+                    """
+                    INSERT INTO prompts (
+                        text, category, tags, rating, notes, hash, created_at,
+                        updated_at
+                    ) VALUES (?, ?, NULL, ?, ?, ?, ?, ?)
+                    """,
+                    (
+                        text.strip(),
+                        category,
+                        rating,
+                        notes,
+                        prompt_hash,
+                        datetime.datetime.now(datetime.timezone.utc).isoformat(),
+                        datetime.datetime.now(datetime.timezone.utc).isoformat(),
+                    ),
                 )
+                prompt_id = cursor.lastrowid
+                if tags:
+                    self._sync_prompt_tags(conn, prompt_id, tags)
                 conn.commit()
                 self.logger.debug(f"Successfully saved prompt with ID: {prompt_id}")
                 return prompt_id
@@ -475,32 +490,6 @@ class PromptDatabase(
             )
             return existing["id"]
 
-    def _insert_prompt(
-        self,
-        conn: sqlite3.Connection,
-        text: str,
-        category: Optional[str],
-        tags: Optional[List[str]],
-        rating: Optional[int],
-        notes: Optional[str],
-        prompt_hash: Optional[str],
-    ) -> int:
-        """Insert one prompt row and its tags on ``conn`` (no commit)."""
-        now = datetime.datetime.now(datetime.timezone.utc).isoformat()
-        cursor = conn.execute(
-            """
-            INSERT INTO prompts (
-                text, category, tags, rating, notes, hash, created_at,
-                updated_at
-            ) VALUES (?, ?, NULL, ?, ?, ?, ?, ?)
-            """,
-            (text.strip(), category, rating, notes, prompt_hash, now, now),
-        )
-        prompt_id = cursor.lastrowid
-        if tags:
-            self._sync_prompt_tags(conn, prompt_id, tags)
-        return prompt_id
-
     def record_prompt_use(self, prompt_id: int, times: int = 1) -> bool:
         """
         Count runs of a prompt and mark it as most recently used.
@@ -1681,83 +1670,64 @@ class PromptDatabase(
                 return 0
 
             # Proceed with linking
-            image_id = self._insert_image_link(
-                conn, prompt_id_int, image_path, metadata
-            )
-            conn.commit()
-
-            if not image_id:
-                self.logger.debug(
-                    f"Image {normalize_image_path(image_path)} already linked to "
-                    f"prompt {prompt_id_int}"
-                )
-                return 0
-
-            return image_id
-
-    def _insert_image_link(
-        self,
-        conn: sqlite3.Connection,
-        prompt_id_int: int,
-        image_path: str,
-        metadata: Optional[Dict[str, Any]] = None,
-    ) -> int:
-        """Insert one image link on ``conn`` (no commit).
-
-        Returns the new image row's id, or 0 when the file is already linked
-        to this prompt (``INSERT OR IGNORE``).
-        """
-        if not isinstance(metadata, dict):
-            metadata = {}
-        filename = os.path.basename(image_path)
-        file_path = normalize_image_path(image_path)
-        file_size, width, height, image_format = _coerce_file_info(metadata)
-        # Each workflow and prompt graph is stored once (new form).
-        documents = stored_values(
-            conn,
-            {
-                "workflow_data": dumps_strict(metadata.get("workflow", {})),
-                "prompt_metadata": dumps_strict(metadata.get("prompt", {})),
-            },
-        )
-
-        # INSERT OR IGNORE skips a file already linked to this prompt
-        # (same prompt_id + normalised full path)
-        cursor = conn.execute(
-            """
-            INSERT OR IGNORE INTO generated_images
-            (prompt_id, image_path, filename, file_path, file_size, width,
-             height, format, workflow_data, prompt_metadata, parameters,
-             workflow_document_id, prompt_document_id)
-            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-            """,
-            (
-                prompt_id_int,
-                image_path,
-                filename,
-                file_path,
-                file_size,
-                width,
-                height,
-                image_format,
-                documents["workflow_data"],
-                documents["prompt_metadata"],
-                dumps_strict(metadata.get("parameters", {})),
-                documents["workflow_document_id"],
-                documents["prompt_document_id"],
-            ),
-        )
-        if cursor.rowcount == 0:
-            # Already linked: a document made only for this row goes.
-            release_documents(
+            if not isinstance(metadata, dict):
+                metadata = {}
+            filename = os.path.basename(image_path)
+            file_path = normalize_image_path(image_path)
+            file_size, width, height, image_format = _coerce_file_info(metadata)
+            # Each workflow and prompt graph is stored once (new form).
+            documents = stored_values(
                 conn,
+                {
+                    "workflow_data": dumps_strict(metadata.get("workflow", {})),
+                    "prompt_metadata": dumps_strict(metadata.get("prompt", {})),
+                },
+            )
+
+            # INSERT OR IGNORE skips a file already linked to this prompt
+            # (same prompt_id + normalised full path)
+            cursor = conn.execute(
+                """
+                INSERT OR IGNORE INTO generated_images
+                (prompt_id, image_path, filename, file_path, file_size, width,
+                 height, format, workflow_data, prompt_metadata, parameters,
+                 workflow_document_id, prompt_document_id)
+                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+                """,
                 (
+                    prompt_id_int,
+                    image_path,
+                    filename,
+                    file_path,
+                    file_size,
+                    width,
+                    height,
+                    image_format,
+                    documents["workflow_data"],
+                    documents["prompt_metadata"],
+                    dumps_strict(metadata.get("parameters", {})),
                     documents["workflow_document_id"],
                     documents["prompt_document_id"],
                 ),
             )
-            return 0
-        return cursor.lastrowid
+            if cursor.rowcount == 0:
+                # Already linked: a document made only for this row goes.
+                release_documents(
+                    conn,
+                    (
+                        documents["workflow_document_id"],
+                        documents["prompt_document_id"],
+                    ),
+                )
+            conn.commit()
+
+            if cursor.rowcount == 0:
+                self.logger.debug(
+                    f"Image {file_path} already linked to prompt {prompt_id_int}"
+                )
+                return 0
+
+            return cursor.lastrowid
 
     def get_prompt_images(self, prompt_id: str) -> List[Dict[str, Any]]:
         """

database/pair_ingestion.py

@@ -23,26 +23,10 @@ except ImportError:
     from utils.prompt_pair_resolver import RESOLVER_VERSION
 
 
-def blank_positive(resolution: Dict[str, Any]) -> bool:
-    """A resolved pair whose stored positive text is empty (#342).
-
-    A PromptManager node whose editor is empty encodes only its prepend and
-    append text, which is never stored as a prompt: such a result names no
-    prompt to link.
-    """
-    if resolution.get("state") != "resolved":
-        return False
-    positive = resolution.get("positive") or {}
-    text = positive.get("storage_text", positive.get("text"))
-    return not (isinstance(text, str) and text.strip())
-
-
 def ingest_resolved_pair(
     db: Any, image_path: str, metadata: Dict[str, Any], resolution: Dict[str, Any]
 ) -> Dict[str, Any]:
     state = resolution.get("state", "unresolved")
-    if state == "resolved" and blank_positive(resolution):
-        state = "unresolved"
     if state != "resolved":
         return {"status": state, "pairs_added": 0, "links_added": 0}
     with db._pair_transaction() as conn:

database/restore_stage.py

@@ -1,365 +0,0 @@
-"""A restore in two steps: stage the upload, then publish it (#249 System S8).
-
-**Stage** (``stage_restore``) never touches the live database or the source.
-In a new folder ``.pm-restore-*`` in the library's own folder (#318: never
-the system temp folder, which may be another disk), it:
-
-1. checks the source (``verify_database_file`` without reading every
-   workflow document: a damaged one is repaired below, not refused);
-2. copies it with SQLite's backup API (a rollback-journal file and a WAL file
-   alike) and opens the copy as a ``PromptModel``, which migrates an older
-   schema;
-3. repairs damaged workflow documents (``repair_damaged_documents``),
-   rotates the history epoch and counts what the copy holds;
-4. makes the copy one self-contained file and verifies it fully (every
-   current table, every document);
-5. records the copy's SHA-256, so publishing binds exactly these bytes.
-
-**Publish** (``publish_staged``) re-hashes the stage (``StageChanged`` if it
-differs), keeps the current database as a uniquely named, standalone safety
-backup beside it (``database/safety_backup.py``; not verified, because the
-database being replaced may be the damaged one), copies the stage over the
-live pages through the backup API (no file is swapped under open handles; an
-``OperationalError`` there leaves the live data intact, #226), then
-checkpoints the WAL with TRUNCATE so the copied pages do not leave a
-database-sized ``-wal`` behind. A reader that keeps a snapshot past the busy
-wait is logged, not fatal: the restore itself is done.
-
-Every handle on the stage is closed before its folder is removed (Windows).
-``sweep_restore_temps`` removes what an interrupted restore left (startup).
-"""
-
-import hashlib
-import logging
-import os
-import sqlite3
-import tempfile
-from contextlib import closing
-from dataclasses import dataclass, field
-from pathlib import Path
-from typing import Dict, Optional
-
-from . import workflow_documents as wd
-from .execution_history_schema import rotate_history_epoch
-from .safety_backup import take_safety_backup
-
-logger = logging.getLogger("prompt_manager.database.restore_stage")
-
-STAGE_PREFIX = ".pm-restore-"
-UPLOAD_PREFIX = ".pm-restore-upload-"
-STAGED_NAME = "staged.db"
-# How long the post-restore TRUNCATE checkpoint waits for readers to leave.
-CHECKPOINT_BUSY_MS = 30_000
-_HASH_CHUNK = 1024 * 1024
-SUMMARY_KEYS = (
-    "prompts",
-    "positives",
-    "pairs",
-    "archived_pairs",
-    "image_links",
-    "runs",
-    "saved_views",
-)
-
-
-class StageChanged(ValueError):
-    """The staged file is no longer the bytes that were reviewed."""
-
-
-@dataclass
-class StagedRestore:
-    """A verified, migrated copy of an upload, ready to publish."""
-
-    path: str
-    digest: str
-    size: int
-    summary: Dict[str, int]
-    schema: Dict[str, bool]
-    documents: Dict[str, int] = field(
-        default_factory=lambda: {"repaired": 0, "cleared": 0, "images": 0}
-    )
-
-    @property
-    def directory(self) -> str:
-        return os.path.dirname(self.path)
-
-    def discard(self) -> None:
-        """Remove the stage folder (idempotent; its handles are all closed)."""
-        remove_stage_folder(self.directory)
-
-
-def remove_stage_folder(directory: str) -> None:
-    """Remove a stage folder and its files, logging what cannot be removed."""
-    if not directory or not os.path.isdir(directory):
-        return
-    for name in os.listdir(directory):
-        try:
-            os.remove(os.path.join(directory, name))
-        except OSError as error:
-            logger.warning(f"Could not remove restore stage file {name}: {error}")
-    try:
-        os.rmdir(directory)
-    except OSError as error:
-        logger.warning(f"Could not remove the restore stage folder: {error}")
-
-
-def file_digest(path: str) -> str:
-    """``sha256:<hex>`` of the file's bytes (blocking)."""
-    digest = hashlib.sha256()
-    with open(path, "rb") as handle:
-        for chunk in iter(lambda: handle.read(_HASH_CHUNK), b""):
-            digest.update(chunk)
-    return "sha256:" + digest.hexdigest()
-
-
-def _readonly(path: str) -> sqlite3.Connection:
-    return sqlite3.connect(Path(path).resolve().as_uri() + "?mode=ro", uri=True)
-
-
-def _schema(path: str) -> list:
-    """The file's schema objects, to tell whether staging migrated it."""
-    with closing(_readonly(path)) as conn:
-        return sorted(
-            conn.execute(
-                "SELECT type, name, tbl_name, sql FROM sqlite_master "
-                "WHERE name NOT LIKE 'sqlite_%'"
-            ).fetchall(),
-            key=repr,
-        )
-
-
-def _count(conn: sqlite3.Connection, table: str, where: str = "") -> int:
-    exists = conn.execute(
-        "SELECT 1 FROM sqlite_master WHERE type='table' AND name=?", (table,)
-    ).fetchone()
-    if not exists:
-        return 0
-    # ``table`` and ``where`` are constants of library_summary, never input.
-    return conn.execute(f"SELECT COUNT(*) FROM {table} {where}").fetchone()[0]  # nosec
-
-
-def library_summary(conn: sqlite3.Connection) -> Dict[str, int]:
-    """What a library holds, for a restore's review (reads only).
-
-    ``positives`` are the Library's prompts (``library_counts``'s
-    ``positive_prompts``); ``pairs`` the active saved pairs and
-    ``archived_pairs`` the archived ones; ``image_links`` the indexed image
-    rows; ``runs`` the recorded executions.
-    """
-    from .library import _ELIGIBLE
-
-    has_state = conn.execute(
-        "SELECT 1 FROM sqlite_master WHERE type='table' AND "
-        "name='prompt_library_state'"
-    ).fetchone()
-    has_pairs = conn.execute(
-        "SELECT 1 FROM sqlite_master WHERE type='table' AND name='prompt_pairs'"
-    ).fetchone()
-    if has_state and has_pairs:
-        positives = conn.execute(
-            "SELECT COUNT(*) FROM prompts p WHERE " + _ELIGIBLE
-        ).fetchone()[0]
-    else:
-        positives = _count(conn, "prompts")
-    return {
-        "prompts": _count(conn, "prompts"),
-        "positives": positives,
-        "pairs": _count(conn, "prompt_pairs", "WHERE archived=0"),
-        "archived_pairs": _count(conn, "prompt_pairs", "WHERE archived<>0"),
-        "image_links": _count(conn, "generated_images"),
-        "runs": _count(conn, "execution_runs"),
-        "saved_views": _count(conn, "saved_views"),
-    }
-
-
-# The newest row of each table a restore would overwrite: with the counts,
-# a write after the review (a new run, image, prompt or edit) changes it.
-_FINGERPRINT_SQL = (
-    ("prompts", "SELECT MAX(id), MAX(updated_at), MAX(last_used_at) FROM prompts"),
-    ("generated_images", "SELECT MAX(id) FROM generated_images"),
-    ("prompt_pairs", "SELECT MAX(id), MAX(updated_at) FROM prompt_pairs"),
-    ("execution_runs", "SELECT COUNT(*), MAX(rowid) FROM execution_runs"),
-    ("saved_views", "SELECT MAX(rowid) FROM saved_views"),
-)
-
-
-def live_fingerprint(conn: sqlite3.Connection):
-    """``(summary, fingerprint)`` of a live library, read in one snapshot.
-
-    The fingerprint changes when rows are added to or removed from the
-    tables a restore replaces, or when a prompt, pair, run or saved view is
-    the newest edited (counts plus the newest row and edit of each table);
-    the apply refuses with ``plan-changed`` then. It does not see every
-    edit (a tag or favorite change on an older row); those are kept in the
-    restore's safety backup. A read transaction the caller already has is
-    used and left open; one opened here is ended here.
-    """
-    import json
-
-    opened = not conn.in_transaction
-    if opened:
-        conn.execute("BEGIN")  # one read snapshot for every count
-    try:
-        summary = library_summary(conn)
-        newest = []
-        for table, sql in _FINGERPRINT_SQL:
-            try:
-                newest.append([table, list(conn.execute(sql).fetchone())])
-            except sqlite3.OperationalError:
-                newest.append([table, None])  # no such table or column
-    finally:
-        if opened:
-            conn.rollback()  # it only read
-    text = json.dumps([summary, newest], sort_keys=True, default=str)
-    return summary, "sha256:" + hashlib.sha256(text.encode("utf-8")).hexdigest()
-
-
-def _copy(src_path: str, staged_path: str) -> None:
-    source = _readonly(src_path)
-    try:
-        with closing(sqlite3.connect(staged_path)) as destination:
-            source.backup(destination)
-    finally:
-        source.close()
-
-
-def _standalone(path: str) -> None:
-    with closing(sqlite3.connect(path)) as conn:
-        conn.execute("PRAGMA journal_mode=DELETE").fetchone()
-
-
-def stage_restore(model_cls, db_path: str, src_path: str) -> StagedRestore:
-    """Stage ``src_path`` beside ``db_path`` (blocking); see the module docstring.
-
-    Raises ValueError with a readable reason when the source or the migrated
-    stage does not verify; the stage folder is then already removed.
-    """
-    ok, reason = model_cls.verify_database_file(src_path, documents=False)
-    if not ok:
-        raise ValueError(reason)
-    before = _schema(src_path)
-    with closing(_readonly(src_path)) as conn:
-        library_state = bool(
-            conn.execute(
-                "SELECT 1 FROM sqlite_master WHERE type='table' AND "
-                "name='prompt_library_state'"
-            ).fetchone()
-        )
-    folder = os.path.dirname(os.path.abspath(db_path))
-    directory = tempfile.mkdtemp(prefix=STAGE_PREFIX, dir=folder)
-    staged_path = os.path.join(directory, STAGED_NAME)
-    staged_key = os.path.normcase(os.path.realpath(staged_path))
-    try:
-        _copy(src_path, staged_path)
-        staged = None
-        try:
-            staged = model_cls(staged_path)
-            conn = staged.get_connection()
-            documents = wd.repair_damaged_documents(conn)
-            rotate_history_epoch(conn)
-            summary = library_summary(conn)
-        finally:
-            if staged is not None:
-                staged.close_all()
-        _standalone(staged_path)
-        ok, reason = model_cls.verify_database_file(
-            staged_path, require_library_state=True
-        )
-        if not ok:
-            raise ValueError(reason)
-        result = StagedRestore(
-            path=staged_path,
-            digest=file_digest(staged_path),
-            size=os.path.getsize(staged_path),
-            summary=summary,
-            schema={
-                "migrated": _schema(staged_path) != before,
-                "library_state": library_state,
-            },
-            documents=documents,
-        )
-    except BaseException:
-        remove_stage_folder(directory)
-        raise
-    finally:
-        with model_cls._init_lock:
-            model_cls._initialized_paths.discard(staged_key)
-    return result
-
-
-def checkpoint_truncate(conn: sqlite3.Connection) -> bool:
-    """Checkpoint the WAL and truncate it to 0 bytes; False when a reader held it."""
-    previous = conn.execute("PRAGMA busy_timeout").fetchone()[0]
-    try:
-        conn.execute(f"PRAGMA busy_timeout = {int(CHECKPOINT_BUSY_MS)}")
-        busy = conn.execute("PRAGMA wal_checkpoint(TRUNCATE)").fetchone()[0]
-    finally:
-        conn.execute(f"PRAGMA busy_timeout = {int(previous)}")
-    return not busy
-
-
-def publish_staged(model, staged: StagedRestore) -> str:
-    """Publish ``staged`` over ``model``'s database; return the safety backup path.
-
-    "" when there was no database to back up. Raises StageChanged before
-    anything is written when the stage's bytes changed since staging, and
-    SafetyBackupFailed when the current database could not be kept. An
-    ``OperationalError`` from the page copy propagates with
-    ``_prompt_manager_restore_backup_created`` set; the live data is intact.
-    """
-    if not os.path.isfile(staged.path) or file_digest(staged.path) != staged.digest:
-        raise StageChanged("The staged restore changed since it was reviewed")
-    backup_path = ""
-    if os.path.exists(model.db_path):
-        backup_path = take_safety_backup(model, verify=False)
-        logger.info(f"Current database backed up to: {os.path.basename(backup_path)}")
-    try:
-        model._replace_contents_from(staged.path)
-    except sqlite3.OperationalError as exc:
-        exc._prompt_manager_restore_backup_created = bool(backup_path)
-        raise
-    with model._init_lock:
-        model._initialized_paths.add(model._schema_key())
-    _truncate_wal(model)
-    return backup_path
-
-
-def _truncate_wal(model) -> Optional[bool]:
-    """TRUNCATE-checkpoint the live WAL after a publish (never raises)."""
-    try:
-        conn = model.get_connection()
-        with conn.using():
-            truncated = checkpoint_truncate(conn)
-    except sqlite3.Error as error:
-        logger.warning(f"The database log could not be truncated: {error}")
-        return None
-    if not truncated:
-        logger.warning(
-            "The database log could not be truncated after the restore: a "
-            "reader kept it open. It shrinks at the next checkpoint with no "
-            "reader."
-        )
-    return truncated
-
-
-def sweep_restore_temps(db_path: str) -> list:
-    """Remove the stages and uploads an interrupted restore left (startup)."""
-    folder = os.path.dirname(os.path.abspath(db_path))
-    removed = []
-    try:
-        names = os.listdir(folder)
-    except OSError:
-        return removed
-    for name in names:
-        path = os.path.join(folder, name)
-        if name.startswith(UPLOAD_PREFIX) and os.path.isfile(path):
-            try:
-                os.remove(path)
-                removed.append(name)
-            except OSError:
-                continue
-        elif name.startswith(STAGE_PREFIX) and os.path.isdir(path):
-            remove_stage_folder(path)
-            if not os.path.exists(path):
-                removed.append(name)
-    return removed

database/review_schema.py

@@ -380,21 +380,15 @@ def _structure_error(conn: sqlite3.Connection) -> Optional[str]:
 
 
 def _evidence_error(conn: sqlite3.Connection) -> Optional[str]:
-    """Stream every evidence document once; one row is held at a time.
-
-    Rows are read with ``fetchone``: iterating a managed connection's cursor
-    would prefetch ``ITER_CHUNK`` (128) rows (``database/managed_connection.py``).
-    """
-    items = conn.execute(
+    """Stream every evidence document once; one row is held at a time."""
+    for evidence_hash, text in conn.execute(
         f"SELECT evidence_hash, evidence FROM {ITEMS_TABLE}"  # nosec B608
-    )
-    while (row := items.fetchone()) is not None:
-        evidence_hash, text = row[0], row[1]
+    ):
         if not _is_canonical(text) or evidence_digest(text) != evidence_hash:
             return f"Review queue table {ITEMS_TABLE} contains invalid evidence"
-    decisions = conn.execute(f"SELECT evidence FROM {DECISIONS_TABLE}")  # nosec B608
-    while (row := decisions.fetchone()) is not None:
-        text = row[0]
+    for (text,) in conn.execute(
+        f"SELECT evidence FROM {DECISIONS_TABLE}"  # nosec B608
+    ):
         if not _is_canonical(text):
             return f"Review queue table {DECISIONS_TABLE} contains invalid evidence"
     return None

database/run_attribution.py

@@ -1,244 +0,0 @@
-"""Attribute an output file to a stored prompt through recorded history (#342).
-
-Execution history records, per run, the files ComfyUI reported
-(``execution_run_outputs``) and the PromptManager texts the run used
-(``execution_run_contexts``, whose ``positive_prompt_id`` hint is set only
-while the raw text matches exactly one stored prompt). A file is attributed
-only when all of this holds:
-
-- exactly one recorded run reported the file's output location (same output
-  root, subfolder and name);
-- the file was last written while that run was executing, from its dequeue
-  to its terminal event (else the finish callback): a later run that history
-  did not record may have reused the name;
-- every positive context of that run names the same stored prompt.
-
-Anything else returns None: the caller leaves the file unlinked. Read-only.
-
-Lookups are batched (``stored_run_prompts``): one parameterized query per
-chunk of at most ``LOOKUP_CHUNK`` distinct file names, matched in memory. The
-history schema is left exactly as it is (no extra index), so older builds can
-still open the library.
-"""
-
-import logging
-import os
-import sqlite3
-import threading
-import weakref
-from typing import Any, Callable, Dict, Iterable, List, Optional
-
-try:
-    from ..utils.execution_outputs import snapshot_output_roots
-    from ..utils.library_location import import_folder_paths
-except ImportError:
-    from utils.execution_outputs import snapshot_output_roots
-    from utils.library_location import import_folder_paths
-
-# File times may trail or lead the recorded run times a little (coarse file
-# system clocks, the write finishing just after the host reported it).
-MTIME_SLACK_MS = 2000
-
-# Distinct file names per lookup query: well under SQLite's bound-parameter
-# limit (999 on old builds), so a scan batch costs one query per chunk.
-LOOKUP_CHUNK = 500
-
-_RUNS_FOR_NAMES = (
-    "SELECT DISTINCT o.filename, o.subfolder, o.root_key, o.path_style, o.run_id, "
-    "r.observed_dequeue_at, COALESCE(r.terminal_event_at, r.observed_callback_at) "
-    "FROM execution_run_outputs o JOIN execution_runs r ON r.run_id = o.run_id "
-    "WHERE o.folder_type = 'output' AND o.filename IN ({marks})"
-)
-
-
-def host_output_directory() -> Optional[str]:
-    """ComfyUI's output directory, or None outside ComfyUI."""
-    folder_paths = import_folder_paths()
-    if folder_paths is None:
-        return None
-    try:
-        value = folder_paths.get_output_directory()
-    except Exception:
-        return None
-    return value if isinstance(value, str) and value else None
-
-
-def _inside(image_path: str, output_root: str) -> Optional[str]:
-    """``image_path`` relative to ``output_root``, or None when outside it."""
-    try:
-        relative = os.path.relpath(image_path, output_root)
-    except ValueError:  # another drive on Windows
-        return None
-    if os.path.isabs(relative) or relative == os.pardir:
-        return None
-    if relative.startswith(os.pardir + os.sep):
-        return None
-    return relative
-
-
-def _resolved(path: str) -> str:
-    try:
-        return os.path.realpath(path)
-    except (OSError, ValueError):
-        return os.path.abspath(path)
-
-
-def _location(image_path: str, output_root: str, path_style: str):
-    """(root key, subfolder, filename) as history records them, or None.
-
-    The root key is always the host's own spelling of its output folder,
-    because history recorded that one. The file may be spelled through the
-    same folder or through its resolved path (a symlinked or junction output
-    folder, as scan roots are): the lexical spelling is tried first, then
-    both sides resolved.
-    """
-    root_key = snapshot_output_roots(path_style, output_root, output_root).output_key
-    if root_key is None:
-        return None
-    relative = _inside(os.path.abspath(image_path), os.path.abspath(output_root))
-    if relative is None:
-        relative = _inside(_resolved(image_path), _resolved(output_root))
-    if relative is None:
-        return None
-    subfolder, filename = os.path.split(relative)
-    if not filename:
-        return None
-    return root_key, subfolder, filename
-
-
-def in_output_folder(image_path: str, output_root: Optional[str]) -> bool:
-    """Whether history could ever attribute ``image_path`` (inside the host's
-    output folder, in either spelling)."""
-    if not image_path or not output_root:
-        return False
-    style = "windows" if os.name == "nt" else "posix"
-    return _location(image_path, output_root, style) is not None
-
-
-def _written_during(image_path: str, started: Any, finished: Any) -> bool:
-    if not isinstance(started, int) or not isinstance(finished, int):
-        return False
-    try:
-        written = os.stat(image_path).st_mtime_ns // 1_000_000
-    except OSError:
-        return False
-    return started - MTIME_SLACK_MS <= written <= finished + MTIME_SLACK_MS
-
-
-def stored_run_prompt(
-    db: Any,
-    image_path: str,
-    output_root: Optional[str],
-    path_style: Optional[str] = None,
-) -> Optional[int]:
-    """The stored prompt id history attributes to ``image_path``, else None."""
-    if not image_path:
-        return None
-    return stored_run_prompts(db, [image_path], output_root, path_style).get(image_path)
-
-
-def _runs_by_location(db: Any, names: List[str]) -> Optional[Dict[tuple, dict]]:
-    """``{(filename, subfolder, root_key, style): {run_id: (start, end)}}``.
-
-    One query per ``LOOKUP_CHUNK`` names; None without history tables.
-    """
-    found: Dict[tuple, dict] = {}
-    conn = db.model.get_connection()
-    for start in range(0, len(names), LOOKUP_CHUNK):
-        chunk = names[start : start + LOOKUP_CHUNK]
-        query = _RUNS_FOR_NAMES.format(marks=",".join("?" for _ in chunk))
-        try:
-            rows = conn.execute(query, chunk).fetchall()  # nosec B608
-        except sqlite3.Error:
-            return None  # no history tables (a library without history)
-        for name, subfolder, root_key, style, run_id, began, ended in rows:
-            runs = found.setdefault((name, subfolder, root_key, style), {})
-            runs[run_id] = (began, ended)
-    return found
-
-
-def _named_prompt(db: Any, run_id: str) -> Optional[int]:
-    contexts = db.get_execution_contexts(run_id).get("contexts") or []
-    named = {
-        context.get("positive_prompt_id")
-        for context in contexts
-        if context.get("positive") is not None
-    }
-    if len(named) != 1:
-        return None
-    (prompt_id,) = named
-    return prompt_id if isinstance(prompt_id, int) else None
-
-
-def stored_run_prompts(
-    db: Any,
-    image_paths: Iterable[str],
-    output_root: Optional[str],
-    path_style: Optional[str] = None,
-) -> Dict[str, Optional[int]]:
-    """``{path: stored prompt id or None}`` for many files in few queries.
-
-    The output lookup is one query per ``LOOKUP_CHUNK`` distinct names; each
-    run that alone reported a file is then read once for its contexts.
-    """
-    paths = list(dict.fromkeys(path for path in image_paths if path))
-    result: Dict[str, Optional[int]] = dict.fromkeys(paths)
-    if not paths or not output_root:
-        return result
-    style = path_style or ("windows" if os.name == "nt" else "posix")
-    located = {}
-    for path in paths:
-        location = _location(path, output_root, style)
-        if location is not None:
-            located[path] = location
-    if not located:
-        return result
-    names = sorted({filename for _key, _sub, filename in located.values()})
-    runs = _runs_by_location(db, names)
-    if not runs:
-        return result
-    prompts: Dict[str, Optional[int]] = {}
-    for path, (root_key, subfolder, filename) in located.items():
-        reported = runs.get((filename, subfolder, root_key, style), {})
-        if len(reported) != 1:
-            continue
-        ((run_id, (began, ended)),) = reported.items()
-        if not _written_during(path, began, ended):
-            continue
-        if run_id not in prompts:
-            prompts[run_id] = _named_prompt(db, run_id)
-        result[path] = prompts[run_id]
-    return result
-
-
-_LOGGER = logging.getLogger("prompt_manager.run_attribution")
-_SEALED_LISTENERS: List[weakref.WeakMethod] = []
-_SEALED_LOCK = threading.Lock()
-
-
-def subscribe_outputs_sealed(method: Callable[[str, List[dict]], None]) -> None:
-    """Call bound ``method(run_id, references)`` after a run's outputs are recorded.
-
-    Held weakly: a listener that is garbage collected is dropped.
-    """
-    with _SEALED_LOCK:
-        _SEALED_LISTENERS.append(weakref.WeakMethod(method))
-
-
-def notify_outputs_sealed(run_id: str, references: Iterable[dict]) -> None:
-    """Tell listeners a run's output references were just committed.
-
-    A listener failure is logged and never reaches the history writer.
-    """
-    references = list(references)
-    with _SEALED_LOCK:
-        alive = [ref for ref in _SEALED_LISTENERS if ref() is not None]
-        _SEALED_LISTENERS[:] = alive
-        listeners = [ref() for ref in alive]
-    for listener in listeners:
-        if listener is None:
-            continue
-        try:
-            listener(run_id, references)
-        except Exception:
-            _LOGGER.warning("Output seal listener failed", exc_info=True)

database/safety_backup.py

@@ -1,185 +0,0 @@
-"""Safety backups beside the live database: one writer for every caller.
-
-A safety backup is ``<db>.<label>_<YYYYmmdd_HHMMSS_ffffff>[_n]`` in the
-library's own folder. It is written by SQLite's backup API into a temp file
-beside the database (``SAFETY_TEMP_PREFIX``, swept at startup after a crash),
-made one self-contained file (rollback journal), optionally verified, fsynced,
-made private (``0o600`` on POSIX) and only then given its unique name, so a
-backup name never carries a half-written file. The names are unique within
-one second (microseconds, then a counter): on Windows two backups in the same
-second must not overwrite each other.
-
-Maintenance applies take a verified backup (``py/api/maintenance.py``); a
-restore takes an unverified one, because the database it replaces may be the
-damaged one the user is recovering from (``database/restore_stage.py``).
-"""
-
-import datetime
-import os
-import sqlite3
-import tempfile
-from contextlib import closing
-
-SAFETY_TEMP_PREFIX = ".pm-safety-"
-_NAME_ATTEMPTS = 1000
-
-
-class SafetyBackupFailed(Exception):
-    """The safety backup could not be written, verified or put in place.
-
-    ``reason`` is the verify reason when the copy did not verify.
-    """
-
-    def __init__(self, message, reason=None):
-        super().__init__(message)
-        self.reason = reason
-
-
-def _now():
-    return datetime.datetime.now()
-
-
-def remove_quietly(*paths):
-    """Remove each existing path, ignoring errors (cleanup after a failure)."""
-    for path in paths:
-        try:
-            if path and os.path.exists(path):
-                os.remove(path)
-        except OSError:
-            pass
-
-
-def backup_names(db_path, label="backup"):
-    """Candidate names, unique within one second (microseconds, then ``_n``)."""
-    base = f"{db_path}.{label}_{_now().strftime('%Y%m%d_%H%M%S_%f')}"
-    for attempt in range(_NAME_ATTEMPTS):
-        yield base if attempt == 0 else f"{base}_{attempt}"
-
-
-def reserve_backup_name(db_path, label="backup"):
-    """Create and return an unused ``<db>.<label>_<stamp>[_n]`` (O_EXCL)."""
-    for candidate in backup_names(db_path, label):
-        try:
-            fd = os.open(candidate, os.O_CREAT | os.O_EXCL | os.O_WRONLY, 0o600)
-        except FileExistsError:
-            continue
-        os.close(fd)
-        return candidate
-    raise SafetyBackupFailed("No free backup name")
-
-
-def place_backup(temp, db_path, label="backup"):
-    """Give the finished ``temp`` its unique backup name; return that path.
-
-    ``os.link`` is atomic and refuses an existing name, so no empty or half
-    file ever carries a backup name, even across a crash. A filesystem
-    without hard links falls back to reserving the name (``O_EXCL``) and
-    ``os.replace``. The temp file is removed by the caller.
-    """
-    for candidate in backup_names(db_path, label):
-        try:
-            os.link(temp, candidate)
-        except FileExistsError:
-            continue
-        except (OSError, NotImplementedError):
-            break  # no hard links here
-        else:
-            return candidate
-    else:
-        raise SafetyBackupFailed("No free backup name")
-    final = reserve_backup_name(db_path, label)
-    try:
-        os.replace(temp, final)
-    except OSError:
-        remove_quietly(final)
-        raise
-    return final
-
-
-def sweep_safety_temps(db_path):
-    """Remove the temp copies an interrupted safety backup left (blocking).
-
-    Called once at startup, before any job can take a backup. Returns the
-    names removed.
-    """
-    folder = os.path.dirname(os.path.abspath(db_path))
-    removed = []
-    try:
-        names = os.listdir(folder)
-    except OSError:
-        return removed
-    for name in names:
-        if not (name.startswith(SAFETY_TEMP_PREFIX) and ".tmp" in name):
-            continue
-        try:
-            os.remove(os.path.join(folder, name))
-            removed.append(name)
-        except OSError:
-            continue
-    return removed
-
-
-def make_standalone(path):
-    """Make the copy one self-contained file (rollback journal, not WAL).
-
-    The backup API copies the live database's WAL flag; a WAL file opened
-    read-only later (a verify, a restore preview) would leave ``-wal`` and
-    ``-shm`` sidecars beside it.
-    """
-    try:
-        with closing(sqlite3.connect(path)) as conn:
-            conn.execute("PRAGMA journal_mode=DELETE").fetchone()
-    except sqlite3.Error as exc:
-        raise SafetyBackupFailed("The backup could not be finished") from exc
-
-
-def fsync_file(path):
-    with open(path, "rb+") as handle:
-        os.fsync(handle.fileno())
-
-
-def safety_temp(db_path):
-    """A new, closed temp file beside the database (``SAFETY_TEMP_PREFIX``)."""
-    fd, temp = tempfile.mkstemp(
-        dir=os.path.dirname(os.path.abspath(db_path)),
-        prefix=SAFETY_TEMP_PREFIX,
-        suffix=".tmp",
-    )
-    os.close(fd)
-    return temp
-
-
-def take_safety_backup(model, label="backup", *, verify=True):
-    """Write (and by default verify) a safety backup; return its path (blocking).
-
-    The copy is made in a temp file beside the database and only renamed
-    onto its final, unique name ``<db>.<label>_<stamp>`` once it is complete
-    (and verified), so a backup file on disk is always a whole one. ``label``
-    "backup" joins the pruned pool; another label (the workflow storage
-    migration's ``pre-workflow-storage``) is kept until the user removes it.
-    Raises SafetyBackupFailed, leaving no file.
-    """
-    db_path = os.path.abspath(model.db_path)
-    temp = safety_temp(db_path)
-    final = None
-    try:
-        if not model.backup_database(temp):
-            raise SafetyBackupFailed("The backup could not be written")
-        make_standalone(temp)
-        if verify:
-            ok, reason = model.verify_database_file(temp)
-            if not ok:
-                raise SafetyBackupFailed("The backup did not verify", reason)
-        fsync_file(temp)
-        if os.name != "nt":
-            os.chmod(temp, 0o600)
-        final = place_backup(temp, db_path, label)
-        return final
-    except OSError as exc:
-        remove_quietly(final)
-        raise SafetyBackupFailed("The backup could not be put in place") from exc
-    except SafetyBackupFailed:
-        remove_quietly(final)
-        raise
-    finally:
-        remove_quietly(temp, temp + "-journal", temp + "-wal", temp + "-shm")

database/workflow_documents.py

@@ -475,178 +475,3 @@ def release_documents(conn: sqlite3.Connection, ids: Iterable[Optional[int]]) ->
 def sweep_documents(conn: sqlite3.Connection) -> int:
     """Delete every document no image row references; returns the count."""
     return conn.execute(SWEEP_SQL).rowcount
-
-
-# ── repair (a restore's stage) ────────────────────────────────────────
-
-INLINE_TEXTS_SQL = (
-    "SELECT workflow_data, prompt_metadata FROM generated_images "
-    "WHERE workflow_data IS NOT NULL OR prompt_metadata IS NOT NULL"
-)
-REKEY_SQL = "UPDATE workflow_documents SET sha256=?, byte_length=? WHERE id=?"
-
-
-def _rows(conn: sqlite3.Connection, sql: str, params=()):
-    """Each row of ``sql``, read one at a time.
-
-    Iterating a managed connection's cursor prefetches ``ITER_CHUNK`` (128)
-    rows, and a document or inline text can be megabytes.
-    """
-    cursor = conn.execute(sql, params)
-    while (row := cursor.fetchone()) is not None:
-        yield row
-
-
-def _inflated(data) -> Optional[bytes]:
-    """The complete text bytes ``data`` inflates to, or None.
-
-    Complete means the zlib stream ends (its Adler-32 checked) within
-    MAX_DOCUMENT_BYTES with nothing after it: the body is intact even when
-    the row's recorded hash or length is not.
-    """
-    try:
-        inflater = zlib.decompressobj()
-        raw = inflater.decompress(bytes(data), MAX_DOCUMENT_BYTES + 1)
-        if not inflater.eof or inflater.unconsumed_tail or inflater.unused_data:
-            return None
-        if len(raw) > MAX_DOCUMENT_BYTES:
-            return None
-        raw.decode("utf-8")
-        return raw
-    except (zlib.error, TypeError, UnicodeDecodeError):
-        return None
-
-
-def _one_column_off(row, raw: bytes) -> bool:
-    """Whether only the recorded hash or only the recorded length is wrong.
-
-    The two columns check the body independently. When the body inflates
-    completely and one of them still agrees with it, that column vouches for
-    the body and the other one is the damaged value. When both disagree, the
-    body itself is the suspect (another valid stream), so it is not trusted.
-    """
-    hash_ok = hashlib.sha256(raw).digest() == bytes(row[0])
-    length_ok = row[1] == len(raw)
-    return hash_ok != length_ok
-
-
-def _inline_copies(conn: sqlite3.Connection, wanted: Dict[bytes, int]):
-    """``{document id: text}`` for each wanted hash an inline row still holds."""
-    found: Dict[int, str] = {}
-    for row in _rows(conn, INLINE_TEXTS_SQL):
-        for text in row:
-            if not isinstance(text, str) or not storable(text):
-                continue
-            document_id = wanted.get(hashlib.sha256(text.encode("utf-8")).digest())
-            if document_id is not None and document_id not in found:
-                found[document_id] = text
-        if len(found) == len(wanted):
-            break
-    return found
-
-
-def _rekey(conn: sqlite3.Connection, document_id: int, raw: bytes) -> Optional[int]:
-    """Give an intact body its true key, or merge it into the document that has it.
-
-    Returns the holder's id when its own body was damaged and has just been
-    rewritten from ``raw`` (it is repaired, never to be cleared), else None.
-    """
-    digest = hashlib.sha256(raw).digest()
-    holder = conn.execute(LOOKUP_SQL, (digest,)).fetchone()
-    if holder is None or holder[0] == document_id:
-        conn.execute(REKEY_SQL, (digest, len(raw), document_id))
-        return None
-    for column in DOCUMENT_ID_COLUMNS:
-        # ``column`` is one of DOCUMENT_ID_COLUMNS, never caller data.
-        conn.execute(
-            f"UPDATE generated_images SET {column}=? WHERE {column}=?",  # nosec B608
-            (holder[0], document_id),
-        )
-    conn.execute("DELETE FROM workflow_documents WHERE id=?", (document_id,))
-    if _decode(holder[1:], holder[0], quiet=True) is None:
-        conn.execute(
-            REPAIR_SQL, (len(raw), zlib.compress(raw, COMPRESSION_LEVEL), holder[0])
-        )
-        return holder[0]
-    return None
-
-
-def repair_damaged_documents(conn: sqlite3.Connection) -> Dict[str, int]:
-    """Repair or clear every document failing its checks; commit (writes).
-
-    For a restore's stage only, never the live library. In order:
-
-    1. A document whose body inflates completely and whose recorded hash or
-       length (not both) disagrees is re-keyed from its text, or merged
-       into the document that already holds that text (``_one_column_off``).
-    2. A damaged body whose exact text an inline row still holds (the same
-       SHA-256, its key) is stored again from that text.
-    3. Any other damaged document is unreadable for good: its images'
-       references are cleared (they already showed no workflow) and the
-       document is removed, so the stage verifies.
-
-    Returns ``{repaired, cleared, images}``: documents repaired (1 and 2),
-    documents cleared and the distinct image rows whose reference was
-    cleared. Rows are read one at a time.
-    """
-    damaged: Dict[bytes, int] = {}
-    intact: Dict[int, bytes] = {}
-    for row in _rows(conn, ALL_DOCUMENTS_SQL):
-        if _decode(row[:3], row[3], quiet=True) is None:
-            raw = _inflated(row[2])
-            if raw is not None and _one_column_off(row, raw):
-                intact[row[3]] = raw
-            else:
-                damaged[bytes(row[0])] = row[3]
-    result = {"repaired": 0, "cleared": 0, "images": 0}
-    if not damaged and not intact:
-        return result
-    with conn:
-        healed = []
-        for document_id, raw in intact.items():
-            holder = _rekey(conn, document_id, raw)
-            if holder is not None and holder in damaged.values():
-                # Rewritten from the merged body: repaired, not to be cleared
-                # (it now also holds the merged images' references).
-                damaged = {k: v for k, v in damaged.items() if v != holder}
-                healed.append(holder)
-        copies = _inline_copies(conn, damaged) if damaged else {}
-        for document_id, text in copies.items():
-            raw = text.encode("utf-8")
-            data = zlib.compress(raw, COMPRESSION_LEVEL)
-            conn.execute(REPAIR_SQL, (len(raw), data, document_id))
-        lost = sorted(set(damaged.values()) - set(copies))
-        images: Set[int] = set()
-        for chunk in _chunks(lost):
-            marks = ",".join("?" * len(chunk))
-            # ``marks`` is only "?" placeholders; the ids are bound.
-            for (image_id,) in _rows(
-                conn,
-                "SELECT id FROM generated_images WHERE "  # nosec B608
-                f"workflow_document_id IN ({marks}) OR prompt_document_id IN ({marks})",
-                chunk + chunk,
-            ):
-                images.add(image_id)
-            for column in DOCUMENT_ID_COLUMNS:
-                conn.execute(
-                    f"UPDATE generated_images SET {column}=NULL "  # nosec B608
-                    f"WHERE {column} IN ({marks})",
-                    chunk,
-                )
-            conn.execute(
-                f"DELETE FROM workflow_documents WHERE id IN ({marks})",  # nosec B608
-                chunk,
-            )
-    for document_id in list(intact) + healed + list(copies):
-        logger.warning(f"Workflow document {document_id} was damaged; repaired")
-    if lost:
-        logger.warning(
-            f"{len(lost)} damaged workflow document(s) could not be repaired; "
-            f"{len(images)} image(s) show no workflow"
-        )
-    result.update(
-        repaired=len(intact) + len(healed) + len(copies),
-        cleared=len(lost),
-        images=len(images),
-    )
-    return result

prompt_manager.py

@@ -238,9 +238,6 @@ class PromptManager(PromptManagerBase, ComfyNodeABC):
             except Exception as e:
                 # Log error but don't fail the encoding
                 self.logger.warning(f"Failed to save prompt to database: {e}")
-                self._mark_untracked(prompt, unique_id)
-        else:
-            self._skip_empty_prompt(prompt, unique_id)
 
         # Perform standard CLIP text encoding using the combined text
         self.logger.debug(

prompt_manager_base.py

@@ -24,7 +24,6 @@ try:
     from .utils.prompt_tracker import get_prompt_tracker
     from .utils.hashing import generate_prompt_hash
     from .utils.prompt_graph import resolve_text, run_prompt_nodes
-    from .utils.run_keys import executing_run_id, prompt_node_key
     from .utils.usage_tracking import PENDING_FIRST_USE
 except ImportError:
     import sys
@@ -36,7 +35,6 @@ except ImportError:
     from utils.prompt_tracker import get_prompt_tracker
     from utils.hashing import generate_prompt_hash
     from utils.prompt_graph import resolve_text, run_prompt_nodes
-    from utils.run_keys import executing_run_id, prompt_node_key
     from utils.usage_tracking import PENDING_FIRST_USE
 
 
@@ -170,67 +168,14 @@ class PromptManagerBase:
         prompt_id = self._save_prompt_to_database(
             text=text, category=category, tags=tags, count_run=batch_item
         )
-        if role["is_run_prompt"] and not prompt_id:
-            # The save failed: an older entry of this key must not stand in (#342)
-            self._mark_untracked(prompt_graph, unique_id)
-        elif role["is_run_prompt"]:
+        if prompt_id and role["is_run_prompt"]:
             self.prompt_tracker.set_current_prompt(
                 prompt_text=encoding_text,
                 additional_data={**additional_data, "prompt_id": prompt_id},
                 push_to_queue=batch_item or not role["known"],
-                **self._run_identity(prompt_graph, unique_id),
             )
         return prompt_id
 
-    @staticmethod
-    def _run_identity(prompt_graph: Any, unique_id: Any) -> Dict[str, Any]:
-        """The tracker's proof that an image belongs to this execution (#342)."""
-        return {
-            "run_key": prompt_node_key(prompt_graph, unique_id),
-            "run_id": executing_run_id(),
-        }
-
-    def _skip_empty_prompt(self, prompt_graph: Any, unique_id: Any) -> None:
-        """The ``text`` editor is empty: save and track nothing (#342).
-
-        Prepend and append text are deliberately never stored as the prompt, so
-        an empty editor has no prompt to save, count or link. For the run's
-        positive node this is logged at info and the node's run key is marked
-        empty (``_mark_untracked``).
-        """
-        self._mark_untracked(
-            prompt_graph,
-            unique_id,
-            "Prompt text is empty (prepend and append text are not stored): "
-            "nothing saved or tracked, and this run's images stay unlinked",
-        )
-
-    def _mark_untracked(
-        self, prompt_graph: Any, unique_id: Any, message: Optional[str] = None
-    ) -> None:
-        """This execution of a positive node has no prompt to link (#342).
-
-        An empty editor, or a save or tracking failure. The node's run key is
-        marked with a placeholder, so no earlier prompt of that key can be
-        linked to this run's images, and a batch item keeps its queue place.
-        ``message`` is logged at info for a positive node.
-        """
-        try:
-            role = self._prompt_role(prompt_graph, unique_id, "")
-            if not role["is_run_prompt"]:
-                if message:
-                    self.logger.debug("Empty text on a non-positive node; not saved")
-                return
-            if message:
-                self.logger.info(message)
-            self.prompt_tracker.mark_empty(
-                push_to_queue=role["known"],
-                **self._run_identity(prompt_graph, unique_id),
-            )
-        except Exception as error:
-            # Tracking must never block generation
-            self.logger.warning(f"Could not mark the untracked prompt: {error}")
-
     def _record_use(self, prompt_id: int, times: int = 1) -> None:
         """Count runs; a tracking failure must never block generation."""
         try:
@@ -268,10 +213,8 @@ class PromptManagerBase:
 
         cache = get_trigger_cache()
 
-        # Lazy-load cache on first use; a failed load waits before the next try
-        # (#355: never a rescan of LoraManager's folders on every run).
-        retry_due = getattr(cache, "retry_due", lambda: True)
-        if not cache.is_loaded and IntegrationConfig.LORA_MANAGER_PATH and retry_due():
+        # Lazy-load cache on first use
+        if not cache.is_loaded and IntegrationConfig.LORA_MANAGER_PATH:
             cache.load(IntegrationConfig.LORA_MANAGER_PATH)
 
         modified, injected = inject_trigger_words(text, cache)

prompt_manager_pair.py

@@ -117,29 +117,85 @@ class PromptManagerPair(PromptManagerFocused):
         )
         is_positive = "text" in used_fields
         pair_used = node_id in intrinsic_pair_nodes(prompt) if known else True
-        if not text.strip():
-            # Nothing to store: prepend/append are never the stored prompt (#342)
-            self._skip_empty_prompt(prompt, unique_id)
-        else:
-            try:
-                pair_id, prompt_id = self._save_and_track_pair(
-                    text,
+        try:
+            pair_id = self.db.save_prompt_pair(
+                text,
+                negative_text,
+                category=category.strip() or None,
+                tags=self._parse_tags(tags),
+            )
+            pair = self.db.get_prompt_pair(pair_id)
+            prompt_id = pair["positive_prompt_id"]
+            resolved_positive = (
+                resolve_text_input(prompt, node_id, "text") if known else None
+            )
+            resolved_negative = (
+                resolve_text_input(prompt, node_id, "negative_text") if known else None
+            )
+            positive_seen = resolved_positive is not None and generate_prompt_hash(
+                resolved_positive
+            ) == generate_prompt_hash(text)
+            pair_seen = (
+                positive_seen
+                and resolved_negative is not None
+                and generate_prompt_hash(resolved_negative)
+                == generate_prompt_hash(negative_text)
+            )
+            positive_pending = getattr(self, "pending_first_use", PENDING_FIRST_USE)
+            pair_pending = getattr(
+                self, "pending_pair_first_use", PENDING_PAIR_FIRST_USE
+            )
+            counted = set()
+            for field, component_text, resolved_text, component_id in (
+                ("text", text, resolved_positive, prompt_id),
+                (
+                    "negative_text",
                     negative_text,
-                    positive,
-                    category=category,
-                    tags=tags,
-                    prepend_text=prepend_text,
-                    append_text=append_text,
-                    prompt=prompt,
-                    unique_id=unique_id,
-                    used_fields=used_fields,
-                    is_positive=is_positive,
-                    pair_used=pair_used,
+                    resolved_negative,
+                    pair["negative_prompt_id"],
+                ),
+            ):
+                component_hash = generate_prompt_hash(component_text)
+                if (
+                    field not in used_fields
+                    or not component_id
+                    or component_hash in counted
+                ):
+                    continue
+                counted.add(component_hash)
+                seen_at_queue = (
+                    resolved_text is not None
+                    and generate_prompt_hash(resolved_text) == component_hash
                 )
-            except Exception as error:
-                self.logger.warning(f"Could not save or track paired prompt: {error}")
-                if is_positive:
-                    self._mark_untracked(prompt, unique_id)
+                runs = positive_pending.consume(component_hash) + int(not seen_at_queue)
+                if runs:
+                    self.db.record_prompt_use(component_id, times=runs)
+            if pair_used:
+                runs = pair_pending.consume(pair_run_key(text, negative_text)) + int(
+                    not pair_seen
+                )
+                if runs:
+                    self.db.record_prompt_pair_use(pair_id, times=runs)
+            if is_positive:
+                self.prompt_tracker.set_current_prompt(
+                    prompt_text=positive,
+                    additional_data={
+                        "prompt_id": prompt_id,
+                        "pair_id": pair_id if pair_used else None,
+                        "positive_text": positive,
+                        "negative_text": negative_text,
+                        "positive_storage_text": text.strip(),
+                        "negative_storage_text": negative_text.strip(),
+                        "prepend_text": prepend_text.strip(),
+                        "append_text": append_text.strip(),
+                        "final_text": positive,
+                        "category": category.strip() or None,
+                        "tags": self._parse_tags(tags) or [],
+                    },
+                    push_to_queue=not positive_seen or (pair_used and not pair_seen),
+                )
+        except Exception as error:
+            self.logger.warning(f"Could not save or track paired prompt: {error}")
         try:
             self.comfyui_integration.register_prompt(
                 f"promptmanager_pair_{time.time_ns()}",
@@ -167,102 +223,6 @@ class PromptManagerPair(PromptManagerFocused):
         )
         return result
 
-    def _save_and_track_pair(
-        self,
-        text: str,
-        negative_text: str,
-        positive: str,
-        *,
-        category: str,
-        tags: str,
-        prepend_text: str,
-        append_text: str,
-        prompt: Optional[Dict[str, Any]],
-        unique_id: Optional[str],
-        used_fields: set,
-        is_positive: bool,
-        pair_used: bool,
-    ) -> Tuple[Optional[int], Optional[int]]:
-        """Save the recipe, count its runs and register the positive for linking."""
-        known = isinstance(prompt, dict) and unique_id is not None
-        node_id = str(unique_id)
-        pair_id = self.db.save_prompt_pair(
-            text,
-            negative_text,
-            category=category.strip() or None,
-            tags=self._parse_tags(tags),
-        )
-        pair = self.db.get_prompt_pair(pair_id)
-        prompt_id = pair["positive_prompt_id"]
-        resolved_positive = (
-            resolve_text_input(prompt, node_id, "text") if known else None
-        )
-        resolved_negative = (
-            resolve_text_input(prompt, node_id, "negative_text") if known else None
-        )
-        positive_seen = resolved_positive is not None and generate_prompt_hash(
-            resolved_positive
-        ) == generate_prompt_hash(text)
-        pair_seen = (
-            positive_seen
-            and resolved_negative is not None
-            and generate_prompt_hash(resolved_negative)
-            == generate_prompt_hash(negative_text)
-        )
-        positive_pending = getattr(self, "pending_first_use", PENDING_FIRST_USE)
-        pair_pending = getattr(self, "pending_pair_first_use", PENDING_PAIR_FIRST_USE)
-        counted = set()
-        for field, component_text, resolved_text, component_id in (
-            ("text", text, resolved_positive, prompt_id),
-            (
-                "negative_text",
-                negative_text,
-                resolved_negative,
-                pair["negative_prompt_id"],
-            ),
-        ):
-            component_hash = generate_prompt_hash(component_text)
-            if (
-                field not in used_fields
-                or not component_id
-                or component_hash in counted
-            ):
-                continue
-            counted.add(component_hash)
-            seen_at_queue = (
-                resolved_text is not None
-                and generate_prompt_hash(resolved_text) == component_hash
-            )
-            runs = positive_pending.consume(component_hash) + int(not seen_at_queue)
-            if runs:
-                self.db.record_prompt_use(component_id, times=runs)
-        if pair_used:
-            runs = pair_pending.consume(pair_run_key(text, negative_text)) + int(
-                not pair_seen
-            )
-            if runs:
-                self.db.record_prompt_pair_use(pair_id, times=runs)
-        if is_positive:
-            self.prompt_tracker.set_current_prompt(
-                prompt_text=positive,
-                additional_data={
-                    "prompt_id": prompt_id,
-                    "pair_id": pair_id if pair_used else None,
-                    "positive_text": positive,
-                    "negative_text": negative_text,
-                    "positive_storage_text": text.strip(),
-                    "negative_storage_text": negative_text.strip(),
-                    "prepend_text": prepend_text.strip(),
-                    "append_text": append_text.strip(),
-                    "final_text": positive,
-                    "category": category.strip() or None,
-                    "tags": self._parse_tags(tags) or [],
-                },
-                push_to_queue=not positive_seen or (pair_used and not pair_seen),
-                **self._run_identity(prompt, unique_id),
-            )
-        return pair_id, prompt_id
-
     @classmethod
     def IS_CHANGED(
         cls,

prompt_manager_text.py

@@ -216,9 +216,6 @@ class PromptManagerText(PromptManagerBase, ComfyNodeABC):
             except Exception as e:
                 # Log error but don't fail the processing
                 self.logger.warning(f"Failed to save prompt to database: {e}")
-                self._mark_untracked(prompt, unique_id)
-        else:
-            self._skip_empty_prompt(prompt, unique_id)
 
         # Register with ComfyUI integration for standard metadata compatibility
         node_id = f"promptmanagertext_{int(time.time() * 1000)}"

py/api/__init__.py

@@ -9,7 +9,6 @@ Split into domain-specific mixins for maintainability:
 - JobRoutesMixin: the session job registry behind Activity (py/api/jobs.py)
 - ImageTagJobsMixin: bulk Add tags / Auto-tag as image-tags jobs
 - ThumbnailJobsMixin: thumbnail plan, thumbnail job and the gallery stream on it
-- ThumbnailConvertMixin: Convert outdated thumbnails (#317), a thumbnail job mode
 - AutoThumbnailMixin: previews made on first view, on capture and after a scan
 - ReviewRoutesMixin: the Needs review queue, item detail and decisions
 - ReviewRecordingMixin: Needs review recording for the scan and the monitor
@@ -19,7 +18,6 @@ Split into domain-specific mixins for maintainability:
 - MaintenanceRoutesMixin: reviewed maintenance plans (preview, apply)
 - WorkflowStorageRoutesMixin: store each workflow once, then Reclaim space
 - DuplicateFilesMixin: duplicate image files as find and removal jobs
-- LoraImportRoutesMixin: the reviewed, staged LoRA reference import job
 """
 
 import asyncio
@@ -31,7 +29,6 @@ import math
 import ntpath
 import os
 import re
-import threading
 from pathlib import Path
 
 from aiohttp import web
@@ -48,18 +45,15 @@ from .review_events import ReviewEventsMixin
 from .saved_views import SavedViewRoutesMixin
 from .history import HistoryRoutesMixin
 from .images import ImageRoutesMixin
-from .gallery_listing import WALK_STOPPED, RootListing, WalkOutcome
 from .admin import AdminRoutesMixin
 from .settings_routes import SettingsRoutesMixin
 from .job_routes import JobRoutesMixin
 from .image_tag_jobs import ImageTagJobsMixin
 from .thumbnail_jobs import ThumbnailJobsMixin
-from .thumbnail_convert import ThumbnailConvertMixin
 from .thumbnail_auto import AutoThumbnailMixin
 from .system import SystemRoutesMixin
 from .library_location import LibraryLocationRoutesMixin
 from .maintenance import MaintenanceRoutesMixin
-from .backup_restore import BackupRestoreRoutesMixin
 from .workflow_storage import WorkflowStorageRoutesMixin
 from .duplicate_files import DuplicateFilesMixin
 from .maintenance_plans import PlanStore
@@ -67,7 +61,6 @@ from .jobs import JobRegistry
 from .logging_routes import LoggingRoutesMixin
 from .autotag_routes import AutotagRoutesMixin
 from .lora_integration import LoraIntegrationMixin
-from .lora_import_routes import LoraImportRoutesMixin
 
 try:
     from ...database.operations import PromptDatabase
@@ -89,18 +82,6 @@ def _get_project_root():
     return os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 
-# How long an executor thread waits for the loop to drop the listings.
-_OFF_LOOP_DROP_WAIT = 30
-
-
-def _running_loop():
-    """The event loop running in this thread, or None."""
-    try:
-        return asyncio.get_running_loop()
-    except RuntimeError:
-        return None
-
-
 def _public_path(path) -> str:
     """Render a server path for an API response without revealing the layout.
 
@@ -314,18 +295,15 @@ class PromptManagerAPI(
     JobRoutesMixin,
     ImageTagJobsMixin,
     ThumbnailJobsMixin,
-    ThumbnailConvertMixin,
     AutoThumbnailMixin,
     SystemRoutesMixin,
     LibraryLocationRoutesMixin,
     MaintenanceRoutesMixin,
-    BackupRestoreRoutesMixin,
     WorkflowStorageRoutesMixin,
     DuplicateFilesMixin,
     LoggingRoutesMixin,
     AutotagRoutesMixin,
     LoraIntegrationMixin,
-    LoraImportRoutesMixin,
 ):
     """REST API handler for PromptManager operations and web interface.
 
@@ -358,20 +336,8 @@ class PromptManagerAPI(
         self._captures_closed = False
         self._cached_output_dir = None  # Lazy-cached by _find_comfyui_output_dir()
         self._html_cache = {}  # Cached HTML file contents keyed by path
-        # One shared listing per output root, keyed by str(root), and the
-        # background walks refreshing them (py/api/gallery_listing.py, #348).
-        self._root_listings: dict[str, RootListing] = {}
-        self._listing_tasks: set = set()
-        # The loop the walks run on, set by the startup warm-up or the first
-        # walk; the monitor's thread hops onto it (notify_output_settled).
-        self._listing_loop = None
-        # Set by cleanup_gallery_listings: no background walk starts after it.
-        self._listings_closed = False
-        # The workspace caches rebuilt behind a stored walk that changed the
-        # listing, once the host's startup warm-up has run (#348).
-        self._workspace_warm_enabled = False
-        self._workspace_warm_task = None
-        self._workspace_warm_again = False
+        self._gallery_cache = {}  # dict: path_str -> (files, timestamp)
+        self._gallery_cache_ttl = 30  # Cache TTL in seconds
         # Workspace listing values and sort orders derived from a cached scan
         # (py/api/images.py _workspace_listed/_workspace_orders).
         self._workspace_listed_cache = {}
@@ -407,10 +373,7 @@ class PromptManagerAPI(
         try:
             from .maintenance import sweep_safety_temps
 
-            from .backup_restore import restore_stage
-
             swept = sweep_safety_temps(self.db.model.db_path)
-            swept += restore_stage.sweep_restore_temps(self.db.model.db_path)
             if swept:
                 self.logger.info(f"Removed {len(swept)} interrupted backup copies")
         except Exception as e:
@@ -491,122 +454,23 @@ class PromptManagerAPI(
             return await loop.run_in_executor(None, call)
         return await loop.run_in_executor(None, func, *args)
 
-    def _root_listing(self, root) -> RootListing:
-        """The shared listing record of one output root (created empty)."""
-        return self._root_listings.setdefault(str(root), RootListing())
+    def invalidate_gallery_cache(self):
+        """Invalidate the cached gallery file listing.
 
-    def invalidate_gallery_cache(self, retire=False):
-        """Drop every root's listing, so the next read waits for a new walk.
-
-        Called after files are deleted through the app (duplicate cleanup and
-        the legacy duplicate delete), never for thumbnail writes. A walk
-        running now is not stored (its generation moved on). The workspace
-        keeps its per-file values and card facts, so the next request
-        rebuilds only new or changed files (see ImageRoutesMixin.
-        _workspace_listed and _card_facts); its sort orders are dropped, as
-        the walk replaces them anyway, and so is the favorites lookup, which
-        holds the old list.
-
-        ``retire`` (the roots changed): no background walk of a root starts
-        again until a reader or the warm-up asks for it.
+        Called by the image monitor when new files are detected. The workspace
+        keeps its per-file values and card facts, so the next request rebuilds
+        only new or changed files (see ImageRoutesMixin._workspace_listed and
+        _card_facts); its sort orders
+        are dropped, as the rescan replaces them anyway, and so is the
+        favorites lookup, which holds the old scan list.
         """
-        loop = self._listing_loop
-        if loop is not None and loop.is_running() and _running_loop() is not loop:
-            # Called from an executor thread (a settings save, a test seed):
-            # listing records are touched only on the loop, and the caller
-            # expects the drop done when this returns.
-            dropped = threading.Event()
-
-            def drop():
-                try:
-                    self._drop_listings(retire)
-                finally:
-                    dropped.set()
-
-            loop.call_soon_threadsafe(drop)
-            if not dropped.wait(_OFF_LOOP_DROP_WAIT):
-                self.logger.warning("The Images listing drop is still queued")
-            return
-        self._drop_listings(retire)
-
-    def _drop_listings(self, retire=False):
-        for record in list(self._root_listings.values()):
-            record.drop()
-            if retire:
-                # The roots changed: a removed root must not come back through
-                # a pending timer, a trailing walk or a monitor mark.
-                record.retired = True
-                record.dirty = False
-                handle, record.rewalk_handle = record.rewalk_handle, None
-                if handle is not None:
-                    handle.cancel()
+        self._gallery_cache = {}
         self._workspace_order_cache = {}
         self._favorite_listing_cache = {}
 
-    async def warm_gallery_listings(self, app=None):
-        """Start one background walk per output root (aiohttp on_startup).
-
-        Registered by the root ``__init__.py``, so the first Images open after
-        ComfyUI starts finds the listing built. It never fails startup: a
-        root that cannot be walked is retried by the first read.
-        """
-        # Each stored walk that changes a listing then rebuilds the workspace's
-        # per-file values, orders and favorites behind it (_warm_workspace).
-        self._workspace_warm_enabled = True
-        self._listing_loop = asyncio.get_running_loop()
-        self._listings_closed = False
-        try:
-            for root in self._get_all_output_dirs():
-                self._root_listing(root).retired = False
-                self._schedule_walk(root)
-        except Exception as e:
-            self.logger.warning(f"Could not warm the Images listing: {e}")
-
-    def notify_output_settled(self, path):
-        """The image monitor settled an output at *path* (any thread).
-
-        Called on the monitor's worker thread with the resolved path. It only
-        hands the path to the event loop (``output_settled``) and never
-        touches a listing from this thread; before the loop is known, or once
-        the listings are cleaned up, it does nothing.
-        """
-        loop = self._listing_loop
-        if loop is None or self._listings_closed or not loop.is_running():
-            return
-        try:
-            loop.call_soon_threadsafe(self.output_settled, path)
-        except RuntimeError:
-            pass  # the loop closed meanwhile (shutdown)
-
-    async def cleanup_gallery_listings(self, app=None):
-        """Stop the background listing walks (aiohttp on_cleanup)."""
-        self._workspace_warm_enabled = False
-        # No mark, deferred walk or trailing walk starts a walk from now on.
-        self._listings_closed = True
-        # Before any await, so no delayed refresh can start a walk meanwhile.
-        for record in self._root_listings.values():
-            handle, record.rewalk_handle = record.rewalk_handle, None
-            if handle is not None:
-                handle.cancel()
-        warm, self._workspace_warm_task = self._workspace_warm_task, None
-        if warm is not None:
-            warm.cancel()
-            await asyncio.gather(warm, return_exceptions=True)
-        tasks = list(self._listing_tasks)
-        for task in tasks:
-            task.cancel()
-        if tasks:
-            await asyncio.gather(*tasks, return_exceptions=True)
-        self._listing_tasks.clear()
-        # A walk cancelled before its first step never ran its own cleanup.
-        for record in self._root_listings.values():
-            flight, record.flight = record.flight, None
-            if flight is not None and not flight.done():
-                flight.set_result(WalkOutcome.failed(RuntimeError(WALK_STOPPED)))
-
     def reset_gallery_roots_cache(self):
         """Drop every cached listing and derived workspace value (roots changed)."""
-        self.invalidate_gallery_cache(retire=True)
+        self.invalidate_gallery_cache()
         self._workspace_listed_cache = {}
         self._workspace_card_cache = {}
 
@@ -680,12 +544,10 @@ class PromptManagerAPI(
         self._register_system_routes(routes)
         self._register_library_location_routes(routes)
         self._register_maintenance_routes(routes)
-        self._register_backup_restore_routes(routes)
         self._register_duplicate_routes(routes)
         self._register_logging_routes(routes)
         self._register_autotag_routes(routes)
         self._register_lora_routes(routes)
-        self._register_lora_import_routes(routes)
 
         # Register gzip compression middleware (once)
         global _gzip_registered
@@ -750,12 +612,7 @@ class PromptManagerAPI(
     # ── Shared utilities used by multiple mixins ──────────────────────
 
     def _enrich_images(self, images):
-        """Add url and thumbnail_url to a flat list of image dicts.
-
-        Each dict without ``is_video`` also gets ``is_video`` and
-        ``media_type`` from its extension (#355: a linked LoraManager video
-        outside the output folders is shown as a video, not a picture).
-        """
+        """Add url and thumbnail_url to a flat list of image dicts."""
         from urllib.parse import quote as url_quote
 
         output_dirs = self._get_all_output_dirs()
@@ -765,11 +622,6 @@ class PromptManagerAPI(
             if not image_path_str:
                 continue
 
-            if "is_video" not in image:
-                video = is_video_path(image_path_str)
-                image["is_video"] = video
-                image["media_type"] = "video" if video else "image"
-
             img_path = Path(image_path_str)
 
             # Set fallback url via image ID
@@ -786,20 +638,16 @@ class PromptManagerAPI(
                         f"{url_quote(rel_path.as_posix(), safe='/')}"
                     )
 
-                    # Any preview the file owns, the current format first (#317)
-                    from . import thumbnail_settings
+                    # Check for thumbnail
+                    rel_no_ext = rel_path.with_suffix("")
+                    thumb_rel = (
+                        f"thumbnails/{rel_no_ext.as_posix()}_thumb{rel_path.suffix}"
+                    )
                     from .prompts import thumbnail_url_for
 
-                    existing = thumbnail_settings.existing_thumbnail(
-                        output_path, rel_path
+                    thumbnail_url = thumbnail_url_for(
+                        thumb_rel, output_path / thumb_rel
                     )
-                    thumbnail_url = None
-                    if existing is not None:
-                        thumb_rel = (
-                            thumbnail_settings.thumbnail_stem_rel(rel_path)
-                            + existing.suffix
-                        )
-                        thumbnail_url = thumbnail_url_for(thumb_rel, existing)
                     if thumbnail_url:
                         image["thumbnail_url"] = thumbnail_url
                     break  # Found matching root, stop searching

py/api/admin.py

@@ -3,21 +3,21 @@
 import asyncio
 import contextlib
 from contextlib import closing
+import datetime
 import functools
 import hashlib
 import json
 import math
 import os
 import sqlite3
+import tempfile
 import threading
 import time
-import urllib.parse
 from pathlib import Path
 
 from aiohttp import web
 
 from .prompts import thumbnail_url_for
-from . import thumbnail_settings
 from .jobs import (
     DEFAULT_SCAN_SCOPE,
     SCAN_GROUP_NAMES,
@@ -26,6 +26,7 @@ from .jobs import (
     DUPLICATE_CLEANUP_JOB_KIND,
     DUPLICATES_JOB_KIND,
     MAINTENANCE_JOB_KIND,
+    RESTORE_JOB_KIND,
     JobBusy,
 )
 
@@ -35,12 +36,8 @@ except ImportError:
     from utils.parallel import map_parallel
 
 try:
-    from ...database.pair_ingestion import blank_positive, ingest_resolved_pair
-    from ...database.run_attribution import (
-        host_output_directory,
-        stored_run_prompt,
-        stored_run_prompts,
-    )
+    from ...database.operations import PromptDatabase
+    from ...database.pair_ingestion import ingest_resolved_pair
     from ...utils.generation_params import (
         PLACEHOLDERS,
         GenerationParamsError,
@@ -50,12 +47,8 @@ try:
     from ...utils.prompt_pair_resolver import resolve_prompt_pair
     from ...utils.review_capture import reviewable
 except ImportError:
-    from database.pair_ingestion import blank_positive, ingest_resolved_pair
-    from database.run_attribution import (
-        host_output_directory,
-        stored_run_prompt,
-        stored_run_prompts,
-    )
+    from database.operations import PromptDatabase
+    from database.pair_ingestion import ingest_resolved_pair
     from utils.generation_params import (
         PLACEHOLDERS,
         GenerationParamsError,
@@ -153,48 +146,39 @@ def _physical_file_key(path, stat):
     return ("path", os.path.normcase(os.path.realpath(str(path))))
 
 
-def _other_sources(output_path, rel_path):
-    """Whether another media file shares *rel_path*'s stem in its folder."""
-    folder = Path(output_path) / Path(rel_path).parent
-    stem = Path(rel_path).stem
-    own = Path(rel_path).suffix.lower()
-    for extension in IMAGE_EXTENSIONS + VIDEO_EXTENSIONS:
-        if extension == own:
-            continue
-        for name in (stem + extension, stem + extension.upper()):
-            if (folder / name).is_file():
-                return True
-    return False
+def _thumbnail_rel_path(rel_path, thumbnail_ext):
+    """Relative path of the thumbnail the gallery would generate for ``rel_path``."""
+    return f"thumbnails/{rel_path.with_suffix('').as_posix()}_thumb{thumbnail_ext}"
+
+
+def _media_thumbnail_rel_path(rel_path):
+    """The thumbnail of a media file: a video's preview is a ``.jpg``."""
+    extension = rel_path.suffix.lower()
+    return _thumbnail_rel_path(
+        rel_path, ".jpg" if extension in VIDEO_EXTENSIONS else rel_path.suffix
+    )
 
 
 def _remove_thumbnail(output_path, rel_path, logger=None):
-    """Remove the previews of ``rel_path`` under ``output_path``, if any.
+    """Remove the thumbnail of ``rel_path`` under ``output_path``, if any.
 
-    Shared by the legacy duplicate delete and the reviewed removal job.
-    Every preview the file owns goes, in any format (#317); a preview name
-    another same-stem file still shares (``x_thumb.webp`` of ``x.png`` and
-    ``x.mp4``, ruling R2) stays for it. A preview that is a link, or one that
-    cannot be removed, is left alone (a stale preview never fails a removal).
-    Returns whether one was removed.
+    Shared by the legacy duplicate delete and the reviewed removal job. A
+    thumbnail that is a link, or one that cannot be removed, is left alone
+    (a stale preview never fails a removal). Returns whether one was removed.
     """
     output_path = Path(output_path)
-    rel_path = Path(rel_path)
-    shared = _other_sources(output_path, rel_path)
-    removed = False
-    for thumbnail_path in thumbnail_settings.owned_thumbnails(output_path, rel_path):
-        extension = thumbnail_path.suffix.lower()
-        if shared and extension in thumbnail_settings.WRITTEN_EXTENSIONS:
-            continue
-        try:
-            os.remove(thumbnail_path)
-        except OSError as e:
-            if logger is not None:
-                logger.warning(f"Could not delete thumbnail for {rel_path}: {e}")
-            continue
-        removed = True
+    thumbnail_path = output_path / _media_thumbnail_rel_path(Path(rel_path))
+    try:
+        if thumbnail_path.is_symlink() or not thumbnail_path.is_file():
+            return False
+        os.remove(thumbnail_path)
+    except OSError as e:
         if logger is not None:
-            logger.debug(f"Deleted associated thumbnail: {thumbnail_path}")
-    return removed
+            logger.warning(f"Could not delete thumbnail for {rel_path}: {e}")
+        return False
+    if logger is not None:
+        logger.debug(f"Deleted associated thumbnail: {thumbnail_path}")
+    return True
 
 
 async def _read_json(request):
@@ -558,24 +542,6 @@ def _current_image_monitor():
     return getattr(_image_monitor_module(), "_monitor_instance", None)
 
 
-class _BatchHistory:
-    """A scan batch's recorded-history lookup, made on the first file needing it.
-
-    Most files link through their metadata and never ask; the first one that
-    does triggers one lookup for the whole batch (``_recorded_runs_for``).
-    """
-
-    def __init__(self, api, media_files):
-        self._api = api
-        self._files = media_files
-        self._found = None
-
-    def get(self, path):
-        if self._found is None:
-            self._found = self._api._recorded_runs_for(self._files)
-        return self._found.get(path)
-
-
 class AdminRoutesMixin:
     """Mixin providing admin, diagnostics, and maintenance API endpoints."""
 
@@ -758,20 +724,9 @@ class AdminRoutesMixin:
 
         Only the files under ``output_dir`` count (paths are relative to it);
         a group needs two of them. A file that vanished since it was hashed
-        is left out. Each ``url`` names the source ``output_dir`` is
-        (``?root=``) when it is one, so View Full never opens another
-        source's file at the same path.
+        is left out.
         """
         output_path = Path(os.path.abspath(output_dir))
-        identity = os.path.normcase(os.path.realpath(str(output_path)))
-        root_index = next(
-            (
-                index
-                for index, root in enumerate(self._get_all_output_dirs())
-                if os.path.normcase(os.path.realpath(str(root))) == identity
-            ),
-            None,
-        )
         base = os.path.normcase(str(output_path)).rstrip("\\/") + os.sep
         duplicates = []
         for group in groups:
@@ -782,10 +737,7 @@ class AdminRoutesMixin:
                 try:
                     images.append(
                         self._describe_media_file(
-                            Path(record["abs"]),
-                            output_path,
-                            file_hash=group["hash"],
-                            root_index=root_index,
+                            Path(record["abs"]), output_path, file_hash=group["hash"]
                         )
                     )
                 except (OSError, ValueError) as e:
@@ -885,36 +837,23 @@ class AdminRoutesMixin:
                 )
         return groups
 
-    def _describe_media_file(
-        self, media_path, output_path, file_hash=None, root_index=None
-    ):
+    def _describe_media_file(self, media_path, output_path, file_hash=None):
         """Describe one media file for the duplicates response (hashing it
-        unless ``file_hash`` is given). With ``root_index`` the ``url`` names
-        that source and its path is URL-encoded."""
+        unless ``file_hash`` is given)."""
         stat = media_path.stat()
         rel_path = media_path.relative_to(output_path)
         extension = media_path.suffix.lower()
         is_video = extension in VIDEO_EXTENSIONS
 
-        existing = thumbnail_settings.existing_thumbnail(output_path, rel_path)
-        thumbnail_url = None
-        if existing is not None:
-            thumb_rel = (
-                thumbnail_settings.thumbnail_stem_rel(rel_path) + existing.suffix
-            )
-            thumbnail_url = thumbnail_url_for(thumb_rel, existing)
-        if root_index is None:
-            url = f"/prompt_manager/images/serve/{rel_path.as_posix()}"
-        else:
-            encoded = urllib.parse.quote(rel_path.as_posix(), safe="/")
-            url = f"/prompt_manager/images/serve/{encoded}?root={root_index}"
+        thumb_rel = _thumbnail_rel_path(rel_path, ".jpg" if is_video else extension)
+        thumbnail_url = thumbnail_url_for(thumb_rel, output_path / thumb_rel)
 
         return {
             "id": str(hash(str(media_path))),
             "filename": media_path.name,
             "path": str(rel_path),
             "relative_path": str(rel_path),
-            "url": url,
+            "url": f"/prompt_manager/images/serve/{rel_path.as_posix()}",
             "thumbnail_url": thumbnail_url,
             "size": stat.st_size,
             "modified_time": stat.st_mtime,
@@ -1282,6 +1221,216 @@ class AdminRoutesMixin:
             "message": f"Found {len(issues)} consistency issues",
         }
 
+    async def backup_database(self, request):
+        """Download a consistent copy of the prompts database (WAL included)."""
+        try:
+            model = self.db.model
+            db_path = model.db_path
+
+            if not os.path.exists(db_path):
+                return web.json_response(
+                    {"success": False, "error": "Database file not found"}, status=404
+                )
+
+            fd, temp_path = tempfile.mkstemp(suffix=".db")
+            os.close(fd)
+            try:
+                ok = await self._run_in_executor(model.backup_database, temp_path)
+                if not ok:
+                    return web.json_response(
+                        {"success": False, "error": "Failed to create database backup"},
+                        status=500,
+                    )
+                # Read once (the file is deleted right after) rather than
+                # streaming so the temp file never outlives the request.
+                with open(temp_path, "rb") as fh:
+                    file_data = fh.read()
+            finally:
+                if os.path.exists(temp_path):
+                    os.unlink(temp_path)
+
+            timestamp = datetime.datetime.now().strftime("%Y%m%d_%H%M%S")
+            filename = f"prompts_backup_{timestamp}.db"
+
+            return web.Response(
+                body=file_data,
+                content_type="application/octet-stream",
+                headers={
+                    "Content-Disposition": f'attachment; filename="{filename}"',
+                    "Content-Length": str(len(file_data)),
+                },
+            )
+
+        except Exception as e:
+            self.logger.error(f"Backup error: {e}", exc_info=True)
+            return web.json_response(
+                {
+                    "success": False,
+                    "error": f"Failed to backup database: {self._public_error(e)}",
+                },
+                status=500,
+            )
+
+    async def restore_database(self, request):
+        """Restore the prompts database from an uploaded SQLite file.
+
+        The upload is streamed to a temp file. Free disk space decides how
+        large it may be (``maintenance.restore_room``), under a 64 GiB ceiling
+        (``restore_max_bytes``): a request whose Content-Length does not fit
+        is refused before anything is written, and one without is refused as
+        soon as its running size does not. The file is
+        verified with PromptModel.verify_database_file and only then copied
+        over the live database, which is backed up first. The whole request
+        holds the registry (records): it is refused while a scan or another
+        record-changing job runs, and those are refused while it runs.
+        """
+        return await self._run_held(
+            RESTORE_JOB_KIND,
+            "Database restore (admin page)",
+            "records",
+            lambda: self._restore_database(request),
+        )
+
+    def _restore_refusal(self, size, ceiling, room, *, known):
+        """``400 too-large`` past the ceiling, else ``507 insufficient-space``."""
+        from .maintenance import restore_space_message
+
+        if size > ceiling:
+            return web.json_response(
+                {
+                    "success": False,
+                    "code": "too-large",
+                    "error": (
+                        "File too large. Maximum size is "
+                        f"{ceiling // (1024 * 1024)}MB"
+                    ),
+                },
+                status=400,
+            )
+        return web.json_response(
+            {
+                "success": False,
+                "code": "insufficient-space",
+                "error": restore_space_message(size, room, known=known),
+            },
+            status=507,
+        )
+
+    async def _restore_database(self, request):
+        from .maintenance import RESTORE_MAX_BYTES, restore_room
+
+        ceiling = getattr(self, "restore_max_bytes", RESTORE_MAX_BYTES)
+        temp_path = None
+        try:
+            # Free disk space decides how large a backup may be (#313): the
+            # upload, its staged copy and the swap must all fit.
+            room = await self._run_in_executor(restore_room, self.db.model.db_path)
+            max_bytes = min(ceiling, room)
+            length = request.content_length
+            if length is not None and length > max_bytes:
+                return self._restore_refusal(length, ceiling, room, known=True)
+            reader = await request.multipart()
+            field = await reader.next()
+
+            if not field or field.name != "database_file":
+                return web.json_response(
+                    {
+                        "success": False,
+                        "error": (
+                            "No database file uploaded. "
+                            "Expected field name: database_file"
+                        ),
+                    },
+                    status=400,
+                )
+
+            fd, temp_path = tempfile.mkstemp(suffix=".db")
+            os.close(fd)
+            size = 0
+            with open(temp_path, "wb") as out:
+                while True:
+                    chunk = await field.read_chunk()
+                    if not chunk:
+                        break
+                    size += len(chunk)
+                    if size > max_bytes:
+                        return self._restore_refusal(size, ceiling, room, known=False)
+                    out.write(chunk)
+
+            if size == 0:
+                return web.json_response(
+                    {"success": False, "error": "Uploaded file is empty"}, status=400
+                )
+
+            model = self.db.model
+            ok, reason = await self._run_in_executor(
+                model.verify_database_file, temp_path
+            )
+            if ok:
+                reason = await self._run_in_executor(_inspect_restore_upload, temp_path)
+                ok = reason is None
+            if not ok:
+                return web.json_response(
+                    {"success": False, "error": reason}, status=400
+                )
+
+            try:
+                backup_path = await self._run_in_executor(
+                    model.restore_from_file, temp_path
+                )
+            except sqlite3.OperationalError as exc:
+                if (
+                    getattr(exc, "_prompt_manager_restore_backup_created", False)
+                    is True
+                ):
+                    try:
+                        await self._run_in_executor(
+                            _prune_safety_backups, model.db_path
+                        )
+                    except Exception:
+                        self.logger.warning(
+                            "Could not prune safety backups after failed restore"
+                        )
+                raise
+            removed = await self._run_in_executor(_prune_safety_backups, model.db_path)
+            if removed:
+                self.logger.info(f"Removed {len(removed)} old safety backups")
+            previous = self.db
+            self.db = PromptDatabase(model.db_path)
+            self._database_replaced()  # a health report described the old one
+            # Its connections would otherwise linger (a file lock on Windows)
+            previous.close_all()
+            prompt_count = self.db.model.get_database_info().get("total_prompts", 0)
+
+            return web.json_response(
+                {
+                    "success": True,
+                    "message": (
+                        "Database restored successfully. "
+                        f"Found {prompt_count} prompts."
+                    ),
+                    "prompt_count": prompt_count,
+                    "backup_created": (
+                        self._public_path(backup_path) if backup_path else None
+                    ),
+                }
+            )
+
+        except Exception as e:
+            self.logger.error(f"Restore error: {e}", exc_info=True)
+            return web.json_response(
+                {
+                    "success": False,
+                    "error": f"Failed to restore database: {self._public_error(e)}",
+                },
+                status=500,
+            )
+        finally:
+            if temp_path:
+                for suffix in ("", "-wal", "-shm", "-journal"):
+                    if os.path.exists(temp_path + suffix):
+                        os.unlink(temp_path + suffix)
+
     async def scan_images(self, request):
         """Scan ComfyUI output images for prompt metadata and add them to the database.
 
@@ -1592,8 +1741,6 @@ class AdminRoutesMixin:
             if outcomes is not None:
                 outcomes.append(_scan_outcome(media_file, roots, status, title))
 
-        batch_results = list(batch_results)
-        history = _BatchHistory(self, [media for media, _meta in batch_results])
         for media_file, metadata in batch_results:
             if self._scan_job and self._scan_job.cancelled:
                 break
@@ -1607,7 +1754,6 @@ class AdminRoutesMixin:
                     ambiguous=ambiguous,
                     untraced=untraced,
                     records=records,
-                    history=history,
                 )
             except Exception as e:
                 self.logger.error(f"Error processing {media_file.name}: {e}")
@@ -1666,7 +1812,6 @@ class AdminRoutesMixin:
         ambiguous=None,
         untraced=None,
         records=None,
-        history=None,
     ):
         """Enrich exact pairs; retain legacy positive-only import for absent pairs.
 
@@ -1684,9 +1829,7 @@ class AdminRoutesMixin:
         a dict.
         """
         if not metadata:
-            # No prompt metadata (--disable-metadata, bare savers): only the
-            # recorded run can say which prompt made it (#342)
-            return self._link_recorded_run(media_file, {}, detailed, history)
+            return None
         canonical = dict(metadata)
         for key in ("prompt", "workflow"):
             if isinstance(canonical.get(key), str):
@@ -1696,12 +1839,9 @@ class AdminRoutesMixin:
                     # Preserve malformed metadata for conservative resolver rejection.
                     pass
         if not canonical.get("prompt") and not canonical.get("parameters"):
-            return self._link_recorded_run(media_file, canonical, detailed, history)
+            return None
         _with_file_size(canonical, media_file)
         resolution = resolve_prompt_pair(canonical)
-        if blank_positive(resolution):
-            # Only prepend/append text: no stored prompt can own it (#342)
-            resolution = {**resolution, "state": "unresolved"}
         # Ambiguous without a choice: unresolved unless something links it.
         unchoosable = resolution["state"] == "ambiguous" and not reviewable(resolution)
         if unchoosable:
@@ -1730,11 +1870,6 @@ class AdminRoutesMixin:
             # Graphs without a recognized sampler keep the legacy extractor below.
             prompt_text = self._graph_prompt_text(metadata)
             if not prompt_text:
-                linked = self._link_recorded_run(
-                    media_file, canonical, detailed, history
-                )
-                if linked is not None:
-                    return linked
                 return "unresolved" if unchoosable else resolution["state"]
         elif resolution["state"] == "ambiguous":
             return "unresolved" if unchoosable else "ambiguous"
@@ -1758,62 +1893,6 @@ class AdminRoutesMixin:
             return status
         return {"status": status, "title": self._scan_title(media_file, prompt_text)}
 
-    def _recorded_runs_for(self, media_files):
-        """``{path: prompt id or None}`` from recorded history for a scan batch.
-
-        One output lookup per chunk of names (``stored_run_prompts``), so a
-        batch never queries history once per file. An empty dict on failure.
-        """
-        try:
-            return stored_run_prompts(
-                self.db, [str(path) for path in media_files], host_output_directory()
-            )
-        except Exception:
-            self.logger.warning(
-                "History attribution failed for a scan batch", exc_info=True
-            )
-            return {}
-
-    def _link_recorded_run(self, media_file, canonical, detailed=False, history=None):
-        """Link a file recorded history attributes to one stored prompt (#342).
-
-        Returns the scan status (with ``detailed``, a stored or linked file's
-        ``{"status", "title"}``), or None when history names no single stored
-        prompt for the file (``database.run_attribution``). Never creates a
-        prompt. Works without any prompt metadata in the file. ``history`` is
-        the batch's precomputed lookup; without it the file is looked up alone.
-        """
-        if history is not None:
-            prompt_id = history.get(str(media_file))
-        else:
-            try:
-                prompt_id = stored_run_prompt(
-                    self.db, str(media_file), host_output_directory()
-                )
-            except Exception:
-                self.logger.warning(
-                    f"History attribution failed for {media_file.name}",
-                    exc_info=True,
-                )
-                return None
-        if prompt_id is None:
-            return None
-        try:
-            image_id = self.db.link_image_to_prompt(
-                prompt_id, str(media_file), metadata=canonical
-            )
-        except Exception as e:
-            self.logger.error(f"Failed to link {media_file.name} from history: {e}")
-            return "found"
-        status = "linked" if image_id else "unchanged"
-        if not detailed or status not in SCAN_TITLED_DETAILS:
-            return status
-        prompt = self.db.get_prompt_by_id(prompt_id) or {}
-        return {
-            "status": status,
-            "title": self._scan_title(media_file, prompt.get("text") or ""),
-        }
-
     def _scan_title(self, media_file, text):
         """The linked prompt's Library title (its stored title, else ``text``'s
         first line), as the Library and the inspector name it."""

py/api/autotag_routes.py

@@ -10,7 +10,6 @@ from urllib.parse import quote
 
 from .jobs import AUTOTAG_BATCH_JOB_KIND
 from .prompts import thumbnail_url_for
-from . import thumbnail_settings
 from .. import model_gate
 
 from aiohttp import web
@@ -793,16 +792,13 @@ class AutotagRoutesMixin:
                 rel_path = image_path.relative_to(output_path)
                 thumbnail_url = None
                 if has_thumbnails:
-                    # Any preview the file owns, the current format first (#317)
-                    existing = thumbnail_settings.existing_thumbnail(
-                        output_path, rel_path
+                    thumb_rel = (
+                        f"thumbnails/{rel_path.with_suffix('').as_posix()}"
+                        f"_thumb{image_path.suffix}"
+                    )
+                    thumbnail_url = thumbnail_url_for(
+                        thumb_rel, output_path / thumb_rel
                     )
-                    if existing is not None:
-                        thumb_rel = (
-                            thumbnail_settings.thumbnail_stem_rel(rel_path)
-                            + existing.suffix
-                        )
-                        thumbnail_url = thumbnail_url_for(thumb_rel, existing)
                 images.append(
                     {
                         "filename": image_path.name,

py/api/backup_restore.py

@@ -1,942 +0,0 @@
-"""Database backup and restore routes (#249 System S8).
-
-Legacy routes, responses unchanged:
-
-- ``GET /prompt_manager/backup`` downloads a consistent copy of the library.
-  While the copy is made it holds the registry as ``backup`` ("Database
-  backup", ``guarded``): it is refused while a restore, maintenance apply or
-  other record-changing job runs. The copy is written in the library's
-  folder and made one standalone file; the hold ends there, so a slow or
-  stalled download never keeps other work waiting. A copy that fails its
-  integrity check is a 500 with no bytes. One that fails only a semantic
-  check (``verify_database_file``) is still sent: a user can always get a
-  backup. The reason is logged and sent as ``X-PromptManager-Verify``
-  (``ok`` otherwise), and the status records it as not verified. The file
-  is streamed, then closed and removed.
-- ``POST /prompt_manager/restore`` (multipart ``database_file``) restores in
-  one request through the same stage and publish as the restore job, holding
-  the registry as ``restore`` (``exclusive``).
-
-Reviewed restore (new routes answer errors as ``{success:false, code, error}``):
-
-- ``POST /prompt_manager/restore/preview`` (multipart ``database_file``, the
-  same disk-space cap) stages the upload in the library's folder
-  (``database/restore_stage.py``) and answers what it holds beside the live
-  library: ``{token, expires_at, summary, schema:{migrated, library_state},
-  integrity:"ok", documents:{repaired, cleared, images}, live, size,
-  safety_backup:{destination_label}}``. Nothing live is written or backed
-  up. At most two previews are held (``too-large``, 429).
-- ``DELETE /prompt_manager/restore/preview/{token}`` discards a stage.
-- ``POST /prompt_manager/restore/apply {token}`` starts the restore job (202
-  ``{job}``): kind ``restore``, "Database restore", ``exclusive`` (it runs
-  alone, like Move library), not cancellable, indeterminate. The runner waits
-  for request leases to end, rechecks the live fingerprint (``plan-changed``),
-  publishes the exact staged bytes, swaps ``self.db``, prunes old safety
-  backups and logs what was restored. Once the copy replaced the library,
-  the restore is done: the later steps only log their failures.
-- ``GET /prompt_manager/backup/status``: the safety backups on disk
-  (``<db>.backup_*``, newest first, names only) and this session's last
-  verified download (Q9: no sidecar file).
-"""
-
-import asyncio
-import datetime
-import os
-import sqlite3
-import tempfile
-from contextlib import closing
-from pathlib import Path
-
-from aiohttp import web
-
-from . import admin as _admin
-from .job_routes import busy_response
-from .jobs import RESTORE_JOB_KIND, JobBusy
-from .maintenance_plans import PlanExpired, PlanUsed
-from .restore_plans import RestorePlanStore
-
-try:
-    from ...database import restore_stage
-    from ...database.operations import PromptDatabase
-    from ...database.safety_backup import (
-        SafetyBackupFailed,
-        fsync_file,
-        make_standalone,
-        remove_quietly,
-        safety_temp,
-    )
-except ImportError:
-    from database import restore_stage
-    from database.operations import PromptDatabase
-    from database.safety_backup import (
-        SafetyBackupFailed,
-        fsync_file,
-        make_standalone,
-        remove_quietly,
-        safety_temp,
-    )
-
-BACKUP_JOB_KIND = "backup"
-BACKUP_HOLD_TITLE = "Database backup"
-LEGACY_RESTORE_TITLE = "Database restore (admin page)"
-RESTORE_JOB_TITLE = "Database restore"
-RESTORE_GROUPS = ("errors",)
-MAX_TOKEN_LENGTH = 128
-APPLY_BODY_MAX = 1024
-STREAM_CHUNK = 1024 * 1024
-MAX_LISTED_BACKUPS = 10
-SIDECARS = ("", "-wal", "-shm", "-journal")
-REQUESTS_BUSY = (
-    "Other requests are still reading the library; nothing was changed. "
-    "Try again in a moment."
-)
-# S9 I1: the review goes back to the page that started the restore
-# (``scope.review_kept``), which opens it again with Restore and Discard; no
-# other place can start a kept review, so the line says where it is.
-REVIEW_KEPT = (
-    "Other requests are still reading the library; nothing was changed. "
-    "The review was reopened in the page that started the restore: restore it "
-    "again there, or discard it."
-)
-VERIFY_HEADER = "X-PromptManager-Verify"
-SQLITE_HEADER = b"SQLite format 3\x00"
-PLAN_CHANGED = (
-    "The library changed since the review; nothing was changed. "
-    "Review the restore again."
-)
-NOT_RESTORED = "The restore failed; the library was not changed."
-
-
-def _failure(message, status, code=None, **extra):
-    return web.json_response(
-        {"success": False, "code": code, "error": message, **extra}, status=status
-    )
-
-
-def _iso(timestamp):
-    return datetime.datetime.fromtimestamp(timestamp, datetime.timezone.utc).isoformat()
-
-
-def _plural(count, word):
-    return f"{count:,} {word}" + ("" if count == 1 else "s")
-
-
-def documents_line(documents):
-    """The repair report's sentence, or "" when nothing was damaged."""
-    repaired, cleared = documents.get("repaired", 0), documents.get("cleared", 0)
-    parts = []
-    if repaired:
-        parts.append(f"repaired {_plural(repaired, 'damaged workflow document')}")
-    if cleared:
-        images = documents.get("images", 0)
-        parts.append(
-            f"could not repair {_plural(cleared, 'workflow document')}: "
-            f"{_plural(images, 'image')} {'shows' if images == 1 else 'show'} "
-            "no workflow"
-        )
-    if not parts:
-        return ""
-    text = "; ".join(parts)
-    return text[0].upper() + text[1:] + "."
-
-
-def restored_line(summary):
-    return (
-        f"Restored {_plural(summary['prompts'], 'prompt')}, "
-        f"{_plural(summary['image_links'], 'image link')}, "
-        f"{_plural(summary['pairs'], 'saved pair')} and "
-        f"{_plural(summary['runs'], 'run')}"
-    )
-
-
-def safety_backups(db_path, limit=MAX_LISTED_BACKUPS):
-    """``<db>.backup_*`` files beside the database, newest first (blocking)."""
-    db_path = os.path.abspath(db_path)
-    folder = os.path.dirname(db_path)
-    prefix = os.path.basename(db_path) + ".backup_"
-    found = []
-    try:
-        names = os.listdir(folder)
-    except OSError:
-        return []
-    for name in names:
-        if not name.startswith(prefix):
-            continue
-        try:
-            stat = os.stat(os.path.join(folder, name))
-        except OSError:
-            continue
-        if not os.path.isfile(os.path.join(folder, name)):
-            continue
-        found.append((stat.st_mtime, name, stat.st_size))
-    found.sort(key=lambda item: (item[0], item[1]), reverse=True)
-    return [
-        {"name": name, "bytes": size, "modified_at": _iso(mtime)}
-        for mtime, name, size in found[:limit]
-    ]
-
-
-def snapshot_corruption(path):
-    """Why the snapshot file is corrupt, or None (blocking).
-
-    Only physical damage refuses a download: not a SQLite file, or a failed
-    ``PRAGMA integrity_check``.
-    """
-    try:
-        with open(path, "rb") as handle:
-            if handle.read(len(SQLITE_HEADER)) != SQLITE_HEADER:
-                return "Not a SQLite database file"
-        uri = Path(os.path.abspath(path)).as_uri() + "?mode=ro"
-        with closing(sqlite3.connect(uri, uri=True)) as conn:
-            row = conn.execute("PRAGMA integrity_check").fetchone()
-    except (OSError, sqlite3.Error) as error:
-        return f"Invalid SQLite database: {error}"
-    verdict = row[0] if row else "no result"
-    return None if verdict == "ok" else f"Integrity check failed: {verdict}"
-
-
-def write_backup_snapshot(model):
-    """A standalone copy of the library beside it: ``(path, warning)`` (blocking).
-
-    Raises SafetyBackupFailed with nothing left on disk when the copy cannot
-    be written or is corrupt (``snapshot_corruption``). ``warning`` is the
-    reason a semantic check (``verify_database_file``, workflow documents
-    not read) refused the copy, or None. The caller removes the file.
-    """
-    temp = safety_temp(model.db_path)
-    try:
-        if not model.backup_database(temp):
-            raise SafetyBackupFailed("The backup could not be written")
-        make_standalone(temp)
-        corrupt = snapshot_corruption(temp)
-        if corrupt is not None:
-            raise SafetyBackupFailed("The backup is corrupt", corrupt)
-        ok, reason = model.verify_database_file(temp, documents=False)
-        fsync_file(temp)
-        return temp, (None if ok else reason)
-    except BaseException:
-        remove_quietly(*(temp + suffix for suffix in SIDECARS))
-        raise
-
-
-def _header_text(text):
-    """A reason as a one-line, latin-1 header value."""
-    flat = " ".join(str(text).split())[:300]
-    return flat.encode("latin-1", "replace").decode("latin-1")
-
-
-class BackupRestoreRoutesMixin:
-    """Mixin providing the backup and restore endpoints."""
-
-    def _register_backup_restore_routes(self, routes):
-        @routes.post("/prompt_manager/restore/preview")
-        async def restore_preview_route(request):
-            return await self.preview_restore(request)
-
-        @routes.delete("/prompt_manager/restore/preview/{token}")
-        async def restore_discard_route(request):
-            return await self.discard_restore_preview(request)
-
-        @routes.post("/prompt_manager/restore/apply")
-        async def restore_apply_route(request):
-            return await self.apply_restore(request)
-
-        @routes.get("/prompt_manager/backup/status")
-        async def backup_status_route(request):
-            return await self.backup_status(request)
-
-    @property
-    def _restore_plans(self):
-        store = getattr(self, "_restore_plan_store", None)
-        if store is None:
-            store = self._restore_plan_store = RestorePlanStore()
-        return store
-
-    # ── backup ────────────────────────────────────────────────────────
-
-    async def backup_database(self, request):
-        """Download a copy of the prompts database (WAL included)."""
-        return await self._stream_backup(request)
-
-    async def _stream_backup(self, request):
-        model = self.db.model
-        if not os.path.exists(model.db_path):
-            return web.json_response(
-                {"success": False, "error": "Database file not found"}, status=404
-            )
-        made = await self._run_held(
-            BACKUP_JOB_KIND,
-            BACKUP_HOLD_TITLE,
-            "guarded",
-            lambda: self._make_backup_snapshot(model),
-        )
-        if isinstance(made, web.StreamResponse):
-            return made  # refused, or the snapshot failed
-        temp, warning = made
-        return await self._send_snapshot(request, temp, warning)
-
-    async def _make_backup_snapshot(self, model):
-        """``(path, warning)``, or the error response (inside the hold)."""
-        loop = asyncio.get_running_loop()
-        future = loop.run_in_executor(None, write_backup_snapshot, model)
-        try:
-            temp, warning = await asyncio.shield(future)
-        except asyncio.CancelledError:
-            # The worker cannot be stopped: remove what it writes once it is
-            # done (#335 re-review R4).
-            future.add_done_callback(
-                lambda done: loop.create_task(self._remove_finished_snapshot(done))
-            )
-            raise
-        except SafetyBackupFailed as failed:
-            self.logger.error(f"Backup failed: {failed} {failed.reason or ''}")
-            return web.json_response(
-                {"success": False, "error": "Failed to create database backup"},
-                status=500,
-            )
-        except Exception as e:
-            self.logger.error(f"Backup error: {e}", exc_info=True)
-            return web.json_response(
-                {
-                    "success": False,
-                    "error": f"Failed to backup database: {self._public_error(e)}",
-                },
-                status=500,
-            )
-        if warning is not None:
-            self.logger.warning(f"Backup sent with a failed check: {warning}")
-        return temp, warning
-
-    async def _remove_finished_snapshot(self, future):
-        """Remove the snapshot a cancelled download's worker finished."""
-        if future.cancelled() or future.exception() is not None:
-            return  # nothing was left on disk
-        temp, _warning = future.result()
-        await self._run_in_executor(
-            remove_quietly, *(temp + suffix for suffix in SIDECARS)
-        )
-
-    async def _send_snapshot(self, request, temp, warning):
-        """Stream the snapshot (outside the hold), then close and remove it."""
-        timestamp = datetime.datetime.now().strftime("%Y%m%d_%H%M%S")
-        handle = None
-        try:
-            size = os.path.getsize(temp)
-            handle = open(temp, "rb")
-            response = web.StreamResponse(
-                headers={
-                    "Content-Type": "application/octet-stream",
-                    "Content-Disposition": (
-                        f'attachment; filename="prompts_backup_{timestamp}.db"'
-                    ),
-                    "Content-Length": str(size),
-                    VERIFY_HEADER: "ok" if warning is None else _header_text(warning),
-                }
-            )
-            await response.prepare(request)
-            while True:
-                chunk = await self._run_in_executor(handle.read, STREAM_CHUNK)
-                if not chunk:
-                    break
-                await response.write(chunk)
-            await response.write_eof()
-            self._last_backup_download = {
-                "at": datetime.datetime.now(datetime.timezone.utc).isoformat(),
-                "bytes": size,
-                "verified": warning is None,
-            }
-            return response
-        finally:
-            if handle is not None:
-                handle.close()  # before the unlink (Windows)
-            await self._run_in_executor(
-                remove_quietly, *(temp + suffix for suffix in SIDECARS)
-            )
-
-    async def backup_status(self, request):
-        try:
-            backups = await self._run_in_executor(safety_backups, self.db.model.db_path)
-        except Exception:
-            self.logger.exception("Backup status failed")
-            return _failure("Failed to read the backup status", 500)
-        return web.json_response(
-            {
-                "success": True,
-                "safety_backups": backups,
-                "last_download": getattr(self, "_last_backup_download", None),
-            },
-            headers={"Cache-Control": "no-store"},
-        )
-
-    # ── the upload ────────────────────────────────────────────────────
-
-    def _restore_refusal(self, size, ceiling, room, *, known):
-        """``400 too-large`` past the ceiling, else ``507 insufficient-space``."""
-        from .maintenance import restore_space_message
-
-        if size > ceiling:
-            return web.json_response(
-                {
-                    "success": False,
-                    "code": "too-large",
-                    "error": (
-                        "File too large. Maximum size is "
-                        f"{ceiling // (1024 * 1024)}MB"
-                    ),
-                },
-                status=400,
-            )
-        return web.json_response(
-            {
-                "success": False,
-                "code": "insufficient-space",
-                "error": restore_space_message(size, room, known=known),
-            },
-            status=507,
-        )
-
-    async def _receive_restore_upload(self, request, uploads):
-        """Stream ``database_file`` into the library's folder.
-
-        Returns ``(path, None)`` or ``(None, refusal)``. Each temp path is
-        appended to ``uploads`` as soon as it exists, so the caller removes
-        it (and its sidecars) whatever happens.
-        """
-        from .maintenance import RESTORE_MAX_BYTES, restore_room
-
-        ceiling = getattr(self, "restore_max_bytes", RESTORE_MAX_BYTES)
-        db_path = self.db.model.db_path
-        # Free disk space decides how large a backup may be (#313): the
-        # upload, its staged copy and the swap must all fit.
-        room = await self._run_in_executor(restore_room, db_path)
-        max_bytes = min(ceiling, room)
-        length = request.content_length
-        if length is not None and length > max_bytes:
-            return None, self._restore_refusal(length, ceiling, room, known=True)
-        reader = await request.multipart()
-        field = await reader.next()
-        if not field or field.name != "database_file":
-            return None, web.json_response(
-                {
-                    "success": False,
-                    "error": (
-                        "No database file uploaded. "
-                        "Expected field name: database_file"
-                    ),
-                },
-                status=400,
-            )
-        fd, temp_path = tempfile.mkstemp(
-            prefix=restore_stage.UPLOAD_PREFIX,
-            suffix=".tmp",
-            dir=os.path.dirname(os.path.abspath(db_path)),
-        )
-        uploads.append(temp_path)
-        size = 0
-        with os.fdopen(fd, "wb") as out:
-            while True:
-                chunk = await field.read_chunk()
-                if not chunk:
-                    break
-                size += len(chunk)
-                if size > max_bytes:
-                    return None, self._restore_refusal(size, ceiling, room, known=False)
-                out.write(chunk)
-        if size == 0:
-            return None, web.json_response(
-                {"success": False, "error": "Uploaded file is empty"}, status=400
-            )
-        return temp_path, None
-
-    async def _upload_problem(self, path):
-        """None when the upload may be staged, else a readable reason."""
-        ok, reason = await self._run_in_executor(
-            self.db.model.verify_database_file, path, documents=False
-        )
-        if ok:
-            reason = await self._run_in_executor(_admin._inspect_restore_upload, path)
-            ok = reason is None
-        return None if ok else reason
-
-    async def _remove_uploads(self, uploads):
-        for path in uploads:
-            await self._run_in_executor(
-                remove_quietly, *(path + suffix for suffix in SIDECARS)
-            )
-
-    async def _prune_after(self, db_path, *, failed=False):
-        """Prune old safety backups; a failure is only logged (never raises).
-
-        It runs after a restore replaced the library, or after one failed:
-        either way the restore's outcome stands.
-        """
-        try:
-            removed = await self._run_in_executor(_admin._prune_safety_backups, db_path)
-        except Exception as error:
-            when = "failed" if failed else "completed"
-            self.logger.warning(
-                f"Could not prune safety backups after a {when} restore: "
-                f"{type(error).__name__}"
-            )
-            return
-        if removed:
-            self.logger.info(f"Removed {len(removed)} old safety backups")
-
-    async def _publish(self, model, staged):
-        """Publish ``staged``; on a page-copy failure prune and re-raise."""
-        try:
-            return await self._run_in_executor(model.publish_staged, staged)
-        except sqlite3.OperationalError as exc:
-            if getattr(exc, "_prompt_manager_restore_backup_created", False) is True:
-                await self._prune_after(model.db_path, failed=True)
-            raise
-
-    async def _after_publish(self, db_path):
-        """Everything after the copy replaced the library: best effort, logged.
-
-        The restore is done once the copy succeeded, so nothing here fails it
-        (#335 review I1). The library is adopted as ``self.db`` (the previous
-        object, which points at the same file, stays when a new one cannot
-        be opened), the generation is bumped (so the health report and
-        reviewed plans of the old library are dropped), held restore
-        previews are dropped and the previous object's connections closed.
-        """
-        await self._prune_after(db_path)
-        previous = self.db
-        try:
-            self.db = PromptDatabase(db_path)
-        except Exception:
-            self.logger.exception("Could not reopen the restored library")
-        try:
-            self._database_replaced()
-        except Exception:
-            self.logger.exception("Could not drop the old library's reports")
-        try:
-            await self._discard_held(self._restore_plans.pop_all())
-        except Exception:
-            self.logger.exception("Could not remove the old restore previews")
-        if previous is not self.db:
-            try:
-                # Its connections would otherwise linger (a lock on Windows).
-                await self._run_in_executor(previous.close_all)
-            except Exception:
-                self.logger.exception("Could not close the previous library")
-
-    async def _discard_held(self, held):
-        """Remove the stage folders of dropped store entries (off the loop)."""
-        for entry in held:
-            try:
-                await self._run_in_executor(entry.staged.discard)
-            except Exception:
-                self.logger.exception("Could not remove a restore stage")
-
-    async def _discard_popped(self, token):
-        """Drop ``token`` and remove its stage, only if the store still held it.
-
-        A stage another apply's job has taken is not this request's to remove
-        (#335 re-review R2).
-        """
-        popped = self._restore_plans.pop(token)
-        if popped is not None:
-            await self._discard_held([popped])
-
-    async def _drop_expired_restores(self):
-        """Drop expired previews from the store (on the loop), then their files."""
-        await self._discard_held(self._restore_plans.pop_expired())
-
-    def _schedule_restore_expiry(self):
-        """Remove each preview's stage when it expires, without a request.
-
-        A loop timer (``call_later``), so a server that stops with previews
-        held leaves nothing pending; the startup sweep removes the folders.
-        """
-        store = self._restore_plans
-        expires = store.next_expiry()
-        if expires is None:
-            return
-        handle = getattr(self, "_restore_expiry_handle", None)
-        if handle is not None:
-            handle.cancel()
-        loop = asyncio.get_running_loop()
-
-        def fire():
-            self._restore_expiry_handle = None
-            task = loop.create_task(self._expire_restores())
-            self._restore_expiry_task = task
-
-        delay = max(0.0, expires - store.now())
-        self._restore_expiry_handle = loop.call_later(delay, fire)
-
-    async def _expire_restores(self):
-        await self._drop_expired_restores()
-        self._schedule_restore_expiry()
-
-    # ── legacy one-step restore ───────────────────────────────────────
-
-    async def restore_database(self, request):
-        """Restore the prompts database from an uploaded SQLite file.
-
-        The upload is streamed to a temp file in the library's folder. Free
-        disk space decides how large it may be (``maintenance.restore_room``),
-        under a 64 GiB ceiling (``restore_max_bytes``): a request whose
-        Content-Length does not fit is refused before anything is written,
-        and one without is refused as soon as its running size does not. The
-        file is checked, staged, repaired and verified, then published over
-        the live database, which is backed up first. The whole request holds
-        the registry as ``restore`` (``exclusive``): it is refused while any
-        job runs, and every job and request lease is refused while it runs.
-        """
-        return await self._run_held(
-            RESTORE_JOB_KIND,
-            LEGACY_RESTORE_TITLE,
-            "exclusive",
-            lambda: self._restore_database(request),
-        )
-
-    async def _restore_database(self, request):
-        uploads = []
-        try:
-            temp_path, refused = await self._receive_restore_upload(request, uploads)
-            if refused is not None:
-                return refused
-            reason = await self._upload_problem(temp_path)
-            if reason is not None:
-                return web.json_response(
-                    {"success": False, "error": reason}, status=400
-                )
-            if not await self._jobs.drain_leases():
-                return web.json_response(
-                    {"success": False, "error": REQUESTS_BUSY}, status=409
-                )
-            model = self.db.model
-            staged = await self._run_in_executor(model.stage_restore, temp_path)
-            try:
-                backup_path = await self._publish(model, staged)
-            finally:
-                await self._run_in_executor(staged.discard)
-            # The library is replaced: from here on the restore succeeded.
-            await self._after_publish(model.db_path)
-            try:
-                prompt_count = await self._run_in_executor(
-                    lambda: self.db.model.get_database_info().get("total_prompts", 0)
-                )
-            except Exception:
-                self.logger.exception("Could not count the restored prompts")
-                prompt_count = staged.summary.get("prompts", 0)
-            message = f"Database restored successfully. Found {prompt_count} prompts."
-            body = {
-                "success": True,
-                "message": message,
-                "prompt_count": prompt_count,
-                "backup_created": (
-                    self._public_path(backup_path) if backup_path else None
-                ),
-            }
-            repaired = documents_line(staged.documents)
-            if repaired:
-                body["message"] = f"{message} {repaired}"
-                body["workflow_documents"] = dict(staged.documents)
-            return web.json_response(body)
-        except Exception as e:
-            self.logger.error(f"Restore error: {e}", exc_info=True)
-            return web.json_response(
-                {
-                    "success": False,
-                    "error": f"Failed to restore database: {self._public_error(e)}",
-                },
-                status=500,
-            )
-        finally:
-            await self._remove_uploads(uploads)
-
-    # ── reviewed restore ──────────────────────────────────────────────
-
-    def _live_fingerprint(self, db):
-        return restore_stage.live_fingerprint(db.model.get_connection())
-
-    async def preview_restore(self, request):
-        """Stage an upload for review; nothing live is written (see module)."""
-        await self._drop_expired_restores()
-        if self._restore_plans.full():
-            return _too_many_reviews()
-        uploads = []
-        try:
-            db = self.db
-            identity = self._database_identity(db)
-            temp_path, refused = await self._receive_restore_upload(request, uploads)
-            if refused is not None:
-                return refused
-            return await self._review_upload(db, identity, temp_path, uploads)
-        except Exception:
-            self.logger.exception("Restore preview failed")
-            return _failure("Failed to review the restore", 500)
-        finally:
-            await self._remove_uploads(uploads)
-
-    async def _stage_for_review(self, db, temp_path, uploads):
-        """Stage ``temp_path`` in the executor; a cancel discards the result.
-
-        A cancelled handler (shutdown, a dropped client) cannot stop the
-        worker thread: the stage it finishes is removed when it is done, and
-        so is the upload it reads (``_orphan_stage_cleanup``).
-        """
-        loop = asyncio.get_running_loop()
-        future = loop.run_in_executor(None, db.model.stage_restore, temp_path)
-        try:
-            return await asyncio.shield(future)
-        except asyncio.CancelledError:
-            orphans = getattr(self, "_orphan_stages", None)
-            if orphans is None:
-                orphans = self._orphan_stages = set()
-            entry = (future, tuple(uploads))
-            orphans.add(entry)
-            uploads.clear()  # still being read: removed with the stage
-            future.add_done_callback(
-                lambda _f: loop.create_task(self._orphan_stage_cleanup())
-            )
-            raise
-
-    async def _orphan_stage_cleanup(self):
-        """Remove what cancelled previews staged, once their workers are done."""
-        for entry in list(getattr(self, "_orphan_stages", ()) or ()):
-            future, uploads = entry
-            if not future.done():
-                continue
-            self._orphan_stages.discard(entry)
-            if not future.cancelled() and future.exception() is None:
-                await self._discard_held([_Orphan(future.result())])
-            await self._remove_uploads(uploads)
-
-    async def _review_upload(self, db, identity, temp_path, uploads=None):
-        """Check, stage and compare an upload; the preview response.
-
-        Only the read of the live library takes a lease (#335 review M2):
-        the upload and the staging never touch it, and a lease held for a
-        long staging would make a restore's drain fail. A stage that is not
-        handed to the store (a refusal, an error, a cancel) is removed.
-        """
-        uploads = [] if uploads is None else uploads  # the caller removes them
-        reason = await self._upload_problem(temp_path)
-        if reason is not None:
-            return _failure(reason, 400, "invalid-backup")
-        staged = None
-        issued = False
-        try:
-            try:
-                staged = await self._stage_for_review(db, temp_path, uploads)
-            except ValueError as invalid:
-                return _failure(str(invalid), 400, "invalid-backup")
-            try:
-                async with self._jobs.lease("Restore preview"):
-                    live, fingerprint = await self._run_in_executor(
-                        self._live_fingerprint, db
-                    )
-            except JobBusy as busy:
-                return busy_response(busy)
-            store = self._restore_plans
-            if identity != self._database_identity(self.db):
-                return _failure(
-                    "The database was replaced while the restore was reviewed. "
-                    "Review again.",
-                    409,
-                    "storage-changed",
-                )
-            if store.full():
-                return _too_many_reviews()
-            token = store.issue(staged, fingerprint, identity, live)
-            issued = True
-            self._schedule_restore_expiry()
-        finally:
-            if staged is not None and not issued:
-                await self._discard_held([_Orphan(staged)])
-        held = store.entry(token)
-        name = os.path.basename(db.model.db_path)
-        return web.json_response(
-            {
-                "success": True,
-                "token": token,
-                "expires_at": _iso(held.expires_at),
-                "summary": dict(staged.summary),
-                "schema": dict(staged.schema),
-                "integrity": "ok",
-                "documents": dict(staged.documents),
-                "live": dict(live),
-                "size": staged.size,
-                "safety_backup": {
-                    "destination_label": f"{name}.backup_<date and time>"
-                },
-            },
-            headers={"Cache-Control": "no-store"},
-        )
-
-    async def discard_restore_preview(self, request):
-        token = request.match_info.get("token", "")
-        if not 0 < len(token) <= MAX_TOKEN_LENGTH:
-            return _failure("Unknown restore review.", 410, "plan-expired")
-        held = self._restore_plans.pop(token)
-        if held is None:
-            await self._drop_expired_restores()
-            return _failure("Unknown restore review.", 410, "plan-expired")
-        await self._discard_held([held])
-        return web.json_response({"success": True})
-
-    def _peek_restore(self, token):
-        try:
-            return self._restore_plans.peek(token), None
-        except PlanUsed as used:
-            job = self._jobs.get(used.job_id)
-            return None, _failure(
-                "This restore was already started.",
-                409,
-                "plan-used",
-                job={"id": used.job_id, "title": job.title if job else None},
-            )
-        except PlanExpired:
-            return None, _failure(
-                "This review expired. Review the restore again.",
-                410,
-                "plan-expired",
-            )
-
-    async def apply_restore(self, request):
-        data, error = await self._read_json_body(request, max_bytes=APPLY_BODY_MAX)
-        if error is not None:
-            if error.status == 413:
-                return _failure("Request body too large", 413, "too-large")
-            return _failure(
-                "Request body must be a JSON object", 400, "invalid-request"
-            )
-        token = data.get("token")
-        if set(data) != {"token"} or not isinstance(token, str):
-            return _failure("token must be the review's token", 400, "invalid-request")
-        if not 0 < len(token) <= MAX_TOKEN_LENGTH:
-            return _failure("token must be the review's token", 400, "invalid-request")
-        await self._drop_expired_restores()
-        held, refused = self._peek_restore(token)
-        if refused is not None:
-            await self._drop_expired_restores()  # one peek found expired
-            return refused
-        db = self.db
-        if held.db_identity != self._database_identity(db):
-            await self._discard_popped(token)
-            return _failure(
-                "The database was replaced since the review. Review again.",
-                409,
-                "storage-changed",
-            )
-        try:
-            async with self._jobs.lease("Restore review check"):
-                _live, fingerprint = await self._run_in_executor(
-                    self._live_fingerprint, db
-                )
-        except JobBusy as busy:
-            return busy_response(busy)
-        if fingerprint != held.fingerprint:
-            # It can never match again: free the stage for a new review.
-            await self._discard_popped(token)
-            return _failure(PLAN_CHANGED, 409, "plan-changed")
-        # The token may have been used, expired or discarded meanwhile.
-        held, refused = self._peek_restore(token)
-        if refused is not None:
-            await self._drop_expired_restores()
-            return refused
-        if db is not self.db:
-            return _failure(
-                "The database was replaced since the review. Review again.",
-                409,
-                "storage-changed",
-            )
-        try:
-            job = self._jobs.start(
-                RESTORE_JOB_KIND,
-                RESTORE_JOB_TITLE,
-                # It replaces the whole database: it runs alone, beside no
-                # job of any class, like Move library.
-                admission="exclusive",
-                cancellable=False,
-                scope={},
-                groups=RESTORE_GROUPS,
-                runner=lambda job: self._run_restore(job, db, held, token),
-            )
-        except JobBusy as busy:
-            return busy_response(busy)  # the token stays usable
-        # Same loop turn as the peek and the start: the runner has not run.
-        self._restore_plans.take(token, job.id)
-        return web.json_response({"success": True, "job": job.summary()}, status=202)
-
-    async def _run_restore(self, job, db, held, token=None):
-        from .maintenance import _fail_job
-
-        staged = held.staged
-        keep_stage = False
-        try:
-            job.update(status_line="Waiting for other requests to finish")
-            if not await self._jobs.drain_leases():
-                # Nothing ran: the reviewed stage stays usable (#335 M2),
-                # unless it expired meanwhile or its slot was reused.
-                if token is not None and self._restore_plans.give_back(token, held):
-                    keep_stage = True
-                    self._schedule_restore_expiry()
-                    job.scope["review_kept"] = True
-                    return _fail_job(job, "busy", REVIEW_KEPT)
-                return _fail_job(job, "busy", REQUESTS_BUSY)
-            job.update(status_line="Checking the library")
-            _live, fingerprint = await self._run_in_executor(self._live_fingerprint, db)
-            if db is not self.db or fingerprint != held.fingerprint:
-                return _fail_job(job, "plan-changed", PLAN_CHANGED)
-            job.update(status_line="Restoring the database")
-            job.log_line("Restoring the reviewed backup")
-            model = db.model
-            try:
-                backup_path = await self._publish(model, staged)
-            except restore_stage.StageChanged:
-                return _fail_job(job, "plan-changed", PLAN_CHANGED)
-            except SafetyBackupFailed:
-                return _fail_job(
-                    job,
-                    "backup-failed",
-                    "The current library could not be backed up; nothing was "
-                    "changed.",
-                )
-            except sqlite3.OperationalError as error:
-                kept = (
-                    " The safety backup was kept."
-                    if getattr(error, "_prompt_manager_restore_backup_created", False)
-                    else ""
-                )
-                self.logger.error(f"Restore failed: {error}")
-                return _fail_job(job, "restore-failed", NOT_RESTORED + kept)
-        except Exception:
-            self.logger.exception("Restore job failed")
-            return _fail_job(job, None, NOT_RESTORED)
-        finally:
-            if not keep_stage:
-                await self._discard_held([_Orphan(staged)])
-        # The copy replaced the library: the restore is done (#335 review I1).
-        # Every later step only logs a failure.
-        await self._after_publish(model.db_path)
-        if backup_path:
-            job.log_line(f"Safety backup {os.path.basename(backup_path)}")
-        else:
-            job.log_line("No safety backup: there was no library to keep")
-        repaired = documents_line(staged.documents)
-        if repaired:
-            job.log_line(repaired)
-        line = restored_line(staged.summary)
-        job.log_line(line)
-        job.update(progress=100, status_line=line)
-
-
-class _Orphan:
-    """A stage with no store entry, in the shape ``_discard_held`` takes."""
-
-    def __init__(self, staged):
-        self.staged = staged
-
-
-def _too_many_reviews():
-    return _failure(
-        "Two restores are already being reviewed. Discard one first.",
-        429,
-        "too-large",
-    )

py/api/gallery_listing.py

@@ -1,337 +0,0 @@
-"""One shared listing per output root, and the pure helpers behind it (#348).
-
-The API keeps one ``RootListing`` per output root (``_root_listings`` in
-``py/api/__init__.py``). The record is read and written only on the event
-loop; the walk itself, the comparison with the previous listing and both
-folder sets run in the executor through ``walk_root``. Routes live in
-``py/api/images.py`` (``_listing``); this module has no aiohttp import so
-tests can exercise it without a server.
-
-A settled output the image monitor reports is added to its root's stored
-listing without a walk (``output_settled``, ``insert_entry``), in the place
-a walk would list it. When that cannot be exact, the root is marked dirty
-(``mark_root_dirty``) instead; a dirty root gets one background walk, no
-sooner than ``rewalk_interval`` after its previous walk started (PR 2).
-"""
-
-from __future__ import annotations
-
-import asyncio
-import os
-from bisect import bisect_left
-from dataclasses import dataclass, field
-from pathlib import PurePath
-from typing import Callable, NamedTuple
-
-# A listing older than this (seconds) is served as it is, and one background
-# walk replaces it. Read as ``gallery_listing.REFRESH_AFTER`` so tests can
-# patch it.
-REFRESH_AFTER = 30
-
-# The stale read is served at once; its refresh walk starts this many seconds
-# later, so the walk does not share the GIL with the page's own requests
-# (#348 live test: reads during the walk took 2.2 s instead of 0.07 s).
-REFRESH_DELAY = 1.0
-
-# No background walk of a root starts sooner than rewalk_interval(last walk's
-# duration) after its previous walk started: FACTOR times that duration, at
-# least FLOOR and at most CAP seconds. Walks up to CAP / FACTOR (3 s) then
-# hold the GIL at most ~20% of the time; the cap keeps a new output listed
-# within ~20 s, at the cost of a higher share (back to back from 15 s) on
-# slower walks. Read through this module so tests can patch them.
-REWALK_FLOOR = 5
-REWALK_FACTOR = 5
-REWALK_CAP = 15
-
-# A deferred walk is never armed sooner than this: no zero-delay loop.
-MIN_REWALK_DELAY = 0.5
-
-# A reader with no listing gives up (500) after this many walks in a row were
-# discarded by invalidations made while they ran.
-MAX_DISCARDED_WALKS = 3
-
-WALK_STOPPED = "The listing walk was stopped"
-
-STORED = "stored"
-DISCARDED = "discarded"
-FAILED = "failed"
-
-
-class WalkOutcome(NamedTuple):
-    """What one walk ended with; a walk's flight future resolves to this."""
-
-    kind: str
-    error: BaseException | None = None
-
-    @classmethod
-    def stored(cls) -> "WalkOutcome":
-        return cls(STORED)
-
-    @classmethod
-    def discarded(cls) -> "WalkOutcome":
-        return cls(DISCARDED)
-
-    @classmethod
-    def failed(cls, error: BaseException) -> "WalkOutcome":
-        return cls(FAILED, error)
-
-
-@dataclass
-class RootListing:
-    """The shared listing of one output root.
-
-    A record is never deleted: ``drop()`` clears the listing and bumps
-    ``generation``, so a walk that started before a drop can never be stored
-    after it.
-    """
-
-    # (path, mtime) newest first, as _scan_gallery_files_sync returns it.
-    files: list | None = None
-    folders: frozenset | None = None
-    folders_with_ancestors: frozenset | None = None
-    # Monotonic time the last walk finished, stored or failed.
-    walked_at: float | None = None
-    # Number of the last walk started; a running walk is always that one.
-    walk_seq: int = 0
-    # Number of the walk whose files are stored (Rescan waits on it).
-    stored_seq: int = 0
-    generation: int = 0
-    # The running walk's future (resolves to a WalkOutcome), or None.
-    flight: asyncio.Future | None = None
-    # True while walks keep failing: one warning per streak.
-    failing: bool = False
-    # The one deferred background walk not started yet (loop.call_later), or
-    # None: a stale refresh or a dirty root's rewalk, whichever is due first.
-    rewalk_handle: asyncio.TimerHandle | None = None
-    # normcase(realpath(root)), computed by the walk in the executor: monitor
-    # paths are matched against it without file I/O on the loop.
-    resolved_root: str | None = None
-    # Monotonic start and duration of the last walk (rewalk_interval).
-    last_started_at: float | None = None
-    last_duration: float | None = None
-    # A settled output was reported under this root; cleared when a walk starts.
-    dirty: bool = False
-    # Dropped because the output roots changed: no background walk until a
-    # reader (or the warm-up) asks for this root again. The monitor keeps
-    # watching a removed root until ComfyUI restarts.
-    retired: bool = False
-    # Relative paths of settled outputs waiting to be added to ``files``
-    # without a walk, and the one task adding them (``output_settled``).
-    pending_adds: list = field(default_factory=list)
-    add_task: asyncio.Task | None = None
-    # Settled outputs added to the stored listing since the last walk stored.
-    patched: int = 0
-
-    def drop(self) -> None:
-        self.files = None
-        self.folders = None
-        self.folders_with_ancestors = None
-        self.walked_at = None
-        self.pending_adds = []
-        self.patched = 0
-        self.generation += 1
-
-
-def folder_sets(root, files) -> tuple[frozenset, frozenset]:
-    """``(folders, folders_with_ancestors)`` of the files listed under *root*.
-
-    Folders keep the spelling ``/gallery/subfolders`` has always answered:
-    ``str(relative.parent)`` (native separators) for the folders holding
-    files, plus every ancestor joined by ``/``.
-    """
-    # From the path strings: relative_to per file was half of a large walk.
-    sep, prefix = _root_prefix(root)
-    folders = set()
-    for path, _mtime in files:
-        rel_dir = _folder_of(root, path, sep, prefix)
-        if rel_dir:
-            folders.add(rel_dir)
-    with_ancestors = set(folders)
-    for folder in folders:
-        with_ancestors.update(_ancestors(folder))
-    return frozenset(folders), frozenset(with_ancestors)
-
-
-def add_folder(root, path, folders, with_ancestors) -> tuple[frozenset, frozenset]:
-    """Both folder sets once *path* is listed too (the same sets when it adds none)."""
-    sep, prefix = _root_prefix(root)
-    rel_dir = _folder_of(root, path, sep, prefix)
-    if not rel_dir or rel_dir in folders:
-        return folders, with_ancestors
-    return folders | {rel_dir}, with_ancestors | {rel_dir, *_ancestors(rel_dir)}
-
-
-def _root_prefix(root) -> tuple[str, str]:
-    # The separator is the path flavour's own (tests use PureWindowsPath).
-    sep = str(type(root)("a", "b"))[1]
-    prefix = str(root)
-    if not prefix.endswith(sep):
-        prefix += sep
-    return sep, prefix
-
-
-def _folder_of(root, path, sep, prefix) -> str:
-    """The folder ``/gallery/subfolders`` names for *path*; "" for the root."""
-    text = str(path)
-    if text.startswith(prefix):
-        rel_dir = text[len(prefix) :].rpartition(sep)[0]
-    else:
-        rel_dir = str(path.relative_to(root).parent)
-    return "" if rel_dir == "." else rel_dir
-
-
-def _ancestors(folder: str) -> list[str]:
-    parts = folder.replace("\\", "/").split("/")
-    return ["/".join(parts[:i]) for i in range(1, len(parts))]
-
-
-def relative_part(resolved_root: str, path, pathmod=os.path) -> str | None:
-    """The part of the resolved *path* below *resolved_root*, as a walk spells it.
-
-    Kept in *path*'s own case (``realpath`` gives a file's on-disk case on
-    Windows) with the native separator. None when *path* is not below the
-    root, or when the case folding changed the length so the slice would
-    not be exact.
-    """
-    sep = pathmod.sep
-    text = str(path)
-    if sep == "\\":
-        text = _plain(text.replace("/", sep), pathmod)
-    folded = pathmod.normcase(text)
-    prefix = _plain(resolved_root, pathmod)
-    if not prefix.endswith(sep):
-        prefix += sep
-    if len(folded) != len(text) or not folded.startswith(prefix):
-        return None
-    relative = text[len(prefix) :]
-    if any(part in ("", ".", "..") for part in relative.split(sep)):
-        return None
-    return relative
-
-
-def insert_entry(files: list, entry: tuple, max_files: int) -> list | None:
-    """A new listing with *entry* ``(path, mtime)`` where a walk would list it.
-
-    *files* is newest first; an entry for the same path is replaced. Returns
-    *files* itself when it already holds *entry*, and None when the place is
-    not exact: another file has the same mtime (a walk orders those by its
-    own visit order), or the listing is at the walk's *max_files* cap.
-    Blocking (one pass over *files*): run it in the executor.
-    """
-    path, mtime = entry
-    text = str(path)
-    kept = files
-    for index, (listed, listed_mtime) in enumerate(files):
-        if str(listed) == text:
-            if listed_mtime == mtime:
-                return files
-            kept = files[:index] + files[index + 1 :]
-            break
-    else:
-        if len(files) >= max_files:
-            return None
-    index = bisect_left(kept, -mtime, key=lambda item: -item[1])
-    if index < len(kept) and kept[index][1] == mtime:
-        return None
-    return [*kept[:index], entry, *kept[index:]]
-
-
-# A listing that differs from the cached one by more entries than this is
-# rebuilt in full by the workspace caches (listing_delta).
-MAX_DELTA = 256
-
-
-def listing_delta(old: list, new: list, limit: int = MAX_DELTA):
-    """``(added, removed)`` entries from *old* to *new*, or None past *limit*.
-
-    A listing patched by ``insert_entry`` shares every unchanged entry object
-    with the one it came from, so entries are told apart by identity: a walk
-    builds new tuples, shares none and is rebuilt in full. *old* must still
-    be alive (the
-    caller's cache holds it), so no identity was reused.
-    """
-    if abs(len(new) - len(old)) > limit:
-        return None
-    old_ids = set(map(id, old))
-    added = []
-    for entry in new:
-        if id(entry) not in old_ids:
-            added.append(entry)
-            if len(added) > limit:
-                return None
-    if new and len(added) == len(new):
-        return None  # nothing shared: a walk
-    if len(old) + len(added) == len(new):
-        return added, []
-    new_ids = set(map(id, new))
-    return added, [entry for entry in old if id(entry) not in new_ids]
-
-
-def rewalk_interval(last_duration) -> float:
-    """Seconds from a walk's start to the next background walk of its root."""
-    scaled = REWALK_FACTOR * (last_duration or 0.0)
-    return min(REWALK_CAP, max(REWALK_FLOOR, scaled))
-
-
-def root_contains(resolved_root: str, path, pathmod=os.path) -> bool:
-    """True when the resolved *path* lies under *resolved_root* (no file I/O).
-
-    *resolved_root* is already ``normcase``d; *path* is folded the same way,
-    so Windows matches case-insensitively and with either separator. The
-    match ends at a separator: ``/out2/x.png`` is not under ``/out``.
-    """
-    target = _plain(pathmod.normcase(str(path)), pathmod)
-    prefix = _plain(resolved_root, pathmod)
-    if not prefix.endswith(pathmod.sep):
-        prefix += pathmod.sep
-    return target.startswith(prefix)
-
-
-def _plain(path: str, pathmod) -> str:
-    """*path* (normcased or not) without a Windows extended-length prefix.
-
-    ``realpath`` may keep ``\\\\?\\`` on a file past MAX_PATH while its shorter
-    root resolves without it.
-    """
-    if pathmod.sep != "\\":
-        return path
-    if path[:8].lower() == "\\\\?\\unc\\":
-        return "\\\\" + path[8:]
-    if path.startswith("\\\\?\\"):
-        return path[4:]
-    return path
-
-
-def resolve_root(root) -> str:
-    """``normcase(realpath(root))``, the spelling monitor paths are matched in.
-
-    File I/O (realpath follows links): call it in the executor.
-    """
-    return os.path.normcase(os.path.realpath(str(root)))
-
-
-def same_listing(old, new) -> bool:
-    """True when two listings hold the same ``(path, mtime)`` pairs in order."""
-    if old is None or new is None:
-        return False
-    return old is new or old == new
-
-
-def walk_root(
-    scan_fn: Callable[[PurePath], list], root, previous_files
-) -> tuple[list, frozenset, frozenset, str]:
-    """The single executor job of a walk.
-
-    Returns ``(files, folders, with_ancestors, resolved_root)``.
-
-    Opens the root first, so a missing or unreadable root raises ``OSError``
-    instead of listing nothing. Returns *previous_files* itself when nothing
-    changed, which keeps the identity-keyed caches built on it warm.
-    """
-    with os.scandir(root):
-        pass
-    files = scan_fn(root)
-    if same_listing(previous_files, files):
-        files = previous_files
-    folders, with_ancestors = folder_sets(root, files)
-    return files, folders, with_ancestors, resolve_root(root)

py/api/history.py

@@ -20,7 +20,6 @@ from .history_current import (
     _OpenedCurrentMedia,
     _current_media_response,
     _prepare_current_media,
-    accepts_jxl,
     _reauthorize_current_target,
     candidate_locator,
     resolve_current_candidate,
@@ -143,18 +142,6 @@ def _query(request: web.Request) -> None:
         raise ValueError("Duplicate history query parameter")
 
 
-def _jxl_flag(request: web.Request) -> bool:
-    """The cover's ``jxl`` flag (#317): ``1`` when the workspace decoded a
-    JPEG XL image (a browser may not list ``image/jxl`` in Accept), ``0`` or
-    absent otherwise; anything else is a bad request."""
-    value = request.query.get("jxl")
-    if value is None:
-        return False
-    if value not in ("0", "1"):
-        raise ValueError("Invalid jxl flag")
-    return value == "1"
-
-
 def _page_limit(request: web.Request) -> int:
     limit = _decimal(request.query.get("limit", "40"), minimum=1)
     if limit > 100:
@@ -807,7 +794,6 @@ class HistoryRoutesMixin:
             media_options = {
                 "ensure_preview": lambda *preview: needed.append(preview),
                 "placeholder": self._video_placeholder_bytes(),
-                "accepts_jxl": _jxl_flag(request) or accepts_jxl(request),
             }
         prepared = await execute()
         if needed:

py/api/history_current.py

@@ -15,9 +15,7 @@ from typing import BinaryIO
 
 from aiohttp import web
 
-from . import thumbnail_settings
 from .images import _canonical, _public_path, SERVABLE_EXTENSIONS, VIDEO_EXTENSIONS
-from .images import existing_media_thumbnail, media_thumbnail_rel
 
 try:
     from ...utils.execution_outputs import (
@@ -241,19 +239,14 @@ def resolve_current_candidate(
 
 
 def _open_current_target(
-    target: Path, namespace: Path, scope: CurrentOutputScope, preview: bool = False
+    target: Path, namespace: Path, scope: CurrentOutputScope
 ) -> BinaryIO:
-    """Open only the canonical target and verify authority against the actual handle.
-
-    A *preview* (a file under ``thumbnails/``) may also be JPEG XL (#317)."""
+    """Open only the canonical target and verify authority against the actual handle."""
     if _canonical(target) != target:
         raise CurrentLocationUnavailable("not_authorized", stale=True)
     if not _authorized(target, namespace, scope):
         raise CurrentLocationUnavailable("not_authorized")
-    suffix = target.suffix.lower()
-    if suffix not in SERVABLE_EXTENSIONS and not (
-        preview and suffix in thumbnail_settings.THUMBNAIL_EXTENSIONS
-    ):
+    if target.suffix.lower() not in SERVABLE_EXTENSIONS:
         raise CurrentLocationUnavailable("unsupported_media")
     flags = (
         os.O_RDONLY
@@ -326,61 +319,6 @@ def _preview_writable(root: Path, preview: Path) -> bool:
     ).is_relative_to(_canonical(folder))
 
 
-def _is_jxl(path) -> bool:
-    return Path(path).suffix.lower() == ".jxl"
-
-
-def _preview_without_jxl(root: Path, relative: Path) -> Path | None:
-    """The first existing preview *relative* owns that is not JPEG XL."""
-    return next(
-        (
-            path
-            for path in thumbnail_settings.owned_thumbnails(root, relative)
-            if not _is_jxl(path)
-        ),
-        None,
-    )
-
-
-def accepts_jxl(request) -> bool:
-    """Whether the request's ``Accept`` lists ``image/jxl``."""
-    accept = request.headers.get("Accept", "")
-    return any(
-        part.split(";", 1)[0].strip().lower() == "image/jxl"
-        for part in accept.split(",")
-    )
-
-
-def _placeholder_media(placeholder: bytes) -> "_OpenedCurrentMedia":
-    return _OpenedCurrentMedia(io.BytesIO(placeholder), len(placeholder), "image/jpeg")
-
-
-def _cover_target(resolved, ensure_preview, placeholder, accepts_jxl):
-    """What the cover opens: a preview path, the placeholder media, or None
-    for the original (see ``_prepare_current_media``)."""
-    target = resolved.canonical_target
-    relative = target.relative_to(resolved.gallery_root)
-    is_video = target.suffix.lower() in VIDEO_EXTENSIONS
-    # #317: any preview the file owns (the current format first); a missing
-    # one is made under the current format's name.
-    preview = existing_media_thumbnail(resolved.gallery_root, relative)
-    if preview is not None and not accepts_jxl and _is_jxl(preview):
-        preview = _preview_without_jxl(resolved.gallery_root, relative)
-        if preview is None:
-            if is_video and placeholder is not None:
-                return _placeholder_media(placeholder)
-            return None
-        return _canonical(preview)
-    if preview is not None:
-        return _canonical(preview)
-    preview = resolved.gallery_root / media_thumbnail_rel(relative)
-    if ensure_preview is not None and _preview_writable(resolved.gallery_root, preview):
-        ensure_preview(target, preview, is_video)
-    if is_video and placeholder is not None:
-        return _placeholder_media(placeholder)
-    return None
-
-
 def _prepare_current_media(
     resolved: ResolvedCurrentCandidate,
     scope: CurrentOutputScope,
@@ -388,7 +326,6 @@ def _prepare_current_media(
     thumbnail: bool,
     ensure_preview=None,
     placeholder: bytes | None = None,
-    accepts_jxl: bool = True,
 ) -> _OpenedCurrentMedia:
     """Open the current file, or its preview for ``thumbnail``.
 
@@ -396,28 +333,36 @@ def _prepare_current_media(
     ``ensure_preview(src, dst, is_video)`` (the route makes it and reads
     again, #249). Without one an image's original is opened and a video is
     the ``placeholder`` JPEG, never the video inside an ``<img>``.
-
-    The cover's URL names no format, so a JPEG XL preview goes only to a
-    browser whose ``Accept`` lists ``image/jxl`` (*accepts_jxl*, review M3).
-    Another one gets the file's preview in another format when there is one,
-    else the original image or a video's placeholder: never a broken image.
     """
     target = resolved.canonical_target
-    is_preview = False
     if thumbnail:
-        chosen = _cover_target(resolved, ensure_preview, placeholder, accepts_jxl)
-        if isinstance(chosen, _OpenedCurrentMedia):
-            return chosen
-        if chosen is not None:
-            target, is_preview = chosen, True
-    handle = _open_current_target(target, resolved.namespace, scope, is_preview)
+        relative = target.relative_to(resolved.gallery_root)
+        is_video = target.suffix.lower() in VIDEO_EXTENSIONS
+        extension = ".jpg" if is_video else target.suffix.lower()
+        preview = (
+            resolved.gallery_root
+            / "thumbnails"
+            / f"{relative.with_suffix('').as_posix()}_thumb{extension}"
+        )
+        try:
+            preview.stat()
+        except FileNotFoundError:
+            if ensure_preview is not None and _preview_writable(
+                resolved.gallery_root, preview
+            ):
+                ensure_preview(target, preview, is_video)
+            if is_video and placeholder is not None:
+                return _OpenedCurrentMedia(
+                    io.BytesIO(placeholder), len(placeholder), "image/jpeg"
+                )
+        else:
+            target = _canonical(preview)
+    handle = _open_current_target(target, resolved.namespace, scope)
     try:
         return _OpenedCurrentMedia(
             handle,
             os.fstat(handle.fileno()).st_size,
-            thumbnail_settings.content_type(target)
-            or mimetypes.guess_type(target.name)[0]
-            or "application/octet-stream",
+            mimetypes.guess_type(target.name)[0] or "application/octet-stream",
         )
     except BaseException:
         handle.close()

py/api/jobs.py

@@ -28,15 +28,6 @@ ones. One job of a kind runs at a time, and each job has an admission class
 A short legacy-page operation takes a ``hold``: a running, non-cancellable
 job that lasts as long as the request, so the Activity page lists it and a
 workspace job is refused while it runs (and the other way round).
-
-Short request-scoped work that reads or writes the library beside any
-ordinary job (a Needs review decision, a maintenance or restore preview)
-takes a ``lease`` instead: it is not listed (so quick requests never push
-real jobs out of the finished history, and two of them never refuse each
-other), but it is refused while an ``exclusive`` job runs, and an
-``exclusive`` job that replaces the database (a restore) awaits
-``drain_leases`` before it switches the file, so no lease's connection is
-open across the switch (#249 S8).
 """
 
 import asyncio
@@ -57,9 +48,6 @@ MAX_OUTCOME_ROWS = 200  # rows listed per outcome group; counters stay exact
 MAX_LOG_LINES = 2000
 LOG_CAP_LINE = "[Log capped at 2,000 lines]"
 MAX_FINISHED_JOBS = 20  # finished jobs this session keeps
-# The longest an exclusive job waits for running leases to end (a ceiling a
-# hung request reaches, not a pacing timer: leases end with their request).
-LEASE_DRAIN_SECONDS = 60
 
 # The metadata scan's outcome groups, in counter-tile order of the spec's
 # mapping, and the per-file scan status each group collects. Files without
@@ -415,74 +403,6 @@ class JobRegistry:
     def __init__(self, logger_=None):
         self._logger = logger_ or logger
         self._jobs = {}
-        self._leases = {}  # title -> running count
-        self._drain_waiters = []
-
-    # ── leases ────────────────────────────────────────────────────────
-
-    def lease(self, title):
-        """An async context manager for short request-scoped library work.
-
-        Entering raises JobBusy, naming the job, while an ``exclusive`` job
-        runs; otherwise the lease is counted until the block exits. Leases
-        are never listed and never refuse one another or any job.
-        """
-        return _Lease(self, title)
-
-    def lease_blocker(self):
-        """The running ``exclusive`` job a new lease is refused for, or None."""
-        for job in self.running():
-            if job.admission == "exclusive":
-                return job
-        return None
-
-    @property
-    def leases(self):
-        """Running leases by title (a copy)."""
-        return dict(self._leases)
-
-    def _take_lease(self, title):
-        blocker = self.lease_blocker()
-        if blocker is not None:
-            raise JobBusy(blocker)
-        self._leases[title] = self._leases.get(title, 0) + 1
-
-    def _release_lease(self, title):
-        count = self._leases.get(title, 0) - 1
-        if count > 0:
-            self._leases[title] = count
-        else:
-            self._leases.pop(title, None)
-        if not self._leases:
-            waiters, self._drain_waiters = self._drain_waiters, []
-            for waiter in waiters:
-                if not waiter.done():
-                    waiter.set_result(True)
-
-    async def drain_leases(self, timeout=None):
-        """Wait until no lease runs; False when ``timeout`` ended the wait.
-
-        For an ``exclusive`` job about to switch the database: once it runs
-        no new lease is admitted, so the count only goes down.
-        """
-        if not self._leases:
-            return True
-        waiter = asyncio.get_running_loop().create_future()
-        self._drain_waiters.append(waiter)
-        try:
-            await asyncio.wait_for(
-                asyncio.shield(waiter),
-                LEASE_DRAIN_SECONDS if timeout is None else timeout,
-            )
-            return True
-        except asyncio.TimeoutError:
-            self._logger.warning(
-                "Still running after the wait: " + ", ".join(sorted(self._leases))
-            )
-            return False
-        finally:
-            if waiter in self._drain_waiters:
-                self._drain_waiters.remove(waiter)
 
     def start(
         self,
@@ -645,23 +565,3 @@ class _Hold:
         if self._job.running:
             self._job.finish("finished" if exc_type is None else "failed")
         return False
-
-
-class _Lease:
-    """The async context manager ``JobRegistry.lease`` returns."""
-
-    def __init__(self, registry, title):
-        self._registry = registry
-        self._title = title
-        self._held = False
-
-    async def __aenter__(self):
-        self._registry._take_lease(self._title)
-        self._held = True
-        return self
-
-    async def __aexit__(self, exc_type, exc, tb):
-        if self._held:
-            self._held = False
-            self._registry._release_lease(self._title)
-        return False

py/api/library.py

@@ -234,22 +234,9 @@ class LibraryRoutesMixin:
         )
 
     def _library_media(
-        self,
-        records: list[dict],
-        roots: list[Path],
-        *,
-        linked: bool = True,
-        outputs: int | None = None,
+        self, records: list[dict], roots: list[Path], *, linked: bool = True
     ) -> list[dict]:
-        """Workspace descriptors for a prompt's linked media under ``roots``.
-
-        Roots from index ``outputs`` on are linked-only (LoRA media, #355):
-        their media keeps its rooted identity, but gets no preview file (the
-        card loads the original; a video shows its label), no favorite star
-        and is marked ``linked_only`` (no Tag action).
-        """
         page = []
-        linked_only = set()
         for record in records:
             try:
                 raw_path = Path(record["image_path"])
@@ -263,25 +250,10 @@ class LibraryRoutesMixin:
                     canonical_root = _canonical(root)
                     if path.is_relative_to(canonical_root):
                         page.append((path, 0, canonical_root, index))
-                        if outputs is not None and index >= outputs:
-                            relative = path.relative_to(canonical_root).as_posix()
-                            linked_only.add((index, relative))
                         break
             except (OSError, ValueError, RuntimeError):
                 continue
-        images = self._format_workspace_page(page, linked=linked)
-        for image in images:
-            if (image["root_index"], image["path"]) in linked_only:
-                image["thumbnail_url"] = None
-                image["thumbnail_ready"] = False
-                image["linked_only"] = True
-                image.pop("favorite", None)
-        return images
-
-    def _library_roots(self) -> tuple[list[Path], int]:
-        """``(roots, number of output roots)`` for a prompt's linked media."""
-        outputs = list(self._get_all_output_dirs())
-        return self._media_roots(outputs), len(outputs)
+        return self._format_workspace_page(page, linked=linked)
 
     @pair_response
     async def get_library_options(self, request: web.Request) -> web.Response:
@@ -322,13 +294,13 @@ class LibraryRoutesMixin:
             return result, records
 
         result, records = await self._run_in_executor(read)
+        roots = list(self._get_all_output_dirs())
 
         def previews() -> None:
-            roots, outputs = self._library_roots()
             for parent in result["items"]:
                 # Previews belong to their parent; a per-parent link read is N+1.
                 parent["previews"] = self._library_media(
-                    records[parent["id"]], roots, linked=False, outputs=outputs
+                    records[parent["id"]], roots, linked=False
                 )
 
         await self._run_in_executor(previews)
@@ -370,9 +342,9 @@ class LibraryRoutesMixin:
         result, records = await self._run_in_executor(read)
         if result is None:
             return _missing()
-        roots, outputs = await self._run_in_executor(self._library_roots)
+        roots = list(self._get_all_output_dirs())
         result["positive"]["previews"] = await self._run_in_executor(
-            lambda: self._library_media(records, roots, outputs=outputs)
+            self._library_media, records, roots
         )
         return web.json_response({"success": True, **result})
 
@@ -386,7 +358,7 @@ class LibraryRoutesMixin:
         archive = _archive_scope(request)
         limit = _page_limit(request)
         cursor = request.query.get("cursor")
-        roots, outputs = await self._run_in_executor(self._library_roots)
+        roots = list(self._get_all_output_dirs())
         canonical_roots = [str(_canonical(root)) for root in roots]
 
         def read() -> dict | None:
@@ -419,7 +391,7 @@ class LibraryRoutesMixin:
         if result is None:
             return _missing()
         result["images"] = await self._run_in_executor(
-            lambda: self._library_media(result["images"], roots, outputs=outputs)
+            self._library_media, result["images"], roots
         )
         return web.json_response({"success": True, **result})
 

py/api/lora_import_routes.py

@@ -1,513 +0,0 @@
-"""The staged LoRA reference import as a reviewed Activity job (#221, S10).
-
-``POST /prompt_manager/lora/import/preview`` (body ``{}``) reviews an import:
-it lists the LoraManager metadata files and parses them, and counts the
-current imports, those a saved pair uses and the example images an import
-would download. It writes nothing and requests nothing. It answers a
-``Plan`` (the maintenance plan's shape, ``py/api/maintenance.py``) plus
-``{lora_files, with_metadata, skipped, with_local_media, current_imports,
-blocked_by_pairs, planned_downloads, network:{planned_downloads, api_key},
-layout}`` (#355: ``layout`` says which LoraManager settings file, storage mode
-and library the import read, and ``error`` when they cannot be used). A plan
-that saved pairs block, or whose layout is unusable, carries no token
-(nothing can be applied).
-
-``POST /prompt_manager/lora/import/apply {token}`` starts the job (202
-``{job}``): kind ``lora_import``, titled "LoRA reference import", admission
-``records``, cancellable while it downloads only. Refused before it starts:
-``plan-changed`` (409: the metadata files changed since the review),
-``plan-expired``, ``plan-used``, ``storage-changed``, ``busy``,
-``insufficient-space`` (as maintenance). The job stages the records
-(downloads into the cache first, each counted in ``downloaded`` or
-``download_errors``), takes the safety backup the policy promises, then
-replaces the collection in one transaction bound to the reviewed imports. Any
-failure leaves the previous imports exactly as they were, and the job says so.
-
-The legacy ``POST /lora/scan`` runs the same stages (``stage_lora_import``
-and ``replace_lora_imports``) under its SSE event shape.
-"""
-
-import asyncio
-import os
-import sqlite3
-
-from aiohttp import web
-
-from .. import lora_import, lora_utils
-from .inspection_service import SERVABLE_EXTENSIONS
-from .job_routes import busy_response
-from .jobs import LORA_IMPORT_JOB_KIND, JobBusy
-from .maintenance import (
-    MAX_TOKEN_LENGTH,
-    _failure,
-    _fail_job,
-    _invalid,
-    _iso,
-    disk_plan,
-    short_space_message,
-)
-from .maintenance_plans import ScopeTooLarge
-
-try:
-    from ...database.category_import import EmptyReplacement
-    from ...database.maintenance import PlanChanged
-    from ...database.pairs import PairDependencyError
-except ImportError:  # pragma: no cover - flat test imports
-    from database.category_import import EmptyReplacement
-    from database.maintenance import PlanChanged
-    from database.pairs import PairDependencyError
-
-LORA_OPERATION = "lora_import"
-# The review reads the library: a request lease, so it is refused while a
-# restore runs and a restore waits for it before switching the file (S8).
-LORA_PREVIEW_LEASE = "LoRA import review"
-CATEGORY = lora_import.LORA_CATEGORY
-SOURCE_CHANGED = (
-    "The LoRA metadata files changed since the review; nothing was changed. "
-    "Review the import again."
-)
-IMPORTS_CHANGED = (
-    "The imported LoRA prompts changed since the review; the previous imports "
-    "were kept. Review the import again."
-)
-BLOCKED = (
-    "Saved pairs use some imported LoRA prompts, so the collection cannot be "
-    "replaced; the previous imports were kept."
-)
-INTEGRATION_CHANGED = (
-    "The LoraManager integration changed since the review; nothing was changed. "
-    "Review the import again."
-)
-EMPTY = "No LoRA could be prepared for import; the previous imports were kept."
-FAILED = "The import failed; the previous LoRA imports were kept."
-CACHE_NOTE = "Images already downloaded stay in the image cache."
-CANCELLED = "Cancelled before anything was written; the previous imports were kept."
-DISABLED = "LoraManager integration is not enabled"
-NO_PATH = "LoraManager path not configured"
-
-
-def _noun(count, word, plural=None):
-    return word if count == 1 else (plural or word + "s")
-
-
-def _count(count, word, plural=None):
-    return f"{count:,} {_noun(count, word, plural)}"
-
-
-def _import_line(result, skipped):
-    parts = [f"Imported {_count(result['imported'], 'LoRA')}"]
-    if result["linked"] or result["duplicates"]:
-        linked = result["linked"] + result["duplicates"]
-        parts.append(f"{linked:,} linked to an existing prompt")
-    if skipped:
-        parts.append(f"{skipped:,} skipped")
-    return " · ".join(parts)
-
-
-def _all_downloads_failed(errors):
-    """The warning when every planned download failed (#337)."""
-    if errors == 1:
-        return "Warning: the example image could not be downloaded"
-    return f"Warning: none of the {errors:,} example images could be downloaded"
-
-
-def _with_downloads(line, downloaded, errors):
-    """``line`` with the failed downloads: counted when some failed, led by
-    a warning when every planned download failed (#337). The job still
-    finishes: the import itself succeeded and the downloads are best effort."""
-    if not errors:
-        return line
-    if not downloaded:
-        return f"{_all_downloads_failed(errors)} · {line}"
-    failed = f"{_count(errors, 'example image')} could not be downloaded"
-    return f"{line} · {failed}"
-
-
-class LoraImportRoutesMixin:
-    """Mixin providing the reviewed LoRA import (preview, apply, job)."""
-
-    def _register_lora_import_routes(self, routes):
-        @routes.post("/prompt_manager/lora/import/preview")
-        async def lora_import_preview_route(request):
-            return await self.preview_lora_import(request)
-
-        @routes.post("/prompt_manager/lora/import/apply")
-        async def lora_import_apply_route(request):
-            return await self.apply_lora_import(request)
-
-    # ── shared stages ─────────────────────────────────────────────────
-
-    async def _lora_source(self):
-        """``(path, None)``: the configured, allowed LoraManager path, or
-        ``(None, (code, message))`` when the import cannot run."""
-        from ..config import IntegrationConfig
-
-        if not IntegrationConfig.LORA_MANAGER_ENABLED:
-            return None, ("lora-disabled", DISABLED)
-        lm_path = IntegrationConfig.LORA_MANAGER_PATH
-        if not lm_path:
-            return None, ("lora-path", NO_PATH)
-        allowed = await self._run_in_executor(
-            lora_utils.resolve_lora_manager_path, lm_path
-        )
-        if allowed is None:
-            from .lora_integration import _LORA_PATH_ERROR
-
-            return None, ("lora-path", _LORA_PATH_ERROR)
-        return allowed, None
-
-    async def stage_lora_import(self, discovery, *, on_record=None, cancelled=None):
-        """Stage ``discovery``'s sidecars off the loop: records, skips and
-        download counts."""
-        from ..config import IntegrationConfig
-
-        cache_dir = await self._run_in_executor(lora_utils.get_lora_image_cache_dir)
-        await self._run_in_executor(lora_utils.sweep_stale_downloads, cache_dir)
-        loop = asyncio.get_running_loop()
-
-        def report(index, record, staged):
-            if on_record is not None:
-                loop.call_soon_threadsafe(on_record, index, record, staged)
-
-        return await self._run_in_executor(
-            lambda: lora_import.stage(
-                discovery,
-                cache_dir,
-                IntegrationConfig.CIVITAI_API_KEY,
-                media_extensions=SERVABLE_EXTENSIONS,
-                on_record=report,
-                cancelled=cancelled or (lambda: False),
-                logger=self.logger,
-            )
-        )
-
-    async def lora_files_unchanged(self, lm_path, expected):
-        """Whether LoraManager's sidecars for ``lm_path`` still fingerprint as
-        ``expected`` (found again, so an added file counts too)."""
-
-        def current():
-            return lora_import.fingerprint(lora_import.discover(lm_path))
-
-        try:
-            return await self._run_in_executor(current) == expected
-        except OSError:
-            return False
-
-    async def replace_lora_imports(self, db, staged, *, expected_ids, allow_empty):
-        """Swap the collection for ``staged.records`` in one transaction."""
-        return await self._run_in_executor(
-            lambda: db.replace_category_prompts(
-                CATEGORY,
-                staged.records,
-                expected_ids=expected_ids,
-                allow_empty=allow_empty,
-            )
-        )
-
-    # ── preview ───────────────────────────────────────────────────────
-
-    async def preview_lora_import(self, request):
-        try:
-            async with self._jobs.lease(LORA_PREVIEW_LEASE):
-                return await self._preview_lora_import(request)
-        except JobBusy as busy:
-            return busy_response(busy)
-
-    async def _preview_lora_import(self, request):
-        data, error = await self._read_maintenance_body(request, ())
-        if error is not None:
-            return error
-        lm_path, refused = await self._lora_source()
-        if refused is not None:
-            return _failure(refused[1], 400, refused[0])
-        db = self.db
-        identity = self._database_identity(db)
-        try:
-            cache_dir = await self._run_in_executor(
-                lambda: lora_utils.get_lora_image_cache_dir(create=False)
-            )
-            found = await self._run_in_executor(
-                lora_import.preview, lm_path, cache_dir, SERVABLE_EXTENSIONS
-            )
-            state = await self._run_in_executor(db.category_import_state, CATEGORY)
-        except OSError as error:
-            # A folder discovery cannot list refuses the import (it must not
-            # replace the collection with part of it): say which one.
-            self.logger.warning(
-                f"LoRA import review: a folder could not be listed: {error}"
-            )
-            return _failure(
-                f"A LoRA folder could not be listed ({self._public_error(error)}). "
-                "Nothing was changed.",
-                500,
-                "folder-unreadable",
-            )
-        except Exception:
-            self.logger.exception("LoRA import preview failed")
-            return _failure("The LoRA import could not be reviewed.", 500)
-        if identity != self._database_identity(self.db):
-            return _failure(
-                "The database was replaced while it was reviewed. Review again.",
-                409,
-                "storage-changed",
-            )
-        return await self._lora_plan_response(db, identity, lm_path, found, state)
-
-    async def _lora_plan_response(self, db, identity, lm_path, found, state):
-        from ..config import IntegrationConfig
-
-        current = len(state["ids"])
-        blocked = state["paired"]
-        policy = self._safety_backup_policy()
-        try:
-            disk, _short, size = await self._run_in_executor(
-                disk_plan, db.model.db_path, backup=policy != "off", vacuum=False
-            )
-        except (OSError, sqlite3.Error):
-            self.logger.exception("Could not measure the disk space for a plan")
-            return _failure("The LoRA import could not be reviewed.", 500)
-        token = None
-        expires_at = None
-        layout = found["layout"]
-        # An unusable LoraManager layout found nothing it may replace with.
-        if not blocked and layout["error"] is None:
-            payload = {
-                "path": lm_path,
-                "fingerprint": found["fingerprint"],
-                "expected_ids": state["ids"],
-                "empty": found["with_metadata"] == 0,
-                "backup": policy,
-            }
-            try:
-                token = self._maintenance_plans.issue(
-                    LORA_OPERATION, found["fingerprint"], payload, identity
-                )
-            except ScopeTooLarge:
-                return _failure(
-                    "This import is too large to review at once.", 413, "too-large"
-                )
-            expires_at = _iso(self._maintenance_plans.peek(token).expires_at)
-        name = os.path.basename(db.model.db_path)
-        downloads = found["planned_downloads"]
-        reasons = (
-            [f"{_count(blocked, 'imported prompt')} used by saved pairs"]
-            if blocked
-            else []
-        )
-        return web.json_response(
-            {
-                "success": True,
-                "operation": LORA_OPERATION,
-                "token": token,
-                "expires_at": expires_at,
-                "lora_files": found["lora_files"],
-                "with_metadata": found["with_metadata"],
-                "skipped": found["skipped"],
-                "with_local_media": found["with_local_media"],
-                "layout": layout,
-                "current_imports": current,
-                "blocked_by_pairs": blocked,
-                "planned_downloads": downloads,
-                "scope": {
-                    "count": found["with_metadata"],
-                    "label": (
-                        f"Replace {_count(current, 'imported prompt')} with "
-                        f"{_count(found['with_metadata'], 'LoRA')}"
-                    ),
-                },
-                "protected": {"count": blocked, "reasons": reasons},
-                "backup": {
-                    "policy": policy,
-                    "destination_label": f"{name}.backup_<date and time>",
-                    "expected_bytes": size if policy != "off" else None,
-                },
-                "media": {
-                    "deletes_files": False,
-                    "label": "No files are removed; image links are replaced",
-                },
-                "network": {
-                    "planned_downloads": downloads,
-                    "api_key": bool(IntegrationConfig.CIVITAI_API_KEY),
-                },
-                "details": [{"label": n, "detail": ""} for n in found["names"]],
-                "disk": disk,
-            },
-            headers={"Cache-Control": "no-store"},
-        )
-
-    # ── apply ─────────────────────────────────────────────────────────
-
-    async def apply_lora_import(self, request):
-        data, error = await self._read_maintenance_body(request, ("token",))
-        if error is not None:
-            return error
-        token = data.get("token")
-        if not isinstance(token, str) or not 0 < len(token) <= MAX_TOKEN_LENGTH:
-            return _invalid("token must be the plan's token")
-        plan, refused = self._peek_plan(token)
-        if refused is not None:
-            return refused
-        if plan.operation != LORA_OPERATION:
-            return _failure(
-                "This review expired. Review the plan again.", 410, "plan-expired"
-            )
-        store = self._maintenance_plans
-        db = self.db
-        if plan.db_identity != self._database_identity(db):
-            store.discard(token)
-            return _failure(
-                "The database was replaced since the review. Review again.",
-                409,
-                "storage-changed",
-            )
-        lm_path = plan.payload["path"]
-        # M5: the integration must still be on and at the reviewed install.
-        current, _refused = await self._lora_source()
-        if current != lm_path:
-            store.discard(token)
-            return _failure(INTEGRATION_CHANGED, 409, "plan-changed")
-        try:
-            discovery = await self._run_in_executor(lora_import.discover, lm_path)
-            now = await self._run_in_executor(lora_import.fingerprint, discovery)
-            backup = self._backup_promised(plan)
-            _disk, short, _size = await self._run_in_executor(
-                disk_plan, db.model.db_path, backup=backup, vacuum=False
-            )
-        except Exception:
-            self.logger.exception("LoRA import could not start")
-            return _failure(
-                "The import could not start. Nothing was changed.", 500, "apply-failed"
-            )
-        if now != plan.fingerprint:
-            store.discard(token)
-            return _failure(SOURCE_CHANGED, 409, "plan-changed")
-        if short is not None:
-            return _failure(short_space_message(short), 507, "insufficient-space")
-        plan, refused = self._peek_plan(token)
-        if refused is not None:
-            return refused
-        try:
-            job = self._jobs.start(
-                LORA_IMPORT_JOB_KIND,
-                lora_import.JOB_TITLE,
-                admission="records",
-                cancellable=True,
-                scope={
-                    "operation": LORA_OPERATION,
-                    "lora_files": len(discovery.sidecars),
-                },
-                groups=lora_import.GROUPS,
-                runner=lambda job: self._run_lora_import(
-                    job, db, plan, discovery, backup
-                ),
-            )
-        except JobBusy as busy:
-            return busy_response(busy)
-        store.consume(token, LORA_OPERATION, job_id=job.id)
-        return web.json_response({"success": True, "job": job.summary()}, status=202)
-
-    # ── the job ───────────────────────────────────────────────────────
-
-    async def _run_lora_import(self, job, db, plan, discovery, backup_on):
-        total = len(discovery.sidecars)
-        job.update(total=total, status_line="Preparing LoRA records")
-        job.log_line(f"Found {_count(total, 'LoRA metadata file')}")
-
-        def on_record(index, record, staged):
-            job.update(
-                processed=index + 1,
-                progress=int(90 * (index + 1) / max(total, 1)),
-                status_line=f"Prepared {index + 1:,} of {total:,}",
-            )
-            job.publish({"type": "progress", "progress": job.progress})
-
-        try:
-            staged = await self.stage_lora_import(
-                discovery, on_record=on_record, cancelled=lambda: job.cancelled
-            )
-        except lora_import.ImportCancelled:
-            job.log_line(f"{CANCELLED} {CACHE_NOTE}")
-            job.update(status_line=CANCELLED)
-            job.finish("cancelled")
-            return
-        except Exception:
-            self.logger.exception("LoRA import staging failed")
-            return _fail_job(job, "import-failed", f"{FAILED} {CACHE_NOTE}")
-        self._count_downloads(job, staged)
-        # M4: what staging skipped stays on the job whatever happens next.
-        job.record_counted(
-            "skipped",
-            len(staged.skipped),
-            [{"path": "", "detail": name} for name in staged.skipped],
-        )
-        # Past this point nothing stops halfway: the replace is one transaction.
-        # Published, so a view that offered Cancel during the downloads drops it.
-        job.cancellable = False
-        job.publish({"type": "progress", "progress": job.progress})
-        if job.cancelled:
-            job.log_line(f"{CANCELLED} {CACHE_NOTE}")
-            job.update(status_line=CANCELLED)
-            job.finish("cancelled")
-            return
-        ok, _backup = await self._safety_backup_step(job, db, backup_on)
-        if not ok:
-            return
-        # I1: the files are listed and fingerprinted again right before the
-        # replace, so a file changed, removed or added while the downloads ran
-        # (LoraManager refreshing its CivitAI info) aborts with nothing deleted.
-        if not await self.lora_files_unchanged(plan.payload["path"], plan.fingerprint):
-            return _fail_job(job, "plan-changed", f"{SOURCE_CHANGED} {CACHE_NOTE}")
-        job.update(status_line="Replacing the LoRA collection", progress=95)
-        await self._replace_in_job(job, db, plan, staged)
-
-    def _count_downloads(self, job, staged):
-        downloaded = staged.stats.get("downloaded", 0)
-        errors = staged.stats.get("download_errors", 0)
-        job.record_counted("downloaded", downloaded)
-        rows = []
-        if errors and not downloaded:
-            warning = _all_downloads_failed(errors)
-            rows = [{"path": "", "detail": f"{warning}; the log has the details"}]
-            job.log_line(warning)
-        job.record_counted("download_errors", errors, rows)
-        if downloaded or errors:
-            job.log_line(
-                f"Downloaded {_count(downloaded, 'example image')}"
-                + (f"; {errors:,} could not be downloaded" if errors else "")
-            )
-
-    async def _replace_in_job(self, job, db, plan, staged):
-        try:
-            result = await self.replace_lora_imports(
-                db,
-                staged,
-                expected_ids=plan.payload["expected_ids"],
-                allow_empty=plan.payload["empty"],
-            )
-        except PlanChanged:
-            return _fail_job(job, "plan-changed", f"{IMPORTS_CHANGED} {CACHE_NOTE}")
-        except PairDependencyError:
-            return _fail_job(job, "blocked-by-pairs", f"{BLOCKED} {CACHE_NOTE}")
-        except EmptyReplacement:
-            return _fail_job(job, "nothing-to-import", f"{EMPTY} {CACHE_NOTE}")
-        except Exception:
-            self.logger.exception("LoRA import failed")
-            return _fail_job(job, "import-failed", f"{FAILED} {CACHE_NOTE}")
-        rows = {"imported": [], "linked": []}
-        for row in result["rows"]:
-            group = "imported" if row["outcome"] == "imported" else "linked"
-            rows[group].append({"path": "", "detail": row["name"]})
-        job.record_counted("imported", result["imported"], rows["imported"])
-        job.record_counted(
-            "linked", result["linked"] + result["duplicates"], rows["linked"]
-        )
-        line = _import_line(result, len(staged.skipped))
-        if result["removed"]:
-            job.log_line(f"Replaced {_count(result['removed'], 'previous import')}")
-        job.log_line(line)
-        line = _with_downloads(
-            line,
-            staged.stats.get("downloaded", 0),
-            staged.stats.get("download_errors", 0),
-        )
-        job.update(progress=100, processed=job.total, status_line=line)

py/api/lora_integration.py

@@ -1,9 +1,7 @@
 """LoraManager integration API routes for PromptManager."""
 
-import asyncio
-import contextlib
 import json
-import threading
+from pathlib import Path
 
 from aiohttp import web
 
@@ -39,30 +37,6 @@ def _lora_settings_mutation(values):
     return mutate
 
 
-# The admin page's own words for the refusals it can meet (it has no review).
-_FILES_CHANGED = (
-    "The LoRA metadata files changed during the scan; the previous imports "
-    "were kept. Run the scan again."
-)
-_IMPORTS_CHANGED = (
-    "The imported LoRA prompts changed during the scan; the previous imports "
-    "were kept. Run the scan again."
-)
-
-
-class LoraSettingsUnusable(Exception):
-    """LoraManager's settings cannot be used; nothing was imported (#355)."""
-
-    def __init__(self, reason):
-        super().__init__(
-            f"LoraManager settings: not usable: {reason}. Nothing was changed."
-        )
-
-
-class LoraFilesChanged(Exception):
-    """A metadata file changed, appeared or went while the legacy scan staged."""
-
-
 def _lora_error_frame(message):
     """An import stream's error event, as the admin page's modal reads it.
 
@@ -72,23 +46,6 @@ def _lora_error_frame(message):
     return {"type": "error", "status": message, "progress": 0, "message": message}
 
 
-def _closed(request):
-    """A check (safe off the loop) for whether ``request``'s client left."""
-
-    def closed():
-        transport = request.transport
-        return transport is None or transport.is_closing()
-
-    return closed
-
-
-def _stopped(error) -> bool:
-    """Whether a legacy scan ended because its page closed the connection."""
-    from .. import lora_import
-
-    return isinstance(error, (ConnectionError, lora_import.ImportCancelled))
-
-
 class LoraIntegrationMixin:
     """Mixin providing LoraManager detection, scanning, and trigger word endpoints."""
 
@@ -151,11 +108,7 @@ class LoraIntegrationMixin:
         """Get current LoraManager integration status."""
         try:
             from ..config import IntegrationConfig
-            from ..lora_utils import (
-                detect_lora_manager,
-                get_trigger_cache,
-                resolve_lora_manager_path,
-            )
+            from ..lora_utils import detect_lora_manager, get_trigger_cache
 
             config = IntegrationConfig.get_config()["lora_manager"]
             cache = get_trigger_cache()
@@ -164,12 +117,6 @@ class LoraIntegrationMixin:
             detected_path = await self._run_in_executor(
                 detect_lora_manager, config.get("path", "")
             )
-            # A detected install reached through a link outside custom_nodes is
-            # found but cannot be enabled (S10 review N5): say which.
-            usable = bool(detected_path) and (
-                await self._run_in_executor(resolve_lora_manager_path, detected_path)
-                is not None
-            )
 
             return web.json_response(
                 {
@@ -179,7 +126,6 @@ class LoraIntegrationMixin:
                     "trigger_words_enabled": config["trigger_words_enabled"],
                     "has_civitai_api_key": bool(config.get("civitai_api_key")),
                     "detected": detected_path is not None,
-                    "detected_usable": usable,
                     "detected_path": (
                         self._public_path(detected_path) if detected_path else ""
                     ),
@@ -222,9 +168,6 @@ class LoraIntegrationMixin:
     async def lora_enable(self, request):
         """Enable or disable LoraManager integration and save it to config.json.
 
-        ``expected_revision`` (optional, GET /settings' ``revision``) refuses
-        a save over a config.json changed meanwhile (``settings-changed``).
-
         The values are committed through the config store first (#220) and
         published at runtime only once config.json holds them; a save that
         cannot be written reports ``persisted: false`` and changes nothing.
@@ -237,11 +180,6 @@ class LoraIntegrationMixin:
             for flag in _LORA_FLAGS:
                 if flag in data and not isinstance(data[flag], bool):
                     return self._bad_lora_request(f"{flag} must be true or false")
-            # The System Save row sends the revision it read (#220); the
-            # legacy page sends none and merges into what is on disk.
-            expected_revision = data.get("expected_revision")
-            if expected_revision is not None and not isinstance(expected_revision, str):
-                return self._bad_lora_request("expected_revision must be a string")
             enabled = data.get("enabled", False)
             path = data.get("path", "")
             trigger_words = data.get("trigger_words_enabled", False)
@@ -288,7 +226,7 @@ class LoraIntegrationMixin:
                 _saved, revision = await self._run_in_executor(
                     get_config_store().commit,
                     _lora_settings_mutation(values),
-                    expected_revision=expected_revision,
+                    expected_revision=None,
                     publish=publish,
                 )
             except (ConfigUnreadable, RevisionConflict, OSError) as exc:
@@ -370,75 +308,43 @@ class LoraIntegrationMixin:
             ) as job:
                 await response.prepare(request)
                 try:
-                    await self._lora_scan_stream(
-                        allowed, send_progress, disconnected=_closed(request)
-                    )
-                except asyncio.CancelledError:
-                    # The server cancelled the handler when the page left.
-                    job.finish("cancelled")
-                    raise
+                    await self._lora_scan_stream(allowed, send_progress)
                 except Exception as e:
-                    # A page that left stopped the scan; nothing failed (R2).
-                    job.finish("cancelled" if _stopped(e) else "failed")
-                    await self._send_scan_failure(e, send_progress)
-                with contextlib.suppress(ConnectionError, RuntimeError):
-                    await response.write_eof()
+                    self.logger.exception("LoRA scan failed")
+                    job.finish("failed")
+                    await send_progress(_lora_error_frame(self._public_error(e)))
+
+                await response.write_eof()
             return response
 
         except Exception as e:
             self.logger.error(f"LoRA scan failed: {e}")
             return self._error_response(e)
 
-    async def _send_scan_failure(self, error, send_progress):
-        """The error frame for a failed legacy scan; quiet when the page left.
-
-        Expected refusals (files or imports changed, saved pairs, nothing to
-        import) are warnings in the admin page's own words; anything else is
-        logged with its traceback.
-        """
-        from .lora_import_routes import (
-            EmptyReplacement,
-            PairDependencyError,
-            PlanChanged,
+    async def _lora_scan_stream(self, lm_path, send_progress):
+        """Import every LoRA under ``lm_path``, reporting through ``send_progress``."""
+        from ..config import IntegrationConfig
+        from ..lora_utils import (
+            download_civitai_images,
+            find_lora_directories,
+            get_example_prompt_from_metadata,
+            get_lora_image_cache_dir,
+            get_preview_images_from_metadata,
+            get_trigger_words_from_metadata,
+            get_model_name_from_metadata,
+            read_lora_metadata,
         )
 
-        if _stopped(error):
-            self.logger.info("LoRA scan stopped: the page closed its connection")
-            return
-        if isinstance(error, PlanChanged):
-            message = _IMPORTS_CHANGED
-        elif isinstance(error, (LoraFilesChanged, LoraSettingsUnusable)):
-            message = str(error)
-        else:
-            message = self._public_error(error)
-        if isinstance(
-            error,
-            (
-                PlanChanged,
-                LoraFilesChanged,
-                LoraSettingsUnusable,
-                EmptyReplacement,
-                PairDependencyError,
-            ),
-        ):
-            self.logger.warning(f"LoRA scan refused: {message}")
-        else:
-            self.logger.exception("LoRA scan failed")
-        with contextlib.suppress(ConnectionError, RuntimeError):
-            await send_progress(_lora_error_frame(message))
+        await send_progress(
+            {
+                "type": "progress",
+                "status": "Clearing previous lora-manager imports...",
+                "progress": 0,
+            }
+        )
 
-    async def _lora_scan_stream(
-        self, lm_path, send_progress, disconnected=lambda: False
-    ):
-        """Import every LoRA under ``lm_path``, reporting through ``send_progress``.
-
-        The staged path of the System import (#221, ``lora_import_routes``):
-        discover, stage every record (downloads into the cache first), then
-        replace the collection in one transaction. A failure at any stage
-        raises with the previous imports untouched; an empty replacement of a
-        non-empty collection is refused (it needs the reviewed import).
-        """
-        from .. import lora_import
+        # Clear previous imports so reimport is always clean
+        await self._run_in_executor(self.db.delete_prompts_by_category, "lora-manager")
 
         await send_progress(
             {
@@ -447,11 +353,19 @@ class LoraIntegrationMixin:
                 "progress": 2,
             }
         )
-        discovery = await self._run_in_executor(lora_import.discover, lm_path)
-        if discovery.layout.error is not None:
-            raise LoraSettingsUnusable(discovery.layout.error)
-        sidecars = discovery.sidecars
-        total = len(sidecars)
+
+        lora_dirs = await self._run_in_executor(find_lora_directories, lm_path)
+
+        # Collect all metadata files
+        meta_files = []
+        for d in lora_dirs:
+            dir_path = Path(d)
+            meta_files.extend(dir_path.rglob("*.metadata.json"))
+
+        total = len(meta_files)
+        imported = 0
+        skipped = 0
+
         await send_progress(
             {
                 "type": "progress",
@@ -461,105 +375,116 @@ class LoraIntegrationMixin:
             }
         )
 
-        reviewed = await self._run_in_executor(lora_import.fingerprint, discovery)
-        events = asyncio.Queue()
-        state = await self._run_in_executor(
-            self.db.category_import_state, lora_import.LORA_CATEGORY
-        )
-        # Records whose prompt already exists outside the collection are
-        # linked, not imported (the running counts; the end ones are exact).
-        known = set()
+        cache_dir = get_lora_image_cache_dir()
 
-        def on_record(index, record, _staged):
-            events.put_nowait((index, record))
+        for i, meta_file in enumerate(meta_files):
+            metadata = await self._run_in_executor(read_lora_metadata, meta_file)
+            if not metadata:
+                skipped += 1
+                continue
 
-        counts = {"imported": 0}
+            model_name = get_model_name_from_metadata(metadata)
+            trigger_words = get_trigger_words_from_metadata(metadata)
+
+            # Collect all images: local previews + downloaded civitai examples
+            preview_paths = await self._run_in_executor(
+                get_preview_images_from_metadata, metadata, meta_file
+            )
+            civitai_paths = await self._run_in_executor(
+                download_civitai_images,
+                metadata,
+                meta_file,
+                cache_dir,
+                IntegrationConfig.CIVITAI_API_KEY,
+            )
+
+            # Merge, local first, dedup
+            seen = set(preview_paths)
+            all_images = list(preview_paths)
+            for cp in civitai_paths:
+                if cp not in seen:
+                    all_images.append(cp)
+                    seen.add(cp)
+
+            # Build prompt text: prefer example prompt, then model name
+            example_prompt = get_example_prompt_from_metadata(metadata)
+            prompt_text = example_prompt or model_name
+
+            # Build tags
+            tags = ["lora-manager", f"lora:{model_name}"]
+            tags.extend(trigger_words)
+
+            # Save to database via existing mechanism
+            try:
+                import hashlib
+
+                prompt_hash = hashlib.sha256(
+                    prompt_text.strip().lower().encode("utf-8")
+                ).hexdigest()
 
-        async def report(index, record):
-            if record is not None and record["hash"] not in known:
-                known.add(record["hash"])
                 existing = await self._run_in_executor(
-                    self.db.existing_prompt_hashes,
-                    [record["hash"]],
-                    lora_import.LORA_CATEGORY,
+                    self.db.get_prompt_by_hash, prompt_hash
                 )
-                if not existing:
-                    counts["imported"] += 1
-            status = record["name"] if record else sidecars[index].metadata_path.name
-            if record and record["images"]:
-                status += f" ({len(record['images'])} images)"
+
+                if existing:
+                    # Link all images
+                    for pp in all_images:
+                        await self._run_in_executor(
+                            self.db.link_image_to_prompt,
+                            existing["id"],
+                            pp,
+                        )
+                    skipped += 1
+                else:
+                    prompt_id = await self._run_in_executor(
+                        self.db.save_prompt,
+                        prompt_text,
+                        "lora-manager",  # category
+                        tags,
+                        None,  # rating
+                        None,  # notes
+                        prompt_hash,
+                    )
+
+                    if prompt_id:
+                        for pp in all_images:
+                            await self._run_in_executor(
+                                self.db.link_image_to_prompt,
+                                prompt_id,
+                                pp,
+                            )
+                        imported += 1
+                    else:
+                        skipped += 1
+
+            except Exception as e:
+                self.logger.warning(f"Failed to import LoRA {model_name}: {e}")
+                skipped += 1
+
+            # Progress update for every LoRA
+            progress = int(5 + (90 * (i + 1) / max(total, 1)))
+            img_count = len(all_images)
+            status = f"{model_name}"
+            if img_count:
+                status += f" ({img_count} images)"
             await send_progress(
                 {
                     "type": "progress",
                     "status": status,
-                    "progress": int(5 + (90 * (index + 1) / max(total, 1))),
-                    "processed": index + 1,
-                    "imported": counts["imported"],
-                    "skipped": index + 1 - counts["imported"],
+                    "progress": progress,
+                    "processed": i + 1,
+                    "imported": imported,
+                    "skipped": skipped,
                 }
             )
 
-        # Each record's event is queued (through the loop) before staging
-        # ends, so reporting until staging is done and then draining the
-        # queue reports every record in order. I2: when the page goes away
-        # (its connection closes, or a report cannot be sent) staging stops
-        # before its next LoRA, and this returns only once it has stopped, so
-        # the caller's records hold covers every download.
-        stop = threading.Event()
-        staging = asyncio.ensure_future(
-            self.stage_lora_import(
-                discovery,
-                on_record=on_record,
-                cancelled=lambda: stop.is_set() or disconnected(),
-            )
-        )
-        try:
-            while not staging.done():
-                getter = asyncio.ensure_future(events.get())
-                await asyncio.wait(
-                    {getter, staging}, return_when=asyncio.FIRST_COMPLETED
-                )
-                if getter.done():
-                    await report(*getter.result())
-                else:
-                    getter.cancel()
-            while not events.empty():
-                await report(*events.get_nowait())
-        finally:
-            stop.set()
-            # Staging must have stopped before the records hold is released,
-            # even when the handler is cancelled again while it waits (R3).
-            interrupted = False
-            while not staging.done():
-                try:
-                    await asyncio.shield(staging)
-                except asyncio.CancelledError:
-                    interrupted = True
-                except Exception:
-                    pass
-            if interrupted:
-                raise asyncio.CancelledError
-        staged = await staging
-        if not await self.lora_files_unchanged(lm_path, reviewed):
-            raise LoraFilesChanged(_FILES_CHANGED)
-
-        await send_progress(
-            {
-                "type": "progress",
-                "status": "Replacing previous lora-manager imports...",
-                "progress": 96,
-            }
-        )
-        result = await self.replace_lora_imports(
-            self.db, staged, expected_ids=state["ids"], allow_empty=False
-        )
         await send_progress(
             {
                 "type": "complete",
                 "progress": 100,
                 "total": total,
-                "imported": result["imported"],
-                "skipped": total - result["imported"],
+                "imported": imported,
+                "skipped": skipped,
             }
         )
 

py/api/maintenance.py

@@ -37,8 +37,7 @@ runner runs); a refused start keeps it. The runner:
 
 The job log names the backup by its file name only, and the job says "No
 safety backup" when none was taken. Apply errors: ``invalid-request`` (400),
-``apply-failed`` (500: nothing started), ``plan-expired`` (410: unknown,
-expired or forgotten after a restart),
+``plan-expired`` (410: unknown, expired or forgotten after a restart),
 ``plan-used`` (409, with the job that applied it), ``storage-changed`` (409:
 a restore replaced the database since the review) and ``busy`` (409).
 """
@@ -48,6 +47,8 @@ import json
 import os
 import shutil
 import sqlite3
+import tempfile
+from contextlib import closing
 
 from aiohttp import web
 
@@ -57,28 +58,15 @@ from .jobs import MAINTENANCE_JOB_KIND, JobBusy
 from .maintenance_plans import PlanExpired, PlanUsed, ScopeTooLarge
 
 try:
-    from ...database import safety_backup as _backups
-    from ...database.safety_backup import (  # noqa: F401 - re-exported
-        SAFETY_TEMP_PREFIX,
-        SafetyBackupFailed,
-        sweep_safety_temps,
-    )
     from ...database.workflow_storage import PRE_MIGRATION_LABEL, pre_migration_backups
     from ...database.health import readonly_uri
     from ...database.maintenance import MAINTENANCE_OPERATIONS, PlanChanged
 except ImportError:
-    from database import safety_backup as _backups
-    from database.safety_backup import (  # noqa: F401 - re-exported
-        SAFETY_TEMP_PREFIX,
-        SafetyBackupFailed,
-        sweep_safety_temps,
-    )
     from database.workflow_storage import PRE_MIGRATION_LABEL, pre_migration_backups
     from database.health import readonly_uri
     from database.maintenance import MAINTENANCE_OPERATIONS, PlanChanged
 
 PREVIEW_BODY_MAX = 4096
-MAINTENANCE_PREVIEW_LEASE = "Maintenance preview"
 # Duplicate-file previews carry the reviewed keepers (py/api/duplicate_files.py).
 DUPLICATE_PREVIEW_BODY_MAX = 1024 * 1024
 DUPLICATE_FILES = "duplicate_files"
@@ -107,6 +95,18 @@ PLAN_CHANGED = (
 APPLY_FAILED = "Maintenance failed; nothing was changed."
 NOTHING_TO_DO = "Every image record already stores its workflow once; nothing to do."
 NO_BACKUP = "No safety backup"
+_NAME_ATTEMPTS = 1000
+
+
+class SafetyBackupFailed(Exception):
+    """The safety backup could not be written, verified or put in place.
+
+    ``reason`` is the verify reason when the copy did not verify.
+    """
+
+    def __init__(self, message, reason=None):
+        super().__init__(message)
+        self.reason = reason
 
 
 def backup_failed_message(error):
@@ -117,6 +117,10 @@ def backup_failed_message(error):
     return BACKUP_FAILED
 
 
+def _now():
+    return datetime.datetime.now()
+
+
 def _free_bytes(path):
     return shutil.disk_usage(path).free
 
@@ -239,18 +243,29 @@ def size_label(size):
 
 
 def restore_room(db_path):
-    """The largest restore upload the disk has room for (blocking).
+    """The largest restore upload the disks have room for (blocking).
 
-    Everything a restore writes is in the library's folder (#318): the
-    upload, its staged copy (``database/restore_stage.py``) and the WAL
-    growth while the stage is copied over the live database (3x the upload),
-    plus the safety backup of the current database (1x its size), with
-    ``DISK_MARGIN_BYTES`` to spare.
+    The upload is written to a temp file and staged once more in the
+    temporary folder (2x), then copied over the live database beside it,
+    whose current contents are first kept as a safety backup (1x the upload
+    for the WAL, plus the current database). Needs on one device add up,
+    each with ``DISK_MARGIN_BYTES``.
     """
     db_path = os.path.abspath(db_path)
     folder = os.path.dirname(db_path)
     current = database_bytes(db_path) if os.path.exists(db_path) else 0
-    room = (_free_bytes(folder) - current - DISK_MARGIN_BYTES) // 3
+    devices = {}
+    for path, per_upload, fixed in (
+        (tempfile.gettempdir(), 2, 0),
+        (folder, 1, current),
+    ):
+        entry = devices.setdefault(_device(path), {"path": path, "per": 0, "fixed": 0})
+        entry["per"] += per_upload
+        entry["fixed"] += fixed
+    room = min(
+        (_free_bytes(e["path"]) - e["fixed"] - DISK_MARGIN_BYTES) // e["per"]
+        for e in devices.values()
+    )
     return max(0, room)
 
 
@@ -290,13 +305,142 @@ def _changed_line(operation, count):
     return f"Removed {count:,} {noun}"
 
 
+def _remove_quietly(*paths):
+    for path in paths:
+        try:
+            if path and os.path.exists(path):
+                os.remove(path)
+        except OSError:
+            pass
+
+
+def _reserve_backup_name(db_path, label="backup"):
+    """Create and return an unused ``<db>.<label>_<stamp>[_n]`` (O_EXCL)."""
+    for candidate in _backup_names(db_path, label):
+        try:
+            fd = os.open(candidate, os.O_CREAT | os.O_EXCL | os.O_WRONLY, 0o600)
+        except FileExistsError:
+            continue
+        os.close(fd)
+        return candidate
+    raise SafetyBackupFailed("No free backup name")
+
+
+def _backup_names(db_path, label="backup"):
+    base = f"{db_path}.{label}_{_now().strftime('%Y%m%d_%H%M%S_%f')}"
+    for attempt in range(_NAME_ATTEMPTS):
+        yield base if attempt == 0 else f"{base}_{attempt}"
+
+
+def _place_backup(temp, db_path, label="backup"):
+    """Give the verified ``temp`` its unique backup name; return that path.
+
+    ``os.link`` is atomic and refuses an existing name, so no empty or half
+    file ever carries a backup name, even across a crash. A filesystem
+    without hard links falls back to reserving the name (``O_EXCL``) and
+    ``os.replace``. The temp file is removed by the caller.
+    """
+    for candidate in _backup_names(db_path, label):
+        try:
+            os.link(temp, candidate)
+        except FileExistsError:
+            continue
+        except (OSError, NotImplementedError):
+            break  # no hard links here
+        else:
+            return candidate
+    else:
+        raise SafetyBackupFailed("No free backup name")
+    final = _reserve_backup_name(db_path, label)
+    try:
+        os.replace(temp, final)
+    except OSError:
+        _remove_quietly(final)
+        raise
+    return final
+
+
+SAFETY_TEMP_PREFIX = ".pm-safety-"
+
+
+def sweep_safety_temps(db_path):
+    """Remove the temp copies an interrupted safety backup left (blocking).
+
+    Called once at startup, before any job can take a backup. Returns the
+    names removed.
+    """
+    folder = os.path.dirname(os.path.abspath(db_path))
+    removed = []
+    try:
+        names = os.listdir(folder)
+    except OSError:
+        return removed
+    for name in names:
+        if not (name.startswith(SAFETY_TEMP_PREFIX) and ".tmp" in name):
+            continue
+        try:
+            os.remove(os.path.join(folder, name))
+            removed.append(name)
+        except OSError:
+            continue
+    return removed
+
+
+def _standalone(path):
+    """Make the copy one self-contained file (rollback journal, not WAL).
+
+    The backup API copies the live database's WAL flag; a WAL file opened
+    read-only later (a verify, a restore preview) would leave ``-wal`` and
+    ``-shm`` sidecars beside it.
+    """
+    try:
+        with closing(sqlite3.connect(path)) as conn:
+            conn.execute("PRAGMA journal_mode=DELETE").fetchone()
+    except sqlite3.Error as exc:
+        raise SafetyBackupFailed("The backup could not be finished") from exc
+
+
+def _fsync(path):
+    with open(path, "rb+") as handle:
+        os.fsync(handle.fileno())
+
+
 def take_safety_backup(model, label="backup"):
     """Write and verify a safety backup; return its file name (blocking).
 
-    See ``database/safety_backup.py``: a backup file on disk is always a
-    verified one. Raises SafetyBackupFailed, leaving no file.
+    The copy is made in a temp file beside the database and only renamed
+    onto its final, unique name ``<db>.<label>_<stamp>`` once it verified,
+    so a backup file on disk is always a verified one. ``label`` "backup"
+    joins the pruned pool; another label (the workflow storage migration's
+    ``pre-workflow-storage``) is kept until the user removes it. Raises
+    SafetyBackupFailed, leaving no file.
     """
-    return os.path.basename(_backups.take_safety_backup(model, label))
+    db_path = os.path.abspath(model.db_path)
+    fd, temp = tempfile.mkstemp(
+        dir=os.path.dirname(db_path), prefix=SAFETY_TEMP_PREFIX, suffix=".tmp"
+    )
+    os.close(fd)
+    final = None
+    try:
+        if not model.backup_database(temp):
+            raise SafetyBackupFailed("The backup could not be written")
+        _standalone(temp)
+        ok, reason = model.verify_database_file(temp)
+        if not ok:
+            raise SafetyBackupFailed("The backup did not verify", reason)
+        _fsync(temp)
+        if os.name != "nt":
+            os.chmod(temp, 0o600)
+        final = _place_backup(temp, db_path, label)
+        return os.path.basename(final)
+    except OSError as exc:
+        _remove_quietly(final)
+        raise SafetyBackupFailed("The backup could not be put in place") from exc
+    except SafetyBackupFailed:
+        _remove_quietly(final)
+        raise
+    finally:
+        _remove_quietly(temp, temp + "-journal", temp + "-wal", temp + "-shm")
 
 
 def _failure(message, status, code=None, **extra):
@@ -359,19 +503,6 @@ class MaintenanceRoutesMixin:
         return data, None
 
     async def preview_maintenance(self, request):
-        """Review one operation under a registry lease (#249 S8).
-
-        The preview's read-only connections must not be open while a restore
-        switches the database: it is refused (409 ``busy``) while an
-        ``exclusive`` job runs, and a restore waits for running previews.
-        """
-        try:
-            async with self._jobs.lease(MAINTENANCE_PREVIEW_LEASE):
-                return await self._preview_maintenance(request)
-        except JobBusy as busy:
-            return busy_response(busy)
-
-    async def _preview_maintenance(self, request):
         data, error = await self._read_maintenance_body(
             request,
             ("operation", "options"),
@@ -513,9 +644,7 @@ class MaintenanceRoutesMixin:
             )
         except (OSError, sqlite3.Error):
             self.logger.exception("Could not measure the disk space for an apply")
-            # Coded: the workspace tells the server's own refusal (nothing
-            # started) from a proxy's 5xx (the job may have started).
-            return _failure(APPLY_FAILED, 500, "apply-failed")
+            return _failure(APPLY_FAILED, 500)
         if short is not None:
             # Refused before any job starts: nothing fails halfway for space.
             return _failure(short_space_message(short), 507, "insufficient-space")
@@ -679,13 +808,7 @@ def backup_note(backup):
 
 
 def _fail_job(job, code, message):
-    """End ``job`` failed with ``message`` (one error row) and its code.
-
-    The code is also the job's ``scope["failure"]``, so Activity can offer
-    Review again for a plan the library overtook.
-    """
-    if code:
-        job.scope["failure"] = code
+    """End ``job`` failed with ``message`` (one error row) and its code."""
     job.record("errors", {"path": "", "detail": message}, f"! {message}")
     job.update(status_line=message)
     job.publish({"type": "error", "code": code, "message": message})

py/api/restore_plans.py

@@ -1,146 +0,0 @@
-"""Reviewed restores: staged uploads held under single-use tokens (#249 S8).
-
-A restore preview stages the upload (``database/restore_stage.py``) and
-keeps it here under a ``secrets.token_urlsafe(32)`` token with the live
-library's fingerprint and the database identity it was reviewed against.
-``take`` hands the stage to the restore job exactly once; a second apply of
-the token names that job (``PlanUsed``). An expired, discarded or unknown
-token raises ``PlanExpired``; its stage folder is removed. A restart forgets
-every token (the startup sweep removes the folders).
-
-At most ``max_stages`` stages are held. Bytes are bounded by free disk space
-(the upload is refused when the disk has no room, and held stages use that
-disk), not by a fixed budget. A stage being applied belongs to its job and is
-never evicted or counted.
-
-The store is only read and changed on the event loop (it has no lock). Its
-entries own stage folders, whose removal is blocking: every method that
-drops an entry returns it (or keeps it in ``take_doomed``), and the caller
-removes the folder in the executor (``HeldRestore.staged.discard``).
-"""
-
-import secrets
-import time
-from dataclasses import dataclass
-from typing import Any, Callable, Dict, List, Optional
-
-from .maintenance_plans import PlanExpired, PlanUsed
-
-STAGE_TTL_SECONDS = 900
-MAX_STAGES = 2
-_USED_KEPT = 32  # applied tokens remembered for plan-used answers
-
-
-class TooManyStages(Exception):
-    """Every stage slot is held by a reviewed restore."""
-
-
-@dataclass
-class HeldRestore:
-    staged: Any  # database.restore_stage.StagedRestore
-    fingerprint: str
-    db_identity: Any
-    live: Dict[str, int]
-    expires_at: float
-
-
-class RestorePlanStore:
-    def __init__(
-        self,
-        clock: Optional[Callable[[], float]] = None,
-        ttl: float = STAGE_TTL_SECONDS,
-        max_stages: int = MAX_STAGES,
-    ):
-        self._ttl = ttl
-        self._max = max_stages
-        self._clock = clock or time.time
-        self._held: Dict[str, HeldRestore] = {}
-        self._used: Dict[str, str] = {}
-        self._doomed: List[HeldRestore] = []
-
-    @property
-    def ttl(self) -> float:
-        return self._ttl
-
-    def now(self) -> float:
-        return self._clock()
-
-    def __len__(self):
-        return len(self._held)
-
-    def full(self) -> bool:
-        return len(self._held) >= self._max
-
-    def issue(self, staged, fingerprint, db_identity, live) -> str:
-        """Hold ``staged`` and return its token; TooManyStages when full."""
-        if self.full():
-            raise TooManyStages()
-        token = secrets.token_urlsafe(32)
-        self._held[token] = HeldRestore(
-            staged=staged,
-            fingerprint=fingerprint,
-            db_identity=db_identity,
-            live=dict(live),
-            expires_at=self._clock() + self._ttl,
-        )
-        return token
-
-    def peek(self, token) -> HeldRestore:
-        if token in self._used:
-            raise PlanUsed(self._used[token])
-        held = self._held.get(token)
-        if held is None:
-            raise PlanExpired()
-        if held.expires_at <= self._clock():
-            self._doomed.append(self._held.pop(token))
-            raise PlanExpired()
-        return held
-
-    def take(self, token, job_id) -> HeldRestore:
-        """Hand the held stage to the job applying it (single use)."""
-        held = self.peek(token)
-        del self._held[token]
-        self._used[token] = job_id
-        while len(self._used) > _USED_KEPT:
-            self._used.pop(next(iter(self._used)))
-        return held
-
-    def give_back(self, token, held) -> bool:
-        """Hold a taken stage again under its token (its job did not apply it).
-
-        False, holding nothing, when the review expired meanwhile or its slot
-        was reused (the store is full): the caller then discards the stage.
-        """
-        if held.expires_at <= self._clock() or self.full():
-            return False
-        self._used.pop(token, None)
-        self._held[token] = held
-        return True
-
-    def entry(self, token) -> Optional[HeldRestore]:
-        """The held entry, expired or not (for the response that issued it)."""
-        return self._held.get(token)
-
-    def pop(self, token) -> Optional[HeldRestore]:
-        """Drop the token; its entry (to discard) or None when it was not held."""
-        return self._held.pop(token, None)
-
-    def pop_expired(self) -> List[HeldRestore]:
-        """Drop every expired entry; them, with any ``peek`` found expired."""
-        now = self._clock()
-        expired = [t for t, held in self._held.items() if held.expires_at <= now]
-        return [self._held.pop(token) for token in expired] + self.take_doomed()
-
-    def pop_all(self) -> List[HeldRestore]:
-        """Drop every entry (the library was replaced); them, to discard."""
-        held = list(self._held.values()) + self.take_doomed()
-        self._held.clear()
-        return held
-
-    def take_doomed(self) -> List[HeldRestore]:
-        doomed, self._doomed = self._doomed, []
-        return doomed
-
-    def next_expiry(self) -> Optional[float]:
-        """When the soonest held entry expires (clock time), or None."""
-        return min((held.expires_at for held in self._held.values()), default=None)

py/api/review.py

@@ -31,8 +31,6 @@ from aiohttp import web
 from .annotations import _HEX64, _TOKEN, _UUID, _capture_error, _error
 from .images import media_thumbnail_url
 from .inspection_service import VIDEO_EXTENSIONS
-from .job_routes import busy_response
-from .jobs import JobBusy
 from .prompts import bad_request
 
 try:
@@ -241,9 +239,6 @@ def _side_label(titles: dict, side, empty: str) -> str:
     return display_title(titles.get(stored, ()), text) or empty
 
 
-REVIEW_DECISION_LEASE = "Needs review decision"
-
-
 class ReviewRoutesMixin:
     """The Needs review queue over E1's schema and E2's recorded items."""
 
@@ -451,20 +446,7 @@ class ReviewRoutesMixin:
     # -- decision --------------------------------------------------------------
 
     async def decide_review_item(self, request: web.Request) -> web.Response:
-        """POST one explicit decision on one pending item.
-
-        The decision runs under a registry lease (#249 S8): it is refused
-        (409 ``busy``) while a restore or another ``exclusive`` job runs, and
-        a restore waits for decisions already running before it switches the
-        database. Decisions never refuse one another or a scan.
-        """
-        try:
-            async with self._jobs.lease(REVIEW_DECISION_LEASE):
-                return await self._decide_review_item(request)
-        except JobBusy as busy:
-            return busy_response(busy)
-
-    async def _decide_review_item(self, request: web.Request) -> web.Response:
+        """POST one explicit decision on one pending item."""
         data, error = await self._read_json_body(request, max_bytes=MAX_BODY_BYTES)
         if error is not None:
             return error

py/api/settings_routes.py

@@ -13,7 +13,6 @@ checks one path and writes nothing.
 """
 
 import contextlib
-import functools
 import os
 
 from aiohttp import web
@@ -24,11 +23,9 @@ from ..config_store import (
     get_config_store,
 )
 from . import sources
-from . import thumbnail_encode
-from . import thumbnail_settings
 from .admin import _current_image_monitor
 from .job_routes import busy_response
-from .jobs import THUMBNAILS_JOB_KIND, JobBusy
+from .jobs import JobBusy
 
 try:
     from ...utils.validators import validate_result_timeout, validate_worker_threads
@@ -44,12 +41,7 @@ _SETTINGS_FILE_KEYS = {
     "WORKER_THREADS": ("performance", "worker_threads"),
     "MONITORING_ENABLED": ("gallery", "monitoring", "enabled"),
     "SAFETY_BACKUP": ("maintenance", "safety_backup"),
-    "THUMBNAIL_FORMAT": ("thumbnails", "format"),
-    "THUMBNAIL_QUALITY": ("thumbnails", "quality"),
-    "THUMBNAIL_EDGE": ("thumbnails", "edge"),
 }
-# The thumbnail settings a running Convert outdated job fixes (#317).
-_THUMBNAIL_SETTINGS = ("THUMBNAIL_FORMAT", "THUMBNAIL_QUALITY", "THUMBNAIL_EDGE")
 # Attributes that live on GalleryConfig; the others on PromptManagerConfig.
 _GALLERY_SETTINGS = frozenset({"MONITORING_ENABLED"})
 SOURCE_CHANGE_JOB_KIND = "source_change"
@@ -184,15 +176,12 @@ class SettingsRoutesMixin:
             ]
             revision = await self._run_in_executor(self._config_revision)
             source_status, monitor = await self._run_in_executor(self._source_status)
-            # #317: which thumbnail formats can be written (a cached probe).
-            encoders = await self._run_in_executor(thumbnail_encode.encoder_status)
             return web.json_response(
                 {
                     "success": True,
                     **revision,
                     "sources": source_status,
                     "monitor": monitor,
-                    "thumbnail_encoders": encoders,
                     "settings": {
                         "monitoring_enabled": GalleryConfig.MONITORING_ENABLED,
                         "result_timeout": PromptManagerConfig.RESULT_TIMEOUT,
@@ -200,9 +189,6 @@ class SettingsRoutesMixin:
                         "infinite_scroll": PromptManagerConfig.INFINITE_SCROLL,
                         "worker_threads": PromptManagerConfig.WORKER_THREADS,
                         "safety_backup": PromptManagerConfig.SAFETY_BACKUP,
-                        "thumbnail_format": PromptManagerConfig.THUMBNAIL_FORMAT,
-                        "thumbnail_quality": PromptManagerConfig.THUMBNAIL_QUALITY,
-                        "thumbnail_edge": PromptManagerConfig.THUMBNAIL_EDGE,
                         "cpu_count": PromptManagerConfig.max_worker_threads(),
                         "gallery_root_paths": root_paths,
                         "gallery_root_path": root_paths[0] if root_paths else "",
@@ -309,26 +295,6 @@ class SettingsRoutesMixin:
                 return web.json_response(
                     {"success": False, "error": str(ve)}, status=400
                 )
-            if updates.get("THUMBNAIL_FORMAT") == "jxl":
-                # #317: JPEG XL only with an encoder (a cached probe).
-                encoder = await self._run_in_executor(
-                    functools.partial(
-                        thumbnail_encode.detect_jxl_encoder, recheck_missing=True
-                    )
-                )
-                if encoder is None:
-                    return web.json_response(
-                        {
-                            "success": False,
-                            "code": "jxl-unavailable",
-                            "error": thumbnail_encode.JXL_UNAVAILABLE,
-                        },
-                        status=400,
-                    )
-
-            refused = self._thumbnail_change_refused(updates)
-            if refused is not None:
-                return refused
 
             # Off the loop: an accepted root is resolved (filesystem access).
             new_roots, error = await self._run_in_executor(
@@ -389,33 +355,6 @@ class SettingsRoutesMixin:
                 status=500,
             )
 
-    def _thumbnail_change_refused(self, updates):
-        """409 ``busy`` for a thumbnail format, quality or size change while
-        Convert outdated runs (review I4): the job converts to the settings
-        it started with, and a change under it would make it remove previews
-        in the newly chosen format. Unchanged values pass."""
-        from ..config import PromptManagerConfig
-
-        changed = any(
-            key in updates and updates[key] != getattr(PromptManagerConfig, key)
-            for key in _THUMBNAIL_SETTINGS
-        )
-        job = self._jobs.active(THUMBNAILS_JOB_KIND) if changed else None
-        if job is None or job.scope.get("mode") != "convert":
-            return None
-        return web.json_response(
-            {
-                "success": False,
-                "code": "busy",
-                "error": (
-                    f"{job.title} is running. Change the thumbnail settings "
-                    "when it finishes, or cancel it first."
-                ),
-                "running": {"id": job.id, "title": job.title},
-            },
-            status=409,
-        )
-
     def _publish_settings(self, updates, new_roots):
         """Install committed settings at runtime (inside the config commit).
 
@@ -552,18 +491,6 @@ class SettingsRoutesMixin:
             updates["WORKER_THREADS"] = validate_worker_threads(
                 data["worker_threads"], PromptManagerConfig.max_worker_threads()
             )
-        if "thumbnail_format" in data:
-            updates["THUMBNAIL_FORMAT"] = thumbnail_settings.validate_format(
-                data["thumbnail_format"]
-            )
-        if "thumbnail_quality" in data:
-            updates["THUMBNAIL_QUALITY"] = thumbnail_settings.validate_quality(
-                data["thumbnail_quality"]
-            )
-        if "thumbnail_edge" in data:
-            updates["THUMBNAIL_EDGE"] = thumbnail_settings.validate_edge(
-                data["thumbnail_edge"]
-            )
         return updates
 
     def _parse_gallery_roots(self, data):

py/api/thumbnail_auto.py

@@ -33,11 +33,9 @@ previews behind those URLs are made here, in three ways:
   (missing only, visible and cancellable) instead of writing them silently,
   and fewer go through the worker.
 
-Every preview is written by ``_generate_one`` with the server's thumbnail
-settings (format, quality, size limit; ``thumbnail_settings``, #317), into a
-temp sibling verified and renamed over the old one, so a reader never sees a
-partial file. A request for an older preview name (``_thumb.png``) is answered
-with the preview in the current format.
+Every preview is written by ``_generate_one`` with the thumbnail job's default
+size and quality (``DEFAULT_THUMBNAIL_EDGE``, medium), into a temp sibling
+renamed over the old one, so a reader never sees a partial file.
 
 Holds: automatic previews only write files under ``thumbnails/`` and never
 touch the database, like the thumbnail job, so they run beside a scan, image
@@ -65,10 +63,11 @@ from pathlib import Path
 
 from aiohttp import web
 
-from . import thumbnail_settings
 from .images import (
+    GALLERY_IMAGE_EXTENSIONS,
     MEDIA_EXTENSIONS,
     THUMBNAIL_CLEAR_TITLE,
+    THUMBNAIL_ENCODINGS,
     VIDEO_EXTENSIONS,
     _has_traversal,
     _is_within,
@@ -84,20 +83,16 @@ from .jobs import (
     JobBusy,
 )
 from .settings_routes import SOURCE_CHANGE_JOB_KIND
-from .thumbnail_encode import shutdown_encoders, writer_settings
-from .thumbnail_jobs import ThumbnailOptions
+from .thumbnail_jobs import DEFAULT_THUMBNAIL_EDGE, ThumbnailOptions
 
 try:
     from ...utils.parallel import map_parallel
 except ImportError:  # tests import the package top-level
     from utils.parallel import map_parallel
 
-# The placeholder frame a video without a preview is answered with (JPEG
-# bytes, never written to disk); written previews follow the settings.
-PLACEHOLDER_SIZE = (thumbnail_settings.DEFAULT_EDGE, thumbnail_settings.DEFAULT_EDGE)
-PLACEHOLDER_QUALITY = 85
-# Source extensions in the order a shared preview name looks for them (R2).
-_SOURCE_ORDER = thumbnail_settings.IMAGE_SOURCE_ORDER + tuple(sorted(VIDEO_EXTENSIONS))
+AUTO_THUMBNAIL_EDGE = DEFAULT_THUMBNAIL_EDGE
+AUTO_THUMBNAIL_SIZE = (AUTO_THUMBNAIL_EDGE, AUTO_THUMBNAIL_EDGE)
+AUTO_THUMBNAIL_ENCODING = THUMBNAIL_ENCODINGS["medium"]
 # Previews views may write at once (the size of the view pool).
 ON_DEMAND_LIMIT = 3
 # View requests that may wait on the gate; one more gets its fallback at once.
@@ -151,8 +146,8 @@ def _dst_key(dst):
 def video_placeholder_jpeg():
     """The placeholder frame as JPEG bytes (a video whose preview is missing)."""
     buffer = io.BytesIO()
-    _video_placeholder_image(PLACEHOLDER_SIZE).save(
-        buffer, "JPEG", quality=PLACEHOLDER_QUALITY, optimize=True
+    _video_placeholder_image(AUTO_THUMBNAIL_SIZE).save(
+        buffer, "JPEG", **AUTO_THUMBNAIL_ENCODING
     )
     return buffer.getvalue()
 
@@ -176,7 +171,7 @@ def _is_preview_request(filepath):
         stem.endswith("_thumb")
         and len(stem) > len("_thumb")
         and extension == extension.lower()
-        and extension in thumbnail_settings.THUMBNAIL_EXTENSIONS
+        and extension in GALLERY_IMAGE_EXTENSIONS
     )
 
 
@@ -189,27 +184,12 @@ def _regular_file(path):
 
 
 def _candidates(parts):
-    """``(folder parts, base, source extensions)`` of a checked preview
-    request: every media extension that owns the requested preview name
-    (``thumbnail_settings.owns``), images first (ruling R2)."""
+    """``(folder parts, base, extensions)`` of a checked preview request."""
     stem, extension = os.path.splitext(parts[-1])
-    wanted = [
-        source
-        for source in _SOURCE_ORDER
-        if source in MEDIA_EXTENSIONS and thumbnail_settings.owns(extension, source)
-    ]
+    wanted = [extension] + (sorted(VIDEO_EXTENSIONS) if extension == ".jpg" else [])
     return parts[1:-1], stem[: -len("_thumb")], wanted
 
 
-def _current_preview(root, parts):
-    """The preview *parts* names, in the format written now (#317): a request
-    for an older name (``_thumb.png`` before a conversion) is answered with
-    the current file."""
-    _folder, base, _wanted = _candidates(parts)
-    name = base + thumbnail_settings.THUMB_SUFFIX + writer_settings().extension
-    return Path(root).joinpath(*parts[:-1], name)
-
-
 def _quick_source(root, parts):
     """``(src, is_video)`` by exact name only (no folder listing), or None."""
     root = Path(root)
@@ -227,12 +207,11 @@ def _thumbnail_source(root, parts):
     """``(src, dst, is_video)`` for the preview *parts* under *root*, or None.
 
     *parts* passed ``_is_preview_request``. The source has the preview's name
-    without ``_thumb`` and an extension that owns the requested one (any case:
-    exact names first, then one listing of the folder; ruling R4). It must be
-    a regular file inside *root*. ``dst`` is the preview in the format written
-    now (#317), whatever extension was requested; it is None when the
-    preview's folder resolves outside ``root/thumbnails`` (a link): nothing is
-    written there.
+    without ``_thumb`` and an extension that previews as the requested one
+    (any case: exact names first, then one listing of the folder); a ``.jpg``
+    may also be a video's. It must be a regular file inside *root*. ``dst``
+    is None when the preview's folder resolves outside ``root/thumbnails`` (a
+    link): nothing is written there.
     """
     root = Path(root)
     folder_parts, base, wanted = _candidates(parts)
@@ -245,7 +224,7 @@ def _thumbnail_source(root, parts):
             return None
     rel = Path(*folder_parts, found.name)
     dst = root / media_thumbnail_rel(rel)
-    if dst != _current_preview(root, parts):
+    if dst != root.joinpath(*parts):
         return None
     if not _is_within(root / "thumbnails", root) or not _is_within(
         dst, root / "thumbnails"
@@ -626,8 +605,6 @@ class AutoThumbnailMixin:
             thumbnailer.close()
         if pool is not None:
             pool.shutdown(wait=False, cancel_futures=True)
-        if final:
-            shutdown_encoders()  # kill JPEG XL / ffmpeg encoders still running
 
     def _auto_thumbnail_failures(self):
         thumbnailer = self._auto_thumbnailer
@@ -637,8 +614,9 @@ class AutoThumbnailMixin:
         return self._generate_one(
             src,
             dst,
-            writer_settings(),
+            AUTO_THUMBNAIL_SIZE,
             is_video,
+            encoding=AUTO_THUMBNAIL_ENCODING,
             stop=stop,
             guard=guard,
             track=track,
@@ -752,7 +730,7 @@ class AutoThumbnailMixin:
                 if quick is None:
                     continue
                 return self._preview_response(BUSY, quick[0], None, quick[1])
-            dst = _current_preview(root, parts)
+            dst = root.joinpath(*parts)
             if outcome == READY:
                 return self._file_response(dst)
             located = await gate.loop.run_in_executor(
@@ -829,7 +807,7 @@ class AutoThumbnailMixin:
         plan = await self._run_in_executor(self._plan_gallery_thumbnails, output_dirs)
         missing = len(plan["targets"]) + plan["remaining"]
         if missing >= SCAN_THUMBNAIL_JOB_THRESHOLD:
-            options = ThumbnailOptions("missing", writer_settings())
+            options = ThumbnailOptions("missing", AUTO_THUMBNAIL_EDGE, "medium")
             try:
                 self._start_thumbnail_job(options)
             except JobBusy as busy:

py/api/thumbnail_convert.py

@@ -1,404 +0,0 @@
-"""Convert outdated thumbnails (#317): an explicit, cancellable Activity job.
-
-``POST /prompt_manager/jobs/thumbnails {mode: "convert"}`` (and
-``GET /prompt_manager/images/thumbnails/plan?mode=convert`` for its count)
-starts "Convert outdated thumbnails": the thumbnail job's kind, ``guarded``
-admission (never beside a record-changing job such as a scan, a restore or
-a duplicate removal; one thumbnail job at a time), its worker threads and
-its outcome groups. Nothing converts on its own: changing the format in
-Appearance only makes previews "outdated".
-
-A preview is outdated when the file owns one in another format than the one
-written now (``writer_settings``: a legacy ``_thumb.png``, or a format
-switched away from). For each such file, at a file boundary (Cancel keeps
-what was converted):
-
-1. the new preview is written from the SOURCE media in the configured
-   format (``_generate_one``: atomic, verified to decode; a video whose frame
-   cannot be decoded fails rather than getting the placeholder), unless a
-   current preview at least as new as the source is already there and
-   decodes;
-2. only then are that file's old-format previews removed: regular files (no
-   links) in its ``thumbnails/`` folder, owned by that source
-   (``thumbnail_settings.owns``), with the source still present. One already
-   gone counts as removed.
-
-Files sharing a stem in one folder (``x.png`` and ``x.mp4``) share one
-preview (ruling R2), so they are converted once, as a group: the preview is
-made from the first source in ``thumbnail_settings.source_rank`` order
-(``.png``, ``.jpg``, ``.jpeg``, ``.webp``, ``.gif``, then videos), the old
-previews of every source in the group are removed, and each removed or
-written file's bytes count once.
-
-A failure keeps the old preview. Previews whose source is gone (orphans) are
-never planned, so never touched. The format the job converts to is fixed
-when it starts; Appearance refuses a thumbnail settings change while it runs
-(409), and should the format still change underneath, the job stops at the
-next file without removing anything in another format. The final status line
-reads "N converted · F failed · <bytes before> → <bytes after>".
-"""
-
-import asyncio
-import functools
-import os
-import time
-from pathlib import Path
-
-from . import thumbnail_settings
-from .thumbnail_encode import ThumbnailVerifyError, verify_thumbnail, writer_settings
-from .admin import _plural, _scan_location, _scan_roots, _scan_status_line
-from .images import _thumbnail_is_fresh, _worker_threads, _thumbnail_batch_size
-from .prompts import safe_error_message
-
-try:
-    from ...utils.parallel import map_parallel
-except ImportError:  # tests import the package top-level
-    from utils.parallel import map_parallel
-
-CONVERT_JOB_TITLE = "Convert outdated thumbnails"
-NOTHING_OUTDATED = "No outdated previews to convert"
-CANCELLED_BEFORE_CONVERTING = "Cancelled before any preview was converted"
-SOURCE_GONE = "The file is gone; its old preview was kept"
-OLD_NOT_REMOVED = "Converted; the old preview could not be removed"
-FORMAT_CHANGED = (
-    "Stopped: the thumbnail format changed while converting · "
-    "{converted} converted. Run Convert outdated again."
-)
-_UNITS = ("B", "KB", "MB", "GB", "TB")
-
-
-def readable_bytes(count):
-    """``1.5 KB``-style size (whole bytes below 1 KB)."""
-    size = float(count)
-    for unit in _UNITS:
-        if size < 1024 or unit == _UNITS[-1]:
-            return f"{int(size)} B" if unit == "B" else f"{size:.1f} {unit}"
-        size /= 1024
-    return f"{size:.1f} {_UNITS[-1]}"  # pragma: no cover - loop always returns
-
-
-def _old_previews(src, dst, settings):
-    """``[(path, size)]``: *src*'s previews beside *dst* in another format."""
-    stem = dst.name[: -len(dst.suffix)] if dst.suffix else dst.name
-    old = []
-    for path in thumbnail_settings.owned_in_folder(
-        dst.parent, stem, src.suffix, settings.extension
-    ):
-        if path.suffix == settings.extension:
-            continue
-        try:
-            old.append((path, path.stat().st_size))
-        except OSError:
-            continue
-    return old
-
-
-def _group_targets(targets):
-    """``[[(src, dst, is_video)]]``: targets sharing a preview name (one
-    folder, one stem) in one group, its first source first (R2)."""
-    groups = {}
-    for target in targets:
-        dst = Path(target[1])
-        key = os.path.normcase(str(dst.with_suffix("")))
-        groups.setdefault(key, []).append(target)
-    ordered = []
-    for group in groups.values():
-        group.sort(
-            key=lambda t: (thumbnail_settings.source_rank(Path(t[0]).suffix), str(t[0]))
-        )
-        ordered.append(group)
-    return ordered
-
-
-def _same_file(a, b):
-    """Whether *a* and *b* name one file (re-review N1: on a case-insensitive
-    disk ``x_thumb.JPG`` is the ``x_thumb.jpg`` just written). Without inode
-    numbers (st_ino 0 on some SMB/FAT mounts) the resolved, normcased paths
-    are compared."""
-    try:
-        first, second = os.stat(a), os.stat(b)
-    except OSError:
-        return False
-    if first.st_ino and second.st_ino:
-        return (first.st_dev, first.st_ino) == (second.st_dev, second.st_ino)
-    return os.path.normcase(os.path.realpath(a)) == os.path.normcase(
-        os.path.realpath(b)
-    )
-
-
-def _format_changed(settings):
-    """Whether previews are written in another format than *settings* now."""
-    return writer_settings().extension != settings.extension
-
-
-def _finished_line(totals, remaining):
-    line = (
-        f"{totals['converted']:,} converted · {totals['failed']:,} failed · "
-        f"{readable_bytes(totals['before'])} → {readable_bytes(totals['after'])}"
-    )
-    if remaining:
-        line += f" · {remaining:,} more on the next run"
-    return line
-
-
-class ThumbnailConvertMixin:
-    """The Convert outdated job (started through ``_start_thumbnail_job``)."""
-
-    async def _run_convert_job(self, job, options):
-        try:
-            state = await self._convert_job_body(job, options)
-        except Exception:
-            self.logger.exception("Thumbnail conversion failed")
-            job.update(status_line="Thumbnail conversion stopped on an internal error.")
-            job.log_line("Conversion failed · internal error")
-            state = "failed"
-        job.finish(state)
-
-    async def _convert_job_body(self, job, options):
-        output_dirs = await self._run_in_executor(self._get_all_output_dirs)
-        if not output_dirs:
-            message = "ComfyUI output directory not found"
-            job.update(status_line=message)
-            job.log_line(f"Conversion failed · {message}")
-            return "failed"
-        folders = _plural(len(output_dirs), "output folder")
-        job.scope["output_folders"] = len(output_dirs)
-        job.update(status_line=f"Looking for outdated previews in {folders}")
-        job.log_line(
-            f"Conversion started · {folders} · to {options.settings.describe()}"
-        )
-        plan = await self._plan_conversion(job, options, output_dirs)
-        if job.cancelled:
-            return self._end_conversion(job, 0, CANCELLED_BEFORE_CONVERTING)
-        if not plan["targets"]:
-            job.update(progress=100, status_line=NOTHING_OUTDATED)
-            job.log_line(f"Conversion finished · {NOTHING_OUTDATED.lower()}")
-            return "finished"
-        totals, left = await self._convert_in_batches(job, options, plan, output_dirs)
-        if totals["stopped"]:
-            job.update(status_line=FORMAT_CHANGED.format(converted=totals["converted"]))
-            job.log_line(
-                "Conversion stopped · the thumbnail format changed · "
-                f"{_plural(totals['converted'], 'preview')} converted"
-            )
-            return "cancelled"
-        if job.cancelled:
-            return self._end_conversion(
-                job,
-                totals["converted"],
-                f"Cancelled · {_plural(totals['converted'], 'preview')} converted",
-            )
-        line = _finished_line(totals, left)
-        job.update(progress=100, status_line=line)
-        job.log_line(f"Conversion finished · {line}")
-        self.logger.info(f"Thumbnail conversion: {line}")
-        return "finished"
-
-    @staticmethod
-    def _end_conversion(job, converted, status_line):
-        job.update(status_line=status_line)
-        job.log_line(
-            f"Conversion cancelled · {_plural(converted, 'preview')} converted"
-        )
-        return "cancelled"
-
-    async def _plan_conversion(self, job, options, output_dirs, exclude=None):
-        """One batch's plan (at most MAX_THUMBNAIL_FILES targets), off-loop."""
-        return await self._run_in_executor(
-            self._plan_gallery_thumbnails,
-            output_dirs,
-            "convert",
-            stop=lambda: job.cancelled,
-            settings=options.settings,
-            exclude=exclude,
-        )
-
-    async def _convert_in_batches(self, job, options, plan, output_dirs):
-        """Convert ``plan``, then plan again after each batch until nothing
-        is left, the job is cancelled or stopped, or a batch converted
-        nothing (files that fail are never planned again). Returns
-        ``(totals across batches, files left)``."""
-        totals = {"converted": 0, "failed": 0, "before": 0, "after": 0}
-        totals["stopped"] = False
-        run = {
-            "index": 0,
-            "batches": 0,
-            "total": len(plan["targets"]) + plan["remaining"],
-        }
-        run["start"] = time.monotonic()
-        job.update(
-            total=run["total"], status_line=_scan_status_line(0, run["total"], 0, 0)
-        )
-        attempted = set()
-        while True:
-            before = totals["converted"]
-            await self._convert_targets(
-                job, options, plan["targets"], output_dirs, totals, run
-            )
-            attempted.update(src for src, _dst, _video in plan["targets"])
-            stop = job.cancelled or totals["stopped"]
-            if stop or not plan["remaining"] or totals["converted"] == before:
-                return totals, plan["remaining"]
-            plan = await self._plan_conversion(
-                job, options, output_dirs, exclude=attempted
-            )
-            if job.cancelled:
-                return totals, 0
-            run["total"] = run["index"] + len(plan["targets"]) + plan["remaining"]
-            job.update(total=run["total"])
-            if not plan["targets"]:
-                return totals, plan["remaining"]
-
-    async def _convert_targets(self, job, options, targets, output_dirs, totals, run):
-        """Convert one batch's *targets* in worker batches of preview groups,
-        recording each file against the job's overall ``run`` counters."""
-        roots = _scan_roots(output_dirs)
-        groups = _group_targets(targets)
-        batch_size = _thumbnail_batch_size(_worker_threads())
-        for batch_start in range(0, len(groups), batch_size):
-            if job.cancelled or totals["stopped"]:
-                break
-            batch = groups[batch_start : batch_start + batch_size]
-            results = await self._run_in_executor(
-                self._convert_batch, batch, options.settings, lambda: job.cancelled
-            )
-            for group, group_results in zip(batch, results):
-                for (src, _dst, _video), result in zip(group, group_results):
-                    if result["action"] == "stopped":
-                        totals["stopped"] = True
-                    if result["action"] in ("cancelled", "stopped"):
-                        continue
-                    run["index"] += 1
-                    index, total = run["index"], max(run["total"], run["index"])
-                    self._record_conversion(job, src, result, roots, totals)
-                    job.update(processed=index, progress=index * 100 // total)
-            run["batches"] += 1
-            job.update(
-                status_line=_scan_status_line(
-                    run["index"],
-                    run["total"],
-                    run["batches"],
-                    time.monotonic() - run["start"],
-                )
-            )
-            await asyncio.sleep(0)  # let other requests run between batches
-
-    @staticmethod
-    def _record_conversion(job, src, result, roots, totals):
-        path, label, index = _scan_location(src, roots)
-        where = f"{label}/{path}" if label else path
-        row = {"path": path, "root": label, "root_index": index}
-        if result["action"] == "converted":
-            totals["converted"] += 1
-            totals["before"] += result["before"]
-            totals["after"] += result["after"]
-            detail = result["detail"]
-            job.record("generated", {**row, "detail": detail}, f"+ {where} · {detail}")
-            return
-        totals["failed"] += 1
-        detail = result.get("error") or "failed"
-        job.record("errors", {**row, "detail": detail}, f"! {where} · {detail}")
-
-    def _convert_batch(self, groups, settings, stop):
-        """Convert preview ``groups`` on the configured worker threads
-        (blocking); one result list per group."""
-        convert = functools.partial(self._convert_group, settings=settings, stop=stop)
-        return map_parallel(convert, groups, _worker_threads())
-
-    def _convert_group(self, group, settings, stop):
-        """Convert the preview a group of same-stem files shares, once.
-
-        The first source writes it; the others are recorded with the same
-        outcome and no bytes of their own."""
-        src, dst, is_video = group[0]
-        siblings = [Path(target[0]) for target in group[1:]]
-        result = self._convert_one(
-            src, dst, is_video, settings, stop=stop, siblings=siblings
-        )
-        if result["action"] != "converted":
-            return [result] * len(group)
-        shared = {**result, "before": 0, "after": 0}
-        shared["detail"] = f"{result['detail']} (shares {Path(src).name}'s preview)"
-        return [result] + [shared] * len(siblings)
-
-    def _convert_one(self, src, dst, is_video, settings, stop=None, siblings=()):
-        """Convert one file's preview (blocking; never raises).
-
-        ``converted`` with the bytes removed and written, ``error`` (the old
-        preview kept), ``cancelled`` (a file boundary) or ``stopped`` (the
-        format changed underneath, review I4). *siblings* share the preview
-        (R2): their old previews go too.
-        """
-        if stop is not None and stop():
-            return {"action": "cancelled"}
-        if _format_changed(settings):
-            return {"action": "stopped"}
-        dst = Path(dst)
-        try:
-            old = self._old_group_previews([Path(src), *siblings], dst, settings)
-            if not self._current_preview_usable(src, dst, settings):
-                made = self._generate_one(
-                    src, dst, settings, is_video, rebuild=True, placeholder=False
-                )
-                if made["action"] != "generated":
-                    return {"action": "error", "error": made.get("error")}
-                dst = Path(made["path"])
-            if dst.suffix != settings.extension or not dst.is_file():
-                return {"action": "error", "error": "The new preview was not written"}
-            if not os.path.isfile(src):
-                return {"action": "error", "error": SOURCE_GONE}
-            if _format_changed(settings):
-                return {"action": "stopped"}
-            old = [(path, size) for path, size in old if not _same_file(path, dst)]
-            removed, kept = self._remove_old_previews(old)
-            if kept:
-                return {"action": "error", "error": OLD_NOT_REMOVED}
-            label = thumbnail_settings.FORMAT_LABELS[settings.format]
-            return {
-                "action": "converted",
-                "before": removed,
-                "after": dst.stat().st_size,
-                "detail": f"Converted to {label}",
-            }
-        except Exception as exc:
-            self.logger.warning(f"Conversion failed for {src.name}", exc_info=True)
-            return {"action": "error", "error": safe_error_message(exc)}
-
-    @staticmethod
-    def _old_group_previews(sources, dst, settings):
-        """``[(path, size)]`` of every source's old previews, each path once."""
-        seen, old = set(), []
-        for source in sources:
-            for path, size in _old_previews(source, dst, settings):
-                key = os.path.normcase(str(path))
-                if key not in seen:
-                    seen.add(key)
-                    old.append((path, size))
-        return old
-
-    @staticmethod
-    def _current_preview_usable(src, dst, settings):
-        """A current preview at least as new as *src* that decodes (M4)."""
-        if not _thumbnail_is_fresh(src, dst):
-            return False
-        try:
-            verify_thumbnail(dst, settings.format)
-        except ThumbnailVerifyError:
-            return False
-        return True
-
-    def _remove_old_previews(self, old):
-        """``(bytes removed, [kept paths])``; a file already gone counts as
-        removed, with no bytes (another run or a sibling removed it)."""
-        removed, kept = 0, []
-        for path, size in old:
-            try:
-                os.remove(path)
-            except FileNotFoundError:
-                continue
-            except OSError as exc:
-                self.logger.warning(f"Could not remove old preview {path}: {exc}")
-                kept.append(path)
-                continue
-            removed += size
-        return removed, kept

py/api/thumbnail_encode.py

@@ -1,524 +0,0 @@
-"""Thumbnail encoders (#317): every preview file is written here.
-
-``write_thumbnail(frame, dst, settings)`` encodes a prepared frame
-(``thumbnail_frame``: the first frame, RGB, fitted inside the edge) in the
-configured format into a hidden temp sibling, closes it, verifies that it
-decodes, and renames it over ``dst`` (``os.replace``), so a reader never sees
-a partial file and a failure keeps the old preview. ``guard()`` is asked just
-before the rename (automatic previews' holds, #249).
-
-Formats: WebP (Pillow, ``method=4``) and JPEG (Pillow, ``optimize``) always
-work. JPEG XL needs no new dependency; the first encoder found is used:
-
-1. Pillow, natively or through the ``pillow_jxl`` plugin (imported when
-   installed: ``pip install pillow-jxl-plugin``), given the quality itself;
-2. ffmpeg built with ``libjxl`` (``-distance``), fed a PNG on stdin;
-3. ``cjxl`` from libjxl (``-d``), fed a temp PNG that is closed first.
-
-Quality maps to a JPEG XL distance with libjxl's own
-``JxlEncoderDistanceFromQuality``: ``0.1 + (100 - q) * 0.09`` from 30 up
-(q80 → d1.9, q85 → d1.45, q90 → d1.0), the quadratic below 30, and q100 →
-d0.1 (a preview is never lossless). Pillow's plugin applies the same mapping
-inside libjxl. Detection is cached (``detect_jxl_encoder(refresh=True)``
-probes again); "none found" is probed again on the settings read
-(``encoder_status``) and after MISSING_ENCODER_TTL, so one slow probe never
-turns JPEG XL off until a restart. An encoder that fails because its binary
-or module is gone makes that write detect again: another encoder found is
-used for that file, none at all writes it as WebP (logged once) and
-refreshes what Appearance reads. Any other failure (one bad file) raises
-without a probe.
-
-Encoder processes (and ffmpeg's video frames, images.py) go through
-``run_encoder``: tracked, bounded by a timeout, and killed by
-``shutdown_encoders()`` at the app's cleanup, after which none starts.
-"""
-
-import importlib
-import io
-import os
-import re
-import shutil
-import subprocess  # nosec B404 - fixed argv lists, never a shell
-import threading
-import time
-from dataclasses import replace
-from pathlib import Path
-
-from PIL import Image
-
-from . import thumbnail_settings
-
-try:
-    from ...utils.logging_config import get_logger
-except ImportError:  # tests import the package top-level
-    from utils.logging_config import get_logger
-
-logger = get_logger("prompt_manager.thumbnails")
-
-PILLOW_JXL_FORMAT = "JXL"
-JXL_UNAVAILABLE = (
-    "No JPEG XL encoder found. Install pillow-jxl-plugin "
-    "(pip install pillow-jxl-plugin), ffmpeg built with libjxl, or cjxl from "
-    "libjxl, then restart ComfyUI."
-)
-# Seconds an encoder process may run (ffmpeg's video frame shares it).
-ENCODE_TIMEOUT = 30
-PROBE_TIMEOUT = 10
-JXL_EFFORT = 7
-WEBP_METHOD = 4
-JXL_SIGNATURES = (b"\xff\x0a", b"\x00\x00\x00\x0cJXL \r\n\x87\n")
-_NO_WINDOW = getattr(subprocess, "CREATE_NO_WINDOW", 0)
-
-
-class PreviewWriteHeld(Exception):
-    """A preview write stopped before its rename: ``guard()`` said no (#249)."""
-
-
-# The result error of a write held before its rename (never remembered).
-PREVIEW_HELD = "Preview writes are held while another job runs"
-
-
-class ThumbnailVerifyError(RuntimeError):
-    """The encoded preview did not decode; it was never renamed in."""
-
-
-class EncoderFailed(RuntimeError):
-    """An encoder process failed or wrote nothing."""
-
-
-class EncoderClosed(RuntimeError):
-    """The app is shutting down: no encoder process runs any more."""
-
-
-# ── temp files ───────────────────────────────────────────────────────
-
-
-def temp_sibling(dst, tag="part"):
-    """Hidden temp path next to *dst* that keeps its extension."""
-    dst = Path(dst)
-    token = f"{os.getpid()}-{threading.get_ident()}"
-    return dst.with_name(f".{dst.stem}.{tag}-{token}{dst.suffix}")
-
-
-def replace_unless_held(tmp, dst, guard=None):
-    """Rename *tmp* over *dst*, unless ``guard()`` is false (PreviewWriteHeld)."""
-    if guard is not None and not guard():
-        raise PreviewWriteHeld(PREVIEW_HELD)
-    os.replace(tmp, dst)
-
-
-# ``temp_sibling``'s names: ``.<stem>.<tag>-<pid>-<thread id><ext>``.
-_TEMP_NAME = re.compile(r"^\..+\.(?:part|src)-(\d+)-\d+\.[A-Za-z0-9]+$")
-# A temp at least this old (seconds) outlived its write: no encode runs longer.
-STRAY_TEMP_AGE = 4 * ENCODE_TIMEOUT
-# When this process started (this module's import): a temp carrying its PID
-# that is older was left by an earlier run with the same PID (containers).
-PROCESS_STARTED = time.time()
-
-
-def sweep_stray_temps(folder, min_age=None):
-    """Remove the temp files a crashed write left under *folder* (a preview
-    folder, walked without following links); returns ``(count, bytes)``.
-
-    Only ``temp_sibling`` names are touched, never a link. With *min_age*
-    (seconds, the startup sweep) a temp younger than that, or one this
-    process wrote since it started (it may still be writing it), is left;
-    ``min_age=0`` (the clear, which holds every preview write) removes them
-    all.
-    """
-    min_age = STRAY_TEMP_AGE if min_age is None else min_age
-    now = time.time()
-    own = str(os.getpid())
-    count = size = 0
-    for root, _dirs, files in os.walk(folder):
-        for name in files:
-            match = _TEMP_NAME.match(name)
-            if match is None:
-                continue
-            path = Path(root) / name
-            try:
-                stat = path.lstat()
-                if path.is_symlink() or not path.is_file():
-                    continue
-                if min_age and (
-                    now - stat.st_mtime < min_age
-                    or (match.group(1) == own and stat.st_mtime >= PROCESS_STARTED)
-                ):
-                    continue
-                path.unlink()
-            except OSError as exc:
-                logger.debug(f"Could not remove stray temp {name}: {exc}")
-                continue
-            count += 1
-            size += stat.st_size
-    return count, size
-
-
-def _unlink_quietly(path):
-    try:
-        Path(path).unlink()
-    except FileNotFoundError:
-        pass
-    except OSError as exc:
-        logger.debug(f"Could not remove temp file {Path(path).name}: {exc}")
-
-
-# ── encoder processes ────────────────────────────────────────────────
-
-_process_lock = threading.Lock()
-_processes = set()
-_closed = False
-
-
-def run_encoder(cmd, *, input=None, timeout=ENCODE_TIMEOUT, track=None):
-    """Run *cmd* (a fixed argv) with *input* on stdin; returns a
-    CompletedProcess with bytes output.
-
-    The process is tracked so ``shutdown_encoders`` can kill it; past
-    *timeout* it is killed and TimeoutExpired raised. After the shutdown
-    nothing starts (EncoderClosed). ``track(process)`` sees it too.
-    """
-    with _process_lock:
-        if _closed:
-            raise EncoderClosed("Encoders are shut down")
-    process = subprocess.Popen(  # nosec B603 - fixed argv, no shell
-        cmd,
-        stdin=subprocess.PIPE if input is not None else subprocess.DEVNULL,
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
-        creationflags=_NO_WINDOW,
-    )
-    with _process_lock:
-        _processes.add(process)
-        closed = _closed
-    try:
-        if closed:
-            process.kill()
-        if track is not None:
-            track(process)
-        try:
-            out, err = process.communicate(input=input, timeout=timeout)
-        except subprocess.TimeoutExpired:
-            process.kill()
-            process.communicate()
-            raise
-    finally:
-        with _process_lock:
-            _processes.discard(process)
-            closed = _closed
-    if closed:
-        raise EncoderClosed("Encoder stopped by the shutdown")
-    return subprocess.CompletedProcess(cmd, process.returncode, out, err)
-
-
-def shutdown_encoders():
-    """Kill every running encoder process; none starts afterwards."""
-    global _closed
-    with _process_lock:
-        _closed = True
-        running = list(_processes)
-    for process in running:
-        try:
-            process.kill()
-        except OSError:
-            pass
-
-
-def reset_encoders():
-    """Allow encoders again and forget the detection (tests, a reload)."""
-    global _closed, _detected, _fallback_logged
-    with _process_lock:
-        _closed = False
-    with _detect_lock:
-        _detected = _UNSET
-        _fallback_logged = False
-
-
-# ── JPEG XL detection ────────────────────────────────────────────────
-
-_UNSET = object()
-_detect_lock = threading.Lock()
-_detected = _UNSET
-_detected_at = 0.0
-# Seconds after which "no JPEG XL encoder" is probed again.
-MISSING_ENCODER_TTL = 60
-_fallback_logged = False
-
-
-def _pillow_jxl_format():
-    """Pillow's JPEG XL format id when it can save one, else None."""
-    try:
-        native = Image.registered_extensions().get(".jxl")
-    except Exception:
-        native = None
-    if native and native in Image.SAVE:
-        return native
-    return PILLOW_JXL_FORMAT if PILLOW_JXL_FORMAT in Image.SAVE else None
-
-
-def _pillow_can_save_jxl():
-    if _pillow_jxl_format():
-        return True
-    try:
-        importlib.import_module("pillow_jxl")
-    except Exception:
-        return False
-    return _pillow_jxl_format() is not None
-
-
-def _pillow_decodes_jxl():
-    try:
-        native = Image.registered_extensions().get(".jxl")
-    except Exception:
-        native = None
-    return bool(native and native in Image.OPEN) or PILLOW_JXL_FORMAT in Image.OPEN
-
-
-def _ffmpeg_has_libjxl():
-    """Whether the ffmpeg on PATH lists the ``libjxl`` encoder."""
-    if not shutil.which("ffmpeg"):
-        return False
-    try:
-        done = run_encoder(
-            ["ffmpeg", "-hide_banner", "-encoders"], timeout=PROBE_TIMEOUT
-        )
-    except (OSError, subprocess.SubprocessError, EncoderClosed):
-        return False
-    listing = done.stdout
-    if isinstance(listing, bytes):
-        listing = listing.decode("utf-8", "replace")
-    return any(
-        len(line.split()) > 1 and line.split()[1] == "libjxl"
-        for line in listing.splitlines()
-    )
-
-
-def _detect():
-    if _pillow_can_save_jxl():
-        return "pillow"
-    if _ffmpeg_has_libjxl():
-        return "ffmpeg"
-    if shutil.which("cjxl"):
-        return "cjxl"
-    return None
-
-
-def detect_jxl_encoder(refresh=False, recheck_missing=False):
-    """``pillow``, ``ffmpeg``, ``cjxl`` or None (cached; blocking on a probe).
-
-    A cached None is probed again with *recheck_missing* or once it is older
-    than MISSING_ENCODER_TTL."""
-    global _detected, _detected_at
-    with _detect_lock:
-        now = time.monotonic()
-        stale_missing = _detected is None and (
-            recheck_missing or now - _detected_at >= MISSING_ENCODER_TTL
-        )
-        if refresh or _detected is _UNSET or stale_missing:
-            _detected = _detect()
-            _detected_at = now
-        return _detected
-
-
-def _encoder_gone(encoder):
-    """Whether *encoder*'s binary or module is no longer there."""
-    if encoder == "pillow":
-        return not _pillow_can_save_jxl()
-    return shutil.which(encoder) is None
-
-
-def encoder_status():
-    """Which formats can be written now (``GET /prompt_manager/settings``;
-    a "none found" is probed again here)."""
-    encoder = detect_jxl_encoder(recheck_missing=True)
-    return {
-        "webp": {"available": True},
-        "jpeg": {"available": True},
-        "jxl": {
-            "available": encoder is not None,
-            "encoder": encoder,
-            "reason": None if encoder is not None else JXL_UNAVAILABLE,
-        },
-    }
-
-
-def jxl_distance(quality):
-    """libjxl's distance for a 1–100 quality (q100 gives 0.1, never lossless)."""
-    if quality >= 100:
-        return 0.1
-    if quality >= 30:
-        return 0.1 + (100 - quality) * 0.09
-    return 53.0 / 3000.0 * quality * quality - 23.0 / 20.0 * quality + 25.0
-
-
-# ── frames and writers ───────────────────────────────────────────────
-
-
-def thumbnail_frame(img, edge):
-    """The first frame of *img* as RGB, fitted inside ``edge`` x ``edge``."""
-    try:
-        img.seek(0)
-    except (EOFError, AttributeError, ValueError):
-        pass
-    try:
-        img.draft("RGB", (edge, edge))  # JPEG: decode at a reduced scale
-    except (AttributeError, ValueError, OSError):
-        pass
-    frame = img.convert("RGB") if img.mode != "RGB" else img.copy()
-    frame.thumbnail((edge, edge), Image.Resampling.LANCZOS)
-    return frame
-
-
-def _png_bytes(img):
-    buffer = io.BytesIO()
-    img.save(buffer, "PNG", compress_level=1)
-    return buffer.getvalue()
-
-
-def _write_webp(img, tmp, settings, track):
-    img.save(tmp, "WEBP", quality=settings.quality, method=WEBP_METHOD)
-
-
-def _write_jpeg(img, tmp, settings, track):
-    img.save(tmp, "JPEG", quality=settings.quality, optimize=True)
-
-
-def _check(done, tmp, name):
-    if done.returncode != 0 or not Path(tmp).is_file():
-        detail = (done.stderr or b"")[-300:]
-        if isinstance(detail, bytes):
-            detail = detail.decode("utf-8", "replace")
-        raise EncoderFailed(f"{name} could not encode the preview: {detail.strip()}")
-
-
-class _EncoderGone(RuntimeError):
-    """No JPEG XL encoder is left: this file is written as WebP."""
-
-
-def _write_jxl(img, tmp, settings, track):
-    """Encode with the detected encoder. One that failed because it is gone
-    makes the write detect again once (another one is used, none raises
-    _EncoderGone); any other failure raises without a probe."""
-    encoder = detect_jxl_encoder()
-    try:
-        _encode_jxl(encoder, img, tmp, settings, track)
-        return
-    except (OSError, EncoderFailed) as exc:
-        if encoder is not None and not _encoder_gone(encoder):
-            raise
-        again = detect_jxl_encoder(refresh=True)
-        if again is None:
-            raise _EncoderGone(str(exc)) from exc
-        if again == encoder:
-            raise
-        logger.info(f"JPEG XL encoder {encoder} failed; using {again}")
-    _unlink_quietly(tmp)
-    _encode_jxl(again, img, tmp, settings, track)
-
-
-def _encode_jxl(encoder, img, tmp, settings, track):
-    distance = f"{jxl_distance(settings.quality):.2f}"
-    if encoder == "pillow":
-        img.save(
-            tmp,
-            _pillow_jxl_format() or PILLOW_JXL_FORMAT,
-            quality=min(settings.quality, 99),
-            effort=JXL_EFFORT,
-            num_threads=1,
-        )
-        return
-    if encoder == "ffmpeg":
-        cmd = [
-            "ffmpeg", "-v", "error", "-f", "png_pipe", "-i", "-",
-            "-frames:v", "1", "-c:v", "libjxl", "-distance", distance,
-            "-effort", str(JXL_EFFORT), "-f", "image2", "-update", "1",
-            "-y", str(tmp),
-        ]  # fmt: skip
-        _check(run_encoder(cmd, input=_png_bytes(img), track=track), tmp, "ffmpeg")
-        return
-    if encoder == "cjxl":
-        source = temp_sibling(Path(tmp).with_suffix(".png"), "src")
-        try:
-            with open(source, "wb") as handle:
-                handle.write(_png_bytes(img))
-            cmd = ["cjxl", str(source), str(tmp), "-d", distance, "-e", str(JXL_EFFORT)]
-            _check(run_encoder(cmd, track=track), tmp, "cjxl")
-        finally:
-            _unlink_quietly(source)
-        return
-    raise EncoderFailed(JXL_UNAVAILABLE)
-
-
-_WRITERS = {"webp": _write_webp, "jpeg": _write_jpeg, "jxl": _write_jxl}
-
-
-def verify_thumbnail(path, fmt):
-    """Raise ThumbnailVerifyError unless *path* decodes as a preview.
-
-    A JPEG XL file Pillow cannot read (no plugin) is checked by signature.
-    """
-    try:
-        if fmt == "jxl" and not _pillow_decodes_jxl():
-            with open(path, "rb") as handle:
-                head = handle.read(12)
-            if not head.startswith(JXL_SIGNATURES):
-                raise ThumbnailVerifyError("The JPEG XL preview has no signature")
-            return
-        with Image.open(path) as written:
-            written.load()
-    except ThumbnailVerifyError:
-        raise
-    except Exception as exc:
-        raise ThumbnailVerifyError(f"The new preview does not decode: {exc}") from exc
-
-
-def _jxl_fallback():
-    """Log once that JPEG XL previews are being written as WebP."""
-    global _fallback_logged
-    with _detect_lock:
-        first, _fallback_logged = not _fallback_logged, True
-    if first:
-        logger.warning(
-            "JPEG XL is the thumbnail format but no JPEG XL encoder is available "
-            "any more; previews are written as WebP until one is installed"
-        )
-
-
-def writer_settings(settings=None):
-    """The settings a preview is written with now: the configured ones, but
-    WebP while JPEG XL has no encoder (logged once). Its extension names the
-    file, so "outdated" means a preview this server would not write now."""
-    settings = settings or thumbnail_settings.current()
-    if settings.format == "jxl" and detect_jxl_encoder() is None:
-        _jxl_fallback()
-        return replace(settings, format="webp")
-    return settings
-
-
-def write_thumbnail(frame, dst, settings, *, guard=None, track=None):
-    """Encode *frame* into *dst* in ``settings``' format; returns the path
-    written (``.webp`` when JPEG XL fell back). Atomic and verified; raises
-    PreviewWriteHeld, ThumbnailVerifyError, EncoderFailed, EncoderClosed or
-    the OSError of the write."""
-    dst = Path(dst)
-    fmt = settings.format
-    if fmt == "jxl" and detect_jxl_encoder() is None:
-        _jxl_fallback()
-        fmt, dst = "webp", dst.with_suffix(".webp")
-    try:
-        return _write_verified(frame, dst, fmt, settings, guard, track)
-    except _EncoderGone:
-        _jxl_fallback()
-        dst = dst.with_suffix(".webp")
-        return _write_verified(frame, dst, "webp", settings, guard, track)
-
-
-def _write_verified(frame, dst, fmt, settings, guard, track):
-    tmp = temp_sibling(dst)
-    try:
-        _WRITERS[fmt](frame, tmp, settings, track)
-        verify_thumbnail(tmp, fmt)
-        replace_unless_held(tmp, dst, guard)
-    finally:
-        _unlink_quietly(tmp)
-    return dst

py/api/thumbnail_jobs.py

@@ -1,32 +1,29 @@
-"""Thumbnail generation as an Activity job (#249 System S5, Task 12; #317).
+"""Thumbnail generation as an Activity job (#249 System S5, Task 12).
 
-- ``GET /prompt_manager/images/thumbnails/plan?mode=`` counts what a run
-  would do over every gallery root and writes nothing: ``{success, targets,
-  fresh, outdated, remaining, roots, mode, format, quality, size}``.
-- ``POST /prompt_manager/jobs/thumbnails {mode}`` starts the ``thumbnails``
-  job (202 ``{job}``). Its admission class is ``guarded``: it never runs
-  beside a record-changing job, and one thumbnail job runs at a time. It
-  stops at a file boundary when cancelled, keeping the previews it wrote.
-  Its outcome groups are ``generated``, ``skipped`` (already fresh) and
-  ``errors``.
+- ``GET /prompt_manager/images/thumbnails/plan?mode=&size=&quality=`` counts
+  what a run would do over every gallery root and writes nothing:
+  ``{success, targets, fresh, remaining, roots, mode, size, quality}``.
+- ``POST /prompt_manager/jobs/thumbnails {mode, size, quality}`` starts the
+  ``thumbnails`` job (202 ``{job}``). Its admission class is ``guarded``: it
+  never runs beside a record-changing job, and one thumbnail job runs at a
+  time. It stops at a file boundary when cancelled, keeping the previews it
+  wrote. Its outcome groups are ``generated``, ``skipped`` (already fresh)
+  and ``errors``.
 
-``mode`` is ``missing`` (previews that are absent or older than their file),
-``rebuild`` (every preview again, fresh ones too) or ``convert`` (Convert
-outdated: previews in another format, see ``thumbnail_convert.py``). Format, quality and
-size limit are the server's thumbnail settings (``thumbnail_settings``,
-#317), read once when the job starts and shown in its scope; a ``size`` or
-``quality`` an older client sends is ignored. Every preview is written next
-to the old one, verified and renamed over it, so nothing is cleared first and
-a failure keeps the old preview; originals are only read.
+``mode`` is ``missing`` (previews that are absent or older than their file)
+or ``rebuild`` (every preview again, fresh ones too). ``size`` is the
+preview's longest edge, 128 to 2048 pixels. ``quality`` picks the encoder
+settings (``THUMBNAIL_ENCODINGS``). Every preview is written next to the old
+one and renamed over it, so nothing is cleared first and a failure keeps the
+old preview; originals are only read.
 
 The legacy gallery stream ``POST /images/generate-thumbnails/progress``
-starts this job (missing previews, the server's settings; its ``quality``
-preset is ignored, #317 R3) or attaches to the running one. Its first frame,
-``job {id, started}``, names that job and whether this stream started it (the
-gallery cancels by that id, and only a job it started); then come the job's
-legacy ``status``/``start``/``progress``/``file_error``/``complete`` frames. A
-client that goes away no longer stops the work: the job outlives the request,
-as a scan does.
+starts this job (its quality preset still sizes the previews) or attaches to
+the running one. Its first frame, ``job {id, started}``, names that job and
+whether this stream started it (the gallery cancels by that id, and only a
+job it started); then come the job's legacy ``status``/``start``/
+``progress``/``file_error``/``complete`` frames. A client that goes away no
+longer stops the work: the job outlives the request, as a scan does.
 """
 
 import asyncio
@@ -39,6 +36,7 @@ from aiohttp import web
 
 from .admin import _plural, _scan_location, _scan_roots, _scan_status_line
 from .images import (
+    THUMBNAIL_ENCODINGS,
     _BodyTooLarge,
     _new_thumbnail_stats,
     _read_json_body,
@@ -50,13 +48,24 @@ from .images import (
 )
 from .job_routes import busy_response
 from .jobs import THUMBNAIL_GROUP_NAMES, THUMBNAILS_JOB_KIND, JobBusy
-from .thumbnail_convert import CONVERT_JOB_TITLE
-from .thumbnail_encode import writer_settings
-from .thumbnail_settings import ThumbnailSettings
 
 THUMBNAIL_JOB_TITLE = "Thumbnail generation"
-THUMBNAIL_MODES = ("missing", "rebuild", "convert")
-_OPTIONS_ERROR = 'mode must be "missing", "rebuild" or "convert"'
+THUMBNAIL_MODES = ("missing", "rebuild")
+THUMBNAIL_QUALITIES = tuple(THUMBNAIL_ENCODINGS)
+MIN_THUMBNAIL_EDGE = 128
+MAX_THUMBNAIL_EDGE = 2048
+# The concept's "Preview size limit" default.
+DEFAULT_THUMBNAIL_EDGE = 512
+DEFAULT_THUMBNAIL_OPTIONS = {
+    "mode": "missing",
+    "size": DEFAULT_THUMBNAIL_EDGE,
+    "quality": "medium",
+}
+_OPTIONS_ERROR = (
+    'mode must be "missing" or "rebuild", quality "low", "medium" or "high", '
+    f"and size a whole number of pixels from {MIN_THUMBNAIL_EDGE} "
+    f"to {MAX_THUMBNAIL_EDGE}"
+)
 CANCELLED_ERROR = "Thumbnail generation was cancelled"
 CANCELLED_BEFORE_WRITING = "Cancelled before any preview was written"
 NOTHING_TO_PREVIEW = "No images or videos to preview"
@@ -71,35 +80,56 @@ _LOG_PREFIXES = {"generated": "+", "errors": "!"}
 
 @dataclass(frozen=True)
 class ThumbnailOptions:
-    """One run's choices: the mode and the thumbnail settings it writes with."""
+    """One run's choices: the mode, the preview's longest edge and quality."""
 
     mode: str
-    settings: ThumbnailSettings
+    edge: int
+    quality: str
+
+    @property
+    def size(self):
+        return (self.edge, self.edge)
+
+    @property
+    def encoding(self):
+        return THUMBNAIL_ENCODINGS[self.quality]
 
     @property
     def rebuild(self):
         return self.mode == "rebuild"
 
     def scope(self):
-        return {
-            "mode": self.mode,
-            "format": self.settings.format,
-            "quality": self.settings.quality,
-            "size": self.settings.edge,
-        }
+        return {"mode": self.mode, "size": self.edge, "quality": self.quality}
+
+
+def _edge(value, *, from_query):
+    """The preview edge as an int, or None when it is not one in range."""
+    if from_query and isinstance(value, str):
+        if not value.isascii() or not value.isdigit() or len(value) > 5:
+            return None
+        value = int(value)
+    if isinstance(value, bool) or not isinstance(value, int):
+        return None
+    return value if MIN_THUMBNAIL_EDGE <= value <= MAX_THUMBNAIL_EDGE else None
 
 
 def thumbnail_options(raw, *, from_query=False):
     """``(ThumbnailOptions, None)`` from a body or query, or ``(None, message)``.
 
-    An absent mode is ``missing``; the settings are the server's now.
+    Absent fields take ``DEFAULT_THUMBNAIL_OPTIONS``. Query values are
+    strings, so a query ``size`` may be decimal digits; a JSON ``size`` must
+    be an int.
     """
     if not isinstance(raw, dict) and not hasattr(raw, "get"):
         return None, _OPTIONS_ERROR
-    mode = raw.get("mode", "missing")
-    if mode not in THUMBNAIL_MODES:
+    mode = raw.get("mode", DEFAULT_THUMBNAIL_OPTIONS["mode"])
+    quality = raw.get("quality", DEFAULT_THUMBNAIL_OPTIONS["quality"])
+    edge = _edge(raw.get("size", DEFAULT_THUMBNAIL_EDGE), from_query=from_query)
+    if mode not in THUMBNAIL_MODES or quality not in THUMBNAIL_QUALITIES:
         return None, _OPTIONS_ERROR
-    return ThumbnailOptions(mode, writer_settings()), None
+    if edge is None:
+        return None, _OPTIONS_ERROR
+    return ThumbnailOptions(mode, edge, quality), None
 
 
 def _invalid(message):
@@ -138,10 +168,7 @@ class ThumbnailJobsMixin:
         try:
             output_dirs = await self._run_in_executor(self._get_all_output_dirs)
             plan = await self._run_in_executor(
-                self._plan_gallery_thumbnails,
-                output_dirs,
-                options.mode,
-                settings=options.settings,
+                self._plan_gallery_thumbnails, output_dirs, rebuild=options.rebuild
             )
         except Exception:
             self.logger.exception("Thumbnail plan failed")
@@ -158,7 +185,6 @@ class ThumbnailJobsMixin:
                 "success": True,
                 "targets": len(plan["targets"]),
                 "fresh": plan["fresh"],
-                "outdated": plan["outdated"],
                 "remaining": plan["remaining"],
                 "roots": [self._public_path(root) for root in output_dirs],
                 **options.scope(),
@@ -189,20 +215,14 @@ class ThumbnailJobsMixin:
         return web.json_response({"success": True, "job": job.summary()}, status=202)
 
     def _start_thumbnail_job(self, options):
-        """Register the thumbnail job synchronously; raises JobBusy.
-
-        ``convert`` runs Convert outdated (``thumbnail_convert.py``) under the
-        same kind, admission, cancel and groups.
-        """
-        convert = options.mode == "convert"
-        runner = self._run_convert_job if convert else self._run_thumbnail_job
+        """Register the thumbnail job synchronously; raises JobBusy."""
         return self._jobs.start(
             THUMBNAILS_JOB_KIND,
-            CONVERT_JOB_TITLE if convert else THUMBNAIL_JOB_TITLE,
+            THUMBNAIL_JOB_TITLE,
             admission="guarded",
             cancellable=True,
             scope=options.scope(),
-            runner=functools.partial(runner, options=options),
+            runner=functools.partial(self._run_thumbnail_job, options=options),
             groups=THUMBNAIL_GROUP_NAMES,
         )
 
@@ -245,7 +265,7 @@ class ThumbnailJobsMixin:
         job.update(status_line=f"Looking for media files in {folders}")
         job.log_line(
             f"Thumbnails started · {folders} · {_MODE_LOG[options.mode]} · "
-            f"{options.settings.describe()}"
+            f"{options.edge} px · {options.quality}"
         )
         job.publish(
             _frame(
@@ -253,83 +273,41 @@ class ThumbnailJobsMixin:
                 {"phase": "scanning", "message": "Scanning for images and videos..."},
             )
         )
-        plan = await self._plan_thumbnail_batch(job, options, output_dirs)
+        plan = await self._run_in_executor(
+            self._plan_gallery_thumbnails,
+            output_dirs,
+            rebuild=options.rebuild,
+            stop=lambda: job.cancelled,
+        )
         if job.cancelled:  # M2: stopped during the walk, before any start frame
             return self._end_cancelled(job, 0, CANCELLED_BEFORE_WRITING)
         roots = _scan_roots(output_dirs)
         self._record_fresh(job, plan, roots)
-        stats, start, left, attempted = await self._generate_in_batches(
-            job, options, plan, roots, output_dirs
-        )
+        stats, start = await self._generate_thumbnail_targets(job, options, plan, roots)
+        self.invalidate_gallery_cache()
         generated = _plural(stats["generated"], "preview")
         if job.cancelled:
             return self._end_cancelled(
                 job, stats["generated"], f"Cancelled · {generated} written"
             )
-        overall = {"targets": attempted, "skipped": plan["skipped"], "remaining": left}
         payload = _thumbnail_complete_payload(
-            len(attempted) + plan["skipped"] + left,
+            len(plan["targets"]) + plan["skipped"] + plan["remaining"],
             stats,
             start,
-            remaining=left,
-            processed=len(attempted),
+            remaining=plan["remaining"],
+            processed=len(plan["targets"]),
         )
-        job.update(progress=100, status_line=_finished_line(overall, stats))
-        if left:
-            job.log_line(f"{left:,} more previews are left for the next run")
+        job.update(progress=100, status_line=_finished_line(plan, stats))
+        if plan["remaining"]:
+            job.log_line(
+                f"{plan['remaining']:,} more previews are left for the next run"
+            )
         errors = _plural(len(stats["errors"]), "error")
         job.log_line(f"Thumbnails finished · {generated} written · {errors}")
         self.logger.info(payload["message"])
         job.publish(_frame("complete", payload))
         return "finished"
 
-    async def _plan_thumbnail_batch(self, job, options, output_dirs, exclude=None):
-        """One batch's plan (at most MAX_THUMBNAIL_FILES targets), off-loop."""
-        return await self._run_in_executor(
-            self._plan_gallery_thumbnails,
-            output_dirs,
-            options.mode,
-            stop=lambda: job.cancelled,
-            settings=options.settings,
-            exclude=exclude,
-        )
-
-    async def _generate_in_batches(self, job, options, plan, roots, output_dirs):
-        """Work through ``plan``, then plan again after each batch until
-        nothing is left, the job is cancelled, or a batch made no progress
-        (every file failed: they are not planned again, and the rest waits
-        for the next run). Files worked on are never planned twice. Returns
-        ``(stats, start, files left, files worked on)``; progress counts
-        against the overall total."""
-        run = {
-            "index": 0,
-            "batches": 0,
-            "total": len(plan["targets"]) + plan["remaining"],
-        }
-        stats = _new_thumbnail_stats()
-        stats["skipped"] = plan["skipped"]
-        start = time.monotonic()
-        self._publish_thumbnail_start(job, plan, run["total"])
-        attempted = set()
-        while True:
-            before = stats["generated"] + stats["skipped"]
-            await self._generate_thumbnail_targets(
-                job, options, plan, roots, stats, run, start
-            )
-            attempted.update(src for src, _dst, _video in plan["targets"])
-            progressed = stats["generated"] + stats["skipped"] > before
-            if job.cancelled or not plan["remaining"] or not progressed:
-                return stats, start, plan["remaining"], attempted
-            plan = await self._plan_thumbnail_batch(
-                job, options, output_dirs, exclude=attempted
-            )
-            if job.cancelled:
-                return stats, start, 0, attempted
-            run["total"] = run["index"] + len(plan["targets"]) + plan["remaining"]
-            job.update(total=run["total"])
-            if not plan["targets"]:
-                return stats, start, plan["remaining"], attempted
-
     @staticmethod
     def _end_cancelled(job, generated, status_line):
         """Close a cancelled job: its status line, log line and error frame."""
@@ -357,10 +335,10 @@ class ThumbnailJobsMixin:
         if plan["skipped"]:
             job.log_line(f"= {plan['skipped']:,} previews already up to date")
 
-    @staticmethod
-    def _publish_thumbnail_start(job, plan, total):
-        """The legacy stream's start frame, with the job's overall total."""
+    async def _generate_thumbnail_targets(self, job, options, plan, roots):
+        """Generate ``plan``'s targets in worker batches, publishing each file."""
         targets = plan["targets"]
+        total = len(targets)
         video_count = sum(1 for _, _, is_video in targets if is_video)
         message = (
             f"Found {total - video_count} images and {video_count} videos to process"
@@ -376,7 +354,7 @@ class ThumbnailJobsMixin:
                 {
                     "total_images": total,
                     "skipped": plan["skipped"],
-                    "remaining": 0,
+                    "remaining": plan["remaining"],
                     "phase": "processing",
                     "image_count": total - video_count,
                     "video_count": video_count,
@@ -384,30 +362,28 @@ class ThumbnailJobsMixin:
                 },
             )
         )
-
-    async def _generate_thumbnail_targets(
-        self, job, options, plan, roots, stats, run, start
-    ):
-        """Generate one batch (``plan``'s targets) in worker batches,
-        publishing each file against the job's overall ``run`` counters."""
-        targets = plan["targets"]
+        stats = _new_thumbnail_stats()
+        stats["skipped"] = plan["skipped"]
+        start = time.monotonic()
         batch_size = _thumbnail_batch_size(_worker_threads())
         generate = {
+            "encoding": options.encoding,
             "rebuild": options.rebuild,
             "stop": lambda: job.cancelled,
         }
-        for batch_start in range(0, len(targets), batch_size):
+        index = 0
+        batches = 0
+        for batch_start in range(0, total, batch_size):
             if job.cancelled:
                 break
             batch = targets[batch_start : batch_start + batch_size]
             results = await self._run_in_executor(
-                self._generate_batch, batch, options.settings, **generate
+                self._generate_batch, batch, options.size, **generate
             )
             for (src, _dst, _video), result in zip(batch, results):
                 if result["action"] == "cancelled":
                     continue
-                run["index"] += 1
-                index, total = run["index"], max(run["total"], run["index"])
+                index += 1
                 _record_thumbnail_result(stats, result)
                 self._record_thumbnail_outcome(job, src, result, roots)
                 job.update(processed=index, progress=index * 100 // total)
@@ -424,13 +400,14 @@ class ThumbnailJobsMixin:
                         _thumbnail_progress_payload(index, total, stats, result, start),
                     )
                 )
-            run["batches"] += 1
+            batches += 1
             job.update(
                 status_line=_scan_status_line(
-                    run["index"], run["total"], run["batches"], time.monotonic() - start
+                    index, total, batches, time.monotonic() - start
                 )
             )
             await asyncio.sleep(0)  # let other requests run between batches
+        return stats, start
 
     @staticmethod
     def _record_thumbnail_outcome(job, src, result, roots):
@@ -453,13 +430,14 @@ class ThumbnailJobsMixin:
     async def generate_thumbnails_with_progress(self, request):
         """The gallery's thumbnail stream (POST, server-sent events).
 
-        Starts the thumbnail job (missing previews with the server's
-        thumbnail settings; the gallery's ``quality`` preset is ignored, R3),
-        or attaches to the running thumbnail job, and streams its frames. A
+        Starts the thumbnail job with the gallery's quality preset as the
+        preview size (missing previews, medium encoding, as before), or
+        attaches to the running thumbnail job, and streams its frames. A
         legacy hold (the blocking generate or clear) or a record-changing
         job refuses it with the stream's error frame. The job goes on when
         the client goes away.
         """
+        thumbnail_size = self._thumbnail_size(request.query.get("quality", "medium"))
         response = web.StreamResponse(
             status=200,
             headers={
@@ -471,7 +449,7 @@ class ThumbnailJobsMixin:
         await response.prepare(request)
         # M3: read the registry after the last await, so a job that started
         # while the headers went out is attached to, not refused.
-        job, started, busy = self._legacy_stream_job()
+        job, started, busy = self._legacy_stream_job(thumbnail_size)
         if busy is not None:
             message = f"{busy.title} already running"
             await self._emit_sse(
@@ -498,21 +476,19 @@ class ThumbnailJobsMixin:
             await events.aclose()
         return response
 
-    def _legacy_stream_job(self):
+    def _legacy_stream_job(self, thumbnail_size):
         """``(job, started, busy)`` for the legacy stream, synchronously.
 
-        Attaches to the running cancellable thumbnail job, or starts one for
-        the missing previews with the server's settings, or names the job in
-        the way.
+        Attaches to the running cancellable thumbnail job, or starts one with
+        the gallery's preset as the size (missing previews, medium encoding,
+        as the gallery always wrote), or names the job in the way.
         """
         running = self._jobs.active(THUMBNAILS_JOB_KIND)
-        if running is not None and running.scope.get("mode") == "convert":
-            return None, False, running  # no legacy frames to follow (#317)
         if running is not None and running.cancellable:
             return running, False, None
         busy = self._jobs.blocker(THUMBNAILS_JOB_KIND, admission="guarded")
         if busy is not None:
             return None, False, busy
         # blocker() said free and nothing awaited since, so the start is admitted.
-        options = ThumbnailOptions("missing", writer_settings())
+        options = ThumbnailOptions("missing", thumbnail_size[0], "medium")
         return self._start_thumbnail_job(options), True, None

py/api/thumbnail_settings.py

@@ -1,228 +0,0 @@
-"""Thumbnail settings and names (#317): the one place every preview writer reads.
-
-Settings (System › Appearance, ``POST /prompt_manager/settings``, config.json
-``thumbnails``): ``thumbnail_format`` (``webp`` default, ``jxl``, ``jpeg``),
-``thumbnail_quality`` (1–100, default 80) and ``thumbnail_edge`` (the longest
-edge, 128–2048 px, default 512). ``current()`` is the snapshot a writer takes
-once per preview; automatic previews, the Activity job, the history route and
-the legacy gallery routes all go through it.
-
-Names: a media file ``<rel>/<stem>.<ext>`` previews as
-``thumbnails/<rel>/<stem>_thumb<extension of the format>`` (``.webp``,
-``.jxl``, ``.jpg``), images and videos alike. Two files with one stem in one
-folder share that name (ruling R2). Older releases kept the source's own
-extension (``.png``, ``.jpeg``, ``.gif``, ``.webp``, ``.jpg``; ``.jpg`` for a
-video): those are read, served and converted, never written. A preview with a
-format extension (``.webp``, ``.jxl``, ``.jpg``) belongs to every same-stem
-source; a legacy-only one (``.png``, ``.jpeg``, ``.gif``) only to a source
-with that extension (``owns``, ruling R4). Lookups take the first existing
-preview the source owns, preferring the configured format.
-"""
-
-import os
-from dataclasses import dataclass
-from pathlib import Path
-
-FORMATS = ("webp", "jxl", "jpeg")
-FORMAT_EXTENSIONS = {"webp": ".webp", "jxl": ".jxl", "jpeg": ".jpg"}
-FORMAT_LABELS = {"webp": "WebP", "jxl": "JPEG XL", "jpeg": "JPEG"}
-DEFAULT_FORMAT = "webp"
-DEFAULT_QUALITY = 80
-DEFAULT_EDGE = 512
-MIN_QUALITY, MAX_QUALITY = 1, 100
-MIN_EDGE, MAX_EDGE = 128, 2048
-
-# Extensions a format writes, then the ones only older releases wrote.
-WRITTEN_EXTENSIONS = (".webp", ".jxl", ".jpg")
-LEGACY_EXTENSIONS = (".png", ".jpeg", ".gif")
-THUMBNAIL_EXTENSIONS = WRITTEN_EXTENSIONS + LEGACY_EXTENSIONS
-CONTENT_TYPES = {
-    ".webp": "image/webp",
-    ".jxl": "image/jxl",
-    ".jpg": "image/jpeg",
-    ".jpeg": "image/jpeg",
-    ".png": "image/png",
-    ".gif": "image/gif",
-}
-THUMB_SUFFIX = "_thumb"
-
-
-@dataclass(frozen=True)
-class ThumbnailSettings:
-    """One preview's settings: the format, the quality and the longest edge."""
-
-    format: str
-    quality: int
-    edge: int
-
-    @property
-    def extension(self):
-        return FORMAT_EXTENSIONS[self.format]
-
-    @property
-    def size(self):
-        return (self.edge, self.edge)
-
-    def describe(self):
-        """``WebP · quality 80 · 512 px`` (log lines and the job's scope)."""
-        return f"{FORMAT_LABELS[self.format]} · quality {self.quality} · {self.edge} px"
-
-
-def current():
-    """The configured settings now (read once per preview or per run)."""
-    from ..config import PromptManagerConfig
-
-    fmt = PromptManagerConfig.THUMBNAIL_FORMAT
-    return ThumbnailSettings(
-        fmt if fmt in FORMATS else DEFAULT_FORMAT,
-        int(PromptManagerConfig.THUMBNAIL_QUALITY),
-        int(PromptManagerConfig.THUMBNAIL_EDGE),
-    )
-
-
-def _whole(value, low, high, message):
-    if type(value) is not int or not low <= value <= high:
-        raise ValueError(message)
-    return value
-
-
-def validate_format(value):
-    if not isinstance(value, str) or value not in FORMATS:
-        raise ValueError('thumbnail_format must be "webp", "jxl" or "jpeg"')
-    return value
-
-
-def validate_quality(value):
-    return _whole(
-        value,
-        MIN_QUALITY,
-        MAX_QUALITY,
-        f"thumbnail_quality must be a whole number from {MIN_QUALITY} to {MAX_QUALITY}",
-    )
-
-
-def validate_edge(value):
-    return _whole(
-        value,
-        MIN_EDGE,
-        MAX_EDGE,
-        "thumbnail_edge must be a whole number of pixels "
-        f"from {MIN_EDGE} to {MAX_EDGE}",
-    )
-
-
-# ── names ────────────────────────────────────────────────────────────
-
-
-def thumbnail_stem_rel(rel_path):
-    """``thumbnails/<rel without extension>_thumb`` (POSIX)."""
-    return f"thumbnails/{Path(rel_path).with_suffix('').as_posix()}{THUMB_SUFFIX}"
-
-
-def thumbnail_rel(rel_path, extension=None):
-    """The preview of *rel_path* in *extension* (the configured one when None)."""
-    return thumbnail_stem_rel(rel_path) + (extension or current().extension)
-
-
-# Ruling R2: files sharing a stem share one preview, made from the first
-# source in this order: these images, then videos (by extension name).
-IMAGE_SOURCE_ORDER = (".png", ".jpg", ".jpeg", ".webp", ".gif")
-
-
-def source_rank(source_extension):
-    """Sort key of a source extension in R2's order (images first)."""
-    extension = source_extension.lower()
-    if extension in IMAGE_SOURCE_ORDER:
-        return (0, IMAGE_SOURCE_ORDER.index(extension), extension)
-    return (1, 0, extension)
-
-
-def owns(thumb_extension, source_extension):
-    """Whether a ``_thumb<thumb_extension>`` preview can belong to a source
-    with *source_extension* (ruling R4)."""
-    thumb_extension = thumb_extension.lower()
-    if thumb_extension in WRITTEN_EXTENSIONS:
-        return True
-    if thumb_extension in LEGACY_EXTENSIONS:
-        return thumb_extension == source_extension.lower()
-    return False
-
-
-def _legacy_extension(source_extension):
-    from .inspection_service import VIDEO_EXTENSIONS
-
-    source_extension = source_extension.lower()
-    return ".jpg" if source_extension in VIDEO_EXTENSIONS else source_extension
-
-
-def candidate_extensions(source_extension, preferred=None):
-    """The preview extensions a source owns, in lookup order: the configured
-    one, the name an older release gave it, then the other written ones."""
-    preferred = preferred or current().extension
-    ordered = [preferred, _legacy_extension(source_extension), *WRITTEN_EXTENSIONS]
-    seen = []
-    for extension in ordered:
-        if extension not in seen and owns(extension, source_extension):
-            seen.append(extension)
-    return tuple(seen)
-
-
-def owned_extensions(source_extension, preferred=None):
-    """``candidate_extensions`` plus the other spellings an older release
-    may have given a legacy preview (review M1): the source's own
-    (``X_thumb.JPG`` for ``X.JPG``) and the upper-case legacy one."""
-    extensions = list(candidate_extensions(source_extension, preferred))
-    legacy = _legacy_extension(source_extension)
-    for spelling in (source_extension, legacy.upper()):
-        if spelling not in extensions and owns(spelling, source_extension):
-            extensions.append(spelling)
-    return tuple(extensions)
-
-
-def _is_preview_file(path):
-    try:
-        return not path.is_symlink() and path.is_file()
-    except OSError:
-        return False
-
-
-def owned_in_folder(folder, stem, source_extension, preferred=None):
-    """Yield the existing previews ``<folder>/<stem><ext>`` a source with
-    *source_extension* owns, in lookup order (regular files, no links; one
-    file found under two spellings on a case-insensitive disk once)."""
-    seen = set()
-    for extension in owned_extensions(source_extension, preferred):
-        path = Path(folder) / (stem + extension)
-        if not _is_preview_file(path):
-            continue
-        try:
-            stat = path.stat()
-            identity = (stat.st_dev, stat.st_ino) if stat.st_ino else str(path)
-        except OSError:
-            continue
-        if identity in seen:
-            continue  # the same file under another case (Windows, macOS)
-        seen.add(identity)
-        yield path
-
-
-def _owned(root, rel_path, preferred):
-    rel_path = Path(rel_path)
-    stem = Path(root) / thumbnail_stem_rel(rel_path)
-    return owned_in_folder(stem.parent, stem.name, rel_path.suffix, preferred)
-
-
-def owned_thumbnails(root, rel_path, preferred=None):
-    """Every existing preview of *rel_path* under *root*, in lookup order."""
-    return list(_owned(root, rel_path, preferred))
-
-
-def existing_thumbnail(root, rel_path, preferred=None):
-    """The preview a listing shows for *rel_path*: the first owned one that
-    exists (the configured format first), or None."""
-    return next(_owned(root, rel_path, preferred), None)
-
-
-def content_type(path):
-    """The Content-Type of a preview file by its extension, or None."""
-    return CONTENT_TYPES.get(os.path.splitext(str(path))[1].lower())

py/config.py

@@ -202,6 +202,7 @@ class GalleryConfig:
         AUTO_CLEANUP_MISSING_FILES (bool): Automatically remove missing file records
         MAX_IMAGE_AGE_DAYS (int): Maximum age in days before cleaning up images
         IMAGES_PER_PAGE (int): Number of images to display per page in web UI
+        THUMBNAIL_SIZE (int): Size in pixels for generated thumbnails
         ENABLE_SEARCH (bool): Enable search functionality in web interface
         ENABLE_METADATA_VIEW (bool): Enable metadata viewing for images
         MAX_CONCURRENT_PROCESSING (int): Maximum concurrent image processing tasks
@@ -226,6 +227,7 @@ class GalleryConfig:
 
     # Web interface settings
     IMAGES_PER_PAGE = 20
+    THUMBNAIL_SIZE = 256
     ENABLE_SEARCH = True
     ENABLE_METADATA_VIEW = True
 
@@ -265,6 +267,7 @@ class GalleryConfig:
             },
             "web_interface": {
                 "images_per_page": cls.IMAGES_PER_PAGE,
+                "thumbnail_size": cls.THUMBNAIL_SIZE,
                 "enable_search": cls.ENABLE_SEARCH,
                 "enable_metadata_view": cls.ENABLE_METADATA_VIEW,
             },
@@ -327,6 +330,8 @@ class GalleryConfig:
         web_interface = new_config.get("web_interface", {})
         if "images_per_page" in web_interface:
             cls.IMAGES_PER_PAGE = web_interface["images_per_page"]
+        if "thumbnail_size" in web_interface:
+            cls.THUMBNAIL_SIZE = web_interface["thumbnail_size"]
         if "enable_search" in web_interface:
             cls.ENABLE_SEARCH = web_interface["enable_search"]
         if "enable_metadata_view" in web_interface:
@@ -664,15 +669,6 @@ class PromptManagerConfig:
     # where it is, so the workspace stops offering to move it.
     KEEP_LIBRARY_IN_NODE_FOLDER = False
 
-    # Thumbnails (#317): every preview writer reads these through
-    # py/api/thumbnail_settings.py (System › Appearance). The legacy
-    # ``gallery.web_interface.thumbnail_size`` was never read and is ignored.
-    THUMBNAIL_FORMATS = ("webp", "jxl", "jpeg")
-    THUMBNAIL_FORMAT = "webp"
-    THUMBNAIL_QUALITY = 80
-    THUMBNAIL_EDGE = 512
-    THUMBNAIL_EDGE_RANGE = (128, 2048)
-
     @classmethod
     def max_worker_threads(cls) -> int:
         """Largest accepted worker-thread count: the detected core count."""
@@ -729,11 +725,6 @@ class PromptManagerConfig:
             },
             "maintenance": {"safety_backup": cls.SAFETY_BACKUP},
             "library": {"keep_in_node_folder": cls.KEEP_LIBRARY_IN_NODE_FOLDER},
-            "thumbnails": {
-                "format": cls.THUMBNAIL_FORMAT,
-                "quality": cls.THUMBNAIL_QUALITY,
-                "edge": cls.THUMBNAIL_EDGE,
-            },
             "gallery": GalleryConfig.get_config(),
             "integrations": IntegrationConfig.get_config(),
             "autotag": AutotagConfig.get_config(),
@@ -879,8 +870,6 @@ class PromptManagerConfig:
         ):
             cls.KEEP_LIBRARY_IN_NODE_FOLDER = library["keep_in_node_folder"]
 
-        cls._update_thumbnails(new_config.get("thumbnails"))
-
         # Update gallery config
         if "gallery" in new_config:
             GalleryConfig.update_config(new_config["gallery"])
@@ -892,22 +881,6 @@ class PromptManagerConfig:
         if "autotag" in new_config:
             AutotagConfig.update_config(new_config["autotag"])
 
-    @classmethod
-    def _update_thumbnails(cls, section: Any) -> None:
-        """Apply a ``thumbnails`` section; a hand-edited bad value is ignored."""
-        if not isinstance(section, dict):
-            return
-        fmt = section.get("format")
-        if fmt in cls.THUMBNAIL_FORMATS:
-            cls.THUMBNAIL_FORMAT = fmt
-        quality = section.get("quality")
-        if type(quality) is int and 1 <= quality <= 100:
-            cls.THUMBNAIL_QUALITY = quality
-        edge = section.get("edge")
-        low, high = cls.THUMBNAIL_EDGE_RANGE
-        if type(edge) is int and low <= edge <= high:
-            cls.THUMBNAIL_EDGE = edge
-
 
 # Load configuration on import
 try:

py/lora_import.py

@@ -1,223 +0,0 @@
-"""The staged LoRA reference import (#221, #249 System S10, #355).
-
-The import reads LoraManager's ``*.metadata.json`` sidecars and turns each
-LoRA into one prompt of the ``lora-manager`` category, tagged with its name and
-trigger words and linked to its images. It runs in three stages, and only the
-last writes to the database:
-
-1. **discover**: read LoraManager's settings the way LoraManager does
-   (``py/lora_manager_layout.py``: the settings file from the environment
-   folder, the portable plugin file or the user config folder; the LoRA
-   roots, the storage mode, the sidecar and example-images roots) and find
-   the sidecars (``discover``). In ``alongside`` mode a sidecar beside its
-   model is kept when ``<base>.safetensors`` exists; in ``centralized`` mode
-   every sidecar under the sidecar root is kept when its ``file_path`` names
-   a model inside a LoRA root. ``fingerprint`` covers the kept sidecars (path,
-   size and modification time) and the layout; ``preview`` adds the counts a
-   review shows. Nothing is written and nothing is requested.
-2. **stage**: read each sidecar and build its record. Its LoraManager preview
-   and example images are linked where they are (``local_media``); only a
-   LoRA without any local image downloads its CivitAI example images into the
-   image cache first (best effort, counted). A cancelled or failed stage
-   leaves the database untouched; downloaded images stay in the cache.
-3. **replace**: the sidecars are found and fingerprinted once more (a file
-   changed, removed or added while staging aborts the import), then
-   ``PromptDatabase.replace_category_prompts`` swaps the old collection for
-   the staged records in one transaction (or changes nothing).
-
-Both the System job (``POST /lora/import/apply``) and the legacy ``POST
-/lora/scan`` run these stages (``py/api/lora_integration.py``).
-"""
-
-import hashlib
-from dataclasses import dataclass, field
-from pathlib import Path
-from typing import AbstractSet, Callable, Dict, List, Optional
-
-from . import lora_utils
-from .lora_manager_layout import (
-    Discovery,
-    discover_sidecars,
-    layout_summary,
-    local_media,
-)
-
-try:
-    from ..utils.hashing import generate_prompt_hash
-except ImportError:  # pragma: no cover - flat test imports
-    from utils.hashing import generate_prompt_hash
-
-LORA_CATEGORY = "lora-manager"
-JOB_TITLE = "LoRA reference import"
-# The job's outcome groups, in its counter-tile order.
-GROUPS = ("imported", "linked", "skipped", "downloaded", "download_errors", "errors")
-
-
-class ImportCancelled(Exception):
-    """The import was cancelled while staging; nothing was written."""
-
-
-def discover(lora_manager_path: Optional[str]) -> Discovery:
-    """The sidecars of every LoRA whose model exists inside a LoRA root.
-
-    ``lora_manager_path`` is resolved as the integration resolves it (an
-    install under ``custom_nodes``; empty means auto-detection). Raises
-    whatever listing a folder raised: a discovery that cannot see every
-    folder must not replace the collection with part of it.
-    """
-    return discover_sidecars(lora_utils.lora_manager_layout(lora_manager_path))
-
-
-def fingerprint(discovery: Discovery) -> str:
-    """What a review saw: the layout, then each kept sidecar's path, size and
-    modification time (a LoraManager save that changes unrelated settings
-    leaves it as it was)."""
-    layout = discovery.layout
-    digest = hashlib.sha256()
-    for value in (
-        layout.settings_path,
-        layout.source,
-        layout.error,
-        layout.mode,
-        "\0".join(layout.lora_roots),
-        layout.sidecar_root,
-        layout.example_images_root,
-        layout.library,
-    ):
-        digest.update(f"{value}\n".encode("utf-8", "surrogatepass"))
-    for name in discovery.unreadable:
-        digest.update(f"unreadable\0{name}\n".encode("utf-8", "surrogatepass"))
-    for sidecar in discovery.sidecars:
-        path = sidecar.metadata_path
-        try:
-            stat = path.stat()
-            entry = f"{path}\0{stat.st_size}\0{stat.st_mtime_ns}\n"
-        except OSError:
-            entry = f"{path}\0missing\n"
-        digest.update(entry.encode("utf-8", "surrogatepass"))
-    return "sha256:" + digest.hexdigest()
-
-
-def preview(
-    lora_manager_path: Optional[str],
-    cache_dir: Path,
-    media_extensions: AbstractSet[str],
-) -> Dict:
-    """The review's counts (blocking; reads only, requests nothing).
-
-    ``{lora_files, with_metadata, skipped, with_local_media,
-    planned_downloads, fingerprint, names, layout}``: the metadata files
-    seen, the kept LoRAs whose sidecar parses, the rest, the LoRAs with a
-    local image, the CivitAI images an import would download for the LoRAs
-    without one (not yet in the cache), the first LoRA names and what the
-    layout says (``layout_summary``).
-    """
-    discovery = discover(lora_manager_path)
-    layout = discovery.layout
-    with_metadata = 0
-    with_local_media = 0
-    planned = 0
-    names = []
-    for sidecar in discovery.sidecars:
-        metadata = lora_utils.read_lora_metadata(sidecar.metadata_path)
-        if not metadata:
-            continue
-        with_metadata += 1
-        if local_media(sidecar, metadata, layout, media_extensions):
-            with_local_media += 1
-        else:
-            planned += lora_utils.planned_civitai_downloads(
-                metadata, sidecar.metadata_path, cache_dir
-            )
-        if len(names) < 50:
-            names.append(lora_utils.get_model_name_from_metadata(metadata))
-    return {
-        "lora_files": discovery.scanned,
-        "with_metadata": with_metadata,
-        "skipped": discovery.scanned - with_metadata,
-        "with_local_media": with_local_media,
-        "planned_downloads": planned,
-        "fingerprint": fingerprint(discovery),
-        "names": names,
-        "layout": layout_summary(layout, Path.home()),
-    }
-
-
-def build_record(metadata: Dict, path: Path, images: List[str]) -> Dict:
-    """The prompt a LoRA becomes: its example prompt (else its name), tags, images."""
-    model_name = lora_utils.get_model_name_from_metadata(metadata)
-    text = lora_utils.get_example_prompt_from_metadata(metadata) or model_name
-    tags = ["lora-manager", f"lora:{model_name}"]
-    tags.extend(lora_utils.get_trigger_words_from_metadata(metadata))
-    return {
-        "name": model_name,
-        "text": text,
-        "hash": generate_prompt_hash(text),
-        "tags": list(dict.fromkeys(tags)),
-        "images": images,
-    }
-
-
-@dataclass
-class StagedImport:
-    """The records an import will write, and what staging counted."""
-
-    total: int
-    records: List[Dict] = field(default_factory=list)
-    skipped: List[str] = field(default_factory=list)
-    stats: Dict[str, int] = field(
-        default_factory=lambda: {"downloaded": 0, "download_errors": 0}
-    )
-
-
-def stage(
-    discovery: Discovery,
-    cache_dir: Path,
-    api_key: str = "",
-    *,
-    media_extensions: AbstractSet[str],
-    on_record: Optional[Callable[[int, Dict, "StagedImport"], None]] = None,
-    cancelled: Callable[[], bool] = lambda: False,
-    logger=None,
-) -> StagedImport:
-    """Read each sidecar and build its record with its images.
-
-    Blocking. Local images (``local_media``) come first; a LoRA without any
-    downloads its CivitAI example images. A sidecar that cannot be read, or
-    whose record fails to build, is skipped by its name, as are the
-    centralized sidecars discovery could not parse. ``cancelled()`` is asked
-    before each sidecar (raises ImportCancelled); ``on_record(index,
-    record_or_None, staged)`` follows each one.
-    """
-    sidecars = discovery.sidecars
-    staged = StagedImport(total=len(sidecars))
-    staged.skipped.extend(discovery.unreadable)
-    for index, sidecar in enumerate(sidecars):
-        if cancelled():
-            raise ImportCancelled()
-        record = None
-        path = sidecar.metadata_path
-        metadata = lora_utils.read_lora_metadata(path)
-        if not metadata:
-            staged.skipped.append(path.name)
-        else:
-            try:
-                local = local_media(
-                    sidecar, metadata, discovery.layout, media_extensions
-                )
-                remote = []
-                if not local:
-                    remote = lora_utils.download_civitai_images(
-                        metadata, path, cache_dir, api_key, stats=staged.stats
-                    )
-                images = list(dict.fromkeys([*local, *remote]))
-                record = build_record(metadata, path, images)
-                staged.records.append(record)
-            except Exception as error:  # one LoRA never stops the import
-                name = lora_utils.get_model_name_from_metadata(metadata)
-                if logger is not None:
-                    logger.warning(f"Failed to prepare LoRA {name}: {error}")
-                staged.skipped.append(name)
-        if on_record is not None:
-            on_record(index, record, staged)
-    return staged

py/lora_manager_layout.py

@@ -1,602 +0,0 @@
-"""Where LoraManager keeps its files (#355).
-
-LoraManager (``custom_nodes/comfyui-lora-manager``) stores one
-``<name>.metadata.json`` sidecar per model, a preview image or video beside
-it, and each model's downloaded CivitAI example images. Where it stores them
-is a user setting, and its settings file itself can live in three places.
-This module repeats LoraManager's own rules, reading its files only (never
-importing it), so the LoRA import, the trigger-word cache and the image
-server share one definition:
-
-- ``load_layout`` finds the settings file (environment folder, portable
-  plugin file, or the user config folder, in LoraManager's order), keeps only
-  the seven keys the import needs, and resolves the LoRA roots, the sidecar
-  root (centralized storage), the example-images root and the active
-  LoraManager library. Every folder from the settings passes the folder
-  guard (exists, not a filesystem root, not the home folder itself).
-- ``discover_sidecars`` finds every sidecar whose model file exists inside a
-  LoRA root: beside the models in ``alongside`` mode, under the sidecar root
-  (matched to its model by ``file_path``) in ``centralized`` mode.
-- ``local_media`` lists a LoRA's preview and example images that the image
-  server may serve.
-
-Standard library plus ``platformdirs`` only (LoraManager depends on it), so
-it is testable outside ComfyUI.
-"""
-
-import json
-import os
-import re
-from dataclasses import dataclass, replace
-from pathlib import Path
-from typing import (
-    AbstractSet,
-    Callable,
-    Dict,
-    Iterator,
-    List,
-    Mapping,
-    Optional,
-    Sequence,
-    Tuple,
-)
-
-# py/utils/settings_paths.py: SETTINGS_DIR_ENV, _LM_PORTABLE_ENV, APP_NAME.
-SETTINGS_DIR_ENV = "LORA_MANAGER_SETTINGS_DIR"
-PORTABLE_ENV = "LORA_MANAGER_PORTABLE"
-APP_NAME = "ComfyUI-LoRA-Manager"
-# py/utils/constants.py PREVIEW_EXTENSIONS, in LoraManager's order.
-PREVIEW_EXTENSIONS = (
-    ".webp",
-    ".preview.webp",
-    ".preview.png",
-    ".preview.jpeg",
-    ".preview.jpg",
-    ".preview.mp4",
-    ".png",
-    ".jpeg",
-    ".jpg",
-    ".mp4",
-    ".gif",
-    ".webm",
-    ".avif",
-    ".jxl",
-)
-# LoraManager's LoRA scanner accepts .safetensors only (py/services/lora_scanner.py).
-MODEL_SUFFIX = ".safetensors"
-# py/utils/sidecar_paths.py METADATA_SUFFIX.
-METADATA_SUFFIX = ".metadata.json"
-MAX_SETTINGS_BYTES = 5 * 1024 * 1024
-# The only settings the import reads; every other key (the file can hold API
-# keys) is dropped right after parsing.
-SETTINGS_KEYS = frozenset(
-    {
-        "sidecar_storage_mode",
-        "sidecar_storage_path",
-        "example_images_path",
-        "folder_paths",
-        "extra_folder_paths",
-        "libraries",
-        "active_library",
-    }
-)
-# py/utils/sidecar_paths.py STORAGE_MODE_ALONGSIDE / STORAGE_MODE_CENTRALIZED.
-MODE_ALONGSIDE = "alongside"
-MODE_CENTRALIZED = "centralized"
-# utils/video_metadata.py VIDEO_EXTENSIONS (not imported: that package needs
-# the node's relative imports).
-VIDEO_SUFFIXES = frozenset({".mp4", ".mov", ".m4v", ".webm", ".mkv", ".avi", ".wmv"})
-
-SOURCE_ENVIRONMENT = "environment"
-SOURCE_PORTABLE = "portable"
-SOURCE_USER_CONFIG = "user config"
-
-NO_INSTALL = "no LoraManager install found"
-UNREADABLE = "the settings file could not be read"
-NOT_JSON = "the settings file is not valid JSON"
-NOT_OBJECT = "the settings file is not a JSON object"
-TOO_LARGE = "the settings file is larger than 5 MB"
-NO_PLATFORMDIRS = "platformdirs is not available"
-NO_SIDECAR_ROOT = "the sidecar folder does not exist"
-BAD_SIDECAR_ROOT = "the sidecar folder is a filesystem root or the home folder"
-
-
-@dataclass(frozen=True)
-class LoraManagerLayout:
-    """What LoraManager's settings say about where its files are."""
-
-    settings_path: Optional[Path]
-    source: Optional[str]
-    error: Optional[str]
-    mode: str
-    lora_roots: Tuple[str, ...]
-    sidecar_root: Optional[str]
-    example_images_root: Optional[str]
-    library: str
-    media_roots: Tuple[str, ...]
-
-
-@dataclass(frozen=True)
-class Sidecar:
-    """One LoRA's metadata file and the model file it describes."""
-
-    metadata_path: Path
-    model_path: Path
-
-
-@dataclass(frozen=True)
-class Discovery:
-    """The sidecars kept, how many metadata files were seen, and those unread."""
-
-    layout: LoraManagerLayout
-    sidecars: List[Sidecar]
-    scanned: int
-    unreadable: List[str]
-
-
-class _SettingsError(Exception):
-    """The settings file cannot be used, for the reason it carries."""
-
-
-# ── paths ────────────────────────────────────────────────────────────
-
-
-def _canonical(path: str, pathmod=os.path) -> str:
-    # py/config.py _canonical_path (not imported: py.config imports ComfyUI's
-    # ``server`` at import time).
-    return pathmod.normcase(pathmod.realpath(path))
-
-
-def _is_filesystem_root(path: str, pathmod=os.path) -> bool:
-    # py/config.py _is_filesystem_root: '/', 'C:\\' and UNC share roots.
-    return pathmod.dirname(path) == path
-
-
-def _guard_folder(
-    path: str,
-    home: str,
-    *,
-    pathmod=os.path,
-    isdir: Optional[Callable[[str], bool]] = None,
-) -> Optional[str]:
-    """The canonical form of ``path`` when it may be read and served, else None.
-
-    Kept only when it is a folder, not a filesystem root, and neither the
-    home folder nor one of its ancestors (``/home``, ``C:\\Users``: a
-    security review ruled that a folder holding the home folder must never
-    be read or served).
-    """
-    isdir = isdir or os.path.isdir
-    try:
-        canonical = _canonical(path, pathmod)
-        if not isdir(canonical) or _is_filesystem_root(canonical, pathmod):
-            return None
-        if _inside(home, (canonical,), pathmod):
-            return None
-    except (OSError, ValueError):
-        return None
-    return canonical
-
-
-def _inside(path, roots: Sequence[str], pathmod=os.path) -> bool:
-    """True when ``path`` (canonical) is one of ``roots`` or below one."""
-    try:
-        candidate = _canonical(str(path), pathmod)
-    except (OSError, ValueError):
-        return False
-    for root in roots:
-        prefix = root if root.endswith(pathmod.sep) else root + pathmod.sep
-        if candidate == root or candidate.startswith(prefix):
-            return True
-    return False
-
-
-def _absolute(value) -> Optional[str]:
-    """A settings path, stripped, ``~``-expanded and absolute; None when unset."""
-    if not isinstance(value, str) or not value.strip():
-        return None
-    return os.path.abspath(os.path.expanduser(value.strip()))
-
-
-# ── the settings file ───────────────────────────────────────────────
-
-
-def _platform_user_config_dir() -> str:
-    from platformdirs import user_config_dir
-
-    return user_config_dir(APP_NAME, appauthor=False)
-
-
-def _read_bytes(path: Path) -> bytes:
-    with open(path, "rb") as handle:
-        return handle.read(MAX_SETTINGS_BYTES + 1)
-
-
-def _read_settings(path: Path) -> Optional[Dict]:
-    """The parsed object in ``path``; None when it does not exist."""
-    try:
-        raw = _read_bytes(path)
-    except FileNotFoundError:
-        return None
-    except OSError:
-        raise _SettingsError(UNREADABLE) from None
-    if len(raw) > MAX_SETTINGS_BYTES:
-        raise _SettingsError(TOO_LARGE)
-    try:
-        data = json.loads(raw.decode("utf-8"))
-    except (UnicodeDecodeError, ValueError):
-        raise _SettingsError(NOT_JSON) from None
-    if not isinstance(data, dict):
-        raise _SettingsError(NOT_OBJECT)
-    return data
-
-
-def _settings_subset(data: Mapping) -> Dict:
-    """Only the keys the import reads."""
-    return {key: data[key] for key in SETTINGS_KEYS if key in data}
-
-
-def _portable_flag(environ: Mapping[str, str], plugin_settings: Path) -> bool:
-    """LoraManager's portable mode (settings_paths._should_use_portable_settings)."""
-    forced = environ.get(PORTABLE_ENV)
-    if forced == "1":
-        return True
-    if forced == "0":
-        return False
-    try:
-        data = _read_settings(plugin_settings)
-    except _SettingsError:
-        return False
-    return bool(data) and data.get("use_portable_settings") is True
-
-
-def _settings_location(
-    lora_manager_path: str,
-    environ: Mapping[str, str],
-    user_config_dir: Callable[[], str],
-) -> Tuple[Path, str]:
-    """``(settings file, source)`` in LoraManager's lookup order."""
-    override = environ.get(SETTINGS_DIR_ENV)
-    if override:
-        folder = os.path.abspath(os.path.expanduser(override))
-        return Path(folder) / "settings.json", SOURCE_ENVIRONMENT
-    plugin_settings = Path(lora_manager_path) / "settings.json"
-    if _portable_flag(environ, plugin_settings):
-        return plugin_settings, SOURCE_PORTABLE
-    try:
-        folder = user_config_dir()
-    except ImportError:
-        raise _SettingsError(NO_PLATFORMDIRS) from None
-    return Path(folder) / "settings.json", SOURCE_USER_CONFIG
-
-
-# ── libraries and folders ───────────────────────────────────────────
-
-
-def _sanitize_library_name(name: str) -> str:
-    # py/utils/example_images_paths.py sanitize_library_name.
-    safe = re.sub(r"[^A-Za-z0-9_.-]", "_", name or "")
-    return safe or "default"
-
-
-def _active_library(settings: Mapping) -> Tuple[str, Optional[Dict], int]:
-    """``(name, library dict or None, number of libraries)``."""
-    libraries = settings.get("libraries")
-    if not isinstance(libraries, dict) or not libraries:
-        return "default", None, 0
-    active = settings.get("active_library")
-    if not isinstance(active, str) or active not in libraries:
-        active = next(iter(libraries))
-    library = libraries[active]
-    return str(active), library if isinstance(library, dict) else None, len(libraries)
-
-
-def _lora_list(settings: Mapping, library: Optional[Dict], key: str) -> List[str]:
-    """The ``loras`` folders of ``key`` (the library's, else the top level)."""
-    source = library if library is not None and key in library else settings
-    section = source.get(key)
-    if not isinstance(section, dict):
-        return []
-    value = section.get("loras")
-    if isinstance(value, str):
-        value = [value]
-    if not isinstance(value, list):
-        return []
-    return [entry for entry in value if isinstance(entry, str) and entry.strip()]
-
-
-def _guarded(paths, home: str) -> Tuple[str, ...]:
-    kept = []
-    for path in paths:
-        absolute = _absolute(path)
-        guarded = _guard_folder(absolute, home) if absolute else None
-        if guarded and guarded not in kept:
-            kept.append(guarded)
-    return tuple(kept)
-
-
-def _example_images_root(
-    settings: Mapping, library: str, libraries: int, home: str
-) -> Optional[str]:
-    """py/utils/example_images_paths.py get_library_root, when the folder exists."""
-    configured = _absolute(settings.get("example_images_path"))
-    root = _guard_folder(configured, home) if configured else None
-    if root is None or libraries <= 1:
-        return root
-    # Guarded (canonical) like its root: a library name keeps its case, and
-    # the media check compares normcased paths.
-    return _guard_folder(os.path.join(root, _sanitize_library_name(library)), home)
-
-
-def _media_roots(*groups) -> Tuple[str, ...]:
-    roots = []
-    for group in groups:
-        for root in group:
-            if root and root not in roots:
-                roots.append(root)
-    return tuple(roots)
-
-
-def load_layout(
-    lora_manager_path: Optional[str],
-    *,
-    default_roots: Callable[[], List[str]],
-    environ: Mapping[str, str] = os.environ,
-    user_config_dir: Callable[[], str] = _platform_user_config_dir,
-) -> LoraManagerLayout:
-    """Read LoraManager's settings the way LoraManager does (read only).
-
-    ``lora_manager_path`` is the resolved install (``None`` when none was
-    found). An unusable layout carries ``error``, alongside mode and the
-    default LoRA roots, so serving and trigger words keep working.
-    """
-    home = str(Path.home())
-    defaults = _guarded(default_roots(), home)
-    fallback = LoraManagerLayout(
-        settings_path=None,
-        source=None,
-        error=NO_INSTALL,
-        mode=MODE_ALONGSIDE,
-        lora_roots=defaults,
-        sidecar_root=None,
-        example_images_root=None,
-        library="default",
-        media_roots=defaults,
-    )
-    if not lora_manager_path:
-        return fallback
-    try:
-        settings_path, source = _settings_location(
-            lora_manager_path, environ, user_config_dir
-        )
-    except _SettingsError as error:
-        return replace(fallback, error=str(error))
-    fallback = replace(fallback, settings_path=settings_path, source=source)
-    try:
-        raw = _read_settings(settings_path)
-    except _SettingsError as error:
-        return replace(fallback, error=str(error))
-    settings = _settings_subset(raw or {})
-    return _layout_from_settings(settings, settings_path, source, defaults, home)
-
-
-def _layout_from_settings(settings, settings_path, source, defaults, home):
-    library, entry, libraries = _active_library(settings)
-    lora_roots = _media_roots(
-        defaults,
-        _guarded(_lora_list(settings, entry, "folder_paths"), home),
-        _guarded(_lora_list(settings, entry, "extra_folder_paths"), home),
-    )
-    mode = settings.get("sidecar_storage_mode")
-    mode = MODE_CENTRALIZED if mode == MODE_CENTRALIZED else MODE_ALONGSIDE
-    example_root = _example_images_root(settings, library, libraries, home)
-    layout = LoraManagerLayout(
-        settings_path=settings_path,
-        source=source,
-        error=None,
-        mode=mode,
-        lora_roots=lora_roots,
-        sidecar_root=None,
-        example_images_root=example_root,
-        library=library,
-        media_roots=_media_roots(lora_roots, [example_root]),
-    )
-    if mode != MODE_CENTRALIZED:
-        return layout
-    configured = _absolute(settings.get("sidecar_storage_path"))
-    configured = configured or os.path.join(str(settings_path.parent), "sidecars")
-    sidecar_root = _guard_folder(configured, home)
-    if sidecar_root is None:
-        reason = NO_SIDECAR_ROOT if not os.path.isdir(configured) else BAD_SIDECAR_ROOT
-        return replace(
-            layout,
-            error=reason,
-            lora_roots=defaults,
-            example_images_root=None,
-            media_roots=defaults,
-        )
-    return replace(
-        layout,
-        sidecar_root=sidecar_root,
-        media_roots=_media_roots(lora_roots, [sidecar_root], [example_root]),
-    )
-
-
-# ── sidecars ────────────────────────────────────────────────────────
-
-
-def _metadata_files(folder: str) -> Iterator[Path]:
-    """Every ``*.metadata.json`` under ``folder``; an unlistable folder raises.
-
-    Symlinked folders are followed, each real folder once (no loops).
-    """
-
-    def fail(error):
-        raise error
-
-    visited = set()
-    for current, dirs, files in os.walk(folder, onerror=fail, followlinks=True):
-        real = _canonical(current)
-        if real in visited:
-            dirs[:] = []
-            continue
-        visited.add(real)
-        dirs.sort()
-        for name in sorted(files):
-            if name.endswith(METADATA_SUFFIX):
-                yield Path(current) / name
-
-
-def _read_sidecar(path: Path) -> Optional[Dict]:
-    try:
-        with open(path, "r", encoding="utf-8") as handle:
-            data = json.load(handle)
-    except (OSError, ValueError):
-        return None
-    return data if isinstance(data, dict) else None
-
-
-def _model_for(path: Path, layout: LoraManagerLayout, unreadable: List[str]):
-    """The model file a sidecar describes, when it exists inside a LoRA root."""
-    if layout.mode == MODE_ALONGSIDE:
-        base = path.name[: -len(METADATA_SUFFIX)]
-        model = path.parent / f"{base}{MODEL_SUFFIX}"
-        return model if model.is_file() else None
-    metadata = _read_sidecar(path)
-    if metadata is None:
-        unreadable.append(path.name)
-        return None
-    file_path = metadata.get("file_path")
-    if not isinstance(file_path, str) or not file_path.strip():
-        return None
-    model = Path(file_path)
-    if not model.is_file() or not _inside(model, layout.lora_roots):
-        return None
-    return model
-
-
-def discover_sidecars(layout: LoraManagerLayout) -> Discovery:
-    """Every sidecar whose model exists inside a LoRA root, sorted, once each.
-
-    Raises ``OSError`` when a folder cannot be listed: a discovery that
-    cannot see every folder must not replace the collection with part of it.
-    """
-    if layout.error is not None:
-        return Discovery(layout, [], 0, [])
-    if layout.mode == MODE_CENTRALIZED:
-        folders = [layout.sidecar_root]
-    else:
-        folders = list(layout.lora_roots)
-    seen = set()
-    scanned = 0
-    unreadable: List[str] = []
-    sidecars = []
-    for folder in folders:
-        for path in _metadata_files(folder):
-            resolved = Path(os.path.realpath(path))
-            key = os.path.normcase(str(resolved))
-            if key in seen:
-                continue
-            seen.add(key)
-            scanned += 1
-            model = _model_for(resolved, layout, unreadable)
-            if model is not None:
-                sidecars.append(Sidecar(resolved, Path(os.path.realpath(model))))
-    sidecars.sort(key=lambda sidecar: str(sidecar.metadata_path))
-    return Discovery(layout, sidecars, scanned, unreadable)
-
-
-# ── images ──────────────────────────────────────────────────────────
-
-
-def _natural_key(name: str):
-    parts = re.split(r"(\d+)", name)
-    return [int(part) if part.isdigit() else part.lower() for part in parts], name
-
-
-def _example_files(folder: str) -> List[str]:
-    try:
-        with os.scandir(folder) as entries:
-            names = [entry.name for entry in entries if entry.is_file()]
-    except OSError:
-        return []
-    return [os.path.join(folder, name) for name in sorted(names, key=_natural_key)]
-
-
-def _preview_candidates(sidecar: Sidecar, metadata: Dict) -> Iterator[str]:
-    """The paths a preview is looked for at, in LoraManager's order."""
-    url = metadata.get("preview_url")
-    if isinstance(url, str) and url.strip() and os.path.isabs(url.strip()):
-        yield url.strip()
-    base = sidecar.metadata_path.name[: -len(METADATA_SUFFIX)]
-    for suffix in PREVIEW_EXTENSIONS:
-        yield str(sidecar.metadata_path.parent / f"{base}{suffix}")
-
-
-def local_media(
-    sidecar: Sidecar,
-    metadata: Dict,
-    layout: LoraManagerLayout,
-    media_extensions: AbstractSet[str],
-) -> List[str]:
-    """The LoRA's preview, then its example images: absolute, resolved paths.
-
-    A file counts only when its extension is in ``media_extensions`` (what the
-    image server serves) and it lies inside ``layout.media_roots``.
-    """
-
-    def usable(path: str) -> bool:
-        return (
-            os.path.splitext(path)[1].lower() in media_extensions
-            and os.path.isfile(path)
-            and _inside(path, layout.media_roots)
-        )
-
-    found: List[str] = []
-    for path in _preview_candidates(sidecar, metadata):
-        if usable(path):
-            found.append(path)
-            break
-    sha256 = metadata.get("sha256")
-    if layout.example_images_root and isinstance(sha256, str) and sha256.strip():
-        folder = os.path.join(layout.example_images_root, sha256.strip().lower())
-        found.extend(path for path in _example_files(folder) if usable(path))
-    media: List[str] = []
-    for path in found:
-        resolved = os.path.realpath(path)
-        if resolved not in media:
-            media.append(resolved)
-    return _cover_first(media)
-
-
-def _cover_first(media: List[str]) -> List[str]:
-    """A still image in front of a leading video (no thumbnails for these yet)."""
-    if not media or os.path.splitext(media[0])[1].lower() not in VIDEO_SUFFIXES:
-        return media
-    for index, path in enumerate(media):
-        if os.path.splitext(path)[1].lower() not in VIDEO_SUFFIXES:
-            return [path] + media[:index] + media[index + 1 :]
-    return media
-
-
-# ── the review ──────────────────────────────────────────────────────
-
-
-def layout_summary(layout: LoraManagerLayout, home: Path) -> Dict:
-    """What the review shows about the layout (no settings values)."""
-    settings_file = None
-    if layout.settings_path is not None:
-        settings_file = str(layout.settings_path)
-        try:
-            relative = Path(settings_file).relative_to(home)
-            settings_file = os.path.join("~", str(relative))
-        except ValueError:
-            pass
-    return {
-        "source": layout.source,
-        "settings_file": settings_file,
-        "error": layout.error,
-        "mode": layout.mode,
-        "library": layout.library,
-        "example_images": layout.example_images_root is not None,
-    }

py/lora_utils.py

@@ -8,17 +8,14 @@ return empty results rather than raising.
 """
 
 import hashlib
-import http.client
 import json
 import os
 import re
 import threading
-import time
-import urllib.error
 import urllib.request
 from pathlib import Path
 from typing import Dict, List, Optional, Tuple
-from urllib.parse import urljoin, urlsplit
+from urllib.parse import urlsplit
 
 try:
     from ..utils.logging_config import get_logger
@@ -28,16 +25,6 @@ except ImportError:
     sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
     from utils.logging_config import get_logger
 
-from dataclasses import replace
-
-from .lora_manager_layout import (
-    MODE_ALONGSIDE,
-    METADATA_SUFFIX,
-    LoraManagerLayout,
-    discover_sidecars,
-    load_layout,
-)
-
 logger = get_logger("prompt_manager.lora_utils")
 
 # ── LoraManager detection ────────────────────────────────────────────
@@ -95,46 +82,23 @@ def detect_lora_manager(custom_path: str = "") -> Optional[str]:
         if p.is_dir() and _looks_like_lora_manager(p):
             return str(p.resolve())
 
-    # 2. Auto-detect in every custom_nodes folder (case-insensitive scan):
-    # ComfyUI's own first, then the extra ones it registered (#144).
-    folders = []
+    # 2. Auto-detect via custom_nodes (case-insensitive scan)
     root = find_comfyui_root()
     if root:
-        folders.append(root / "custom_nodes")
-    folders.extend(custom_nodes_directories())
-    seen = set()
-    for custom_nodes in folders:
-        key = os.path.normcase(os.path.abspath(str(custom_nodes)))
-        if key in seen:
-            continue
-        seen.add(key)
-        found = _lora_manager_in(Path(custom_nodes))
-        if found:
-            return found
+        custom_nodes = root / "custom_nodes"
+        if custom_nodes.is_dir():
+            for entry in custom_nodes.iterdir():
+                if (
+                    entry.is_dir()
+                    and "lora" in entry.name.lower()
+                    and "manager" in entry.name.lower()
+                    and _looks_like_lora_manager(entry)
+                ):
+                    return str(entry.resolve())
 
     return None
 
 
-def _lora_manager_in(custom_nodes: Path) -> Optional[str]:
-    """The LoraManager install directly under ``custom_nodes``, or None."""
-    try:
-        entries = sorted(custom_nodes.iterdir()) if custom_nodes.is_dir() else []
-    except OSError:
-        return None
-    for entry in entries:
-        try:
-            if (
-                entry.is_dir()
-                and "lora" in entry.name.lower()
-                and "manager" in entry.name.lower()
-                and _looks_like_lora_manager(entry)
-            ):
-                return str(entry.resolve())
-        except OSError:
-            continue
-    return None
-
-
 def _looks_like_lora_manager(path: Path) -> bool:
     """Heuristic: does this directory look like a LoraManager install?"""
     # Must have __init__.py (ComfyUI extension) or README.md
@@ -245,22 +209,23 @@ def resolve_lora_manager_path(path) -> Optional[str]:
 # ── Metadata reading ─────────────────────────────────────────────────
 
 
-def default_lora_roots() -> List[str]:
-    """The LoRA folders ComfyUI knows, without LoraManager's settings.
+def find_lora_directories(lora_manager_path: str) -> List[str]:
+    """Find directories that contain LoRA models (with .metadata.json files).
 
-    ComfyUI's ``models/loras``, the ``loras`` entries of
-    ``extra_model_paths.yaml`` and, inside ComfyUI, every folder
-    ``folder_paths`` registers for ``loras``. ``lora_manager_layout`` adds
-    the folders LoraManager's own settings name.
+    Searches: ComfyUI models/loras, extra_model_paths.yaml lora dirs,
+    and the LoraManager extension dir itself.
     """
     dirs = set()
+    lm_path = Path(lora_manager_path)
 
     root = find_comfyui_root()
     if root:
+        # Default models/loras
         models_loras = root / "models" / "loras"
         if models_loras.is_dir():
             dirs.add(str(models_loras.resolve()))
 
+        # Extra model paths from ComfyUI config
         for extra_dir in _get_extra_lora_paths(root):
             if extra_dir.is_dir():
                 dirs.add(str(extra_dir.resolve()))
@@ -277,28 +242,13 @@ def default_lora_roots() -> List[str]:
         # folder_paths unavailable — not running inside ComfyUI runtime
         pass
 
+    # Check for any .metadata.json in the LoraManager dir tree
+    for meta in lm_path.rglob("*.metadata.json"):
+        dirs.add(str(meta.parent.resolve()))
+
     return sorted(dirs)
 
 
-def lora_manager_install(lora_manager_path: Optional[str]) -> Optional[str]:
-    """The LoraManager install to read: the configured path when it is an
-    allowed install under ``custom_nodes``, auto-detection when it is empty."""
-    if isinstance(lora_manager_path, str) and lora_manager_path.strip():
-        return resolve_lora_manager_path(lora_manager_path)
-    detected = detect_lora_manager()
-    return resolve_lora_manager_path(detected) if detected else None
-
-
-def layout_for_install(install: Optional[str]) -> LoraManagerLayout:
-    """The layout of an already resolved install (None: none was found)."""
-    return load_layout(install, default_roots=default_lora_roots)
-
-
-def lora_manager_layout(lora_manager_path: Optional[str]) -> LoraManagerLayout:
-    """Where LoraManager keeps its files (``py/lora_manager_layout.py``)."""
-    return layout_for_install(lora_manager_install(lora_manager_path))
-
-
 def _get_extra_lora_paths(comfyui_root: Path) -> List[Path]:
     """Parse extra_model_paths.yaml for additional LoRA directories."""
     results = []
@@ -404,42 +354,61 @@ def get_model_name_from_metadata(metadata: Dict) -> str:
     return name
 
 
+def get_preview_images_from_metadata(metadata: Dict, metadata_path: Path) -> List[str]:
+    """Find all local preview/example image paths for a LoRA.
+
+    Returns:
+        List of absolute path strings to image files.
+    """
+    results = []
+    lora_dir = metadata_path.parent
+    file_name = metadata.get("file_name", "")
+    if not file_name:
+        stem = metadata_path.name.replace(".metadata.json", "")
+        file_name = stem
+
+    base_name = Path(file_name).stem
+
+    # Check standard preview naming conventions
+    for ext in (
+        ".png",
+        ".jpg",
+        ".jpeg",
+        ".webp",
+        ".preview.png",
+        ".preview.jpg",
+        ".preview.jpeg",
+    ):
+        candidate = lora_dir / f"{base_name}{ext}"
+        if candidate.exists():
+            results.append(str(candidate.resolve()))
+
+    return results
+
+
+def get_preview_image_from_metadata(
+    metadata: Dict, metadata_path: Path
+) -> Optional[str]:
+    """Find the first preview image path for a LoRA (backward compat)."""
+    images = get_preview_images_from_metadata(metadata, metadata_path)
+    return images[0] if images else None
+
+
 _THUMB_MAX_SIZE = 512
 
-# CivitAI's own domains (#340: civitai.red and civitai.green serve the same
-# content as civitai.com).
-CIVITAI_DOMAINS = ("civitai.com", "civitai.red", "civitai.green")
 # Only these hosts may ever receive the CivitAI API key, and only over HTTPS.
 CIVITAI_HOSTS = frozenset(
-    f"{prefix}{domain}"
-    for domain in CIVITAI_DOMAINS
-    for prefix in ("", "www.", "api.", "image.")
+    {"civitai.com", "www.civitai.com", "api.civitai.com", "image.civitai.com"}
 )
 MAX_CIVITAI_DOWNLOAD_BYTES = 50 * 1024 * 1024
 _DOWNLOAD_CHUNK_BYTES = 64 * 1024
 
 
-# A redirect is followed (#337: image.civitai.com now answers with a redirect
-# to blobs-b2.civitai.com) only over HTTPS to one of CIVITAI_DOMAINS or a
-# subdomain of one, at most this many hops, and never with the API key.
-MAX_CIVITAI_REDIRECTS = 3
-_REDIRECT_CODES = frozenset({301, 302, 303, 307, 308})
-_USER_AGENT = "ComfyUI-PromptManager/1.0"
-
-
-class _DownloadFailed(Exception):
-    """A download failed for the short, loggable ``reason`` it carries."""
-
-    def __init__(self, reason: str):
-        super().__init__(reason)
-        self.reason = reason
-
-
 class _RefuseRedirects(urllib.request.HTTPRedirectHandler):
-    """Never follow a redirect inside urllib: it would re-send the Bearer
-    header. A 3xx surfaces as ``HTTPError``; ``_download_one`` decides."""
+    """Never follow a redirect: urllib would re-send the Bearer header to it."""
 
     def redirect_request(self, req, fp, code, msg, headers, newurl):
+        logger.warning(f"Refusing redirect from {req.full_url} to {newurl}")
         return None
 
 
@@ -456,84 +425,6 @@ def _open_url(req: urllib.request.Request, timeout: float = 10):
     return _opener.open(req, timeout=timeout)
 
 
-def _loggable(url: str) -> str:
-    """``url`` without its query, fragment or credentials (signed URLs)."""
-    try:
-        parts = urlsplit(url)
-        host = parts.hostname or ""
-    except ValueError:
-        return "<unparsable URL>"
-    return f"{parts.scheme}://{host}{parts.path}"
-
-
-def _on_civitai_domain(hostname: str) -> bool:
-    """True when ``hostname`` is one of CIVITAI_DOMAINS or a subdomain of one."""
-    return any(
-        hostname == domain or hostname.endswith(f".{domain}")
-        for domain in CIVITAI_DOMAINS
-    )
-
-
-def is_civitai_redirect_target(url: str) -> bool:
-    """True when a redirect to ``url`` may be followed: HTTPS on one of
-    CIVITAI_DOMAINS or a subdomain of one, matched on the parsed host name,
-    default port and no credentials in the URL."""
-    try:
-        parts = urlsplit(url)
-        port = parts.port
-    except ValueError:
-        return False
-    hostname = (parts.hostname or "").lower()
-    return (
-        parts.scheme == "https"
-        and _on_civitai_domain(hostname)
-        and parts.username is None
-        and parts.password is None
-        and port in (None, 443)
-    )
-
-
-def _redirect_target(url: str, error) -> Optional[str]:
-    """The URL a 3xx ``error`` for ``url`` points to, or None when absent."""
-    if error.code not in _REDIRECT_CODES:
-        return None
-    location = (error.headers.get("Location") or "").strip()
-    if not location:
-        return None
-    return urljoin(url, location)
-
-
-def _open_following_civitai_redirects(url: str, api_key: str):
-    """Open ``url``, following only allowed CivitAI redirects (keyless).
-
-    The first request carries the key; every redirected one carries the
-    User-Agent alone. Returns the open response; raises ``_DownloadFailed``
-    when a redirect is refused or the hop limit is reached. Other HTTP
-    errors propagate.
-    """
-    headers = {"User-Agent": _USER_AGENT}
-    if api_key:
-        headers["Authorization"] = f"Bearer {api_key}"
-    current = url
-    for hop in range(MAX_CIVITAI_REDIRECTS + 1):
-        req = urllib.request.Request(current, headers=headers)
-        try:
-            return _open_url(req, timeout=10)
-        except urllib.error.HTTPError as error:
-            with error:
-                target = _redirect_target(current, error)
-            if target is None:
-                raise
-        if hop == MAX_CIVITAI_REDIRECTS:
-            raise _DownloadFailed(f"more than {MAX_CIVITAI_REDIRECTS} redirects")
-        if not is_civitai_redirect_target(target):
-            raise _DownloadFailed(f"redirect refused to {_loggable(target)}")
-        logger.debug(f"Following redirect to {_loggable(target)}")
-        current = target
-        headers = {"User-Agent": _USER_AGENT}  # never the key across a redirect
-    raise AssertionError("unreachable")  # pragma: no cover - loop ends above
-
-
 def is_civitai_url(url: str) -> bool:
     """True when ``url`` is an HTTPS URL on an allow-listed CivitAI host."""
     try:
@@ -574,160 +465,73 @@ def _read_capped(resp, cap: int) -> Optional[bytes]:
     return b"".join(chunks)
 
 
-def _network_reason(error: BaseException) -> str:
-    """A short reason for a failed request: a timeout or a network error."""
-    cause = getattr(error, "reason", error)  # URLError wraps the socket error
-    if isinstance(cause, TimeoutError):
-        return "timed out"
-    return f"network error: {cause}"
-
-
-def _fetch_civitai_body(url: str, api_key: str) -> bytes:
-    """The body behind ``url`` (redirects as allowed, size capped), or
-    ``_DownloadFailed`` with the reason it could not be fetched."""
-    try:
-        with _open_following_civitai_redirects(url, api_key) as resp:
-            raw = _read_capped(resp, MAX_CIVITAI_DOWNLOAD_BYTES)
-    except urllib.error.HTTPError as error:
-        error.close()
-        raise _DownloadFailed(f"HTTP {error.code}") from None
-    except (urllib.error.URLError, OSError, http.client.HTTPException) as error:
-        raise _DownloadFailed(_network_reason(error)) from None
-    if raw is None:
-        cap = MAX_CIVITAI_DOWNLOAD_BYTES
-        size = f"{cap // (1024 * 1024)} MB" if cap >= 1024 * 1024 else f"{cap} byte"
-        raise _DownloadFailed(f"larger than the {size} cap")
-    return raw
-
-
-def _thumbnail(raw: bytes):
-    """``raw`` decoded and shrunk to an RGB thumbnail, or ``_DownloadFailed``."""
-    from io import BytesIO
-
-    from PIL import Image
-
-    try:
-        with Image.open(BytesIO(raw)) as img:
-            img.thumbnail((_THUMB_MAX_SIZE, _THUMB_MAX_SIZE), Image.LANCZOS)
-            return img.convert("RGB")
-    except Exception as error:  # PIL raises several types for bad data
-        raise _DownloadFailed(
-            f"image could not be decoded ({type(error).__name__})"
-        ) from None
-
-
 def _download_one(url: str, local_path: Path, api_key: str) -> Optional[str]:
     """Download a single CivitAI image, resize to thumbnail, save as JPEG.
 
     Refuses any URL that is not HTTPS on an allow-listed CivitAI host so the
-    API key is never sent elsewhere, follows a redirect only as
-    ``_open_following_civitai_redirects`` allows (without the key), and
-    refuses bodies larger than MAX_CIVITAI_DOWNLOAD_BYTES. A failure logs
-    one warning with a short reason and the URL without query or
-    credentials (#340), and returns None.
+    API key is never sent elsewhere, and refuses bodies larger than
+    MAX_CIVITAI_DOWNLOAD_BYTES.
     """
+    if not is_civitai_url(url):
+        logger.warning(f"Refusing non-CivitAI download URL: {url}")
+        return None
     try:
-        if not is_civitai_url(url):
-            raise _DownloadFailed("not an allowed CivitAI URL")
-        image = _thumbnail(_fetch_civitai_body(url, api_key))
-        try:
-            _save_atomically(image, local_path)
-        except OSError as error:
-            raise _DownloadFailed(
-                f"image could not be saved ({error.strerror or type(error).__name__})"
-            ) from None
-    except _DownloadFailed as failure:
-        reason = failure.reason
-    except Exception as error:  # best effort: an import never fails on one image
-        reason = f"unexpected {type(error).__name__}"
-    else:
+        headers = {"User-Agent": "ComfyUI-PromptManager/1.0"}
+        if api_key:
+            headers["Authorization"] = f"Bearer {api_key}"
+        req = urllib.request.Request(url, headers=headers)
+        with _open_url(req, timeout=10) as resp:
+            raw = _read_capped(resp, MAX_CIVITAI_DOWNLOAD_BYTES)
+        if raw is None:
+            logger.warning(f"Refusing oversized download: {url}")
+            return None
+
+        # Resize to thumbnail to save disk space
+        from io import BytesIO
+
+        from PIL import Image
+
+        img = Image.open(BytesIO(raw))
+        img.thumbnail((_THUMB_MAX_SIZE, _THUMB_MAX_SIZE), Image.LANCZOS)
+        img = img.convert("RGB")
+        img.save(str(local_path), "JPEG", quality=85)
+
         return str(local_path.resolve())
-    logger.warning(f"CivitAI image download failed: {_loggable(url)}: {reason}")
-    return None
+    except Exception as e:
+        logger.debug(f"Failed to download {url}: {e}")
+        return None
 
 
-_PART_PREFIX = ".pm-"
-_PART_SUFFIX = ".part"
-# A temp download older than this was left by a killed process, not a live one
-# (each download has a 10 s timeout).
-STALE_PART_SECONDS = 3600
+def download_civitai_images(
+    metadata: Dict, metadata_path: Path, cache_dir: Path, api_key: str = ""
+) -> List[str]:
+    """Download civitai example images to a local cache directory.
 
+    Uses thumbnail URLs (512px) instead of full-size originals, and
+    downloads in parallel (up to 8 concurrent) for speed.
 
-def _save_atomically(image, local_path: Path) -> None:
-    """Write ``image`` as JPEG so ``local_path`` only ever names a whole file.
+    Args:
+        api_key: CivitAI API key for authenticated downloads (NSFW content).
 
-    The image goes to a ``.pm-*.part`` file in the same folder, which is
-    closed before ``os.replace`` puts it in place (Windows cannot replace an
-    open file); a failure removes the temp file. A reader (another import's
-    cache check) never sees a half-written image. The temp file is opened
-    like ``img.save`` opens a file, so the image keeps the umask's mode.
+    Returns:
+        List of absolute paths to downloaded image files.
     """
-    import secrets
+    from concurrent.futures import ThreadPoolExecutor
 
-    while True:
-        temp = local_path.parent / (
-            f"{_PART_PREFIX}{secrets.token_hex(8)}{_PART_SUFFIX}"
-        )
-        try:
-            handle = open(temp, "xb")
-        except FileExistsError:
-            continue
-        break
-    try:
-        with handle:
-            image.save(handle, "JPEG", quality=85)
-        os.replace(temp, local_path)
-    except BaseException:
-        try:
-            os.remove(temp)
-        except OSError:
-            pass
-        raise
-
-
-def sweep_stale_downloads(cache_dir: Path) -> None:
-    """Remove ``.pm-*.part`` files a killed download left in the image cache.
-
-    Only that exact pattern, only in ``cache_dir`` and its LoRA folders, and
-    only once older than ``STALE_PART_SECONDS``; a file that cannot be read
-    or removed is left for a later import.
-    """
-    import time
-
-    cutoff = time.time() - STALE_PART_SECONDS
-    try:
-        folders = [cache_dir] + [p for p in cache_dir.iterdir() if p.is_dir()]
-    except OSError:
-        return
-    for folder in folders:
-        try:
-            candidates = list(folder.glob(f"{_PART_PREFIX}*{_PART_SUFFIX}"))
-        except OSError:
-            continue
-        for path in candidates:
-            try:
-                if path.is_file() and path.stat().st_mtime < cutoff:
-                    os.remove(path)
-            except OSError:
-                logger.debug(f"Could not remove stale download {path}")
-
-
-def _civitai_cache_plan(
-    metadata: Dict, metadata_path: Path, cache_dir: Path
-) -> Tuple[Path, List[str], List[Tuple[str, Path]]]:
-    """``(lora_cache, cached, tasks)`` for a LoRA's CivitAI example images.
-
-    ``cached`` are the images already in the cache, ``tasks`` the
-    ``(url, local_path)`` downloads still needed. Reads only; creates nothing.
-    """
     civitai = _get_civitai(metadata)
     images = civitai.get("images", []) or []
+    if not images:
+        return []
 
     file_name = metadata.get("file_name", "")
     if not file_name:
         file_name = metadata_path.name.replace(".metadata.json", "")
-    lora_cache = cache_dir / Path(file_name).stem
+    lora_stem = Path(file_name).stem
 
+    lora_cache = cache_dir / lora_stem
+    lora_cache.mkdir(parents=True, exist_ok=True)
+
+    # Build download tasks
     cached = []
     tasks = []  # (url, local_path)
     for img in images:
@@ -744,42 +548,9 @@ def _civitai_cache_plan(
             cached.append(str(local_path.resolve()))
         else:
             tasks.append((url, local_path))
-    return lora_cache, cached, tasks
 
-
-def planned_civitai_downloads(
-    metadata: Dict, metadata_path: Path, cache_dir: Path
-) -> int:
-    """How many example images an import would download (no request, no write)."""
-    return len(_civitai_cache_plan(metadata, metadata_path, cache_dir)[2])
-
-
-def download_civitai_images(
-    metadata: Dict,
-    metadata_path: Path,
-    cache_dir: Path,
-    api_key: str = "",
-    stats: Optional[Dict[str, int]] = None,
-) -> List[str]:
-    """Download civitai example images to a local cache directory.
-
-    Uses thumbnail URLs (512px) instead of full-size originals, and
-    downloads in parallel (up to 8 concurrent) for speed.
-
-    Args:
-        api_key: CivitAI API key for authenticated downloads (NSFW content).
-        stats: When given, ``downloaded`` and ``download_errors`` are
-            increased by the downloads that succeeded and failed.
-
-    Returns:
-        List of absolute paths to downloaded image files.
-    """
-    from concurrent.futures import ThreadPoolExecutor
-
-    lora_cache, cached, tasks = _civitai_cache_plan(metadata, metadata_path, cache_dir)
     if not tasks:
         return cached
-    lora_cache.mkdir(parents=True, exist_ok=True)
 
     # Download in parallel
     downloaded = []
@@ -792,21 +563,15 @@ def download_civitai_images(
             if result:
                 downloaded.append(result)
 
-    if stats is not None:
-        stats["downloaded"] = stats.get("downloaded", 0) + len(downloaded)
-        stats["download_errors"] = (
-            stats.get("download_errors", 0) + len(tasks) - len(downloaded)
-        )
     return cached + downloaded
 
 
-def get_lora_image_cache_dir(create: bool = True) -> Path:
+def get_lora_image_cache_dir() -> Path:
     """Get the directory used to cache downloaded LoRA example images.
 
     ``<data folder>/data/lora_images`` (``utils.library_location``): the node
     folder for a library that was not moved, else ComfyUI's
-    ``user/__promptmanager``. ``create=False`` only names it (a preview
-    writes nothing).
+    ``user/__promptmanager``.
     """
     try:
         from ..utils import library_location
@@ -817,21 +582,34 @@ def get_lora_image_cache_dir(create: bool = True) -> Path:
     cache = Path(
         library_location.cache_dir("lora_images", extension_root=str(ext_root))
     )
-    if create:
-        cache.mkdir(parents=True, exist_ok=True)
+    cache.mkdir(parents=True, exist_ok=True)
     return cache
 
 
+def get_example_images_dir(lora_manager_path: str) -> Optional[str]:
+    """Find the LoraManager example_images directory."""
+    lm_path = Path(lora_manager_path)
+
+    # Direct subdirectory
+    candidate = lm_path / "example_images"
+    if candidate.is_dir():
+        return str(candidate.resolve())
+
+    # Search one level in user data dirs
+    for child in lm_path.iterdir():
+        if child.is_dir():
+            sub = child / "example_images"
+            if sub.is_dir():
+                return str(sub.resolve())
+
+    return None
+
+
 # ── Trigger word cache & injection ───────────────────────────────────
 
 _LORA_PATTERN = re.compile(r"<lora:([^:>]+):[^>]+>", re.IGNORECASE)
 
 
-# A failed load is retried by a running node only after this long (an explicit
-# reload, from the settings routes, always runs).
-TRIGGER_RETRY_SECONDS = 60
-
-
 class TriggerWordCache:
     """Thread-safe cache mapping LoRA names to their trigger words.
 
@@ -842,81 +620,52 @@ class TriggerWordCache:
         self._cache: Dict[str, List[str]] = {}
         self._lock = threading.Lock()
         self._loaded = False
-        self._failed_at: Optional[float] = None
 
     def load(self, lora_manager_path: str) -> int:
-        """Build the trigger word map from the sidecars LoraManager uses.
-
-        Never raises (a node calls this while it runs): a folder that cannot
-        be listed, or any other failure, is logged and the previous map is
-        kept. When LoraManager's settings cannot be used, the reason is
-        logged and the default LoRA folders are read in alongside mode.
+        """Scan LoRA metadata files and build the trigger word mapping.
 
         Returns:
-            Number of LoRAs with trigger words in the map.
+            Number of LoRAs with trigger words found.
         """
-        try:
-            new_cache = self._build(lora_manager_path)
-        except Exception as error:
-            logger.warning(f"Trigger word cache not refreshed: {error}")
-            with self._lock:
-                self._failed_at = time.monotonic()
-                return len(self._cache)
+        new_cache: Dict[str, List[str]] = {}
+
+        lora_dirs = find_lora_directories(lora_manager_path)
+        for lora_dir in lora_dirs:
+            dir_path = Path(lora_dir)
+            for meta_file in dir_path.rglob("*.metadata.json"):
+                metadata = read_lora_metadata(meta_file)
+                if not metadata:
+                    continue
+
+                words = get_trigger_words_from_metadata(metadata)
+                if not words:
+                    continue
+
+                # Key by filename stem (what appears in <lora:NAME:weight>)
+                file_name = metadata.get("file_name", "")
+                if file_name:
+                    stem = Path(file_name).stem
+                    new_cache[stem.lower()] = words
+
+                # Also key by the metadata file stem
+                meta_stem = meta_file.name.replace(".metadata.json", "")
+                if meta_stem.lower() not in new_cache:
+                    new_cache[meta_stem.lower()] = words
 
         with self._lock:
             self._cache = new_cache
             self._loaded = True
-            self._failed_at = None
 
         logger.info(
             f"Trigger word cache loaded: {len(new_cache)} LoRAs with trigger words"
         )
         return len(new_cache)
 
-    @staticmethod
-    def _build(lora_manager_path: str) -> Dict[str, List[str]]:
-        layout = lora_manager_layout(lora_manager_path)
-        if layout.error is not None:
-            logger.warning(
-                f"LoraManager settings not usable ({layout.error}); trigger words "
-                "come from the default LoRA folders"
-            )
-            layout = replace(
-                layout,
-                error=None,
-                mode=MODE_ALONGSIDE,
-                sidecar_root=None,
-                example_images_root=None,
-            )
-        new_cache: Dict[str, List[str]] = {}
-        for sidecar in discover_sidecars(layout).sidecars:
-            metadata = read_lora_metadata(sidecar.metadata_path)
-            if not metadata:
-                continue
-            words = get_trigger_words_from_metadata(metadata)
-            if not words:
-                continue
-            # Key by the model file name (what appears in <lora:NAME:weight>)
-            # and by the sidecar's name.
-            new_cache[sidecar.model_path.stem.lower()] = words
-            sidecar_stem = sidecar.metadata_path.name[: -len(METADATA_SUFFIX)]
-            new_cache.setdefault(sidecar_stem.lower(), words)
-        return new_cache
-
     def get_trigger_words(self, lora_name: str) -> List[str]:
         """Look up trigger words for a LoRA by name (case-insensitive)."""
         with self._lock:
             return self._cache.get(lora_name.lower(), [])
 
-    def retry_due(self) -> bool:
-        """Whether a node may try loading again: never failed, or the last
-        failure is TRIGGER_RETRY_SECONDS old (no rescan on every prompt run)."""
-        with self._lock:
-            failed_at = self._failed_at
-        return failed_at is None or time.monotonic() - failed_at >= (
-            TRIGGER_RETRY_SECONDS
-        )
-
     @property
     def is_loaded(self) -> bool:
         with self._lock:
@@ -926,7 +675,6 @@ class TriggerWordCache:
         with self._lock:
             self._cache.clear()
             self._loaded = False
-            self._failed_at = None
 
 
 # Module-level singleton

pyproject.toml

@@ -3,11 +3,11 @@ name = "promptmanager"
 description = "A powerful ComfyUI custom node that extends the standard text encoder with persistent prompt storage, advanced search capabilities, and an automatic image gallery system using SQLite."
 version = "3.3.1"
 license = {file = "LICENSE"}
-requires-python = ">=3.12"
+requires-python = ">=3.10"
 dependencies = ["watchdog>=2.1.0", "Pillow>=8.0.0"]
 
 [build-system]
-requires = ["setuptools>=84.2.1"]
+requires = ["setuptools>=84.0.0"]
 build-backend = "setuptools.build_meta"
 
 [project.urls]

tests/browser/classic-node.spec.mjs

@@ -149,49 +149,3 @@ test('Classic test button reports success and failure and releases expired notif
     await page.clock.fastForward(3001);
     await expect(page.locator('.pm-classic-notification')).toHaveCount(0);
 });
-
-test('Classic shows linked text, keeps the typed text through save and refuses to overwrite it (#343)',async({page})=>{
-    await page.route('**/prompt_manager/recent?**',route=>route.fulfill({json:{success:true,results:[{text:'Saved prompt',tags:[]}]}}));
-    const note=page.locator('.pm-classic').getByText('Text comes from a link. Your typed text is kept for when you disconnect it.',{exact:true});
-    await expect(note).toBeHidden();
-    await page.evaluate(()=>{
-        const widget=node.widgets.find(item=>item.name==='text');widget.value=widget.inputEl.value='Typed classic';
-        node.inputs=[{name:'text',type:'STRING',link:3,widget:{name:'text'}}];node.onConnectionsChange();
-    });
-    await expect(note).toBeVisible();
-    // The link drives the run; the saved workflow keeps what the user typed, not a stale or empty value.
-    expect(await page.evaluate(()=>node.serialize().widgets_values[0])).toBe('Typed classic');
-    await page.getByRole('button',{name:'📋 Recent',exact:true}).click();
-    await page.getByRole('button',{name:/Saved prompt/}).click();
-    expect(await page.evaluate(()=>node.widgets.find(item=>item.name==='text').value)).toBe('Typed classic');
-    await expect(page.getByRole('alert').filter({hasText:'Text comes from a link. Disconnect it to use a saved prompt.'})).toBeVisible();
-    await page.evaluate(()=>{node.inputs[0].link=null;node.onConnectionsChange();});
-    await expect(note).toBeHidden();
-    await page.getByRole('button',{name:/Saved prompt/}).click();
-    expect(await page.evaluate(()=>node.widgets.find(item=>item.name==='text').value)).toBe('Saved prompt');
-    // A workflow load re-evaluates the link state.
-    await page.evaluate(()=>{node.inputs[0].link=8;node.configure({});});
-    await expect(note).toBeVisible();
-});
-
-test('PromptManagerText shows linked text in its legacy controls and keeps the typed text (#343)',async({page})=>{
-    await page.evaluate(async()=>{
-        class TextNode {
-            constructor(){this.widgets=['text','category','tags','search_text'].map(name=>({name,value:'',inputEl:document.createElement('textarea')}));this.widgets_values=[];this.inputs=[{name:'text',type:'STRING',link:null,widget:{name:'text'}}];}
-            addDOMWidget(name,type,element){element.id='legacy-text-node';document.body.append(element);return {element};}
-            setSize(){} setDirtyCanvas(){} serialize(){return {properties:{...this.properties}};}
-        }
-        await fixtureApp.extensions[0].beforeRegisterNodeDef(TextNode,{name:'PromptManagerText'},fixtureApp);
-        window.textNode=new TextNode();textNode.onNodeCreated();
-        const widget=textNode.widgets[0];widget.value=widget.inputEl.value='Typed text node';
-    });
-    const note=page.locator('#legacy-text-node').getByText('Text comes from a link. Your typed text is kept for when you disconnect it.',{exact:true});
-    await expect(note).toBeHidden();
-    await page.evaluate(()=>{textNode.inputs[0].link=5;textNode.onConnectionsChange();});
-    await expect(note).toBeVisible();
-    expect(await page.evaluate(()=>textNode.serialize().widgets_values[0])).toBe('Typed text node');
-    await page.evaluate(()=>{textNode.usePrompt({text:'Replacement'},0);});
-    expect(await page.evaluate(()=>textNode.widgets[0].value)).toBe('Typed text node');
-    await page.evaluate(()=>{textNode.inputs[0].link=null;textNode.onConnectionsChange();textNode.onRemoved();});
-    await expect(note).toBeHidden();
-});

tests/browser/focused-node.spec.mjs

@@ -26,8 +26,7 @@ test.beforeEach(async({page,browserName})=>{
         window.fixtureApp={registerExtension(extension){this.extension=extension;},ui:{settings:new EventTarget()},graph:{setDirtyCanvas(){}},canvas:{}};
         await import('/extensions/promptmanager/prompt_manager.js');
         class Node {
-            constructor(){this.widgets=['text','category','tags','search_text'].map(name=>({name,type:'text',value:'',options:{},inputEl:document.createElement('textarea')}));this.inputs=[...['clip','prepend_text','append_text'].map(name=>({name,type:name==='clip'?'CLIP':'STRING',link:null})),...['text','category','tags','search_text'].map(name=>({name,type:'STRING',link:null,widget:{name}}))];this.properties={};this.size=[550,700];}
-            findInputByType(type){const index=this.inputs.findIndex(input=>input.type===type&&input.link==null);return index<0?undefined:{index,slot:this.inputs[index]};}
+            constructor(){this.widgets=['text','category','tags','search_text'].map(name=>({name,type:'text',value:'',options:{},inputEl:document.createElement('textarea')}));this.inputs=['clip','prepend_text','append_text'].map(name=>({name,link:null}));this.properties={};this.size=[550,700];}
             addWidget(type,name,value,callback,options){const widget={type,name,value,callback,options};this.widgets.push(widget);return widget;}
             addDOMWidget(name,type,element){const host=document.createElement('div');host.style.height='650px';host.className='fixture-dom-widget';host.append(element);document.body.append(host);return {element};}
             setSize(size){this.size=size;}setDirtyCanvas(){}
@@ -247,39 +246,13 @@ test(`${variant} restores workflow values and disclosures and protects connected
     await page.evaluate(()=>{const saved=node.serialize();node.configure(saved);});
     await expect(page.getByLabel('Category',{exact:true})).toBeVisible();
     await expect(page.getByLabel('Category',{exact:true})).toHaveValue('Saved category');
-    await page.evaluate(()=>{node.inputs.find(input=>input.name==='text').link=9;node.onConnectionsChange();});
+    await page.evaluate(()=>{node.inputs.push({name:'text',link:9});node.onConnectionsChange();});
     await expect(page.getByRole('textbox',{name:'Main prompt',exact:true})).toBeHidden();
-    await expect(page.getByText('Main prompt comes from a link. Your typed text is kept for when you disconnect it.',{exact:true})).toBeVisible();
+    await expect(page.getByText('Text is supplied by an upstream connection.',{exact:true})).toBeVisible();
     await page.evaluate(()=>{node.inputs.find(input=>input.name==='text').link=null;node.onConnectionsChange();});
     await expect(page.getByRole('textbox',{name:'Main prompt',exact:true})).toHaveValue('Saved draft');
 });
 
-test(`${variant} offers text as a link socket, keeps typed text while linked and through a reload (#343)`,async({page})=>{
-    const sockets=()=>page.evaluate(()=>Object.fromEntries(node.inputs.map(input=>[input.name,input.widget?.name??null])));
-    // The hidden text widget no longer owns the input, so the host draws it as a socket; the other widget inputs are unchanged.
-    expect(await sockets()).toEqual({clip:null,prepend_text:null,append_text:null,text:null,category:'category',tags:'tags',search_text:'search_text'});
-    expect(await page.evaluate(()=>node.findInputByType('STRING').slot.name)).toBe('text');
-    expect(await page.evaluate(()=>node.findInputByType('CLIP').slot.name)).toBe('clip');
-    const main=page.getByRole('textbox',{name:'Main prompt',exact:true});
-    await main.fill('Typed main');
-    await page.evaluate(()=>{node.inputs.find(input=>input.name==='text').link=21;node.onConnectionsChange();});
-    await expect(main).toBeHidden();
-    const note=page.getByText('Main prompt comes from a link. Your typed text is kept for when you disconnect it.',{exact:true});
-    await expect(note).toBeVisible();
-    await expect(page.locator('[data-composed-preview]')).toHaveText('[text supplied by connection]');
-    // A second STRING link dropped on the editor falls back to the frontend's own choice.
-    expect(await page.evaluate(()=>node.findInputByType('STRING').slot.name)).toBe('prepend_text');
-    // An older saved workflow brings the widget binding back with its inputs: configure exposes the socket again.
-    const saved=await page.evaluate(()=>{const saved=node.serialize();node.inputs.find(input=>input.name==='text').widget={name:'text'};node.configure(saved);return saved;});
-    expect(saved.widgets_values[0]).toBe('Typed main');
-    expect((await sockets()).text).toBeNull();
-    await expect(note).toBeVisible();
-    await page.evaluate(()=>{node.inputs.find(input=>input.name==='text').link=null;node.onConnectionsChange();});
-    await expect(main).toBeVisible();
-    await expect(main).toHaveValue('Typed main');
-    await expect(note).toBeHidden();
-});
-
 test(`${variant} searches quoted tags with Enter and explicitly loads metadata`, async ({page}) => {
     let requested;
     await page.route('**/prompt_manager/search?**', async route => {

tests/browser/pair-node.spec.mjs

@@ -17,8 +17,7 @@ test.beforeEach(async({page,browserName})=>{
         window.fixtureApp={registerExtension(extension){this.extension=extension;},ui:{settings},graph:{_nodes:[],setDirtyCanvas(){}},canvas:{},graphToPrompt:async()=>({})};
         await import('/extensions/promptmanager/prompt_manager.js');
         class Node {
-            constructor(){this.id=1;this.type='PromptManagerPair';this.widgets=['text','negative_text','category','tags','search_text'].map(name=>({name,type:'text',value:'',options:{},inputEl:document.createElement('textarea')}));this.inputs=[...['clip','prepend_text','append_text'].map(name=>({name,type:name==='clip'?'CLIP':'STRING',link:null})),...['text','negative_text','category','tags','search_text'].map(name=>({name,type:'STRING',link:null,widget:{name}}))];this.properties={};this.size=[1100,700];}
-            findInputByType(type){const index=this.inputs.findIndex(input=>input.type===type&&input.link==null);return index<0?undefined:{index,slot:this.inputs[index]};}
+            constructor(){this.id=1;this.type='PromptManagerPair';this.widgets=['text','negative_text','category','tags','search_text'].map(name=>({name,type:'text',value:'',options:{},inputEl:document.createElement('textarea')}));this.inputs=['clip','prepend_text','append_text'].map(name=>({name,link:null}));this.properties={};this.size=[1100,700];}
             addWidget(type,name,value,callback,options){const widget={type,name,value,callback,options};this.widgets.push(widget);return widget;}
             addDOMWidget(name,type,element){const host=document.createElement('div');host.style.cssText='height:700px;width:1100px;max-width:100%';host.className='fixture-dom-widget';host.append(element);document.body.append(host);return {element};}
             setSize(size){this.size=size;}setDirtyCanvas(){}
@@ -124,46 +123,6 @@ test('a superseded library response never replaces the latest pair selection',as
     await expect(page.locator('.pm-editor-result')).not.toContainText('Stale positive');
 });
 
-test('paired editor offers positive and negative link sockets and keeps both typed texts (#343)',async({page})=>{
-    await draft(page,'Typed positive','Typed negative');
-    expect(await page.evaluate(()=>node.inputs.filter(input=>!input.widget).map(input=>input.name))).toEqual(['clip','prepend_text','append_text','text','negative_text']);
-    const target=()=>page.evaluate(()=>node.findInputByType('STRING').slot.name);
-    expect(await target()).toBe('text');
-    const positive=page.getByRole('textbox',{name:'Positive prompt',exact:true}),negative=page.getByRole('textbox',{name:'Negative prompt',exact:true});
-    const positiveNote=page.getByText('Positive prompt comes from a link. Your typed text is kept for when you disconnect it.',{exact:true});
-    const negativeNote=page.getByText('Negative prompt comes from a link. Your typed text is kept for when you disconnect it.',{exact:true});
-    const link=(name,value)=>page.evaluate(({name,value})=>{node.inputs.find(input=>input.name===name).link=value;node.onConnectionsChange();},{name,value});
-    for(const [linked,next] of [[['text'],'negative_text'],[['negative_text'],'text'],[['text','negative_text'],'prepend_text'],[[],'text']]){
-        for(const name of ['text','negative_text'])await link(name,linked.includes(name)?30:null);
-        expect(await target()).toBe(next);
-        await expect(positive).toBeVisible({visible:!linked.includes('text')});
-        await expect(negative).toBeVisible({visible:!linked.includes('negative_text')});
-        await expect(positiveNote).toBeVisible({visible:linked.includes('text')});
-        await expect(negativeNote).toBeVisible({visible:linked.includes('negative_text')});
-        const saved=await page.evaluate(()=>{const saved=node.serialize();for(const input of node.inputs)if(['text','negative_text'].includes(input.name))input.widget={name:input.name};node.configure(saved);return saved.widgets_values.slice(0,2);});
-        expect(saved).toEqual(['Typed positive','Typed negative']);
-        expect(await page.evaluate(()=>node.inputs.filter(input=>input.widget&&['text','negative_text'].includes(input.name)).length)).toBe(0);
-    }
-    await expect(positive).toHaveValue('Typed positive');await expect(negative).toHaveValue('Typed negative');
-});
-
-test('a link dropped on either prompt box, or its note, fills that box (#343 review M1)',async({page})=>{
-    const keys=await page.evaluate(()=>[...document.querySelectorAll('.pm-pair .lg-node-widget [data-slot-key]')].map(key=>key.dataset.slotKey));
-    // Nodes 2.0 resolves a drop through the nearest .lg-node-widget and its slot key: positive box and note, negative box and note.
-    expect(keys).toEqual(['1-in-3','1-in-3','1-in-4','1-in-4']);
-    const at=(name,connecting=true)=>page.evaluate(({name,connecting})=>{
-        fixtureApp.canvas={linkConnector:{state:{connectingTo:connecting?'input':undefined}},ds:{convertOffsetToCanvas:point=>point},canvas:{getBoundingClientRect:()=>({left:0,top:0})}};
-        const box=[...document.querySelectorAll('.pm-pair .lg-node-widget')].find(element=>element.getClientRects().length&&element.textContent.includes(name)).getBoundingClientRect();
-        return node.getInputOnPos([box.left+box.width/2,box.top+box.height/2])?.name??null;
-    },{name,connecting});
-    expect(await at('Negative prompt')).toBe('negative_text');
-    expect(await at('Positive prompt')).toBe('text');
-    expect(await at('Negative prompt',false)).toBeNull();
-    await page.evaluate(()=>{node.inputs.find(input=>input.name==='negative_text').link=4;node.onConnectionsChange();});
-    expect(await at('Negative prompt comes from a link')).toBe('negative_text');
-    expect(await page.evaluate(()=>{fixtureApp.canvas={};return node.getInputOnPos([1,1])??null;})).toBeNull();
-});
-
 test('queue hook synchronizes both editors, preserves links and forwards branch execution arguments',async({page})=>{
     await draft(page);
     const args=await page.evaluate(async()=>{

tests/browser/server.py

@@ -23,9 +23,6 @@ from tests.browser.request_hold import register_request_holds
 from tests.browser import slow_reset_watch
 from tests.browser.workspace_activity_fixture import register_activity_commands
 from tests.browser.workspace_system_fixture import register_system_commands
-from tests.browser.workspace_integrations_fixture import (
-    register_integrations_commands,
-)
 from tests.browser.workspace_concept_fixture import (
     MAX_EXTRA_IMAGES as CONCEPT_MAX_EXTRA_IMAGES,
     MAX_SEEDLESS_IMAGES as CONCEPT_MAX_SEEDLESS_IMAGES,
@@ -166,20 +163,7 @@ def register_reveal_stub(routes, api, root: Path):
     return types.SimpleNamespace(reset=reset)
 
 
-def isolate_lora_manager_settings(root: Path) -> Path:
-    """LoraManager's settings lookup reads an empty folder under ``root`` (#355).
-
-    The server's temporary root is removed when it exits, and with it this
-    folder: no page test reads the developer's real LoraManager settings.
-    """
-    folder = root / "lora-manager-settings"
-    folder.mkdir(exist_ok=True)
-    os.environ["LORA_MANAGER_SETTINGS_DIR"] = str(folder)
-    return folder
-
-
 def create_app(root: Path) -> web.Application:
-    isolate_lora_manager_settings(root)
     os.environ["PROMPT_MANAGER_CONFIG_PATH"] = str(root / "config.json")
     os.chdir(root)
     app = web.Application()
@@ -219,7 +203,6 @@ def create_app(root: Path) -> web.Application:
     reveal_stub = register_reveal_stub(routes, api, root)
     register_activity_commands(app, routes, api)
     register_system_commands(app, routes, api, root)
-    register_integrations_commands(app, routes, api, root)
     request_holds = register_request_holds(app, routes)
     slow_reset_watch.install(app, api)
 
@@ -373,12 +356,7 @@ def create_app(root: Path) -> web.Application:
                 with Image.new("RGB", (64, 64), (100, 80, 120)) as image:
                     image.save(root / "output" / name, pnginfo=info)
                 os.utime(root / "output" / name, (time.time() - 100, time.time() - 100))
-        from py.api.thumbnail_settings import ThumbnailSettings
-
-        # 150 px previews in the default format (#317 thumbnail settings).
-        api._generate_gallery_thumbnails_sync(
-            api._get_all_output_dirs(), ThumbnailSettings("webp", 80, 150)
-        )
+        api._generate_gallery_thumbnails_sync(api._get_all_output_dirs(), (150, 150))
         if include_video:
             # Seed after thumbnail generation to exercise a real unthumbnailed video.
             video = root / "output" / "clip.webm"

tests/browser/system-backups-concept.spec.mjs

@@ -1,329 +0,0 @@
-import { startCoverage, saveCoverage } from '../../tools/vendor/browser-coverage.mjs';
-import { test, expect } from './fixtures.mjs';
-import { SIZES, THEMES, seedConcept, openConcept, openProduction, diffInventory, mutate } from './concept-inventory.mjs';
-
-// #249 System S9 Task 25: System › Backup & export (app.js renderSystem 691–693), its "Restore preview" (`restore`,
-// 1472–1476) and its "Import & inspect" (`import`, 1483–1487) against the immutable concept, on the concept-shaped
-// fixture. Each concept measurement is mapped only by the recorded deviations (D103, D104, D105; the Import dialog's
-// D15 and D55), each commented where it applies; after that the difference must be empty, and a mutated label, row,
-// danger mark or token must be noticed.
-test.use({ locale: 'en-US', timezoneId: 'UTC' });
-
-test.beforeEach(async ({ page, request, browserName }) => {
-    await startCoverage(page, browserName);
-    await seedConcept(request);
-    await expect(await request.post('/__test__/system/reset')).toBeOK();
-    await expect(await request.post('/__test__/jobs/restart')).toBeOK();
-    page.conceptErrors = [];
-    page.on('pageerror', error => page.conceptErrors.push(error.message));
-});
-
-test.afterEach(async ({ page, request, browserName }) => {
-    await saveCoverage(page, browserName);
-    await request.post('/__test__/jobs/restart');
-    await request.post('/__test__/system/reset');
-    expect(page.conceptErrors).toEqual([]);
-});
-
-const PREVIEW_URL = '/prompt_manager/restore/preview';
-
-/** Runs in the page: the section's surfaces under `mainSelector`, their text, controls, geometry and tokens. */
-function measureBackups(mainSelector) {
-    const layout = document.querySelector(`${mainSelector} .settings-layout`);
-    const css = (node, ...keys) => node ? Object.fromEntries(keys.map(key => [key, getComputedStyle(node)[key]])) : null;
-    const name = node => [node.localName, ...[...node.classList].sort()].join('.');
-    const text = node => node?.textContent.trim() ?? null;
-    const button = node => ({ text: text(node), className: node.className,
-        ...css(node, 'backgroundColor', 'color', 'fontSize', 'paddingTop', 'paddingLeft', 'borderTopColor') });
-    const base = layout.getBoundingClientRect();
-    const box = node => {
-        const rect = node.getBoundingClientRect();
-        return { left: Math.round(rect.left - base.left), top: Math.round(rect.top - base.top), width: Math.round(rect.width) };
-    };
-    const control = row => {
-        const select = row.querySelector(':scope > select');
-        if (select) return { kind: 'select', id: select.id, options: [...select.options].map(option => [option.textContent, option.disabled]),
-            selected: select.selectedOptions[0]?.textContent ?? null, disabled: select.disabled };
-        const toggle = row.querySelector(':scope > * input[type="checkbox"]');
-        return toggle ? { kind: 'switch', id: toggle.id, wrapper: name(toggle.parentElement), checked: toggle.checked,
-            disabled: toggle.disabled, ...css(toggle.parentElement, 'width', 'height') } : null;
-    };
-    const columns = layout.querySelector(':scope > .two-col');
-    const surfaces = [...columns.querySelectorAll(':scope > section.surface')];
-    const policy = layout.querySelector(':scope > section.surface');
-    const chip = policy.querySelector(':scope > h2 > .chip');
-    const row = policy.querySelector('.setting-row');
-    const status = surfaces[0].querySelector(':scope > p.small');
-    const warning = policy.querySelector(':scope > .warning-note');
-    return {
-        layout: [...layout.children].map(name),
-        columns: { ...css(columns, 'display', 'gridTemplateColumns', 'columnGap'), box: box(columns) },
-        surfaces: surfaces.map(surface => ({ tree: [...surface.children].map(name), heading: text(surface.querySelector(':scope > h2')),
-            intro: text(surface.querySelector(':scope > p:not(.small)')), box: box(surface),
-            actions: [...surface.querySelectorAll(':scope > .row-actions')].map(group => ({ tree: [...group.children].map(name),
-                ...css(group, 'display', 'columnGap', 'flexWrap', 'marginTop'),
-                buttons: [...group.children].map(button) })) })),
-        status: { text: text(status), ...css(status, 'fontSize', 'color', 'marginTop') },
-        surface: css(surfaces[0], 'paddingTop', 'paddingLeft', 'backgroundColor', 'borderTopWidth', 'borderTopColor', 'borderTopLeftRadius'),
-        h2: css(surfaces[0].querySelector('h2'), 'fontSize', 'fontWeight', 'color', 'marginBottom'),
-        intro: css(surfaces[0].querySelector(':scope > p'), 'fontSize', 'color', 'lineHeight'),
-        // Its place below the columns (the concept's `.surface + .surface` 18px), whatever the columns' height.
-        policy: { tree: [...policy.children].map(name), heading: text(policy.querySelector(':scope > h2')),
-            box: { left: box(policy).left, width: box(policy).width,
-                gap: Math.round(policy.getBoundingClientRect().top - columns.getBoundingClientRect().bottom) },
-            chip: { text: text(chip), className: chip.className, ...css(chip, 'color', 'fontSize', 'borderTopColor', 'backgroundColor') },
-            rows: [...policy.querySelectorAll(':scope > .setting-row')].map(item => ({ tree: [...item.children].map(name),
-                text: [...item.firstElementChild.children].map(node => [name(node), text(node), node.localName === 'label' ? node.htmlFor : null]),
-                control: control(item) })),
-            warning: { text: text(warning), ...css(warning, 'fontSize', 'color', 'marginTop', 'marginBottom') } },
-        row: css(row, 'display', 'alignItems', 'justifyContent', 'columnGap', 'paddingTop', 'paddingBottom', 'borderTopWidth', 'borderTopColor',
-            'marginTop'),
-        label: css(row.querySelector('label'), 'fontSize', 'fontWeight', 'color'),
-        description: css(row.querySelector('p'), 'fontSize', 'color', 'marginTop', 'maxWidth'),
-        select: css(policy.querySelector('.setting-row > select'), 'fontSize', 'minWidth', 'maxWidth', 'backgroundColor', 'color',
-            'borderTopColor'),
-        pageScroll: document.documentElement.scrollWidth > document.documentElement.clientWidth,
-    };
-}
-
-const SCHEDULE_REASON = 'Daily and Weekly are not available yet: back up with Back up whenever you choose.';
-const SAFETY_DESCRIPTION = 'Keep a verified copy of the database on disk before maintenance, cleanups and LoRA imports change ' +
-    'records. A restore always keeps one.';
-
-/**
- * D103: "Back up" (the concept's "Simulate backup"), the status line from /backup/status, "Export JSON" (its "Export
- * sample JSON") and the two secondary exports in a second `.row-actions.spaced` with the concept's plain buttons.
- * D104: the toggle's line says what the policy does, the schedule's reason replaces the prototype's proposal line,
- * Daily and Weekly are disabled, and the warning note is truthful. The fixture has no backup yet.
- */
-function mapBackupsConcept(reference) {
-    const [database, portable] = reference.surfaces;
-    const [backup, restore] = database.actions[0].buttons;
-    const [exportButton, importButton] = portable.actions[0].buttons;
-    const secondary = ['Export all prompts JSON', 'Export saved pairs JSON'].map(label => ({ ...exportButton, text: label }));
-    return {
-        ...reference,
-        surfaces: [
-            { ...database, actions: [{ ...database.actions[0], buttons: [{ ...backup, text: 'Back up' }, restore] }] },
-            { ...portable, tree: [...portable.tree, 'div.row-actions.spaced'],
-                actions: [{ ...portable.actions[0], buttons: [{ ...exportButton, text: 'Export JSON' }, importButton] },
-                    { ...portable.actions[0], tree: ['button', 'button'], buttons: secondary }] },
-        ],
-        status: { ...reference.status, text: 'No backup recorded.' },
-        policy: { ...reference.policy,
-            rows: reference.policy.rows.map(item => (item.control.kind !== 'select'
-                // D104 (M2): what the safety-backup policy really does.
-                ? { ...item, text: item.text.map(([node, value, target]) => [node, node === 'p' ? SAFETY_DESCRIPTION : value, target]) }
-                : { ...item,
-                    text: item.text.map(([node, value, target]) => [node, node === 'p' ? SCHEDULE_REASON : value, target]),
-                    control: { ...item.control, options: item.control.options.map(([label]) => [label, label !== 'Manual only']) } })),
-            warning: { ...reference.policy.warning, text: 'Restores are staged, migrated and validated before replacing live data.' } },
-    };
-}
-
-async function conceptBackups(page, theme) {
-    await openConcept(page, 'system', theme);
-    await page.locator('#main .section-nav').getByRole('button', { name: 'Backup & export', exact: true }).click();
-    await expect(page.locator('#main .settings-layout > .two-col > section.surface')).toHaveCount(2);
-    await page.mouse.move(0, 0);
-    return page.evaluate(measureBackups, '#main');
-}
-
-async function productionBackups(page, theme, status = 'No backup recorded.') {
-    await openProduction(page, 'system/backups', theme);
-    await expect(page.locator('#workspace-main .settings-layout > .two-col > section.surface')).toHaveCount(2);
-    // The status line and the policy row are their own reads: compare once both answered.
-    await expect(page.locator('#workspace-main #backup-status')).toHaveText(status);
-    await expect(page.locator('#workspace-main #backup-before')).toBeEnabled();
-    await page.mouse.move(0, 0);
-    return page.evaluate(measureBackups, '#workspace-main');
-}
-
-for (const theme of THEMES) for (const [width, height] of SIZES) {
-    test(`backup & export matches the concept ${theme} ${width}x${height}`, async ({ page }, testInfo) => {
-        await page.setViewportSize({ width, height });
-        const concept = await conceptBackups(page, theme);
-        await page.screenshot({ path: testInfo.outputPath(`concept-backups-${theme}-${width}.png`), fullPage: true });
-        const production = await productionBackups(page, theme);
-        await page.screenshot({ path: testInfo.outputPath(`production-backups-${theme}-${width}.png`), fullPage: true });
-        expect(diffInventory(mapBackupsConcept(concept), production)).toEqual([]);
-        expect(production.pageScroll).toBe(false);
-    });
-}
-
-/** Runs in the page: the open dialog's title, body tree, grid, note, backup box and actions with the concept's tokens. */
-function measureDialog() {
-    const dialog = document.querySelector('dialog#modal[open]');
-    const css = (node, ...keys) => node ? Object.fromEntries(keys.map(key => [key, getComputedStyle(node)[key]])) : null;
-    const name = node => [node.localName, ...[...node.classList].sort()].join('.');
-    const text = node => node?.textContent.trim() ?? null;
-    const body = dialog.querySelector('#modal-body');
-    const grid = body.querySelector(':scope > dl.meta-grid');
-    const note = body.querySelector(':scope > p.small');
-    const actions = body.querySelector(':scope > .dialog-actions');
-    const list = body.querySelector(':scope > .operation-list');
-    return {
-        title: text(dialog.querySelector('#modal-title')),
-        tree: [...body.children].map(name),
-        grid: grid && { rows: [...grid.children].map(row => [text(row.querySelector('dt')), text(row.querySelector('dd'))]),
-            ...css(grid, 'display', 'gridTemplateColumns', 'columnGap', 'rowGap'),
-            dt: css(grid.querySelector('dt'), 'fontSize', 'color', 'textTransform'), dd: css(grid.querySelector('dd'), 'fontSize', 'color') },
-        note: note && { text: text(note), ...css(note, 'fontSize', 'color') },
-        backup: body.querySelector(':scope > .notice') && { tree: [...body.querySelector(':scope > .notice').children].map(name),
-            text: [...body.querySelectorAll(':scope > .notice > div:first-child > *')].map(node => [node.localName, text(node)]),
-            buttons: [...body.querySelectorAll(':scope > .notice button')].map(text) },
-        list: list && { ...css(list, 'display', 'rowGap'),
-            rows: [...list.children].map(row => ({ tree: [...row.children].map(name), title: text(row.querySelector('h3')),
-                description: text(row.querySelector('p')), buttons: [...row.querySelectorAll('button')].map(text),
-                ...css(row, 'display', 'alignItems', 'paddingTop', 'borderTopColor') })) },
-        actions: actions && { tree: [...actions.children].map(name), ...css(actions, 'display', 'justifyContent', 'columnGap', 'marginTop'),
-            buttons: [...actions.children].map(item => ({ text: text(item), className: item.className,
-                ...css(item, 'backgroundColor', 'color', 'fontSize', 'paddingTop', 'paddingLeft', 'borderTopColor') })) },
-    };
-}
-
-const RESTORE_BACKUP_BOX = Object.freeze({ tree: ['div', 'div.row-actions'], text: [['h3', 'Back up the database first (recommended)'],
-    ['p', 'Downloads a copy of the prompts database before the restore replaces it.']], buttons: ['Back up now'] });
-
-/**
- * D105: the server's review in the concept's "Restore preview": no sample note; the four rows with the review's values,
- * then "In the backup" and "In the library now"; the hold line in the concept's dialog `p.small` (its Import dialog's
- * intro, `small`); the D55 backup box before the actions; "Restore" (the concept's "Simulate restore", still danger).
- */
-function mapRestoreConcept(reference, small, rows) {
-    const [cancel, restore] = reference.actions.buttons;
-    return {
-        ...reference,
-        tree: ['dl.meta-grid', 'p.small', 'div.notice', 'div.dialog-actions'],
-        grid: { ...reference.grid, rows },
-        note: { ...small, text: 'Restore replaces the whole library with this backup and runs alone in Activity. ' +
-            'Nothing changes until you restore. This review holds for 15 minutes.' },
-        backup: RESTORE_BACKUP_BOX,
-        actions: { ...reference.actions, buttons: [cancel, { ...restore, text: 'Restore' }] },
-    };
-}
-
-/** D15 and D55, as on Images: Rescan for "Scan an output folder", then "Scan for metadata"; no portable recipe import. */
-function mapImportConcept(reference) {
-    return { ...reference,
-        note: { ...reference.note, text: 'Image inspection and output scanning have different effects. Choose the workflow you want.' },
-        list: { ...reference.list, rows: reference.list.rows.filter(row => row.title !== 'Import portable recipes').flatMap(row =>
-            row.title === 'Scan an output folder'
-                ? [{ ...row, description: 'Find files added or removed in the output folders.', buttons: ['Rescan'] },
-                    { ...row, title: 'Scan for metadata' }] : [row]) } };
-}
-
-async function conceptDialog(page, theme, action, title) {
-    await conceptBackups(page, theme);
-    await page.locator(`#main .settings-layout [data-action="${action}"]`).click();
-    await expect(page.locator('dialog#modal[open] #modal-title')).toHaveText(title);
-    await page.mouse.move(0, 0);
-    return page.evaluate(measureDialog);
-}
-
-/** Production's restore review of a fresh backup of this server's library; the review's own answer too. */
-async function productionRestore(page, request, theme) {
-    const copy = await request.get('/prompt_manager/backup');
-    await expect(copy).toBeOK();
-    // That copy is this session's download now.
-    await productionBackups(page, theme, /^Downloaded backup · .+ · verified\.$/);
-    const chooser = page.waitForEvent('filechooser');
-    const answer = page.waitForResponse(response => response.url().endsWith(PREVIEW_URL));
-    await page.locator('#workspace-main').getByRole('button', { name: 'Review restore…', exact: true }).click();
-    await (await chooser).setFiles({ name: 'prompts_backup_20261025_093000.db', mimeType: 'application/octet-stream',
-        buffer: await copy.body() });
-    const preview = await (await answer).json();
-    await expect(page.locator('dialog#modal[open] #modal-title')).toHaveText('Restore preview');
-    await page.mouse.move(0, 0);
-    return { preview, production: await page.evaluate(measureDialog) };
-}
-
-const counts = summary => `${summary.prompts} ${summary.prompts === 1 ? 'prompt' : 'prompts'} · ${summary.image_links} ` +
-    `${summary.image_links === 1 ? 'image link' : 'image links'} · ${summary.pairs} ${summary.pairs === 1 ? 'saved pair' : 'saved pairs'}` +
-    ` · ${summary.runs} ${summary.runs === 1 ? 'run' : 'runs'}`;
-
-function restoreRows(preview, snapshot) {
-    return [['Snapshot', snapshot], ['Integrity', 'Verified'], ['Migration', 'Current schema'],
-        ['Safety backup', `Created before replacing (${preview.safety_backup.destination_label})`],
-        ['In the backup', counts(preview.summary)], ['In the library now', counts(preview.live)]];
-}
-
-for (const theme of THEMES) for (const [width, height] of SIZES) {
-    test(`restore preview and import dialogs match the concept ${theme} ${width}x${height}`, async ({ page, request }, testInfo) => {
-        await page.setViewportSize({ width, height });
-        // The concept's own dialog `p.small` (its Import dialog's intro) is the reference for the review's note.
-        const conceptImport = await conceptDialog(page, theme, 'import', 'Import & inspect');
-        await page.screenshot({ path: testInfo.outputPath(`concept-import-${theme}-${width}.png`) });
-        const conceptRestore = await conceptDialog(page, theme, 'restore', 'Restore preview');
-        expect(conceptRestore.tree).toEqual(['p.demo-note', 'dl.meta-grid', 'div.dialog-actions']);
-        await page.screenshot({ path: testInfo.outputPath(`concept-restore-${theme}-${width}.png`) });
-        const { preview, production } = await productionRestore(page, request, theme);
-        await page.screenshot({ path: testInfo.outputPath(`production-restore-${theme}-${width}.png`) });
-        const snapshot = production.grid.rows[0][1];
-        expect(snapshot).toMatch(/^prompts_backup_20261025_093000.db · (\d+ KB|\d+\.\d MB) · .+$/);
-        const { text: _intro, ...small } = conceptImport.note;
-        expect(diffInventory(mapRestoreConcept(conceptRestore, small, restoreRows(preview, snapshot)), production)).toEqual([]);
-        await page.keyboard.press('Escape');
-        await expect(page.locator('dialog#modal[open]')).toHaveCount(0);
-        await page.locator('#workspace-main').getByRole('button', { name: 'Import / inspect file', exact: true }).click();
-        await expect(page.locator('dialog#modal[open] #modal-title')).toHaveText('Import & inspect');
-        await page.mouse.move(0, 0);
-        await page.screenshot({ path: testInfo.outputPath(`production-import-${theme}-${width}.png`) });
-        expect(diffInventory(mapImportConcept(conceptImport), await page.evaluate(measureDialog))).toEqual([]);
-    });
-}
-
-test('backup & export comparison detects mutations', async ({ page, request }) => {
-    await page.setViewportSize({ width: 1600, height: 1100 });
-    const concept = await conceptBackups(page, 'dark');
-    const expected = mapBackupsConcept(concept);
-    await productionBackups(page, 'dark');
-    const measure = () => page.evaluate(measureBackups, '#workspace-main');
-    const paths = async () => diffInventory(expected, await measure()).map(item => item.path);
-    expect(await paths()).toEqual([]);
-    // Unmapped, the section differs exactly on the D103 and D104 paths (the added row's own paths, then the rest).
-    const unmapped = diffInventory(concept, await measure()).map(item => item.path).sort();
-    const added = 'surfaces.1.actions.1.';
-    expect(unmapped.some(path => path.startsWith(added))).toBe(true);
-    expect(unmapped.filter(path => !path.startsWith(added))).toEqual([
-        'policy.rows.0.text.1.1', 'policy.rows.1.control.options.1.1', 'policy.rows.1.control.options.2.1', 'policy.rows.1.text.1.1',
-        'policy.warning.text',
-        'status.text', 'surfaces.0.actions.0.buttons.0.text', 'surfaces.1.actions.0.buttons.0.text', 'surfaces.1.actions.length',
-        'surfaces.1.tree.3', 'surfaces.1.tree.length']);
-    // A renamed label, a removed row, a lost danger mark and a swapped token are noticed.
-    await page.evaluate(() => { document.querySelector('#workspace-main .setting-row label').textContent = 'Safety backup'; });
-    expect(await paths()).toEqual(['policy.rows.0.text.0.1']);
-    await page.evaluate(() => { document.querySelector('#workspace-main .setting-row label').textContent = 'Create a safety backup before maintenance'; });
-    const undoRow = await mutate(page, { remove: ['#workspace-main .settings-layout > section.surface > .setting-row:last-of-type'] });
-    expect(await paths()).toEqual(expect.arrayContaining(['policy.rows.length', 'policy.tree.length']));
-    await undoRow();
-    await page.evaluate(() => { document.querySelector('#workspace-main button.danger').classList.remove('danger'); });
-    expect(await paths()).toEqual(expect.arrayContaining(['surfaces.0.actions.0.buttons.1.className']));
-    await page.evaluate(() => { document.querySelector('#workspace-main .two-col .row-actions > button:nth-child(2)').classList.add('danger'); });
-    const undoToken = await mutate(page, { css: '#workspace-main .settings-layout { --line: rgb(255, 0, 0); }' });
-    expect(await paths()).toEqual(expect.arrayContaining(['row.borderTopColor']));
-    await undoToken();
-    const undoChip = await mutate(page, { css: '#workspace-main .chip.blue { color: rgb(255, 0, 0); }' });
-    expect(await paths()).toEqual(['policy.chip.color']);
-    await undoChip();
-    expect(await paths()).toEqual([]);
-
-    // The restore review: a renamed term, a lost danger mark and the grid's token are noticed.
-    const conceptImport = await conceptDialog(page, 'dark', 'import', 'Import & inspect');
-    const conceptRestore = await conceptDialog(page, 'dark', 'restore', 'Restore preview');
-    const { preview, production } = await productionRestore(page, request, 'dark');
-    const { text: _intro, ...small } = conceptImport.note;
-    const expectedRestore = mapRestoreConcept(conceptRestore, small, restoreRows(preview, production.grid.rows[0][1]));
-    const restorePaths = async () => diffInventory(expectedRestore, await page.evaluate(measureDialog)).map(item => item.path);
-    expect(await restorePaths()).toEqual([]);
-    await page.evaluate(() => { document.querySelector('dialog#modal[open] dl.meta-grid dt').textContent = 'Backup'; });
-    expect(await restorePaths()).toEqual(['grid.rows.0.0']);
-    await page.evaluate(() => { document.querySelector('dialog#modal[open] dl.meta-grid dt').textContent = 'Snapshot'; });
-    await page.evaluate(() => { document.querySelector('dialog#modal[open] .dialog-actions .danger').classList.remove('danger'); });
-    expect(await restorePaths()).toEqual(expect.arrayContaining(['actions.buttons.1.className']));
-    await page.evaluate(() => { document.querySelector('dialog#modal[open] .dialog-actions button:last-child').classList.add('danger'); });
-    const undoGrid = await mutate(page, { css: 'dialog#modal dl.meta-grid { column-gap: 3px; }' });
-    expect(await restorePaths()).toEqual(expect.arrayContaining(['grid.columnGap']));
-    await undoGrid();
-    expect(await restorePaths()).toEqual([]);
-});

tests/browser/system-concept.spec.mjs

@@ -172,8 +172,8 @@ function mapOverviewConcept(reference, overview) {
         // D93: the real pending count; Review metadata opens Needs review (the concept's go-review).
         '3 ambiguous image links': row => ({ ...row,
             title: `${number(overview.needs_review.pending)} ambiguous image link${overview.needs_review.pending === 1 ? '' : 's'}` }),
-        // D93 (S9): what GET /backup/status reports; the fixture has no backup yet.
-        'Backup status': row => ({ ...row, description: 'No backup recorded.' }),
+        // D93: no backup has been recorded (verified backups arrive with S8).
+        'Backup status': row => ({ ...row, description: 'No retained backup record.' }),
         // D93: there is no paging, so the shared settings are grid and density.
         'One display configuration': row => ({ ...row, description: 'Grid and density settings are shared across views.' }),
         // D93: the real sources, not samples.
@@ -219,9 +219,6 @@ async function productionOverview(page, theme) {
     await expect(page.locator('#workspace-main .summary-metrics')).toBeVisible();
     // The thumbnail row is its own read (I2): compare once it answered.
     await expect(page.locator('#workspace-main .operation h3').filter({ hasText: 'thumbnails' })).toHaveText('No missing thumbnails');
-    // So is the backup row (S9).
-    await expect(page.locator('#workspace-main .operation').filter({ has: page.locator('h3', { hasText: 'Backup status' }) })
-        .locator('p')).toHaveText('No backup recorded.');
     await page.mouse.move(0, 0);
     return page.evaluate(measureSystem, '#workspace-main');
 }
@@ -485,8 +482,6 @@ function mapAppearanceConcept(reference, settings) {
         control: { ...toggleRow.control, id, checked } }));
     return {
         ...reference,
-        // #317: the server's thumbnail settings follow in their own surface ("Thumbnails", README: retained in Appearance).
-        layout: [reference.layout[0], 'section.surface', ...reference.layout.slice(1)],
         // D97: two added toggles and the "Reset display defaults" operation close the surface.
         surface: { ...reference.surface, tree: [...reference.surface.tree, 'div.setting-row', 'div.setting-row', 'div.operation'] },
         rows: [...reference.rows.map(row => row.control?.id === 'timeout'
@@ -535,8 +530,7 @@ test('appearance comparison detects mutations', async ({ page, request }) => {
     // Unmapped, the concept differs only where D97 and the real timeout are recorded.
     expect(diffInventory(concept, production).map(item => item.path.split('.').slice(0, 2).join('.'))
         .filter((path, index, all) => all.indexOf(path) === index).sort())
-        .toEqual(['layout.1', 'layout.2', 'layout.length', 'operations.0', 'operations.length', 'rows.11', 'rows.12', 'rows.13',
-            'rows.length', 'surface.tree'].sort());
+        .toEqual(['operations.0', 'operations.length', 'rows.11', 'rows.12', 'rows.13', 'rows.length', 'surface.tree'].sort());
     const measure = () => page.evaluate(measureAppearance, '#workspace-main');
     const paths = async () => diffInventory(expected, await measure()).map(item => item.path);
     // A removed row.
@@ -848,16 +842,13 @@ function measureThumbnailReview() {
 
 /**
  * D99: the planned counts line (`p.small[role=status]`) before the actions, from the server's plan for the chosen
- * options, and the primary "Start" (the concept's "Simulate thumbnail job"). D131 (#317): the Quality and Preview size
- * limit fields give way to a second `p.small` naming the server's thumbnail settings, and Scope gains "Convert
- * outdated (removes older formats)".
+ * options, and the primary "Start" (the concept's "Simulate thumbnail job").
  */
 function mapThumbnailConcept(reference, plan) {
     const [cancel, start] = reference.actions.buttons;
-    const [scope] = reference.fields;
-    const tree = ['div.field', 'p.small', 'p.small', 'div.dialog-actions'];
-    const fields = [{ ...scope, control: { ...scope.control, options: [...scope.control.options, 'Convert outdated (removes older formats)'] } }];
-    return { ...reference, tree, fields,
+    const tree = [...reference.tree];
+    tree.splice(tree.indexOf('div.dialog-actions'), 0, 'p.small');
+    return { ...reference, tree,
         plan: { ...reference.plan, role: 'status',
             text: `${number(plan.targets)} ${plan.targets === 1 ? 'preview' : 'previews'} to generate · ${number(plan.fresh)} already up to date.` },
         actions: { ...reference.actions, buttons: [cancel, { ...start, text: 'Start' }] } };
@@ -883,12 +874,12 @@ async function productionThumbnailReview(page, theme, entry) {
         await page.locator('#workspace-main').getByRole('button', { name: 'Review thumbnails', exact: true }).click();
     }
     await expect(page.locator('dialog#modal[open] #modal-title')).toHaveText('Thumbnail maintenance');
-    await expect(page.locator('dialog#modal[open] #modal-body > p.small').first()).toHaveText(/ already up to date\.$/);
+    await expect(page.locator('dialog#modal[open] #modal-body > p.small')).toHaveText(/ already up to date\.$/);
     await page.mouse.move(0, 0);
     return page.evaluate(measureThumbnailReview);
 }
 
-const thumbnailPlan = request => serverJson(request, '/prompt_manager/images/thumbnails/plan?mode=missing');
+const thumbnailPlan = request => serverJson(request, '/prompt_manager/images/thumbnails/plan?mode=missing&size=512&quality=medium');
 
 for (const entry of ['sources', 'overview']) for (const theme of THEMES) for (const [width, height] of SIZES) {
     test(`thumbnail dialog matches the concept from ${entry} ${theme} ${width}x${height}`, async ({ page, request }, testInfo) => {
@@ -911,24 +902,22 @@ test('thumbnail dialog comparison detects mutations', async ({ page, request })
     const expected = mapThumbnailConcept(concept, plan);
     const production = await productionThumbnailReview(page, 'dark', 'sources');
     expect(diffInventory(expected, production)).toEqual([]);
-    // Unmapped, the concept differs only where D99 and D131 are recorded.
-    expect(diffInventory(concept, production).map(item => item.path.split('.').slice(0, 2).join('.'))
-        .filter((path, index, all) => all.indexOf(path) === index).sort())
-        .toEqual(['actions.buttons', 'fields.0', 'fields.1', 'fields.2', 'fields.length', 'plan.role', 'plan.text', 'tree.1', 'tree.2']
-            .sort());
+    // Unmapped, the concept differs only where D99 is recorded.
+    expect(diffInventory(concept, production).map(item => item.path).sort())
+        .toEqual(['actions.buttons.1.text', 'plan.role', 'plan.text', 'tree.3', 'tree.4', 'tree.length']);
     const paths = async () => diffInventory(expected, await page.evaluate(measureThumbnailReview)).map(item => item.path);
     // A changed option label, a swapped option order, a swapped action order and a changed style.
-    await page.evaluate(() => { document.querySelector('#thumb-mode option').textContent = 'Missing only'; });
-    expect(await paths()).toEqual(['fields.0.control.options.0']);
-    await page.evaluate(() => { document.querySelector('#thumb-mode option').textContent = 'Missing thumbnails only'; });
+    await page.evaluate(() => { document.querySelector('#thumb-quality option').textContent = 'Medium'; });
+    expect(await paths()).toEqual(['fields.1.control.options.0']);
+    await page.evaluate(() => { document.querySelector('#thumb-quality option').textContent = 'Medium · optimized'; });
     await page.evaluate(() => { const select = document.querySelector('#thumb-mode'); select.prepend(select.lastElementChild); });
     expect(await paths()).toEqual(expect.arrayContaining(['fields.0.control.options.0', 'fields.0.control.options.1']));
-    await page.evaluate(() => { const select = document.querySelector('#thumb-mode'); select.append(select.firstElementChild); select.selectedIndex = 0; });
+    await page.evaluate(() => { const select = document.querySelector('#thumb-mode'); select.prepend(select.lastElementChild); select.selectedIndex = 0; });
     await page.evaluate(() => { const actions = document.querySelector('dialog#modal[open] .dialog-actions'); actions.prepend(actions.lastElementChild); });
     expect(await paths()).toEqual(expect.arrayContaining(['actions.buttons.0.text', 'actions.buttons.1.text']));
     await page.evaluate(() => { const actions = document.querySelector('dialog#modal[open] .dialog-actions'); actions.prepend(actions.lastElementChild); });
-    const undoStyle = await mutate(page, { css: 'dialog#modal #thumb-mode { border-color: rgb(255, 0, 0); } dialog#modal #modal-body > p.small { color: rgb(255, 0, 0); }' });
-    expect(await paths()).toEqual(expect.arrayContaining(['fields.0.control.borderTopColor', 'plan.color']));
+    const undoStyle = await mutate(page, { css: 'dialog#modal #thumb-limit { border-color: rgb(255, 0, 0); } dialog#modal #modal-body > p.small { color: rgb(255, 0, 0); }' });
+    expect(await paths()).toEqual(expect.arrayContaining(['fields.2.control.borderTopColor', 'plan.color']));
     await undoStyle();
     expect(diffInventory(expected, await page.evaluate(measureThumbnailReview))).toEqual([]);
 });

tests/browser/system-integrations-concept.spec.mjs

@@ -1,344 +0,0 @@
-import { startCoverage, saveCoverage } from '../../tools/vendor/browser-coverage.mjs';
-import { test, expect } from './fixtures.mjs';
-import { SIZES, THEMES, seedConcept, openConcept, openProduction, diffInventory, mutate } from './concept-inventory.mjs';
-
-// #249 System S10 Task 28: System › Integrations (app.js renderSystem 682–684) and the LoRA import review against the
-// immutable concept, on the concept-shaped fixture with a fake LoraManager install. Each concept measurement is mapped
-// only by the recorded deviations (D106, D107, D114), each commented where it applies; after that the difference must
-// be empty, and a mutated label, option, row or token must be noticed. The concept starts its sample import without a
-// review, so the import review is compared with the concept's own record-changing review, `maintenancePlan`
-// (953–958), whose shell, grid, note and actions it shares.
-test.use({ locale: 'en-US', timezoneId: 'UTC' });
-
-test.beforeEach(async ({ page, request, browserName }) => {
-    await startCoverage(page, browserName);
-    await seedConcept(request);
-    await expect(await request.post('/__test__/system/reset')).toBeOK();
-    await expect(await request.post('/__test__/integrations/reset')).toBeOK();
-    await expect(await request.post('/__test__/jobs/restart')).toBeOK();
-    page.conceptErrors = [];
-    page.on('pageerror', error => page.conceptErrors.push(error.message));
-});
-
-test.afterEach(async ({ page, request, browserName }) => {
-    await saveCoverage(page, browserName);
-    await request.post('/__test__/jobs/restart');
-    await request.post('/__test__/integrations/reset');
-    await request.post('/__test__/system/reset');
-    expect(page.conceptErrors).toEqual([]);
-});
-
-const PREVIEW_URL = '/prompt_manager/lora/import/preview';
-
-/** Runs in the page: Integrations' surfaces under `mainSelector`, every row's text and control, geometry and tokens. */
-function measureIntegrations(mainSelector) {
-    const layout = document.querySelector(`${mainSelector} .settings-layout`);
-    const css = (node, ...keys) => node ? Object.fromEntries(keys.map(key => [key, getComputedStyle(node)[key]])) : null;
-    const name = node => [node.localName, ...[...node.classList].sort()].join('.');
-    const text = node => node?.textContent.trim() ?? null;
-    const control = row => {
-        const select = row.querySelector(':scope > select');
-        if (select) return { kind: 'select', id: select.id, options: [...select.options].map(option => [option.textContent, option.disabled]),
-            selected: select.selectedOptions[0]?.textContent ?? null, disabled: select.disabled };
-        const input = row.querySelector(':scope > input');
-        if (input) return { kind: `input.${input.type}`, id: input.id, value: input.value, readOnly: input.readOnly };
-        const toggle = row.querySelector(':scope > * input[type="checkbox"]');
-        return toggle ? { kind: 'switch', id: toggle.id, wrapper: name(toggle.parentElement), checked: toggle.checked,
-            disabled: toggle.disabled, ...css(toggle.parentElement, 'width', 'height') } : null;
-    };
-    const surfaces = [...layout.querySelectorAll(':scope > section.surface')];
-    const firstRow = surfaces[0].querySelector('.setting-row');
-    const note = layout.querySelector('.setting-row p.small');
-    return {
-        layout: [...layout.children].map(name),
-        surfaces: surfaces.map(surface => ({ tree: [...surface.children].map(name), heading: text(surface.querySelector(':scope > h2')),
-            intro: text(surface.querySelector(':scope > p')),
-            rows: [...surface.querySelectorAll(':scope > .setting-row')].map(row => ({ tree: [...row.children].map(name),
-                text: [...row.firstElementChild.children].map(node => [name(node), text(node), node.localName === 'label' ? node.htmlFor : null]),
-                control: control(row) })),
-            operations: [...surface.querySelectorAll(':scope > .operation')].map(row => ({ tree: [...row.children].map(name),
-                title: text(row.querySelector('h3')), description: text(row.querySelector('p')),
-                actions: [...row.querySelectorAll('.row-actions > button')].map(item => [text(item), item.className]) })) })),
-        surface: css(surfaces[1], 'paddingTop', 'paddingLeft', 'backgroundColor', 'borderTopWidth', 'borderTopColor', 'borderTopLeftRadius',
-            'marginTop'),
-        row: css(firstRow, 'display', 'alignItems', 'justifyContent', 'columnGap', 'paddingTop', 'paddingBottom', 'borderTopWidth',
-            'borderTopColor', 'marginTop'),
-        label: css(firstRow.querySelector('label'), 'fontSize', 'fontWeight', 'color'),
-        description: css(firstRow.querySelector('p'), 'fontSize', 'color', 'marginTop', 'maxWidth'),
-        select: css(firstRow.querySelector('select'), 'fontSize', 'minWidth', 'maxWidth', 'backgroundColor', 'color', 'borderTopColor'),
-        password: css(layout.querySelector('.setting-row input[type="password"]'), 'fontSize', 'minWidth', 'maxWidth', 'backgroundColor',
-            'color', 'borderTopColor'),
-        // The concept's `.small` text (its Save row status); production's row notes use the same class.
-        small: css(layout.querySelector('#settings-status'), 'fontSize', 'color'),
-        note: note && css(note, 'fontSize', 'color'),
-        // Whether each select is as wide as the browser lays out a copy holding only its chosen option, i.e. it shows
-        // that option whole (the browser's own select sizing, arrow included).
-        selectsFit: [...layout.querySelectorAll('.setting-row > select')].map(select => {
-            const copy = select.cloneNode(false);
-            copy.removeAttribute('id');
-            copy.append(new Option(select.selectedOptions[0]?.textContent ?? ''));
-            Object.assign(copy.style, { position: 'absolute', visibility: 'hidden', width: 'max-content', minWidth: '0',
-                maxWidth: 'none', flex: 'none' });
-            select.parentElement.append(copy);
-            const needed = copy.getBoundingClientRect().width;
-            copy.remove();
-            return select.getBoundingClientRect().width + 0.5 >= needed;
-        }),
-        pageScroll: document.documentElement.scrollWidth > document.documentElement.clientWidth,
-    };
-}
-
-const SEND_REASON = 'Sending always asks for the ComfyUI window and node, so “Ask each time” is the only option.';
-const RENDERER_REASON = 'Prompt Manager nodes always follow ComfyUI’s own renderer setting.';
-const RENDERER_NONE = 'No ComfyUI window is open in this browser, so its renderer is not known.';
-const RETURN_REASON = 'Not available: sending applies the text in ComfyUI and keeps this page open.';
-const PATH_DESCRIPTION = 'Found automatically in ComfyUI’s custom_nodes folders; read-only, as on the existing settings page.';
-
-/**
- * The concept's Integrations with the recorded deviations applied, for the fixture's LoraManager (detected, disabled,
- * no key, trigger words off and not loaded).
- */
-function mapIntegrationsConcept(reference) {
-    const [comfy, lora] = reference.surfaces;
-    const small = text => ['p.small', text, null];
-    const firstOnly = row => ({ ...row, control: { ...row.control, options: row.control.options.map(([label], index) => [label, index > 0]) } });
-    const [send, renderer, back] = comfy.rows;
-    const [enable, triggers, key] = lora.rows;
-    return {
-        ...reference,
-        surfaces: [
-            { ...comfy, rows: [
-                // D106: only "Ask each time" can be chosen, and the row says why.
-                { ...firstOnly(send), text: [...send.text, small(SEND_REASON)] },
-                // D106: only "Follow host renderer" can be chosen; the reason, then the detected renderer.
-                { ...firstOnly(renderer), text: [...renderer.text, small(RENDERER_REASON), small(RENDERER_NONE)] },
-                // D106: Return to canvas is not available: off, disabled and saying why.
-                { ...back, text: [...back.text, small(RETURN_REASON)], control: { ...back.control, checked: false, disabled: true } },
-            ] },
-            { ...lora,
-                // D106: the LoraManager path row (legacy, read-only) follows the integration toggle.
-                tree: [lora.tree[0], lora.tree[1], 'div.setting-row', 'div.setting-row', 'div.setting-row', 'div.setting-row', 'div.operation'],
-                rows: [
-                    // The real detection replaces the concept's sample line; the integration is off in the fixture.
-                    { ...enable, text: [enable.text[0], ['p', 'Detected: custom_nodes/ComfyUI-Lora-Manager.', null]],
-                        control: { ...enable.control, checked: false } },
-                    { tree: ['div', 'input'],
-                        text: [['label', 'LoraManager path', 'lora-path'], ['p', PATH_DESCRIPTION, null]],
-                        control: { kind: 'input.text', id: 'lora-path', value: 'custom_nodes/ComfyUI-Lora-Manager', readOnly: true } },
-                    // The trigger cache is a separate fact from the setting: its own line.
-                    { ...triggers, text: [...triggers.text, small('Trigger words are not loaded.')], control: { ...triggers.control, checked: false } },
-                    // D114: no prototype warning; the saved-key line under it.
-                    // (No key is saved in the fixture, so "Clear saved key" is not offered.)
-                    { ...key, text: [key.text[0], ['p', 'Credentials stay in the server configuration.', null], small('No key saved.')],
-                        control: { ...key.control, value: '' } },
-                ],
-                // D107: the import is reviewed first ("Review import"; the concept's button only simulated a job).
-                operations: lora.operations.map(operation => ({ ...operation, actions: [['Review import', '']] })) },
-        ],
-        // D106: both selects show their whole chosen option at every width (at 390 the concept cuts "Follow host
-        // renderer"; production lets the two selects grow to 160px and never shrink for the reason lines).
-        selectsFit: reference.selectsFit.map(() => true),
-        select: reference.select.maxWidth === '120px' ? { ...reference.select, maxWidth: '160px' } : reference.select,
-        // The D106/D114 row notes are `p.small` inside the row text, so they read as its description (`.setting-row p`).
-        note: { fontSize: reference.description.fontSize, color: reference.description.color },
-    };
-}
-
-async function conceptIntegrations(page, theme) {
-    await openConcept(page, 'system', theme);
-    await page.locator('#main .section-nav').getByRole('button', { name: 'Integrations', exact: true }).click();
-    await expect(page.locator('#main .settings-layout > section.surface')).toHaveCount(2);
-    await page.mouse.move(0, 0);
-    return page.evaluate(measureIntegrations, '#main');
-}
-
-async function productionIntegrations(page, theme) {
-    await openProduction(page, 'system/integrations', theme);
-    // Compare once the LoRA state and the renderer check answered.
-    await expect(page.locator('#workspace-main #lora-path')).toHaveValue('custom_nodes/ComfyUI-Lora-Manager');
-    await expect(page.locator('#workspace-main #renderer-status')).toHaveText(RENDERER_NONE);
-    await page.mouse.move(0, 0);
-    return page.evaluate(measureIntegrations, '#workspace-main');
-}
-
-const fakeLoraManager = async (request, data = {}) =>
-    expect(await request.post('/__test__/integrations/lora-manager', { data })).toBeOK();
-
-for (const theme of THEMES) for (const [width, height] of SIZES) {
-    test(`integrations matches the concept ${theme} ${width}x${height}`, async ({ page, request }, testInfo) => {
-        await page.setViewportSize({ width, height });
-        await fakeLoraManager(request);
-        const concept = await conceptIntegrations(page, theme);
-        await page.screenshot({ path: testInfo.outputPath(`concept-integrations-${theme}-${width}.png`), fullPage: true });
-        const production = await productionIntegrations(page, theme);
-        await page.screenshot({ path: testInfo.outputPath(`production-integrations-${theme}-${width}.png`), fullPage: true });
-        expect(diffInventory(mapIntegrationsConcept(concept), production)).toEqual([]);
-        expect(production.pageScroll).toBe(false);
-    });
-}
-
-// D106 below the concept's smallest size: on a 320px phone both selects still show their whole option, without page
-// scroll (S10 re-review N9).
-for (const theme of THEMES) test(`integrations selects fit at 320 wide ${theme}`, async ({ page, request }) => {
-    await page.setViewportSize({ width: 320, height: 700 });
-    await fakeLoraManager(request);
-    const production = await productionIntegrations(page, theme);
-    expect(production.selectsFit).toEqual([true, true]);
-    expect(production.pageScroll).toBe(false);
-});
-
-test('integrations comparison detects mutations', async ({ page, request }) => {
-    await page.setViewportSize({ width: 1600, height: 1100 });
-    await fakeLoraManager(request);
-    const concept = await conceptIntegrations(page, 'dark');
-    const expected = mapIntegrationsConcept(concept);
-    const production = await productionIntegrations(page, 'dark');
-    expect(diffInventory(expected, production)).toEqual([]);
-    // Unmapped, the section differs only where D106, D107 and D114 are recorded.
-    expect(diffInventory(concept, production).map(item => item.path.split('.').slice(0, 4).join('.'))
-        .filter((path, index, all) => all.indexOf(path) === index).sort()).toEqual([
-        'note', 'note.color', 'note.fontSize', 'surfaces.0.rows.0', 'surfaces.0.rows.1', 'surfaces.0.rows.2', 'surfaces.1.operations.0',
-        'surfaces.1.rows.0', 'surfaces.1.rows.1', 'surfaces.1.rows.2', 'surfaces.1.rows.3', 'surfaces.1.rows.length',
-        'surfaces.1.tree.5', 'surfaces.1.tree.6', 'surfaces.1.tree.length'].sort());
-    const measure = () => page.evaluate(measureIntegrations, '#workspace-main');
-    const paths = async () => diffInventory(expected, await measure()).map(item => item.path);
-    // A removed row.
-    const undoRow = await mutate(page, { remove: ['#workspace-main section.surface:nth-of-type(2) > .setting-row:nth-of-type(3)'] });
-    expect(await paths()).toEqual(expect.arrayContaining(['surfaces.1.rows.length', 'surfaces.1.tree.length']));
-    await undoRow();
-    // A changed label and a changed option.
-    await page.evaluate(() => { document.querySelector('#workspace-main label[for="renderer"]').textContent = 'Renderer'; });
-    expect(await paths()).toEqual(['surfaces.0.rows.1.text.0.1']);
-    await page.evaluate(() => { document.querySelector('#workspace-main label[for="renderer"]').textContent = 'Host compatibility'; });
-    await page.evaluate(() => { document.querySelector('#workspace-main #send-destination option').textContent = 'Always ask'; });
-    expect(await paths()).toEqual(expect.arrayContaining(['surfaces.0.rows.0.control.options.0.0']));
-    await page.evaluate(() => { document.querySelector('#workspace-main #send-destination option').textContent = 'Ask each time'; });
-    // An unsupported option that became selectable.
-    await page.evaluate(() => { document.querySelectorAll('#workspace-main #renderer option')[1].disabled = false; });
-    expect(await paths()).toEqual(['surfaces.0.rows.1.control.options.1.1']);
-    await page.evaluate(() => { document.querySelectorAll('#workspace-main #renderer option')[1].disabled = true; });
-    // A select squeezed until its chosen option is cut (S10 review M3).
-    const undoSqueeze = await mutate(page, { css: '#workspace-main #renderer { max-width: 70px !important; }' });
-    expect(await paths()).toEqual(['selectsFit.1']);
-    await undoSqueeze();
-    // A swapped token.
-    const undoToken = await mutate(page, { css: '#workspace-main .settings-layout { --line: rgb(255, 0, 0); }' });
-    expect(await paths()).toEqual(expect.arrayContaining(['row.borderTopColor']));
-    await undoToken();
-    expect(diffInventory(expected, await measure())).toEqual([]);
-});
-
-/** Runs in the page: the open review dialog: its title, body and the concept's tokens. */
-function measureReview() {
-    const dialog = document.querySelector('dialog#modal[open]');
-    const css = (node, ...keys) => node ? Object.fromEntries(keys.map(key => [key, getComputedStyle(node)[key]])) : null;
-    const name = node => [node.localName, ...[...node.classList].sort()].join('.');
-    const text = node => node?.textContent.trim() ?? null;
-    const body = dialog.querySelector('#modal-body');
-    const grid = body.querySelector(':scope > dl.meta-grid');
-    const note = [...body.querySelectorAll(':scope > p.small')].at(-1);
-    const actions = body.querySelector(':scope > .dialog-actions');
-    return {
-        title: text(dialog.querySelector('#modal-title')),
-        tree: [...body.children].map(name),
-        heading: { text: text(body.querySelector(':scope > h3')),
-            ...css(body.querySelector(':scope > h3'), 'fontSize', 'fontWeight', 'color', 'marginBottom') },
-        grid: { rows: [...grid.children].map(row => [text(row.querySelector('dt')), text(row.querySelector('dd'))]),
-            ...css(grid, 'display', 'gridTemplateColumns', 'columnGap', 'rowGap'),
-            dt: css(grid.querySelector('dt'), 'fontSize', 'color', 'textTransform'), dd: css(grid.querySelector('dd'), 'fontSize', 'color') },
-        details: body.querySelector(':scope > details') && { summary: text(body.querySelector(':scope > details > summary')),
-            tree: [...body.querySelector(':scope > details').children].map(name) },
-        backup: body.querySelector(':scope > .notice') && { tree: [...body.querySelector(':scope > .notice').children].map(name),
-            text: [...body.querySelectorAll(':scope > .notice > div:first-child > *')].map(node => [node.localName, text(node)]),
-            buttons: [...body.querySelectorAll(':scope > .notice button')].map(text) },
-        note: { text: text(note), ...css(note, 'fontSize', 'color', 'marginTop') },
-        actions: { tree: [...actions.children].map(name), ...css(actions, 'display', 'justifyContent', 'columnGap', 'marginTop'),
-            buttons: [...actions.children].map(item => ({ text: text(item), className: item.className,
-                ...css(item, 'backgroundColor', 'color', 'fontSize', 'paddingTop', 'paddingLeft', 'borderTopColor') })) },
-    };
-}
-
-/**
- * D107: the server's import plan in the concept's review: "Review LoRA import" with "LoRA reference data" as its `h3`,
- * the concept's four rows with the plan's values plus Found and Network, the LoRAs it found (`details`), the hold
- * line with the cache sentence in the concept's `p.small`, the D55 backup box, and Cancel / "Start import".
- */
-function mapImportConcept(reference, plan) {
-    const [cancel, start] = reference.actions.buttons;
-    return {
-        ...reference,
-        title: 'Review LoRA import',
-        tree: ['h3', 'dl.meta-grid', 'details', 'p.small', 'div.notice', 'div.dialog-actions'],
-        heading: { ...reference.heading, text: 'LoRA reference data' },
-        grid: { ...reference.grid, rows: [['LoraManager', 'environment settings · alongside storage · library default'],
-            ['Scope', plan.scope.label], ['Found', '2 metadata files · 2 LoRAs · 0 with local images'],
-            ['Protected', 'Nothing is protected'], ['Network', 'Downloads up to 2 example images from CivitAI'],
-            ['Backup', `Create and verify before changes (${plan.backup.destination_label})`],
-            ['Media on disk', 'No files are removed; image links are replaced']] },
-        details: { summary: 'LoRAs found (2)', tree: ['summary', 'pre'] },
-        backup: { tree: ['div', 'div.row-actions'], text: [['h3', 'Back up the database first (recommended)'],
-            ['p', 'Downloads a copy of the prompts database before this operation changes any records.']], buttons: ['Back up now'] },
-        note: { ...reference.note, text: 'Nothing changes until you apply. This review holds for 15 minutes. '
-            + 'Example images downloaded before a failure stay in the image cache.' },
-        actions: { ...reference.actions, buttons: [cancel, { ...start, text: 'Start import' }] },
-    };
-}
-
-async function conceptReview(page, theme) {
-    await openConcept(page, 'system', theme);
-    await page.locator('#main .section-nav').getByRole('button', { name: 'Maintenance', exact: true }).click();
-    await page.locator('#main [data-plan="duplicate prompts"]').click();
-    await expect(page.locator('dialog#modal[open] #modal-title')).toHaveText('Review maintenance plan');
-    await page.mouse.move(0, 0);
-    return page.evaluate(measureReview);
-}
-
-async function productionReview(page, request, theme) {
-    await openProduction(page, 'system/integrations', theme);
-    await expect(page.locator('#workspace-main #lora-path')).toHaveValue('custom_nodes/ComfyUI-Lora-Manager');
-    // The renderer line above settles first: its new text moves the rows below (a click must not land mid-shift).
-    await expect(page.locator('#workspace-main #renderer-status')).toHaveText(RENDERER_NONE);
-    // The import reviews what is enabled: save the integration on first.
-    await page.locator('#workspace-main #lora-enable').check();
-    await page.getByRole('button', { name: 'Save preferences', exact: true }).click();
-    await expect(page.locator('#settings-status')).toHaveText('Saved to the server configuration.');
-    const answer = page.waitForResponse(response => response.url().endsWith(PREVIEW_URL));
-    await page.locator('#workspace-main').getByRole('button', { name: 'Review import', exact: true }).click();
-    const plan = await (await answer).json();
-    await expect(page.locator('dialog#modal[open] #modal-title')).toHaveText('Review LoRA import');
-    await page.mouse.move(0, 0);
-    return { plan, production: await page.evaluate(measureReview) };
-}
-
-for (const theme of THEMES) for (const [width, height] of SIZES) {
-    test(`LoRA import review matches the concept ${theme} ${width}x${height}`, async ({ page, request }, testInfo) => {
-        await page.setViewportSize({ width, height });
-        await fakeLoraManager(request, { loras: 2, civitai: true, preview: false });
-        const concept = await conceptReview(page, theme);
-        expect(concept.tree).toEqual(['p.demo-note', 'h3', 'dl.meta-grid', 'p.small', 'div.dialog-actions']);
-        await page.screenshot({ path: testInfo.outputPath(`concept-plan-review-${theme}-${width}.png`) });
-        const { plan, production } = await productionReview(page, request, theme);
-        await page.screenshot({ path: testInfo.outputPath(`production-lora-review-${theme}-${width}.png`) });
-        expect(diffInventory(mapImportConcept(concept, plan), production)).toEqual([]);
-    });
-}
-
-test('LoRA import review comparison detects mutations', async ({ page, request }) => {
-    await page.setViewportSize({ width: 1600, height: 1100 });
-    await fakeLoraManager(request, { loras: 2, civitai: true, preview: false });
-    const concept = await conceptReview(page, 'dark');
-    const { plan } = await productionReview(page, request, 'dark');
-    const expected = mapImportConcept(concept, plan);
-    const paths = async () => diffInventory(expected, await page.evaluate(measureReview)).map(item => item.path);
-    expect(await paths()).toEqual([]);
-    await page.evaluate(() => { document.querySelectorAll('dialog#modal[open] dl.meta-grid dt')[4].textContent = 'Downloads'; });
-    expect(await paths()).toEqual(['grid.rows.4.0']);
-    await page.evaluate(() => { document.querySelectorAll('dialog#modal[open] dl.meta-grid dt')[4].textContent = 'Network'; });
-    const undoGrid = await mutate(page, { css: 'dialog#modal dl.meta-grid { column-gap: 3px; }' });
-    expect(await paths()).toEqual(expect.arrayContaining(['grid.columnGap']));
-    await undoGrid();
-    const undoBox = await mutate(page, { remove: ['dialog#modal[open] #modal-body > .notice'] });
-    expect(await paths()).toEqual(expect.arrayContaining(['backup', 'tree.length']));
-    await undoBox();
-    expect(await paths()).toEqual([]);
-});

tests/browser/system-maintenance-concept.spec.mjs

@@ -1,332 +0,0 @@
-import { startCoverage, saveCoverage } from '../../tools/vendor/browser-coverage.mjs';
-import { test, expect } from './fixtures.mjs';
-import { SIZES, THEMES, seedConcept, openConcept, openProduction, diffInventory, mutate } from './concept-inventory.mjs';
-
-// #249 System S7 Task 20: System › Maintenance (app.js renderSystem 688–690), its plan dialog (`maintenancePlan`,
-// 953–958) for each operation and its duplicates dialog (`duplicates`, 1457–1461) against the immutable concept, on
-// the concept-shaped real fixture. Each concept measurement is mapped only by the recorded deviations (D100, D101,
-// D102; the health report is D95, compared in system-concept.spec), each commented where it applies; after that the
-// difference must be empty, and a mutated label, row or token must be noticed.
-test.use({ locale: 'en-US', timezoneId: 'UTC' });
-
-test.beforeEach(async ({ page, request, browserName }) => {
-    await startCoverage(page, browserName);
-    await seedConcept(request);
-    await expect(await request.post('/__test__/system/reset')).toBeOK();
-    await expect(await request.post('/__test__/jobs/restart')).toBeOK();
-    page.conceptErrors = [];
-    page.on('pageerror', error => page.conceptErrors.push(error.message));
-});
-
-test.afterEach(async ({ page, request, browserName }) => {
-    await saveCoverage(page, browserName);
-    await request.post('/__test__/jobs/restart');
-    await request.post('/__test__/system/reset');
-    expect(page.conceptErrors).toEqual([]);
-});
-
-const PREVIEW_URL = '/prompt_manager/maintenance/preview';
-
-/** Runs in the page: Maintenance's notice and surfaces under `mainSelector`, with the concept's geometry and tokens. */
-function measureMaintenance(mainSelector) {
-    const layout = document.querySelector(`${mainSelector} .settings-layout`);
-    const css = (node, ...keys) => node ? Object.fromEntries(keys.map(key => [key, getComputedStyle(node)[key]])) : null;
-    const name = node => [node.localName, ...[...node.classList].sort()].join('.');
-    const text = node => node?.textContent.trim() ?? null;
-    const button = node => ({ text: text(node), className: node.className,
-        ...css(node, 'backgroundColor', 'color', 'fontSize', 'paddingTop', 'paddingLeft', 'borderTopColor', 'opacity', 'cursor') });
-    const box = node => {
-        const rect = node.getBoundingClientRect(), base = layout.getBoundingClientRect();
-        return { left: Math.round(rect.left - base.left), width: Math.round(rect.width) };
-    };
-    const notice = layout.querySelector(':scope > .notice');
-    const surfaces = [...layout.querySelectorAll(':scope > section.surface')];
-    const operation = surfaces[0].querySelector('.operation');
-    return {
-        layout: [...layout.children].map(name),
-        notice: { tree: [...notice.children].map(name), text: [...notice.querySelectorAll(':scope > div > *')].map(node => [node.localName, text(node)]),
-            run: button(notice.querySelector(':scope > button')),
-            ...css(notice, 'display', 'alignItems', 'justifyContent', 'columnGap', 'borderTopColor', 'backgroundColor', 'paddingTop', 'marginBottom') },
-        surfaces: surfaces.map(surface => ({ tree: [...surface.children].map(name), heading: text(surface.querySelector(':scope > h2')),
-            box: box(surface),
-            rows: [...surface.querySelectorAll(':scope > .operation')].map(row => ({ tree: [...row.children].map(name),
-                title: text(row.querySelector('h3')), description: text(row.querySelector('p')),
-                actions: [...row.querySelectorAll('.row-actions > button')].map(button) })) })),
-        surface: css(surfaces[0], 'paddingTop', 'paddingLeft', 'backgroundColor', 'borderTopWidth', 'borderTopColor', 'borderTopLeftRadius', 'marginTop'),
-        h2: css(surfaces[0].querySelector('h2'), 'fontSize', 'fontWeight', 'color', 'marginBottom'),
-        operation: css(operation, 'display', 'alignItems', 'justifyContent', 'columnGap', 'paddingTop', 'paddingBottom',
-            'borderTopWidth', 'borderTopColor'),
-        h3: css(operation.querySelector('h3'), 'fontSize', 'fontWeight', 'color'),
-        p: css(operation.querySelector('p'), 'fontSize', 'color', 'marginTop'),
-        actions: css(operation.querySelector('.row-actions'), 'display', 'columnGap', 'flexShrink'),
-        pageScroll: document.documentElement.scrollWidth > document.documentElement.clientWidth,
-    };
-}
-
-/** D102: the Metadata cache row says why its review is unavailable and its button is aria-disabled (D93's dimmed style). */
-function mapMaintenanceConcept(reference) {
-    return {
-        ...reference,
-        surfaces: reference.surfaces.map(surface => ({ ...surface, rows: surface.rows.map(row => row.title !== 'Metadata cache' ? row : {
-            ...row, description: `${row.description} Nothing is cached in this browser.`,
-            actions: row.actions.map(action => ({ ...action, opacity: '0.55', cursor: 'not-allowed' })) }) })),
-    };
-}
-
-async function conceptMaintenance(page, theme) {
-    await openConcept(page, 'system', theme);
-    await page.locator('#main .section-nav').getByRole('button', { name: 'Maintenance', exact: true }).click();
-    await expect(page.locator('#main .settings-layout > section.surface')).toHaveCount(2);
-    await page.mouse.move(0, 0);
-    return page.evaluate(measureMaintenance, '#main');
-}
-
-async function productionMaintenance(page, theme) {
-    await openProduction(page, 'system/maintenance', theme);
-    await expect(page.locator('#workspace-main .settings-layout > section.surface')).toHaveCount(2);
-    // The Metadata cache row reads this browser's storage once: compare after it answered.
-    await expect(page.locator('#workspace-main .operation').filter({ hasText: 'Metadata cache' }).locator('p'))
-        .toHaveText(/Nothing is cached in this browser\.$/);
-    await page.mouse.move(0, 0);
-    return page.evaluate(measureMaintenance, '#workspace-main');
-}
-
-for (const theme of THEMES) for (const [width, height] of SIZES) {
-    test(`maintenance matches the concept ${theme} ${width}x${height}`, async ({ page }, testInfo) => {
-        await page.setViewportSize({ width, height });
-        const concept = await conceptMaintenance(page, theme);
-        await page.screenshot({ path: testInfo.outputPath(`concept-maintenance-${theme}-${width}.png`), fullPage: true });
-        const production = await productionMaintenance(page, theme);
-        await page.screenshot({ path: testInfo.outputPath(`production-maintenance-${theme}-${width}.png`), fullPage: true });
-        expect(diffInventory(mapMaintenanceConcept(concept), production)).toEqual([]);
-        expect(production.pageScroll).toBe(false);
-    });
-}
-
-/** Runs in the page: the open review dialog (plan or duplicates): its title, body and the concept's tokens. */
-function measureReview() {
-    const dialog = document.querySelector('dialog#modal[open]');
-    const css = (node, ...keys) => node ? Object.fromEntries(keys.map(key => [key, getComputedStyle(node)[key]])) : null;
-    const name = node => [node.localName, ...[...node.classList].sort()].join('.');
-    const text = node => node?.textContent.trim() ?? null;
-    const body = dialog.querySelector('#modal-body');
-    const grid = body.querySelector(':scope > dl.meta-grid');
-    const compare = body.querySelector('.compare-grid');
-    const item = compare?.querySelector('.compare-item');
-    const notes = [...body.querySelectorAll(':scope > p.small')];
-    const note = notes.at(-1);
-    const actions = body.querySelector(':scope > .dialog-actions');
-    return {
-        title: text(dialog.querySelector('#modal-title')),
-        tree: [...body.children].map(name),
-        heading: body.querySelector(':scope > h3') && { text: text(body.querySelector(':scope > h3')),
-            ...css(body.querySelector(':scope > h3'), 'fontSize', 'fontWeight', 'color', 'marginBottom') },
-        grid: grid && { rows: [...grid.children].map(row => [text(row.querySelector('dt')), text(row.querySelector('dd'))]),
-            ...css(grid, 'display', 'gridTemplateColumns', 'columnGap', 'rowGap'),
-            dt: css(grid.querySelector('dt'), 'fontSize', 'color', 'textTransform'), dd: css(grid.querySelector('dd'), 'fontSize', 'color') },
-        details: body.querySelector(':scope > details') && { summary: text(body.querySelector(':scope > details > summary')),
-            tree: [...body.querySelector(':scope > details').children].map(name) },
-        backup: body.querySelector(':scope > .notice') && { tree: [...body.querySelector(':scope > .notice').children].map(name),
-            text: [...body.querySelectorAll(':scope > .notice > div:first-child > *')].map(node => [node.localName, text(node)]),
-            buttons: [...body.querySelectorAll(':scope > .notice button')].map(text) },
-        compare: compare && { tree: [...compare.children].map(name), ...css(compare, 'display', 'gridTemplateColumns', 'columnGap'),
-            items: [...compare.children].map(entry => ({ tree: [...entry.children].map(name), label: text(entry.querySelector('label')),
-                checked: entry.querySelector('input[type=radio]').checked, image: entry.querySelector('img')?.className ?? null })),
-            item: css(item, 'paddingTop', 'paddingLeft', 'backgroundColor', 'borderTopWidth', 'borderTopColor', 'borderTopLeftRadius'),
-            image: css(item.querySelector('img'), 'width', 'objectFit'),
-            label: css(item.querySelector('label'), 'fontSize', 'color'),
-            radio: { name: item.querySelector('input[type=radio]').name.startsWith('keep-') ? 'keep-*' : 'other',
-                type: item.querySelector('input').type } },
-        note: note && { text: text(note), ...css(note, 'fontSize', 'color', 'marginTop') },
-        actions: { tree: [...actions.children].map(name), ...css(actions, 'display', 'justifyContent', 'columnGap', 'marginTop'),
-            buttons: [...actions.children].map(item => ({ text: text(item), className: item.className,
-                ...css(item, 'backgroundColor', 'color', 'fontSize', 'paddingTop', 'paddingLeft', 'borderTopColor') })) },
-    };
-}
-
-// The concept's plan names (`data-plan`) and production's operation, row and button for each.
-const PLANS = Object.freeze([
-    ['duplicate prompts', 'duplicate_prompts', 'Duplicate prompt text'],
-    ['database optimization', 'optimize', 'Optimize database'],
-    ['unused prompt components', 'unused_components', 'Unused prompt components'],
-    ['missing-file links', 'missing_links', 'Missing-file links'],
-]);
-const BACKUP_BOX = Object.freeze({ tree: ['div', 'div.row-actions'], text: [['h3', 'Back up the database first (recommended)'],
-    ['p', 'Downloads a copy of the prompts database before this operation changes any records.']], buttons: ['Back up now'] });
-
-/**
- * D100: the server's plan in the concept's dialog: the operation's row title as its `h3` (the concept prints its
- * `data-plan` name), the four rows with the plan's values, the listed records (`details`), the hold line in the
- * concept's `p.small`, the D55 backup box before the actions, and "Apply reviewed operation". No sample note.
- */
-function mapPlanConcept(reference, title, plan) {
-    const backup = plan.backup.policy === 'off' ? 'No safety backup (the policy is off)'
-        : `Create and verify before changes (${plan.backup.destination_label})`;
-    const tree = ['h3', 'dl.meta-grid', ...(plan.details.length ? ['details'] : []), 'p.small', 'div.notice', 'div.dialog-actions'];
-    const [cancel, apply] = reference.actions.buttons;
-    return {
-        ...reference,
-        tree,
-        heading: { ...reference.heading, text: title },
-        grid: { ...reference.grid, rows: [['Scope', plan.scope.label],
-            ['Protected', plan.protected.reasons.length ? plan.protected.reasons.join(' · ') : 'Nothing is protected'],
-            ['Backup', backup], ['Media on disk', plan.media.label]] },
-        details: plan.details.length ? { summary: `Listed records (${plan.details.length})`, tree: ['summary', 'pre'] } : null,
-        backup: BACKUP_BOX,
-        note: { ...reference.note, text: 'Nothing changes until you apply. This review holds for 15 minutes.' },
-        actions: { ...reference.actions, buttons: [cancel, { ...apply, text: 'Apply reviewed operation' }] },
-    };
-}
-
-async function conceptPlan(page, theme, name) {
-    await conceptMaintenance(page, theme);
-    await page.locator(`#main [data-plan="${name}"]`).click();
-    await expect(page.locator('dialog#modal[open] #modal-title')).toHaveText('Review maintenance plan');
-    await page.mouse.move(0, 0);
-    return page.evaluate(measureReview);
-}
-
-/** Production's plan dialog for the row `title`, with the server's answer its review read. */
-async function productionPlan(page, title) {
-    const answer = page.waitForResponse(response => response.url().endsWith(PREVIEW_URL));
-    await page.locator('#workspace-main .operation').filter({ has: page.locator('h3', { hasText: title }) })
-        .getByRole('button', { name: 'Review plan', exact: true }).click();
-    const plan = await (await answer).json();
-    await expect(page.locator('dialog#modal[open] #modal-body > h3')).toHaveText(title);
-    await page.mouse.move(0, 0);
-    return { plan, production: await page.evaluate(measureReview) };
-}
-
-for (const theme of THEMES) for (const [width, height] of SIZES) {
-    test(`plan dialogs match the concept ${theme} ${width}x${height}`, async ({ page, request }, testInfo) => {
-        await page.setViewportSize({ width, height });
-        // Something to merge, and a missing-file link, so no plan is empty.
-        await expect(await request.post('/__test__/system/duplicate-prompts')).toBeOK();
-        await expect(await request.post('/__test__/system/missing-file')).toBeOK();
-        const concepts = [];
-        for (const [name] of PLANS) {
-            concepts.push(await conceptPlan(page, theme, name));
-            await page.screenshot({ path: testInfo.outputPath(`concept-plan-${name.replace(/\W+/g, '-')}-${theme}-${width}.png`) });
-        }
-        expect(concepts[0].tree).toEqual(['p.demo-note', 'h3', 'dl.meta-grid', 'p.small', 'div.dialog-actions']);
-        await productionMaintenance(page, theme);
-        for (const [index, [, operation, title]] of PLANS.entries()) {
-            const { plan, production } = await productionPlan(page, title);
-            expect(plan.operation).toBe(operation);
-            await page.screenshot({ path: testInfo.outputPath(`production-plan-${operation}-${theme}-${width}.png`) });
-            expect(diffInventory(mapPlanConcept(concepts[index], title, plan), production)).toEqual([]);
-            await page.keyboard.press('Escape');
-            await expect(page.locator('dialog#modal[open]')).toHaveCount(0);
-        }
-    });
-}
-
-/**
- * D101: the real group in the concept's markup: the status line (the concept's sample note's place), a group's
- * `p.small` and `.compare-grid` in one wrapper, a "Keep <source>/<path>" radio per copy, the oldest checked, and the
- * production note in the concept's `p.small`.
- */
-function mapDuplicatesConcept(reference) {
-    const items = reference.compare.items.map((item, index) => ({ ...item,
-        label: `Keep output/s7-dupes/group_00_${index ? 'b' : 'a'}.png` }));
-    return {
-        ...reference,
-        tree: ['p.small', 'div.duplicate-groups', 'p.small', 'div.dialog-actions'],
-        compare: { ...reference.compare, items },
-        note: { ...reference.note, text: 'Removing a copy deletes its file from disk; its database links move to the kept copy. '
-            + 'History keeps the removed paths in its run records. Nothing is deleted until you review and apply the cleanup.' },
-    };
-}
-
-async function conceptDuplicates(page, theme) {
-    await conceptMaintenance(page, theme);
-    await page.locator('#main').getByRole('button', { name: 'Find duplicates', exact: true }).click();
-    await expect(page.locator('dialog#modal[open] #modal-title')).toHaveText('Review duplicate image files');
-    await page.mouse.move(0, 0);
-    return page.evaluate(measureReview);
-}
-
-async function productionDuplicates(page, theme) {
-    await productionMaintenance(page, theme);
-    await page.locator('#workspace-main').getByRole('button', { name: 'Find duplicates', exact: true }).click();
-    await page.locator('#workspace-main').getByRole('button', { name: 'Review groups', exact: true }).click();
-    await expect(page.locator('dialog#modal[open] .compare-item img')).toHaveCount(2);
-    await page.locator('dialog#modal[open] .compare-item img').evaluateAll(images => Promise.all(images.map(image => image.decode())));
-    await page.mouse.move(0, 0);
-    return page.evaluate(measureReview);
-}
-
-for (const theme of THEMES) for (const [width, height] of SIZES) {
-    test(`duplicates dialog matches the concept ${theme} ${width}x${height}`, async ({ page, request }, testInfo) => {
-        await page.setViewportSize({ width, height });
-        await expect(await request.post('/__test__/system/duplicate-files', { data: { groups: 1, trio: false } })).toBeOK();
-        const concept = await conceptDuplicates(page, theme);
-        expect(concept.tree).toEqual(['p.demo-note', 'div.compare-grid', 'p.small', 'div.dialog-actions']);
-        await page.screenshot({ path: testInfo.outputPath(`concept-duplicates-${theme}-${width}.png`) });
-        const production = await productionDuplicates(page, theme);
-        await page.screenshot({ path: testInfo.outputPath(`production-duplicates-${theme}-${width}.png`) });
-        expect(diffInventory(mapDuplicatesConcept(concept), production)).toEqual([]);
-    });
-}
-
-test('maintenance comparison detects mutations', async ({ page, request }) => {
-    await page.setViewportSize({ width: 1600, height: 1100 });
-    const concept = await conceptMaintenance(page, 'dark');
-    const expected = mapMaintenanceConcept(concept);
-    const production = await productionMaintenance(page, 'dark');
-    expect(diffInventory(expected, production)).toEqual([]);
-    // Unmapped, the section differs only on the D102 row.
-    expect(diffInventory(concept, production).map(item => item.path).sort()).toEqual([
-        'surfaces.1.rows.3.actions.0.cursor', 'surfaces.1.rows.3.actions.0.opacity', 'surfaces.1.rows.3.description']);
-    const measure = () => page.evaluate(measureMaintenance, '#workspace-main');
-    const paths = async () => diffInventory(expected, await measure()).map(item => item.path);
-    // A removed row, a changed label, a lost danger mark and a swapped token.
-    const undoRow = await mutate(page, { remove: ['#workspace-main section.surface:nth-of-type(1) > .operation:nth-of-type(2)'] });
-    expect(await paths()).toEqual(expect.arrayContaining(['surfaces.0.rows.length', 'surfaces.0.tree.length']));
-    await undoRow();
-    await page.evaluate(() => { document.querySelector('#workspace-main section.surface h3').textContent = 'Integrity checks'; });
-    expect(await paths()).toEqual(['surfaces.0.rows.0.title']);
-    await page.evaluate(() => { document.querySelector('#workspace-main section.surface h3').textContent = 'Integrity & relationship checks'; });
-    await page.evaluate(() => { document.querySelector('#workspace-main button.danger').classList.remove('danger'); });
-    expect(await paths()).toEqual(expect.arrayContaining(['surfaces.0.rows.3.actions.0.className']));
-    await page.evaluate(() => { document.querySelectorAll('#workspace-main section.surface')[0].querySelectorAll('.row-actions > button')[3].classList.add('danger'); });
-    const undoToken = await mutate(page, { css: '#workspace-main .settings-layout { --line: rgb(255, 0, 0); }' });
-    expect(await paths()).toEqual(expect.arrayContaining(['operation.borderTopColor']));
-    await undoToken();
-    expect(diffInventory(expected, await measure())).toEqual([]);
-
-    // The plan dialog: a changed grid term and the duplicates dialog's grid token are noticed.
-    await expect(await request.post('/__test__/system/duplicate-prompts')).toBeOK();
-    const conceptPlanDialog = await conceptPlan(page, 'dark', 'duplicate prompts');
-    await productionMaintenance(page, 'dark');
-    const { plan } = await productionPlan(page, 'Duplicate prompt text');
-    const expectedPlan = mapPlanConcept(conceptPlanDialog, 'Duplicate prompt text', plan);
-    const planPaths = async () => diffInventory(expectedPlan, await page.evaluate(measureReview)).map(item => item.path);
-    expect(await planPaths()).toEqual([]);
-    await page.evaluate(() => { document.querySelector('dialog#modal[open] dl.meta-grid dt').textContent = 'Impact'; });
-    expect(await planPaths()).toEqual(['grid.rows.0.0']);
-    await page.evaluate(() => { document.querySelector('dialog#modal[open] dl.meta-grid dt').textContent = 'Scope'; });
-    const undoGrid = await mutate(page, { css: 'dialog#modal dl.meta-grid { column-gap: 3px; }' });
-    expect(await planPaths()).toEqual(expect.arrayContaining(['grid.columnGap']));
-    await undoGrid();
-    expect(await planPaths()).toEqual([]);
-});
-
-test('duplicates comparison detects mutations', async ({ page, request }) => {
-    await page.setViewportSize({ width: 1600, height: 1100 });
-    await expect(await request.post('/__test__/system/duplicate-files', { data: { groups: 1, trio: false } })).toBeOK();
-    const expected = mapDuplicatesConcept(await conceptDuplicates(page, 'dark'));
-    await productionDuplicates(page, 'dark');
-    const paths = async () => diffInventory(expected, await page.evaluate(measureReview)).map(item => item.path);
-    expect(await paths()).toEqual([]);
-    const undoToken = await mutate(page, { css: 'dialog#modal .compare-item { background: rgb(255, 0, 0); }' });
-    expect(await paths()).toEqual(['compare.item.backgroundColor']);
-    await undoToken();
-    await page.evaluate(() => { document.querySelector('dialog#modal[open] .dialog-actions button:last-child').classList.add('ca-primary'); });
-    expect(await paths()).toEqual(expect.arrayContaining(['actions.buttons.1.className']));
-    await page.evaluate(() => { document.querySelector('dialog#modal[open] .dialog-actions button:last-child').classList.remove('ca-primary'); });
-    const undoItem = await mutate(page, { remove: ['dialog#modal[open] .compare-item:last-child'] });
-    expect(await paths()).toEqual(expect.arrayContaining(['compare.items.length']));
-    await undoItem();
-    expect(await paths()).toEqual([]);
-});

tests/browser/workflows.spec.mjs

@@ -99,34 +99,6 @@ for (const leave of ['beforeunload', 'pagehide']) {
     });
 }
 
-// #222: the gallery's Clear cache clears the server's thumbnails by its own request and keeps this browser's
-// preferences and other tools' storage; nothing of Prompt Manager's is cached in a browser, and the toast says so.
-test('the gallery cache clear keeps preferences and other tools caches', async ({ page }) => {
-    await page.addInitScript(() => {
-        if (sessionStorage.getItem('seeded')) return;
-        sessionStorage.setItem('seeded', '1');
-        localStorage.setItem('pm_workspace_theme', 'light');
-        localStorage.setItem('other-tool-setting', 'keep');
-        localStorage.setItem('pm_other_tool', 'keep');
-    });
-    await page.goto('/prompt_manager/gallery');
-    await expect(page.locator('#galleryGrid .image-item')).toHaveCount(2);
-    await page.evaluate(async () => { await (await caches.open('other-tool-gallery-thumbnails')).put('/x', new Response('x')); });
-    const clears = [];
-    page.on('request', req => { if (req.url().includes('/clear-thumbnails')) clears.push(req.method()); });
-    page.once('dialog', dialog => dialog.accept());
-    await page.locator('#settingsBtn').click();
-    await page.locator('#clearCacheBtn').click();
-    await expect(page.getByText("Thumbnails cleared; original images untouched. Nothing of Prompt Manager's is cached in this browser."))
-        .toBeVisible();
-    expect(clears).toEqual(['POST']);
-    expect(await page.evaluate(async () => ({
-        theme: localStorage.getItem('pm_workspace_theme'), other: localStorage.getItem('other-tool-setting'),
-        prefixed: localStorage.getItem('pm_other_tool'), notice: localStorage.getItem('pm_update_notice_dismissed'),
-        caches: await caches.keys(),
-    }))).toEqual({ theme: 'light', other: 'keep', prefixed: 'keep', notice: '3.2.0', caches: ['other-tool-gallery-thumbnails'] });
-});
-
 test('actual gallery review generates and persists tags for the selected root', async ({ page, request }) => {
     await page.goto('/prompt_manager/gallery');
     await expect(page.locator('#galleryGrid .image-item')).toHaveCount(2);
@@ -257,18 +229,6 @@ async function chooseRestore(page, file) {
     await page.locator('#restoreFileInput').setInputFiles(file);
 }
 
-// Confirms the chosen restore and waits for the server's answer, not for a timer: a restore is disk-bound and can take
-// longer than an expect timeout on a slow runner (#359). The modal closes only after that answer.
-async function confirmRestoreAndWait(page) {
-    const restored = page.waitForResponse(response => response.url().endsWith('/prompt_manager/restore'));
-    await page.locator('#confirmRestore').click();
-    const response = await restored;
-    const body = await response.text();
-    expect(response.status(), body).toBe(200);
-    expect(JSON.parse(body)).toMatchObject({ success: true, prompt_count: 2, backup_created: expect.any(String) });
-    await expect(page.locator('#restoreModal')).toBeHidden();
-}
-
 function confirmNextDialog(page, accept, message) {
     page.once('dialog', async dialog => {
         expect(dialog.type()).toBe('confirm');
@@ -299,7 +259,12 @@ test('downloaded backup restores deleted prompts, tags, and image links through
     expect(await promptSnapshot(request)).not.toEqual(before);
     await chooseRestore(page, backup);
     confirmNextDialog(page, true, backup.name);
-    await confirmRestoreAndWait(page);
+    const restored = page.waitForResponse(response => response.url().endsWith('/prompt_manager/restore'));
+    await page.locator('#confirmRestore').click();
+    const response = await restored;
+    expect(response.ok()).toBe(true);
+    expect(await response.json()).toMatchObject({ success: true, prompt_count: 2, backup_created: expect.any(String) });
+    await expect(page.locator('#restoreModal')).toBeHidden();
     await expect(page.locator('.prompt-text')).toHaveCount(2);
     await page.reload();
     await expect(page.locator('.prompt-text').filter({ hasText: 'Cat portrait' })).toBeVisible();
@@ -342,7 +307,8 @@ test('restore validation and cancellation preserve live data and allow a valid r
     expect(await promptSnapshot(request)).toEqual(before);
     await page.locator('#restoreFileInput').setInputFiles(backup);
     confirmNextDialog(page, true, backup.name);
-    await confirmRestoreAndWait(page);
+    await page.locator('#confirmRestore').click();
+    await expect(page.locator('#restoreModal')).toBeHidden();
     expect(await promptSnapshot(request)).toEqual(before);
 });
 
@@ -362,7 +328,8 @@ test('backup and restore recover from interrupted network requests without losin
     await expect(page.locator('#restoreModal')).toBeVisible();
     expect(await promptSnapshot(request)).toEqual(before);
     confirmNextDialog(page, true, backup.name);
-    await confirmRestoreAndWait(page);
+    await page.locator('#confirmRestore').click();
+    await expect(page.locator('#restoreModal')).toBeHidden();
     expect(await promptSnapshot(request)).toEqual(before);
 });
 

tests/browser/workspace-images.spec.mjs

@@ -399,7 +399,7 @@ test('real video media has a usable card and native playback cleans up on close
     await expect(await request.post('/__test__/reset', { data: { include_video: true } })).toBeOK();
     const media = await (await request.get('/prompt_manager/images/output?limit=40')).json();
     // #249: a video with no preview yet still lists its preview URL; the server makes the frame on first view.
-    expect(media.images.find(image => image.filename === 'clip.webm').thumbnail_url).toMatch(/\/thumbnails\/clip_thumb\.webp\?root=0/);
+    expect(media.images.find(image => image.filename === 'clip.webm').thumbnail_url).toMatch(/\/thumbnails\/clip_thumb\.jpg\?root=0/);
     await page.goto(workspace);
     await refine(page, { Media: 'video' });
     await expect(cards(page)).toHaveCount(1);
@@ -722,7 +722,7 @@ test('refresh releases the previous inspector cover source', async ({ page, requ
     await card.getByRole('button', { name: 'Inspect clip.webm', exact: true }).click();
     // #249: a video's cover is its preview frame, not the video.
     const cover = details(page).locator('img.detail-cover');
-    await expect(cover).toHaveAttribute('src', /\/thumbnails\/clip_thumb\.webp\?/);
+    await expect(cover).toHaveAttribute('src', /\/thumbnails\/clip_thumb\.jpg\?/);
     await expect(details(page).locator('video')).toHaveCount(0);
     await cover.evaluate(element => { window.__oldInspectorCover = element; });
     await rescan(page);
@@ -2184,8 +2184,6 @@ test('scan for metadata opens the review dialog from Import', async ({ page, req
     await dialog.getByRole('button', { name: 'Cancel', exact: true }).click();
     await expect(scanReview(page)).toHaveCount(0);
     await expect(page.getByRole('button', { name: 'Import', exact: true })).toBeFocused();
-    // No scan started: the one job is the backup's finished registry hold
-    // (#249 S8: a backup download holds a guarded slot while it streams).
-    await expect.poll(async () => (await (await request.get('/prompt_manager/jobs')).json()).jobs
-        .map(job => [job.kind, job.state])).toEqual([['backup', 'finished']]);
+    const jobs = await (await request.get('/prompt_manager/jobs')).json();
+    expect(jobs.jobs).toEqual([]);
 });

tests/browser/workspace-system-backups.spec.mjs

@@ -1,490 +0,0 @@
-import { startCoverage, saveCoverage } from '../../tools/vendor/browser-coverage.mjs';
-import { test, expect } from './fixtures.mjs';
-import { seedConcept } from './concept-inventory.mjs';
-
-// System › Backup & export (#249 System S9 Task 24) on the S8 backend and the concept-shaped fixture: Back up and its
-// status line (D103), the restore review (D105) and its job, the exports, Import / inspect and the recovery policy
-// (D104). A restore here replaces this worker's own temp database; every test starts from a fresh concept fixture.
-const workspace = '/prompt_manager/workspace';
-const STATUS_URL = '/prompt_manager/backup/status';
-const PREVIEW_URL = '/prompt_manager/restore/preview';
-const APPLY_URL = '/prompt_manager/restore/apply';
-const WHEN = { dateStyle: 'medium', timeStyle: 'short' };
-const SAFETY_DESCRIPTION = 'Keep a verified copy of the database on disk before maintenance, cleanups and LoRA imports change ' +
-    'records. A restore always keeps one.';
-
-test.use({ locale: 'en-US', timezoneId: 'UTC' });
-
-test.beforeEach(async ({ page, request, browserName }) => {
-    await startCoverage(page, browserName);
-    await seedConcept(request);
-    await expect(await request.post('/__test__/system/reset')).toBeOK();
-    await expect(await request.post('/__test__/jobs/restart')).toBeOK();
-    page.systemErrors = [];
-    page.on('pageerror', error => page.systemErrors.push(error.message));
-});
-
-test.afterEach(async ({ page, request, browserName }) => {
-    await saveCoverage(page, browserName);
-    await request.post('/__test__/release');
-    await request.post('/__test__/jobs/restart');
-    await request.post('/__test__/system/reset');
-    expect(page.systemErrors).toEqual([]);
-});
-
-const toast = page => page.locator('#workspace-toast');
-const layoutOf = page => page.locator('#workspace-main .settings-layout');
-const dialog = page => page.locator('dialog#modal[open]');
-const statusLine = page => layoutOf(page).locator('#backup-status');
-const settingsStatus = page => page.locator('#settings-status');
-const save = page => page.getByRole('button', { name: 'Save preferences', exact: true });
-const buttonOf = (page, name) => layoutOf(page).getByRole('button', { name, exact: true });
-const settingOf = (page, label) => layoutOf(page).locator('.setting-row').filter({ has: page.locator(`label:text-is("${label}")`) });
-
-async function serverJson(request, url) {
-    const response = await request.get(url);
-    await expect(response).toBeOK();
-    return response.json();
-}
-
-async function openBackups(page) {
-    // A fresh page each time: the drafts live for the page session (Q10), and a hash-only goto would not reload.
-    if (page.url().endsWith('#/system/backups')) await page.reload();
-    else await page.goto(`${workspace}#/system/backups`);
-    await expect(layoutOf(page).locator(':scope > .two-col > section.surface')).toHaveCount(2);
-    await expect(statusLine(page)).not.toHaveText('Checking backups…');
-    // The policy row is painted once the server settings were read.
-    await expect(settingOf(page, 'Create a safety backup before maintenance').locator('input')).toBeEnabled();
-    return layoutOf(page);
-}
-
-/** The status line the page should show for the server's current status (its own wording, in this locale). */
-async function expectedStatus(page, request) {
-    const status = await serverJson(request, STATUS_URL);
-    return page.evaluate(([answer, options]) => {
-        const when = value => new Date(value).toLocaleString(undefined, options);
-        const parts = [];
-        if (answer.last_download) parts.push(`Downloaded backup · ${when(answer.last_download.at)} · ${answer.last_download.verified ? 'verified' : 'not verified'}.`);
-        if (answer.safety_backups.length) parts.push(`Safety backup · ${when(answer.safety_backups[0].modified_at)} · ${answer.safety_backups.length} on disk.`);
-        return parts.join(' ') || 'No backup recorded.';
-    }, [status, WHEN]);
-}
-
-/** A verified copy of the library as it is now (this records the session's last download, as Back up does). */
-async function backupBytes(request) {
-    const response = await request.get('/prompt_manager/backup');
-    await expect(response).toBeOK();
-    expect(response.headers()['x-promptmanager-verify']).toBe('ok');
-    return response.body();
-}
-
-/** Pick `buffer` as the backup file through Review restore…'s file chooser; resolves with the preview's answer. */
-async function chooseBackup(page, buffer, name = 'prompts_backup_20261025_093000.db') {
-    const chooser = page.waitForEvent('filechooser');
-    const answer = page.waitForResponse(response => response.url().endsWith(PREVIEW_URL) && response.request().method() === 'POST');
-    await buttonOf(page, 'Review restore…').click();
-    await (await chooser).setFiles({ name, mimeType: 'application/octet-stream', buffer });
-    return answer;
-}
-
-const gridOf = page => dialog(page).locator('dl.meta-grid > div').evaluateAll(items => items.map(item =>
-    [item.querySelector('dt').textContent, item.querySelector('dd').textContent]));
-
-const libraryTotal = async request => (await serverJson(request, '/prompt_manager/library?limit=1')).total;
-
-test('Back up downloads through the api client and revokes the object URL (D103)', async ({ page, request }) => {
-    await page.addInitScript(() => {
-        window.objectUrls = { created: [], revoked: [] };
-        const create = URL.createObjectURL.bind(URL), revoke = URL.revokeObjectURL.bind(URL);
-        URL.createObjectURL = blob => { const url = create(blob); window.objectUrls.created.push(url); return url; };
-        URL.revokeObjectURL = url => { window.objectUrls.revoked.push(url); revoke(url); };
-    });
-    await openBackups(page);
-    await expect(statusLine(page)).toHaveText('No backup recorded.');
-    const download = page.waitForEvent('download');
-    const answer = page.waitForResponse(response => new URL(response.url()).pathname === '/prompt_manager/backup');
-    await buttonOf(page, 'Back up').click();
-    expect((await answer).headers()['x-promptmanager-verify']).toBe('ok');
-    expect((await download).suggestedFilename()).toMatch(/^prompts_backup_\d{8}_\d{6}\.db$/);
-    await expect(toast(page)).toHaveText('Database backup downloaded.');
-    // The status line is read again: this session's verified download, as the server records it.
-    await expect(statusLine(page)).toHaveText(/^Downloaded backup · .+ · verified\.$/);
-    await expect(statusLine(page)).toHaveText(await expectedStatus(page, request));
-    await expect(buttonOf(page, 'Back up')).not.toHaveAttribute('aria-disabled', 'true');
-    const urls = await page.evaluate(() => window.objectUrls.created);
-    expect(urls).toHaveLength(1);
-    await expect.poll(() => page.evaluate(() => window.objectUrls.revoked)).toEqual(urls);
-});
-
-test('status line shows only server-reported backups (D103)', async ({ page, request }) => {
-    await openBackups(page);
-    await expect(statusLine(page)).toHaveText('No backup recorded.');
-    await expect(await request.post('/__test__/system/safety-backup')).toBeOK();
-    await openBackups(page);
-    await expect(statusLine(page)).toHaveText(/^Safety backup · .+ · 1 on disk\.$/);
-    await expect(statusLine(page)).toHaveText(await expectedStatus(page, request));
-    // A status the server could not report is never shown as "no backup".
-    await page.route(`**${STATUS_URL}`, route => route.fulfill({ status: 500, json: { success: false, error: 'Failed' } }));
-    await page.reload();
-    await expect(statusLine(page)).toHaveText('The backup status could not be read.');
-});
-
-test('Overview backup row uses the same status (D93)', async ({ page, request }) => {
-    await expect(await request.post('/__test__/system/safety-backup')).toBeOK();
-    await backupBytes(request);
-    await page.goto(`${workspace}#/system/overview`);
-    const row = layoutOf(page).locator('.operation').filter({ has: page.locator('h3', { hasText: 'Backup status' }) });
-    const expected = await expectedStatus(page, request);
-    expect(expected).toMatch(/^Downloaded backup · .+ · verified\. Safety backup · .+ · 1 on disk\.$/);
-    await expect(row.locator('p')).toHaveText(expected);
-    await row.getByRole('button', { name: 'View backups', exact: true }).click();
-    await expect(page).toHaveURL(`${workspace}#/system/backups`);
-    await expect(statusLine(page)).toHaveText(expected);
-});
-
-test('Review restore stages the chosen file and shows the real summary with the backup box (D105)', async ({ page, request }) => {
-    const bytes = await backupBytes(request);
-    await expect(await request.post('/prompt_manager/save', { data: { text: 'S9 prompt saved after the backup' } })).toBeOK();
-    const before = await serverJson(request, '/__test__/system/digest');
-    await openBackups(page);
-    const answer = await chooseBackup(page, bytes);
-    const preview = await answer.json();
-    expect(preview.integrity).toBe('ok');
-    await expect(dialog(page).locator('#modal-title')).toHaveText('Restore preview');
-    const counts = summary => `${summary.prompts.toLocaleString('en-US')} ${summary.prompts === 1 ? 'prompt' : 'prompts'} · ` +
-        `${summary.image_links} ${summary.image_links === 1 ? 'image link' : 'image links'} · ` +
-        `${summary.pairs} ${summary.pairs === 1 ? 'saved pair' : 'saved pairs'} · ${summary.runs} ${summary.runs === 1 ? 'run' : 'runs'}`;
-    const rows = await gridOf(page);
-    expect(rows.map(([term]) => term)).toEqual(['Snapshot', 'Integrity', 'Migration', 'Safety backup', 'In the backup', 'In the library now']);
-    expect(rows[0][1]).toMatch(/^prompts_backup_20261025_093000.db · (\d+ KB|\d+\.\d MB) · .+$/);
-    expect(rows.slice(1)).toEqual([['Integrity', 'Verified'], ['Migration', 'Current schema'],
-        ['Safety backup', `Created before replacing (${preview.safety_backup.destination_label})`],
-        ['In the backup', counts(preview.summary)], ['In the library now', counts(preview.live)]]);
-    // The prompt saved after the backup is the difference the review shows.
-    expect(preview.live.prompts).toBe(preview.summary.prompts + 1);
-    await expect(dialog(page).locator('#modal-body > p.small')).toHaveText('Restore replaces the whole library with this backup ' +
-        'and runs alone in Activity. Nothing changes until you restore. This review holds for 15 minutes.');
-    await expect(dialog(page).locator('.notice h3')).toHaveText('Back up the database first (recommended)');
-    await expect(dialog(page).locator('.notice p')).toHaveText('Downloads a copy of the prompts database before the restore replaces it.');
-    const actions = dialog(page).locator('.dialog-actions > button');
-    await expect(actions).toHaveText(['Cancel', 'Restore']);
-    await expect(actions.nth(1)).toHaveClass('danger');
-    // The backup box downloads a copy and keeps the review open.
-    const download = page.waitForEvent('download');
-    await dialog(page).getByRole('button', { name: 'Back up now', exact: true }).click();
-    await download;
-    await expect(toast(page)).toHaveText('Database backup downloaded.');
-    await expect(dialog(page).locator('#modal-title')).toHaveText('Restore preview');
-    // A review writes nothing: the rows and the media are as they were.
-    expect(await serverJson(request, '/__test__/system/digest')).toEqual(before);
-    expect((await serverJson(request, '/__test__/system/backups')).stages).toBe(1);
-});
-
-test('Cancel discards the stage; Escape too', async ({ page, request }) => {
-    const bytes = await backupBytes(request);
-    const before = await serverJson(request, '/__test__/system/digest');
-    await openBackups(page);
-    await chooseBackup(page, bytes);
-    await expect(dialog(page).locator('#modal-title')).toHaveText('Restore preview');
-    expect((await serverJson(request, '/__test__/system/backups')).stages).toBe(1);
-    let discarded = page.waitForResponse(response => response.url().includes(`${PREVIEW_URL}/`) && response.request().method() === 'DELETE');
-    await dialog(page).getByRole('button', { name: 'Cancel', exact: true }).click();
-    expect((await discarded).status()).toBe(200);
-    await expect(dialog(page)).toHaveCount(0);
-    await expect(buttonOf(page, 'Review restore…')).toBeFocused();
-    expect((await serverJson(request, '/__test__/system/backups')).stages).toBe(0);
-    await chooseBackup(page, bytes);
-    await expect(dialog(page).locator('#modal-title')).toHaveText('Restore preview');
-    discarded = page.waitForResponse(response => response.url().includes(`${PREVIEW_URL}/`) && response.request().method() === 'DELETE');
-    await page.keyboard.press('Escape');
-    expect((await discarded).status()).toBe(200);
-    expect((await serverJson(request, '/__test__/system/backups')).stages).toBe(0);
-    expect(await serverJson(request, '/__test__/system/digest')).toEqual(before);
-});
-
-test('Restore starts the job, opens Activity; views reload after it finishes', async ({ page, request }) => {
-    const bytes = await backupBytes(request);
-    const restoredTotal = await libraryTotal(request);
-    await expect(await request.post('/prompt_manager/save', { data: { text: 'S9 prompt the restore removes' } })).toBeOK();
-    expect(await libraryTotal(request)).toBe(restoredTotal + 1);
-    await openBackups(page);
-    const libraryCount = page.locator('aside.sidebar a[data-route="library"] .nav-count');
-    await expect(libraryCount).toHaveText((restoredTotal + 1).toLocaleString('en-US'));
-    await chooseBackup(page, bytes);
-    const applied = page.waitForResponse(response => response.url().endsWith(APPLY_URL));
-    await dialog(page).getByRole('button', { name: 'Restore', exact: true }).click();
-    const { job } = await (await applied).json();
-    expect([job.kind, job.title, job.cancellable]).toEqual(['restore', 'Database restore', false]);
-    await expect(page).toHaveURL(`${workspace}#/activity/${job.id}`);
-    await expect(toast(page)).toHaveText(/^Database restore finished · Restored \d+ prompts?, /);
-    // The library is the backup's again, and the page says so without a reload: the sidebar counts were read again.
-    expect(await libraryTotal(request)).toBe(restoredTotal);
-    await expect(libraryCount).toHaveText(restoredTotal.toLocaleString('en-US'));
-    expect((await serverJson(request, '/__test__/system/backups')).safety).toHaveLength(1);
-    // The Activity job view stayed, and Backup & export now names the safety backup the restore kept.
-    await expect(page).toHaveURL(`${workspace}#/activity/${job.id}`);
-    await page.goto(`${workspace}#/system/backups`);
-    await expect(statusLine(page)).toHaveText(/Safety backup · .+ · 1 on disk\.$/);
-});
-
-test('a finished restore shows the open page again from the restored data', async ({ page, request }) => {
-    const bytes = await backupBytes(request);
-    const restoredTotal = await libraryTotal(request);
-    await expect(await request.post('/prompt_manager/save', { data: { text: 'S9 prompt the restore removes' } })).toBeOK();
-    await openBackups(page);
-    await chooseBackup(page, bytes);
-    const preview = page.locator('dialog#modal[open] #modal-title');
-    await expect(preview).toHaveText('Restore preview');
-    // The restore is held at its start, so the reader is on the Library (showing the prompt) when it finishes.
-    await expect(await request.post('/__test__/hold', { data: { path: APPLY_URL } })).toBeOK();
-    const applied = page.waitForResponse(response => response.url().endsWith(APPLY_URL));
-    await dialog(page).getByRole('button', { name: 'Restore', exact: true }).click();
-    await expect.poll(async () => (await serverJson(request, '/__test__/hold')).held[APPLY_URL]).toBe(1);
-    await page.evaluate(() => { window.location.hash = '#/library'; });
-    const card = page.locator('#workspace-main article.prompt-card').filter({ hasText: 'S9 prompt the restore removes' });
-    await expect(card).toHaveCount(1);
-    await expect(await request.post('/__test__/release')).toBeOK();
-    await applied;
-    await expect(toast(page)).toHaveText(/^Database restore finished · /);
-    // The shelf was read again from the restored library, on the same route.
-    await expect(card).toHaveCount(0);
-    await expect(page).toHaveURL(`${workspace}#/library`);
-    expect(await libraryTotal(request)).toBe(restoredTotal);
-});
-
-test('invalid file shows the validator message; nothing is staged', async ({ page, request }) => {
-    const before = await serverJson(request, '/__test__/system/digest');
-    await openBackups(page);
-    const answer = await chooseBackup(page, Buffer.from('this is not a database'), 'notes.db');
-    expect(answer.status()).toBe(400);
-    const body = await answer.json();
-    expect(body.code).toBe('invalid-backup');
-    await expect(toast(page)).toHaveText(`This file can't be restored: ${body.error.replace(/\.?$/, '.')}`);
-    await expect(dialog(page)).toHaveCount(0);
-    await expect(buttonOf(page, 'Review restore…')).not.toHaveAttribute('aria-disabled', 'true');
-    expect((await serverJson(request, '/__test__/system/backups')).stages).toBe(0);
-    expect(await serverJson(request, '/__test__/system/digest')).toEqual(before);
-});
-
-test('Export JSON downloads /library/export; secondary buttons download all prompts (/export) and /pairs/export (D103)', async ({ page }) => {
-    const layout = await openBackups(page);
-    const portable = layout.locator('section.surface').filter({ has: page.locator('h2', { hasText: 'Portable export' }) });
-    expect(await portable.locator('.row-actions > button').allTextContents())
-        .toEqual(['Export JSON', 'Import / inspect file', 'Export all prompts JSON', 'Export saved pairs JSON']);
-    for (const [label, url, name, kind] of [
-        ['Export JSON', '/prompt_manager/library/export', /^prompt-manager-library-v1\.json$/, 'prompt-manager-library'],
-        ['Export all prompts JSON', '/prompt_manager/export', /^prompt_manager_\d{8}_\d{6}\.json$/, null],
-        ['Export saved pairs JSON', '/prompt_manager/pairs/export', /^prompt-pairs\.json$/, 'prompt-manager-pairs']]) {
-        const download = page.waitForEvent('download');
-        const answer = page.waitForResponse(response => new URL(response.url()).pathname === url);
-        await portable.getByRole('button', { name: label, exact: true }).click();
-        expect((await answer).status()).toBe(200);
-        const file = await download;
-        expect(file.suggestedFilename()).toMatch(name);
-        const parsed = JSON.parse(await (await file.createReadStream()).toArray().then(chunks => Buffer.concat(chunks).toString('utf8')));
-        if (kind) expect(parsed.kind).toBe(kind);
-        else expect(Array.isArray(parsed.prompts)).toBe(true);
-    }
-    // A failed export says so and saves nothing.
-    await page.route('**/prompt_manager/pairs/export', route => route.fulfill({ status: 500, json: { success: false } }));
-    await portable.getByRole('button', { name: 'Export saved pairs JSON', exact: true }).click();
-    await expect(toast(page)).toHaveText('The export could not be downloaded. Nothing was saved to this device.');
-});
-
-test('Import / inspect lists Inspect, Rescan and the shared scan review (D15, D55)', async ({ page, request }) => {
-    await openBackups(page);
-    const open = async () => {
-        await buttonOf(page, 'Import / inspect file').click();
-        await expect(dialog(page).locator('#modal-title')).toHaveText('Import & inspect');
-    };
-    await open();
-    const rows = dialog(page).locator('.operation-list > .operation');
-    expect(await rows.locator('h3').allTextContents()).toEqual(['Inspect a local image', 'Scan an output folder', 'Scan for metadata']);
-    expect(await rows.locator('button').allTextContents()).toEqual(['Open inspector', 'Rescan', 'Review scan']);
-    // Rescan reads the output folders again and says what it found; while it runs, a reopened dialog says so.
-    await expect(await request.post('/__test__/hold', { data: { path: '/prompt_manager/gallery/rescan' } })).toBeOK();
-    const rescan = page.waitForResponse(response => response.url().endsWith('/prompt_manager/gallery/rescan'));
-    await rows.getByRole('button', { name: 'Rescan', exact: true }).click();
-    await expect(dialog(page)).toHaveCount(0);
-    await expect(toast(page)).toHaveText('Rescanning output folders…');
-    await open();
-    await expect(rows.nth(1).locator('button')).toHaveText('Rescanning…');
-    await expect(rows.nth(1).locator('button')).toHaveAttribute('aria-disabled', 'true');
-    await expect(await request.post('/__test__/release')).toBeOK();
-    expect((await rescan).status()).toBe(200);
-    await expect(toast(page)).toHaveText(/^Rescan finished\. \d+ files? in \d+ output folders?\.$/);
-    await expect(rows.nth(1).locator('button')).toHaveText('Rescan');
-    // Scan for metadata opens the shared review over the server's output folders; Cancel starts nothing.
-    await dialog(page).getByRole('button', { name: 'Review scan', exact: true }).click();
-    await expect(dialog(page).locator('#modal-title')).toHaveText('Review metadata scan');
-    await expect(dialog(page).locator('dl.meta-grid dd').first()).toHaveText(/^\d+ output folders?$/);
-    await dialog(page).getByRole('button', { name: 'Cancel', exact: true }).click();
-    await expect(dialog(page)).toHaveCount(0);
-    // Open inspector goes to Inspect a file.
-    await open();
-    await dialog(page).getByRole('button', { name: 'Open inspector', exact: true }).click();
-    await expect(page).toHaveURL(`${workspace}#/inspect`);
-    await expect(dialog(page)).toHaveCount(0);
-});
-
-test('safety backup toggle saves through Save preferences with revision (D104)', async ({ page, request }) => {
-    const before = await serverJson(request, '/prompt_manager/settings');
-    expect(before.settings.safety_backup).toBe(true);
-    await openBackups(page);
-    const row = settingOf(page, 'Create a safety backup before maintenance');
-    // D104: what the policy really does (the concept's "Preview a verified backup…" line does not say it).
-    await expect(row.locator('p').first()).toHaveText(SAFETY_DESCRIPTION);
-    const toggle = row.locator('input');
-    await expect(toggle).toBeChecked();
-    await toggle.uncheck();
-    await expect(settingsStatus(page)).toHaveText('Unsaved changes.');
-    const saved = page.waitForRequest(item => item.url().endsWith('/prompt_manager/settings') && item.method() === 'POST');
-    await save(page).click();
-    const body = (await saved).postDataJSON();
-    expect(body).toEqual({ safety_backup: false, expected_revision: before.revision });
-    await expect(settingsStatus(page)).toHaveText('Saved to the server configuration.');
-    expect((await serverJson(request, '/prompt_manager/settings')).settings.safety_backup).toBe(false);
-    // A maintenance review now says so.
-    const plan = await request.post('/prompt_manager/maintenance/preview', { data: { operation: 'optimize', options: {} } });
-    expect((await plan.json()).backup.policy).toBe('off');
-    await openBackups(page);
-    await expect(toggle).not.toBeChecked();
-    // A configuration changed elsewhere is a conflict, never a blind write.
-    await toggle.check();
-    await expect(await request.post('/prompt_manager/settings', { data: { result_timeout: 7,
-        expected_revision: (await serverJson(request, '/prompt_manager/settings')).revision } })).toBeOK();
-    await save(page).click();
-    await expect(settingsStatus(page)).toHaveText('Settings changed elsewhere. Reload this section to see them.');
-    expect((await serverJson(request, '/prompt_manager/settings')).settings.safety_backup).toBe(false);
-});
-
-test('schedule offers Manual only; Daily/Weekly disabled with reason (D104)', async ({ page }) => {
-    await openBackups(page);
-    const schedule = settingOf(page, 'Scheduled database backups');
-    expect(await schedule.locator('option').evaluateAll(options => options.map(option => [option.textContent, option.disabled])))
-        .toEqual([['Manual only', false], ['Daily', true], ['Weekly', true]]);
-    await expect(schedule.locator('select')).toHaveValue('Manual only');
-    await expect(schedule.locator('p')).toHaveText('Daily and Weekly are not available yet: back up with Back up whenever you choose.');
-    const policy = layoutOf(page).locator(':scope > section.surface');
-    await expect(policy.locator('h2')).toHaveText('Recovery policy Proposed');
-    await expect(policy.locator('h2 > span.chip.blue')).toHaveText('Proposed');
-    await expect(policy.locator('p.warning-note')).toHaveText('Restores are staged, migrated and validated before replacing live data.');
-    // Nothing on the schedule is ever drafted.
-    await expect(settingsStatus(page)).toHaveText('No unsaved changes.');
-});
-
-test('a failed settings read leaves the policy disabled with the reason', async ({ page }) => {
-    await page.route('**/prompt_manager/settings', route => (route.request().method() === 'GET'
-        ? route.fulfill({ status: 500, json: { success: false, error: 'Failed' } }) : route.continue()));
-    await page.goto(`${workspace}#/system/backups`);
-    const row = settingOf(page, 'Create a safety backup before maintenance');
-    await expect(row.locator('p.small')).toHaveText('Server settings could not be read.');
-    await expect(row.locator('input')).toBeDisabled();
-});
-
-test('the legacy admin Backup and Restore keep working', async ({ page, request }) => {
-    const bytes = await backupBytes(request);
-    const restored = await request.post('/prompt_manager/restore', { multipart: { database_file: {
-        name: 'prompts_backup.db', mimeType: 'application/octet-stream', buffer: bytes } } });
-    await expect(restored).toBeOK();
-    expect((await restored.json()).success).toBe(true);
-    await page.goto('/prompt_manager/admin');
-    await expect(page.locator('#restoreFileInput')).toHaveCount(1);
-});
-
-/** Start a fake running job (a metadata scan another tab started), which an exclusive restore must wait for. */
-async function runningScan(request) {
-    const response = await request.post('/__test__/jobs/start', { data: { kind: 'scan', title: 'Metadata scan', total: 4 } });
-    await expect(response).toBeOK();
-    return (await response.json()).job;
-}
-
-const stagesOf = async request => (await serverJson(request, '/__test__/system/backups')).stages;
-const deleted = page => page.waitForResponse(response => response.url().includes(`${PREVIEW_URL}/`) &&
-    response.request().method() === 'DELETE');
-
-test('a refused restore reopens its review: Restore retries it, Discard releases it (I1)', async ({ page, request }) => {
-    const bytes = await backupBytes(request);
-    await openBackups(page);
-    await chooseBackup(page, bytes);
-    await expect(dialog(page).locator('#modal-title')).toHaveText('Restore preview');
-    const scan = await runningScan(request);
-    const refused = page.waitForResponse(response => response.url().endsWith(APPLY_URL));
-    await dialog(page).getByRole('button', { name: 'Restore', exact: true }).click();
-    expect((await refused).status()).toBe(409);
-    await expect(toast(page)).toHaveText('Another job is running: Metadata scan.');
-    // The same review is open again, its stage still held: Restore retries, Discard releases it.
-    await expect(dialog(page).locator('#modal-title')).toHaveText('Restore preview');
-    await expect(dialog(page).locator('.dialog-actions > button')).toHaveText(['Discard', 'Restore']);
-    expect(await stagesOf(request)).toBe(1);
-    await expect(await request.post(`/__test__/jobs/${scan.id}/finish`, { data: { state: 'finished' } })).toBeOK();
-    const applied = page.waitForResponse(response => response.url().endsWith(APPLY_URL));
-    await dialog(page).getByRole('button', { name: 'Restore', exact: true }).click();
-    const { job } = await (await applied).json();
-    await expect(page).toHaveURL(`${workspace}#/activity/${job.id}`);
-    await expect(toast(page)).toHaveText(/^Database restore finished · /);
-    expect(await stagesOf(request)).toBe(0);
-});
-
-test('two refused restores in a row, then a third Review restore… still opens the preview (I1)', async ({ page, request }) => {
-    const bytes = await backupBytes(request);
-    await openBackups(page);
-    await runningScan(request);
-    for (const leave of ['discard', 'escape']) {
-        await chooseBackup(page, bytes);
-        await expect(dialog(page).locator('#modal-title')).toHaveText('Restore preview');
-        const refused = page.waitForResponse(response => response.url().endsWith(APPLY_URL));
-        await dialog(page).getByRole('button', { name: 'Restore', exact: true }).click();
-        expect((await refused).status()).toBe(409);
-        await expect(dialog(page).locator('.dialog-actions > button')).toHaveText(['Discard', 'Restore']);
-        const released = deleted(page);
-        if (leave === 'discard') await dialog(page).getByRole('button', { name: 'Discard', exact: true }).click();
-        else await page.keyboard.press('Escape');
-        expect((await released).status()).toBe(200);
-        await expect(dialog(page)).toHaveCount(0);
-        expect(await stagesOf(request)).toBe(0);
-    }
-    const answer = await chooseBackup(page, bytes);
-    expect((await answer).status()).toBe(200);
-    await expect(dialog(page).locator('#modal-title')).toHaveText('Restore preview');
-    expect(await stagesOf(request)).toBe(1);
-});
-
-test('× and leaving the section or the page discard the stage (M1)', async ({ page, request }) => {
-    const bytes = await backupBytes(request);
-    await openBackups(page);
-    const leaves = [
-        ['×', () => page.locator('#modal-close').click()],
-        // The modal covers the page, so the section changes as a link or the Back button changes it: by its hash.
-        ['section', () => page.evaluate(() => { window.location.hash = '#/system/maintenance'; })],
-        ['route', () => page.evaluate(() => { window.location.hash = '#/images'; })],
-    ];
-    for (const [name, leave] of leaves) {
-        if (!page.url().endsWith('#/system/backups')) {
-            await page.goto(`${workspace}#/system/backups`);
-            await expect(statusLine(page)).not.toHaveText('Checking backups…');
-        }
-        await chooseBackup(page, bytes);
-        await expect(dialog(page).locator('#modal-title')).toHaveText('Restore preview');
-        expect(await stagesOf(request), name).toBe(1);
-        // A keepalive DELETE (it may outlive the page) is asserted by its request and the server's stage count.
-        const released = page.waitForRequest(item => item.url().includes(`${PREVIEW_URL}/`) && item.method() === 'DELETE');
-        await leave();
-        await released;
-        await expect(dialog(page)).toHaveCount(0);
-        await expect.poll(() => stagesOf(request), { message: name }).toBe(0);
-    }
-});
-
-test('a safety backup file (no .db extension) can be picked and reviewed (M3)', async ({ page, request }) => {
-    await expect(await request.post('/__test__/system/safety-backup')).toBeOK();
-    const bytes = await backupBytes(request);
-    await openBackups(page);
-    // The picker lists every file; the server decides what is a database.
-    await expect(page.locator('#restore-file')).not.toHaveAttribute('accept', /./);
-    const answer = await chooseBackup(page, bytes, 'prompts.db.backup_20261025_093000_000000');
-    expect((await answer).status()).toBe(200);
-    await expect(dialog(page).locator('#modal-title')).toHaveText('Restore preview');
-    // The copy's size depends on what earlier tests on this server wrote: KB or MB.
-    expect((await gridOf(page))[0][1]).toMatch(/^prompts\.db\.backup_20261025_093000_000000 · [\d,.]+ (KB|MB) · .+$/);
-});

tests/browser/workspace-system-integrations.spec.mjs

@@ -1,482 +0,0 @@
-import { startCoverage, saveCoverage } from '../../tools/vendor/browser-coverage.mjs';
-import { test, expect } from './fixtures.mjs';
-import { seedConcept } from './concept-inventory.mjs';
-
-// System › Integrations (#249 System S10 Task 27) on the concept-shaped fixture with a fake LoraManager install
-// (workspace_integrations_fixture.py): the D106 ComfyUI rows and renderer status, the LoRA rows and the D114 key, saved
-// through the one Save row, and the D107 import review run as an Activity job. No test reaches the network: CivitAI
-// downloads are answered by the fixture's stub opener.
-const workspace = '/prompt_manager/workspace';
-const PREVIEW_URL = '/prompt_manager/lora/import/preview';
-const APPLY_URL = '/prompt_manager/lora/import/apply';
-const ENABLE_URL = '/prompt_manager/lora/enable';
-const KEPT = 'The import failed; the previous LoRA imports were kept. Images already downloaded stay in the image cache.';
-
-test.beforeEach(async ({ page, request, browserName }) => {
-    await startCoverage(page, browserName);
-    await seedConcept(request);
-    await expect(await request.post('/__test__/system/reset')).toBeOK();
-    await expect(await request.post('/__test__/integrations/reset')).toBeOK();
-    await expect(await request.post('/__test__/jobs/restart')).toBeOK();
-    page.systemErrors = [];
-    page.on('pageerror', error => page.systemErrors.push(error.message));
-});
-
-test.afterEach(async ({ page, request, browserName }) => {
-    await saveCoverage(page, browserName);
-    await request.post('/__test__/integrations/gate', { data: { hold: false } });
-    await request.post('/__test__/release');
-    await request.post('/__test__/jobs/restart');
-    await request.post('/__test__/integrations/reset');
-    await request.post('/__test__/system/reset');
-    expect(page.systemErrors).toEqual([]);
-});
-
-const toast = page => page.locator('#workspace-toast');
-const layoutOf = page => page.locator('#workspace-main .settings-layout');
-const dialog = page => page.locator('dialog#modal[open]');
-const status = page => page.locator('#settings-status');
-const save = page => page.getByRole('button', { name: 'Save preferences', exact: true });
-const settingOf = (page, label) => layoutOf(page).locator('.setting-row').filter({ has: page.locator(`label:text-is("${label}")`) });
-
-async function serverJson(request, url) {
-    const response = await request.get(url);
-    await expect(response).toBeOK();
-    return response.json();
-}
-
-async function lora(request, data = {}) {
-    await expect(await request.post('/__test__/integrations/lora-manager', { data })).toBeOK();
-}
-
-async function openIntegrations(page) {
-    // A fresh page each time: the drafts live for the page session (Q10), and a hash-only goto would not reload.
-    if (page.url().endsWith('#/system/integrations')) await page.reload();
-    else await page.goto(`${workspace}#/system/integrations`);
-    await expect(layoutOf(page).locator(':scope > section.surface')).toHaveCount(2);
-    // The LoRA rows are painted once the server's LoRA state was read.
-    await expect(settingOf(page, 'LoraManager integration').locator('input')).toBeEnabled();
-    // The renderer line settles first: its new text moves the rows below, so no click lands mid-shift.
-    await expect(settingOf(page, 'Host compatibility').getByRole('status')).not.toHaveText('Looking for open ComfyUI windows…');
-    return layoutOf(page);
-}
-
-/** Enable the integration (and optionally its trigger words) through the Save row. */
-async function enable(page, { triggers = false } = {}) {
-    await settingOf(page, 'LoraManager integration').locator('input').check();
-    if (triggers) await settingOf(page, 'Automatically include trigger words').locator('input').check();
-    await save(page).click();
-    await expect(status(page)).toHaveText('Saved to the server configuration.');
-}
-
-/** The open review's `[dt, dd]` rows. */
-const gridOf = page => dialog(page).locator('dl.meta-grid > div').evaluateAll(items => items.map(item =>
-    [item.querySelector('dt').textContent, item.querySelector('dd').textContent]));
-
-async function ended(request, id) {
-    await expect.poll(async () => (await serverJson(request, `/prompt_manager/jobs/${id}`)).job.state).not.toBe('running');
-    return (await serverJson(request, `/prompt_manager/jobs/${id}`)).job;
-}
-
-/** A second page of this origin that serves a fake ComfyUI window on the send bridge. */
-async function fakeComfyWindow(context, renderer) {
-    const host = await context.newPage();
-    await host.goto(`${workspace}#/overview`);
-    await host.evaluate(async drawn => {
-        const { createBridgeHost } = await import('/prompt_manager/js/shared/toolkit/prompt-bridge.js');
-        window.fakeHost = createBridgeHost({ namespace: '/', origin: location.origin, label: 'PromptManager — ComfyUI',
-            adapter: { listTargets: () => (drawn ? [{ id: '7', label: 'Prompt Manager', type: 'PromptManager', roles: ['positive'],
-                renderer: drawn }] : []), preview() { throw new Error('unused'); }, apply() { throw new Error('unused'); } } });
-    }, renderer);
-    return host;
-}
-
-test('send destination offers Ask each time; unsupported options disabled with the reason (D106)', async ({ page }) => {
-    const layout = await openIntegrations(page);
-    expect(await layout.locator(':scope > section.surface > h2').allTextContents()).toEqual(['ComfyUI', 'LoRA & resources']);
-    const send = settingOf(page, 'Default send destination');
-    expect(await send.locator('option').evaluateAll(options => options.map(option => [option.textContent, option.disabled])))
-        .toEqual([['Ask each time', false], ['Selected Prompt Manager node', true], ['Create a Prompt Manager (+/-) node', true]]);
-    await expect(send.locator('select')).toHaveValue('Ask each time');
-    await expect(send.locator('p.small')).toHaveText(
-        'Sending always asks for the ComfyUI window and node, so “Ask each time” is the only option.');
-    const renderer = settingOf(page, 'Host compatibility');
-    expect(await renderer.locator('option').evaluateAll(options => options.map(option => [option.textContent, option.disabled])))
-        .toEqual([['Follow host renderer', false], ['Classic', true], ['Nodes 2.0', true]]);
-    await expect(renderer.locator('p.small').first()).toHaveText('Prompt Manager nodes always follow ComfyUI’s own renderer setting.');
-    const back = settingOf(page, 'Return to canvas after send');
-    await expect(back.locator('input')).toBeDisabled();
-    await expect(back.locator('input')).not.toBeChecked();
-    await expect(back.locator('p.small')).toHaveText('Not available: sending applies the text in ComfyUI and keeps this page open.');
-    // Nothing on this surface is ever drafted: the Save row stays clean.
-    await expect(status(page)).toHaveText('No unsaved changes.');
-    await expect(save(page)).toHaveAttribute('aria-disabled', 'true');
-});
-
-test('host compatibility shows the detected renderer as status (D106)', async ({ page, context }) => {
-    await openIntegrations(page);
-    const line = settingOf(page, 'Host compatibility').getByRole('status');
-    await expect(line).toHaveText('No ComfyUI window is open in this browser, so its renderer is not known.');
-    const host = await fakeComfyWindow(context, 'nodes2');
-    try {
-        await page.reload();
-        await expect(line).toHaveText('Detected: Nodes 2.0 (1 ComfyUI window).');
-        await host.evaluate(() => window.fakeHost.dispose());
-        await host.evaluate(async () => {
-            const { createBridgeHost } = await import('/prompt_manager/js/shared/toolkit/prompt-bridge.js');
-            window.fakeHost = createBridgeHost({ namespace: '/', origin: location.origin, label: 'PromptManager — ComfyUI',
-                adapter: { listTargets: () => [], preview() {}, apply() {} } });
-        });
-        await page.reload();
-        await expect(line).toHaveText('ComfyUI is open; add a Prompt Manager node to see which renderer it uses.');
-    } finally {
-        await host.close();
-    }
-});
-
-test('LoRA rows show detected / enabled / cache-loaded separately', async ({ page, request }) => {
-    await openIntegrations(page);
-    const integration = settingOf(page, 'LoraManager integration');
-    const triggers = settingOf(page, 'Automatically include trigger words');
-    await expect(integration.locator('p').first()).toHaveText('Not detected in ComfyUI’s custom_nodes folders.');
-    await expect(integration.locator('input')).not.toBeChecked();
-    await expect(triggers.locator('p.small')).toHaveText('Trigger words are not loaded.');
-    // Enabling what is not installed is refused by the server: the toggle stays highlighted, nothing was saved.
-    await integration.locator('input').check();
-    await save(page).click();
-    await expect(status(page)).toHaveText('Some changes were not saved. Review the highlighted settings.');
-    await expect(integration.locator('input')).toHaveAttribute('aria-invalid', 'true');
-    expect((await serverJson(request, '/__test__/integrations/state')).enabled).toBe(false);
-
-    await lora(request);
-    await openIntegrations(page);
-    await expect(integration.locator('p').first()).toHaveText('Detected: custom_nodes/ComfyUI-Lora-Manager.');
-    await expect(integration.locator('input')).not.toBeChecked();
-    await enable(page, { triggers: true });
-    await expect(integration.locator('input')).toBeChecked();
-    await expect(triggers.locator('p.small')).toHaveText('Trigger words are loaded.');
-    expect(await serverJson(request, '/__test__/integrations/state')).toMatchObject({ enabled: true, trigger_words: true });
-    // A reload reads the saved state back.
-    await openIntegrations(page);
-    await expect(integration.locator('input')).toBeChecked();
-    await expect(triggers.locator('input')).toBeChecked();
-    await expect(status(page)).toHaveText('No unsaved changes.');
-});
-
-test('LoraManager path row shows the detected path read-only, as legacy (D106)', async ({ page, request }) => {
-    await openIntegrations(page);
-    const row = settingOf(page, 'LoraManager path');
-    const input = row.locator('input');
-    await expect(input).toHaveAttribute('readonly', '');
-    await expect(input).toHaveValue('');
-    await expect(input).toHaveAttribute('placeholder', 'Not detected');
-    await lora(request);
-    await openIntegrations(page);
-    await expect(input).toHaveValue('custom_nodes/ComfyUI-Lora-Manager');
-    await input.focus();
-    await page.keyboard.type('elsewhere');
-    await expect(input).toHaveValue('custom_nodes/ComfyUI-Lora-Manager');
-    await expect(status(page)).toHaveText('No unsaved changes.');
-});
-
-test('key never prefilled; blank keeps; Clear saved key clears; saved through Save preferences (D114)', async ({ page, request }) => {
-    const enables = [];
-    page.on('request', item => { if (item.url().endsWith(ENABLE_URL)) enables.push(item.postDataJSON()); });
-    await lora(request);
-    await openIntegrations(page);
-    const key = settingOf(page, 'CivitAI API key');
-    const field = key.locator('input[type="password"]');
-    const clear = key.getByRole('button', { name: 'Clear saved key', exact: true });
-    await expect(field).toHaveValue('');
-    await expect(key.locator('p.small')).toHaveText('No key saved.');
-    await expect(clear).toHaveCount(0);
-    // A typed key is dropped when the section is left: the field comes back empty with nothing hidden to save (N4).
-    await field.fill('sk-dropped');
-    await expect(status(page)).toHaveText('Unsaved changes.');
-    await page.locator('#workspace-main .section-nav').getByRole('button', { name: 'Appearance', exact: true }).click();
-    await page.locator('#workspace-main .section-nav').getByRole('button', { name: 'Integrations', exact: true }).click();
-    await expect(status(page)).toHaveText('No unsaved changes.');
-    await expect(key.locator('p.small')).toHaveText('No key saved.');
-    // Typing a key drafts it; Save sends it once through /lora/enable with the settings revision.
-    await field.fill('sk-test-key');
-    await expect(key.locator('p.small')).toHaveText('The new key replaces the saved one when you save.');
-    await expect(status(page)).toHaveText('Unsaved changes.');
-    await save(page).click();
-    await expect(status(page)).toHaveText('Saved to the server configuration.');
-    expect(enables).toHaveLength(1);
-    expect(enables[0]).toMatchObject({ civitai_api_key: 'sk-test-key', enabled: false });
-    expect(enables[0].expected_revision).toMatch(/^(sha256:|absent)/);
-    await expect(field).toHaveValue('');
-    await expect(key.locator('p.small')).toHaveText('A key is saved.');
-    expect((await serverJson(request, '/__test__/integrations/state')).key_saved).toBe(true);
-    // Never prefilled, even after a reload; the page never receives the key.
-    const statusBodies = [];
-    page.on('response', async response => {
-        if (response.url().endsWith('/prompt_manager/lora/status')) statusBodies.push(await response.text());
-    });
-    await openIntegrations(page);
-    await expect(field).toHaveValue('');
-    await expect(key.locator('p.small')).toHaveText('A key is saved.');
-    expect(statusBodies.join('')).not.toContain('sk-test-key');
-    // The announced line is rewritten only when its text changes, not on every edit elsewhere (S10 re-review N8).
-    await page.evaluate(() => {
-        window.__keyNoteWrites = 0;
-        new MutationObserver(records => { window.__keyNoteWrites += records.length; })
-            .observe(document.querySelector('#civitai-key-status'), { childList: true, characterData: true, subtree: true });
-    });
-    const triggers = settingOf(page, 'Automatically include trigger words').locator('input');
-    await triggers.check();
-    await expect(status(page)).toHaveText('Unsaved changes.');
-    await triggers.uncheck();
-    await expect(status(page)).toHaveText('No unsaved changes.');
-    expect(await page.evaluate(() => window.__keyNoteWrites)).toBe(0);
-    // A blank field keeps the saved key: nothing to save.
-    await field.fill('   ');
-    await expect(status(page)).toHaveText('No unsaved changes.');
-    await field.fill('');
-    // Clear saved key drafts the removal; Save removes it. The keyboard stays on the key field, and the line that
-    // says so is announced (S10 review M2).
-    await expect(key.locator('p.small')).toHaveAttribute('role', 'status');
-    await expect(field).toHaveAttribute('aria-describedby', 'civitai-key-status');
-    await clear.focus();
-    await page.keyboard.press('Enter');
-    await expect(key.locator('p.small')).toHaveText('The saved key is removed when you save.');
-    await expect(clear).toHaveCount(0);
-    await expect(field).toBeFocused();
-    await save(page).click();
-    await expect(status(page)).toHaveText('Saved to the server configuration.');
-    expect(enables.at(-1)).toMatchObject({ clear_civitai_api_key: true });
-    expect(enables.at(-1)).not.toHaveProperty('civitai_api_key');
-    await expect(key.locator('p.small')).toHaveText('No key saved.');
-    expect((await serverJson(request, '/__test__/integrations/state')).key_saved).toBe(false);
-});
-
-test('a LoRA save over settings changed elsewhere is a conflict, never a blind write', async ({ page, request }) => {
-    await lora(request);
-    await openIntegrations(page);
-    await settingOf(page, 'Automatically include trigger words').locator('input').check();
-    // Another page saves the settings meanwhile: the revision this page read is stale.
-    await expect(await request.post('/prompt_manager/settings', { data: { result_timeout: 42 } })).toBeOK();
-    await save(page).click();
-    await expect(status(page)).toHaveText('Settings changed elsewhere. Reload this section to see them.');
-    expect((await serverJson(request, '/__test__/integrations/state')).trigger_words).toBe(false);
-    // The draft stays; the next Save carries the reread revision and succeeds.
-    await save(page).click();
-    await expect(status(page)).toHaveText('Saved to the server configuration.');
-    expect((await serverJson(request, '/__test__/integrations/state')).trigger_words).toBe(true);
-});
-
-test('a save where only the LoRA part is written says so; the next save needs no conflict (S10 review I3)',
-    async ({ page, request }) => {
-        await lora(request);
-        await expect(await request.post('/__test__/system/missing-source', { data: { inside: true } })).toBeOK();
-        await openIntegrations(page);
-        const triggers = settingOf(page, 'Automatically include trigger words').locator('input');
-        await triggers.check();
-        // In Sources, the drive is unplugged after the page read the list, and another source is removed.
-        const nav = page.locator('#workspace-main .section-nav');
-        await nav.getByRole('button', { name: 'Sources & scans', exact: true }).click();
-        const sourceRow = title => layoutOf(page).locator('#source-list .operation').filter({ has: page.locator('h3', { hasText: title }) });
-        await expect(sourceRow('unplugged')).toBeVisible();
-        await expect(await request.post('/__test__/system/unplug')).toBeOK();
-        await sourceRow('ComfyUI input').getByRole('button', { name: 'Remove', exact: true }).click();
-        await save(page).click();
-        // The LoRA part was saved, the sources were refused: the status gives the server's reason for the source, and
-        // only the source row is highlighted.
-        await expect(status(page)).toHaveText("output/unplugged can't be used: Gallery root does not exist. Remove it or reconnect it, then save.");
-        await expect(sourceRow('unplugged')).toHaveAttribute('aria-invalid', 'true');
-        expect((await serverJson(request, '/__test__/integrations/state')).trigger_words).toBe(true);
-        await nav.getByRole('button', { name: 'Integrations', exact: true }).click();
-        await expect(triggers).toBeChecked();
-        await expect(triggers).not.toHaveAttribute('aria-invalid', 'true');
-        // The next save carries the revision the saved part left: it saves, with no "changed elsewhere".
-        await nav.getByRole('button', { name: 'Sources & scans', exact: true }).click();
-        await sourceRow('unplugged').getByRole('button', { name: 'Remove', exact: true }).click();
-        await save(page).click();
-        await expect(status(page)).toHaveText('Saved to the server configuration.');
-        expect((await serverJson(request, '/prompt_manager/settings')).sources.configured.map(source => source.path)).toEqual(['output']);
-    });
-
-test('a partial save made from Integrations keeps its outcome when Sources opens (S10 re-review R1)',
-    async ({ page, request }) => {
-        await lora(request);
-        await expect(await request.post('/__test__/system/missing-source', { data: { inside: true } })).toBeOK();
-        await openIntegrations(page);
-        const nav = page.locator('#workspace-main .section-nav');
-        const sourceRow = title => layoutOf(page).locator('#source-list .operation').filter({ has: page.locator('h3', { hasText: title }) });
-        await nav.getByRole('button', { name: 'Sources & scans', exact: true }).click();
-        await expect(sourceRow('unplugged')).toBeVisible();
-        await expect(await request.post('/__test__/system/unplug')).toBeOK();
-        await sourceRow('ComfyUI input').getByRole('button', { name: 'Remove', exact: true }).click();
-        // Back in Integrations, a LoRA change, then Save from there.
-        await nav.getByRole('button', { name: 'Integrations', exact: true }).click();
-        await settingOf(page, 'Automatically include trigger words').locator('input').check();
-        await save(page).click();
-        const reason = "output/unplugged can't be used: Gallery root does not exist. Remove it or reconnect it, then save.";
-        await expect(status(page)).toHaveText(reason);
-        // Leaving Integrations (no key was typed) keeps the outcome: Sources shows the reason on the refused row.
-        await nav.getByRole('button', { name: 'Sources & scans', exact: true }).click();
-        await expect(sourceRow('unplugged')).toHaveAttribute('aria-invalid', 'true');
-        await expect(status(page)).toHaveText(reason);
-    });
-
-test('Review import shows replacement, blocked items and network effects with the backup box; Start opens the job (D107)',
-    async ({ page, request }) => {
-        await lora(request, { loras: 3, civitai: true, preview: false, previous: 2 });
-        const previews = [];
-        const applies = [];
-        page.on('request', item => {
-            if (item.url().endsWith(PREVIEW_URL)) previews.push(item.postDataJSON());
-            if (item.url().endsWith(APPLY_URL)) applies.push(item.postDataJSON());
-        });
-        await openIntegrations(page);
-        await enable(page);
-        const before = await serverJson(request, '/__test__/integrations/state');
-        const review = layoutOf(page).locator('.operation').filter({ hasText: 'LoRA reference data' })
-            .getByRole('button', { name: 'Review import', exact: true });
-        await review.click();
-        await expect(dialog(page).locator('#modal-title')).toHaveText('Review LoRA import');
-        await expect(dialog(page).locator('#modal-body > h3')).toHaveText('LoRA reference data');
-        expect(previews).toEqual([{}]);
-        expect(await gridOf(page)).toEqual([
-            ['LoraManager', 'environment settings · alongside storage · library default'],
-            ['Scope', 'Replace 2 imported prompts with 3 LoRAs'],
-            ['Found', '3 metadata files · 3 LoRAs · 0 with local images'],
-            ['Protected', 'Nothing is protected'],
-            ['Network', 'Downloads up to 3 example images from CivitAI'],
-            ['Backup', 'Create and verify before changes (browser.db.backup_<date and time>)'],
-            ['Media on disk', 'No files are removed; image links are replaced'],
-        ]);
-        // #355: the settings file the server read is the LoraManager row's hover title.
-        await expect(dialog(page).locator('dl.meta-grid > div').first().locator('dd'))
-            .toHaveAttribute('title', /lora-manager-settings[\/\\]settings\.json$/);
-        await expect(dialog(page).locator('details > summary')).toHaveText('LoRAs found (3)');
-        await expect(dialog(page).locator('.notice h3')).toHaveText('Back up the database first (recommended)');
-        await expect(dialog(page).locator('p.small').last()).toContainText('stay in the image cache');
-        // The review wrote and downloaded nothing; Cancel neither.
-        await dialog(page).getByRole('button', { name: 'Cancel', exact: true }).click();
-        await expect(dialog(page)).toHaveCount(0);
-        await expect(review).toBeFocused();
-        expect(await serverJson(request, '/__test__/integrations/state')).toEqual(before);
-
-        await review.click();
-        await dialog(page).getByRole('button', { name: 'Start import', exact: true }).click();
-        await expect(dialog(page)).toHaveCount(0);
-        await expect(page).toHaveURL(/#\/activity\/[0-9a-f]{32}$/);
-        await expect(toast(page)).toHaveText(/LoRA reference import started\.|LoRA import finished · 3 imported · 0 errors/);
-        expect(applies).toHaveLength(1);
-        expect(Object.keys(applies[0])).toEqual(['token']);
-        const job = await ended(request, page.url().split('/').pop());
-        expect([job.kind, job.title, job.state]).toEqual(['lora_import', 'LoRA reference import', 'finished']);
-        expect(job.counters).toMatchObject({ imported: 3, downloaded: 3, download_errors: 0, errors: 0 });
-        const main = page.locator('#workspace-main');
-        await expect(main.locator('h1')).toHaveText('LoRA reference import');
-        await expect(main.locator('.stat-row .stat dt')).toHaveText(['Imported', 'Linked to existing', 'Skipped', 'Images downloaded',
-            'Download errors', 'Errors']);
-        await expect(main.getByRole('button', { name: 'Cancel import', exact: true })).toHaveCount(0);
-        const after = await serverJson(request, '/__test__/integrations/state');
-        expect(after.imports).toEqual(['style_01 example prompt', 'style_02 example prompt', 'style_03 example prompt']);
-        expect(after.downloads).toBe(3);
-    });
-
-test('saved pairs block the import: the review explains it and offers only Close', async ({ page, request }) => {
-    await lora(request, { previous: 1 });
-    await expect(await request.post('/__test__/integrations/pair')).toBeOK();
-    await openIntegrations(page);
-    await enable(page);
-    await layoutOf(page).getByRole('button', { name: 'Review import', exact: true }).click();
-    // gridOf reads once; poll until the review has rendered its rows.
-    await expect.poll(async () => (await gridOf(page))[3]).toEqual(['Protected', '1 imported prompt used by saved pairs']);
-    await expect(dialog(page).locator('p.small')).toHaveText(
-        'Delete or change the saved pairs that use these prompts, then review the import again. Nothing was changed.');
-    expect(await dialog(page).locator('.dialog-actions button').allTextContents()).toEqual(['Close']);
-    await dialog(page).getByRole('button', { name: 'Close', exact: true }).click();
-    await expect(dialog(page)).toHaveCount(0);
-});
-
-test('unusable LoraManager settings: the review says why and offers only Close (#355)', async ({ page, request }) => {
-    await lora(request, { previous: 1, settings: 'invalid' });
-    await openIntegrations(page);
-    await enable(page);
-    const before = await serverJson(request, '/__test__/integrations/state');
-    await layoutOf(page).getByRole('button', { name: 'Review import', exact: true }).click();
-    await expect.poll(async () => (await gridOf(page))[0])
-        .toEqual(['LoraManager', 'Not usable: the settings file is not valid JSON']);
-    await expect(dialog(page).locator('p.small')).toHaveText(
-        'LoraManager settings: not usable: the settings file is not valid JSON. Nothing was changed.');
-    expect(await dialog(page).locator('.dialog-actions button').allTextContents()).toEqual(['Close']);
-    await dialog(page).getByRole('button', { name: 'Close', exact: true }).click();
-    await expect(dialog(page)).toHaveCount(0);
-    expect(await serverJson(request, '/__test__/integrations/state')).toEqual(before);
-});
-
-test('imported LoRA previews show on the Library card and open in the inspector and viewer (#355 G6)', async ({ page, request }) => {
-    await lora(request, { loras: 1 });
-    await openIntegrations(page);
-    await enable(page);
-    await layoutOf(page).getByRole('button', { name: 'Review import', exact: true }).click();
-    await dialog(page).getByRole('button', { name: 'Start import', exact: true }).click();
-    await expect(page).toHaveURL(/#\/activity\/[0-9a-f]{32}$/);
-    expect((await ended(request, page.url().split('/').pop())).state).toBe('finished');
-    await page.goto(`${workspace}#/library`);
-    const card = page.locator('#workspace-main article.prompt-card').filter({ hasText: 'Style 01' });
-    const cover = card.locator('.card-art img');
-    await expect(cover).toHaveAttribute('src', /\/prompt_manager\/images\/serve\/style_01\.png\?root=\d+&root_scope=[0-9a-f]{64}$/);
-    await expect.poll(() => cover.evaluate(node => node.complete && node.naturalWidth)).toBeGreaterThan(0);
-    await expect(card.locator('.card-art')).not.toContainText('No available image previews');
-    // The prompt's gallery: Info inspects the file and the viewer opens it; no Tag action or star for LoRA media.
-    await card.getByRole('button', { name: 'Explore history', exact: true }).click();
-    const item = page.getByRole('region', { name: 'Shared gallery', exact: true }).locator('article[data-image-key]').first();
-    await expect(item.getByRole('button', { name: 'Tag or auto-tag style_01.png', exact: true })).toHaveCount(0);
-    await expect(item.locator('.star-button')).toHaveCount(0);
-    await item.getByRole('button', { name: 'Inspect style_01.png', exact: true }).click();
-    const inspector = page.getByRole('complementary', { name: 'Selected image details', exact: true });
-    await expect(inspector).toContainText('style_01.png');
-    await item.getByRole('button', { name: 'Open style_01.png', exact: true }).click();
-    await expect(page.locator('dialog[open] .viewer-canvas img')).toBeVisible();
-    await expect.poll(() => page.locator('dialog[open] .viewer-canvas img').evaluate(node => node.complete && node.naturalWidth))
-        .toBeGreaterThan(0);
-    await page.keyboard.press('Escape');
-});
-
-test('a failed import keeps old imports and its job says so', async ({ page, request }) => {
-    await lora(request, { loras: 2, previous: 2 });
-    await openIntegrations(page);
-    await enable(page);
-    const before = await serverJson(request, '/__test__/integrations/state');
-    await expect(await request.post('/__test__/integrations/fail-import')).toBeOK();
-    await layoutOf(page).getByRole('button', { name: 'Review import', exact: true }).click();
-    await dialog(page).getByRole('button', { name: 'Start import', exact: true }).click();
-    await expect(page).toHaveURL(/#\/activity\/[0-9a-f]{32}$/);
-    await expect(toast(page)).toHaveText(`LoRA import failed · ${KEPT}`);
-    const job = await ended(request, page.url().split('/').pop());
-    expect([job.state, job.scope.failure, job.counters.errors]).toEqual(['failed', 'import-failed', 1]);
-    await expect(page.locator('#workspace-main')).toContainText(KEPT);
-    expect((await serverJson(request, '/__test__/integrations/state')).imports).toEqual(before.imports);
-    expect(before.imports).toEqual(['previous lora import 1', 'previous lora import 2']);
-});
-
-test('the import can be cancelled while it downloads; then nothing is written', async ({ page, request }) => {
-    await lora(request, { loras: 2, civitai: true, preview: false, previous: 1 });
-    await openIntegrations(page);
-    await enable(page);
-    const before = await serverJson(request, '/__test__/integrations/state');
-    await expect(await request.post('/__test__/integrations/gate', { data: { hold: true } })).toBeOK();
-    await layoutOf(page).getByRole('button', { name: 'Review import', exact: true }).click();
-    await dialog(page).getByRole('button', { name: 'Start import', exact: true }).click();
-    await expect(page).toHaveURL(/#\/activity\/[0-9a-f]{32}$/);
-    const id = page.url().split('/').pop();
-    await expect.poll(async () => (await serverJson(request, '/__test__/integrations/state')).downloads).toBeGreaterThan(0);
-    const cancel = page.locator('#workspace-main').getByRole('button', { name: 'Cancel import', exact: true });
-    await expect(cancel).toBeVisible();
-    // The cancel must have reached the server before the held download goes on (S10 review M1).
-    await Promise.all([
-        page.waitForResponse(response => /\/prompt_manager\/jobs\/[0-9a-f]+\/cancel$/.test(response.url()) && response.ok()),
-        cancel.click(),
-    ]);
-    await expect(await request.post('/__test__/integrations/gate', { data: { hold: false } })).toBeOK();
-    const job = await ended(request, id);
-    expect(job.state).toBe('cancelled');
-    expect((await serverJson(request, '/__test__/integrations/state')).imports).toEqual(before.imports);
-    await expect(cancel).toHaveCount(0);
-});

tests/browser/workspace-system-maintenance.spec.mjs

@@ -1,483 +0,0 @@
-import { startCoverage, saveCoverage } from '../../tools/vendor/browser-coverage.mjs';
-import { test, expect } from './fixtures.mjs';
-import { seedConcept } from './concept-inventory.mjs';
-
-// System › Maintenance (#249 System S7 Task 19) on the concept-shaped real fixture and the S6 backend: the concept's
-// rows, the read-only health check, the D100 plan review applied as an Activity job, the D101 duplicate search and
-// review, the S5 thumbnail dialog and the D102 metadata cache row. The hooks are workspace_system_fixture.py's.
-const workspace = '/prompt_manager/workspace';
-const PREVIEW_URL = '/prompt_manager/maintenance/preview';
-const APPLY_URL = '/prompt_manager/maintenance/apply';
-const CHANGED = 'The library changed since the review; nothing was changed. Review the plan again.';
-
-test.beforeEach(async ({ page, request, browserName }) => {
-    await startCoverage(page, browserName);
-    await seedConcept(request);
-    await expect(await request.post('/__test__/system/reset')).toBeOK();
-    await expect(await request.post('/__test__/jobs/restart')).toBeOK();
-    page.systemErrors = [];
-    page.on('pageerror', error => page.systemErrors.push(error.message));
-});
-
-test.afterEach(async ({ page, request, browserName }) => {
-    await saveCoverage(page, browserName);
-    await request.post('/__test__/release');
-    await request.post('/__test__/jobs/restart');
-    await request.post('/__test__/system/reset');
-    expect(page.systemErrors).toEqual([]);
-});
-
-const toast = page => page.locator('#workspace-toast');
-const layoutOf = page => page.locator('#workspace-main .settings-layout');
-const dialog = page => page.locator('dialog#modal[open]');
-const row = (page, title) => layoutOf(page).locator('.operation').filter({ has: page.locator('h3', { hasText: title }) });
-
-async function serverJson(request, url) {
-    const response = await request.get(url);
-    await expect(response).toBeOK();
-    return response.json();
-}
-
-async function openMaintenance(page) {
-    await page.goto(`${workspace}#/system/maintenance`);
-    await expect(layoutOf(page).locator(':scope > section.surface')).toHaveCount(2);
-    return layoutOf(page);
-}
-
-/** The open plan dialog's `[dt, dd]` rows. */
-const gridOf = page => dialog(page).locator('dl.meta-grid > div').evaluateAll(items => items.map(item =>
-    [item.querySelector('dt').textContent, item.querySelector('dd').textContent]));
-
-/** Wait until the job `id` ended on the server; answers its summary. */
-async function ended(request, id) {
-    await expect.poll(async () => (await serverJson(request, `/prompt_manager/jobs/${id}`)).job.state).not.toBe('running');
-    return (await serverJson(request, `/prompt_manager/jobs/${id}`)).job;
-}
-
-test('the section shows the concept rows; Metadata cache follows Q5 (D102)', async ({ page }) => {
-    const layout = await openMaintenance(page);
-    await expect(layout.locator(':scope > .notice h2')).toHaveText('Check first. Review changes. Then apply.');
-    await expect(layout.locator(':scope > section.handoff')).toHaveCount(0);
-    expect(await layout.locator(':scope > section.surface').evaluateAll(surfaces => surfaces.map(surface => [
-        surface.querySelector('h2').textContent,
-        [...surface.querySelectorAll('.operation')].map(item => [item.querySelector('h3').textContent,
-            item.querySelector('.row-actions > button').textContent, item.querySelector('.row-actions > button').className]),
-    ]))).toEqual([
-        ['Database', [['Integrity & relationship checks', 'Check', ''], ['Duplicate prompt text', 'Review plan', ''],
-            ['Optimize database', 'Review plan', ''], ['Unused prompt components', 'Review plan', 'danger']]],
-        ['Images & cache', [['Missing-file links', 'Review plan', 'danger'], ['Duplicate image files', 'Find duplicates', ''],
-            ['Thumbnail cache', 'Review options', ''], ['Metadata cache', 'Review plan', '']]],
-    ]);
-    // Nothing of Prompt Manager's is cached in a browser (#222): the row says so and its review is unavailable.
-    const cache = row(page, 'Metadata cache');
-    await expect(cache.locator('p')).toHaveText('Clear only Prompt Manager metadata cached by this browser. Nothing is cached in this browser.');
-    const review = cache.getByRole('button', { name: 'Review plan', exact: true });
-    await expect(review).toHaveAttribute('aria-disabled', 'true');
-    // An aria-disabled button stays focusable and clickable; its press opens nothing.
-    await review.dispatchEvent('click');
-    await expect(review).toHaveAttribute('aria-disabled', 'true');
-    await expect(dialog(page)).toHaveCount(0);
-});
-
-test('Metadata cache reviews and clears only owned browser entries when there are some (D102)', async ({ page }) => {
-    // The shipped inventory is empty (#222); this test names one owned entry through the module's inventory seam.
-    await page.addInitScript(() => {
-        localStorage.setItem('pm-owned-test-entry', 'cached');
-        localStorage.setItem('pm_workspace_theme', 'dark');
-        let wrapped;
-        Object.defineProperty(window, 'CacheOwnership', { configurable: true, get: () => wrapped, set(api) {
-            const owned = { storageKeys: ['pm-owned-test-entry'], cacheNames: [] };
-            wrapped = { ...api, ownedEntries: options => api.ownedEntries({ ...options, owned }),
-                clearOwned: options => api.clearOwned({ ...options, owned }) };
-        } });
-    });
-    await openMaintenance(page);
-    const cache = row(page, 'Metadata cache');
-    const review = cache.getByRole('button', { name: 'Review plan', exact: true });
-    await expect(review).not.toHaveAttribute('aria-disabled', 'true');
-    await expect(cache.locator('p')).toHaveText('Clear only Prompt Manager metadata cached by this browser.');
-    await review.click();
-    await expect(dialog(page).locator('#modal-body > h3')).toHaveText('Metadata cache');
-    expect(await gridOf(page)).toEqual([['Scope', '1 cached entry in this browser'],
-        ['Protected', 'Preferences and other tools’ data in this browser'], ['Backup', 'Not needed: the database is not changed'],
-        ['Media on disk', 'No files are removed']]);
-    await dialog(page).getByRole('button', { name: 'Clear browser cache', exact: true }).click();
-    await expect(toast(page)).toHaveText('Cleared 1 cached entry from this browser.');
-    await expect(review).toHaveAttribute('aria-disabled', 'true');
-    expect(await page.evaluate(() => [localStorage.getItem('pm-owned-test-entry'), localStorage.getItem('pm_workspace_theme')]))
-        .toEqual([null, 'dark']);
-});
-
-test('Run health checks and Check open the Health report; Review missing links starts a fresh preview, never a cleanup',
-    async ({ page, request }) => {
-        await expect(await request.post('/__test__/system/missing-file')).toBeOK();
-        const before = await serverJson(request, '/__test__/system/digest');
-        const previews = [];
-        page.on('request', item => { if (item.url().endsWith(PREVIEW_URL)) previews.push(item.postDataJSON()); });
-        await openMaintenance(page);
-        const check = row(page, 'Integrity & relationship checks').getByRole('button', { name: 'Check', exact: true });
-        await check.click();
-        await expect(dialog(page).locator('#modal-title')).toHaveText('Health report');
-        await expect(dialog(page).locator('.operation').filter({ hasText: 'Missing files · output' }).locator('.chip'))
-            .toHaveText('1 link needs review');
-        await expect(check).toHaveText('Check');
-        await dialog(page).getByRole('button', { name: 'Review missing links', exact: true }).click();
-        await expect(dialog(page).locator('#modal-title')).toHaveText('Review maintenance plan');
-        await expect(dialog(page).locator('#modal-body > h3')).toHaveText('Missing-file links');
-        expect(previews).toEqual([{ operation: 'missing_links', options: {} }]);
-        expect((await gridOf(page))[0]).toEqual(['Scope', '1 link to a missing file']);
-        await dialog(page).getByRole('button', { name: 'Cancel', exact: true }).click();
-        await expect(dialog(page)).toHaveCount(0);
-        await expect(check).toBeFocused();
-        // The notice's Run health checks opens the same report.
-        await layoutOf(page).getByRole('button', { name: 'Run health checks', exact: true }).click();
-        await expect(dialog(page).locator('#modal-title')).toHaveText('Health report');
-        expect(await serverJson(request, '/__test__/system/digest')).toEqual(before);
-    });
-
-test("plan dialog shows the server's scope, protected, backup policy and media lines with the backup box (D100); Cancel writes nothing",
-    async ({ page, request }) => {
-        await expect(await request.post('/__test__/system/duplicate-prompts')).toBeOK();
-        const before = await serverJson(request, '/__test__/system/digest');
-        const answers = [];
-        page.on('response', response => { if (response.url().endsWith(PREVIEW_URL)) answers.push(response.json()); });
-        await openMaintenance(page);
-        const reviewButton = row(page, 'Duplicate prompt text').getByRole('button', { name: 'Review plan', exact: true });
-        await reviewButton.click();
-        const plan = dialog(page);
-        await expect(plan.locator('#modal-title')).toHaveText('Review maintenance plan');
-        const answer = await answers[0];
-        expect(answer.scope.count).toBe(1);
-        await expect(plan.locator('#modal-body > h3')).toHaveText('Duplicate prompt text');
-        expect(await gridOf(page)).toEqual([
-            ['Scope', answer.scope.label],
-            ['Protected', answer.protected.reasons.length ? answer.protected.reasons.join(' · ') : 'Nothing is protected'],
-            ['Backup', `Create and verify before changes (${answer.backup.destination_label})`],
-            ['Media on disk', answer.media.label],
-        ]);
-        expect(await plan.locator('#modal-body').evaluate(body => [...body.children].map(node =>
-            [node.localName, ...node.classList].join('.')))).toEqual(['h3', 'dl.meta-grid', 'details', 'p.small', 'div.notice',
-            'div.dialog-actions']);
-        await expect(plan.locator('details > summary')).toHaveText('Listed records (1)');
-        await expect(plan.locator('#modal-body > p.small')).toHaveText(/^Nothing changes until you apply\. This review holds for 1[45] minutes\.$/);
-        await expect(plan.locator('.notice h3')).toHaveText('Back up the database first (recommended)');
-        await expect(plan.locator('.dialog-actions button')).toHaveText(['Cancel', 'Apply reviewed operation']);
-        await plan.getByRole('button', { name: 'Cancel', exact: true }).click();
-        await expect(dialog(page)).toHaveCount(0);
-        await expect(reviewButton).toBeFocused();
-        // Optimize and Unused prompt components are reviewed the same way.
-        for (const [title, scope] of [['Optimize database', 'The whole database'], ['Unused prompt components', null]]) {
-            await row(page, title).getByRole('button', { name: 'Review plan', exact: true }).click();
-            await expect(dialog(page).locator('#modal-body > h3')).toHaveText(title);
-            const value = (await answers.at(-1)).scope.label;
-            expect((await gridOf(page))[0]).toEqual(['Scope', scope ?? value]);
-            await page.keyboard.press('Escape');
-            await expect(dialog(page)).toHaveCount(0);
-        }
-        expect(await serverJson(request, '/__test__/system/digest')).toEqual(before);
-    });
-
-test('a plan with nothing to do shows only Close, never Apply', async ({ page, request }) => {
-    const applies = [];
-    page.on('request', item => { if (item.url().endsWith(APPLY_URL)) applies.push(item.url()); });
-    await openMaintenance(page);
-    // The concept fixture has no duplicate prompt text.
-    const reviewButton = row(page, 'Duplicate prompt text').getByRole('button', { name: 'Review plan', exact: true });
-    await reviewButton.click();
-    await expect(dialog(page).locator('#modal-body > h3')).toHaveText('Duplicate prompt text');
-    expect((await gridOf(page))[0]).toEqual(['Scope', 'No duplicate prompt text']);
-    await expect(dialog(page).locator('#modal-body > p.small')).toHaveText('There is nothing to apply; nothing was changed.');
-    await expect(dialog(page).locator('.dialog-actions button')).toHaveText(['Close']);
-    await expect(dialog(page).locator('.notice')).toHaveCount(0);
-    await dialog(page).getByRole('button', { name: 'Close', exact: true }).click();
-    await expect(dialog(page)).toHaveCount(0);
-    await expect(reviewButton).toBeFocused();
-    expect(applies).toEqual([]);
-});
-
-test('Apply reviewed operation closes, toasts, opens the job in Activity', async ({ page, request }) => {
-    await expect(await request.post('/__test__/system/duplicate-prompts')).toBeOK();
-    const applies = [];
-    page.on('request', item => { if (item.url().endsWith(APPLY_URL)) applies.push(item.postDataJSON()); });
-    await openMaintenance(page);
-    await row(page, 'Duplicate prompt text').getByRole('button', { name: 'Review plan', exact: true }).click();
-    await dialog(page).getByRole('button', { name: 'Apply reviewed operation', exact: true }).click();
-    await expect(dialog(page)).toHaveCount(0);
-    await expect(page).toHaveURL(/#\/activity\/[0-9a-f]{32}$/);
-    await expect(toast(page)).toHaveText(/Duplicate prompt text (started|finished · 1 changed)/);
-    expect(applies).toHaveLength(1);
-    expect(Object.keys(applies[0])).toEqual(['token']);
-    const job = await ended(request, page.url().split('/').pop());
-    expect([job.kind, job.state, job.counters.changed]).toEqual(['maintenance', 'finished', 1]);
-    const main = page.locator('#workspace-main');
-    await expect(main.locator('h1')).toHaveText('Duplicate prompt text');
-    await expect(main.locator('.stat-row .stat dt')).toHaveText(['Changed', 'Protected', 'Errors']);
-    await expect(main.locator('.stat-row .stat dd').first()).toHaveText('1');
-    // Not cancellable: no Cancel, a report like every job.
-    await expect(main.getByRole('button', { name: 'Cancel job', exact: true })).toHaveCount(0);
-    await expect(main.getByRole('button', { name: 'Download report', exact: true })).toBeVisible();
-});
-
-test('plan-changed asks for a new review', async ({ page, request }) => {
-    await expect(await request.post('/__test__/system/duplicate-prompts')).toBeOK();
-    await openMaintenance(page);
-    await row(page, 'Duplicate prompt text').getByRole('button', { name: 'Review plan', exact: true }).click();
-    await expect(dialog(page).locator('#modal-body > h3')).toHaveText('Duplicate prompt text');
-    // The library changes after the review: the apply's recheck refuses it and nothing is changed.
-    await expect(await request.post('/__test__/system/duplicate-prompts', { data: { again: true } })).toBeOK();
-    const before = await serverJson(request, '/__test__/system/digest');
-    await dialog(page).getByRole('button', { name: 'Apply reviewed operation', exact: true }).click();
-    await expect(page).toHaveURL(/#\/activity\/[0-9a-f]{32}$/);
-    await expect(toast(page)).toHaveText(`Duplicate prompt text failed · ${CHANGED}`);
-    await expect(page.locator('#workspace-main')).toContainText(CHANGED);
-    expect((await serverJson(request, '/__test__/system/digest')).rows).toEqual(before.rows);
-    // S7 review M2: the failed job offers Review again, which reviews the same operation afresh.
-    const previews = [];
-    page.on('request', item => { if (item.url().endsWith(PREVIEW_URL)) previews.push(item.postDataJSON()); });
-    await page.locator('#workspace-main').getByRole('button', { name: 'Review again', exact: true }).click();
-    await expect(dialog(page).locator('#modal-title')).toHaveText('Review maintenance plan');
-    await expect(dialog(page).locator('#modal-body > h3')).toHaveText('Duplicate prompt text');
-    expect(previews).toEqual([{ operation: 'duplicate_prompts', options: {} }]);
-});
-
-test('a review button pressed twice sends one preview (S7 review M4)', async ({ page, request }) => {
-    await expect(await request.post('/__test__/system/missing-file')).toBeOK();
-    await expect(await request.post('/__test__/system/duplicate-files')).toBeOK();
-    const previews = [];
-    page.on('request', item => { if (item.url().endsWith(PREVIEW_URL)) previews.push(item.postDataJSON().operation); });
-    await openMaintenance(page);
-    await row(page, 'Integrity & relationship checks').getByRole('button', { name: 'Check', exact: true }).click();
-    // Hold the preview at the server so the second press lands while it is read.
-    await expect(await request.post('/__test__/hold', { data: { path: PREVIEW_URL } })).toBeOK();
-    // The pressed button reads "Reviewing…" while held, so it is found by its place, not its name.
-    const missing = dialog(page).locator('.dialog-actions > button').last();
-    await expect(missing).toHaveText('Review missing links');
-    await missing.click();
-    await expect(missing).toHaveAttribute('aria-disabled', 'true');
-    await expect(missing).toHaveText('Reviewing…');
-    await missing.dispatchEvent('click');
-    await expect.poll(async () => (await serverJson(request, '/__test__/hold')).held[PREVIEW_URL]).toBe(1);
-    await expect(await request.post('/__test__/release')).toBeOK();
-    await expect(dialog(page).locator('#modal-body > h3')).toHaveText('Missing-file links');
-    expect(previews).toEqual(['missing_links']);
-    await page.keyboard.press('Escape');
-
-    await row(page, 'Duplicate image files').getByRole('button', { name: 'Find duplicates', exact: true }).click();
-    await page.locator('#workspace-main').getByRole('button', { name: 'Review groups', exact: true }).click();
-    await expect(await request.post('/__test__/hold', { data: { path: PREVIEW_URL } })).toBeOK();
-    const cleanup = dialog(page).locator('.dialog-actions > button').last();
-    await expect(cleanup).toHaveText('Review duplicate cleanup');
-    await cleanup.click();
-    await expect(cleanup).toHaveAttribute('aria-disabled', 'true');
-    await cleanup.dispatchEvent('click');
-    await expect.poll(async () => (await serverJson(request, '/__test__/hold')).held[PREVIEW_URL]).toBe(1);
-    await expect(await request.post('/__test__/release')).toBeOK();
-    await expect(dialog(page).locator('#modal-body > h3')).toHaveText('Duplicate image files');
-    expect(previews).toEqual(['missing_links', 'duplicate_files']);
-});
-
-test('plan-used links the job that applied it', async ({ page, request }) => {
-    await expect(await request.post('/__test__/system/duplicate-prompts')).toBeOK();
-    // A double-submitted apply: the first request applies the plan, the second one's answer reaches the page.
-    await page.route(`**${APPLY_URL}`, async route => {
-        await route.fetch();
-        await route.fulfill({ response: await route.fetch() });
-    });
-    await openMaintenance(page);
-    await row(page, 'Duplicate prompt text').getByRole('button', { name: 'Review plan', exact: true }).click();
-    await dialog(page).getByRole('button', { name: 'Apply reviewed operation', exact: true }).click();
-    await expect(toast(page)).toHaveText('This plan was already applied: Duplicate prompt text.');
-    const link = toast(page).getByRole('link', { name: 'Duplicate prompt text', exact: true });
-    const { jobs } = await serverJson(request, '/prompt_manager/jobs');
-    const applied = jobs.find(job => job.kind === 'maintenance');
-    await expect(link).toHaveAttribute('href', `#/activity/${applied.id}`);
-    await expect(page).toHaveURL(`${workspace}#/system/maintenance`);
-});
-
-/**
- * Record every toast the page shows (`[text, [link hrefs]]`): a job's finish toast may replace an earlier one before a
- * test reads it.
- */
-async function recordToasts(page) {
-    await page.addInitScript(() => {
-        window.toastLog = [];
-        const record = node => window.toastLog.push([node.textContent, [...node.querySelectorAll('a')].map(a => a.getAttribute('href'))]);
-        new MutationObserver(() => {
-            const node = document.getElementById('workspace-toast');
-            const last = window.toastLog.at(-1);
-            if (node && node.textContent && last?.[0] !== node.textContent) record(node);
-        }).observe(document, { subtree: true, childList: true, characterData: true });
-    });
-    return () => page.evaluate(() => window.toastLog);
-}
-
-const NOT_CONFIRMED = ['Outcome not confirmed. Check Activity before applying it again.', ['#/activity']];
-
-/** The maintenance jobs the server lists (the apply ran even though its answer was lost). */
-async function maintenanceJobs(request) {
-    return (await serverJson(request, '/prompt_manager/jobs')).jobs.filter(job => job.kind === 'maintenance');
-}
-
-test('lost apply response says Outcome not confirmed and points to Activity', async ({ page, request }) => {
-    await expect(await request.post('/__test__/system/duplicate-prompts')).toBeOK();
-    // The server applies the plan; its answer never reaches the page.
-    const reads = [];
-    await page.route(`**${APPLY_URL}`, async route => {
-        await route.fetch();
-        page.on('request', item => { if (item.url().endsWith('/prompt_manager/jobs')) reads.push(item.url()); });
-        await route.abort('failed');
-    });
-    const toasts = await recordToasts(page);
-    await openMaintenance(page);
-    await row(page, 'Duplicate prompt text').getByRole('button', { name: 'Review plan', exact: true }).click();
-    await dialog(page).getByRole('button', { name: 'Apply reviewed operation', exact: true }).click();
-    await expect.poll(toasts).toContainEqual(NOT_CONFIRMED);
-    await expect(page).toHaveURL(`${workspace}#/system/maintenance`);
-    // The Activity list is read again at once, and the job the lost answer started is in it.
-    await expect.poll(() => reads.length).toBeGreaterThan(0);
-    expect((await maintenanceJobs(request)).map(job => job.title)).toEqual(['Duplicate prompt text']);
-    await page.evaluate(() => { location.hash = '#/activity'; });
-    await expect(page.locator('#workspace-main')).toContainText('Duplicate prompt text');
-});
-
-test('a proxy error or an unreadable answer is not a refusal: Outcome not confirmed (S7 review I1)', async ({ page, request }) => {
-    await expect(await request.post('/__test__/system/duplicate-prompts')).toBeOK();
-    const reads = [];
-    // A reverse proxy times out after the server started the job.
-    await page.route(`**${APPLY_URL}`, async route => {
-        await route.fetch();
-        page.on('request', item => { if (item.url().endsWith('/prompt_manager/jobs')) reads.push(item.url()); });
-        await route.fulfill({ status: 504, contentType: 'text/html', body: '<html><body>Gateway Timeout</body></html>' });
-    });
-    const toasts = await recordToasts(page);
-    await openMaintenance(page);
-    await row(page, 'Duplicate prompt text').getByRole('button', { name: 'Review plan', exact: true }).click();
-    await dialog(page).getByRole('button', { name: 'Apply reviewed operation', exact: true }).click();
-    await expect.poll(toasts).toContainEqual(NOT_CONFIRMED);
-    await expect.poll(() => reads.length).toBeGreaterThan(0);
-    expect(await maintenanceJobs(request)).toHaveLength(1);
-});
-
-test('a refused apply names the running job', async ({ page, request }) => {
-    await expect(await request.post('/__test__/system/duplicate-prompts')).toBeOK();
-    await openMaintenance(page);
-    await row(page, 'Duplicate prompt text').getByRole('button', { name: 'Review plan', exact: true }).click();
-    await expect(dialog(page).locator('#modal-body > h3')).toHaveText('Duplicate prompt text');
-    const hold = await (await request.post('/__test__/jobs/hold', { data: { title: 'Database restore (admin page)' } })).json();
-    await dialog(page).getByRole('button', { name: 'Apply reviewed operation', exact: true }).click();
-    await expect(toast(page)).toHaveText('Another job is running: Database restore (admin page).');
-    await expect(toast(page).getByRole('link')).toHaveAttribute('href', `#/activity/${hold.job.id}`);
-    await expect(page).toHaveURL(`${workspace}#/system/maintenance`);
-});
-
-test('Find duplicates starts a job; its view links Review groups; Keep radios build a duplicate_files plan (D101)',
-    async ({ page, request }) => {
-        await expect(await request.post('/__test__/system/duplicate-files')).toBeOK();
-        const previews = [];
-        page.on('request', item => { if (item.url().endsWith(PREVIEW_URL)) previews.push(item.postDataJSON()); });
-        await openMaintenance(page);
-        await row(page, 'Duplicate image files').getByRole('button', { name: 'Find duplicates', exact: true }).click();
-        await expect(page).toHaveURL(/#\/activity\/[0-9a-f]{32}$/);
-        const jobId = page.url().split('/').pop();
-        const main = page.locator('#workspace-main');
-        await expect(main.locator('h1')).toHaveText('Find duplicate image files');
-        const reviewGroups = main.getByRole('button', { name: 'Review groups', exact: true });
-        await expect(reviewGroups).toBeVisible();
-        await expect(main.locator('.stat-row .stat dt')).toHaveText(['Groups found']);
-        await reviewGroups.click();
-        const review = dialog(page);
-        await expect(review.locator('#modal-title')).toHaveText('Review duplicate image files');
-        const group = review.locator('.compare-grid').filter({ hasText: 's7-dupes/copy.png' });
-        await expect(group.locator('.compare-item img')).toHaveCount(3);
-        const labels = (await group.locator('.compare-item label').allTextContents()).map(text => text.trim());
-        expect([...labels].sort()).toEqual(['Keep input/s7-dupes/same.png', 'Keep output/s7-dupes/copy.png',
-            'Keep output/s7-dupes/same.png']);
-        await expect(review.locator('#modal-body > p.small').last())
-            .toHaveText(/History keeps the removed paths in its run records\./);
-        // Keep the input copy: the same relative path as the output copy, told apart by its source index.
-        await group.locator('.compare-item').filter({ hasText: 'input/s7-dupes/same.png' }).getByRole('radio').check();
-        await review.getByRole('button', { name: 'Review duplicate cleanup', exact: true }).click();
-        await expect(dialog(page).locator('#modal-title')).toHaveText('Review maintenance plan');
-        await expect(dialog(page).locator('#modal-body > h3')).toHaveText('Duplicate image files');
-        expect(previews).toHaveLength(1);
-        expect(previews[0].operation).toBe('duplicate_files');
-        expect(previews[0].options.job_id).toBe(jobId);
-        expect(previews[0].options.keep).toContainEqual(expect.objectContaining({ root_index: 1, path: 's7-dupes/same.png' }));
-        for (const entry of previews[0].options.keep) expect(Object.keys(entry).sort()).toEqual(['group_id', 'path', 'root_index']);
-        expect((await gridOf(page))[3][1]).toMatch(/^Deletes 2 files \(.+\) from disk; the kept copies stay\./);
-        await dialog(page).getByRole('button', { name: 'Apply reviewed operation', exact: true }).click();
-        await expect(page).not.toHaveURL(new RegExp(jobId));
-        await expect(page).toHaveURL(/#\/activity\/[0-9a-f]{32}$/);
-        const cleanup = await ended(request, page.url().split('/').pop());
-        expect([cleanup.kind, cleanup.state, cleanup.counters.removed]).toEqual(['duplicate_cleanup', 'finished', 2]);
-        await expect(main.locator('.stat-row .stat dt')).toHaveText(['Removed', 'Kept', 'Errors']);
-        expect((await request.get('/prompt_manager/images/serve/s7-dupes/same.png?root=1')).status()).toBe(200);
-        expect((await request.get('/prompt_manager/images/serve/s7-dupes/same.png?root=0')).status()).toBe(404);
-        expect((await request.get('/prompt_manager/images/serve/s7-dupes/copy.png?root=0')).status()).toBe(404);
-    });
-
-test('the duplicates review pages ten groups at a time and keeps each choice (D101)', async ({ page, request }) => {
-    await expect(await request.post('/__test__/system/duplicate-files', { data: { groups: 11 } })).toBeOK();
-    const groupReads = [];
-    page.on('request', item => { if (item.url().includes('/maintenance/duplicates/')) groupReads.push(new URL(item.url()).search); });
-    const previews = [];
-    page.on('request', item => { if (item.url().endsWith(PREVIEW_URL)) previews.push(item.postDataJSON()); });
-    await openMaintenance(page);
-    await row(page, 'Duplicate image files').getByRole('button', { name: 'Find duplicates', exact: true }).click();
-    const main = page.locator('#workspace-main');
-    await main.getByRole('button', { name: 'Review groups', exact: true }).click();
-    const review = dialog(page);
-    const status = review.locator('#modal-body > p.small[role=status]');
-    await expect(status).toHaveText('Groups 1–10 of 12');
-    await expect(review.locator('.compare-grid')).toHaveCount(10);
-    await expect(review.getByRole('button', { name: 'Previous groups', exact: true })).toBeDisabled();
-    // The three-copy group sorts first (the most bytes to free): keep its input copy.
-    const first = review.locator('.compare-grid').first();
-    await first.locator('.compare-item').filter({ hasText: 'input/s7-dupes/same.png' }).getByRole('radio').check();
-    await review.getByRole('button', { name: 'Next groups', exact: true }).click();
-    await expect(status).toHaveText('Groups 11–12 of 12');
-    await expect(review.locator('.compare-grid')).toHaveCount(2);
-    await expect(review.getByRole('button', { name: 'Next groups', exact: true })).toBeDisabled();
-    await review.getByRole('button', { name: 'Previous groups', exact: true }).click();
-    await expect(status).toHaveText('Groups 1–10 of 12');
-    await expect(first.locator('.compare-item').filter({ hasText: 'input/s7-dupes/same.png' }).getByRole('radio')).toBeChecked();
-    expect(groupReads).toEqual(['?offset=0&limit=10', '?offset=10&limit=10', '?offset=0&limit=10']);
-    await review.getByRole('button', { name: 'Review duplicate cleanup', exact: true }).click();
-    await expect(dialog(page).locator('#modal-body > h3')).toHaveText('Duplicate image files');
-    // Every group shown so far is reviewed, each with its chosen copy.
-    expect(previews[0].options.keep).toHaveLength(12);
-    expect(previews[0].options.keep).toContainEqual(expect.objectContaining({ root_index: 1, path: 's7-dupes/same.png' }));
-    await dialog(page).getByRole('button', { name: 'Cancel', exact: true }).click();
-    await expect(dialog(page)).toHaveCount(0);
-});
-
-for (const [width, height] of [[1600, 1100], [390, 844]]) {
-    test(`long copy paths wrap; the duplicates review never scrolls sideways ${width}x${height}`, async ({ page, request }) => {
-        await page.setViewportSize({ width, height });
-        await expect(await request.post('/__test__/system/duplicate-files', { data: { long: true, trio: false } })).toBeOK();
-        await openMaintenance(page);
-        await row(page, 'Duplicate image files').getByRole('button', { name: 'Find duplicates', exact: true }).click();
-        await page.locator('#workspace-main').getByRole('button', { name: 'Review groups', exact: true }).click();
-        const review = dialog(page);
-        await expect(review.locator('.compare-item')).toHaveCount(2);
-        const overflow = await review.evaluate(node => {
-            const body = node.querySelector('#modal-body');
-            // An item wider than its box, or a label (inline: measured by its boxes) past its item's right edge.
-            const wide = [...node.querySelectorAll('.compare-item')].filter(item => item.scrollWidth > item.clientWidth + 1
-                || [...item.querySelector('label').getClientRects()].some(rect => rect.right > item.getBoundingClientRect().right + 1)).length;
-            return { dialog: node.scrollWidth > node.clientWidth + 1, body: body.scrollWidth > body.clientWidth + 1, wide,
-                page: document.documentElement.scrollWidth > document.documentElement.clientWidth };
-        });
-        expect(overflow).toEqual({ dialog: false, body: false, wide: 0, page: false });
-    });
-}
-
-test('Thumbnail cache opens the S5 dialog', async ({ page }) => {
-    await openMaintenance(page);
-    const options = row(page, 'Thumbnail cache').getByRole('button', { name: 'Review options', exact: true });
-    await options.click();
-    await expect(dialog(page).locator('#modal-title')).toHaveText('Thumbnail maintenance');
-    await expect(dialog(page).locator('.field > label')).toHaveText(['Scope']);
-    await page.keyboard.press('Escape');
-    await expect(options).toBeFocused();
-});

tests/browser/workspace-system-sources.spec.mjs

@@ -331,25 +331,27 @@ function thumbnailRequests(page) {
 const missingLine = plan => `${planCount(plan.targets)} ${plan.targets === 1 ? 'preview' : 'previews'} to generate · ` +
     `${planCount(plan.fresh)} already up to date.`;
 
-const SETTINGS_LINE = 'Previews are written as WebP · quality 80 · 512 px. Change this in System › Appearance.';
-
-test('Review options shows the plan counts for the chosen scope and the server settings before Start', async ({ page, request }) => {
+test('Review options shows the plan counts for the chosen scope/quality/size before Start', async ({ page, request }) => {
     await expect(await request.post('/__test__/system/unthumbnailed', { data: { count: 3 } })).toBeOK();
+    // Image loading quality (Appearance, Q3) preselects the dialog's quality.
+    await page.addInitScript(() => { if (location.protocol.startsWith('http')) localStorage.setItem('gallerySettings', JSON.stringify({ imageQuality: 'high' })); });
     const seen = thumbnailRequests(page);
-    const plan = await serverJson(request, `${THUMBNAIL_PLAN_URL}?mode=missing`);
+    const plan = await serverJson(request, `${THUMBNAIL_PLAN_URL}?mode=missing&size=512&quality=high`);
     expect(plan.targets).toBe(3);
     const review = await openThumbnailReview(page);
-    // D131: Scope, the plan line, the server's settings line, the actions (no quality or size field of its own).
-    await expect(review.locator('#modal-body > *')).toHaveCount(4);
-    await expect(review.locator('.field > label')).toHaveText(['Scope']);
-    await expect(review.locator('#thumb-mode option')).toHaveText(['Missing thumbnails only', 'Rebuild all (explicit opt-in)',
-        'Convert outdated (removes older formats)']);
+    await expect(review.locator('#modal-body > *')).toHaveCount(5);
+    await expect(review.locator('.field > label')).toHaveText(['Scope', 'Quality', 'Preview size limit']);
+    await expect(review.locator('#thumb-mode option')).toHaveText(['Missing thumbnails only', 'Rebuild all (explicit opt-in)']);
+    await expect(review.locator('#thumb-quality option')).toHaveText(['Medium · optimized', 'High · original', 'Low · fastest']);
     await expect(review.locator('#thumb-mode')).toHaveValue('missing');
-    const [line, settings] = [review.locator('#modal-body > p.small').first(), review.locator('#modal-body > p.small').last()];
+    await expect(review.locator('#thumb-quality')).toHaveValue('high');
+    await expect(review.locator('#thumb-limit')).toHaveValue('512');
+    await expect(review.locator('#thumb-limit')).toHaveAttribute('min', '128');
+    await expect(review.locator('#thumb-limit')).toHaveAttribute('max', '2048');
+    const line = review.locator('#modal-body > p.small');
     await expect(line).toHaveAttribute('role', 'status');
     await expect(line).toHaveText(missingLine(plan));
-    await expect(settings).toHaveText(SETTINGS_LINE);
-    expect(seen.plans).toEqual([{ mode: 'missing' }]);
+    expect(seen.plans).toEqual([{ mode: 'missing', size: '512', quality: 'high' }]);
     await expect(review.locator('.dialog-actions > button')).toHaveText(['Cancel', 'Start']);
     // Reviewing starts nothing; Cancel closes.
     await review.getByRole('button', { name: 'Cancel', exact: true }).click();
@@ -358,67 +360,63 @@ test('Review options shows the plan counts for the chosen scope and the server s
     expect((await serverJson(request, '/prompt_manager/jobs')).jobs).toEqual([]);
 });
 
-test('Convert outdated replaces older-format previews from their originals and removes the old files (#317)', async ({ page, request }) => {
-    const { files } = await (await request.post('/__test__/system/legacy-previews', { data: { count: 3 } })).json();
-    const before = await serverJson(request, '/prompt_manager/images/thumbnails/status');
-    expect(before.outdated).toBe(3);
+test('size outside 128–2048 reports validity and requests nothing', async ({ page, request }) => {
     const seen = thumbnailRequests(page);
     const review = await openThumbnailReview(page);
-    const line = review.locator('#modal-body > p.small').first();
+    const line = review.locator('#modal-body > p.small');
     await expect(line).toHaveText(/ already up to date\.$/);
-    await review.locator('#thumb-mode').selectOption('convert');
-    await expect(line).toHaveText('3 previews in an older format to convert.');
-    // Choosing the scope converts nothing: only Start does.
-    expect(seen.starts).toEqual([]);
-    await review.getByRole('button', { name: 'Start', exact: true }).click();
-    await expect(page).toHaveURL(/#\/activity\/[0-9a-f]{32}$/);
-    expect(seen.starts).toEqual([{ mode: 'convert' }]);
-    const id = page.url().split('/').pop();
-    await expect.poll(async () => (await serverJson(request, `/prompt_manager/jobs/${id}`)).job.state).toBe('finished');
-    const { job } = await serverJson(request, `/prompt_manager/jobs/${id}`);
-    expect(job).toMatchObject({ kind: 'thumbnails', title: 'Convert outdated thumbnails', scope: { mode: 'convert', format: 'webp' } });
-    expect(job.status_line).toMatch(/^3 converted · 0 failed · .+ → .+$/);
-    await expect(page.locator('#workspace-main h1')).toHaveText('Convert outdated thumbnails');
-    const after = await serverJson(request, '/prompt_manager/images/thumbnails/status');
-    expect(after.outdated).toBe(0);
-    // The listing now names the WebP previews; the old PNG previews are gone.
-    for (const file of files) {
-        const name = file.replace(/\.png$/, '');
-        expect((await request.get(`/prompt_manager/images/serve/thumbnails/${name}_thumb.webp?root=0`)).headers()['content-type']).toBe('image/webp');
-        expect((await request.get(`/prompt_manager/images/serve/${file}?root=0`)).ok()).toBe(true);
+    const size = review.locator('#thumb-limit');
+    for (const value of ['4096', '64', '']) {
+        await size.fill(value);
+        await expect(size).toHaveAttribute('aria-invalid', 'true');
+        await expect(line).toHaveText('Enter a size from 128 to 2048 pixels.');
+        expect(await size.evaluate(input => input.validity.valid)).toBe(false);
+        // Start keeps the dialog open and sends nothing; neither does a scope change.
+        await review.getByRole('button', { name: 'Start', exact: true }).click();
+        await expect(dialog(page).locator('#modal-title')).toHaveText('Thumbnail maintenance');
+        await review.locator('#thumb-mode').selectOption('rebuild');
+        await expect(line).toHaveText('Enter a size from 128 to 2048 pixels.');
+        await review.locator('#thumb-mode').selectOption('missing');
     }
+    expect(seen.starts).toEqual([]);
+    expect(seen.plans).toEqual([{ mode: 'missing', size: '512', quality: 'medium' }]);
+    await size.fill('1024');
+    await expect(size).not.toHaveAttribute('aria-invalid');
+    await expect(line).toHaveText(/ already up to date\.$/);
+    expect((await serverJson(request, '/prompt_manager/jobs')).jobs).toEqual([]);
 });
 
 test('Start closes the dialog, toasts, and opens the job in Activity', async ({ page, request }) => {
     await expect(await request.post('/__test__/system/unthumbnailed', { data: { count: 2 } })).toBeOK();
     const seen = thumbnailRequests(page);
     const review = await openThumbnailReview(page);
+    await review.locator('#thumb-quality').selectOption('low');
+    await review.locator('#thumb-limit').fill('256');
     await review.getByRole('button', { name: 'Start', exact: true }).click();
     await expect(dialog(page)).toHaveCount(0);
     await expect(page).toHaveURL(/#\/activity\/[0-9a-f]{32}$/);
     // The toast says it started (or, for a run this quick, that it already finished); Activity shows its progress.
     await expect(toast(page)).toHaveText(/^(Thumbnail generation started\.|Thumbnails finished · 2 generated · 0 errors)$/);
-    expect(seen.starts).toEqual([{ mode: 'missing' }]);
+    expect(seen.starts).toEqual([{ mode: 'missing', size: 256, quality: 'low' }]);
     const id = page.url().split('/').pop();
     const { job } = await serverJson(request, `/prompt_manager/jobs/${id}`);
-    expect(job).toMatchObject({ kind: 'thumbnails', title: 'Thumbnail generation',
-        scope: { mode: 'missing', format: 'webp', size: 512, quality: 80 } });
+    expect(job).toMatchObject({ kind: 'thumbnails', title: 'Thumbnail generation', scope: { mode: 'missing', size: 256, quality: 'low' } });
     await expect(page.locator('#workspace-main h1')).toHaveText('Thumbnail generation');
     await expect.poll(async () => (await serverJson(request, `/prompt_manager/jobs/${id}`)).job.state).toBe('finished');
 });
 
 test('Rebuild all is explicit and the plan line says every preview is regenerated', async ({ page, request }) => {
     const seen = thumbnailRequests(page);
-    const rebuild = await serverJson(request, `${THUMBNAIL_PLAN_URL}?mode=rebuild`);
+    const rebuild = await serverJson(request, `${THUMBNAIL_PLAN_URL}?mode=rebuild&size=512&quality=medium`);
     expect(rebuild.targets).toBeGreaterThan(0);
     const review = await openThumbnailReview(page);
     // Missing thumbnails only is the default; rebuilding is the explicit second option.
     await expect(review.locator('#thumb-mode')).toHaveValue('missing');
-    const line = review.locator('#modal-body > p.small').first();
+    const line = review.locator('#modal-body > p.small');
     await expect(line).toHaveText(/ already up to date\.$/);
     await review.locator('#thumb-mode').selectOption('rebuild');
     await expect(line).toHaveText(`Every preview is regenerated: ${planCount(rebuild.targets)} files.`);
-    expect(seen.plans).toEqual([{ mode: 'missing' }, { mode: 'rebuild' }]);
+    expect(seen.plans).toEqual([{ mode: 'missing', size: '512', quality: 'medium' }, { mode: 'rebuild', size: '512', quality: 'medium' }]);
     // Back and forth reads each scope once.
     await review.locator('#thumb-mode').selectOption('missing');
     await expect(line).toHaveText(/ already up to date\.$/);
@@ -427,7 +425,7 @@ test('Rebuild all is explicit and the plan line says every preview is regenerate
     expect(seen.plans).toHaveLength(2);
     await review.getByRole('button', { name: 'Start', exact: true }).click();
     await expect(page).toHaveURL(/#\/activity\/[0-9a-f]{32}$/);
-    expect(seen.starts).toEqual([{ mode: 'rebuild' }]);
+    expect(seen.starts).toEqual([{ mode: 'rebuild', size: 512, quality: 'medium' }]);
     const id = page.url().split('/').pop();
     await expect.poll(async () => (await serverJson(request, `/prompt_manager/jobs/${id}`)).job.state).toBe('finished');
 });
@@ -435,7 +433,7 @@ test('Rebuild all is explicit and the plan line says every preview is regenerate
 test('a plan that cannot be read says so; Start still starts', async ({ page }) => {
     await page.route(`**${THUMBNAIL_PLAN_URL}?*`, route => route.fulfill({ status: 500, json: { success: false, error: 'disk' } }));
     const review = await openThumbnailReview(page);
-    await expect(review.locator('#modal-body > p.small').first()).toHaveText('The previews could not be counted.');
+    await expect(review.locator('#modal-body > p.small')).toHaveText('The previews could not be counted.');
     await expect(review.getByRole('button', { name: 'Start', exact: true })).not.toHaveAttribute('aria-disabled');
     await review.getByRole('button', { name: 'Cancel', exact: true }).click();
 });

tests/browser/workspace-system.spec.mjs

@@ -36,9 +36,6 @@ const layoutOf = page => page.locator('#workspace-main .settings-layout');
 async function openOverview(page) {
     await page.goto(`${workspace}#/system/overview`);
     await expect(layoutOf(page).locator(':scope > .summary-metrics')).toBeVisible();
-    // The Backup status row is its own read of /backup/status (S9): compare once it answered.
-    await expect(layoutOf(page).locator('.operation').filter({ has: page.locator('h3', { hasText: 'Backup status' }) })
-        .locator('p')).not.toHaveText('Checking backups…');
     return layoutOf(page);
 }
 
@@ -70,7 +67,7 @@ test('overview shows real counts and Not checked', async ({ page, request }) =>
     ]);
     expect(await rowsOf(layout, 'Library health')).toEqual([
         ['0 ambiguous image links', 'Review metadata before assigning a positive / negative pair.', 'Review metadata'],
-        ['Backup status', 'No backup recorded.', 'View backups'],
+        ['Backup status', 'No retained backup record.', 'View backups'],
         // D129: the fixture's database is configured explicitly, so it reads as config.json's choice and does not move.
         ['Library location', 'browser.db · The database path set in config.json.', 'Details'],
         ['No missing thumbnails', 'Generate only missing previews when necessary.', 'Review thumbnails'],
@@ -176,8 +173,8 @@ test('Run health checks opens Health report and updates metric 4', async ({ page
     await page.goto(`${workspace}#/system/maintenance`);
     const layout = layoutOf(page);
     await expect(layout.locator(':scope > .notice h2')).toHaveText('Check first. Review changes. Then apply.');
-    // Maintenance is native (S7): its two surfaces follow the notice.
-    await expect(layout.locator(':scope > section.surface > h2')).toHaveText(['Database', 'Images & cache']);
+    // The rest of Maintenance is still the existing tools' (D94).
+    await expect(layout.locator(':scope > section.handoff h2')).toHaveText('Your current tools are ready');
     const run = layout.getByRole('button', { name: 'Run health checks', exact: true });
     await run.click();
     const dialog = page.locator('dialog#modal[open]');
@@ -207,11 +204,8 @@ test('Run health checks opens Health report and updates metric 4', async ({ page
         .toHaveText(['1 link needs review', 'Passed', 'Not available']);
     await expect(dialog.locator('.operation h3').filter({ hasText: 'Missing files' }))
         .toHaveText(['Missing files · output', 'Missing files · input', 'Missing files · unmounted-drive']);
-    // Review missing links reviews a fresh Missing-file links plan (S7); nothing is cleaned up.
+    // Review missing links goes to Maintenance, where the cleanup's existing tool is linked.
     await dialog.getByRole('button', { name: 'Review missing links', exact: true }).click();
-    await expect(dialog.locator('#modal-title')).toHaveText('Review maintenance plan');
-    await expect(dialog.locator('#modal-body > h3')).toHaveText('Missing-file links');
-    await dialog.getByRole('button', { name: 'Cancel', exact: true }).click();
     await expect(page.locator('dialog#modal[open]')).toHaveCount(0);
     await expect(page).toHaveURL(`${workspace}#/system/maintenance`);
     await page.locator('#workspace-main .section-nav').getByRole('button', { name: 'Overview', exact: true }).click();
@@ -241,7 +235,7 @@ test('thumbnail row reflects the status endpoint', async ({ page, request }) =>
 
 test('Overview Review thumbnails opens the same dialog', async ({ page, request }) => {
     await expect(await request.post('/__test__/system/unthumbnailed', { data: { count: 2 } })).toBeOK();
-    const plan = await serverJson(request, '/prompt_manager/images/thumbnails/plan?mode=missing');
+    const plan = await serverJson(request, '/prompt_manager/images/thumbnails/plan?mode=missing&size=512&quality=medium');
     const starts = [];
     page.on('request', item => { if (item.method() === 'POST' && item.url().endsWith('/prompt_manager/jobs/thumbnails')) starts.push(item.postDataJSON()); });
     const layout = await openOverview(page);
@@ -251,8 +245,8 @@ test('Overview Review thumbnails opens the same dialog', async ({ page, request
     const review = page.locator('dialog#modal[open]');
     await expect(review.locator('#modal-title')).toHaveText('Thumbnail maintenance');
     await expect(page).toHaveURL(`${workspace}#/system/overview`);
-    await expect(review.locator('.field > label')).toHaveText(['Scope']);
-    await expect(review.locator('#modal-body > p.small').first()).toHaveText(`2 previews to generate · ${number(plan.fresh)} already up to date.`);
+    await expect(review.locator('.field > label')).toHaveText(['Scope', 'Quality', 'Preview size limit']);
+    await expect(review.locator('#modal-body > p.small')).toHaveText(`2 previews to generate · ${number(plan.fresh)} already up to date.`);
     // Escape closes it and focus returns to the row's button.
     await page.keyboard.press('Escape');
     await expect(review).toHaveCount(0);
@@ -260,61 +254,11 @@ test('Overview Review thumbnails opens the same dialog', async ({ page, request
     await row.getByRole('button', { name: 'Review thumbnails', exact: true }).click();
     await review.getByRole('button', { name: 'Start', exact: true }).click();
     await expect(page).toHaveURL(/#\/activity\/[0-9a-f]{32}$/);
-    expect(starts).toEqual([{ mode: 'missing' }]);
+    expect(starts).toEqual([{ mode: 'missing', size: 512, quality: 'medium' }]);
     const id = page.url().split('/').pop();
     await expect.poll(async () => (await serverJson(request, `/prompt_manager/jobs/${id}`)).job.state).toBe('finished');
 });
 
-test('the thumbnail row counts outdated previews and offers Convert outdated (#317)', async ({ page, request }) => {
-    await expect(await request.post('/__test__/system/legacy-previews', { data: { count: 2 } })).toBeOK();
-    const layout = await openOverview(page);
-    const row = layout.locator('.operation').filter({ has: page.getByRole('button', { name: 'Review thumbnails', exact: true }) });
-    await expect(row.locator('h3')).toHaveText('No missing thumbnails · 2 outdated');
-    await expect(row.locator('.row-actions > button')).toHaveText(['Review thumbnails', 'Convert outdated']);
-    await row.getByRole('button', { name: 'Convert outdated', exact: true }).click();
-    const review = page.locator('dialog#modal[open]');
-    await expect(review.locator('#modal-title')).toHaveText('Thumbnail maintenance');
-    // It opens on the Convert outdated scope; nothing starts until Start.
-    await expect(review.locator('#thumb-mode')).toHaveValue('convert');
-    await expect(review.locator('#modal-body > p.small').first()).toHaveText('2 previews in an older format to convert.');
-    expect((await serverJson(request, '/prompt_manager/jobs')).jobs).toEqual([]);
-    await page.keyboard.press('Escape');
-    await expect(row.getByRole('button', { name: 'Convert outdated', exact: true })).toBeFocused();
-});
-
-test('Appearance › Thumbnails saves the server thumbnail settings and never converts by itself (#317)', async ({ page, request }) => {
-    await expect(await request.post('/__test__/system/jxl-encoder', { data: { available: false } })).toBeOK();
-    await expect(await request.post('/__test__/system/legacy-previews', { data: { count: 1 } })).toBeOK();
-    await page.goto(`${workspace}#/system/appearance`);
-    const surface = page.locator('#workspace-main .settings-layout > section.surface').nth(1);
-    await expect(surface.locator(':scope > h2')).toHaveText('Thumbnails');
-    await expect(surface.locator('.setting-row label')).toHaveText(['Thumbnail format', 'Thumbnail quality', 'Thumbnail size limit']);
-    const format = surface.locator('#thumbnail-format');
-    await expect(format).toBeEnabled();
-    await expect(format).toHaveValue('webp');
-    await expect(surface.locator('#thumbnail-quality')).toHaveValue('80');
-    await expect(surface.locator('#thumbnail-edge')).toHaveValue('512');
-    // D130: JPEG XL is offered only with an encoder; without one the row says why, in the server's words.
-    await expect(format.locator('option[value="jxl"]')).toBeDisabled();
-    await expect(surface.locator('.setting-row').first().locator('p.small').first()).toContainText('No JPEG XL encoder found.');
-    await format.selectOption('jpeg');
-    await surface.locator('#thumbnail-quality').fill('65');
-    await surface.locator('#thumbnail-quality').dispatchEvent('change');
-    await page.getByRole('button', { name: 'Save preferences', exact: true }).click();
-    await expect(page.locator('#settings-status')).toHaveText('Saved to the server configuration.');
-    const { settings } = await serverJson(request, '/prompt_manager/settings');
-    expect([settings.thumbnail_format, settings.thumbnail_quality, settings.thumbnail_edge]).toEqual(['jpeg', 65, 512]);
-    // Changing the format converts nothing: the row says so and the old preview is still listed.
-    await expect(surface.locator('.operation p')).toHaveText('Format saved. Existing previews keep their old format until you convert them.');
-    expect((await serverJson(request, '/prompt_manager/jobs')).jobs).toEqual([]);
-    expect((await serverJson(request, '/prompt_manager/images/thumbnails/status')).outdated).toBeGreaterThan(0);
-    // With an encoder JPEG XL can be chosen.
-    await expect(await request.post('/__test__/system/jxl-encoder', { data: { available: true } })).toBeOK();
-    await page.reload();
-    await expect(page.locator('#workspace-main #thumbnail-format option[value="jxl"]')).toBeEnabled();
-    await expect(page.locator('#workspace-main #thumbnail-format')).toHaveValue('jpeg');
-});
-
 test('the thumbnail row paints when its own status read answers', async ({ page, request }) => {
     const held = async () => (await serverJson(request, '/__test__/hold')).held[THUMBNAILS_URL] ?? 0;
     await expect(await request.post('/__test__/hold', { data: { path: THUMBNAILS_URL } })).toBeOK();
@@ -412,11 +356,11 @@ test('out-of-order overview responses never repaint a newer section', async ({ p
     await nav.getByRole('button', { name: 'Appearance', exact: true }).click();
     await nav.getByRole('button', { name: 'Overview', exact: true }).click();
     await expect.poll(held).toBe(2);
-    // Auto-tagging still hands off (S11), so its body is one known panel.
-    await nav.getByRole('button', { name: 'Auto-tagging', exact: true }).click();
+    // Integrations still hands off (S10), so its body is one known panel.
+    await nav.getByRole('button', { name: 'Integrations', exact: true }).click();
     await expect(await request.post('/__test__/release')).toBeOK();
     await expect.poll(held).toBe(0);
-    // Both late answers reached a section that had left: Auto-tagging keeps its own body.
+    // Both late answers reached a section that had left: Integrations keeps its own body.
     await expect(layout.locator(':scope > section.handoff')).toBeVisible();
     await page.evaluate(() => new Promise(resolve => requestAnimationFrame(() => requestAnimationFrame(resolve))));
     await expect(layout.locator('.summary-metrics')).toHaveCount(0);
@@ -439,7 +383,7 @@ const panel = page => page.getByRole('complementary', { name: 'Selected image de
 
 async function openAppearance(page) {
     await page.goto(`${workspace}#/system/appearance`);
-    await expect(page.locator('#workspace-main .settings-layout > section.surface > h2').first()).toHaveText('Browsing & display');
+    await expect(page.locator('#workspace-main .settings-layout > section.surface > h2')).toHaveText('Browsing & display');
     // The host rows are enabled once the server settings answered.
     await expect(page.locator('#timeout')).toBeEnabled();
 }
@@ -656,16 +600,14 @@ test('server settings that cannot be read say so in their rows', async ({ page }
         ? route.fulfill({ status: 500, contentType: 'application/json', body: JSON.stringify({ success: false, error: 'Injected failure' }) })
         : route.continue()));
     await page.goto(`${workspace}#/system/appearance`);
-    // #317: the Thumbnails rows are server settings too.
-    for (const id of ['open-mode', 'timeout', 'thumbnail-format', 'thumbnail-quality', 'thumbnail-edge']) {
+    for (const id of ['open-mode', 'timeout']) {
         const row = page.locator('#workspace-main .setting-row').filter({ has: page.locator(`#${id}`) });
-        await expect(row.locator('p.small').first()).toHaveText('Server settings could not be read.');
+        await expect(row.locator('p.small')).toHaveText('Server settings could not be read.');
         await expect(page.locator(`#${id}`)).toBeDisabled();
     }
     // The browser rows are this browser's, and work as before.
     await expect(page.locator('#default-view')).toBeEnabled();
-    await expect(page.locator('#workspace-main .setting-row p.small', { hasText: 'Server settings could not be read.' })).toHaveCount(5);
-    await expect(page.locator('#workspace-main section.surface').first().locator('.setting-row p.small')).toHaveCount(2);
+    await expect(page.locator('#workspace-main .setting-row p.small')).toHaveCount(2);
 });
 
 test('stale revision shows the conflict status', async ({ page, request }) => {
@@ -727,7 +669,7 @@ test('a change another tab saved while System was closed is a conflict on return
     await other.close();
     // Back in System: the draft is kept and flagged, and nothing was written over the other tab's value.
     await page.evaluate(() => { location.hash = '#/system/appearance'; });
-    await expect(page.locator('#workspace-main .settings-layout > section.surface > h2').first()).toHaveText('Browsing & display');
+    await expect(page.locator('#workspace-main .settings-layout > section.surface > h2')).toHaveText('Browsing & display');
     await expect(statusOf(page)).toHaveText('Settings changed elsewhere. Reload this section to see them.');
     await expect(page.locator('#density')).toHaveAttribute('aria-invalid', 'true');
     await expect(page.locator('#density')).toHaveValue('compact');

tests/browser/workspace-thumbnails.spec.mjs

@@ -44,7 +44,7 @@ test('a page of the Images grid requests previews, never originals, in every lay
     const listing = await (await request.get('/prompt_manager/images/output?limit=40')).json();
     const fresh = listing.images.filter(image => image.path.startsWith('unthumbnailed/'));
     expect(fresh).toHaveLength(6);
-    for (const image of fresh) expect(image.thumbnail_url).toMatch(/\/thumbnails\/unthumbnailed\/plain_\d{3}_thumb\.webp\?root=0/);
+    for (const image of fresh) expect(image.thumbnail_url).toMatch(/\/thumbnails\/unthumbnailed\/plain_\d{3}_thumb\.png\?root=0/);
     const seen = recordMedia(page);
     await page.goto(images);
     await expect(cards(page)).toHaveCount(8);
@@ -73,7 +73,7 @@ test('the inspector cover is the preview and only the media viewer loads the ori
     const card = cards(page).filter({ hasText: 'plain_001.png' });
     await card.getByRole('button', { name: 'Inspect plain_001.png', exact: true }).click();
     const cover = details(page).locator('img.detail-cover');
-    await expect(cover).toHaveAttribute('src', /\/thumbnails\/unthumbnailed\/plain_001_thumb\.webp\?/);
+    await expect(cover).toHaveAttribute('src', /\/thumbnails\/unthumbnailed\/plain_001_thumb\.png\?/);
     await settled(page);
     await cover.evaluate(image => image.decode().catch(() => {}));
     expect(originals(seen)).toEqual([]);
@@ -88,7 +88,7 @@ test('a video card shows its preview frame instead of loading the video', async
     const seen = recordMedia(page);
     await page.goto(images);
     const card = cards(page).filter({ hasText: 'clip.webm' });
-    await expect(card.locator('.media-art > .image-open > img')).toHaveAttribute('src', /\/thumbnails\/clip_thumb\.webp\?/);
+    await expect(card.locator('.media-art > .image-open > img')).toHaveAttribute('src', /\/thumbnails\/clip_thumb\.jpg\?/);
     await expect(card.locator('video')).toHaveCount(0);
     await settled(page);
     expect(originals(seen)).toEqual([]);
@@ -107,7 +107,7 @@ test('Library cards and the shared gallery request previews only', async ({ page
 
 test('a video whose preview cannot be loaded swaps back to its own element', async ({ page, request }) => {
     await expect(await request.post('/__test__/reset', { data: { include_video: true } })).toBeOK();
-    await page.route(url => url.pathname.endsWith('/thumbnails/clip_thumb.webp'), route => route.fulfill({ status: 404, body: '' }));
+    await page.route(url => url.pathname.endsWith('/thumbnails/clip_thumb.jpg'), route => route.fulfill({ status: 404, body: '' }));
     await page.goto(images);
     const card = cards(page).filter({ hasText: 'clip.webm' });
     await expect(card.locator('.media-art > .image-open > video')).toHaveCount(1);
@@ -133,38 +133,3 @@ test('an image listed without a preview (a nested thumbnails folder) shows its o
     expect(seen.length).toBeGreaterThan(0);
     expect(seen.every(item => !item.preview)).toBe(true);
 });
-
-test('a JPEG XL thumbnail this browser cannot show loads the original; one it can show is used (#317)', async ({ page, request }) => {
-    await expect(await request.post('/__test__/reset')).toBeOK();
-    await expect(await request.post('/__test__/system/reset')).toBeOK();
-    try {
-        await expect(await request.post('/__test__/system/jxl-encoder', { data: { available: true } })).toBeOK();
-        const saved = await request.post('/prompt_manager/settings', { data: { thumbnail_format: 'jxl' } });
-        await expect(saved).toBeOK();
-        await expect(await request.post('/__test__/system/unthumbnailed', { data: { count: 1 } })).toBeOK();
-        const listing = await (await request.get('/prompt_manager/images/output?limit=40')).json();
-        const fresh = listing.images.find(image => image.path === 'unthumbnailed/plain_001.png');
-        expect(fresh.thumbnail_url).toMatch(/\/thumbnails\/unthumbnailed\/plain_001_thumb\.jxl\?root=0/);
-        await page.goto(images);
-        // What this browser does with JPEG XL, decided the way the workspace decides it (an embedded probe).
-        const decodes = await page.evaluate(() => new Promise(resolve => {
-            const probe = new Image();
-            probe.onload = () => resolve(true);
-            probe.onerror = () => resolve(false);
-            probe.src = 'data:image/jxl;base64,/woAkAEAE4gCALQAtZ8gAAAVKqOMG7yc6/nyQ4fFtI3rDG21bWEJY7O9MEhIOGwY4s3xwRCTShIA';
-        }));
-        const card = cards(page).filter({ hasText: 'plain_001.png' });
-        const media = card.locator('.media-art > .image-open > img');
-        // A browser without JPEG XL shows the original; one with it shows the preview, or the original when the
-        // preview cannot be made here (no real encoder in the test server): never a broken image.
-        if (!decodes) await expect(media).toHaveAttribute('src', /\/unthumbnailed\/plain_001\.png\?root=0/);
-        await expect.poll(() => media.evaluate(image => image.complete && image.naturalWidth > 0)).toBe(true);
-        // The inspector cover follows the same rule.
-        await card.getByRole('button', { name: 'Inspect plain_001.png', exact: true }).click();
-        const cover = details(page).locator('img.detail-cover');
-        if (!decodes) await expect(cover).toHaveAttribute('src', /\/unthumbnailed\/plain_001\.png\?/);
-        await expect.poll(() => cover.evaluate(image => image.complete && image.naturalWidth > 0)).toBe(true);
-    } finally {
-        await request.post('/__test__/system/reset');
-    }
-});

tests/browser/workspace-visual.spec.mjs

@@ -173,8 +173,7 @@ test('visual fixture exposes real stable media and library records', async ({ re
     await expect(await request.get(image.url)).toBeOK();
     const thumbnail = await request.get(image.thumbnail_url);
     await expect(thumbnail).toBeOK();
-    // #317: previews are written as WebP by default.
-    expect(thumbnail.headers()['content-type']).toBe('image/webp');
+    expect(thumbnail.headers()['content-type']).toBe('image/png');
     const inspection = await (await request.get(`/prompt_manager/images/inspect/${encodeURIComponent(image.path)}?root=${image.root_index}`)).json();
     expect(inspection.success).toBe(true);
     expect(inspection.image.path).toBe(image.path);

tests/browser/workspace.spec.mjs

@@ -413,7 +413,7 @@ for (const width of [1600, 390]) test(`overview and handoff render with concept
 
     await sidebarLink(page, 'System').click();
     // System's Overview is native (S2 Task 6); a section not delivered yet still hands off (D94).
-    await main.locator('.section-nav').getByRole('button', { name: 'Auto-tagging', exact: true }).click();
+    await main.locator('.section-nav').getByRole('button', { name: 'Integrations', exact: true }).click();
     const handoff = main.locator('section.handoff');
     await expect(handoff).toHaveClass(/\bsurface\b/);
     expect(await handoff.evaluate(surfaceStyle)).toMatchObject(SURFACE);
@@ -427,6 +427,7 @@ for (const width of [1600, 390]) test(`overview and handoff render with concept
 const SYSTEM_SECTION_LABELS = ['Overview', 'Appearance', 'Sources & scans', 'Integrations', 'Auto-tagging', 'Maintenance',
     'Backup & export', 'Diagnostics & logs'];
 const SYSTEM_HASHES = ['overview', 'appearance', 'sources', 'integrations', 'tagging', 'maintenance', 'backups', 'diagnostics'];
+const SYSTEM_HANDOFFS = { maintenance: ['/prompt_manager/admin', '/prompt_manager/gallery'] };
 
 test('System is native: the concept shell, section navigation, sections, hand-offs and the Save row', async ({ page }) => {
     const mutations = [];
@@ -463,24 +464,20 @@ test('System is native: the concept shell, section navigation, sections, hand-of
         // The section changes in place: focus stays on the pressed section, not the page title.
         await expect(button).toBeFocused();
         // S2 Task 6: Overview is native (workspace-system.spec.mjs), and so are Appearance (S3 Task 8) and Sources & scans
-        // (S4 Task 11, workspace-system-sources.spec.mjs, its update notice shown in a fresh browser), Integrations (S10
-        // Task 27, workspace-system-integrations.spec.mjs), Maintenance (S7 Task 19,
-        // workspace-system-maintenance.spec.mjs) and Backup & export (S9 Task 24, workspace-system-backups.spec.mjs);
-        // every other section hands off.
+        // (S4 Task 11, workspace-system-sources.spec.mjs, its update notice shown in a fresh browser); Maintenance shows
+        // its health-check notice above the hand-off (D123); every other section hands off.
         if (hash === 'overview') await expect(layout.locator(':scope > .summary-metrics')).toBeVisible();
         if (hash === 'sources') await expect(layout.locator('#source-list .operation')).toHaveCount(2);
         expect(await layout.evaluate(node => [...node.children].map(child => `${child.localName}.${child.className}`)))
-            .toEqual({ overview: ['div.summary-metrics', 'div.two-col', 'div.save-row'], appearance: ['section.surface', 'section.surface', 'div.save-row'],
+            .toEqual({ overview: ['div.summary-metrics', 'div.two-col', 'div.save-row'], appearance: ['section.surface', 'div.save-row'],
                 sources: ['div.notice', 'section.surface', 'div.save-row'],
-                integrations: ['section.surface', 'section.surface', 'div.save-row'],
-                maintenance: ['div.notice', 'section.surface', 'section.surface', 'div.save-row'],
-                backups: ['div.two-col', 'section.surface', 'div.save-row'] }[hash]
+                maintenance: ['div.notice', 'section.surface handoff', 'div.save-row'] }[hash]
                 ?? ['section.surface handoff', 'div.save-row']);
-        if (['overview', 'appearance', 'sources', 'integrations', 'maintenance', 'backups'].includes(hash)) continue;
+        if (['overview', 'appearance', 'sources'].includes(hash)) continue;
         const handoff = layout.locator('section.handoff');
         await expect(handoff.locator('h2')).toHaveText('Your current tools are ready');
         expect(await handoff.locator('a.workspace-link').evaluateAll(links => links.map(link => link.getAttribute('href'))))
-            .toEqual(['/prompt_manager/admin']);
+            .toEqual(SYSTEM_HANDOFFS[hash] ?? ['/prompt_manager/admin']);
         await expect(layout.locator('#settings-status')).toHaveText('No unsaved changes.');
         await expect(page.locator('aside.sidebar a[href="#/system"]')).toHaveAttribute('aria-current', 'page');
     }

tests/browser/workspace_concept_fixture.py

@@ -513,12 +513,7 @@ def seed_workspace_concept(
         tags = [row[0] for row in conn.execute("SELECT name FROM tags ORDER BY id")]
     if tuple(counts) != (len(CONCEPT_PROMPTS), CONCEPT_RUN_COUNT, CONCEPT_RUN_COUNT):
         raise RuntimeError(f"Concept fixture run counts are not real: {tuple(counts)}")
-    from py.api.thumbnail_settings import ThumbnailSettings
-
-    # 150 px previews in the default format (#317 thumbnail settings).
-    api._generate_gallery_thumbnails_sync(
-        api._get_all_output_dirs(), ThumbnailSettings("webp", 80, 150)
-    )
+    api._generate_gallery_thumbnails_sync(api._get_all_output_dirs(), (150, 150))
     api.invalidate_gallery_cache()
     return {
         "epoch": epoch,

tests/browser/workspace_integrations_fixture.py

@@ -1,216 +0,0 @@
-"""System › Integrations test hooks for the browser tests (#249 System S10).
-
-A fake LoraManager install lives under this server's temp root; nothing ever
-reaches a real LoraManager, ComfyUI install or the network:
-
-- ``POST /__test__/integrations/reset`` turns the integration off (no path,
-  no key, no trigger words), removes the fake install, its LoRA folder and
-  the image cache, forgets every LoRA import and injected failure, and opens
-  the download gate;
-- ``POST /__test__/integrations/lora-manager``
-  ``{loras, civitai, preview, previous, settings}`` writes
-  ``custom_nodes/ComfyUI-Lora-Manager`` (detected through the
-  ``folder_paths`` stub's base path) and ``loras`` LoRAs under
-  ``models/loras``: each a ``<stem>.safetensors`` model beside its
-  ``<stem>.metadata.json`` sidecar (LoraManager's alongside layout, #355)
-  and, unless ``preview`` is false, a local preview PNG; ``civitai`` adds one
-  CivitAI example image per LoRA (served by the stub opener below; an import
-  downloads it only for a LoRA without a local preview); ``previous`` saves
-  that many earlier ``lora-manager`` imports with tags and image links;
-  ``settings: "invalid"`` makes LoraManager's settings file unreadable JSON
-  (the server's own isolated settings folder, ``LORA_MANAGER_SETTINGS_DIR``);
-- ``POST /__test__/integrations/gate`` ``{hold}`` holds every CivitAI
-  download until it is released (``{"hold": false}``), so a test sees the job
-  while it downloads;
-- ``POST /__test__/integrations/fail-import`` makes the next collection
-  replacement fail (a database error after staging);
-- ``POST /__test__/integrations/pair`` saves a pair whose positive is the first
-  imported prompt (a saved pair that blocks the replacement);
-- ``GET /__test__/integrations/state`` answers the imported prompt texts,
-  whether a CivitAI key is saved and the downloads served.
-
-CivitAI downloads are always answered by a stub opener (a small PNG), so no
-test ever opens a network connection.
-"""
-
-import io
-import json
-import os
-import shutil
-import threading
-from pathlib import Path
-
-from aiohttp import web
-from PIL import Image
-
-MAX_LORAS = 20
-CATEGORY = "lora-manager"
-
-
-def _png():
-    buffer = io.BytesIO()
-    Image.new("RGB", (8, 8), "#3a6ea5").save(buffer, "PNG")
-    return buffer.getvalue()
-
-
-class _Response:
-    def __init__(self, body):
-        self._body = io.BytesIO(body)
-        self.headers = {"Content-Length": str(len(body))}
-
-    def read(self, amount=-1):
-        return self._body.read(amount)
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, *exc):
-        return False
-
-
-def register_integrations_commands(app, routes, api, root: Path):
-    from py import lora_utils
-    from py.config import IntegrationConfig
-    from utils.hashing import generate_prompt_hash
-
-    lora_manager = root / "custom_nodes" / "ComfyUI-Lora-Manager"
-    loras = root / "models" / "loras"
-    gate = threading.Event()
-    gate.set()
-    served = []
-    failures = {"replace": 0}
-    pairs = []  # the blocking pairs this fixture saved
-    real_replace = type(api.db).replace_category_prompts
-
-    def stub_open(request, timeout=10):
-        served.append(request.full_url)
-        gate.wait(30)
-        return _Response(_png())
-
-    lora_utils._open_url = stub_open
-
-    def replace(db, *args, **kwargs):
-        if failures["replace"] > 0:
-            failures["replace"] -= 1
-            raise RuntimeError("Injected replacement failure")
-        return real_replace(db, *args, **kwargs)
-
-    type(api.db).replace_category_prompts = replace
-
-    def settings_file():
-        return Path(os.environ["LORA_MANAGER_SETTINGS_DIR"]) / "settings.json"
-
-    def reset():
-        settings_file().unlink(missing_ok=True)
-        IntegrationConfig.LORA_MANAGER_ENABLED = False
-        IntegrationConfig.LORA_MANAGER_PATH = ""
-        IntegrationConfig.LORA_TRIGGER_WORDS_ENABLED = False
-        IntegrationConfig.CIVITAI_API_KEY = ""
-        lora_utils.get_trigger_cache().clear()
-        gate.set()
-        served.clear()
-        failures["replace"] = 0
-        cache = Path(lora_utils.get_lora_image_cache_dir(create=False))
-        for folder in (lora_manager, loras, cache):
-            shutil.rmtree(folder, ignore_errors=True)
-        for pair_id in pairs:
-            api.db.delete_prompt_pair(pair_id)
-        pairs.clear()
-        real_replace(api.db, CATEGORY, [], allow_empty=True)
-
-    @routes.post("/__test__/integrations/reset")
-    async def integrations_reset(request):
-        reset()
-        return web.json_response({"success": True})
-
-    @routes.post("/__test__/integrations/lora-manager")
-    async def make_lora_manager(request):
-        data = await request.json() if request.can_read_body else {}
-        count = data.get("loras", 2)
-        previous = data.get("previous", 0)
-        preview = data.get("preview", True)
-        settings = data.get("settings")
-        for value in (count, previous):
-            if isinstance(value, bool) or not isinstance(value, int):
-                raise web.HTTPBadRequest()
-        if not 0 <= count <= MAX_LORAS or not 0 <= previous <= MAX_LORAS:
-            raise web.HTTPBadRequest()
-        if not isinstance(preview, bool) or settings not in (None, "invalid"):
-            raise web.HTTPBadRequest()
-        if settings == "invalid":
-            settings_file().write_text("{not json", encoding="utf-8")
-        (lora_manager / "py").mkdir(parents=True, exist_ok=True)
-        (lora_manager / "__init__.py").write_text("")
-        loras.mkdir(parents=True, exist_ok=True)
-        for number in range(count):
-            stem = f"style_{number + 1:02}"
-            civitai = {"trainedWords": [f"trigger{number + 1}"]}
-            if data.get("civitai") is True:
-                civitai["images"] = [
-                    {
-                        "url": f"https://image.civitai.com/x/{stem}.jpeg",
-                        "meta": {"prompt": f"{stem} example prompt"},
-                    }
-                ]
-            meta = {
-                "file_name": f"{stem}.safetensors",
-                "model_name": f"Style {number + 1:02}",
-                "civitai": civitai,
-            }
-            (loras / f"{stem}.safetensors").write_bytes(b"model")
-            (loras / f"{stem}.metadata.json").write_text(json.dumps(meta))
-            if preview:
-                (loras / f"{stem}.png").write_bytes(_png())
-        for number in range(previous):
-            text = f"previous lora import {number + 1}"
-            prompt_id = api.db.save_prompt(
-                text=text,
-                category=CATEGORY,
-                tags=[CATEGORY, f"lora:previous-{number + 1}"],
-                prompt_hash=generate_prompt_hash(text),
-            )
-            api.db.link_image_to_prompt(str(prompt_id), str(loras / "old.png"))
-        return web.json_response({"success": True})
-
-    @routes.post("/__test__/integrations/gate")
-    async def download_gate(request):
-        data = await request.json()
-        if not isinstance(data.get("hold"), bool):
-            raise web.HTTPBadRequest()
-        if data["hold"]:
-            gate.clear()
-        else:
-            gate.set()
-        return web.json_response({"success": True})
-
-    @routes.post("/__test__/integrations/fail-import")
-    async def fail_import(request):
-        failures["replace"] = 1
-        return web.json_response({"success": True})
-
-    @routes.post("/__test__/integrations/pair")
-    async def pair(request):
-        with api.db.model.get_connection() as conn:
-            row = conn.execute(
-                "SELECT text FROM prompts WHERE category = ? ORDER BY id LIMIT 1",
-                (CATEGORY,),
-            ).fetchone()
-        if row is None:
-            raise web.HTTPConflict()
-        pairs.append(api.db.save_prompt_pair(row[0], "blurry"))
-        return web.json_response({"success": True})
-
-    @routes.get("/__test__/integrations/state")
-    async def state(request):
-        imports = api.db.search_prompts(category=CATEGORY, limit=MAX_LORAS * 2)
-        return web.json_response(
-            {
-                "imports": sorted(prompt["text"] for prompt in imports),
-                "key_saved": bool(IntegrationConfig.CIVITAI_API_KEY),
-                "enabled": IntegrationConfig.LORA_MANAGER_ENABLED,
-                "trigger_words": IntegrationConfig.LORA_TRIGGER_WORDS_ENABLED,
-                "downloads": len(served),
-            }
-        )
-
-    return reset

tests/browser/workspace_system_fixture.py

@@ -29,41 +29,11 @@ read. These per-server hooks only change what a System test needs on top:
   touches no file and ends with the library in the default folder.
   ``failing`` is the same library whose move fails verification. Reset
   restores the real resolver, the real move and "Keep it here".
-- ``POST /__test__/system/legacy-previews`` ``{count}`` (#317) writes ``count``
-  PNGs into ``output/legacy`` with an older release's preview beside each
-  (``thumbnails/legacy/<name>_thumb.png``, newer than its file): outdated
-  previews for Convert outdated;
-- ``POST /__test__/system/jxl-encoder`` ``{available}`` (#317) makes the
-  server read as having (``cjxl``) or lacking a JPEG XL encoder without
-  probing; reset restores the thumbnail settings and the real detection.
-
-- ``POST /__test__/system/duplicate-prompts`` (S7) adds two prompts whose
-  text differs only in case and spacing (a duplicate prompt text group);
-  ``{"again": true}`` adds a third, so a reviewed plan no longer matches;
-- ``POST /__test__/system/duplicate-files`` (S7) writes one PNG's bytes three
-  times: ``output/s7-dupes/same.png``, ``input/s7-dupes/same.png`` (the same
-  relative path in the other source) and ``output/s7-dupes/copy.png``;
-  ``{"groups": n}`` adds ``n`` more groups of two copies each, and
-  ``{"trio": false}`` leaves the three ``same.png``/``copy.png`` copies out,
-  and ``{"long": true}`` adds a group under long names with no spaces;
-- ``GET /__test__/system/digest`` (S7) answers the sha256 of the database's
-  rows (a read-only dump) and of every media file under ``output`` and
-  ``input`` (not the automatic previews in ``thumbnails``), so a test proves
-  a Cancel wrote nothing.
-- ``POST /__test__/system/safety-backup`` (S9) writes one verified safety
-  backup beside the database, as a maintenance apply does;
-  ``GET /__test__/system/backups`` answers ``{safety: [names], stages: n}``:
-  the ``<db>.backup_*`` files and the held ``.pm-restore-*`` stage folders.
-  Reset drops every held restore review, removes the safety backups and
-  forgets the session's last download.
 
 Delays use the shared request holds (``request_hold.py``).
 """
 
-import hashlib
 import os
-import shutil
-import sqlite3
 from pathlib import Path
 
 from aiohttp import web
@@ -102,12 +72,7 @@ def register_system_commands(app, routes, api, root: Path):
         PromptManagerConfig.WEBUI_DISPLAY_MODE,
         PromptManagerConfig.WORKER_THREADS,
         GalleryConfig.MONITORING_ENABLED,
-        PromptManagerConfig.THUMBNAIL_FORMAT,
-        PromptManagerConfig.THUMBNAIL_QUALITY,
-        PromptManagerConfig.THUMBNAIL_EDGE,
     )
-    from py.api import thumbnail_encode
-
     monitor = getattr(image_monitor, "_monitor_instance", None)
     failures: dict[str, int] = {}
 
@@ -125,12 +90,8 @@ def register_system_commands(app, routes, api, root: Path):
 
     unplugged = root / "output" / "unplugged"
 
-    dupes = [root / "output" / "s7-dupes", root / "input" / "s7-dupes"]
-
     def reset():
         failures.clear()
-        for folder in dupes:
-            shutil.rmtree(folder, ignore_errors=True)
         if unplugged.is_dir():
             unplugged.rmdir()
         GalleryConfig.MONITORING_DIRECTORIES = list(configured)
@@ -140,11 +101,7 @@ def register_system_commands(app, routes, api, root: Path):
             PromptManagerConfig.WEBUI_DISPLAY_MODE,
             PromptManagerConfig.WORKER_THREADS,
             GalleryConfig.MONITORING_ENABLED,
-            PromptManagerConfig.THUMBNAIL_FORMAT,
-            PromptManagerConfig.THUMBNAIL_QUALITY,
-            PromptManagerConfig.THUMBNAIL_EDGE,
         ) = host_values
-        thumbnail_encode.reset_encoders()
         image_monitor._monitor_instance = monitor
         api.__dict__.pop("_library_resolver", None)
         library_move.move_library = real_move
@@ -157,45 +114,11 @@ def register_system_commands(app, routes, api, root: Path):
             staged.write_bytes(config_bytes)
             os.replace(staged, config_path)
 
-    def backup_files():
-        db_path = Path(api.db.model.db_path)
-        safety = sorted(
-            path.name
-            for path in db_path.parent.glob(db_path.name + ".backup_*")
-            if path.is_file()
-        )
-        stages = [
-            path
-            for path in db_path.parent.glob(".pm-restore-*")
-            if path.is_dir() and not path.name.startswith(".pm-restore-upload-")
-        ]
-        return db_path, safety, stages
-
-    async def reset_backups():
-        await api._discard_held(api._restore_plans.pop_all())
-        db_path, safety, _stages = backup_files()
-        for name in safety:
-            (db_path.parent / name).unlink(missing_ok=True)
-        api._last_backup_download = None
-
     @routes.post("/__test__/system/reset")
     async def system_reset(request):
         reset()
-        await reset_backups()
         return web.json_response({"success": True})
 
-    @routes.post("/__test__/system/safety-backup")
-    async def safety_backup(request):
-        from py.api.maintenance import take_safety_backup
-
-        name = await api._run_in_executor(take_safety_backup, api.db.model)
-        return web.json_response({"success": True, "name": name})
-
-    @routes.get("/__test__/system/backups")
-    async def backups(request):
-        _db_path, safety, stages = backup_files()
-        return web.json_response({"safety": safety, "stages": len(stages)})
-
     @routes.post("/__test__/system/fail")
     async def system_fail(request):
         data = await request.json()
@@ -263,43 +186,6 @@ def register_system_commands(app, routes, api, root: Path):
         api.invalidate_gallery_cache()
         return web.json_response({"success": True})
 
-    @routes.post("/__test__/system/legacy-previews")
-    async def legacy_previews(request):
-        data = await request.json()
-        count = data.get("count")
-        if (
-            isinstance(count, bool)
-            or not isinstance(count, int)
-            or not 1 <= count <= MAX_UNTHUMBNAILED
-        ):
-            raise web.HTTPBadRequest()
-        folder = root / "output" / "legacy"
-        previews = root / "output" / "thumbnails" / "legacy"
-        folder.mkdir(exist_ok=True)
-        previews.mkdir(parents=True, exist_ok=True)
-        names = []
-        for number in range(count):
-            name = f"old_{number + 1:03}"
-            with Image.effect_noise((256, 256), 50) as noise:
-                noise.convert("RGB").save(folder / f"{name}.png")
-                noise.convert("RGB").save(previews / f"{name}_thumb.png")
-            later = (folder / f"{name}.png").stat().st_mtime + 5
-            os.utime(previews / f"{name}_thumb.png", (later, later))
-            names.append(f"legacy/{name}.png")
-        api.invalidate_gallery_cache()
-        return web.json_response({"success": True, "files": names})
-
-    @routes.post("/__test__/system/jxl-encoder")
-    async def jxl_encoder(request):
-        data = await request.json()
-        available = data.get("available")
-        if not isinstance(available, bool):
-            raise web.HTTPBadRequest()
-        # Test-only: stand in the cached detection (no probe).
-        with thumbnail_encode._detect_lock:
-            thumbnail_encode._detected = "cjxl" if available else None
-        return web.json_response({"success": True})
-
     @routes.post("/__test__/system/monitor")
     async def fake_monitor(request):
         data = await request.json()
@@ -315,75 +201,6 @@ def register_system_commands(app, routes, api, root: Path):
         )
         return web.json_response({"success": True})
 
-    @routes.post("/__test__/system/duplicate-prompts")
-    async def duplicate_prompts(request):
-        data = await request.json() if request.can_read_body else {}
-        texts = [("S7 duplicate prompt", "2001-01-01 00:00:00")]
-        texts.append(("  s7 DUPLICATE prompt", "2002-01-01 00:00:00"))
-        if data.get("again") is True:
-            texts = [("S7 Duplicate Prompt  ", "2003-01-01 00:00:00")]
-        with api.db.model.get_connection() as conn:
-            conn.executemany(
-                "INSERT INTO prompts(text, created_at) VALUES(?, ?)", texts
-            )
-            conn.commit()
-        return web.json_response({"success": True})
-
-    @routes.post("/__test__/system/duplicate-files")
-    async def duplicate_files(request):
-        body = await request.json() if request.can_read_body else {}
-        for folder in dupes:
-            folder.mkdir(exist_ok=True)
-        extra = body.get("groups", 0)
-        if (
-            isinstance(extra, bool)
-            or not isinstance(extra, int)
-            or not 0 <= extra <= 20
-        ):
-            raise web.HTTPBadRequest()
-        for number in range(extra):
-            # One more group each: two copies of a picture no other file has.
-            with Image.new("RGB", (16, 16), (number * 9, 40, 90)) as image:
-                image.save(dupes[0] / f"group_{number:02}_a.png")
-            copy = (dupes[0] / f"group_{number:02}_a.png").read_bytes()
-            (dupes[0] / f"group_{number:02}_b.png").write_bytes(copy)
-        if body.get("long") is True:
-            # One group whose copies sit under long folder and file names with
-            # no space to break at, as real dataset folders do.
-            deep = dupes[0] / ("mabes9sans_DATASET_ideogram_v1_" * 3).rstrip("_")
-            deep.mkdir(exist_ok=True)
-            with Image.new("RGB", (16, 16), "#204060") as image:
-                image.save(deep / ("mabes9sans_DATASET072_" * 4 + "a.png"))
-            copy = (deep / ("mabes9sans_DATASET072_" * 4 + "a.png")).read_bytes()
-            (deep / ("mabes9sans_DATASET072_" * 4 + "b.png")).write_bytes(copy)
-        if body.get("trio", True) is not False:
-            with Image.new("RGB", (48, 48), "#7a3b2e") as image:
-                image.save(dupes[0] / "same.png")
-            data = (dupes[0] / "same.png").read_bytes()
-            (dupes[1] / "same.png").write_bytes(data)
-            (dupes[0] / "copy.png").write_bytes(data)
-        api.invalidate_gallery_cache()
-        return web.json_response({"success": True})
-
-    @routes.get("/__test__/system/digest")
-    async def digest(request):
-        uri = Path(api.db.model.db_path).as_uri() + "?mode=ro"
-        rows = hashlib.sha256()
-        conn = sqlite3.connect(uri, uri=True)
-        try:
-            for line in conn.iterdump():
-                rows.update(line.encode("utf-8") + b"\n")
-        finally:
-            conn.close()
-        media = hashlib.sha256()
-        for name in ("output", "input"):
-            for path in sorted((root / name).rglob("*")):
-                # Automatic previews are written in the background (#316): media only.
-                if path.is_file() and "thumbnails" not in path.relative_to(root).parts:
-                    media.update(str(path.relative_to(root)).encode("utf-8"))
-                    media.update(hashlib.sha256(path.read_bytes()).digest())
-        return web.json_response({"rows": rows.hexdigest(), "media": media.hexdigest()})
-
     @routes.post("/__test__/system/library")
     async def library_state(request):
         data = await request.json()

tests/browser/workspace_tagging_fixture.py

@@ -148,12 +148,7 @@ def seed_tagging(api: PromptManagerAPI, root: Path, extra_images: int = 0) -> di
             image_id = db.link_image_to_prompt(positive_id, str(output / relative))
             if kind == "linked":
                 db.link_image_to_pair(pair_id, image_id, {"source": "fixture"})
-    from py.api.thumbnail_settings import ThumbnailSettings
-
-    # 150 px previews in the default format (#317 thumbnail settings).
-    api._generate_gallery_thumbnails_sync(
-        api._get_all_output_dirs(), ThumbnailSettings("webp", 80, 150)
-    )
+    api._generate_gallery_thumbnails_sync(api._get_all_output_dirs(), (150, 150))
     api.invalidate_gallery_cache()
     return {
         "positive_id": positive_id,

tests/browser/workspace_visual_fixture.py

@@ -164,10 +164,5 @@ def seed_workspace_visual(api: PromptManagerAPI, root: Path) -> None:
             path = root / directory / category.lower() / filename
             _write_art(path, index, positive, negatives[offset % len(negatives)])
             api.db.link_image_to_prompt(prompt_id, str(path))
-    from py.api.thumbnail_settings import ThumbnailSettings
-
-    # 150 px previews in the default format (#317 thumbnail settings).
-    api._generate_gallery_thumbnails_sync(
-        api._get_all_output_dirs(), ThumbnailSettings("webp", 80, 150)
-    )
+    api._generate_gallery_thumbnails_sync(api._get_all_output_dirs(), (150, 150))
     api.invalidate_gallery_cache()

tests/comfyui/execution-text-link.spec.mjs

@@ -1,195 +0,0 @@
-// #343: a link drives a PromptManager node's text (and the Pair's negative) on the real pinned host.
-// The workflow is built by the real frontend through the nodes' sockets and queued as the frontend serializes it;
-// only inference is replaced (fixtures/ledger_nodes.py). The linked text must be saved, counted, recorded in the
-// execution history, and the run's image must link to it.
-import { execFile } from 'node:child_process';
-import { randomUUID } from 'node:crypto';
-import { promisify } from 'node:util';
-import { expect } from '../../tools/vendor/node_modules/@playwright/test/index.mjs';
-import { test, readExecutionRuns } from './execution-fixture.mjs';
-import { installHostHooks } from './host-fixture.mjs';
-
-// The worker's owned host must be up before the shared host hooks open the page.
-test.beforeEach(async ({ execution }) => { expect(execution.databasePath).toBeTruthy(); });
-installHostHooks(test, ['PromptManager', 'PromptManagerText', 'PromptManagerFocused', 'PromptManagerPair', 'PMHistoryInputs']);
-
-// `primitive`: a core string node the queue-time resolver follows. `legacy`: the frontend's virtual Primitive node,
-// whose value is queued as literal text. `preview`: PrimitiveString -> PreviewAny, the shape of the maintainer's
-// TextGenerate -> PreviewAny chain, whose text is only known when the node runs.
-function build(page, { kind, positive, negative, prefix }) {
-    return page.evaluate(async ({ kind, positive, negative, prefix }) => {
-        const { app } = await import('/scripts/app.js');
-        app.graph.clear();
-        const add = (type, x, y) => { const node = LiteGraph.createNode(type); app.graph.add(node); node.pos = [x, y]; return node; };
-        const slot = (node, name) => { const index = node.inputs.findIndex(input => input.name === name); if (index < 0) throw new Error(`${node.type} has no ${name} socket`); return index; };
-        const connect = (from, output, to, name) => { if (!from.connect(output, to, slot(to, name))) throw new Error(`${from.type} could not link to ${to.type}.${name}`); };
-        const inputs = add('PMHistoryInputs', 0, 0);
-        const prompt = add(kind, 700, 0);
-        const set = (name, value) => { const widget = prompt.widgets.find(item => item.name === name); widget.value = value; if (widget.inputEl) widget.inputEl.value = value; };
-        set('text', positive.typed);
-        if (negative) set('negative_text', negative.typed);
-        const drive = (name, side, y) => {
-            if (!side.via) return;
-            if (side.via === 'legacy') {
-                // The frontend's own Primitive: a virtual node whose value is applied when the workflow is queued.
-                const primitive = add('PrimitiveNode', 0, y);
-                connect(primitive, 0, prompt, name);
-                primitive.widgets[0].value = side.text;
-                return;
-            }
-            const text = add('PrimitiveString', 0, y);
-            text.widgets.find(widget => widget.name === 'value').value = side.text;
-            let source = text;
-            if (side.via === 'preview') { source = add('PreviewAny', 350, y); connect(text, 0, source, 'source'); }
-            connect(source, 0, prompt, name);
-        };
-        drive('text', positive, 300);
-        if (negative) drive('negative_text', negative, 500);
-        if (kind !== 'PromptManagerText') connect(inputs, 0, prompt, 'clip');
-        const sampler = add('KSampler', 1400, 0);
-        connect(inputs, 1, sampler, 'model');
-        connect(inputs, 2, sampler, 'latent_image');
-        if (kind === 'PromptManagerText') {
-            const encode = add('CLIPTextEncode', 1100, 0);
-            encode.convertWidgetToInput?.(encode.widgets.find(widget => widget.name === 'text'));
-            connect(inputs, 0, encode, 'clip');
-            connect(prompt, 0, encode, 'text');
-            connect(encode, 0, sampler, 'positive');
-        } else connect(prompt, 0, sampler, 'positive');
-        if (kind === 'PromptManagerPair') connect(prompt, 1, sampler, 'negative');
-        else {
-            const empty = add('CLIPTextEncode', 1100, 300);
-            connect(inputs, 0, empty, 'clip');
-            connect(empty, 0, sampler, 'negative');
-        }
-        const images = add('PMHistoryImages', 1800, 0);
-        images.widgets.find(widget => widget.name === 'value').value = 99;
-        connect(sampler, 0, images, 'latent');
-        const save = add('SaveImage', 2100, 0);
-        save.widgets.find(widget => widget.name === 'filename_prefix').value = prefix;
-        connect(images, 0, save, 'images');
-        // The Classic nodes install their own text serializer shortly after creation; queue after it, as a user does.
-        await prompt._pmTextSerializerReady;
-        const { output, workflow } = await app.graphToPrompt();
-        return { output, workflow, promptNode: String(prompt.id) };
-    }, { kind, positive, negative, prefix });
-}
-
-async function run(execution, page, testCase) {
-    const prefix = `textlink/${randomUUID()}`;
-    const { output, workflow, promptNode } = await build(page, { ...testCase, prefix });
-    const id = randomUUID();
-    const response = await execution.request.post('/prompt', { data: { prompt: output, prompt_id: id, extra_data: { extra_pnginfo: { workflow } } } });
-    expect(response.ok(), await response.text()).toBe(true);
-    let item;
-    await expect.poll(async () => {
-        item = (await (await execution.request.get(`/history/${id}`)).json())[id];
-        return item?.status?.status_str ?? null;
-    }, { timeout: 20000 }).toBe('success');
-    let result;
-    await expect.poll(async () => {
-        result = await readExecutionRuns(execution.databasePath, id);
-        const run = result.rows[0];
-        return run ? result.captures[run.run_id].state : null;
-    }, { timeout: 10000, message: 'the run and its prompt context reach SQLite' }).toBe('complete');
-    const run = result.rows[0];
-    const files = Object.values(item.outputs).flatMap(value => value.images || []).map(image => image.filename);
-    return { output, promptNode, context: result.captures[run.run_id].contexts[0], usage: result.usage[run.run_id], files };
-}
-
-async function scan(execution) {
-    const response = await execution.request.post('/prompt_manager/scan', { timeout: 60000 });
-    expect(response.ok()).toBe(true);
-    const events = (await response.text()).split('\n').filter(line => line.startsWith('data: ')).map(line => JSON.parse(line.slice(6)));
-    expect(events.at(-1)?.type, JSON.stringify(events.at(-1))).toBe('complete');
-}
-
-// filename -> linked prompt id (null when the image is not linked), read-only from the owned host's library.
-const LINKS = `import json, sqlite3, sys, pathlib
-db = sqlite3.connect(pathlib.Path(sys.argv[1]).resolve().as_uri() + "?mode=ro", uri=True)
-links = {name: None for name in sys.argv[2:]}
-for name, prompt in db.execute("SELECT filename, prompt_id FROM generated_images WHERE filename IN (%s)" % ",".join("?" * (len(sys.argv) - 2)), sys.argv[2:]):
-    links[name] = prompt
-print(json.dumps(links))`;
-async function linkedPrompts(execution, files) {
-    const { stdout } = await promisify(execFile)(process.env.PM_TEST_PYTHON || 'python', ['-c', LINKS, execution.databasePath, ...files], { timeout: 5000 });
-    return JSON.parse(stdout);
-}
-
-// Text a link resolves from the queued graph (a primitive) links its images through their embedded metadata.
-// Text only known at run time (PreviewAny) cannot be read from the image: its attribution from the recorded run is
-// #342's. Here it must never be linked to another prompt.
-async function expectImagesLinked(execution, evidence, viaRuntime) {
-    await scan(execution);
-    const links = await linkedPrompts(execution, evidence.files);
-    expect(evidence.files.length).toBeGreaterThan(0);
-    for (const [file, prompt] of Object.entries(links)) {
-        if (viaRuntime) expect([null, evidence.context.positive_prompt_id], file).toContain(prompt);
-        else expect(prompt, file).toBe(evidence.context.positive_prompt_id);
-    }
-}
-
-const unique = label => `${label} ${randomUUID()}`;
-
-const sources = { primitive: 'PrimitiveString', legacy: 'a legacy Primitive', preview: 'PreviewAny' };
-for (const kind of ['PromptManager', 'PromptManagerText', 'PromptManagerFocused', 'PromptManagerSplit']) {
-    for (const via of Object.keys(sources)) {
-        test(`${kind} saves, counts, records and links images to text linked from ${sources[via]}`, async ({ execution, page }) => {
-            test.setTimeout(90000);
-            const text = unique(`Linked ${kind} ${via}`);
-            const evidence = await run(execution, page, { kind, positive: { typed: 'Typed under the link', text, via } });
-            const source = evidence.output[evidence.promptNode].inputs.text;
-            // A real node is queued as a link; the virtual Primitive as its own value, never the hidden typed text.
-            if (via === 'legacy') expect(source).toBe(text);
-            else expect(Array.isArray(source), 'the frontend queued the link, not the typed text').toBe(true);
-            expect(evidence.context.positive.raw).toBe(text);
-            expect(evidence.context.positive.effective).toBe(text);
-            expect(evidence.usage).toEqual([{ role: 'positive', run_count: 1 }]);
-            const saved = await (await execution.request.get(`/prompt_manager/library/${evidence.context.positive_prompt_id}`)).json();
-            expect(saved.positive.text).toBe(text);
-            await expectImagesLinked(execution, evidence, via === 'preview');
-        });
-    }
-}
-
-// A legacy Primitive's wildcard is drawn once when the workflow is queued: the run saves and counts what was queued.
-for (const kind of ['PromptManager', 'PromptManagerFocused']) {
-    test(`${kind} saves and counts the text a wildcard legacy Primitive queued (#343 re-review R1)`, async ({ execution, page }) => {
-        test.setTimeout(90000);
-        const stem = unique(`Wildcard ${kind}`);
-        const evidence = await run(execution, page, { kind, positive: { typed: 'Typed under the link', text: `${stem} {alpha|beta}`, via: 'legacy' } });
-        const queuedText = evidence.output[evidence.promptNode].inputs.text;
-        // The Classic node keeps its widget binding: the host applies the Primitive, and its own text serializer
-        // queues the text as written, as on main. The Focused editor queues one choice.
-        if (kind === 'PromptManager') expect(queuedText).toBe(`${stem} {alpha|beta}`);
-        else expect([`${stem} alpha`, `${stem} beta`]).toContain(queuedText);
-        expect(evidence.context.positive.raw).toBe(queuedText);
-        expect(evidence.usage).toEqual([{ role: 'positive', run_count: 1 }]);
-        const saved = await (await execution.request.get(`/prompt_manager/library/${evidence.context.positive_prompt_id}`)).json();
-        expect(saved.positive.text).toBe(queuedText);
-    });
-}
-
-for (const [label, linked, negativeVia] of [['positive', ['text'], 'primitive'], ['negative', ['negative_text'], 'primitive'],
-    ['both', ['text', 'negative_text'], 'primitive'], ['neither', [], 'primitive'], ['negative from a legacy Primitive', ['negative_text'], 'legacy']]) {
-    test(`PromptManagerPair with ${label} linked saves, counts and records the pair and links its images`, async ({ execution, page }) => {
-        test.setTimeout(90000);
-        const sides = {
-            text: { typed: unique('Typed positive'), text: unique('Linked positive'), via: linked.includes('text') ? 'preview' : null },
-            negative_text: { typed: unique('Typed negative'), text: unique('Linked negative'), via: linked.includes('negative_text') ? negativeVia : null },
-        };
-        const evidence = await run(execution, page, { kind: 'PromptManagerPair', positive: sides.text, negative: sides.negative_text });
-        const expected = name => sides[name].via ? sides[name].text : sides[name].typed;
-        for (const name of ['text', 'negative_text']) {
-            const queuedValue = evidence.output[evidence.promptNode].inputs[name];
-            if (sides[name].via === 'legacy') expect(queuedValue, name).toBe(sides[name].text);
-            else expect(Array.isArray(queuedValue), name).toBe(linked.includes(name));
-        }
-        expect(evidence.context.positive.raw).toBe(expected('text'));
-        expect(evidence.context.negative.raw).toBe(expected('negative_text'));
-        expect(evidence.usage).toEqual([{ role: 'positive', run_count: 1 }, { role: 'negative', run_count: 0 }, { role: 'pair', run_count: 1 }]);
-        const pair = await (await execution.request.get(`/prompt_manager/pairs/${evidence.context.pair_id}`)).json();
-        expect(pair.pair).toMatchObject({ positive_text: expected('text'), negative_text: expected('negative_text') });
-        await expectImagesLinked(execution, evidence, sides.text.via === 'preview');
-    });
-}

tests/comfyui/fixtures/ledger_nodes.py

@@ -1,6 +1,5 @@
 """Deterministic nodes and queue controls installed only in an owned test host."""
 
-import os
 import threading
 import time
 
@@ -256,50 +255,3 @@ async def cache_mode(request: web.Request) -> web.Response:
         raise web.HTTPBadRequest()
     _CACHE_MODE = mode
     return web.json_response({"configured": True})
-
-
-def _plugin_module(suffix: str):
-    """A loaded PromptManager module (ComfyUI names the package by its path)."""
-    import sys
-
-    for name, module in list(sys.modules.items()):
-        if name.endswith("promptmanager." + suffix):
-            return module
-    raise web.HTTPServiceUnavailable(text=f"PromptManager {suffix} not loaded")
-
-
-@PromptServer.instance.routes.post("/pm_execution_fixture/monitor")
-async def image_monitor(request: web.Request) -> web.Response:
-    """Start or stop PromptManager's image monitor on the host output folder.
-
-    The managed host's config disables monitoring; only the attribution cases
-    (#342) turn it on, and they turn it off again.
-    """
-    enabled = (await request.json())["enabled"]
-    if type(enabled) is not bool:
-        raise web.HTTPBadRequest()
-    import folder_paths
-
-    monitor_module = _plugin_module("utils.image_monitor")
-    config = _plugin_module("py.config").GalleryConfig
-    monitor = monitor_module._monitor_instance
-    if monitor is None:
-        database = _plugin_module("database.operations").PromptDatabase()
-        tracker = _plugin_module("utils.prompt_tracker").get_prompt_tracker(database)
-        monitor = monitor_module.get_image_monitor(database, tracker)
-    if enabled:
-        config.MONITORING_ENABLED = True
-        monitor.start_monitoring([folder_paths.get_output_directory()])
-    else:
-        monitor.stop_monitoring()
-        config.MONITORING_ENABLED = False
-    return web.json_response({"monitoring": monitor.is_monitoring})
-
-
-@PromptServer.instance.routes.get("/pm_execution_fixture/monitor")
-async def image_monitor_state(request: web.Request) -> web.Response:
-    """File names of keyless images waiting for their run's recorded outputs."""
-    monitor = _plugin_module("utils.image_monitor")._monitor_instance
-    handler = getattr(monitor, "handler", None)
-    waiting = handler.awaiting_history() if handler is not None else []
-    return web.json_response({"awaiting": [os.path.basename(p) for p in waiting]})

tests/comfyui/fixtures/workflow-before-343-primitive.json

@@ -1,379 +0,0 @@
-{
- "id": "37b6baef-94f5-49d2-9b42-1ffc70e7da92",
- "revision": 0,
- "last_node_id": 4,
- "last_link_id": 2,
- "nodes": [
-  {
-   "id": 1,
-   "type": "PromptManagerFocused",
-   "pos": [
-    600,
-    0
-   ],
-   "size": [
-    550,
-    650
-   ],
-   "flags": {},
-   "order": 2,
-   "mode": 0,
-   "inputs": [
-    {
-     "localized_name": "clip",
-     "name": "clip",
-     "type": "CLIP",
-     "link": null
-    },
-    {
-     "localized_name": "prepend_text",
-     "name": "prepend_text",
-     "shape": 7,
-     "type": "STRING",
-     "link": null
-    },
-    {
-     "localized_name": "append_text",
-     "name": "append_text",
-     "shape": 7,
-     "type": "STRING",
-     "link": null
-    },
-    {
-     "localized_name": "text",
-     "name": "text",
-     "type": "STRING",
-     "widget": {
-      "name": "text"
-     },
-     "link": 1
-    },
-    {
-     "localized_name": "category",
-     "name": "category",
-     "shape": 7,
-     "type": "STRING",
-     "widget": {
-      "name": "category"
-     },
-     "link": null
-    },
-    {
-     "localized_name": "tags",
-     "name": "tags",
-     "shape": 7,
-     "type": "STRING",
-     "widget": {
-      "name": "tags"
-     },
-     "link": null
-    },
-    {
-     "localized_name": "search_text",
-     "name": "search_text",
-     "shape": 7,
-     "type": "STRING",
-     "widget": {
-      "name": "search_text"
-     },
-     "link": null
-    }
-   ],
-   "outputs": [
-    {
-     "localized_name": "CONDITIONING",
-     "name": "CONDITIONING",
-     "type": "CONDITIONING",
-     "links": null
-    },
-    {
-     "localized_name": "STRING",
-     "name": "STRING",
-     "type": "STRING",
-     "links": null
-    }
-   ],
-   "title": "Focused fed by a Primitive",
-   "properties": {
-    "Node name for S&R": "PromptManagerFocused",
-    "focusedUI": {
-     "libraryOpen": false,
-     "libraryFilters": {
-      "category": "",
-      "tags": ""
-     },
-     "composition": false,
-     "metadata": false,
-     "preview": false
-    }
-   },
-   "widgets_values": [
-    "Primitive focused text",
-    "",
-    "",
-    "",
-    "",
-    "",
-    ""
-   ],
-   "widgets_values_named": {
-    "text": "Primitive focused text",
-    "category": "",
-    "tags": "",
-    "search_text": "",
-    "prepend_text": "",
-    "append_text": "",
-    "prompt_manager_focused_ui": ""
-   }
-  },
-  {
-   "id": 2,
-   "type": "PromptManagerPair",
-   "pos": [
-    600,
-    1200
-   ],
-   "size": [
-    1100,
-    700
-   ],
-   "flags": {},
-   "order": 3,
-   "mode": 0,
-   "inputs": [
-    {
-     "localized_name": "clip",
-     "name": "clip",
-     "type": "CLIP",
-     "link": null
-    },
-    {
-     "localized_name": "prepend_text",
-     "name": "prepend_text",
-     "shape": 7,
-     "type": "STRING",
-     "link": null
-    },
-    {
-     "localized_name": "append_text",
-     "name": "append_text",
-     "shape": 7,
-     "type": "STRING",
-     "link": null
-    },
-    {
-     "localized_name": "text",
-     "name": "text",
-     "type": "STRING",
-     "widget": {
-      "name": "text"
-     },
-     "link": null
-    },
-    {
-     "localized_name": "negative_text",
-     "name": "negative_text",
-     "type": "STRING",
-     "widget": {
-      "name": "negative_text"
-     },
-     "link": 2
-    },
-    {
-     "localized_name": "category",
-     "name": "category",
-     "shape": 7,
-     "type": "STRING",
-     "widget": {
-      "name": "category"
-     },
-     "link": null
-    },
-    {
-     "localized_name": "tags",
-     "name": "tags",
-     "shape": 7,
-     "type": "STRING",
-     "widget": {
-      "name": "tags"
-     },
-     "link": null
-    },
-    {
-     "localized_name": "search_text",
-     "name": "search_text",
-     "shape": 7,
-     "type": "STRING",
-     "widget": {
-      "name": "search_text"
-     },
-     "link": null
-    }
-   ],
-   "outputs": [
-    {
-     "localized_name": "positive",
-     "name": "positive",
-     "type": "CONDITIONING",
-     "links": null
-    },
-    {
-     "localized_name": "negative",
-     "name": "negative",
-     "type": "CONDITIONING",
-     "links": null
-    },
-    {
-     "localized_name": "positive_text",
-     "name": "positive_text",
-     "type": "STRING",
-     "links": null
-    },
-    {
-     "localized_name": "negative_text",
-     "name": "negative_text",
-     "type": "STRING",
-     "links": null
-    }
-   ],
-   "title": "Pair negative fed by a Primitive",
-   "properties": {
-    "Node name for S&R": "PromptManagerPair",
-    "pairUI": {
-     "libraryOpen": true,
-     "libraryFilters": {
-      "category": "",
-      "tags": ""
-     },
-     "composition": false,
-     "metadata": false,
-     "preview": false
-    }
-   },
-   "widgets_values": [
-    "Typed pair positive",
-    "Primitive pair negative",
-    "",
-    "",
-    "",
-    "",
-    "",
-    ""
-   ],
-   "widgets_values_named": {
-    "text": "Typed pair positive",
-    "negative_text": "Primitive pair negative",
-    "category": "",
-    "tags": "",
-    "search_text": "",
-    "prepend_text": "",
-    "append_text": "",
-    "prompt_manager_focused_ui": ""
-   }
-  },
-  {
-   "id": 3,
-   "type": "PrimitiveNode",
-   "pos": [
-    0,
-    0
-   ],
-   "size": [
-    210,
-    88
-   ],
-   "flags": {},
-   "order": 0,
-   "mode": 0,
-   "inputs": [],
-   "outputs": [
-    {
-     "name": "STRING",
-     "type": "STRING",
-     "widget": {
-      "name": "text"
-     },
-     "links": [
-      1
-     ]
-    }
-   ],
-   "properties": {
-    "Run widget replace on values": false
-   },
-   "widgets_values": [
-    "Primitive focused text"
-   ],
-   "widgets_values_named": {
-    "text": "Primitive focused text"
-   }
-  },
-  {
-   "id": 4,
-   "type": "PrimitiveNode",
-   "pos": [
-    0,
-    1200
-   ],
-   "size": [
-    210,
-    88
-   ],
-   "flags": {},
-   "order": 1,
-   "mode": 0,
-   "inputs": [],
-   "outputs": [
-    {
-     "name": "STRING",
-     "type": "STRING",
-     "widget": {
-      "name": "negative_text"
-     },
-     "links": [
-      2
-     ]
-    }
-   ],
-   "properties": {
-    "Run widget replace on values": false
-   },
-   "widgets_values": [
-    "Primitive pair negative"
-   ],
-   "widgets_values_named": {
-    "negative_text": "Primitive pair negative"
-   }
-  }
- ],
- "links": [
-  [
-   1,
-   3,
-   0,
-   1,
-   3,
-   "STRING"
-  ],
-  [
-   2,
-   4,
-   0,
-   2,
-   4,
-   "STRING"
-  ]
- ],
- "groups": [],
- "config": {},
- "extra": {
-  "ds": {
-   "scale": 0.9,
-   "offset": [
-    416,
-    110
-   ]
-  }
- },
- "version": 0.4
-}

tests/comfyui/image-attribution.spec.mjs

@@ -1,142 +0,0 @@
-// #342 on the real pinned host: the image monitor links an output only to a prompt
-// that provably produced it. An unknown node (PMHistoryCached) stands in for the
-// maintainer's LLM; KSampler is the fixture's deterministic stand-in.
-import { randomUUID } from 'node:crypto';
-import { execFile } from 'node:child_process';
-import { promisify } from 'node:util';
-import { fileURLToPath } from 'node:url';
-import { expect } from '../../tools/vendor/node_modules/@playwright/test/index.mjs';
-import { test } from './execution-fixture.mjs';
-
-const run = promisify(execFile);
-const reader = fileURLToPath(new URL('./read_execution_history.py', import.meta.url));
-
-async function readLinks(databasePath, filenames, texts = []) {
-    const { stdout } = await run(process.env.PM_TEST_PYTHON || 'python',
-        [reader, databasePath, '--links', ...filenames, '--texts', ...texts], { timeout: 5000, maxBuffer: 1024 * 1024 });
-    return JSON.parse(stdout);
-}
-
-// kind: the positive node; text: a typed editor or 'llm' (linked from the unknown
-// node); prepend: 'llm' links the unknown node into prepend_text.
-function graph({ kind = 'PromptManagerPair', text = '', prepend = '', llm = '', seed = 1, prefix }) {
-    const linked = value => value === 'llm' ? ['11', 0] : value;
-    const nodes = {
-        '10': { class_type: 'PMHistoryInputs', inputs: {} },
-        '20': { class_type: kind, inputs: { text: linked(text), clip: ['10', 0], append_text: '',
-            ...(prepend ? { prepend_text: linked(prepend) } : {}),
-            ...(kind === 'PromptManagerPair' ? { negative_text: '' } : {}) } },
-        '30': { class_type: 'CLIPTextEncode', inputs: { text: '', clip: ['10', 0] } },
-        '40': { class_type: 'KSampler', inputs: { model: ['10', 1], latent_image: ['10', 2],
-            positive: ['20', 0], negative: kind === 'PromptManagerPair' ? ['20', 1] : ['30', 0],
-            seed, steps: 1, cfg: 1, sampler_name: 'euler', scheduler: 'normal', denoise: 1 } },
-        '60': { class_type: 'PMHistoryImages', inputs: { value: 64, batch: 1, latent: ['40', 0] } },
-        '70': { class_type: 'SaveImage', inputs: { images: ['60', 0], filename_prefix: prefix } },
-    };
-    if (llm) nodes['11'] = { class_type: 'PMHistoryCached', inputs: { value: llm } };
-    return nodes;
-}
-
-async function saved(request, prompt, history = {}) {
-    const id = randomUUID();
-    const response = await request.post('/prompt', { data: { prompt, prompt_id: id } });
-    expect(response.ok()).toBe(true);
-    let item;
-    await expect.poll(async () => {
-        item = (await (await request.get(`/history/${id}`)).json())[id];
-        return item?.status?.messages?.some(([kind]) => kind === 'execution_success') || false;
-    }, { timeout: 15000 }).toBe(true);
-    const [image] = item.outputs['70'].images;
-    expect(image.type).toBe('output');
-    history.item = item;
-    return image.filename;
-}
-
-async function linkedTo(execution, filename, expected) {
-    await expect.poll(async () => (await readLinks(execution.databasePath, [filename])).links[filename],
-        { timeout: 20000, message: `${filename} is linked by the image monitor` }).toBe(expected);
-}
-
-async function monitoring(execution, enabled) {
-    const response = await execution.request.post('/pm_execution_fixture/monitor', { data: { enabled } });
-    expect(response.ok()).toBe(true);
-    expect((await response.json()).monitoring).toBe(enabled);
-}
-
-async function cacheMode(execution, mode) {
-    expect((await execution.request.post('/pm_execution_fixture/cache', { data: { mode } })).ok()).toBe(true);
-}
-
-test.beforeEach(async ({ execution }) => {
-    expect((await execution.request.post('/pm_execution_fixture/metadata', { data: { disabled: false } })).ok()).toBe(true);
-    await cacheMode(execution, 'CLASSIC');  // keeps the re-run's PromptManager node cached
-    await monitoring(execution, true);
-});
-test.afterEach(async ({ execution }) => {
-    await monitoring(execution, false);
-    await cacheMode(execution, 'RAM_PRESSURE');
-});
-
-test('an output whose positive is only linked prepend text stays unlinked, never given an earlier prompt', async ({ execution }, testInfo) => {
-    const tag = `${testInfo.project.name} ${randomUUID()}`;
-    const earlier = `a woman holding a coffee cup ${tag}`;
-    const prepended = `llm prepend landscape ${tag}`, llmText = `llm text landscape ${tag}`;
-
-    // A typed prompt runs first: before #342 the next unidentifiable image took it.
-    const first = await saved(execution.request, graph({ text: earlier, prefix: 'misslink/earlier' }));
-    await linkedTo(execution, first, earlier);
-
-    // The maintainer's workflow: empty editor, the generated text arrives in prepend.
-    const orphan = await saved(execution.request,
-        graph({ prepend: 'llm', llm: prepended, prefix: 'misslink/prepend' }));
-
-    // An LLM feeding the editor itself is stored and links through its run key; the
-    // monitor works in creation order, so the prepend image was processed first.
-    const llmGraph = graph({ kind: 'PromptManager', text: 'llm', llm: llmText, prefix: 'misslink/text' });
-    const proven = await saved(execution.request, llmGraph);
-    await linkedTo(execution, proven, llmText);
-    const state = await readLinks(execution.databasePath, [orphan], [prepended]);
-    expect(state).toEqual({ links: { [orphan]: null }, stored: { [prepended]: false } });
-
-    // Only the sampler seed changes: the PromptManager node is served from the cache
-    // without running (the host says so), so no queue entry exists for this run and
-    // only the snapshot's run match can link it.
-    const rerunHistory = {};
-    const rerun = await saved(execution.request, { ...llmGraph, '40': { ...llmGraph['40'],
-        inputs: { ...llmGraph['40'].inputs, seed: 2 } } }, rerunHistory);
-    const cached = rerunHistory.item.status.messages.find(([kind]) => kind === 'execution_cached');
-    expect(cached?.[1].nodes).toEqual(expect.arrayContaining(['11', '20']));
-    await linkedTo(execution, rerun, llmText);
-});
-
-test('an output saved without metadata links once its recorded run names a stored prompt', async ({ execution }, testInfo) => {
-    const llmText = `bare output landscape ${testInfo.project.name} ${randomUUID()}`;
-    const request = execution.request;
-    expect((await request.post('/pm_execution_fixture/metadata', { data: { disabled: true } })).ok()).toBe(true);
-    try {
-        // No embedded graph: no run key can prove the tracker entry, so only the
-        // run's recorded history can, and only once the run's outputs are sealed.
-        // The gate after SaveImage holds the run open while the monitor looks.
-        const prompt = graph({ kind: 'PromptManager', text: 'llm', llm: llmText, prefix: 'misslink/bare' });
-        prompt['80'] = { class_type: 'PMHistoryImageOutput', inputs: { images: ['70', 0], mode: 'gate' } };
-        expect((await request.post('/pm_execution_fixture/gate/hold')).ok()).toBe(true);
-        const id = randomUUID();
-        try {
-            expect((await request.post('/prompt', { data: { prompt, prompt_id: id } })).ok()).toBe(true);
-            let waiting = [];
-            await expect.poll(async () => {
-                waiting = (await (await request.get('/pm_execution_fixture/monitor')).json()).awaiting;
-                return waiting.filter(name => name.startsWith('bare_')).length;
-            }, { timeout: 20000, message: 'the monitor processed the bare output while its run was open' }).toBe(1);
-            const [bare] = waiting.filter(name => name.startsWith('bare_'));
-            expect((await readLinks(execution.databasePath, [bare])).links[bare]).toBeNull();
-            expect((await request.post('/pm_execution_fixture/gate/release')).ok()).toBe(true);
-            await linkedTo(execution, bare, llmText);
-            expect((await (await request.get('/pm_execution_fixture/monitor')).json()).awaiting).not.toContain(bare);
-        } finally {
-            expect((await request.post('/pm_execution_fixture/gate/release')).ok()).toBe(true);
-        }
-    } finally {
-        expect((await request.post('/pm_execution_fixture/metadata', { data: { disabled: false } })).ok()).toBe(true);
-    }
-});

tests/comfyui/prompt-bridge.spec.mjs

@@ -190,21 +190,3 @@ test('bridge remains live through both renderer switches and workflow reload wit
         await expect(page.locator('.pm-focused').getByRole('textbox',{name:'Main prompt',exact:true})).toHaveValue('After reload');
     });
 });
-
-test('each destination reports its window renderer, and System › Integrations shows it (S10)',async({page,context},testInfo)=>{
-    const initial=testInfo.project.metadata.initialRenderer;
-    const id=await addNode(page,'PromptManager',{text:'Renderer check'});
-    await withClient(page,context,async clientPage=>{
-        const name=renderer=>renderer?'Nodes 2.0':'Classic';
-        const status=clientPage.locator('#workspace-main #renderer-status');
-        expect((await destination(clientPage,id)).target.renderer).toBe(initial?'nodes2':'classic');
-        await clientPage.evaluate(()=>{location.hash='#/system/integrations';});
-        await expect(status).toHaveText(`Detected: ${name(initial)} (1 ComfyUI window).`);
-        // Switching the renderer in ComfyUI is what the next check reports; nothing is sent or queued.
-        await page.evaluate(async renderer=>{const {app}=await import('/scripts/app.js');await app.ui.settings.setSettingValue('Comfy.VueNodes.Enabled',renderer);await app.loadGraphData(app.graph.serialize());},!initial);
-        await expect.poll(()=>page.evaluate(()=>LiteGraph.vueNodesMode)).toBe(!initial);
-        expect((await destination(clientPage,id)).target.renderer).toBe(initial?'classic':'nodes2');
-        await clientPage.reload();
-        await expect(status).toHaveText(`Detected: ${name(!initial)} (1 ComfyUI window).`);
-    });
-});

tests/comfyui/read_execution_history.py

@@ -1,7 +1,6 @@
 """Bounded read-only SQLite inspection for the owned execution fixture."""
 
 import argparse
-from contextlib import closing
 import json
 from pathlib import Path
 import sqlite3
@@ -90,48 +89,14 @@ def read_runs(database: str, job_id: str, session_id: str | None = None) -> dict
         }
 
 
-def read_links(database: str, filenames: list, texts: list) -> dict:
-    """Each output file's linked prompt text (None: unlinked), and which texts
-    are stored as prompts (#342)."""
-    uri = Path(database).resolve().as_uri() + "?mode=ro"
-    with closing(sqlite3.connect(uri, uri=True, timeout=0.25)) as connection:
-        connection.execute("PRAGMA query_only=ON")
-        links = {}
-        for name in filenames[:64]:
-            rows = connection.execute(
-                "SELECT p.text FROM generated_images g JOIN prompts p "
-                "ON p.id = g.prompt_id WHERE g.filename = ? LIMIT 2",
-                (name,),
-            ).fetchall()
-            values = [row[0] for row in rows]
-            links[name] = values[0] if len(values) == 1 else None
-            if len(values) > 1:
-                links[name] = "<several links>"
-        stored = {
-            text: connection.execute(
-                "SELECT 1 FROM prompts WHERE text = ? LIMIT 1", (text,)
-            ).fetchone()
-            is not None
-            for text in texts[:64]
-        }
-    return {"links": links, "stored": stored}
-
-
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(description=__doc__)
     parser.add_argument("database")
-    parser.add_argument("job_id", nargs="?")
+    parser.add_argument("job_id")
     parser.add_argument("--session-id")
-    parser.add_argument("--links", nargs="*", default=None)
-    parser.add_argument("--texts", nargs="*", default=[])
     arguments = parser.parse_args()
-    if arguments.links is not None:
-        print(
-            json.dumps(read_links(arguments.database, arguments.links, arguments.texts))
-        )
-    else:
-        print(
-            json.dumps(
-                read_runs(arguments.database, arguments.job_id, arguments.session_id)
-            )
+    print(
+        json.dumps(
+            read_runs(arguments.database, arguments.job_id, arguments.session_id)
         )
+    )

tests/comfyui/text-link.spec.mjs

@@ -1,404 +0,0 @@
-// #343: on the pinned real host, a STRING link dragged with the mouse drives each PromptManager node's text (and the
-// Pair's negative) in Classic and Nodes 2.0, across renderer switches, a workflow reload, disconnect and removal.
-import { readFile } from 'node:fs/promises';
-import { test, expect } from '../../tools/vendor/node_modules/@playwright/test/index.mjs';
-import { installHostHooks } from './host-fixture.mjs';
-
-installHostHooks(test, ['PromptManager', 'PromptManagerText', 'PromptManagerFocused', 'PromptManagerSplit', 'PromptManagerPair']);
-
-const editors = { PromptManagerFocused: 'Main prompt', PromptManagerSplit: 'Main prompt', PromptManagerPair: 'Positive prompt' };
-const note = label => `${label} comes from a link. Your typed text is kept for when you disconnect it.`;
-
-/** Viewport position of a node's slot: the slot dot in Nodes 2.0, the canvas slot position in Classic. */
-function slotPosition(page, nodeId, kind, name) {
-    return page.evaluate(async ({ nodeId, kind, name }) => {
-        const { app } = await import('/scripts/app.js');
-        const node = app.graph.getNodeById(nodeId);
-        const slots = kind === 'out' ? node.outputs : node.inputs;
-        const index = typeof name === 'number' ? name : slots.findIndex(slot => slot.name === name);
-        if (LiteGraph.vueNodesMode) {
-            const dot = document.querySelector(`[data-slot-key="${nodeId}-${kind}-${index}"]`);
-            if (!dot) return null;
-            const box = dot.getBoundingClientRect();
-            return [box.x + box.width / 2, box.y + box.height / 2];
-        }
-        const position = app.canvas.ds.convertOffsetToCanvas(kind === 'out' ? node.getOutputPos(index) : node.getInputPos(index));
-        const box = app.canvas.canvas.getBoundingClientRect();
-        return [box.x + position[0], box.y + position[1]];
-    }, { nodeId, kind, name });
-}
-
-async function drag(page, from, to) {
-    await page.mouse.move(...from);
-    await page.mouse.down();
-    await page.mouse.move((from[0] + to[0]) / 2, (from[1] + to[1]) / 2, { steps: 5 });
-    await page.mouse.move(...to, { steps: 10 });
-    await page.mouse.up();
-}
-
-const center = box => [box.x + box.width / 2, box.y + box.height / 2];
-const linkedInputs = (page, id) => page.evaluate(async id => {
-    const { app } = await import('/scripts/app.js');
-    return app.graph.getNodeById(id).inputs.filter(input => input.link != null).map(input => input.name);
-}, id);
-const queued = (page, id) => page.evaluate(async id => (await (await import('/scripts/app.js')).app.graphToPrompt()).output[String(id)].inputs, id);
-
-async function setup(page, type) {
-    return page.evaluate(async type => {
-        const { app } = await import('/scripts/app.js');
-        const node = LiteGraph.createNode(type);
-        app.graph.add(node);
-        node.pos = [500, 80];
-        node.setSize([type === 'PromptManagerPair' ? 1100 : 650, 760]);
-        const sources = ['text', 'negative_text'].map((name, index) => {
-            const source = LiteGraph.createNode('PrimitiveString');
-            app.graph.add(source);
-            source.pos = [40, 80 + index * 160];
-            source.widgets.find(widget => widget.name === 'value').value = `Linked ${name} ${type}`;
-            return source.id;
-        });
-        app.canvas.ds.scale = .8;
-        app.canvas.ds.offset = [40, 40];
-        app.canvas.setDirty(true, true);
-        return { id: node.id, sources };
-    }, type);
-}
-
-/** The prompt box a user drops the link on: the editor's textarea, or the core text box of the Classic nodes. */
-async function promptBox(page, type, id) {
-    if (editors[type]) return page.getByRole('textbox', { name: editors[type], exact: true });
-    // The Classic nodes keep the core text widget: Nodes 2.0 draws it as its own textarea, Classic as widget.inputEl.
-    if (await page.evaluate(() => LiteGraph.vueNodesMode)) return page.locator(`[data-node-id="${id}"] textarea`).first();
-    await page.evaluate(async id => {
-        const { app } = await import('/scripts/app.js');
-        app.graph.getNodeById(id).widgets.find(widget => widget.name === 'text').inputEl.dataset.pmTestPromptBox = String(id);
-    }, id);
-    return page.locator(`textarea[data-pm-test-prompt-box="${id}"]`);
-}
-
-/** What the node shows while its text is linked. */
-function linkedNote(page, type) {
-    return editors[type] ? page.getByText(note(editors[type]), { exact: true }) : page.locator('.pm-text-link-note').getByText(note('Text'), { exact: true });
-}
-
-for (const type of ['PromptManagerFocused', 'PromptManagerSplit', 'PromptManagerPair', 'PromptManager', 'PromptManagerText']) {
-    test(`${type}: a STRING link dropped on the prompt box drives text and the typed text returns on disconnect`, async ({ page }, testInfo) => {
-        test.setTimeout(90000);
-        const { id, sources } = await setup(page, type);
-        const typed = `Typed ${type} ${testInfo.project.name}`;
-        const box = await promptBox(page, type, id);
-        await box.fill(typed);
-        await expect(linkedNote(page, type)).toBeHidden();
-        await page.screenshot({ path: testInfo.outputPath(`${type}-unlinked.png`) });
-        // The drop lands on text, never on prepend_text (#342).
-        await drag(page, await slotPosition(page, sources[0], 'out', 0), center(await box.boundingBox()));
-        await expect.poll(() => linkedInputs(page, id)).toEqual(['text']);
-        const links = { text: [String(sources[0]), 0] };
-        if (type === 'PromptManagerPair') {
-            await page.getByRole('textbox', { name: 'Negative prompt', exact: true }).fill(`Typed negative ${testInfo.project.name}`);
-            await drag(page, await slotPosition(page, sources[1], 'out', 0), await slotPosition(page, id, 'in', 'negative_text'));
-            await expect.poll(() => linkedInputs(page, id)).toEqual(['text', 'negative_text']);
-            links.negative_text = [String(sources[1]), 0];
-            await expect(page.getByText(note('Negative prompt'), { exact: true })).toBeVisible();
-        }
-        await expect(linkedNote(page, type)).toBeVisible();
-        expect(await queued(page, id)).toMatchObject(links);
-        await page.screenshot({ path: testInfo.outputPath(`${type}-linked.png`) });
-        for (const renderer of [!testInfo.project.metadata.initialRenderer, testInfo.project.metadata.initialRenderer]) {
-            await page.evaluate(async renderer => {
-                const { app } = await import('/scripts/app.js');
-                await app.ui.settings.setSettingValue('Comfy.VueNodes.Enabled', renderer);
-            }, renderer);
-            await expect.poll(() => page.evaluate(() => LiteGraph.vueNodesMode)).toBe(renderer);
-            await expect(linkedNote(page, type)).toBeVisible();
-            expect(await queued(page, id)).toMatchObject(links);
-        }
-        const saved = await page.evaluate(async id => {
-            const { app } = await import('/scripts/app.js');
-            const workflow = app.graph.serialize();
-            await app.loadGraphData(workflow);
-            return workflow.nodes.find(node => String(node.id) === String(id)).widgets_values;
-        }, id);
-        expect(saved[0]).toBe(typed);
-        await expect(linkedNote(page, type)).toBeVisible();
-        expect(await queued(page, id)).toMatchObject(links);
-        const local = await page.evaluate(async id => {
-            const { app } = await import('/scripts/app.js');
-            const node = app.graph.getNodeById(id);
-            for (const input of [...node.inputs]) if (input.link != null) node.disconnectInput(node.inputs.indexOf(input));
-            return (await app.graphToPrompt()).output[String(id)].inputs;
-        }, id);
-        expect(local.text).toBe(typed);
-        if (type === 'PromptManagerPair') expect(local.negative_text).toBe(`Typed negative ${testInfo.project.name}`);
-        await expect(linkedNote(page, type)).toBeHidden();
-        const restored = await promptBox(page, type, id);
-        await expect(restored).toBeVisible();
-        await expect(restored).toHaveValue(typed);
-        await page.screenshot({ path: testInfo.outputPath(`${type}-disconnected.png`) });
-        await page.evaluate(async id => { const { app } = await import('/scripts/app.js'); app.graph.remove(app.graph.getNodeById(id)); }, id);
-        await expect(page.locator('.pm-focused, .pm-classic, .pm-text-link-note')).toHaveCount(0);
-    });
-}
-
-async function addEditors(page) {
-    return page.evaluate(async () => {
-        const { app } = await import('/scripts/app.js');
-        const add = (type, x, y) => { const node = LiteGraph.createNode(type); app.graph.add(node); node.pos = [x, y]; return node; };
-        const focused = add('PromptManagerFocused', 420, 40);
-        focused.setSize([560, 640]);
-        const pair = add('PromptManagerPair', 1020, 40);
-        pair.setSize([1000, 640]);
-        for (const [node, name, value] of [[focused, 'text', 'Typed focused'], [pair, 'text', 'Typed positive'], [pair, 'negative_text', 'Typed negative']]) {
-            const widget = node.widgets.find(item => item.name === name);
-            widget.value = value;
-            if (widget.inputEl) widget.inputEl.value = value;
-        }
-        const sources = [0, 1].map(index => add(index ? 'PrimitiveString' : 'PrimitiveNode', 20, 60 + index * 300).id);
-        app.canvas.ds.scale = .7;
-        // Clear of the floating graph menu (top left) and the PM run bar (top right).
-        app.canvas.ds.offset = [110, 150];
-        app.canvas.setDirty(true, true);
-        return { focused: focused.id, pair: pair.id, primitive: sources[0], string: sources[1] };
-    });
-}
-
-/** The prompt a Run sends to the server, through the real app.queuePrompt path. */
-async function runPrompt(page) {
-    let captured;
-    const sent = new Promise(resolve => { captured = resolve; });
-    // Installed before the run starts, so the POST can never reach the real host.
-    await page.route('**/prompt', async route => {
-        if (route.request().method() !== 'POST') return route.fallback();
-        captured(route.request().postDataJSON().prompt);
-        return route.fulfill({ json: { prompt_id: 'captured', number: 1, node_errors: {} } });
-    });
-    await page.evaluate(async () => { const { app } = await import('/scripts/app.js'); await app.queuePrompt(0, 1); });
-    const prompt = await sent;
-    await page.unroute('**/prompt');
-    return prompt;
-}
-
-const box = (page, name, nth = 0) => page.getByRole('textbox', { name, exact: true }).nth(nth);
-
-test('a legacy Primitive dropped on an editor box or socket drives the text it shows as linked (#343 review I1, M1)', async ({ page }) => {
-    test.setTimeout(90000);
-    const ids = await addEditors(page);
-    // A wildcard Primitive aimed at the Main prompt box, a PrimitiveString aimed at the Negative prompt box.
-    await drag(page, await slotPosition(page, ids.primitive, 'out', 0), center(await box(page, 'Main prompt').boundingBox()));
-    await expect.poll(() => linkedInputs(page, ids.focused)).toEqual(['text']);
-    await drag(page, await slotPosition(page, ids.string, 'out', 0), center(await box(page, 'Negative prompt').boundingBox()));
-    await expect.poll(() => linkedInputs(page, ids.pair)).toEqual(['negative_text']);
-    await expect(page.getByText(note('Main prompt'), { exact: true })).toBeVisible();
-    await expect(page.getByText(note('Negative prompt'), { exact: true })).toBeVisible();
-    await page.evaluate(async ({ primitive, string }) => {
-        const { app } = await import('/scripts/app.js');
-        app.graph.getNodeById(primitive).widgets[0].value = 'From the legacy Primitive';
-        app.graph.getNodeById(string).widgets.find(widget => widget.name === 'value').value = 'From PrimitiveString';
-    }, ids);
-    const prompt = await runPrompt(page);
-    expect(prompt[String(ids.focused)].inputs.text).toBe('From the legacy Primitive');
-    expect(prompt[String(ids.pair)].inputs).toMatchObject({ text: 'Typed positive', negative_text: [String(ids.string), 0] });
-    // The Primitive is re-read on every run; the typed text stays for disconnect.
-    await page.evaluate(async ({ primitive }) => { const { app } = await import('/scripts/app.js'); app.graph.getNodeById(primitive).widgets[0].value = 'Changed in the Primitive'; }, ids);
-    expect((await queued(page, ids.focused)).text).toBe('Changed in the Primitive');
-    await page.evaluate(async ({ focused }) => { const { app } = await import('/scripts/app.js'); const node = app.graph.getNodeById(focused); node.disconnectInput(node.inputs.findIndex(input => input.name === 'text')); }, ids);
-    expect((await queued(page, ids.focused)).text).toBe('Typed focused');
-});
-
-test('a wildcard legacy Primitive queues one resolved choice, drawn once per run, on every PromptManager node (#343 re-review R1)', async ({ page }) => {
-    const choices = `{${Array.from({ length: 10 }, (_, index) => `c${index}`).join('|')}}`;
-    const ids = await page.evaluate(async choices => {
-        const { app } = await import('/scripts/app.js');
-        const add = (type, x, y) => { const node = LiteGraph.createNode(type); app.graph.add(node); node.pos = [x, y]; return node; };
-        // [node, input, Primitive value, its "Run widget replace on values" option]
-        const targets = [['PromptManagerFocused', 'text', `Focused ${choices}`, false], ['PromptManagerSplit', 'text', `Split %date:yyyy% ${choices}`, true],
-            ['PromptManagerPair', 'negative_text', `Pair ${choices}`, false], ['PromptManager', 'text', `Classic ${choices}`, false],
-            ['PromptManagerText', 'text', `Text ${choices}`, false]];
-        const ids = {};
-        targets.forEach(([type, name, value, replace], index) => {
-            const node = add(type, 500, index * 800);
-            const primitive = add('PrimitiveNode', 20, index * 800);
-            if (!primitive.connect(0, node, node.inputs.findIndex(input => input.name === name))) throw new Error(`no Primitive link to ${type}.${name}`);
-            primitive.widgets[0].value = value;
-            primitive.properties['Run widget replace on values'] = replace;
-            ids[type] = [String(node.id), name];
-        });
-        // The Classic nodes install their own text serializer shortly after creation; run after it, as a user does.
-        await Promise.all(app.graph.nodes.map(node => node._pmTextSerializerReady));
-        // What another extension's graphToPrompt wrapper sees must be what the server gets.
-        const inner = app.graphToPrompt;
-        const seen = window.__pmSeen = [];
-        app.graphToPrompt = async function (...args) { const result = await inner.apply(this, args); seen.push(structuredClone(result.output)); return result; };
-        // Each draw takes the next choice, so a second draw for the same text always changes it.
-        const random = Math.random;
-        let draw = 0;
-        Math.random = () => ((draw++ % 10) + .5) / 10;
-        window.__pmRestore = () => { app.graphToPrompt = inner; Math.random = random; };
-        return ids;
-    }, choices);
-    const prompt = await runPrompt(page);
-    const seen = await page.evaluate(() => { window.__pmRestore(); return window.__pmSeen; });
-    expect(seen).toHaveLength(1);
-    const year = String(new Date().getFullYear());
-    const stems = { PromptManagerFocused: 'Focused', PromptManagerSplit: `Split ${year}`, PromptManagerPair: 'Pair', PromptManager: 'Classic', PromptManagerText: 'Text' };
-    // The Classic nodes keep their widget binding, so the host applies the Primitive and #343 leaves the value alone.
-    // As on main, their text widget's own serializer queues the text as written, wildcard included.
-    const classic = new Set(['PromptManager', 'PromptManagerText']);
-    for (const [type, [id, name]] of Object.entries(ids)) {
-        const value = prompt[id].inputs[name];
-        if (classic.has(type)) expect(value, type).toBe(`${stems[type]} ${choices}`);
-        else expect(value, type).toMatch(new RegExp(`^${stems[type]} c\\d$`));
-        expect(value, `${type}: one draw per run`).toBe(seen[0][id].inputs[name]);
-    }
-});
-
-test('a legacy Primitive inside a subgraph drives the inner editor text it shows as linked (#343 re-review R2)', async ({ page }) => {
-    const result = await page.evaluate(async () => {
-        const { app } = await import('/scripts/app.js');
-        const add = (type, x, y) => { const node = LiteGraph.createNode(type); app.graph.add(node); node.pos = [x, y]; return node; };
-        const focused = add('PromptManagerFocused', 500, 40);
-        focused.widgets.find(widget => widget.name === 'text').value = 'Typed under the link';
-        const primitive = add('PrimitiveNode', 20, 40);
-        if (!primitive.connect(0, focused, focused.inputs.findIndex(input => input.name === 'text'))) throw new Error('no Primitive link');
-        const { node } = app.graph.convertToSubgraph(new Set([focused, primitive]));
-        const inner = node.subgraph.nodes.find(item => item.type === 'PromptManagerFocused');
-        // The value the user gives the Primitive inside the subgraph.
-        node.subgraph.nodes.find(item => item.type === 'PrimitiveNode').widgets[0].value = 'Inner {only choice}';
-        return { host: String(node.id), inner: String(inner.id), linked: inner.inputs.find(input => input.name === 'text').link != null };
-    });
-    expect(result.linked).toBe(true);
-    const prompt = await runPrompt(page);
-    expect(prompt[`${result.host}:${result.inner}`]?.inputs.text).toBe('Inner only choice');
-});
-
-test('a workflow saved before #343 with legacy Primitives on editor text keeps running their values (#343 review I1)', async ({ page }) => {
-    const workflow = JSON.parse(await readFile(new URL('./fixtures/workflow-before-343-primitive.json', import.meta.url), 'utf8'));
-    const result = await page.evaluate(async workflow => {
-        const { app } = await import('/scripts/app.js');
-        await app.loadGraphData(structuredClone(workflow));
-        const before = (await app.graphToPrompt()).output;
-        app.graph.getNodeById(4).widgets[0].value = 'Edited after the load';
-        const after = (await app.graphToPrompt()).output;
-        const bound = id => app.graph.getNodeById(id).inputs.filter(input => ['text', 'negative_text'].includes(input.name) && input.widget).length;
-        return { before: [before['1'].inputs.text, before['2'].inputs.text, before['2'].inputs.negative_text], after: after['2'].inputs.negative_text, bound: [bound(1), bound(2)],
-            links: [app.graph.getNodeById(1).inputs.find(input => input.name === 'text').link != null, app.graph.getNodeById(2).inputs.find(input => input.name === 'negative_text').link != null] };
-    }, workflow);
-    expect(result).toEqual({ before: ['Primitive focused text', 'Typed pair positive', 'Primitive pair negative'], after: 'Edited after the load', bound: [0, 0], links: [true, true] });
-    const prompt = await runPrompt(page);
-    expect([prompt['1'].inputs.text, prompt['2'].inputs.negative_text]).toEqual(['Primitive focused text', 'Edited after the load']);
-});
-
-test('moving a linked text and dropping it on the editor body keeps it on text, never prepend_text (#343 review I2)', async ({ page }) => {
-    test.setTimeout(90000);
-    const ids = await addEditors(page);
-    await page.evaluate(async ({ focused, pair, string }) => {
-        const { app } = await import('/scripts/app.js');
-        const source = app.graph.getNodeById(string);
-        for (const id of [focused, pair]) { const node = app.graph.getNodeById(id); source.connect(0, node, node.inputs.findIndex(input => input.name === 'text')); }
-        app.canvas.setDirty(true, true);
-    }, ids);
-    for (const [id, title] of [[ids.focused, 0], [ids.pair, 1]]) {
-        // Grab the link at the text socket and release it over the editor's toolbar, away from any prompt box.
-        const toolbar = page.locator('.pm-editor-toolbar strong').nth(title);
-        await drag(page, await slotPosition(page, id, 'in', 'text'), center(await toolbar.boundingBox()));
-        await expect.poll(() => linkedInputs(page, id)).toEqual(['text']);
-    }
-});
-
-test('paste, clone and undo keep the editor text a linked socket (#343 review M7)', async ({ page }) => {
-    const ids = await addEditors(page);
-    const state = await page.evaluate(async ({ pair, string }) => {
-        const { app } = await import('/scripts/app.js');
-        const node = app.graph.getNodeById(pair);
-        app.graph.getNodeById(string).connect(0, node, node.inputs.findIndex(input => input.name === 'text'));
-        const describe = target => ({ bound: target.inputs.filter(input => ['text', 'negative_text'].includes(input.name) && input.widget).length,
-            linked: target.inputs.find(input => input.name === 'text').link != null });
-        app.canvas.selectItems([node]);
-        app.canvas.copyToClipboard();
-        app.canvas.pasteFromClipboard({ connectInputs: true });
-        const pasted = app.graph._nodes.find(item => item.type === 'PromptManagerPair' && item.id !== pair);
-        const clone = node.clone();
-        app.graph.add(clone);
-        const output = (await app.graphToPrompt()).output;
-        return { pasted: describe(pasted), clone: describe(clone), queued: output[String(pasted.id)].inputs.text, pastedId: pasted.id };
-    }, ids);
-    expect(state).toMatchObject({ pasted: { bound: 0, linked: true }, clone: { bound: 0, linked: false }, queued: [String(ids.string), 0] });
-    // Undo restores the graph through a workflow load: the restored link is still a socket link.
-    const undone = await page.evaluate(async ({ pair }) => {
-        const { app } = await import('/scripts/app.js');
-        const tracker = app.extensionManager?.workflow?.activeWorkflow?.changeTracker;
-        if (!tracker) throw new Error('no change tracker on the active workflow');
-        tracker.checkState();
-        const node = app.graph.getNodeById(pair);
-        node.disconnectInput(node.inputs.findIndex(input => input.name === 'text'));
-        tracker.checkState();
-        await tracker.undo();
-        const restored = app.graph.getNodeById(pair);
-        return { bound: restored.inputs.filter(input => ['text', 'negative_text'].includes(input.name) && input.widget).length,
-            text: (await app.graphToPrompt()).output[String(pair)].inputs.text };
-    }, ids);
-    expect(undone).toEqual({ bound: 0, text: [String(ids.string), 0] });
-});
-
-test('PromptSearchList text is a core widget socket and takes a dragged STRING link too', async ({ page }) => {
-    const { id, sources } = await page.evaluate(async () => {
-        const { app } = await import('/scripts/app.js');
-        const node = LiteGraph.createNode('PromptSearchList');
-        app.graph.add(node);
-        node.pos = [500, 80];
-        const source = LiteGraph.createNode('PrimitiveString');
-        app.graph.add(source);
-        source.pos = [40, 80];
-        app.canvas.ds.scale = .8;
-        app.canvas.ds.offset = [40, 40];
-        app.canvas.setDirty(true, true);
-        return { id: node.id, sources: [source.id] };
-    });
-    // A core widget's socket shows while a link is dragged; aim at where the frontend places it.
-    await expect.poll(async () => Boolean(await slotPosition(page, id, 'in', 'text'))).toBe(true);
-    await drag(page, await slotPosition(page, sources[0], 'out', 0), await slotPosition(page, id, 'in', 'text'));
-    await expect.poll(() => linkedInputs(page, id)).toEqual(['text']);
-    expect((await queued(page, id)).text).toEqual([String(sources[0]), 0]);
-});
-
-test('workflows saved before #343 load unchanged and their linked text keeps working', async ({ page }) => {
-    const workflow = JSON.parse(await readFile(new URL('./fixtures/workflow-before-343.json', import.meta.url), 'utf8'));
-    const result = await page.evaluate(async workflow => {
-        const { app } = await import('/scripts/app.js');
-        await app.loadGraphData(structuredClone(workflow));
-        const output = (await app.graphToPrompt()).output;
-        const nodes = Object.fromEntries(app.graph._nodes.map(node => [node.id, node]));
-        const reloaded = app.graph.serialize();
-        return {
-            values: Object.fromEntries(reloaded.nodes.map(node => [node.id, node.widgets_values])),
-            links: Object.fromEntries(Object.entries(output).map(([id, node]) => [id, { text: node.inputs.text, negative_text: node.inputs.negative_text }])),
-            widgetBound: Object.fromEntries(Object.values(nodes).filter(node => node.type.startsWith('PromptManager')).map(node => [node.id, node.inputs.filter(input => ['text', 'negative_text'].includes(input.name) && input.widget).map(input => input.name)])),
-        };
-    }, workflow);
-    for (const node of workflow.nodes) {
-        // Every saved widget value comes back as it was saved, except the typed text main lost under a link (null).
-        if (node.widgets_values?.[0] !== null) expect(result.values[node.id], `${node.type} ${node.id}`).toEqual(node.widgets_values);
-    }
-    expect(result.links).toMatchObject({
-        1: { text: 'Saved PromptManager text' }, 2: { text: 'Saved PromptManagerText text' }, 3: { text: 'Saved PromptManagerFocused text' },
-        4: { text: 'Saved PromptManagerSplit text' }, 5: { text: 'Saved PromptManagerPair text', negative_text: 'Saved pair negative' },
-        6: { text: ['7', 0] }, 8: { text: ['9', 0], negative_text: ['10', 0] }, 11: { text: ['12', 0] },
-    });
-    // The editor nodes' text inputs are sockets now; the Classic nodes keep their core widget sockets.
-    expect(result.widgetBound).toEqual({ 1: ['text'], 2: ['text'], 3: [], 4: [], 5: [], 6: [], 8: [], 11: ['text'] });
-    // The linked sockets are drawn where a user can see and re-drag them, in either renderer.
-    for (const [node, name] of [[6, 'text'], [8, 'text'], [8, 'negative_text']]) {
-        await page.evaluate(async node => { const { app } = await import('/scripts/app.js'); app.canvas.centerOnNode(app.graph.getNodeById(node)); app.canvas.setDirty(true, true); }, node);
-        await expect.poll(async () => {
-            const position = await slotPosition(page, node, 'in', name);
-            return Boolean(position && position[0] > 0 && position[1] > 0 && position[0] < 1600 && position[1] < 1100);
-        }, { message: `${node}.${name} socket on screen` }).toBe(true);
-    }
-    const unplugged = await page.evaluate(async () => {
-        const { app } = await import('/scripts/app.js');
-        for (const id of [6, 8]) { const node = app.graph.getNodeById(id); for (const input of [...node.inputs]) if (input.link != null) node.disconnectInput(node.inputs.indexOf(input)); }
-        const output = (await app.graphToPrompt()).output;
-        return { focused: output['6'].inputs.text, positive: output['8'].inputs.text, negative: output['8'].inputs.negative_text };
-    });
-    expect(unplugged).toEqual({ focused: 'Typed under focused link', positive: 'Typed pair positive', negative: 'Typed pair negative' });
-});

tests/fixtures/generation_params/vectors.json

@@ -186,57 +186,6 @@
   "prompt": null,
   "workflow": "{\"nodes\": [{\"id\": 4, \"type\": \"CheckpointLoaderSimple\", \"mode\": 0, \"inputs\": [], \"widgets_values\": [\"example.safetensors\"]}, {\"id\": 6, \"type\": \"CLIPTextEncode\", \"mode\": 0, \"inputs\": [{\"name\": \"clip\", \"link\": 3}], \"widgets_values\": [\"a tidepool at noon\"]}, {\"id\": 7, \"type\": \"CLIPTextEncode\", \"mode\": 0, \"inputs\": [{\"name\": \"clip\", \"link\": 5}], \"widgets_values\": [\"noisy\"]}, {\"id\": 10, \"type\": \"Reroute\", \"mode\": 0, \"inputs\": [{\"name\": \"\", \"link\": 7}]}, {\"id\": 3, \"type\": \"KSampler\", \"mode\": 0, \"inputs\": [{\"name\": \"model\", \"link\": 1}, {\"name\": \"positive\", \"link\": 8}, {\"name\": \"negative\", \"link\": 4}, {\"name\": \"latent_image\", \"link\": 2}], \"widgets_values\": [314, \"randomize\", 25, 6.5, \"dpmpp_2m\", \"karras\", 1]}, {\"id\": 11, \"type\": \"CLIPTextEncode\", \"mode\": 2, \"inputs\": [], \"widgets_values\": [\"muted node text\"]}], \"links\": [[1, 4, 0, 3, 0, \"MODEL\"], [3, 4, 1, 6, 0, \"CLIP\"], [5, 4, 1, 7, 0, \"CLIP\"], [7, 6, 0, 10, 0, \"CONDITIONING\"], [8, 10, 0, 3, 1, \"CONDITIONING\"], [4, 7, 0, 3, 2, \"CONDITIONING\"], {\"id\": 2, \"origin_id\": 99, \"origin_slot\": 0, \"target_id\": 3, \"target_slot\": 3, \"type\": \"LATENT\"}]}"
  },
- {
-  "expected": {
-   "ok": true,
-   "result": {
-    "cfgScale": 5,
-    "checkpoint": "example.safetensors",
-    "negativePrompt": "plain negative",
-    "positivePrompt": "a detached positive",
-    "sampler": "euler",
-    "seed": 7,
-    "steps": 12
-   }
-  },
-  "name": "case:workflow-only-detached-editor-text",
-  "prompt": null,
-  "workflow": "{\"nodes\": [{\"id\": 4, \"type\": \"CheckpointLoaderSimple\", \"mode\": 0, \"inputs\": [], \"widgets_values\": [\"example.safetensors\"]}, {\"id\": 6, \"type\": \"PromptManagerFocused\", \"mode\": 0, \"inputs\": [{\"name\": \"clip\", \"link\": 3}, {\"name\": \"prepend_text\", \"link\": null}, {\"name\": \"append_text\", \"link\": null}, {\"name\": \"text\", \"link\": null}, {\"name\": \"category\", \"widget\": {\"name\": \"category\"}, \"link\": null}, {\"name\": \"tags\", \"widget\": {\"name\": \"tags\"}, \"link\": null}, {\"name\": \"search_text\", \"widget\": {\"name\": \"search_text\"}, \"link\": null}], \"widgets_values\": [\"a detached positive\", \"a category\", \"a tag\", \"\", \"\", \"\"]}, {\"id\": 7, \"type\": \"CLIPTextEncode\", \"mode\": 0, \"inputs\": [{\"name\": \"clip\", \"link\": 5}], \"widgets_values\": [\"plain negative\"]}, {\"id\": 3, \"type\": \"KSampler\", \"mode\": 0, \"inputs\": [{\"name\": \"model\", \"link\": 1}, {\"name\": \"positive\", \"link\": 8}, {\"name\": \"negative\", \"link\": 4}], \"widgets_values\": [7, \"fixed\", 12, 5, \"euler\", \"normal\", 1]}], \"links\": [[1, 4, 0, 3, 0, \"MODEL\"], [3, 4, 1, 6, 0, \"CLIP\"], [5, 4, 1, 7, 0, \"CLIP\"], [8, 6, 0, 3, 1, \"CONDITIONING\"], [4, 7, 0, 3, 2, \"CONDITIONING\"]]}"
- },
- {
-  "expected": {
-   "ok": true,
-   "result": {
-    "cfgScale": 5,
-    "checkpoint": "example.safetensors",
-    "negativePrompt": "a detached negative",
-    "positivePrompt": "a detached positive",
-    "sampler": "euler",
-    "seed": 7,
-    "steps": 12
-   }
-  },
-  "name": "case:workflow-only-detached-pair-text",
-  "prompt": null,
-  "workflow": "{\"nodes\": [{\"id\": 4, \"type\": \"CheckpointLoaderSimple\", \"mode\": 0, \"inputs\": [], \"widgets_values\": [\"example.safetensors\"]}, {\"id\": 6, \"type\": \"PromptManagerPair\", \"mode\": 0, \"inputs\": [{\"name\": \"clip\", \"link\": 3}, {\"name\": \"prepend_text\", \"link\": null}, {\"name\": \"append_text\", \"link\": null}, {\"name\": \"text\", \"link\": null}, {\"name\": \"negative_text\", \"link\": null}, {\"name\": \"category\", \"widget\": {\"name\": \"category\"}, \"link\": null}, {\"name\": \"tags\", \"widget\": {\"name\": \"tags\"}, \"link\": null}, {\"name\": \"search_text\", \"widget\": {\"name\": \"search_text\"}, \"link\": null}], \"widgets_values\": [\"a detached positive\", \"a detached negative\", \"a category\", \"a tag\", \"\", \"\", \"\"]}, {\"id\": 3, \"type\": \"KSampler\", \"mode\": 0, \"inputs\": [{\"name\": \"model\", \"link\": 1}, {\"name\": \"positive\", \"link\": 8}, {\"name\": \"negative\", \"link\": 4}], \"widgets_values\": [7, \"fixed\", 12, 5, \"euler\", \"normal\", 1]}], \"links\": [[1, 4, 0, 3, 0, \"MODEL\"], [3, 4, 1, 6, 0, \"CLIP\"], [5, 4, 1, 7, 0, \"CLIP\"], [8, 6, 0, 3, 1, \"CONDITIONING\"], [4, 6, 1, 3, 2, \"CONDITIONING\"]]}"
- },
- {
-  "expected": {
-   "ok": true,
-   "result": {
-    "cfgScale": 4.5,
-    "checkpoint": "example.safetensors",
-    "negativePrompt": "plain negative",
-    "positivePrompt": "a detached positive",
-    "sampler": "dpmpp_2m",
-    "seed": 9,
-    "steps": 30
-   }
-  },
-  "name": "case:workflow-only-core-widget-input-out-of-order",
-  "prompt": null,
-  "workflow": "{\"nodes\": [{\"id\": 4, \"type\": \"CheckpointLoaderSimple\", \"mode\": 0, \"inputs\": [], \"widgets_values\": [\"example.safetensors\"]}, {\"id\": 6, \"type\": \"PromptManagerFocused\", \"mode\": 0, \"inputs\": [{\"name\": \"clip\", \"link\": 3}, {\"name\": \"prepend_text\", \"link\": null}, {\"name\": \"append_text\", \"link\": null}, {\"name\": \"text\", \"link\": null}, {\"name\": \"category\", \"widget\": {\"name\": \"category\"}, \"link\": null}, {\"name\": \"tags\", \"widget\": {\"name\": \"tags\"}, \"link\": null}, {\"name\": \"search_text\", \"widget\": {\"name\": \"search_text\"}, \"link\": null}], \"widgets_values\": [\"a detached positive\", \"a category\", \"a tag\", \"\", \"\", \"\"]}, {\"id\": 7, \"type\": \"CLIPTextEncode\", \"mode\": 0, \"inputs\": [{\"name\": \"clip\", \"link\": 5}], \"widgets_values\": [\"plain negative\"]}, {\"id\": 3, \"type\": \"KSampler\", \"mode\": 0, \"inputs\": [{\"name\": \"model\", \"link\": 1}, {\"name\": \"positive\", \"link\": 8}, {\"name\": \"negative\", \"link\": 4}, {\"name\": \"cfg\", \"widget\": {\"name\": \"cfg\"}, \"link\": null}], \"widgets_values\": [9, \"fixed\", 30, 4.5, \"dpmpp_2m\", \"karras\", 1]}], \"links\": [[1, 4, 0, 3, 0, \"MODEL\"], [3, 4, 1, 6, 0, \"CLIP\"], [5, 4, 1, 7, 0, \"CLIP\"], [8, 6, 0, 3, 1, \"CONDITIONING\"], [4, 7, 0, 3, 2, \"CONDITIONING\"]]}"
- },
  {
   "expected": {
    "ok": true,

tests/generation_params_cases.py

@@ -244,90 +244,6 @@ def _workflow_only():
     }
 
 
-def _detached_editor_text(pair):
-    """#343: editor text inputs are sockets, not widget inputs; no named values."""
-    names = ["text"] + (["negative_text"] if pair else [])
-    sockets = [
-        {"name": "clip", "link": 3},
-        {"name": "prepend_text", "link": None},
-        {"name": "append_text", "link": None},
-    ]
-    sockets += [{"name": name, "link": None} for name in names]
-    sockets += [
-        {"name": name, "widget": {"name": name}, "link": None}
-        for name in ("category", "tags", "search_text")
-    ]
-    editor = {
-        "id": 6,
-        "type": "PromptManagerPair" if pair else "PromptManagerFocused",
-        "mode": 0,
-        "inputs": sockets,
-        "widgets_values": ["a detached positive"]
-        + (["a detached negative"] if pair else [])
-        + ["a category", "a tag", "", "", ""],
-    }
-    negative = (
-        []
-        if pair
-        else [
-            {
-                "id": 7,
-                "type": "CLIPTextEncode",
-                "mode": 0,
-                "inputs": [{"name": "clip", "link": 5}],
-                "widgets_values": ["plain negative"],
-            }
-        ]
-    )
-    return {
-        "nodes": [
-            {
-                "id": 4,
-                "type": "CheckpointLoaderSimple",
-                "mode": 0,
-                "inputs": [],
-                "widgets_values": ["example.safetensors"],
-            },
-            editor,
-            *negative,
-            {
-                "id": 3,
-                "type": "KSampler",
-                "mode": 0,
-                "inputs": [
-                    {"name": "model", "link": 1},
-                    {"name": "positive", "link": 8},
-                    {"name": "negative", "link": 4},
-                ],
-                "widgets_values": [7, "fixed", 12, 5, "euler", "normal", 1],
-            },
-        ],
-        "links": [
-            [1, 4, 0, 3, 0, "MODEL"],
-            [3, 4, 1, 6, 0, "CLIP"],
-            [5, 4, 1, 7, 0, "CLIP"],
-            [8, 6, 0, 3, 1, "CONDITIONING"],
-            [4, 6 if pair else 7, 1 if pair else 0, 3, 2, "CONDITIONING"],
-        ],
-    }
-
-
-def _core_widget_input_out_of_order():
-    """#343 review R4: a core KSampler whose only widget input is ``cfg``.
-
-    Older frontends saved only converted or linked widget inputs, so the list
-    is not a prefix of the schema and carries no named values; the positional
-    values must still land on the schema's names.
-    """
-    workflow = _detached_editor_text(False)
-    sampler = workflow["nodes"][-1]
-    sampler["inputs"] = sampler["inputs"] + [
-        {"name": "cfg", "widget": {"name": "cfg"}, "link": None}
-    ]
-    sampler["widgets_values"] = [9, "fixed", 30, 4.5, "dpmpp_2m", "karras", 1]
-    return workflow
-
-
 def _nested(depth):
     """A value nested ``depth`` arrays deep, as a crafted file can hold."""
     value = ["leaf", 7]
@@ -473,11 +389,6 @@ CASES = {
         }
     ),
     "workflow-only": case(workflow=_workflow_only()),
-    "workflow-only-detached-editor-text": case(workflow=_detached_editor_text(False)),
-    "workflow-only-detached-pair-text": case(workflow=_detached_editor_text(True)),
-    "workflow-only-core-widget-input-out-of-order": case(
-        workflow=_core_widget_input_out_of_order()
-    ),
     "overwritten-prompt-manager-text": case(
         {
             "4": CHECKPOINT,

tests/js/api-client.test.js

@@ -356,21 +356,6 @@ test("keepalive is forwarded only when asked, so a request can outlive its page"
     await Promise.all(writes);
 });
 
-test("ApiError keeps the job that applied a used plan (plan-used, System S7)", () => {
-    const body = { job: { id: "b".repeat(32), title: "Optimize database" } };
-    const used = new ApiError(409, "This plan was already applied.", "plan-used", null, body);
-    assert.deepEqual(used.job, { id: "b".repeat(32), title: "Optimize database" });
-    assert.notEqual(used.job, body.job, "server objects must be copied");
-    // The applying job may already be pruned: its title is null, its id still links Activity.
-    assert.deepEqual(new ApiError(409, "used", "plan-used", null, { job: { id: "c".repeat(32), title: null } }).job,
-        { id: "c".repeat(32), title: null });
-    assert.equal(new ApiError(409, "busy", "busy", null, body).job, null);
-    for (const job of [null, "x", { id: 1, title: "t" }, { id: "a b", title: "t" }, { id: "a", title: 7 },
-        { id: "a", title: "x".repeat(201) }, { id: "a".repeat(65), title: "t" }]) {
-        assert.equal(new ApiError(409, "used", "plan-used", null, { job }).job, null);
-    }
-});
-
 test("ApiError keeps a validated running job on busy and a validated source on invalid-source", () => {
     const body = { running: { id: "a".repeat(32), title: "Scan for metadata" }, source: "output/gone" };
     const busy = new ApiError(409, "busy", "busy", null, body);
@@ -387,12 +372,3 @@ test("ApiError keeps a validated running job on busy and a validated source on i
     }
     assert.deepEqual([new ApiError(409, "old caller").running, new ApiError(409, "old caller").source], [null, null]);
 });
-
-test("ApiError says whether the server itself refused (a parsed success:false body; S7 review I1)", () => {
-    assert.equal(new ApiError(400, "bad", null, null, { success: false, error: "bad" }).refused, true);
-    assert.equal(new ApiError(409, "busy", "busy", null, { success: false, code: "busy" }).refused, true);
-    // A proxy's page, a body that was not JSON, or no body at all: nothing says the server refused.
-    for (const body of [null, undefined, "<html>", { success: true }, [], { error: "x" }]) {
-        assert.equal(new ApiError(504, "Gateway Timeout", null, null, body).refused, false);
-    }
-});

tests/js/cache-ownership.test.js

@@ -1,189 +0,0 @@
-// #222: what "clear the cache" may remove from this browser. Only entries Prompt Manager itself writes as a cache count,
-// from an inventory of the real writers (never a guessed prefix): preferences (the workspace theme, the update notice,
-// the display defaults) and other tools' storage and caches on the shared ComfyUI origin always stay.
-const test = require('node:test');
-const assert = require('node:assert/strict');
-const fs = require('node:fs');
-const path = require('node:path');
-
-const CacheOwnership = require('../../web/js/cache-ownership.js');
-
-const WEB = path.join(__dirname, '../../web');
-
-function memoryStorage(entries) {
-    const map = new Map(Object.entries(entries));
-    return {
-        map,
-        get length() { return map.size; },
-        key: index => [...map.keys()][index] ?? null,
-        getItem: key => (map.has(key) ? map.get(key) : null),
-        setItem: (key, value) => map.set(key, String(value)),
-        removeItem: key => map.delete(key),
-    };
-}
-
-function memoryCaches(names, { failDelete = new Set() } = {}) {
-    const set = new Set(names);
-    return {
-        set,
-        keys: async () => [...set],
-        delete: async name => {
-            if (failDelete.has(name)) throw new Error('denied');
-            return set.delete(name);
-        },
-    };
-}
-
-const PREFERENCES = { gallerySettings: '{"viewMode":"grid"}', pm_workspace_theme: 'light', pm_update_notice_dismissed: '3.3.0' };
-const OWNED = Object.freeze({ storageKeys: ['pm-owned-test-entry'], cacheNames: ['pm-owned-test-cache'] });
-
-test('keeps pm_workspace_theme, pm_update_notice_dismissed and gallerySettings', async () => {
-    const storage = memoryStorage({ ...PREFERENCES, 'pm-owned-test-entry': 'x', pm_cached: '1', promptManager_x: '1' });
-    const result = await CacheOwnership.clearOwned({ storage, cacheStorage: null, owned: OWNED });
-    assert.deepEqual(result.removed, ['pm-owned-test-entry']);
-    for (const [key, value] of Object.entries(PREFERENCES)) assert.equal(storage.getItem(key), value, key);
-    // The old prefix rule's matches are not Prompt Manager caches either: nothing writes them.
-    assert.equal(storage.getItem('pm_cached'), '1');
-    assert.equal(storage.getItem('promptManager_x'), '1');
-    for (const key of Object.keys(PREFERENCES)) assert.ok(CacheOwnership.PREFERENCE_KEYS.includes(key), key);
-});
-
-test("keeps other tools' CacheStorage named gallery/thumbnail", async () => {
-    const caches = memoryCaches(['other-gallery', 'thumbnail-cache', 'my-gallery-thumbnails', 'pm-owned-test-cache']);
-    const result = await CacheOwnership.clearOwned({ storage: memoryStorage({}), cacheStorage: caches, owned: OWNED });
-    assert.deepEqual([...caches.set].sort(), ['my-gallery-thumbnails', 'other-gallery', 'thumbnail-cache']);
-    assert.deepEqual(result.removed, ['pm-owned-test-cache']);
-});
-
-test('removes only inventoried owned keys', async () => {
-    // The shipped inventory: no Prompt Manager writer stores a cache entry in this browser.
-    assert.deepEqual(CacheOwnership.OWNED, { storageKeys: [], cacheNames: [] });
-    assert.ok(Object.isFrozen(CacheOwnership.OWNED.storageKeys) && Object.isFrozen(CacheOwnership.OWNED.cacheNames));
-    const storage = memoryStorage({ ...PREFERENCES, gallery_cache_1: 'a', metadata_cache_2: 'b', other: 'c' });
-    const caches = memoryCaches(['gallery', 'thumbnail']);
-    const result = await CacheOwnership.clearOwned({ storage, cacheStorage: caches });
-    assert.deepEqual(result, { removed: [], failed: [], denied: false, partial: false });
-    assert.equal(storage.map.size, 6);
-    assert.equal(caches.set.size, 2);
-    assert.equal(CacheOwnership.clearMessage(result), CacheOwnership.NOTHING_CACHED);
-});
-
-/**
- * Every browser-storage write in one file's text: `{keys}` (setItem keys, as written) and `problems` (writes no key
- * can be read from: a bracket or property assignment on a Storage, a computed setItem key, an IndexedDB or
- * CacheStorage open or write). The scan is textual, so it errs on the side of reporting.
- */
-function storageWrites(text) {
-    const keys = [];
-    const problems = [];
-    for (const match of text.matchAll(/\.setItem\(\s*([^,)]+)/g)) {
-        const key = match[1].trim();
-        const literal = /^(?:'([^']+)'|"([^"]+)")$/.exec(key);
-        if (literal) keys.push(literal[1] ?? literal[2]);
-        else if (/^[A-Z_]+_KEY$/.test(key)) keys.push(`$${key}`);
-        else problems.push(`a computed setItem key: ${key}`);
-    }
-    if (/\b\w*[sS]torage\s*\[[^\]]+\]\s*=(?!=)/.test(text)) problems.push('a bracket assignment on a Storage');
-    if (/\b(?:local|session)Storage\s*\.\s*(?!getItem|setItem|removeItem|key\b|length\b|clear\b)\w+\s*=(?!=)/.test(text)) {
-        problems.push('a property assignment on a Storage');
-    }
-    if (/\bcaches\s*\.\s*open\s*\(/.test(text)) problems.push('opens a CacheStorage cache');
-    if (/\bindexedDB\s*\.\s*open\s*\(/.test(text)) problems.push('opens IndexedDB');
-    return { keys, problems };
-}
-
-test('the storage scan reports every way of writing browser storage (S7 review M5)', () => {
-    assert.deepEqual(storageWrites("localStorage.setItem('gallerySettings', x); storage.setItem(NOTICE_KEY, v);").keys,
-        ['gallerySettings', '$NOTICE_KEY']);
-    for (const text of ["localStorage['pm_cache'] = 1;", 'sessionStorage[key] = value;', 'storage[name] = x;',
-        'localStorage.pm_cache = 1;', 'sessionStorage.someKey = "v";', 'localStorage.setItem(key, 1);',
-        "caches.open('pm').then(cache => cache.put(url, response));", "indexedDB.open('pm-cache', 1);"]) {
-        assert.equal(storageWrites(text).problems.length, 1, text);
-    }
-    for (const text of ["if (localStorage['pm'] === x) {}", 'const value = localStorage.getItem(KEY);',
-        'localStorage.removeItem(KEY);', 'const n = localStorage.length;']) {
-        assert.deepEqual(storageWrites(text), { keys: [], problems: [] }, text);
-    }
-});
-
-test('the inventory covers every browser storage writer in web/', () => {
-    // Every key a Prompt Manager page writes is a preference or an inventoried cache entry; a new writer must be
-    // classified here before a cache clear may remove it. Skipped: web/lib (third-party Viewer.js and Tailwind
-    // output) and web/js/shared/toolkit (the pinned ComfyAssets Toolkit build, never hand-edited here and verified by
-    // `npm run --prefix tools/vendor check`). Neither writes browser storage today; the Toolkit's own repository owns
-    // its storage, and a new pin is reviewed as its own change.
-    const files = [];
-    const walk = dir => {
-        for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
-            const full = path.join(dir, entry.name);
-            if (entry.isDirectory()) { if (!['lib', 'toolkit'].includes(entry.name)) walk(full); }
-            else if (/\.(m?js|html)$/.test(entry.name)) files.push(full);
-        }
-    };
-    walk(WEB);
-    const written = new Set();
-    const constants = {};
-    for (const file of files) {
-        const text = fs.readFileSync(file, 'utf8');
-        for (const match of text.matchAll(/(?:const|export const)\s+([A-Z_]+_KEY)\s*=\s*'([^']+)'/g)) constants[match[1]] = match[2];
-        const { keys, problems } = storageWrites(text);
-        assert.deepEqual(problems, [], path.relative(WEB, file));
-        for (const key of keys) written.add(key);
-    }
-    const keys = [...written].map(key => (key.startsWith('$') ? constants[key.slice(1)] : key));
-    assert.ok(keys.length >= 3, 'the writers were found');
-    for (const key of keys) {
-        assert.ok(key, 'every written key resolves');
-        assert.ok(CacheOwnership.PREFERENCE_KEYS.includes(key) || CacheOwnership.OWNED.storageKeys.includes(key), key);
-    }
-});
-
-test('storage denial reports partial', async () => {
-    const denied = { get length() { throw new Error('SecurityError'); }, key() { throw new Error('SecurityError'); },
-        getItem() { throw new Error('SecurityError'); }, removeItem() { throw new Error('SecurityError'); } };
-    const result = await CacheOwnership.clearOwned({ storage: denied, cacheStorage: null, owned: OWNED });
-    assert.equal(result.denied, true);
-    assert.equal(result.partial, true);
-    assert.equal(CacheOwnership.clearMessage(result), CacheOwnership.STORAGE_DENIED);
-
-    const caches = memoryCaches(['pm-owned-test-cache'], { failDelete: new Set(['pm-owned-test-cache']) });
-    const storage = memoryStorage({ 'pm-owned-test-entry': 'x' });
-    const partial = await CacheOwnership.clearOwned({ storage, cacheStorage: caches, owned: OWNED });
-    assert.deepEqual(partial.removed, ['pm-owned-test-entry']);
-    assert.deepEqual(partial.failed, ['pm-owned-test-cache']);
-    assert.equal(partial.partial, true);
-    assert.equal(CacheOwnership.clearMessage(partial), 'Cleared 1 of 2 cached entries; this browser refused the rest.');
-
-    const keysDenied = { keys: async () => { throw new Error('denied'); } };
-    const unreadable = await CacheOwnership.clearOwned({ storage: memoryStorage({}), cacheStorage: keysDenied, owned: OWNED });
-    assert.equal(unreadable.denied, true);
-});
-
-test('server thumbnail clear stays a separate explicit call', async () => {
-    const calls = [];
-    const original = globalThis.fetch;
-    globalThis.fetch = async (...args) => { calls.push(args); return { ok: true }; };
-    try {
-        const storage = memoryStorage({ 'pm-owned-test-entry': 'x' });
-        const result = await CacheOwnership.clearOwned({ storage, cacheStorage: memoryCaches([]), owned: OWNED });
-        assert.deepEqual(result.removed, ['pm-owned-test-entry']);
-        assert.equal(CacheOwnership.clearMessage(result), 'Cleared 1 cached entry from this browser.');
-    } finally {
-        globalThis.fetch = original;
-    }
-    assert.deepEqual(calls, []);
-    assert.equal(/fetch|clear-thumbnails|ApiClient/.test(fs.readFileSync(path.join(WEB, 'js/cache-ownership.js'), 'utf8')), false);
-});
-
-test('ownedEntries lists what a clear would remove, reading nothing it cannot', async () => {
-    const storage = memoryStorage({ ...PREFERENCES, 'pm-owned-test-entry': 'x' });
-    const caches = memoryCaches(['pm-owned-test-cache', 'gallery']);
-    assert.deepEqual(await CacheOwnership.ownedEntries({ storage, cacheStorage: caches, owned: OWNED }),
-        { keys: ['pm-owned-test-entry'], caches: ['pm-owned-test-cache'], denied: false });
-    assert.deepEqual(await CacheOwnership.ownedEntries({ storage, cacheStorage: caches }),
-        { keys: [], caches: [], denied: false });
-    assert.deepEqual(await CacheOwnership.ownedEntries({ storage: null, cacheStorage: undefined, owned: OWNED }),
-        { keys: [], caches: [], denied: false });
-    assert.equal(CacheOwnership.clearMessage({ removed: ['a', 'b'], failed: [], denied: false, partial: false }),
-        'Cleared 2 cached entries from this browser.');
-});

tests/js/legacy-refusals.test.js

@@ -32,11 +32,8 @@ function sseResponse(frames) {
 function load(file, className, fetchUrl, extra = {}, dom = elements()) {
     const timers = [];
     const notifications = [];
-    const storage = new Map([['pm_cached', '1'], ['userData', 'keep'], ['pm_workspace_theme', 'light'],
-        ['pm_update_notice_dismissed', '3.3.0']]);
+    const storage = new Map([['pm_cached', '1'], ['userData', 'keep']]);
     const localStorage = {
-        get length() { return storage.size; },
-        key: index => [...storage.keys()][index] ?? null,
         getItem: key => storage.get(key) ?? null,
         setItem: (key, value) => storage.set(key, String(value)),
         removeItem: key => storage.delete(key),
@@ -48,12 +45,11 @@ function load(file, className, fetchUrl, extra = {}, dom = elements()) {
         setTimeout: callback => timers.push(callback),
         confirm: () => true,
         localStorage,
+        Object: { ...Object, keys: target => (target === localStorage ? [...storage.keys()] : Object.keys(target)) },
         TextDecoder, TextEncoder, JSON,
         ApiClient: { fetchUrl },
         ...extra,
     });
-    // gallery.html loads cache-ownership.js before gallery.js (#222).
-    vm.runInContext(fs.readFileSync(path.join(__dirname, '../../web/js/cache-ownership.js'), 'utf8'), context);
     const source = fs.readFileSync(path.join(__dirname, `../../web/js/${file}`), 'utf8');
     const Page = vm.runInContext(`${source}\n${className};`, context, { filename: path.join(__dirname, `../../web/js/${file}`) });
     const page = Object.create(Page.prototype);
@@ -82,68 +78,18 @@ test('gallery cache clear reports a refused server clear and never claims succes
     assert.equal(storage.get('gallerySettings'), undefined); // thumbnailsGenerated is not reset
 });
 
-test('gallery cache clear says what it cleared and keeps preferences and other data (#222)', async () => {
-    const calls = [];
-    const { page, dom, notifications, storage } = load('gallery.js', 'GalleryManager', async url => {
-        calls.push(url);
-        return jsonResponse(200, { success: true, cleared_count: 3 });
-    });
+test('gallery cache clear still says so when the server clears', async () => {
+    const { page, dom, notifications, storage } = load('gallery.js', 'GalleryManager',
+        async () => jsonResponse(200, { success: true, cleared_count: 3 }));
     page.getSettings = () => ({ thumbnailsGenerated: true });
 
     await page.clearCache();
 
-    // The server's thumbnails are cleared by their own explicit call; nothing Prompt Manager owns is cached in this
-    // browser, so no browser entry is removed and the toast says exactly that.
-    assert.deepEqual(calls, ['/prompt_manager/images/clear-thumbnails']);
-    assert.deepEqual(notifications, [['success',
-        "Thumbnails cleared; original images untouched. Nothing of Prompt Manager's is cached in this browser."]]);
+    assert.deepEqual(notifications, [['success', 'PromptManager cache cleared successfully! Original images untouched.']]);
     assert.equal(dom.nodes.thumbnailStatus.textContent, 'Not generated');
     assert.equal(JSON.parse(storage.get('gallerySettings')).thumbnailsGenerated, false);
     assert.equal(storage.get('userData'), 'keep');
-    assert.equal(storage.get('pm_cached'), '1');
-    assert.equal(storage.get('pm_workspace_theme'), 'light');
-    assert.equal(storage.get('pm_update_notice_dismissed'), '3.3.0');
-});
-
-test("gallery cache clear never deletes another tool's gallery or thumbnail caches (#222)", async () => {
-    const names = new Set(['comfy-gallery', 'thumbnail-cache']);
-    const caches = { keys: async () => [...names], delete: async name => names.delete(name) };
-    const { page, notifications } = load('gallery.js', 'GalleryManager',
-        async () => jsonResponse(200, { success: true }), { caches, window: { caches } });
-    page.getSettings = () => ({});
-
-    await page.clearCache();
-
-    assert.deepEqual([...names], ['comfy-gallery', 'thumbnail-cache']);
-    assert.equal(notifications.at(-1)[0], 'success');
-});
-
-test('gallery cache clear reports a lost server clear instead of success', async () => {
-    const { page, dom, notifications, storage } = load('gallery.js', 'GalleryManager', async () => {
-        throw new TypeError('Failed to fetch');
-    });
-    page.getSettings = () => ({ thumbnailsGenerated: true });
-    dom.getElementById('thumbnailStatus').textContent = 'Generated';
-
-    await page.clearCache();
-
-    assert.deepEqual(notifications, [['error', 'Thumbnails were not cleared: the server could not be reached.']]);
-    assert.equal(dom.nodes.thumbnailStatus.textContent, 'Generated');
-    assert.equal(storage.get('gallerySettings'), undefined);
-});
-
-test('gallery cache clear says so when browser storage is denied', async () => {
-    const denied = { get length() { throw new Error('SecurityError'); }, key() { throw new Error('SecurityError'); },
-        getItem() { throw new Error('SecurityError'); }, setItem() { throw new Error('SecurityError'); },
-        removeItem() { throw new Error('SecurityError'); } };
-    const { page, notifications } = load('gallery.js', 'GalleryManager',
-        async () => jsonResponse(200, { success: true }), { localStorage: denied });
-    page.getSettings = () => ({});
-
-    await page.clearCache();
-
-    assert.deepEqual(notifications, [['warning',
-        'Thumbnails cleared; original images untouched. This browser refused access to its storage, so nothing there was cleared.']]);
+    assert.equal(storage.has('pm_cached'), false);
 });
 
 test('admin LoRA import shows a refusal frame and closes its modal', async () => {

tests/js/prompt-bridge-adapter.test.js

@@ -17,17 +17,6 @@ test('lists only explicit PromptManager destinations and roles for all five sche
     assert.equal(targets[0].id,'0'); assert.equal(targets[0].label,'My prompts');
     assert.deepEqual(createPromptAdapter({}).listTargets(),[]);
 });
-test('each destination says which renderer its window draws nodes with (System › Integrations, S10)',async()=>{
-    const {createPromptAdapter}=await source; const {app}=fixture();
-    assert.equal(createPromptAdapter(app,{runtime:{LiteGraph:{vueNodesMode:true}}}).listTargets()[0].renderer,'nodes2');
-    assert.equal(createPromptAdapter(app,{runtime:{LiteGraph:{vueNodesMode:false}}}).listTargets()[0].renderer,'classic');
-    assert.equal(createPromptAdapter(app,{runtime:{LiteGraph:{}}}).listTargets()[0].renderer,'classic');
-    assert.equal(Object.hasOwn(createPromptAdapter(app,{runtime:{}}).listTargets()[0],'renderer'),false);
-    // Read at every listing: a window that switches renderer reports the new one.
-    const runtime={LiteGraph:{vueNodesMode:false}}; const adapter=createPromptAdapter(app,{runtime});
-    runtime.LiteGraph.vueNodesMode=true;
-    assert.equal(adapter.listTargets()[0].renderer,'nodes2');
-});
 test('previews exact composition, updates requested visible/serialized values, preserves other fields',async()=>{
     const {createPromptAdapter}=await source; const {app,node,widget}=fixture(); const adapter=createPromptAdapter(app);
     const {preview,snapshot}=adapter.preview('7',{positive:'new'});

tests/js/text-links.test.js

@@ -1,201 +0,0 @@
-// #343: a link can drive the editor nodes' text inputs (web/js/text-links.js).
-const test = require('node:test');
-const assert = require('node:assert/strict');
-const source = import('../../web/js/text-links.js');
-
-// The frontend's own slot order for the Focused/Split/Pair schemas: forceInput sockets first, then the widget sockets.
-function pairNode() {
-    const inputs = [
-        {name:'clip',type:'CLIP',link:null},
-        {name:'prepend_text',type:'STRING',link:null},
-        {name:'append_text',type:'STRING',link:null},
-        {name:'text',type:'STRING',link:null,widget:{name:'text'},_widget:{name:'text'}},
-        {name:'negative_text',type:'STRING',link:null,widget:{name:'negative_text'}},
-        {name:'category',type:'STRING',link:null,widget:{name:'category'}},
-    ];
-    return {inputs};
-}
-
-test('the editor note says the value comes from a link and that typed text is kept', async () => {
-    const {linkNoteText} = await source;
-    assert.equal(linkNoteText('Negative prompt'), 'Negative prompt comes from a link. Your typed text is kept for when you disconnect it.');
-});
-
-test('a linked widget stores its typed value; an unlinked one its live editor text', async () => {
-    const {storedWidgetValue} = await source;
-    const widget = {name:'text', value:'typed', inputEl:{value:'live'}};
-    assert.equal(storedWidgetValue({inputs:[{name:'text',link:3}]}, widget), 'typed');
-    assert.equal(storedWidgetValue({inputs:[{name:'text',link:null}]}, widget), 'live');
-    assert.equal(storedWidgetValue({}, {name:'tags', value:'a, b'}), 'a, b');
-});
-
-test('exposing a socket detaches only the named inputs from their hidden widgets', async () => {
-    const {exposeTextSockets} = await source;
-    const node = pairNode();
-    assert.deepEqual(exposeTextSockets(node, ['text','negative_text']), ['text','negative_text']);
-    const byName = Object.fromEntries(node.inputs.map(input => [input.name,input]));
-    for (const name of ['text','negative_text']) {
-        assert.equal('widget' in byName[name], false);
-        assert.equal(byName[name]._widget, undefined);
-        assert.equal(byName[name].type, 'STRING');
-    }
-    assert.deepEqual(byName.category.widget, {name:'category'});
-    assert.deepEqual(exposeTextSockets(node, ['text','negative_text']), [], 'idempotent');
-    assert.deepEqual(exposeTextSockets({}, ['text']), [], 'a node without inputs is left alone');
-});
-
-test('exposing a socket keeps an existing link and the widget value', async () => {
-    const {exposeTextSockets,isLinked} = await source;
-    const node = pairNode();
-    node.inputs[3].link = 12;
-    exposeTextSockets(node, ['text']);
-    assert.equal(node.inputs[3].link, 12);
-    assert.equal(isLinked(node,'text'), true);
-    assert.equal(isLinked(node,'negative_text'), false);
-    assert.equal(isLinked({},'text'), false);
-});
-
-test('a STRING link dropped on the editor prefers the first free text input over prepend', async () => {
-    const {preferredTextSlot} = await source;
-    const node = pairNode();
-    assert.deepEqual(preferredTextSlot(node, 'STRING', ['text','negative_text']), {index:3,slot:node.inputs[3]});
-    node.inputs[3].link = 4;
-    assert.deepEqual(preferredTextSlot(node, 'STRING', ['text','negative_text']), {index:4,slot:node.inputs[4]});
-    node.inputs[4].link = 5;
-    assert.equal(preferredTextSlot(node, 'STRING', ['text','negative_text']), undefined, 'both linked: the frontend chooses');
-});
-
-test('only exact STRING links are steered; wildcards keep the frontend choice (#343 review M2)', async () => {
-    const {preferredTextSlot} = await source;
-    const node = pairNode();
-    for (const type of ['STRING','STRING,INT',' STRING ']) assert.equal(preferredTextSlot(node, type, ['text'])?.index, 3, type);
-    for (const type of ['*','','CLIP','INT','IMAGE',undefined,null,0]) assert.equal(preferredTextSlot(node, type, ['text']), undefined, String(type));
-    assert.equal(preferredTextSlot({}, 'STRING', ['text']), undefined);
-});
-
-test('a link being moved off a text input leaves it free, as the frontend counts it (#343 review I2)', async () => {
-    const {preferredTextSlot} = await source;
-    const links = new Map([[7,{id:7,_dragging:true}],[8,{id:8}]]);
-    const node = Object.assign(pairNode(), {graph:{getLink:id => links.get(id)}});
-    node.inputs[3].link = 7;
-    assert.equal(preferredTextSlot(node, 'STRING', ['text','negative_text']).slot.name, 'text', 'the dragged link does not block text');
-    links.get(7)._dragging = false;
-    assert.equal(preferredTextSlot(node, 'STRING', ['text','negative_text']).slot.name, 'negative_text');
-    node.inputs[4].link = 8;
-    assert.equal(preferredTextSlot(node, 'STRING', ['text','negative_text']), undefined);
-    node.inputs[4].link = 99;
-    assert.equal(preferredTextSlot(node, 'STRING', ['text','negative_text']).slot.name, 'negative_text', 'a link the graph no longer has is free');
-    const legacy = Object.assign(pairNode(), {graph:{links:{5:{id:5,_dragging:true}}}});
-    legacy.inputs[3].link = 5;
-    assert.equal(preferredTextSlot(legacy, 'STRING', ['text']).slot.name, 'text', 'object-keyed link tables too');
-});
-
-function primitiveGraph() {
-    const nodes = new Map();
-    const links = new Map();
-    const graph = {getNodeById:id => nodes.get(id), getLink:id => links.get(id)};
-    const add = (id, node) => { nodes.set(id, {id, graph, ...node}); return nodes.get(id); };
-    return {graph, nodes, links, add};
-}
-
-test('a legacy frontend Primitive feeding a detached text input supplies its value (#343 review I1)', async () => {
-    const {primitiveTextValue} = await source;
-    const {nodes, links, add} = primitiveGraph();
-    const target = add(1, {inputs:[{name:'text',link:10},{name:'negative_text',link:11},{name:'prepend_text',link:12},{name:'category',link:null}]});
-    add(2, {type:'PrimitiveNode', isVirtualNode:true, widgets:[{value:'From the primitive'}]});
-    add(3, {type:'Reroute', isVirtualNode:true, inputs:[{link:13}]});
-    add(4, {type:'PrimitiveNode', isVirtualNode:true, widgets:[{value:42}]});
-    add(5, {type:'PrimitiveStringMultiline', widgets:[{value:'a real node'}]});
-    links.set(10, {origin_id:2}); links.set(11, {origin_id:3}); links.set(13, {origin_id:4}); links.set(12, {origin_id:5});
-    assert.equal(await primitiveTextValue(target, 'text'), 'From the primitive');
-    assert.equal(await primitiveTextValue(target, 'negative_text'), '42', 'through a virtual reroute');
-    assert.equal(await primitiveTextValue(target, 'prepend_text'), undefined, 'a real node is serialized as a link');
-    assert.equal(await primitiveTextValue(target, 'category'), undefined, 'not linked');
-    assert.equal(await primitiveTextValue(target, 'missing'), undefined);
-    nodes.get(2).widgets = [];
-    assert.equal(await primitiveTextValue(target, 'text'), undefined, 'a primitive without its widget yet');
-    links.set(13, {origin_id:3});
-    assert.equal(await primitiveTextValue(target, 'negative_text'), undefined, 'a reroute cycle ends');
-    assert.equal(await primitiveTextValue({inputs:[{name:'text',link:1}]}, 'text'), undefined, 'no graph');
-});
-
-test('an input still bound to its widget is left to the host, which applies the Primitive itself (#343 re-review R1)', async () => {
-    const {primitiveTextValue} = await source;
-    const {links, add} = primitiveGraph();
-    const target = add(1, {inputs:[{name:'text',link:10,widget:{name:'text'}}], widgets:[{name:'text',value:'typed'}]});
-    add(2, {type:'PrimitiveNode', isVirtualNode:true, widgets:[{value:'{red|blue}'}]});
-    links.set(10, {origin_id:2});
-    assert.equal(await primitiveTextValue(target, 'text'), undefined);
-});
-
-test('a detached input runs the Primitive value the way the host runs a widget value: replace, then the widget serializer (#343 re-review R1)', async () => {
-    const {primitiveTextValue} = await source;
-    const {graph, links, add} = primitiveGraph();
-    const calls = [];
-    const widget = {name:'text', value:'typed under the link', serializeValue(...args) { calls.push([this.value, args.length]); return this.value.replace('{alpha|beta}', 'alpha'); }};
-    const target = add(1, {inputs:[{name:'text',link:10},{name:'negative_text',link:11}], widgets:[widget]});
-    const primitive = add(2, {type:'PrimitiveNode', isVirtualNode:true, properties:{'Run widget replace on values':false}, widgets:[{value:'a %year% {alpha|beta} car'}]});
-    add(3, {type:'PrimitiveNode', isVirtualNode:true, properties:{'Run widget replace on values':true}, widgets:[{value:'no serializer %year%'}]});
-    links.set(10, {origin_id:2}); links.set(11, {origin_id:3});
-    const replaced = [];
-    const replaceText = (from, value) => { replaced.push(from); return value.replace('%year%', '2026'); };
-    assert.equal(await primitiveTextValue(target, 'text', {replaceText}), 'a %year% alpha car', 'replace stays off unless the Primitive asks for it');
-    assert.deepEqual(calls, [['a %year% {alpha|beta} car', 0]], 'serialized once, without a node, so widgets_values is not touched');
-    assert.equal(widget.value, 'typed under the link', 'the typed text is restored');
-    primitive.properties['Run widget replace on values'] = true;
-    assert.equal(await primitiveTextValue(target, 'text', {replaceText}), 'a 2026 alpha car');
-    assert.deepEqual(replaced, [graph]);
-    assert.equal(await primitiveTextValue(target, 'negative_text', {replaceText}), 'no serializer 2026', 'no widget serializer: the replaced value');
-    assert.equal(await primitiveTextValue(target, 'negative_text'), 'no serializer %year%', 'no replacer: the value as is');
-    const failing = () => { throw new Error('not this host'); };
-    assert.equal(await primitiveTextValue(target, 'negative_text', {replaceText:failing}), 'no serializer %year%', 'a replacer that fails leaves the value');
-    widget.serializeValue = () => { throw new Error('broken serializer'); };
-    await assert.rejects(primitiveTextValue(target, 'text'), /broken serializer/);
-    assert.equal(widget.value, 'typed under the link', 'restored even when the serializer throws');
-});
-
-test('installing the preference wraps findInputByType and restores nothing it did not own', async () => {
-    const {preferTextInputs} = await source;
-    const calls = [];
-    const prototype = {findInputByType(type) { calls.push(type); return {index:1,slot:this.inputs[1]}; }};
-    preferTextInputs(prototype, ['text']);
-    const node = Object.assign(Object.create(prototype), pairNode());
-    assert.equal(node.findInputByType('STRING').index, 3);
-    assert.deepEqual(calls, []);
-    assert.equal(node.findInputByType('CLIP').index, 1);
-    node.inputs[3].link = 9;
-    assert.equal(node.findInputByType('STRING').index, 1, 'the main prompt is taken: fall back to the frontend');
-    assert.deepEqual(calls, ['CLIP','STRING']);
-    const bare = {};
-    preferTextInputs(bare, ['text']);
-    assert.equal(bare.findInputByType, undefined, 'an older frontend without findInputByType is left unchanged');
-});
-
-test('a drop point over a visible prompt box or its note picks that box input (#343 review M1)', async () => {
-    const {textInputAtPoint} = await source;
-    const box = (left, top, width, height) => ({getBoundingClientRect:() => ({left, top, width, height, right:left + width, bottom:top + height})});
-    const node = pairNode();
-    const targets = [{name:'text',element:box(0,0,100,100)},{name:'negative_text',element:box(120,0,100,100)},{name:'text',element:box(0,0,0,0)},{name:'missing',element:box(300,0,50,50)}];
-    assert.equal(textInputAtPoint(node, [150,50], targets).name, 'negative_text');
-    assert.equal(textInputAtPoint(node, [10,10], targets).name, 'text');
-    assert.equal(textInputAtPoint(node, [110,50], targets), undefined, 'between the boxes');
-    assert.equal(textInputAtPoint(node, [320,10], targets), undefined, 'a target whose input the node lacks');
-    assert.equal(textInputAtPoint(node, [0,0], [{name:'text',element:box(0,0,0,0)}]), undefined, 'a hidden target');
-});
-
-test('a linked Classic text box gives its row back and gets its size back on disconnect (#343 review M5)', async () => {
-    const {collapseLinkedWidget} = await source;
-    const own = () => 120;
-    const widget = {options:{getMinHeight:own}};
-    collapseLinkedWidget(widget, true);
-    assert.equal(widget.options.getMinHeight(), 0);
-    assert.equal(widget.options.getMaxHeight(), 0);
-    collapseLinkedWidget(widget, true);
-    collapseLinkedWidget(widget, false);
-    assert.equal(widget.options.getMinHeight, own);
-    assert.equal('getMaxHeight' in widget.options, false, 'an option it did not have is removed again');
-    collapseLinkedWidget(widget, false);
-    assert.equal(widget.options.getMinHeight, own);
-    collapseLinkedWidget(undefined, true);
-    collapseLinkedWidget({}, true);
-});

tests/js/workspace-activity-kinds.test.js

@@ -126,7 +126,7 @@ test('held legacy jobs read "(admin page)" with no outcomes', async () => {
 
 test('unknown and generic kinds show no tiles of another kind', async () => {
     const { kindOf, viewOf } = await source;
-    for (const kind of ['backup', '', 'constructor', '__proto__', 'health']) {
+    for (const kind of ['maintenance', '', 'constructor', '__proto__', 'health']) {
         const view = kindOf(kind);
         assert.deepEqual([view.tiles, view.outcomes, [...view.openable]], [[], [], []], kind);
         assert.deepEqual([view.log, view.cancelLabel], ['Job log', 'Cancel job']);
@@ -146,82 +146,3 @@ test('unknown and generic kinds show no tiles of another kind', async () => {
     assert.deepEqual([...partial.openable], ['added']);
     assert.equal(partial.log, 'Scan log');
 });
-
-// System S7 (carry-over from S6): the maintenance jobs read as themselves in Activity, with their own counters, a
-// report like every job, and Cancel only when the server can stop them.
-test('a maintenance apply shows its title, changed / protected / errors and no Cancel', async () => {
-    const { kindOf, viewOf, canCancel } = await source;
-    const { finishToast, startToast, pillParts, outcomeLine } = await store;
-    const apply = job({ kind: 'maintenance', title: 'Duplicate prompt text', progress: 0, processed: 0, total: 0,
-        counters: { changed: 3, protected: 1, errors: 0 }, scope: { operation: 'duplicate_prompts' }, cancellable: false });
-    const view = kindOf('maintenance');
-    assert.equal(viewOf(apply), view);
-    assert.deepEqual(view.tiles, [['changed', 'Changed', 'added'], ['protected', 'Protected', ''], ['errors', 'Errors', 'bad']]);
-    assert.deepEqual(view.outcomes, [['changed', 'Changed'], ['errors', 'Errors'], ['protected', 'Protected']]);
-    assert.deepEqual([...view.openable], []);
-    assert.deepEqual([view.log, view.cancelLabel], ['Maintenance log', 'Cancel job']);
-    assert.equal(canCancel(apply), false);
-    // Indeterminate while it runs: the title alone, never a made-up percentage.
-    assert.equal(pillParts(apply).text, 'Duplicate prompt text');
-    assert.equal(startToast(apply), 'Duplicate prompt text started.');
-    assert.equal(outcomeLine(apply), '3 changed · 0 errors');
-    assert.equal(finishToast({ ...apply, state: 'finished' }), 'Duplicate prompt text finished · 3 changed');
-    // A failed apply says why, so plan-changed asks for a new review.
-    const changed = 'The library changed since the review; nothing was changed. Review the plan again.';
-    assert.equal(finishToast({ ...apply, state: 'failed', status_line: changed, counters: { changed: 0, protected: 1, errors: 1 } }),
-        `Duplicate prompt text failed · ${changed}`);
-    assert.equal(finishToast({ ...apply, state: 'failed', status_line: '' }), 'Duplicate prompt text failed · 0 errors');
-    // Store each workflow once is a cancellable maintenance job: Cancel shows while it runs.
-    const migration = { ...apply, title: 'Store each workflow once', cancellable: true };
-    assert.equal(canCancel(migration), true);
-    assert.equal(finishToast({ ...migration, state: 'cancelled' }), 'Store each workflow once cancelled · 3 changed');
-});
-
-test('a duplicate search counts groups, opens their first copy and cancels as a search', async () => {
-    const { kindOf, viewOf, canCancel } = await source;
-    const { finishToast, startToast, pillParts, outcomeLine } = await store;
-    const find = job({ kind: 'duplicates', title: 'Find duplicate image files', processed: 5, total: 10, progress: 50,
-        counters: { groups_found: 0 }, scope: { output_folders: 2 } });
-    const view = kindOf('duplicates');
-    assert.equal(viewOf(find), view);
-    assert.deepEqual(view.tiles, [['groups_found', 'Groups found', '']]);
-    assert.deepEqual(view.outcomes, [['groups_found', 'Groups found']]);
-    assert.deepEqual([...view.openable], ['groups_found']);
-    assert.deepEqual([view.log, view.cancelLabel], ['Search log', 'Cancel search']);
-    assert.equal(canCancel(find), true);
-    assert.equal(pillParts(find).text, 'Finding duplicates · 50% · 5 / 10');
-    assert.equal(startToast(find), 'Duplicate search started.');
-    assert.equal(view.scope(find), '2 output folders');
-    const found = { ...find, state: 'finished', counters: { groups_found: 12 } };
-    assert.equal(outcomeLine(found), '12 groups found');
-    assert.equal(finishToast(found), 'Duplicate search finished · 12 groups found');
-    assert.equal(finishToast({ ...find, state: 'cancelled' }), 'Duplicate search cancelled · 0 groups found');
-    assert.equal(finishToast({ ...found, counters: { groups_found: 1 } }), 'Duplicate search finished · 1 group found');
-});
-
-test('a duplicate cleanup counts removed, kept and errors and cannot be cancelled', async () => {
-    const { kindOf, viewOf, canCancel } = await source;
-    const { finishToast, pillParts, outcomeLine } = await store;
-    const cleanup = job({ kind: 'duplicate_cleanup', title: 'Remove duplicate image files', processed: 1, total: 4,
-        progress: 25, counters: { removed: 1, kept: 0, errors: 0 }, cancellable: false });
-    const view = kindOf('duplicate_cleanup');
-    assert.equal(viewOf(cleanup), view);
-    assert.deepEqual(view.tiles, [['removed', 'Removed', 'added'], ['kept', 'Kept', ''], ['errors', 'Errors', 'bad']]);
-    assert.deepEqual(view.outcomes, [['removed', 'Removed'], ['errors', 'Errors'], ['kept', 'Kept']]);
-    assert.deepEqual([...view.openable], ['kept']);
-    assert.deepEqual([view.log, view.cancelLabel], ['Cleanup log', 'Cancel job']);
-    assert.equal(canCancel(cleanup), false);
-    assert.equal(pillParts(cleanup).text, 'Removing duplicate files · 25% · 1 / 4');
-    assert.equal(outcomeLine(cleanup), '1 removed · 0 errors');
-    assert.equal(finishToast({ ...cleanup, state: 'finished', counters: { removed: 3, kept: 1, errors: 1 } }),
-        'Duplicate cleanup finished · 3 removed · 1 error');
-});
-
-test('a failed duplicate cleanup says the server reason (S7 review M3)', async () => {
-    const { finishToast } = await store;
-    const reason = 'The sources changed since the search. Search for duplicates again.';
-    const failed = job({ kind: 'duplicate_cleanup', title: 'Remove duplicate image files', state: 'failed', status_line: reason,
-        counters: { removed: 0, kept: 0, errors: 1 }, cancellable: false });
-    assert.equal(finishToast(failed), `Duplicate cleanup failed · ${reason}`);
-    assert.equal(finishToast({ ...failed, status_line: '' }), 'Duplicate cleanup failed · 0 removed · 1 error');
-});

tests/js/workspace-activity-store.test.js

@@ -344,7 +344,7 @@ test('unknown kinds get the generic view without the scan tiles', async () => {
         ['no_metadata', 'No usable metadata'], ['known', 'Already known']]);
     assert.deepEqual([...scan.openable].sort(), ['added', 'known']);
     assert.deepEqual([scan.log, scan.cancel], ['Scan log', 'Cancel scan']);
-    for (const kind of ['backup', '', 'constructor', '__proto__']) {
+    for (const kind of ['maintenance', '', 'constructor', '__proto__']) {
         const view = jobView(kind);
         assert.deepEqual([view.tiles, view.outcomes, [...view.openable]], [[], [], []]);
         assert.deepEqual([view.log, view.cancel], ['Job log', 'Cancel job']);
@@ -437,16 +437,3 @@ test('numbers group the way the server writes them, whatever the browser locale'
         Number.prototype.toLocaleString = original;
     }
 });
-
-test('a busy start names the job the server named, not the first running one (S7 review M9)', async () => {
-    const { createActivityStore } = await source;
-    const { world, ...deps } = harness();
-    const store = createActivityStore(deps);
-    const holder = 'b'.repeat(32);
-    // Two read jobs run side by side; the server says the second one holds the slot.
-    world.list = [summary(), summary({ id: holder, kind: 'duplicates', title: 'Find duplicate image files' })];
-    world.postError = Object.assign(apiError(409, 'busy', 'busy'),
-        { running: { id: holder, title: 'Find duplicate image files' } });
-    const busy = await store.start('duplicates');
-    assert.deepEqual([busy.busy.id, busy.busy.title], [holder, 'Find duplicate image files']);
-});

tests/js/workspace-history-media.test.js

@@ -40,22 +40,3 @@ test('stale inspection echoes use the canonical recovery vocabulary and identity
     }
 });
 test('the recorded output inspector cover is its preview, not the original (#249)',()=>{const a=adapter(),target=media('2',1);const record=a.toRecord(envelope(target),target,extractGenerationFacts);assert.deepEqual(record.preview,{url:target.thumbnail_url});assert.notEqual(record.preview.url,record.download.url);});
-
-// #317 M3 follow-up: Firefox may decode JPEG XL without listing image/jxl in Accept, so the cover URL says so itself.
-test('the recorded output cover asks for JPEG XL only where this browser decodes it',async()=>{
-    const support=await import('../../web/js/workspace/thumbnail-support.mjs');
-    const a=adapter(),target=media('2',1);
-    const probe=ok=>({createImage:()=>({set src(_){queueMicrotask(()=>ok?this.onload():this.onerror());}})});
-    try {
-        support.resetJxlSupport();
-        assert.equal(a.toRecord(envelope(target),target,extractGenerationFacts).preview.url,target.thumbnail_url,'unknown: no flag');
-        await support.detectJxlSupport(probe(true));
-        const flagged=new URL(a.toRecord(envelope(target),target,extractGenerationFacts).preview.url,'http://localhost/');
-        assert.equal(flagged.searchParams.get('jxl'),'1');
-        assert.equal(flagged.searchParams.getAll('jxl').length,1);
-        assert.equal(`${flagged.pathname}?${new URLSearchParams([...flagged.searchParams].filter(([k])=>k!=='jxl'))}`,target.thumbnail_url);
-        support.resetJxlSupport();
-        await support.detectJxlSupport(probe(false));
-        assert.equal(a.toRecord(envelope(target),target,extractGenerationFacts).preview.url,target.thumbnail_url,'no support: no flag');
-    } finally {support.resetJxlSupport();}
-});

tests/js/workspace-image-card-media.test.js

@@ -1,71 +0,0 @@
-// #317: a card's media is the listing's thumbnail (WebP, JPEG XL or JPEG), never something the browser cannot show:
-// a JPEG XL thumbnail in a browser without JPEG XL support loads the original, and a thumbnail that fails to load falls
-// back to the original. A video whose preview fails still swaps back to its own element (#249).
-import test from 'node:test';
-import assert from 'node:assert/strict';
-import { mountedDom } from './helpers/mounted-dom.mjs';
-
-const support = await import('../../web/js/workspace/thumbnail-support.mjs');
-const { cardMedia } = await import('../../web/js/workspace/image-card.mjs');
-
-function withDom(run) {
-    const dom = mountedDom();
-    dom.win.ApiClient = { resolveUrl: url => `http://host${url}` };
-    try { return run(dom); } finally { support.resetJxlSupport(); dom.restore(); }
-}
-
-const image = (thumbnail, extra = {}) => ({ root_index: 0, path: 'a.png', filename: 'a.png', url: '/serve/a.png?root=0',
-    thumbnail_url: thumbnail, ...extra });
-
-test('a WebP thumbnail is the card media and falls back to the original when it fails', () => withDom(() => {
-    const node = cardMedia(image('/serve/thumbnails/a_thumb.webp?root=0'));
-    assert.equal(node.tagName, 'img');
-    assert.equal(node.src, 'http://host/serve/thumbnails/a_thumb.webp?root=0');
-    node.fire('error');
-    assert.equal(node.src, 'http://host/serve/a.png?root=0');
-}));
-
-test('a JPEG XL thumbnail loads the original where this browser cannot show JPEG XL', async () => {
-    support.resetJxlSupport();
-    await support.detectJxlSupport({ createImage: () => ({ set src(_) { queueMicrotask(() => this.onerror()); } }) });
-    const dom = mountedDom();
-    dom.win.ApiClient = { resolveUrl: url => `http://host${url}` };
-    try {
-        assert.equal(support.jxlSupport(), false);
-        const node = cardMedia(image('/serve/thumbnails/a_thumb.jxl?root=0'));
-        assert.equal(node.src, 'http://host/serve/a.png?root=0');
-    } finally { support.resetJxlSupport(); dom.restore(); }
-});
-
-test('a JPEG XL thumbnail is used where this browser shows JPEG XL', async () => {
-    await support.detectJxlSupport({ createImage: () => ({ set src(_) { queueMicrotask(() => this.onload()); } }) });
-    const dom = mountedDom();
-    dom.win.ApiClient = { resolveUrl: url => `http://host${url}` };
-    try {
-        const node = cardMedia(image('/serve/thumbnails/a_thumb.jxl?root=0'));
-        assert.equal(node.src, 'http://host/serve/thumbnails/a_thumb.jxl?root=0');
-    } finally { support.resetJxlSupport(); dom.restore(); }
-});
-
-test('a video whose preview fails still swaps back to its own element', () => withDom(dom => {
-    const holder = new dom.Node('div');
-    const node = cardMedia(image('/serve/thumbnails/c_thumb.webp?root=0', { path: 'c.mp4', filename: 'c.mp4', url: '/serve/c.mp4?root=0', is_video: true }));
-    holder.append(node);
-    node.replaceWith = replacement => { holder.children = [replacement]; };
-    node.fire('error');
-    assert.equal(holder.children[0].tagName, 'video');
-    assert.equal(holder.children[0].src, 'http://host/serve/c.mp4?root=0');
-}));
-
-test('a video with a JPEG XL thumbnail keeps its own element where JPEG XL cannot be shown (review M2)', async () => {
-    support.resetJxlSupport();
-    await support.detectJxlSupport({ createImage: () => ({ set src(_) { queueMicrotask(() => this.onerror()); } }) });
-    const dom = mountedDom();
-    dom.win.ApiClient = { resolveUrl: url => `http://host${url}` };
-    try {
-        const node = cardMedia(image('/serve/thumbnails/c_thumb.jxl?root=0',
-            { path: 'c.mp4', filename: 'c.mp4', url: '/serve/c.mp4?root=0', is_video: true }));
-        assert.equal(node.tagName, 'video');
-        assert.equal(node.src, 'http://host/serve/c.mp4?root=0');
-    } finally { support.resetJxlSupport(); dom.restore(); }
-});

tests/js/workspace-inspection-state.test.js

@@ -913,26 +913,6 @@ test('record carries the listing thumbnail as its preview, never another file (#
     assert.deepEqual(toRecord(data, video, extractGenerationFacts).preview, { url: video.thumbnail_url });
 });
 
-test('the preview may be any thumbnail format the file owns (#317)', () => {
-    const toRecord = contract('toInspectionRecord'), entry = image();
-    const base = '/prompt_manager/images/serve/thumbnails/folder/a%20%23%25_thumb';
-    for (const extension of ['.webp', '.jxl', '.jpg', '.png']) {
-        const thumbnail_url = `${base}${extension}?v=3&root=0&root_scope=${scopeA}`;
-        assert.deepEqual(toRecord(envelope(entry), { ...entry, thumbnail_url }, extractGenerationFacts).preview, { url: thumbnail_url }, extension);
-    }
-    // Not a thumbnail format, upper case, no extension, or a legacy name another file owns: no preview.
-    for (const extension of ['.txt', '.WEBP', '', '.gif', '.jpeg', '.webp.png']) {
-        const thumbnail_url = `${base}${extension}?root=0&root_scope=${scopeA}`;
-        assert.equal(toRecord(envelope(entry), { ...entry, thumbnail_url }, extractGenerationFacts).preview, null, extension);
-    }
-    const video = { root_index: 0, path: 'clip.MP4', filename: 'clip.MP4', url: `/prompt_manager/images/serve/clip.MP4?root=0&root_scope=${scopeA}`, root_scope: scopeA };
-    const data = envelope(video); data.file = { ...data.file, media_type: 'video', extension: '.mp4', format: 'MP4' };
-    for (const [extension, owned] of [['.webp', true], ['.jxl', true], ['.jpg', true], ['.png', false]]) {
-        const thumbnail_url = `/prompt_manager/images/serve/thumbnails/clip_thumb${extension}?root=0&root_scope=${scopeA}`;
-        assert.deepEqual(toRecord(data, { ...video, thumbnail_url }, extractGenerationFacts).preview, owned ? { url: thumbnail_url } : null, extension);
-    }
-});
-
 test("names the server quotes (parentheses, '!*') still match their original and preview (#249 M11)", () => {
     const toRecord = contract('toInspectionRecord');
     const entry = { root_index: 0, path: "folder/a (1)!'*.png", filename: "a (1)!'*.png", root_scope: scopeA,

tests/js/workspace-media-viewer.test.js

@@ -324,29 +324,3 @@ test('server adapters still cache-bust the original on open and retry', async ()
         } finally { view.dispose(); controller.dispose(); parentScope.dispose(); restoreGlobals(); f.restore(); }
     }
 });
-
-test('the viewer and its download always use the original, never the thumbnail in any format (#317)', async () => {
-    const {rootedFileAdapter, createInspectionController} = await import('../../web/js/workspace/inspection-state.mjs');
-    const scope = 'a'.repeat(64);
-    for (const extension of ['.webp', '.jxl', '.jpg', '.png']) {
-        const item = {root_index:0,path:'folder/a.png',filename:'a.png',root_scope:scope,is_video:false,
-            url:`/prompt_manager/images/serve/folder/a.png?root=0&root_scope=${scope}`,
-            thumbnail_url:`/prompt_manager/images/serve/thumbnails/folder/a_thumb${extension}?v=3&root=0&root_scope=${scope}`};
-        const f = mountedDom(), restoreGlobals = withViewerGlobals(f), parentScope = createScope(), paths = [];
-        const controller = createInspectionController({adapter:rootedFileAdapter,api:{get(url) {paths.push(url);return new Promise(() => {});}}});
-        const view = module.createMediaViewer({container:f.container,parentScope,inspectionController:controller,adapter:rootedFileAdapter,
-            onSelect:entry => controller.select(entry),sender:{open(){}}});
-        try {
-            view.open({items:[item],selectedKey:'0:folder/a.png'});
-            // The metadata read is the original's inspection, never a path under thumbnails/.
-            assert.deepEqual(paths, [`/prompt_manager/images/inspect/folder/a.png?root=0&root_scope=${scope}`], extension);
-            const media = f.walk(f.container,n => n.tagName === 'img');
-            assert.equal(media.length, 1, extension);
-            const url = new URL(media[0].src);url.searchParams.delete('_pm_viewer');
-            assert.equal(`${url.pathname}${url.search}`, item.url, extension);
-            assert.doesNotMatch(media[0].src, /thumbnails/, extension);
-            const download = f.walk(f.container,n => n.attributes['aria-label'] === 'Download original')[0];
-            if (download) assert.equal(download.href, item.url, extension);
-        } finally { view.dispose(); controller.dispose(); parentScope.dispose(); restoreGlobals(); f.restore(); }
-    }
-});

tests/js/workspace-system-backups.test.js

@@ -1,286 +0,0 @@
-// System › Backup & export (#249 System S9 Task 24): the concept's copy (app.js 691–693), the status line from
-// GET /backup/status (D103), the restore review's rows from the S8 preview (D105), its upload and refusals, the export
-// list, the restore job's Activity copy and the reload after a finished restore.
-const test = require('node:test');
-const assert = require('node:assert/strict');
-const fs = require('node:fs');
-const path = require('node:path');
-const { ApiError } = require('../../web/js/api-client.js');
-
-const backups = import('../../web/js/workspace/system-backups.mjs');
-const kinds = import('../../web/js/workspace/activity-kinds.mjs');
-const scan = import('../../web/js/workspace/activity-scan.mjs');
-const dialogs = import('../../web/js/workspace/workspace-dialogs.mjs');
-
-const CONCEPT = fs.readFileSync(path.join(__dirname, '../../docs/concepts/workspace/app.js'), 'utf8');
-// The module's code without its comments (which name the concept's prototype labels they replace).
-const SOURCE = fs.readFileSync(path.join(__dirname, '../../web/js/workspace/system-backups.mjs'), 'utf8')
-    .replace(/\/\*[\s\S]*?\*\//g, '').replace(/^\s*\/\/.*$/gm, '');
-
-const conceptSection = () => {
-    const start = CONCEPT.indexOf('case "backups":');
-    return CONCEPT.slice(start, CONCEPT.indexOf('break;', start));
-};
-
-test('the section keeps the concept copy: surfaces, descriptions and the two kept labels', () => {
-    const body = conceptSection();
-    for (const text of ['Database backup', 'A complete recovery snapshot, including prompt pairs, metadata and image links. Media files are separate.',
-        'Review restore…', 'Portable export', 'Export reusable recipes and tags as versioned JSON. This is distinct from a complete database backup.',
-        'Import / inspect file', 'Recovery policy', 'Proposed', 'Create a safety backup before maintenance', 'Scheduled database backups',
-        'Manual only', 'Daily', 'Weekly']) {
-        assert.ok(body.includes(text), `concept lacks ${text}`);
-        assert.ok(SOURCE.includes(text), `production lacks ${text}`);
-    }
-    // D103/D104: prototype copy is never shipped.
-    // D104 (M2): the toggle's concept line ("Preview a verified backup…") misstates the policy and is replaced too.
-    for (const sample of ['Simulate backup', 'Sample backup', 'Export sample JSON', 'Production feature proposal', 'A restore would be',
-        'Preview a verified backup before applying operations that change records.']) {
-        assert.ok(body.includes(sample));
-        assert.ok(!SOURCE.includes(sample), `production ships ${sample}`);
-    }
-});
-
-test('status line shows only server-reported backups (D103)', async () => {
-    const { backupStatusText, NO_BACKUP, STATUS_LOADING, STATUS_FAILED, whenText } = await backups;
-    assert.equal(backupStatusText(undefined), STATUS_LOADING);
-    assert.equal(backupStatusText(null), STATUS_FAILED);
-    assert.equal(backupStatusText({ success: true, safety_backups: [], last_download: null }), NO_BACKUP);
-    assert.equal(NO_BACKUP, 'No backup recorded.');
-    // A time the server did not send in a readable form names nothing.
-    assert.equal(backupStatusText({ safety_backups: [{ name: 'x', modified_at: 'soon' }], last_download: { at: 7, verified: true } }),
-        NO_BACKUP);
-    const at = '2026-10-25T09:30:00+00:00';
-    assert.equal(backupStatusText({ safety_backups: [], last_download: { at, bytes: 10, verified: true } }),
-        `Downloaded backup · ${whenText(at)} · verified.`);
-    assert.equal(backupStatusText({ safety_backups: [], last_download: { at, bytes: 10, verified: false } }),
-        `Downloaded backup · ${whenText(at)} · not verified.`);
-    const safety = [{ name: 'prompts.db.backup_2', bytes: 1, modified_at: at }, { name: 'prompts.db.backup_1', bytes: 1, modified_at: at }];
-    assert.equal(backupStatusText({ safety_backups: safety, last_download: null }), `Safety backup · ${whenText(at)} · 2 on disk.`);
-    assert.equal(backupStatusText({ safety_backups: safety.slice(0, 1), last_download: { at, verified: true } }),
-        `Downloaded backup · ${whenText(at)} · verified. Safety backup · ${whenText(at)} · 1 on disk.`);
-    assert.equal(whenText(undefined), null);
-});
-
-const PREVIEW = Object.freeze({
-    success: true, token: 'r'.repeat(43), expires_at: '2026-10-25T12:15:00+00:00',
-    summary: { prompts: 1234, positives: 900, pairs: 3, archived_pairs: 0, image_links: 56, runs: 1, saved_views: 2 },
-    schema: { migrated: true, library_state: true }, integrity: 'ok', documents: { repaired: 0, cleared: 0, images: 0 },
-    live: { prompts: 1, positives: 1, pairs: 0, archived_pairs: 0, image_links: 0, runs: 0, saved_views: 0 }, size: 4096,
-    safety_backup: { destination_label: 'prompts.db.backup_<date and time>' },
-});
-
-test('Review restore shows the real summary in the concept rows (D105)', async () => {
-    const { restoreGrid, restoreNote, countsText, integrityText, snapshotText, whenText } = await backups;
-    const file = { name: 'prompts_backup_20261025_093000.db', size: 3 * 2 ** 20, lastModified: Date.parse('2026-10-25T09:30:00Z') };
-    assert.deepEqual(restoreGrid(PREVIEW, file), [
-        ['Snapshot', `prompts_backup_20261025_093000.db · 3.0 MB · ${whenText('2026-10-25T09:30:00.000Z')}`],
-        ['Integrity', 'Verified'],
-        ['Migration', 'Upgraded to the current schema'],
-        ['Safety backup', 'Created before replacing (prompts.db.backup_<date and time>)'],
-        ['In the backup', '1,234 prompts · 56 image links · 3 saved pairs · 1 run'],
-        ['In the library now', '1 prompt · 0 image links · 0 saved pairs · 0 runs'],
-    ]);
-    assert.equal(restoreGrid({ ...PREVIEW, schema: { migrated: false } }, file)[2][1], 'Current schema');
-    assert.equal(restoreGrid({ ...PREVIEW, safety_backup: null }, file)[3][1], 'Created before replacing');
-    assert.equal(countsText({}), 'Not reported');
-    assert.equal(snapshotText({ name: 'a.db' }), 'a.db');
-    assert.equal(integrityText({ integrity: 'ok', documents: { repaired: 2, cleared: 1, images: 1 } }),
-        'Verified · repaired 2 damaged workflow documents · could not repair 1 workflow document: 1 image shows no workflow');
-    assert.equal(integrityText({ integrity: 'ok', documents: { repaired: 1, cleared: 2, images: 3 } }),
-        'Verified · repaired 1 damaged workflow document · could not repair 2 workflow documents: 3 images show no workflow');
-    assert.equal(integrityText({}), 'Not verified');
-    const now = Date.parse('2026-10-25T12:00:00+00:00');
-    assert.equal(restoreNote(PREVIEW, { now }), 'Restore replaces the whole library with this backup and runs alone in Activity. ' +
-        'Nothing changes until you restore. This review holds for 15 minutes.');
-    assert.equal(restoreNote({ expires_at: 'x' }, { now }), 'Restore replaces the whole library with this backup and runs alone ' +
-        'in Activity. Nothing changes until you restore.');
-});
-
-function response(status, body, headers = {}) {
-    return { ok: status >= 200 && status < 300, status, json: async () => {
-        if (body === undefined) throw new SyntaxError('not JSON');
-        return body;
-    }, headers: { get: name => headers[name] ?? null }, blob: async () => new Blob(['x']) };
-}
-
-test('invalid file shows the validator message; a refusal names its job; a lost answer stages nothing', async () => {
-    const { uploadRestore, reviewRefusal, REVIEW_FAILED, PREVIEW_URL } = await backups;
-    const file = new File(['not a database'], 'bad.db');
-    let seen;
-    const refuse = async (url, init) => { seen = [url, init.method, init.cache]; return response(400,
-        { success: false, code: 'invalid-backup', error: 'Not a SQLite database file' }); };
-    const invalid = await uploadRestore(file, { fetchUrl: refuse, ApiError }).catch(error => error);
-    assert.deepEqual(seen, [PREVIEW_URL, 'POST', 'no-store']);
-    assert.equal(reviewRefusal(invalid), "This file can't be restored: Not a SQLite database file.");
-    const busy = await uploadRestore(file, { ApiError, fetchUrl: async () => response(409,
-        { success: false, code: 'busy', error: 'Busy', running: { id: 'j1', title: 'Metadata scan' } }) }).catch(error => error);
-    assert.deepEqual(reviewRefusal(busy), ['Another job is running: ', { text: 'Metadata scan', href: '#/activity/j1' }, '.']);
-    const full = await uploadRestore(file, { ApiError, fetchUrl: async () => response(429,
-        { success: false, code: 'too-large', error: 'Two restores are already being reviewed. Discard one first.' }) })
-        .catch(error => error);
-    // I1: the server's "Discard one first" names nothing this page can do; the toast says what the user can.
-    assert.equal(reviewRefusal(full), (await backups).REVIEWS_FULL);
-    const proxy = await uploadRestore(file, { ApiError, fetchUrl: async () => response(502, undefined) }).catch(error => error);
-    assert.equal(reviewRefusal(proxy), REVIEW_FAILED);
-    const odd = await uploadRestore(file, { ApiError, fetchUrl: async () => response(200, { success: true }) }).catch(error => error);
-    assert.equal(reviewRefusal(odd), REVIEW_FAILED);
-    assert.equal(reviewRefusal(new Error('offline')), REVIEW_FAILED);
-    assert.deepEqual(await uploadRestore(file, { ApiError, fetchUrl: async () => response(200, PREVIEW) }), PREVIEW);
-});
-
-test('Cancel discards the stage through the api client and never throws', async () => {
-    const { discardRestore, PREVIEW_URL } = await backups;
-    const calls = [];
-    await discardRestore('a/b', { fetchUrl: async (url, init) => { calls.push([url, init.method]); return response(200, {}); } });
-    await discardRestore('gone', { fetchUrl: async () => { throw new TypeError('offline'); } });
-    assert.deepEqual(calls, [[`${PREVIEW_URL}/a%2Fb`, 'DELETE']]);
-});
-
-test('Export JSON downloads /library/export; secondary buttons download /export and /pairs/export (D103)', async () => {
-    const { EXPORTS } = await backups;
-    assert.deepEqual(EXPORTS.map(([label, url]) => [label, url]), [
-        ['Export JSON', '/prompt_manager/library/export'],
-        ['Export all prompts JSON', '/prompt_manager/export'],
-        ['Export saved pairs JSON', '/prompt_manager/pairs/export'],
-    ]);
-});
-
-test('a failed export toasts and saves nothing', async () => {
-    const { downloadExport, EXPORTS, EXPORT_FAILED } = await backups;
-    const toasts = [];
-    assert.equal(await downloadExport(EXPORTS[1], { fetchUrl: async () => response(500, {}), notify: text => toasts.push(text) }), false);
-    const aborted = AbortSignal.abort();
-    assert.equal(await downloadExport(EXPORTS[1], { fetchUrl: async () => { throw new Error('x'); }, notify: text => toasts.push(text),
-        signal: aborted }), false);
-    assert.deepEqual(toasts, [EXPORT_FAILED]);
-});
-
-test('Restore starts the job: Activity names it and ends with the server line', async () => {
-    const { finishToast, outcomeLine, pillParts, canCancel, startToast } = await kinds;
-    const job = { id: 'j', kind: 'restore', title: 'Database restore', state: 'running', cancellable: false, progress: 0, total: 0,
-        counters: { errors: 0 }, status_line: 'Restoring the database' };
-    assert.equal(startToast(job), 'Database restore started.');
-    assert.equal(pillParts(job).label, 'Restoring the database');
-    assert.equal(canCancel(job), false);
-    assert.equal(outcomeLine(job), '');
-    const done = { ...job, state: 'finished', status_line: 'Restored 3 prompts, 1 image link, 0 saved pairs and 0 runs' };
-    assert.equal(finishToast(done), 'Database restore finished · Restored 3 prompts, 1 image link, 0 saved pairs and 0 runs');
-    assert.equal(outcomeLine(done), done.status_line);
-    const failed = { ...job, state: 'failed', status_line: 'The library changed since the review; nothing was changed. Review the restore again.' };
-    assert.equal(finishToast(failed), `Database restore failed · ${failed.status_line}`);
-    assert.equal(finishToast({ ...job, state: 'failed', status_line: '' }), 'Database restore failed.');
-});
-
-test('views reload once after a restore this page saw finish; a failed restore changes nothing', async () => {
-    const { onRestoreFinished } = await backups;
-    let list = [];
-    const listeners = new Set();
-    const activity = { jobs: () => list, subscribe(listener) { listeners.add(listener); return () => listeners.delete(listener); } };
-    const emit = next => { list = next; for (const listener of listeners) listener(); };
-    let reloads = 0;
-    const stop = onRestoreFinished(activity, () => { reloads += 1; });
-    emit([{ id: 'old', kind: 'restore', state: 'finished' }]);
-    assert.equal(reloads, 0, 'a restore that ended before this page saw it run');
-    emit([{ id: 'a', kind: 'restore', state: 'running' }, { id: 's', kind: 'scan', state: 'running' }]);
-    emit([{ id: 'a', kind: 'restore', state: 'finished' }, { id: 's', kind: 'scan', state: 'finished' }]);
-    emit([{ id: 'a', kind: 'restore', state: 'finished' }]);
-    assert.equal(reloads, 1);
-    emit([{ id: 'b', kind: 'restore', state: 'running' }]);
-    emit([{ id: 'b', kind: 'restore', state: 'failed' }]);
-    assert.equal(reloads, 1);
-    stop();
-    assert.equal(listeners.size, 0);
-});
-
-test('a downloaded backup the server could not verify says so', async () => {
-    const { downloadDatabaseBackup, BACKUP_DONE, backupUnverified } = await scan;
-    const toasts = [];
-    const body = globalThis.document;
-    globalThis.document = { createElement: () => ({ click() {}, remove() {} }), body: { append() {} } };
-    try {
-        await downloadDatabaseBackup({ notify: text => toasts.push(text),
-            fetchUrl: async () => response(200, {}, { 'X-PromptManager-Verify': 'ok' }) });
-        await downloadDatabaseBackup({ notify: text => toasts.push(text),
-            fetchUrl: async () => response(200, {}, { 'X-PromptManager-Verify': 'Database does not contain a pair table' }) });
-    } finally {
-        globalThis.document = body;
-    }
-    assert.deepEqual(toasts, [BACKUP_DONE, backupUnverified('Database does not contain a pair table')]);
-    assert.equal(toasts[1], 'Database backup downloaded, but it did not pass verification: Database does not contain a pair table');
-});
-
-test('the Import dialog shares the rescan copy with Images (D15)', async () => {
-    const { rescanFinished, RESCAN_STARTED, RESCAN_FAILED } = await dialogs;
-    assert.equal(RESCAN_STARTED, 'Rescanning output folders…');
-    assert.equal(RESCAN_FAILED, 'Rescan could not finish. Try again.');
-    assert.equal(rescanFinished({ total: 1, roots: 2 }), 'Rescan finished. 1 file in 2 output folders.');
-    assert.equal(rescanFinished({ total: 1200, roots: 1 }), 'Rescan finished. 1,200 files in 1 output folder.');
-    assert.equal(rescanFinished(null), 'Rescan finished.');
-});
-
-test('applyPlan follows a started job even after its section left, and reports the outcome (S9 N5, I1)', async () => {
-    const { applyPlan } = await import('../../web/js/workspace/maintenance-review.mjs');
-    const job = { id: 'a'.repeat(32), kind: 'restore', title: 'Database restore', state: 'running' };
-    const tracked = [];
-    const store = { track: raw => { tracked.push(raw.id); return raw; }, load() {} };
-    const left = new AbortController();
-    left.abort();
-    const toasts = [], routes = [];
-    const outcome = await applyPlan({ api: { post: async () => ({ success: true, job }) }, store, scope: { signal: left.signal },
-        token: 't', notify: text => toasts.push(text), navigate: hash => routes.push(hash) });
-    // The page's store follows it (a finished restore must reload the views); the left section neither toasts nor opens it.
-    assert.deepEqual(tracked, [job.id]);
-    assert.deepEqual([toasts, routes], [[], []]);
-    assert.deepEqual(outcome, { job });
-    const busy = new ApiError(409, 'Busy', 'busy', null, { success: false, code: 'busy', running: { id: 'j1', title: 'Scan' } });
-    const live = { signal: new AbortController().signal };
-    const refused = await applyPlan({ api: { post: async () => { throw busy; } }, store, scope: live, token: 't',
-        notify: text => toasts.push(text), navigate: hash => routes.push(hash) });
-    assert.deepEqual(refused, { refused: busy });
-    assert.deepEqual(toasts, [['Another job is running: ', { text: 'Scan', href: '#/activity/j1' }, '.']]);
-});
-
-test('after an apply: follow a started job, reopen a busy refusal, release the token otherwise (I1)', async () => {
-    const { afterApply } = await backups;
-    const refusal = code => ({ refused: new ApiError(409, 'x', code, null, { success: false, code }) });
-    assert.equal(afterApply({ job: { id: 'j' } }), 'follow');
-    assert.equal(afterApply(refusal('busy')), 'reopen');
-    for (const outcome of [refusal('plan-used'), refusal('plan-expired'), refusal('plan-changed'), refusal('storage-changed'),
-        { refused: new TypeError('offline') }, { lost: true }, undefined]) {
-        assert.equal(afterApply(outcome), 'release');
-    }
-});
-
-test('a restore job that hands its review back reopens it once in the page that started it; any other end forgets it (I1)', async () => {
-    const { rememberRestore, onRestoreHandedBack } = await backups;
-    let list = [];
-    const listeners = new Set();
-    const activity = { jobs: () => list, subscribe(listener) { listeners.add(listener); return () => listeners.delete(listener); } };
-    const emit = next => { list = next; for (const listener of listeners) listener(); };
-    const reopened = [];
-    const stop = onRestoreHandedBack(activity, review => reopened.push(review.token));
-    rememberRestore('kept', { token: 'k' });
-    rememberRestore('done', { token: 'd' });
-    rememberRestore('gone', { token: 'g' });
-    emit([{ id: 'kept', kind: 'restore', state: 'running', scope: {} }]);
-    emit([{ id: 'kept', kind: 'restore', state: 'failed', scope: { failure: 'busy', review_kept: true } },
-        { id: 'done', kind: 'restore', state: 'finished', scope: {} },
-        { id: 'gone', kind: 'restore', state: 'failed', scope: { failure: 'busy' } }]);
-    emit(list);
-    assert.deepEqual(reopened, ['k']);
-    stop();
-    assert.equal(listeners.size, 0);
-});
-
-test('small files show KB; a full review store says what to do (N3, I1)', async () => {
-    const { snapshotText, reviewRefusal, EXPORTS } = await backups;
-    assert.equal(snapshotText({ name: 'a.db', size: 40 * 1024 }), 'a.db · 40 KB');
-    assert.equal(snapshotText({ name: 'a.db', size: 10 }), 'a.db · 1 KB');
-    assert.equal(snapshotText({ name: 'a.db', size: 3 * 2 ** 20 }), 'a.db · 3.0 MB');
-    const full = new ApiError(429, 'Two restores are already being reviewed. Discard one first.', 'too-large', null,
-        { success: false, code: 'too-large' });
-    assert.equal(reviewRefusal(full), 'Two restores are already being reviewed in another window. Discard one there, ' +
-        'or try again when it expires (15 minutes after it was reviewed).');
-    // N1: /export is the legacy list of every prompt.
-    assert.deepEqual(EXPORTS[1].slice(0, 2), ['Export all prompts JSON', '/prompt_manager/export']);
-});

tests/js/workspace-system-integrations.test.js

@@ -1,224 +0,0 @@
-// System › Integrations (#249 System S10 Task 27): the host values and saves behind the LoRA rows (D114), the D106
-// renderer and detection lines, and the D107 import review built from the server's plan.
-const test = require('node:test');
-const assert = require('node:assert/strict');
-const fs = require('node:fs');
-const path = require('node:path');
-
-const integrations = import('../../web/js/workspace/system-integrations.mjs');
-const kinds = import('../../web/js/workspace/activity-kinds.mjs');
-
-const CONCEPT = fs.readFileSync(path.join(__dirname, '../../docs/concepts/workspace/app.js'), 'utf8');
-const SOURCE = fs.readFileSync(path.join(__dirname, '../../web/js/workspace/system-integrations.mjs'), 'utf8');
-
-test('the section keeps the concept rows, labels and options in order', () => {
-    const start = CONCEPT.indexOf('case "integrations":');
-    const body = CONCEPT.slice(start, CONCEPT.indexOf('break;', start));
-    const rows = [...body.matchAll(/setting\("([^"]+)", "([^"]+)", "([^"]+)"/g)].map(([, id, label]) => [id, label]);
-    assert.deepEqual(rows.map(([id]) => id), ['send-destination', 'renderer', 'return-canvas', 'lora-enable', 'lora-triggers',
-        'civitai-key']);
-    for (const [id, label] of rows) {
-        assert.ok(SOURCE.includes(`id: '${id}', label: '${label}'`), `${id} keeps the concept label "${label}"`);
-    }
-    for (const option of ['Ask each time', 'Selected Prompt Manager node', 'Create a Prompt Manager (+/-) node',
-        'Follow host renderer', 'Classic', 'Nodes 2.0']) assert.ok(body.includes(option) && SOURCE.includes(`'${option}'`), option);
-    for (const surface of ['ComfyUI', 'LoRA & resources']) assert.ok(SOURCE.includes(`'h2', '${surface}'`), surface);
-    assert.ok(body.includes('"LoRA reference data", "Review and import resource metadata."'));
-    // Prototype copy is never shipped (Global constraints): the sample detection line and the mock warning.
-    assert.ok(!SOURCE.includes('Sample detection'));
-    assert.ok(!SOURCE.includes('Do not enter a real key'));
-    assert.ok(!SOURCE.includes('Simulate import'));
-});
-
-test('LoRA status becomes host values: drafted flags and read-only facts kept apart', async () => {
-    const { loraValues } = await integrations;
-    assert.deepEqual(loraValues({ enabled: true, trigger_words_enabled: false, path: 'custom_nodes/ComfyUI-Lora-Manager',
-        has_civitai_api_key: true, detected: true, detected_path: 'custom_nodes/ComfyUI-Lora-Manager', trigger_cache_loaded: true }), {
-        lora_enabled: true, lora_trigger_words_enabled: false, clear_civitai_api_key: false,
-        lora_path: 'custom_nodes/ComfyUI-Lora-Manager', lora_detected: true, lora_detected_path: 'custom_nodes/ComfyUI-Lora-Manager',
-        lora_detected_usable: true, lora_has_key: true, lora_cache_loaded: true,
-    });
-    const empty = loraValues({});
-    assert.equal(empty.lora_enabled, false);
-    assert.equal(empty.lora_path, '');
-    assert.equal(empty.lora_has_key, false);
-    // The key itself is never part of what the page holds from the server.
-    assert.ok(!Object.keys(loraValues({ civitai_api_key: 'secret' })).includes('civitai_api_key'));
-});
-
-test('host changes split between /lora/enable and /settings', async () => {
-    const { splitHostChanges } = await integrations;
-    assert.deepEqual(splitHostChanges({ lora_enabled: true, result_timeout: 5 }),
-        { lora: { lora_enabled: true }, settings: { result_timeout: 5 } });
-    assert.deepEqual(splitHostChanges({ result_timeout: 5 }), { lora: null, settings: { result_timeout: 5 } });
-    assert.deepEqual(splitHostChanges({ civitai_api_key: 'k', clear_civitai_api_key: false }),
-        { lora: { civitai_api_key: 'k', clear_civitai_api_key: false }, settings: null });
-    assert.deepEqual(splitHostChanges(undefined), { lora: null, settings: null });
-});
-
-test('key never prefilled; blank keeps; Clear saved key clears; saved through Save preferences (D114)', async () => {
-    const { loraPayload, keyText, KEY_COPY } = await integrations;
-    const saved = { lora_enabled: true, lora_trigger_words_enabled: false, lora_path: 'custom_nodes/LM', lora_has_key: true };
-    // The whole LoRA state goes with every save; the saved path is kept; no key unless one was typed.
-    assert.deepEqual(loraPayload({ lora_trigger_words_enabled: true }, saved),
-        { enabled: true, trigger_words_enabled: true, path: 'custom_nodes/LM' });
-    assert.deepEqual(loraPayload({ civitai_api_key: '  ' }, saved), { enabled: true, trigger_words_enabled: false, path: 'custom_nodes/LM' });
-    assert.deepEqual(loraPayload({ civitai_api_key: ' new-key ' }, saved),
-        { enabled: true, trigger_words_enabled: false, path: 'custom_nodes/LM', civitai_api_key: 'new-key' });
-    assert.deepEqual(loraPayload({ clear_civitai_api_key: true, civitai_api_key: 'ignored' }, saved),
-        { enabled: true, trigger_words_enabled: false, path: 'custom_nodes/LM', clear_civitai_api_key: true });
-    assert.deepEqual(loraPayload({ lora_enabled: true }, {}), { enabled: true, trigger_words_enabled: false, path: '' });
-    assert.equal(keyText({ lora_has_key: true }, {}), KEY_COPY.saved);
-    assert.equal(keyText({ lora_has_key: false }, {}), KEY_COPY.none);
-    assert.equal(keyText({ lora_has_key: true }, { clear_civitai_api_key: true }), KEY_COPY.clearing);
-    assert.equal(keyText({ lora_has_key: false }, { civitai_api_key: 'k' }), KEY_COPY.replacing);
-    assert.equal(keyText({}, {}), null);
-    assert.deepEqual(KEY_COPY, { saved: 'A key is saved.', none: 'No key saved.', clearing: 'The saved key is removed when you save.',
-        replacing: 'The new key replaces the saved one when you save.' });
-});
-
-test('LoRA rows show detected / enabled / cache-loaded separately', async () => {
-    const { detectionText, cacheText } = await integrations;
-    assert.equal(detectionText({ lora_detected: true, lora_detected_path: 'custom_nodes/ComfyUI-Lora-Manager' }),
-        'Detected: custom_nodes/ComfyUI-Lora-Manager.');
-    assert.equal(detectionText({ lora_detected: true, lora_detected_path: '' }), 'Detected.');
-    assert.equal(detectionText({ lora_detected: false }), 'Not detected in ComfyUI’s custom_nodes folders.');
-    assert.equal(detectionText({}), null);
-    // S10 review N5: a linked install outside custom_nodes is found but can't be enabled.
-    assert.equal(detectionText({ lora_detected: true, lora_detected_path: 'LoRA-Manager', lora_detected_usable: false }),
-        'Found at LoRA-Manager, but outside ComfyUI’s custom_nodes folders, so it can’t be enabled.');
-    assert.equal((await integrations).loraValues({ detected: true, detected_usable: false }).lora_detected_usable, false);
-    assert.equal(cacheText({ lora_cache_loaded: true }), 'Trigger words are loaded.');
-    assert.equal(cacheText({ lora_cache_loaded: false }), 'Trigger words are not loaded.');
-    assert.equal(cacheText({}), null);
-});
-
-test('host compatibility shows the detected renderer as status (D106)', async () => {
-    const { rendererText, RENDERER_COPY } = await integrations;
-    const host = (...renderers) => ({ hostId: 'h', label: 'PromptManager — ComfyUI', targets: renderers.map((renderer, id) =>
-        ({ id: String(id), roles: ['positive'], renderer })) });
-    assert.equal(rendererText([]), RENDERER_COPY.none);
-    assert.equal(rendererText(null), RENDERER_COPY.none);
-    assert.equal(rendererText([host()]), RENDERER_COPY.noNodes);
-    assert.equal(rendererText([host('vue')]), RENDERER_COPY.noNodes);
-    assert.equal(rendererText([host('classic')]), 'Detected: Classic (1 ComfyUI window).');
-    assert.equal(rendererText([host('nodes2', 'nodes2')]), 'Detected: Nodes 2.0 (1 ComfyUI window).');
-    assert.equal(rendererText([host('nodes2'), host('classic')]), 'Detected: Classic and Nodes 2.0 (2 ComfyUI windows).');
-});
-
-test('the import review shows replacement, blocked items and network effects (D107)', async () => {
-    const { importGrid } = await integrations;
-    const plan = { lora_files: 2221, with_metadata: 615, with_local_media: 476, skipped: 1606, current_imports: 5,
-        blocked_by_pairs: 0, planned_downloads: 4,
-        layout: { source: 'portable', settings_file: '~/ComfyUI/custom_nodes/LM/settings.json', error: null, mode: 'centralized',
-            library: 'comfyui', example_images: true },
-        scope: { count: 2, label: 'Replace 5 imported prompts with 2 LoRAs' }, protected: { count: 0, reasons: [] },
-        backup: { policy: 'on', destination_label: 'prompts.db.backup_<date and time>' }, network: { planned_downloads: 4, api_key: true },
-        media: { deletes_files: false, label: 'No files are removed; image links are replaced' } };
-    assert.deepEqual(importGrid(plan), [
-        ['LoraManager', 'portable settings · centralized storage · library comfyui'],
-        ['Scope', 'Replace 5 imported prompts with 2 LoRAs'],
-        ['Found', '2,221 metadata files · 615 LoRAs · 476 with local images'],
-        ['Protected', 'Nothing is protected'],
-        ['Network', 'Downloads up to 4 example images from CivitAI with your saved key'],
-        ['Backup', 'Create and verify before changes (prompts.db.backup_<date and time>)'],
-        ['Media on disk', 'No files are removed; image links are replaced'],
-    ]);
-    const blocked = importGrid({ ...plan, planned_downloads: 1, network: { api_key: false }, protected: { count: 2,
-        reasons: ['2 imported prompts used by saved pairs'] } });
-    assert.deepEqual(blocked[3], ['Protected', '2 imported prompts used by saved pairs']);
-    assert.deepEqual(blocked[4], ['Network', 'Downloads up to 1 example image from CivitAI']);
-    // A plan without a layout (no LoraManager row) and with no counts.
-    assert.deepEqual(importGrid({})[0], ['Scope', '0 LoRAs']);
-    assert.deepEqual(importGrid({})[1], ['Found', '0 metadata files · 0 LoRAs · 0 with local images']);
-    assert.deepEqual(importGrid({})[3], ['Network', 'No downloads']);
-    assert.deepEqual(importGrid({})[5], ['Media on disk', 'No files are removed']);
-    assert.deepEqual(importGrid({ ...plan, lora_files: 1, with_metadata: 1, with_local_media: 0 })[2],
-        ['Found', '1 metadata file · 1 LoRA · 0 with local images']);
-});
-
-test('the LoraManager row names what the import read, and an unusable layout closes the review (#355)', async () => {
-    const { layoutText, closeNote, LAYOUT_UNUSABLE, BLOCKED_NOTE, NOTHING_TO_IMPORT } = await integrations;
-    assert.equal(layoutText({ source: 'environment', mode: 'alongside', library: 'default', error: null }),
-        'environment settings · alongside storage · library default');
-    assert.equal(layoutText({ source: 'user config', mode: 'alongside', library: 'x', error: 'the settings file is not valid JSON' }),
-        'Not usable: the settings file is not valid JSON');
-    assert.equal(layoutText(null), null);
-    assert.equal(layoutText('nope'), null);
-    const error = 'the sidecar folder does not exist';
-    assert.equal(closeNote({ token: null, layout: { error } }),
-        'LoraManager settings: not usable: the sidecar folder does not exist. Nothing was changed.');
-    assert.equal(LAYOUT_UNUSABLE(error), closeNote({ token: null, layout: { error }, blocked_by_pairs: 2 }));
-    assert.equal(closeNote({ token: null, blocked_by_pairs: 1, layout: { error: null } }), BLOCKED_NOTE);
-    assert.equal(closeNote({ token: null }), NOTHING_TO_IMPORT);
-    assert.equal(closeNote({ token: 't', with_metadata: 0, current_imports: 0 }), NOTHING_TO_IMPORT);
-    assert.equal(closeNote({ token: 't', with_metadata: 1, current_imports: 0 }), null);
-    assert.equal(closeNote({ token: 't', with_metadata: 0, current_imports: 3 }), null);
-});
-
-test('a LoRA import job reads in Activity: tiles, outcomes and the kept collection on failure', async () => {
-    const { kindOf, finishToast, outcomeLine, viewOf } = await kinds;
-    const view = kindOf('lora_import');
-    assert.equal(view.pillVerb, 'Importing LoRAs');
-    assert.deepEqual(view.tiles.map(([group]) => group), ['imported', 'linked', 'skipped', 'downloaded', 'download_errors', 'errors']);
-    const counters = { imported: 3, linked: 1, skipped: 0, downloaded: 2, download_errors: 0, errors: 0 };
-    const job = { kind: 'lora_import', title: 'LoRA reference import', state: 'finished', cancellable: false, counters };
-    assert.equal(outcomeLine(job), '3 imported · 0 errors');
-    assert.equal(finishToast(job), 'LoRA import finished · 3 imported · 0 errors');
-    assert.equal(finishToast({ ...job, state: 'cancelled' }), 'LoRA import cancelled · 3 imported');
-    const failed = { ...job, state: 'failed', status_line: 'The import failed; the previous LoRA imports were kept.' };
-    assert.equal(finishToast(failed), 'LoRA import failed · The import failed; the previous LoRA imports were kept.');
-    assert.equal(finishToast({ ...failed, status_line: '' }), 'LoRA import failed · 3 imported · 0 errors');
-    assert.equal(viewOf(job).tiles.length, 6);
-    // The legacy page's held import (no counters) reads as the generic job.
-    assert.equal(viewOf({ kind: 'lora_import', title: 'LoRA import (admin page)', cancellable: false, counters: {} }).tiles.length, 0);
-});
-
-test('a failed import the files or saved pairs overtook is reviewed again in Integrations', async () => {
-    const { reviewAgainOf } = await import('../../web/js/workspace/activity-job-view.mjs');
-    const failed = failure => ({ kind: 'lora_import', state: 'failed', scope: { operation: 'lora_import', failure } });
-    for (const failure of ['plan-changed', 'storage-changed', 'plan-expired', 'blocked-by-pairs']) {
-        assert.deepEqual(reviewAgainOf(failed(failure)), { section: '#/system/integrations' }, failure);
-    }
-    assert.equal(reviewAgainOf(failed('import-failed')), null);
-    assert.equal(reviewAgainOf({ ...failed('plan-changed'), state: 'cancelled' }), null);
-});
-
-test('a host save in two parts reports exactly which part saved (S10 review I3)', async () => {
-    const { writeHostInParts } = await integrations;
-    const saved = { lora_enabled: true, lora_trigger_words_enabled: false, lora_path: 'custom_nodes/LM' };
-    const calls = [];
-    const ok = revision => async body => { calls.push(body); return { success: true, persisted: true, revision }; };
-    const refuse = (code, message) => async body => { calls.push(body); throw Object.assign(new Error(message), { code }); };
-    const run = (changes, postLora, postSettings) => writeHostInParts({ changes, saved, expected_revision: 'r0', postLora, postSettings });
-
-    // Both parts: the second carries the revision the first returned.
-    assert.equal((await run({ lora_trigger_words_enabled: true, result_timeout: 5 }, ok('r1'), ok('r2'))).revision, 'r2');
-    assert.deepEqual(calls.map(body => body.expected_revision), ['r0', 'r1']);
-    // LoRA saved, settings refused: the LoRA keys and the new revision ride on the settings error.
-    calls.length = 0;
-    const later = await run({ lora_trigger_words_enabled: true, gallery_root_paths: ['x'] }, ok('r1'),
-        refuse('invalid-source', 'x cannot be used')).catch(error => error);
-    assert.equal(later.code, 'invalid-source');
-    assert.deepEqual(later.partial, { saved: ['lora_trigger_words_enabled'], revision: 'r1' });
-    // LoRA refused (not detected), settings still sent with the unchanged revision and saved.
-    calls.length = 0;
-    const first = await run({ lora_enabled: true, result_timeout: 5 }, refuse(null, 'LoraManager not found'), ok('r2'))
-        .catch(error => error);
-    assert.equal(first.message, 'LoraManager not found');
-    assert.deepEqual(first.partial, { saved: ['result_timeout'], revision: 'r2' });
-    assert.deepEqual(calls.map(body => body.expected_revision), ['r0', 'r0']);
-    // A conflict on the first write stops there; a lone part fails as itself.
-    calls.length = 0;
-    const conflict = await run({ lora_enabled: false, result_timeout: 5 }, refuse('settings-changed', 'changed'), ok('r2'))
-        .catch(error => error);
-    assert.equal(conflict.code, 'settings-changed');
-    assert.equal(conflict.partial, undefined);
-    assert.equal(calls.length, 1);
-    const alone = await run({ result_timeout: 5 }, ok('r1'), refuse('busy', 'scan running')).catch(error => error);
-    assert.equal(alone.code, 'busy');
-    assert.equal(alone.partial, undefined);
-    const both = await run({ lora_enabled: true, result_timeout: 5 }, refuse(null, 'a'), refuse(null, 'b')).catch(error => error);
-    assert.equal(both.message, 'b');
-    assert.equal(both.partial, undefined);
-});

tests/js/workspace-system-maintenance.test.js

@@ -1,171 +0,0 @@
-// System › Maintenance (#249 System S7 Task 19): the concept's rows (app.js 688–690), the D100 plan review built from
-// the server's Plan, the D101 duplicates review's keep entries and copy, and the D102 metadata cache row.
-const test = require('node:test');
-const assert = require('node:assert/strict');
-const fs = require('node:fs');
-const path = require('node:path');
-
-const maintenance = import('../../web/js/workspace/system-maintenance.mjs');
-const review = import('../../web/js/workspace/maintenance-review.mjs');
-const jobView = import('../../web/js/workspace/activity-job-view.mjs');
-
-const CONCEPT = fs.readFileSync(path.join(__dirname, '../../docs/concepts/workspace/app.js'), 'utf8');
-
-test('the section lists the concept rows in its order, labels and danger marks', async () => {
-    const { MAINTENANCE_SURFACES } = await maintenance;
-    const start = CONCEPT.indexOf('case "maintenance":');
-    const body = CONCEPT.slice(start, CONCEPT.indexOf('break;', start));
-    const concept = [...body.matchAll(/operation\("([^"]+)", "([^"]+)", "[^"]+", "([^"]+)"(?:, '[^']*'|, "")?(, true)?\)/g)]
-        .map(([, title, description, label, danger]) => [title, description, label, Boolean(danger)]);
-    const surfaces = [...body.matchAll(/<section class="surface"><h2>([^<]+)<\/h2>/g)].map(match => match[1]);
-    assert.deepEqual(MAINTENANCE_SURFACES.map(([heading]) => heading), surfaces.map(text => text.replace('&amp;', '&')));
-    const production = MAINTENANCE_SURFACES.flatMap(([, rows]) => rows.map(([title, description, label, , danger = false]) =>
-        [title, description, label, danger]));
-    assert.deepEqual(production, concept.map(([title, ...rest]) => [title.replace('&amp;', '&'), ...rest]));
-    assert.equal(production.length, 8);
-});
-
-const PLAN = Object.freeze({
-    success: true, token: 't'.repeat(43), operation: 'duplicate_prompts', expires_at: '2026-10-24T12:15:00+00:00',
-    scope: { count: 3, label: '3 duplicate prompts in 2 groups' },
-    protected: { count: 1, reasons: ['1 group belongs to a saved pair'] },
-    backup: { policy: 'on', destination_label: 'prompts.db.backup_<date and time>', expected_bytes: 4096 },
-    media: { deletes_files: false, label: 'No files are deleted' },
-    disk: { free_bytes: 2 ** 30, required_bytes: 2 ** 24, sufficient: true },
-    details: [{ label: 'a cat', detail: '2 copies merged into the oldest' }, { label: 'a dog', detail: '' }],
-});
-
-test("plan dialog shows the server's scope, protected, backup policy and media lines (D100)", async () => {
-    const { planGrid, planNote, detailLines, backupText, protectedText, OPERATION_TITLES } = await review;
-    assert.deepEqual(planGrid(PLAN), [
-        ['Scope', '3 duplicate prompts in 2 groups'],
-        ['Protected', '1 group belongs to a saved pair'],
-        ['Backup', 'Create and verify before changes (prompts.db.backup_<date and time>)'],
-        ['Media on disk', 'No files are deleted'],
-    ]);
-    assert.equal(backupText({ policy: 'off', destination_label: 'x' }), 'No safety backup (the policy is off)');
-    assert.equal(backupText({ policy: 'required', destination_label: 'prompts.db.pre-workflow-storage_<date and time>' }),
-        'Always created and verified first (prompts.db.pre-workflow-storage_<date and time>)');
-    assert.equal(backupText(undefined), 'Create and verify before changes');
-    assert.equal(protectedText({ count: 0, reasons: [] }), 'Nothing is protected');
-    assert.equal(protectedText({ count: 2, reasons: [] }), '2 records kept');
-    assert.equal(protectedText({ count: 3, reasons: ['1 saved pair', '2 titled parents'] }), '1 saved pair · 2 titled parents');
-    assert.deepEqual(planGrid({ scope: { count: 1 } })[0], ['Scope', '1 record']);
-    assert.deepEqual(planGrid({})[3], ['Media on disk', 'No files are removed']);
-    const now = Date.parse('2026-10-24T12:00:00+00:00');
-    assert.equal(planNote(PLAN, { now }), 'Nothing changes until you apply. This review holds for 15 minutes.');
-    assert.equal(planNote({ ...PLAN, expires_at: 'soon' }, { now }), 'Nothing changes until you apply.');
-    assert.equal(planNote({ ...PLAN, expires_at: '2026-10-24T12:00:20+00:00', disk: { free_bytes: 2 ** 20, required_bytes: 3 * 2 ** 20,
-        sufficient: false } }, { now }), 'Nothing changes until you apply. This review holds for 1 minute. ' +
-        'Not enough free disk space: about 3.0 MB is needed and 1.0 MB is free.');
-    assert.deepEqual(detailLines(PLAN), ['a cat · 2 copies merged into the oldest', 'a dog']);
-    assert.deepEqual(detailLines({ details: [null, { label: 7 }] }), []);
-    assert.equal(OPERATION_TITLES.missing_links, 'Missing-file links');
-    // S7 review M8: the workflow migration's plan reads its own title (its job is started outside Maintenance).
-    assert.equal(OPERATION_TITLES.workflow_storage, 'Store each workflow once');
-});
-
-test('a refused apply names its reason; a lost answer is not confirmed', async () => {
-    const { applyRefusal, reviewRefusal, NOT_CONFIRMED, APPLY_FAILED, REVIEW_FAILED } = await review;
-    const error = (status, code, message, extra = {}) => Object.assign(new Error(message), { status, code, ...extra });
-    assert.deepEqual(applyRefusal(new TypeError('Failed to fetch')), { toast: NOT_CONFIRMED, lost: true });
-    assert.deepEqual(NOT_CONFIRMED, ['Outcome not confirmed. ', { text: 'Check Activity', href: '#/activity' },
-        ' before applying it again.']);
-    const busy = applyRefusal(error(409, 'busy', 'busy', { running: { id: 'a'.repeat(32), title: 'Scan for metadata' } }));
-    assert.deepEqual(busy.toast, ['Another job is running: ', { text: 'Scan for metadata', href: `#/activity/${'a'.repeat(32)}` }, '.']);
-    assert.deepEqual(applyRefusal(error(409, 'plan-used', 'used', { job: { id: 'b'.repeat(32), title: 'Optimize database' } })).toast,
-        ['This plan was already applied: ', { text: 'Optimize database', href: `#/activity/${'b'.repeat(32)}` }, '.']);
-    assert.deepEqual(applyRefusal(error(409, 'plan-used', 'used', { job: { id: 'b'.repeat(32), title: null } })).toast[1].text, 'its job');
-    assert.deepEqual(applyRefusal(error(409, 'plan-used', 'used', { job: null })), { toast: 'This plan was already applied.' });
-    assert.deepEqual(applyRefusal(error(410, 'plan-expired', 'This review expired. Review the plan again.')),
-        { toast: 'This review expired. Review the plan again.', review: true });
-    assert.deepEqual(applyRefusal(error(409, 'storage-changed', 'Replaced.')), { toast: 'Replaced.', review: true });
-    assert.deepEqual(applyRefusal(error(507, 'insufficient-space', 'Not enough free disk space.')), { toast: 'Not enough free disk space.' });
-    // S7 review I1: only our server's own refusal is definitive. A proxy's 5xx, a 2xx whose body could not be read,
-    // or any answer without the server's refusal may have followed a started job: not confirmed, read Activity again.
-    assert.deepEqual(applyRefusal(error(504, null, 'Gateway Timeout')), { toast: NOT_CONFIRMED, lost: true });
-    assert.deepEqual(applyRefusal(error(500, null, 'Internal Server Error')), { toast: NOT_CONFIRMED, lost: true });
-    assert.deepEqual(applyRefusal(error(202, null, 'Invalid JSON response')), { toast: NOT_CONFIRMED, lost: true });
-    assert.deepEqual(applyRefusal(error(502, null, 'Bad Gateway', { refused: false })), { toast: NOT_CONFIRMED, lost: true });
-    assert.deepEqual(applyRefusal(error(400, null, 'token must be the plan token', { refused: true })), { toast: APPLY_FAILED });
-    assert.deepEqual(applyRefusal(error(500, 'apply-failed', 'Maintenance failed; nothing was changed.', { refused: true })),
-        { toast: 'Maintenance failed; nothing was changed.' });
-    assert.equal(reviewRefusal(error(413, 'too-large', 'This plan is too large to review at once.')),
-        'This plan is too large to review at once.');
-    assert.equal(reviewRefusal(error(500, null, 'boom')), REVIEW_FAILED);
-    // S7 re-review N1: a duplicate review whose sources changed since the search keeps the server's "search again".
-    const changed = 'The sources changed since the search. Search for duplicates again.';
-    assert.equal(reviewRefusal(error(409, 'sources-changed', changed)), changed);
-    assert.equal(reviewRefusal(new TypeError('x')), REVIEW_FAILED);
-});
-
-test('keep entries name each copy by group, source index and path, never a bare path', async () => {
-    const { keepEntries } = await review;
-    // Two sources hold a file at the same relative path: only the source index tells them apart.
-    const output = { path: 'same.png', root: 'output', root_index: 0 };
-    const input = { path: 'same.png', root: 'input', root_index: 1 };
-    const chosen = new Map([['hash-a', input], ['hash-b', output]]);
-    assert.deepEqual(keepEntries(chosen), [
-        { group_id: 'hash-a', root_index: 1, path: 'same.png' },
-        { group_id: 'hash-b', root_index: 0, path: 'same.png' },
-    ]);
-});
-
-test('the duplicates dialog says what removing a copy does, History included', async () => {
-    const { DUPLICATES_NOTE, pageText, groupText, copyLabel } = await review;
-    assert.match(DUPLICATES_NOTE, /History keeps the removed paths in its run records\./);
-    assert.match(DUPLICATES_NOTE, /deletes its file from disk/);
-    assert.equal(pageText(0, 10, 24), 'Groups 1–10 of 24');
-    assert.equal(pageText(20, 4, 24), 'Groups 21–24 of 24');
-    assert.equal(pageText(0, 0, 0), 'No duplicate files were found.');
-    assert.equal(groupText({ count: 3, size: 120 * 1024, files: [] }), '3 identical files · 120 KB each');
-    assert.equal(groupText({ size: 3 * 2 ** 20, files: [{}, {}] }), '2 identical files · 3.0 MB each');
-    assert.equal(groupText({ count: 2, size: 10, files: [] }), '2 identical files · 1 KB each');
-    assert.equal(copyLabel({ root: 'output', path: 'a/b.png' }), 'Keep output/a/b.png');
-    assert.equal(copyLabel({ root: '', path: 'b.png', missing: true }), 'Keep b.png (no longer on disk)');
-});
-
-test('Metadata cache follows Q5: disabled with its reason while nothing is owned (D102)', async () => {
-    const { metadataCacheDescription, METADATA_CACHE_DESCRIPTION, NOTHING_CACHED_REASON } = await maintenance;
-    assert.equal(METADATA_CACHE_DESCRIPTION, 'Clear only Prompt Manager metadata cached by this browser.');
-    assert.equal(metadataCacheDescription({ keys: [], caches: [] }), `${METADATA_CACHE_DESCRIPTION} ${NOTHING_CACHED_REASON}`);
-    assert.equal(metadataCacheDescription({ keys: ['k'], caches: [] }), METADATA_CACHE_DESCRIPTION);
-    // S7 review M6: a browser that refused the listing is not claimed empty.
-    assert.equal(metadataCacheDescription({ keys: [], caches: [], denied: true }),
-        `${METADATA_CACHE_DESCRIPTION} This browser did not allow checking its storage.`);
-});
-
-test('only a finished duplicate search with groups offers Review groups', async () => {
-    const { hasDuplicateGroups } = await jobView;
-    const job = (state, groups, kind = 'duplicates') => ({ kind, state, counters: { groups_found: groups } });
-    assert.equal(hasDuplicateGroups(job('finished', 2)), true);
-    assert.equal(hasDuplicateGroups(job('finished', 0)), false);
-    assert.equal(hasDuplicateGroups(job('running', 2)), false);
-    assert.equal(hasDuplicateGroups(job('finished', 2, 'scan')), false);
-    assert.equal(hasDuplicateGroups({ kind: 'duplicates', state: 'finished', counters: {} }), false);
-});
-
-test('a failed apply the library overtook offers Review again, back to its review (S7 review M2)', async () => {
-    const { reviewAgainOf } = await jobView;
-    const failed = (kind, failure, operation) => ({ kind, state: 'failed', scope: { operation, failure } });
-    assert.deepEqual(reviewAgainOf(failed('maintenance', 'plan-changed', 'duplicate_prompts')),
-        { operation: 'duplicate_prompts' });
-    assert.deepEqual(reviewAgainOf(failed('maintenance', 'storage-changed', 'optimize')), { operation: 'optimize' });
-    // A duplicate cleanup reviewed against a search the sources overtook: search again in Maintenance.
-    assert.deepEqual(reviewAgainOf(failed('duplicate_cleanup', 'sources-changed', 'duplicate_files')),
-        { section: '#/system/maintenance' });
-    assert.equal(reviewAgainOf(failed('maintenance', 'backup-failed', 'optimize')), null);
-    assert.equal(reviewAgainOf(failed('maintenance', 'plan-changed', 'not_an_operation')), null);
-    assert.equal(reviewAgainOf({ ...failed('maintenance', 'plan-changed', 'optimize'), state: 'finished' }), null);
-    assert.equal(reviewAgainOf(failed('scan', 'plan-changed', 'optimize')), null);
-});
-
-test('a plan with nothing to do offers no Apply (S7 live test)', async () => {
-    const { hasWork, NOTHING_TO_APPLY } = await review;
-    assert.equal(hasWork(PLAN), true);
-    assert.equal(hasWork({ ...PLAN, scope: { count: 0, label: 'No duplicate prompt text' } }), false);
-    assert.equal(hasWork({ ...PLAN, operation: 'optimize', scope: { count: 1, label: 'The whole database' } }), true);
-    // A plan whose count is unknown is not assumed empty: the server decides at apply.
-    assert.equal(hasWork({ ...PLAN, scope: {} }), true);
-    assert.equal(NOTHING_TO_APPLY, 'There is nothing to apply; nothing was changed.');
-});

tests/js/workspace-system-overview.test.js

@@ -34,17 +34,14 @@ test('metric 4 is the last health result', async () => {
 });
 
 test('library health rows never invent a review count, a backup or thumbnails', async () => {
-    const { ambiguousTitle } = await overviewModule;
-    // S9: the Backup status row is Backup & export's status line (system-backups.mjs, tested there).
-    const { backupStatusText } = await import('../../web/js/workspace/system-backups.mjs');
+    const { ambiguousTitle, backupText } = await overviewModule;
     assert.equal(ambiguousTitle({ pending: null }), 'Ambiguous image links');
     assert.equal(ambiguousTitle(undefined), 'Ambiguous image links');
     assert.equal(ambiguousTitle({ pending: 1 }), '1 ambiguous image link');
     assert.equal(ambiguousTitle({ pending: 3 }), '3 ambiguous image links');
-    assert.equal(backupStatusText({ safety_backups: [], last_download: null }), 'No backup recorded.');
-    assert.equal(backupStatusText({ safety_backups: [{ modified_at: 'not a time' }], last_download: null }), 'No backup recorded.');
-    assert.match(backupStatusText({ safety_backups: [], last_download: { at: '2026-10-22T09:30:00Z', verified: true } }),
-        /^Downloaded backup · .+ · verified\.$/);
+    assert.equal(backupText(null), 'No retained backup record.');
+    assert.equal(backupText({ verified_at: 'not a time' }), 'No retained backup record.');
+    assert.match(backupText({ verified_at: '2026-10-22T09:30:00Z' }), /^Last verified backup .+\.$/);
 });
 
 test('the thumbnail row is its own read of the thumbnail status', async () => {
@@ -62,18 +59,6 @@ test('the thumbnail row is its own read of the thumbnail status', async () => {
     assert.equal(thumbnailTitle({ pending: 2 }, { effective: 1 }), '2 missing thumbnails');
 });
 
-test('the thumbnail row says N missing · M outdated · K failed, and offers Convert outdated only for outdated ones (#317)', async () => {
-    const { thumbnailTitle, convertOffered } = await overviewModule;
-    assert.equal(thumbnailTitle({ pending: 3, outdated: 17500, failed: 2 }), '3 missing thumbnails · 17,500 outdated · 2 failed');
-    assert.equal(thumbnailTitle({ pending: 0, outdated: 1, failed: 0 }), 'No missing thumbnails · 1 outdated');
-    assert.equal(thumbnailTitle({ pending: 0, outdated: 0, failed: 4 }), 'No missing thumbnails · 4 failed');
-    assert.equal(thumbnailTitle({ pending: 1, outdated: 'x' }), '1 missing thumbnail');
-    assert.equal(convertOffered({ pending: 0, outdated: 5 }), true);
-    for (const status of [undefined, null, { pending: 0 }, { outdated: 0 }, { outdated: -1 }, { outdated: '5' }]) {
-        assert.equal(convertOffered(status), false, JSON.stringify(status));
-    }
-});
-
 test('an integrity count SQLite stopped at reads as a lower bound', async () => {
     const { checkChip } = await overviewModule;
     assert.equal(checkChip({ id: 'integrity', status: 'issues', count: 100, capped: true }), '100+ problems found');

tests/js/workspace-system-state.test.js

@@ -190,7 +190,6 @@ test('status text per outcome', async () => {
         host: 'Saved to the server configuration.',
         runtime: 'Applied until the server restarts.',
         partial: 'Some changes were not saved. Review the highlighted settings.',
-        partialSaved: 'Some changes were saved to the server configuration; the highlighted ones were not.',
         tabOnly: 'Saved for this tab only; browser storage is unavailable.',
         conflict: 'Settings changed elsewhere. Reload this section to see them.',
         restart: 'Restart ComfyUI to apply:',
@@ -365,42 +364,3 @@ test('a host save refused for one source says the server reason and names it unt
     assert.equal(drafts.invalidSource(), null);
     assert.equal(drafts.statusText(), 'Unsaved changes.');
 });
-
-test('a partial host save keeps what saved, adopts its revision and fails only the rest (S10 review I3)', async () => {
-    const { SETTINGS_STATUS } = await source;
-    const domains = adapters({ host: { lora_trigger_words_enabled: false, gallery_root_paths: ['a'] } });
-    const drafts = await loaded(domains);
-    // The LoRA part is written (config.json moves to sha256:lora), then /settings refuses one source.
-    domains.outcome.host = () => {
-        throw Object.assign(new Error('missing can\'t be used: not found. Remove it or reconnect it, then save.'), {
-            code: 'invalid-source', source: 'missing', partial: { saved: ['lora_trigger_words_enabled'], revision: 'sha256:lora' } });
-    };
-    drafts.set('host', 'lora_trigger_words_enabled', true);
-    drafts.set('host', 'gallery_root_paths', ['a', 'missing']);
-    const first = await drafts.save();
-    assert.equal(first.host, 'partial');
-    assert.deepEqual([...drafts.failed('host')], ['gallery_root_paths']);
-    assert.equal(drafts.saved('host').lora_trigger_words_enabled, true);
-    assert.deepEqual(drafts.changes('host'), { gallery_root_paths: ['a', 'missing'] });
-    assert.equal(drafts.invalidSource(), 'missing');
-    assert.equal(drafts.statusText(), 'missing can\'t be used: not found. Remove it or reconnect it, then save.');
-    // The next save carries the revision the saved part produced: no false "changed elsewhere".
-    domains.outcome.host = null;
-    drafts.set('host', 'gallery_root_paths', ['a']);
-    const second = await drafts.save();
-    assert.equal(second.host, 'saved');
-    assert.equal(domains.calls.at(-1)[2].expected_revision, 'sha256:lora');
-    assert.deepEqual(domains.calls.at(-1)[1], { gallery_root_paths: ['a'] });
-    // Without a server reason, the status says some were saved and the highlighted ones were not.
-    domains.outcome.host = () => { throw Object.assign(new Error('boom'), { partial: { saved: ['x'], revision: 'sha256:three' } }); };
-    drafts.set('host', 'x', 1);
-    drafts.set('host', 'y', 2);
-    assert.equal((await drafts.save()).host, 'partial');
-    assert.equal(drafts.statusText(), SETTINGS_STATUS.partialSaved);
-    assert.deepEqual([...drafts.failed('host')], ['y']);
-    // A partial result that saved nothing is a plain failure.
-    domains.outcome.host = () => { throw Object.assign(new Error('boom'), { partial: { saved: [] } }); };
-    drafts.set('host', 'z', 3);
-    assert.equal((await drafts.save()).host, 'failed');
-    assert.equal(drafts.statusText(), SETTINGS_STATUS.partial);
-});

tests/js/workspace-system-thumbnails.test.js

@@ -1,195 +0,0 @@
-// System › Appearance › Thumbnails (#317): the server's thumbnail format, quality and size limit as host rows of the
-// one Save row, JPEG XL offered only with an encoder (D130), a note where this browser cannot show JPEG XL, and the
-// explicit Convert outdated operation (never automatic).
-const test = require('node:test');
-const assert = require('node:assert/strict');
-
-const thumbnailsModule = import('../../web/js/workspace/system-thumbnails.mjs');
-const stateModule = import('../../web/js/workspace/system-state.mjs');
-const coreModule = import('../../web/js/shared/toolkit/core.js');
-
-/** A minimal DOM whose elements count their live listeners (a listener's signal aborts it, as in a browser). */
-function fakeDOM() {
-    const previous = global.document;
-    const elements = [];
-    class Element {
-        constructor(tag) {
-            this.tagName = tag.toUpperCase();
-            this.children = [];
-            this.attributes = {};
-            this.listeners = [];
-            this.dataset = {};
-            this.className = '';
-            this.id = '';
-            this.value = '';
-            this._text = '';
-            elements.push(this);
-        }
-        get textContent() { return this._text + this.children.map(child => child.textContent).join(''); }
-        set textContent(text) { this.children = []; this._text = String(text); }
-        append(...nodes) {
-            for (const node of nodes) {
-                const child = typeof node === 'string' ? Object.assign(new Element('#text'), { _text: node }) : node;
-                child.parentNode = this;
-                this.children.push(child);
-            }
-        }
-        remove() { if (this.parentNode) this.parentNode.children = this.parentNode.children.filter(child => child !== this); this.parentNode = null; }
-        replaceChildren(...nodes) { this.children = []; this._text = ''; this.append(...nodes); }
-        setAttribute(name, value) { this.attributes[name] = String(value); }
-        getAttribute(name) { return Object.hasOwn(this.attributes, name) ? this.attributes[name] : null; }
-        removeAttribute(name) { delete this.attributes[name]; }
-        addEventListener(type, callback, options = {}) {
-            if (options.signal?.aborted) return;
-            const entry = { type, callback };
-            this.listeners.push(entry);
-            options.signal?.addEventListener('abort', () => { this.listeners = this.listeners.filter(item => item !== entry); });
-        }
-        removeEventListener(type, callback) { this.listeners = this.listeners.filter(item => item.type !== type || item.callback !== callback); }
-        dispatch(type) { for (const { callback } of this.listeners.filter(item => item.type === type)) callback({ type, target: this }); }
-        click() { this.dispatch('click'); }
-    }
-    global.document = {
-        createElement: tag => new Element(tag),
-        createTextNode: text => Object.assign(new Element('#text'), { _text: String(text) }),
-    };
-    const walk = (node, found = []) => { found.push(node); node.children.forEach(child => walk(child, found)); return found; };
-    return {
-        listenerCount: () => elements.reduce((sum, element) => sum + element.listeners.length, 0),
-        find: (root, predicate) => walk(root).find(predicate),
-        tags: node => node.children.map(child => child.tagName.toLowerCase()),
-        restore() { global.document = previous; },
-    };
-}
-
-const HOST = { thumbnail_format: 'webp', thumbnail_quality: 80, thumbnail_edge: 512,
-    thumbnail_encoders: { webp: { available: true }, jpeg: { available: true }, jxl: { available: true, encoder: 'cjxl', reason: null } } };
-const NO_JXL = { webp: { available: true }, jpeg: { available: true },
-    jxl: { available: false, encoder: null, reason: 'No JPEG XL encoder found. Install pillow-jxl-plugin.' } };
-
-async function mounted({ host = HOST, browserJxl = true, hostFails = false, writeHost = async () => ({ success: true, persisted: true, revision: 'sha256:two' }) } = {}) {
-    const { mountThumbnailSettings } = await thumbnailsModule;
-    const { createSystemDrafts } = await stateModule;
-    const { createScope } = await coreModule;
-    const dom = fakeDOM();
-    let hostValues = null;
-    const drafts = createSystemDrafts({
-        readBrowser: () => ({}), readRuntime: () => ({}),
-        readHost: async () => { if (hostFails) throw new Error('offline'); return { values: hostValues, revision: 'sha256:one' }; },
-        writeBrowser: async () => ({ persisted: true }), writeHost, writeRuntime: async () => ({}),
-    });
-    const scope = createScope();
-    const reviews = [];
-    let answer;
-    const support = () => new Promise(resolve => { answer = resolve; });
-    const surface = mountThumbnailSettings(null, { scope, drafts, api: {}, activity: {}, support,
-        openReview: options => reviews.push(options) });
-    const byId = id => dom.find(surface, node => node.dataset?.setting === id);
-    const notes = () => dom.find(surface, node => node.dataset?.setting === 'thumbnail-format').parentNode.children[0].children.slice(2)
-        .map(node => node.textContent);
-    return { dom, drafts, scope, surface, byId, reviews, notes, browser: () => answer(browserJxl),
-        loadHost: async () => { hostValues = host; await drafts.load('host'); } };
-}
-
-test('a Thumbnails surface of three host rows and the Convert outdated operation', async () => {
-    const { dom, surface, scope } = await mounted();
-    try {
-        assert.equal(surface.className, 'surface');
-        assert.equal(surface.children[0].textContent, 'Thumbnails');
-        const rows = surface.children.slice(2);
-        assert.deepEqual(rows.map(row => row.children[0].children[0].textContent),
-            ['Thumbnail format', 'Thumbnail quality', 'Thumbnail size limit', 'Convert outdated thumbnails']);
-        assert.deepEqual(rows.map(row => row.className), ['setting-row', 'setting-row', 'setting-row', 'operation']);
-    } finally { scope.dispose(); assert.equal(dom.listenerCount(), 0); dom.restore(); }
-});
-
-test('the rows edit the server settings once they were read', async () => {
-    const { FORMAT_OPTIONS } = await thumbnailsModule;
-    assert.deepEqual(FORMAT_OPTIONS, [['webp', 'WebP'], ['jxl', 'JPEG XL'], ['jpeg', 'JPEG']]);
-    const { dom, drafts, scope, byId, loadHost } = await mounted();
-    try {
-        for (const id of ['thumbnail-format', 'thumbnail-quality', 'thumbnail-edge']) assert.equal(byId(id).disabled, true, id);
-        await loadHost();
-        assert.equal(byId('thumbnail-format').value, 'webp');
-        assert.equal(byId('thumbnail-quality').value, '80');
-        assert.equal(byId('thumbnail-edge').value, '512');
-        assert.equal(byId('thumbnail-format').disabled, false);
-        byId('thumbnail-format').value = 'jpeg'; byId('thumbnail-format').dispatch('change');
-        byId('thumbnail-quality').value = '60'; byId('thumbnail-quality').dispatch('change');
-        byId('thumbnail-edge').value = '300'; byId('thumbnail-edge').dispatch('change');
-        assert.deepEqual(drafts.changes('host'), { thumbnail_format: 'jpeg', thumbnail_quality: 60, thumbnail_edge: 300 });
-    } finally { scope.dispose(); dom.restore(); }
-});
-
-test('quality takes 1–100 and the size limit 128–2048 whole numbers only', async () => {
-    const { wholeNumber, QUALITY_LIMIT, EDGE_LIMIT } = await thumbnailsModule;
-    assert.deepEqual(['1', ' 100 ', '0', '101', '80.5', '', 'x'].map(text => wholeNumber(text, QUALITY_LIMIT)), [1, 100, null, null, null, null, null]);
-    assert.deepEqual(['128', '2048', '127', '2049', '1e3'].map(text => wholeNumber(text, EDGE_LIMIT)), [128, 2048, null, null, null]);
-    const { dom, drafts, scope, byId, loadHost } = await mounted();
-    try {
-        await loadHost();
-        byId('thumbnail-quality').value = '0'; byId('thumbnail-quality').dispatch('change');
-        byId('thumbnail-edge').value = '4096'; byId('thumbnail-edge').dispatch('change');
-        assert.deepEqual(drafts.changes('host'), {});
-        assert.deepEqual([...drafts.failed('host')].sort(), ['thumbnail_edge', 'thumbnail_quality']);
-    } finally { scope.dispose(); dom.restore(); }
-});
-
-test('JPEG XL is disabled with the server reason when no encoder is installed (D130)', async () => {
-    const { dom, scope, byId, loadHost, notes } = await mounted({ host: { ...HOST, thumbnail_encoders: NO_JXL } });
-    try {
-        await loadHost();
-        const jxl = byId('thumbnail-format').children.find(option => option.value === 'jxl');
-        assert.equal(jxl.disabled, true);
-        assert.deepEqual(notes(), [NO_JXL.jxl.reason]);
-    } finally { scope.dispose(); dom.restore(); }
-    const ready = await mounted();
-    try {
-        await ready.loadHost();
-        assert.equal(ready.byId('thumbnail-format').children.find(option => option.value === 'jxl').disabled, false);
-        assert.deepEqual(ready.notes(), []);
-    } finally { ready.scope.dispose(); ready.dom.restore(); }
-});
-
-test('a browser that cannot show JPEG XL says the originals are shown instead', async () => {
-    const { BROWSER_NO_JXL } = await thumbnailsModule;
-    const { dom, scope, loadHost, notes, browser } = await mounted({ browserJxl: false });
-    try {
-        await loadHost();
-        browser();
-        await new Promise(resolve => setImmediate(resolve));
-        assert.deepEqual(notes(), [BROWSER_NO_JXL]);
-    } finally { scope.dispose(); dom.restore(); }
-});
-
-test('Convert outdated opens Thumbnail maintenance on its convert scope; a format save says previews keep theirs', async () => {
-    const { FORMAT_SAVED, CONVERT_DESCRIPTION } = await thumbnailsModule;
-    const { dom, drafts, scope, surface, byId, reviews, loadHost } = await mounted();
-    try {
-        const operation = surface.children.at(-1);
-        assert.equal(operation.children[0].children[1].textContent, CONVERT_DESCRIPTION);
-        dom.find(operation, node => node.tagName === 'BUTTON').click();
-        assert.equal(reviews.length, 1);
-        assert.equal(reviews[0].mode, 'convert');
-        await loadHost();
-        byId('thumbnail-quality').value = '70'; byId('thumbnail-quality').dispatch('change');
-        await drafts.save();
-        assert.equal(operation.children[0].children[1].textContent, CONVERT_DESCRIPTION, 'quality alone converts nothing');
-        byId('thumbnail-format').value = 'jpeg'; byId('thumbnail-format').dispatch('change');
-        await drafts.save();
-        assert.equal(operation.children[0].children[1].textContent, FORMAT_SAVED);
-        assert.equal(reviews.length, 1, 'nothing starts by itself');
-    } finally { scope.dispose(); assert.equal(dom.listenerCount(), 0); dom.restore(); }
-});
-
-test('rows whose server settings could not be read say so, like Appearance’s host rows', async () => {
-    const { HOST_UNAVAILABLE } = await import('../../web/js/workspace/system-appearance.mjs');
-    const { dom, drafts, scope, surface, byId } = await mounted({ hostFails: true });
-    const notes = () => surface.children.slice(2, 5).map(row => row.children[0].children.slice(2).map(note => note.textContent));
-    try {
-        assert.deepEqual(notes(), [[], [], []]);
-        assert.equal(await drafts.reloadHost(), false);
-        assert.deepEqual(notes(), [[HOST_UNAVAILABLE], [HOST_UNAVAILABLE], [HOST_UNAVAILABLE]]);
-        for (const id of ['thumbnail-format', 'thumbnail-quality', 'thumbnail-edge']) assert.equal(byId(id).disabled, true, id);
-    } finally { scope.dispose(); assert.equal(dom.listenerCount(), 0); dom.restore(); }
-});

tests/js/workspace-thumbnail-review.test.js

@@ -1,36 +1,35 @@
 // System › thumbnail review (#249 System S5 Task 14): the concept's "Thumbnail maintenance" dialog (app.js 1433–1437,
-// `thumbnail-review`) on the thumbnail job (S5 Task 12). Pure parts: the scopes the job takes (Convert outdated, #317),
-// the D131 settings line that replaced its quality and size fields, the D99 plan line and the start outcome.
+// `thumbnail-review`) on the thumbnail job (S5 Task 12). Pure parts: the option values the job takes, the preview size
+// check, the Image loading quality preselection (Q3), the D99 plan line and the start outcome.
 const test = require('node:test');
 const assert = require('node:assert/strict');
 
 const reviewModule = import('../../web/js/workspace/thumbnail-review.mjs');
 
-test('the scopes map to the job modes; Convert outdated is the explicit third (#317)', async () => {
-    const { SCOPE_OPTIONS } = await reviewModule;
-    assert.deepEqual(SCOPE_OPTIONS, [['missing', 'Missing thumbnails only'], ['rebuild', 'Rebuild all (explicit opt-in)'],
-        ['convert', 'Convert outdated (removes older formats)']]);
+test('the concept options map to the job values in the concept order', async () => {
+    const { SCOPE_OPTIONS, QUALITY_OPTIONS, SIZE_LIMIT } = await reviewModule;
+    assert.deepEqual(SCOPE_OPTIONS, [['missing', 'Missing thumbnails only'], ['rebuild', 'Rebuild all (explicit opt-in)']]);
+    assert.deepEqual(QUALITY_OPTIONS, [['medium', 'Medium · optimized'], ['high', 'High · original'], ['low', 'Low · fastest']]);
+    assert.deepEqual(SIZE_LIMIT, { min: 128, max: 2048, value: 512 });
 });
 
-test('D131: the dialog names the server thumbnail settings instead of its own quality and size fields', async () => {
-    const { settingsText, SETTINGS_UNKNOWN } = await reviewModule;
-    assert.equal(settingsText({ format: 'webp', quality: 80, size: 512 }),
-        'Previews are written as WebP · quality 80 · 512 px. Change this in System › Appearance.');
-    assert.equal(settingsText({ format: 'jxl', quality: 90, size: 1024 }),
-        'Previews are written as JPEG XL · quality 90 · 1,024 px. Change this in System › Appearance.');
-    assert.equal(settingsText({ format: 'jpeg', quality: 5, size: 128 }),
-        'Previews are written as JPEG · quality 5 · 128 px. Change this in System › Appearance.');
-    for (const plan of [null, {}, { format: 'png', quality: 80, size: 512 }, { format: 'webp', quality: '80', size: 512 }]) {
-        assert.equal(settingsText(plan), SETTINGS_UNKNOWN);
+test('size outside 128–2048 reports validity: only whole pixels in range are a size', async () => {
+    const { previewSize } = await reviewModule;
+    assert.equal(previewSize('512'), 512);
+    assert.equal(previewSize('128'), 128);
+    assert.equal(previewSize('2048'), 2048);
+    for (const text of ['', ' ', '127', '2049', '4096', '512.5', '-512', 'abc', '1e3', '0x200']) {
+        assert.equal(previewSize(text), null, text);
     }
 });
 
-test('Convert outdated says how many previews in an older format it converts, past the per-batch cap too (#317)', async () => {
-    const { planText } = await reviewModule;
-    assert.equal(planText({ mode: 'convert', targets: 17500, fresh: 2000, outdated: 17500, remaining: 7500 }),
-        '25,000 previews in an older format to convert.');
-    assert.equal(planText({ mode: 'convert', targets: 1, fresh: 0, outdated: 1, remaining: 0 }), '1 preview in an older format to convert.');
-    assert.equal(planText({ mode: 'convert', targets: 0, fresh: 9, outdated: 0, remaining: 0 }), 'No previews in an older format.');
+test('Image loading quality preselects the dialog quality (Q3); anything else is Medium', async () => {
+    const { preselectedQuality } = await reviewModule;
+    assert.equal(preselectedQuality('low'), 'low');
+    assert.equal(preselectedQuality('high'), 'high');
+    assert.equal(preselectedQuality('medium'), 'medium');
+    assert.equal(preselectedQuality(undefined), 'medium');
+    assert.equal(preselectedQuality('original'), 'medium');
 });
 
 test('the plan line counts what a missing-only run generates and what is already up to date (D99)', async () => {
@@ -39,7 +38,7 @@ test('the plan line counts what a missing-only run generates and what is already
     assert.equal(planText({ mode: 'missing', targets: 1, fresh: 1, remaining: 0 }), '1 preview to generate · 1 already up to date.');
     assert.equal(planText({ mode: 'missing', targets: 0, fresh: 0, remaining: 0 }), '0 previews to generate · 0 already up to date.');
     assert.equal(planText({ mode: 'missing', targets: 10000, fresh: 5, remaining: 2500 }),
-        '12,500 previews to generate · 5 already up to date.');
+        '10,000 previews to generate · 5 already up to date · 2,500 more on the next run.');
 });
 
 test('Rebuild all says every preview is regenerated (D99)', async () => {
@@ -47,7 +46,7 @@ test('Rebuild all says every preview is regenerated (D99)', async () => {
     assert.equal(planText({ mode: 'rebuild', targets: 42, fresh: 30, remaining: 0 }), 'Every preview is regenerated: 42 files.');
     assert.equal(planText({ mode: 'rebuild', targets: 1, fresh: 1, remaining: 0 }), 'Every preview is regenerated: 1 file.');
     assert.equal(planText({ mode: 'rebuild', targets: 10000, fresh: 9000, remaining: 3 }),
-        'Every preview is regenerated: 10,003 files.');
+        'Every preview is regenerated: 10,000 files · 3 more on the next run.');
 });
 
 test('an answer without counts is a failed plan, never zeros', async () => {
@@ -65,9 +64,9 @@ test('Start starts the thumbnail job with the chosen options and opens it in Act
     const calls = [];
     const navigated = [];
     const store = { start: async (kind, body) => { calls.push([kind, body]); return { job: { id: 'a'.repeat(32) } }; } };
-    await startThumbnails({ store, scope: scopeOf(), options: { mode: 'convert' },
+    await startThumbnails({ store, scope: scopeOf(), options: { mode: 'rebuild', size: 1024, quality: 'high' },
         navigate: hash => navigated.push(hash), notify: () => assert.fail('no toast of its own') });
-    assert.deepEqual(calls, [['thumbnails', { mode: 'convert' }]]);
+    assert.deepEqual(calls, [['thumbnails', { mode: 'rebuild', size: 1024, quality: 'high' }]]);
     assert.deepEqual(navigated, [`#/activity/${'a'.repeat(32)}`]);
 });
 
@@ -75,7 +74,7 @@ test('a refused start shows the busy link toast and stays', async () => {
     const { startThumbnails } = await reviewModule;
     const toasts = [];
     const store = { start: async () => ({ busy: { id: 'b'.repeat(32), title: 'Scan for metadata' } }) };
-    await startThumbnails({ store, scope: scopeOf(), options: { mode: 'missing' },
+    await startThumbnails({ store, scope: scopeOf(), options: { mode: 'missing', size: 512, quality: 'medium' },
         navigate: () => assert.fail('stays'), notify: message => toasts.push(message) });
     assert.deepEqual(toasts, [['Another job is running: ', { text: 'Scan for metadata', href: `#/activity/${'b'.repeat(32)}` }, '.']]);
 });
@@ -84,11 +83,11 @@ test('a failed start says so; a start after the section left says nothing', asyn
     const { startThumbnails, START_FAILED } = await reviewModule;
     const toasts = [];
     const store = { start: async () => { throw new Error('offline'); } };
-    await startThumbnails({ store, scope: scopeOf(), options: { mode: 'missing' },
+    await startThumbnails({ store, scope: scopeOf(), options: { mode: 'missing', size: 512, quality: 'medium' },
         navigate: () => assert.fail('stays'), notify: message => toasts.push(message) });
     assert.deepEqual(toasts, [START_FAILED]);
     const gone = new AbortController();
     gone.abort();
-    await startThumbnails({ store, scope: { signal: gone.signal }, options: { mode: 'missing' },
+    await startThumbnails({ store, scope: { signal: gone.signal }, options: { mode: 'missing', size: 512, quality: 'medium' },
         navigate: () => assert.fail('stays'), notify: () => assert.fail('silent') });
 });

tests/js/workspace-thumbnail-support.test.js

@@ -1,101 +0,0 @@
-// #317: JPEG XL thumbnails in browsers that cannot decode them. The workspace decodes a tiny embedded JPEG XL once;
-// where it fails, cards and the inspector cover use the original instead, and any thumbnail <img> that fails to load
-// falls back to the original. A thumbnail is only a placeholder: the original is what every other view uses.
-import test from 'node:test';
-import assert from 'node:assert/strict';
-
-const support = await import('../../web/js/workspace/thumbnail-support.mjs');
-
-/** A fake Image whose decode answers `ok` once its src is set. */
-function fakeImage(ok, log) {
-    return () => {
-        const image = {};
-        Object.defineProperty(image, 'src', {
-            set(value) { log.push(value); queueMicrotask(() => (ok ? image.onload?.() : image.onerror?.())); },
-        });
-        return image;
-    };
-}
-
-test('a .jxl thumbnail URL is recognised by its path, never its query', () => {
-    assert.equal(support.isJxlUrl('/prompt_manager/images/serve/thumbnails/a_thumb.jxl?v=1&root=0'), true);
-    assert.equal(support.isJxlUrl('/prompt_manager/images/serve/thumbnails/a_thumb.JXL'), true);
-    assert.equal(support.isJxlUrl('/prompt_manager/images/serve/thumbnails/a_thumb.webp?x=.jxl'), false);
-    assert.equal(support.isJxlUrl('/x/a.jxl#frag'), true);
-    for (const value of [null, undefined, '', 42]) assert.equal(support.isJxlUrl(value), false);
-});
-
-test('decode support is probed once with the embedded image and remembered', async () => {
-    support.resetJxlSupport();
-    const log = [];
-    assert.equal(support.jxlSupport(), undefined, 'unknown before the probe');
-    const first = support.detectJxlSupport({ createImage: fakeImage(true, log) });
-    const again = support.detectJxlSupport({ createImage: fakeImage(false, log) });
-    assert.equal(await first, true);
-    assert.equal(await again, true);
-    assert.equal(log.length, 1, 'one probe');
-    assert.match(log[0], /^data:image\/jxl;base64,\/woA/);
-    assert.equal(support.jxlSupport(), true);
-    support.resetJxlSupport();
-    assert.equal(await support.detectJxlSupport({ createImage: fakeImage(false, log) }), false);
-    assert.equal(support.jxlSupport(), false);
-    support.resetJxlSupport();
-    assert.equal(await support.detectJxlSupport({ createImage: () => { throw new Error('no Image'); } }), false);
-    support.resetJxlSupport();
-});
-
-test('cards use the original for a JPEG XL thumbnail this browser cannot show', () => {
-    const image = { url: '/serve/a.png?root=0', thumbnail_url: '/serve/thumbnails/a_thumb.jxl?root=0' };
-    const webp = { ...image, thumbnail_url: '/serve/thumbnails/a_thumb.webp?root=0' };
-    assert.equal(support.thumbnailSource(image, false), image.url);
-    assert.equal(support.thumbnailSource(image, true), image.thumbnail_url);
-    assert.equal(support.thumbnailSource(image, undefined), image.thumbnail_url, 'unknown: try it, the error falls back');
-    assert.equal(support.thumbnailSource(webp, false), webp.thumbnail_url);
-    assert.equal(support.thumbnailSource({ url: image.url }, false), image.url);
-    assert.equal(support.thumbnailSource({ url: image.url, thumbnail_url: null }, true), image.url);
-});
-
-test('a thumbnail that fails to load falls back to the original once', () => {
-    const listeners = {};
-    const node = { src: '/serve/thumbnails/a_thumb.jxl',
-        addEventListener(type, handler, options) { listeners[type] = { handler, options }; } };
-    support.fallBackToOriginal(node, '/serve/a.png');
-    assert.equal(listeners.error.options.once, true);
-    listeners.error.handler();
-    assert.equal(node.src, '/serve/a.png');
-    const original = { src: '/serve/a.png', addEventListener: () => assert.fail('no listener for the original itself') };
-    support.fallBackToOriginal(original, '/serve/a.png');
-    const listen = [];
-    const scoped = { src: '/serve/thumbnails/b_thumb.webp', isConnected: true };
-    support.fallBackToOriginal(scoped, '/serve/b.png', (target, type, handler, options) => listen.push([target, type, handler, options]));
-    assert.equal(listen[0][1], 'error');
-    listen[0][2]();
-    assert.equal(scoped.src, '/serve/b.png');
-});
-
-test('a video card shows its thumbnail only when this browser can show it (review M2)', () => {
-    const video = { is_video: true, url: '/serve/c.mp4?root=0', thumbnail_url: '/serve/thumbnails/c_thumb.jxl?root=0' };
-    assert.equal(support.showsThumbnail(video, false), false, 'JPEG XL unsupported: the video keeps its own element');
-    assert.equal(support.showsThumbnail(video, true), true);
-    assert.equal(support.showsThumbnail(video, undefined), true, 'unknown: try it, the error swaps');
-    assert.equal(support.showsThumbnail({ ...video, thumbnail_url: '/serve/thumbnails/c_thumb.webp' }, false), true);
-    assert.equal(support.showsThumbnail({ ...video, thumbnail_url: null }, true), false);
-    assert.equal(support.showsThumbnail({ url: '/serve/a.png', thumbnail_url: '/serve/thumbnails/a_thumb.jxl' }, false), true,
-        'an image always shows something: its original');
-});
-
-test('a video thumbnail that fails to load is replaced once, never left broken', () => {
-    const listeners = {};
-    let replaced = null;
-    const node = { addEventListener(type, handler, options) { listeners[type] = { handler, options }; },
-        replaceWith(next) { replaced = next; } };
-    support.replaceOnError(node, () => 'label');
-    assert.equal(listeners.error.options.once, true);
-    listeners.error.handler();
-    assert.equal(replaced, 'label');
-    const listen = [];
-    support.replaceOnError(node, () => 'other', (...args) => listen.push(args));
-    assert.equal(listen[0][1], 'error');
-    listen[0][2]();
-    assert.equal(replaced, 'other');
-});

tests/js/workspace-toolbar.test.js

@@ -841,11 +841,6 @@ test('openReviewDialog lays out heading, grid, options, sentence, backup box and
             [['dt', 'dd'], 'Scope', '2 stale image links'], [['dt', 'dd'], 'Media on disk', 'No source files removed']]);
         review.setValue('Scope', '3 stale image links');
         assert.equal(grid.children[0].children[1].textContent, '3 stale image links');
-        // #355: a row's hover title (the LoRA review's settings file); an unknown term changes nothing.
-        review.setTitle('Media on disk', '~/settings.json');
-        review.setTitle('Absent', 'x');
-        review.setValue('Absent', 'x');
-        assert.equal(grid.children[1].children[1].title, '~/settings.json');
         const actions = byId(dom, 'modal-body').children.at(-1);
         assert.deepEqual(actions.children.map(node => [node.textContent, node.className]),
             [['Cancel', ''], ['Apply reviewed operation', 'ca-primary']]);
@@ -894,7 +889,7 @@ test('review dialog backup box keeps the dialog open and toasts the outcome', as
         assert.equal(action.getAttribute('aria-disabled'), 'true');
         // A second press while the copy downloads is ignored.
         action.click();
-        answer({ ok: true, blob: async () => new Blob(['db']), headers: { get: name => (name === 'Content-Disposition' ? 'attachment; filename="prompts_backup_1.db"' : null) } });
+        answer({ ok: true, blob: async () => new Blob(['db']), headers: { get: () => 'attachment; filename="prompts_backup_1.db"' } });
         await tick();
         assert.deepEqual(toasts, [BACKUP_DONE]);
         assert.equal(modal(dom).open, true);
@@ -938,37 +933,3 @@ test('the scan review is a thin openReviewDialog caller with its scope switch',
         dom.restore();
     }
 });
-
-test('a review dialog reports one dismissal for Cancel, ×, Escape, a replacing dialog and the page leaving, never after its primary (S9 M1)', async () => {
-    const { openReviewDialog, openContentDialog, closeWorkspaceDialog } = await dialogsModule;
-    const { createScope } = await coreModule;
-    const dom = fakeDOM();
-    const scope = createScope();
-    const dismissed = [];
-    const open = (name, primary = 'Restore') => openReviewDialog({ scope, title: 'Restore preview', grid: [['Integrity', 'Verified']],
-        cancelLabel: 'Cancel', primary: { label: primary, danger: true }, onStart() {}, onDismiss: () => dismissed.push(name) });
-    try {
-        open('cancel');
-        button(byId(dom, 'modal-body'), 'Cancel').click();
-        open('close');
-        byId(dom, 'modal-close').click();
-        open('escape');
-        modal(dom).dispatchEvent(new Event('cancel', { cancelable: true }));
-        open('replaced');
-        openContentDialog({ scope, title: 'Other', nodes: [] });
-        closeWorkspaceDialog();
-        open('started');
-        button(byId(dom, 'modal-body'), 'Restore').click();
-        await tick();
-        open('left');
-        scope.dispose();
-        await tick();
-        assert.deepEqual(dismissed, ['cancel', 'close', 'escape', 'replaced', 'left']);
-        assert.throws(() => openReviewDialog({ scope: createScope(), title: 'x', grid: [['a', 'b']], cancelLabel: 'Cancel',
-            primary: { label: 'Go' }, onStart() {}, onDismiss: 'no' }), TypeError);
-    } finally {
-        scope.dispose();
-        closeWorkspaceDialog();
-        dom.restore();
-    }
-});