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

@@ -1,12 +1,22 @@
 {
   "required_status_checks": {
-    "strict": false,
+    "strict": true,
     "contexts": [
+      "py3.10 on ubuntu-latest",
+      "py3.11 on ubuntu-latest",
       "py3.12 on ubuntu-latest",
+      "py3.13 on ubuntu-latest",
+      "py3.10 on windows-latest",
+      "py3.11 on windows-latest",
+      "py3.12 on windows-latest",
+      "py3.13 on windows-latest",
+      "py3.10 on macos-latest",
+      "py3.11 on macos-latest",
+      "py3.12 on macos-latest",
+      "py3.13 on macos-latest",
       "coverage gate (85%)",
       "black and flake8",
       "frontend modules",
-      "all tests",
       "viewerjs",
       "real ComfyUI compatibility",
       "bandit (high severity)"

.github/workflows/code-quality.yml

@@ -4,7 +4,6 @@ permissions:
   contents: read
 
 on:
-  merge_group:
   push:
     branches: [main]
   pull_request:
@@ -20,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/portability.yml

@@ -1,55 +0,0 @@
-name: Windows and macOS
-
-permissions:
-  contents: read
-
-# Non-blocking portability runs (#420): never on pull requests or in the merge queue, and no context
-# here is a required check. A red run is fixed at its cause before the workspace cutover (#334).
-on:
-  push:
-    branches: [main]
-  schedule:
-    - cron: "17 3 * * *"
-  workflow_dispatch:
-
-# Every run gets its own group (run_id), so no main commit's run is ever cancelled or dropped as pending.
-concurrency:
-  group: ${{ github.workflow }}-${{ github.run_id }}
-  cancel-in-progress: false
-
-env:
-  PYTHONFAULTHANDLER: "1"
-
-# Time limit rule as in test.yml: ceil(1.5 x the slowest of three recent green runs on main) + 3
-# minutes, never under 5. Measured 2026-10-26 in test.yml on runs 40257217681 (3be0ada),
-# 40240706568 (fb9134f), 40228167328 (f9835aa), before these legs moved here in #420:
-#   slowest py3.10 on windows-latest: 12m43s / 15m54s / 14m53s -> 27 min
-#     (macos 6m14s-8m30s, windows 11m42s-15m54s)
-jobs:
-  test:
-    name: py${{ matrix.python-version }} on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 27
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [windows-latest, macos-latest]
-        python-version: ["3.12", "3.13", "3.14"]
-
-    steps:
-      - uses: actions/checkout@v7
-
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v7
-        with:
-          python-version: ${{ matrix.python-version }}
-          cache: pip
-          cache-dependency-path: requirements-dev.txt
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install -r requirements-dev.txt
-
-      - name: Run tests
-        run: python -m tests.run_suite -v

.github/workflows/test.yml

@@ -4,7 +4,6 @@ permissions:
   contents: read
 
 on:
-  merge_group:
   pull_request:
     branches: [main]
   push:
@@ -20,36 +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.
-#     Windows and macOS moved to portability.yml (#420), which keeps this 27-minute limit; this
-#     Linux-only matrix keeps it too until it is re-measured.
-#   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)
-#   all tests: a result check without setup, 5 min (the floor)
-#
-# Pull requests run a fast subset (#420): Python 3.12 on ubuntu-latest, coverage, lint and frontend
-# modules. The merge queue (merge_group), pushes to main and manual runs add Python 3.13 and 3.14 on
-# Linux and the real ComfyUI job. "all tests" is the required gate that holds the queue to that set.
-# Windows and macOS run in portability.yml (push to main, nightly, on demand) and never gate a merge.
 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]
-        python-version: ${{ github.event_name == 'pull_request' && fromJSON('["3.12"]') || fromJSON('["3.12", "3.13", "3.14"]') }}
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
 
     steps:
       - uses: actions/checkout@v7
@@ -67,26 +45,21 @@ 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
-    # Merge queue, main and manual runs only. A job skipped by its condition reports Success, so this
-    # required context never blocks a pull request; "all tests" fails if it is skipped anywhere else.
-    if: github.event_name != 'pull_request'
     runs-on: ubuntu-latest
-    # Chromium and its system libraries come from the pinned Playwright image (tag = @playwright/test in
-    # tools/vendor/package-lock.json; tests/vendor/browser-image.test.mjs checks it). The runner install
-    # pulled them from Ubuntu's apt mirror on every run, and three runs (#349, #378, #382) crawled at
-    # ~26 kB/s for 11-12 minutes until the job hit its limit after every test had passed.
-    container:
-      image: mcr.microsoft.com/playwright:v1.64.1-noble
-      options: --user 1001
-    timeout-minutes: 24
+    timeout-minutes: 25
     steps:
       - uses: actions/checkout@v7
         with:
           persist-credentials: false
+      - uses: actions/setup-node@v7
+        with:
+          node-version: "24"
+          cache: npm
+          cache-dependency-path: tools/vendor/package-lock.json
       - name: Read the reviewed runtime pins
         id: runtime
         run: |
@@ -111,42 +84,21 @@ jobs:
           ref: ${{ steps.runtime.outputs.kikoRevision }}
           path: .ci-kikotools
           persist-credentials: false
-      # The image's own Python and Node 24: setup-python/setup-node install the runner's toolcache builds,
-      # whose entry points name host paths that do not exist in the container. The image has no ensurepip
-      # and the job has no root, so a checksum-pinned pip wheel bootstraps a user-space venv. The image
-      # Python must be the reviewed host Python, so a pin or image bump that disagrees fails here.
-      - name: Python environment on the reviewed host Python
-        env:
-          PIP_WHEEL: https://files.pythonhosted.org/packages/f3/6e/1736e5b4ae2b778ef2f81c47d797de9f891d4d8acb047a24ca37a60294dd/pip-26.2.1-py3-none-any.whl
-          PIP_SHA256: 71138adf1f4ca900cdb7d289c21b7494329f2332b6d85f0e1c42108c0384ed3e
-          PINNED_PYTHON: ${{ steps.runtime.outputs.pythonVersion }}
-        run: |
-          image="$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])')"
-          [ "$image" = "$PINNED_PYTHON" ] || { echo "::error::image Python $image is not the pinned $PINNED_PYTHON"; exit 1; }
-          venv="$RUNNER_TEMP/venv" wheel="$RUNNER_TEMP/pip-26.2.1-py3-none-any.whl"
-          python3 -m venv --without-pip "$venv"
-          curl -fsSL --retry 3 -o "$wheel" "$PIP_WHEEL"
-          echo "$PIP_SHA256  $wheel" | sha256sum -c -
-          "$venv/bin/python" "$wheel/pip" install --no-index --no-cache-dir "$wheel"
-          echo "$venv/bin" >> "$GITHUB_PATH"
-      - run: python --version && node --version && node --version | grep -q '^v24\.'
-      # pip's download cache (torch alone is ~200 MB); inside the container ~ is the job's HOME (/github/home).
-      - name: Cache pip downloads
-        uses: actions/cache@v6
+      - uses: actions/setup-python@v7
         with:
-          path: ~/.cache/pip
-          key: pip-${{ runner.os }}-playwright-v1.64.1-${{ hashFiles('requirements-dev.txt', '.ci-comfyui/requirements.txt', 'tools/vendor/comfyui-runtime.json') }}
+          python-version: ${{ steps.runtime.outputs.pythonVersion }}
+          cache: pip
+          cache-dependency-path: |
+            requirements-dev.txt
+            .ci-comfyui/requirements.txt
+            tools/vendor/comfyui-runtime.json
       - name: Install CPU runtime and test dependencies
         run: |
+          python -m pip install --upgrade pip
           pip install "torch==${{ steps.runtime.outputs.torchVersion }}" "torchvision==${{ steps.runtime.outputs.torchvisionVersion }}" --index-url https://download.pytorch.org/whl/cpu
           pip install -r .ci-comfyui/requirements.txt -r requirements-dev.txt "torch==${{ steps.runtime.outputs.torchVersion }}" "torchvision==${{ steps.runtime.outputs.torchvisionVersion }}"
-      # npm's download cache, keyed on the lockfile. node_modules itself is still built fresh by npm ci.
-      - name: Cache npm downloads
-        uses: actions/cache@v6
-        with:
-          path: ~/.npm
-          key: npm-${{ runner.os }}-playwright-v1.64.1-${{ hashFiles('tools/vendor/package-lock.json') }}
       - run: npm ci --prefix tools/vendor --ignore-scripts
+      - run: npx --prefix tools/vendor playwright install --with-deps chromium
       - name: Classic and Nodes 2.0 startup and compatibility
         env:
           PM_COMFY_ROOT: ${{ github.workspace }}/.ci-comfyui
@@ -175,7 +127,6 @@ jobs:
   coverage:
     name: coverage gate (85%)
     runs-on: ubuntu-latest
-    timeout-minutes: 15
     steps:
       - uses: actions/checkout@v7
 
@@ -192,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
 
@@ -203,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
 
@@ -226,31 +176,24 @@ jobs:
   lint:
     name: black and flake8
     runs-on: ubuntu-latest
-    timeout-minutes: 5
     steps:
       - uses: actions/checkout@v7
       - uses: actions/setup-python@v7
         with:
           python-version: "3.12"
-          cache: pip
-          cache-dependency-path: requirements-dev.txt
-      # The exact black and flake8 pins from requirements-dev.txt, so a new release cannot turn CI red.
-      - run: pip install $(grep -E '^(black|flake8)==' requirements-dev.txt)
+      - run: pip install black flake8
       - run: black --check .
       - run: flake8 .
 
   js-test:
     name: frontend modules
     runs-on: ubuntu-latest
-    timeout-minutes: 5
     steps:
       - uses: actions/checkout@v7
 
       - uses: actions/setup-node@v7
         with:
           node-version: "24"
-          cache: npm
-          cache-dependency-path: tools/vendor/package-lock.json
 
       - name: Check shipped extension and page modules parse
         run: |
@@ -264,32 +207,3 @@ jobs:
 
       - name: Run JS tests
         run: node --test tests/js/*.test.js
-
-  # The required context "all tests". A dropped matrix leg never reports a check at all, so the eight
-  # legs that pull requests skip cannot be required by name; this gate requires them instead. Every
-  # job must succeed; real ComfyUI must be skipped on a pull request and succeed on every other event.
-  all-tests:
-    name: all tests
-    needs: [test, comfyui, coverage, lint, js-test]
-    if: always()
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    steps:
-      - name: Require every test job for this event
-        env:
-          EVENT_NAME: ${{ github.event_name }}
-          TEST_RESULT: ${{ needs.test.result }}
-          COMFYUI_RESULT: ${{ needs.comfyui.result }}
-          COVERAGE_RESULT: ${{ needs.coverage.result }}
-          LINT_RESULT: ${{ needs.lint.result }}
-          JS_RESULT: ${{ needs.js-test.result }}
-        run: |
-          queue_only=success
-          if [ "$EVENT_NAME" = pull_request ]; then queue_only=skipped; fi
-          echo "event: $EVENT_NAME (real ComfyUI must be $queue_only)"
-          echo "test matrix: $TEST_RESULT"
-          echo "comfyui: $COMFYUI_RESULT"
-          echo "coverage: $COVERAGE_RESULT"
-          echo "lint: $LINT_RESULT"
-          echo "js-test: $JS_RESULT"
-          test "$TEST_RESULT" = success && test "$COVERAGE_RESULT" = success && test "$LINT_RESULT" = success && test "$JS_RESULT" = success && test "$COMFYUI_RESULT" = "$queue_only"

.github/workflows/viewerjs-check.yml

@@ -1,7 +1,6 @@
 name: Viewer.js vendor and compatibility
 
 on:
-  merge_group:
   pull_request:
     branches: [main]
   push:
@@ -165,8 +164,6 @@ jobs:
 
   browser-workflows:
     name: page workflows (${{ matrix.browser }}, shard ${{ matrix.shard }}/2)
-    # Merge queue, main and manual runs only (#420); pull requests run the Chromium/touch coverage shards.
-    if: github.event_name != 'pull_request'
     runs-on: ubuntu-latest
     # Layout comparisons depend on the fonts each browser falls back to, so browser jobs run in the
     # same pinned Playwright image as local runs (tag = @playwright/test in tools/vendor/package-lock.json;
@@ -221,9 +218,8 @@ jobs:
           retention-days: 14
 
   # Branch protection requires the exact context "viewerjs". This job keeps that
-  # name and fails unless every coverage shard and the coverage merge succeeded and
-  # the browser shards succeeded, or, on a pull request only, were skipped (#420).
-  # Any failure, cancellation or other skip fails it.
+  # name and fails unless every frontend job above succeeded (every shard, the
+  # coverage merge and every browser shard), including when one was cancelled or skipped.
   viewerjs:
     needs: [frontend-coverage, frontend-coverage-merge, browser-workflows]
     if: always()
@@ -232,15 +228,11 @@ jobs:
     steps:
       - name: Require every frontend job to succeed
         env:
-          EVENT_NAME: ${{ github.event_name }}
           COVERAGE_RESULT: ${{ needs.frontend-coverage.result }}
           MERGE_RESULT: ${{ needs.frontend-coverage-merge.result }}
           WORKFLOWS_RESULT: ${{ needs.browser-workflows.result }}
         run: |
-          queue_only=success
-          if [ "$EVENT_NAME" = pull_request ]; then queue_only=skipped; fi
-          echo "event: $EVENT_NAME (browser-workflows must be $queue_only)"
           echo "frontend-coverage: $COVERAGE_RESULT"
           echo "frontend-coverage-merge: $MERGE_RESULT"
           echo "browser-workflows: $WORKFLOWS_RESULT"
-          test "$COVERAGE_RESULT" = success && test "$MERGE_RESULT" = success && test "$WORKFLOWS_RESULT" = "$queue_only"
+          test "$COVERAGE_RESULT" = success && test "$MERGE_RESULT" = success && test "$WORKFLOWS_RESULT" = success

.pre-commit-config.yaml

@@ -13,18 +13,16 @@ repos:
         language: system
         types: [python]
 
-      # Fails at the severity CI enforces (code-quality.yml: -lll, high only), never stricter.
-      # pre-commit appends the staged files, so no shell wrapper can drop the first one.
       - id: bandit
         name: bandit
-        entry: bandit -lll -q
+        entry: bash -c 'bandit "$@" -ll -q 2>&1; true'
         language: system
         types: [python]
         exclude: ^(tests/|reference/)
 
       - 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)
@@ -56,7 +56,7 @@ Both nodes include the complete PromptManager feature set:
 - **📊 Analytics**: Track prompt usage patterns and effectiveness over time
 - **🔬 Workflow Analysis**: Extract and analyze ComfyUI workflow data from PNG images
 - **📋 Metadata Viewer**: Standalone tool for analyzing ComfyUI-generated images
-- **🛠️ System Management**: Built-in diagnostics, backup/restore, and maintenance tools in System
+- **🛠️ System Management**: Built-in diagnostics, backup/restore, and maintenance tools
 - **🏷️ AI AutoTag**: Automatically tag your image collection using WD14 or JoyCaption vision models
 - **🔗 LoRA Manager Integration**: Import LoRA metadata and preview images from [ComfyUI-Lora-Manager](https://github.com/willmiao/ComfyUI-Lora-Manager)
 
@@ -206,11 +206,14 @@ match Classic and Focused.
 - **Responsive Design**: Works on desktop, tablet, and mobile devices
 - **Real-time Search**: Instant search results as you type
 - **Bulk Operations**: Edit multiple prompts simultaneously with batch tools
-- **Settings and System tools live in System**: the dashboard's **Settings** opens System › Overview, **Maintenance** opens System › Maintenance, **Backup DB** and **Restore DB** open System › Backup & export, and **Diagnostics** and **View Logs** open System › Diagnostics & logs, each in a new tab. System reviews every destructive operation before it runs it as an Activity job.
-- **Page options**: the list header's **Page options** keeps the prompt list's Infinite Scrolling default
-- **Dashboard tools**:
+- **Settings Panel**: Configure behavior and display options
+- **System Management**: Complete toolset for database operations:
   - **🔍 Metadata Viewer**: Launch standalone PNG analysis tool
-  - **📸 Scan Images**: Bulk scan output directories for ComfyUI images (with a quick backup first)
+  - **📸 Scan Images**: Bulk scan output directories for ComfyUI images
+  - **💾 Backup/Restore**: Database backup and recovery operations
+  - **🔧 Maintenance**: Database optimization and cleanup tools including orphaned prompt removal
+  - **📋 Logs**: Comprehensive logging system with download capability
+  - **🔍 Diagnostics**: System health checks and troubleshooting
 - **Export Tools**: Download prompts and metadata in various formats
 - **Progress Tracking**: Real-time progress indicators for long operations
 - **Error Handling**: Graceful error display with recovery suggestions
@@ -330,11 +333,14 @@ The comprehensive gallery system provides complete access to all your ComfyUI ou
 
 #### **⚙️ Gallery Settings**
 
-The gallery's **Settings** opens System › Appearance in a new tab: image quality, details on cards, collapsed viewer details, video autoplay/mute/loop, metadata loading and file paths are set there and apply to this page too.
+Configure your viewing experience in the settings panel:
 
-The gallery's **Page options** keep the page's own settings: the thumbnail check at startup, lazy loading, items per page, grid columns, infinite scrolling, debug mode and API timeout. Reset puts back only these.
-
-Thumbnail generation, the server thumbnail and browser cache clears, refreshing the file listing and finding duplicate images are in System › Sources & scans and System › Maintenance (Page options links both); each runs as an Activity job you can follow after closing the page.
+- **Display Settings**: Default view, items per page, grid columns, media info, infinite scrolling
+- **Performance Settings**: Image quality, lazy loading
+- **Video Settings**: Autoplay, mute by default, loop videos
+- **Thumbnail Management**: Generate optimized thumbnails for faster loading (runs on the configured worker threads; a run that stops at the per-run cap tells you how many remain)
+- **Find Duplicate Images**: Hashes every file on the worker threads with a progress bar; close the window and it keeps running, results wait in a pill
+- **Rescan Output Folder**: Drops the server-side listing cache and rewalks the folders
 
 #### **🖼️ Image Viewing Experience**
 
@@ -392,7 +398,7 @@ Import existing ComfyUI images into your database:
    - Any errors or issues encountered
 5. **Access imported data** through the normal gallery interface
 
-The scan reads PNG text chunks and A1111-style parameters, and, when `ffprobe` is installed, the prompt ComfyUI's video savers embed in MP4/MOV/WebM files. Files are read on the number of **worker threads** set in System › Sources & scans (default: half your cores), which makes a large library several times faster.
+The scan reads PNG text chunks and A1111-style parameters, and, when `ffprobe` is installed, the prompt ComfyUI's video savers embed in MP4/MOV/WebM files. Files are read on the number of **worker threads** set in Settings → Performance (default: half your cores), which makes a large library several times faster.
 
 ### 🏷️ AI AutoTag
 
@@ -408,7 +414,7 @@ Automatically tag your entire image collection using AI vision models:
 
 1. **AutoTag (Batch Mode)**: Tag your entire collection automatically
    - Click **"🏷️ AutoTag"** in the admin dashboard
-   - Choose your model type (FP16 or GGUF). A model that is not downloaded yet shows **Manage in System**: download (or unload) it in System › Auto-tagging, then reopen the dialog
+   - Choose your model type (FP16 or GGUF)
    - Select how to handle already-tagged images:
      - **Skip images with existing tags**: Preserve your meticulous manual tagging work
      - **Re-tag all images**: Overwrite existing tags with fresh AI analysis
@@ -439,7 +445,7 @@ Adjust the system prompt to match your tagging style:
 #### **Requirements**
 
 - Sufficient VRAM for the chosen model (FP16 requires more, GGUF is lighter)
-- Models are downloaded in System › Auto-tagging
+- Models are downloaded automatically on first use
 - Feature requests and improvements are welcome!
 
 ### 📁 Folder Filter
@@ -464,28 +470,24 @@ If you use [ComfyUI-Lora-Manager](https://github.com/willmiao/ComfyUI-Lora-Manag
 
 #### **Enabling the Integration**
 
-1. Open System › Integrations (the admin dashboard's **Settings** opens System)
-2. PromptManager auto-detects whether LoRA Manager is installed
+1. Open the admin dashboard and click **Settings**
+2. Scroll to the **Integrations** section — PromptManager will auto-detect if LoRA Manager is installed
 
 ![LoRA Enabled](images/pm-lora-enabled.png)
 
 3. Toggle the **LoraManager** switch to enable
 4. Optionally enable **Auto-inject trigger words** to automatically append LoRA trigger words when `<lora:name:weight>` is detected in your prompts
-5. Click **Save preferences** (requires a ComfyUI restart to take effect)
+5. Click **Save Settings** (requires a ComfyUI restart to take effect)
 
 #### **Importing LoRA Data**
 
-Click **Review import** in System › Integrations; Start runs the import as an Activity job:
+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.
@@ -496,11 +498,9 @@ A CivitAI API key is **required if your library contains NSFW LoRAs** — CivitA
 
 To add your key:
 1. Get your API key from [civitai.com/user/account](https://civitai.com/user/account)
-2. Paste it into the **CivitAI API key** field in System › Integrations
+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
@@ -511,20 +511,23 @@ The comprehensive web interface provides:
 - **Filter Options**: Filter by category, tags, rating, and date
 - **Bulk Operations**: Select multiple prompts for batch editing
 - **Export Tools**: Download your prompt collection
-- **Settings**: System (new tab) for settings, maintenance, backups and diagnostics; **Page options** for the page's own display settings
+- **Settings Panel**: Configure auto-save and display options
+- **Diagnostics**: System health checks and troubleshooting
 
 ### 🔧 Database Maintenance
 
-Keep your database optimized in System › Maintenance (the admin dashboard's **Maintenance** opens it in a new tab):
+Keep your database optimized with built-in maintenance tools:
 
-- **Duplicate prompt text**: merge duplicate prompts while preserving images
-- **Optimize database**: reclaim unused SQLite space
-- **Missing-file links**: remove image records for missing files
-- **Unused prompt components**: remove prompts nothing uses
-- **Run health checks**: verify database integrity and relationships (the Health report)
-- **Database size and prompt counts**: System › Diagnostics & logs (Database) and the Overview's Statistics
-
-Each operation opens a review that shows what it will change and the safety backup it takes, then runs as an Activity job.
+1. **Open the admin dashboard** and click **"🔧 Maintenance"**
+2. **Select maintenance operations**:
+   - **Remove Duplicates**: Find and merge duplicate prompts while preserving images
+   - **Vacuum Database**: Optimize database file size and performance
+   - **Clean Orphaned Images**: Remove image records for missing files
+   - **🚮 Prune Orphaned Prompts**: Remove prompts that have no linked images
+   - **Check Consistency**: Verify database integrity and relationships
+   - **Database Statistics**: Generate detailed database reports
+3. **Run selected operations** and monitor progress in real-time
+4. **Review results** showing detailed information about each operation
 
 ### Database Location
 
@@ -772,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
@@ -826,8 +812,8 @@ Before upgrading or changing this setting:
 1. Identify the database your current installation actually uses and confirm its
    library contents. Check both the configured path and the prior fallback
    `<extension>/prompts.db`; keep track of which existing file you intend to use.
-2. Preserve a consistent backup of the active database with
-   System › Backup & export's Back up or SQLite's online backup API. Do not copy only
+2. Preserve a consistent backup of the active database with the dashboard's
+   Backup/Restore backup action or SQLite's online backup API. Do not copy only
    the main file of a live SQLite database: committed data may still be in its
    `-wal` file. For a filesystem copy, stop ComfyUI cleanly first and preserve any
    remaining `-wal` file together with the main database.
@@ -919,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

@@ -22,21 +22,22 @@ Features:
 - Comprehensive logging and diagnostics
 """
 
-import atexit
-import threading
-import time
+import re
 from pathlib import Path
 
 
 def get_version():
-    """Parse version from pyproject.toml (``utils/version.py``)."""
-    from .utils.version import project_version
-
+    """Parse version from pyproject.toml"""
     try:
-        root = Path(__file__).parent
+        pyproject_path = Path(__file__).parent / "pyproject.toml"
+        if pyproject_path.exists():
+            content = pyproject_path.read_text()
+            match = re.search(r'version\s*=\s*["\']([^"\']+)["\']', content)
+            if match:
+                return match.group(1)
     except Exception:
-        return "unknown"
-    return project_version(root)
+        pass
+    return "unknown"
 
 
 from .prompt_manager import (  # noqa: E402
@@ -71,12 +72,6 @@ NODE_DISPLAY_NAME_MAPPINGS = {
 # are served by our own routes instead (see py/api).
 WEB_DIRECTORY = "web/comfy"
 
-# Parts the package teardown stops (``_stop_background_work``). Each stays None
-# when its start-up block below fails, and the teardown skips it.
-api = None
-_global_prompt_tracker = None
-_global_image_monitor = None
-
 # Add API routes (same pattern as ComfyUI_Assets)
 try:
     # Set extension URI
@@ -92,22 +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.
-    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)
@@ -144,16 +127,25 @@ try:
 
     # The Needs review pass for ambiguous new outputs runs through the API's
     # capture store (the one the scan and the Tag dialog use): a linked output
-    # is never queued and its pending items leave the queue. The package
-    # teardown detaches it before that store is closed at shutdown.
-    if api is not None:
-        _global_image_monitor.set_review_recorder(api.record_review_file)
+    # is never queued and its pending items leave the queue. It stops before
+    # that store is closed at shutdown.
+    _review_api = globals().get("api")
+    if _review_api is not None:
+        _global_image_monitor.set_review_recorder(_review_api.record_review_file)
         # 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(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(api.notify_output_settled)
+        _global_image_monitor.set_thumbnail_queue(_review_api.queue_capture_thumbnail)
+        _review_host = getattr(config.server_instance, "app", None)
+        if _review_host is not None and hasattr(_review_host, "on_cleanup"):
+
+            async def _stop_review_recording(
+                app, monitor=_global_image_monitor, api=_review_api
+            ):
+                monitor.set_review_recorder(None)
+                monitor.set_thumbnail_queue(None)
+                api.close_auto_thumbnails(final=True)
+
+            _review_host.on_cleanup.insert(0, _stop_review_recording)
 
     # Start monitoring
     _global_image_monitor.start_monitoring()
@@ -223,193 +215,6 @@ except Exception:
             "Failed to register execution history"
         )
 
-
-# ── Package teardown (#301, #302) ────────────────────────────────────────────
-# ComfyUI never runs aiohttp's cleanup hooks (it never calls
-# ``runner.cleanup()``), so ``atexit`` is the live host's path: Ctrl+C, and a
-# normal exit. It is registered after the history hook, so at exit (newest
-# first) it runs before the history dispose. Hosts that do run ``on_cleanup``
-# (our test servers) run it there, and the tests' package unload calls it.
-
-TEARDOWN_SECONDS = 10.0
-_clock = time.monotonic
-_background_work_lock = threading.Lock()
-_background_work_result = None
-
-
-def _teardown_step(name, stop, logger):
-    """Run one teardown step; a failure (even Ctrl+C) is logged and is False."""
-    try:
-        return bool(stop())
-    except (Exception, KeyboardInterrupt):
-        logger.error(f"Background work: stopping {name} failed", exc_info=True)
-        return False
-
-
-def _teardown_logger():
-    """PromptManager's init logger; the standard one if that cannot load."""
-    try:
-        from .utils.logging_config import get_logger
-
-        return get_logger("prompt_manager.init")
-    except Exception:
-        import logging
-
-        return logging.getLogger("prompt_manager.init")
-
-
-def _stop_background_work():
-    """Stop the image monitor, the preview worker and the prompt cleanup
-    thread against one TEARDOWN_SECONDS deadline, once.
-
-    Returns ``{"monitor", "thumbnails", "tracker"}`` booleans (True: it
-    stopped), leaving out parts that never started. Later calls return a
-    copy of the first result. A Ctrl+C inside a step is logged and the
-    step is False; one between steps is re-raised after the result (parts
-    not reached are False) is stored and the ``atexit`` entry removed.
-    """
-    global _background_work_result
-    with _background_work_lock:
-        if _background_work_result is not None:
-            return dict(_background_work_result)
-        monitor, thumbnails, tracker = (
-            _global_image_monitor,
-            api,
-            _global_prompt_tracker,
-        )
-        # A part whose global is set has started; False until its step says
-        # otherwise, so an interrupt between steps leaves an honest result.
-        started = (
-            ("monitor", monitor),
-            ("thumbnails", thumbnails),
-            ("tracker", tracker),
-        )
-        result = {name: False for name, part in started if part is not None}
-        try:
-            logger = _teardown_logger()
-            began = _clock()
-            deadline = began + TEARDOWN_SECONDS
-
-            def left(own_bound):
-                return max(0.0, min(own_bound, deadline - _clock()))
-
-            if monitor is not None:
-
-                def stop_monitor():
-                    from .utils.image_monitor import OBSERVER_JOIN_SECONDS
-
-                    # Callbacks first: an image in hand queues no preview into a
-                    # closing preview worker. The worker may have read the queue
-                    # callback already, so the API refuses new previews too (at
-                    # exit, Python 3.12+ refuses to start their worker thread).
-                    if thumbnails is not None:
-                        thumbnails.refuse_auto_thumbnails()
-                    monitor.set_review_recorder(None)
-                    monitor.set_thumbnail_queue(None)
-                    monitor.set_output_listener(None)
-                    return monitor.stop_monitoring(left(OBSERVER_JOIN_SECONDS))
-
-                result["monitor"] = _teardown_step(
-                    "the image monitor", stop_monitor, logger
-                )
-            if thumbnails is not None:
-
-                def close_previews():
-                    from .py.api.thumbnail_auto import CLOSE_WAIT_SECONDS
-
-                    return thumbnails.close_auto_thumbnails(
-                        final=True, timeout=left(CLOSE_WAIT_SECONDS)
-                    )
-
-                result["thumbnails"] = _teardown_step(
-                    "the preview worker", close_previews, logger
-                )
-            if tracker is not None:
-
-                def stop_tracker():
-                    from .utils.prompt_tracker import TRACKER_JOIN_SECONDS
-
-                    return tracker.shutdown(left(TRACKER_JOIN_SECONDS))
-
-                result["tracker"] = _teardown_step(
-                    "the prompt cleanup thread", stop_tracker, logger
-                )
-            elapsed = _clock() - began
-            failed = [name for name, ok in result.items() if not ok]
-            if failed:
-                logger.warning(
-                    f"Background work not stopped in time ({elapsed:.1f} s): "
-                    + ", ".join(failed)
-                )
-            else:
-                parts = " ".join(f"{name}=ok" for name in result)
-                logger.info(f"Background work stopped in {elapsed:.1f} s: {parts}")
-        finally:
-            _background_work_result = result
-            atexit.unregister(_stop_background_work)
-        return dict(result)
-
-
-async def _stop_background_work_on_cleanup(app):
-    """aiohttp ``on_cleanup``: no request is served then, so it runs inline."""
-    _stop_background_work()
-
-
-def _kill_encoders_at_exit():
-    """Run by the exit hook before Python joins the executor threads (#376):
-    a JPEG XL or ffmpeg encoder (no console on Windows, so Ctrl+C never
-    reaches it) is killed instead of being waited for."""
-    from .py.api.thumbnail_encode import shutdown_encoders
-
-    shutdown_encoders()
-
-
-def _abort_downloads_at_exit():
-    """Run by the exit hook (#376): huggingface_hub's Xet transfers ignore
-    the chunk checkpoint, so they are aborted the way hub aborts on Ctrl+C."""
-    import sys
-
-    if "huggingface_hub" not in sys.modules:
-        return  # no download ever ran: import nothing at exit
-    from .py.autotag import abort_hub_downloads
-
-    abort_hub_downloads()
-
-
-try:
-    # Before the executor join: running jobs stop at their next file, item or
-    # chunk (#376). The teardown below still runs from atexit afterwards.
-    from .utils import exit_signal as _exit_signal
-
-    _exit_signal.install(_kill_encoders_at_exit)
-    _exit_signal.install(_abort_downloads_at_exit)
-except Exception as e:
-    try:
-        from .utils.logging_config import get_logger
-
-        get_logger("prompt_manager.init").error(
-            f"Failed to register the exit signal: {e}"
-        )
-    except Exception:
-        pass
-
-try:
-    atexit.register(_stop_background_work)
-    from .py.config import server_instance as _teardown_server
-
-    _teardown_host = getattr(_teardown_server, "app", None)
-    if _teardown_host is not None and hasattr(_teardown_host, "on_cleanup"):
-        _teardown_host.on_cleanup.insert(0, _stop_background_work_on_cleanup)
-except Exception as e:
-    try:
-        from .utils.logging_config import get_logger
-
-        get_logger("prompt_manager.init").error(
-            f"Failed to register the background work teardown: {e}"
-        )
-    except Exception:
-        pass
-
 __all__ = ["NODE_CLASS_MAPPINGS", "NODE_DISPLAY_NAME_MAPPINGS", "WEB_DIRECTORY"]
 
 # Print startup message with loaded tools

database/annotations.py

@@ -19,11 +19,6 @@ links (``PromptDatabase._move_tag_links``).
 Cheap reads (spec amendment S1) treat a byte record as *current* only while
 the file's present ``(size, mtime_ns)`` equals the record's verified
 fingerprint; a file without a current record shows no image tags.
-
-A write made from a tagging model's result passes ``mark_autotagged`` (#379):
-the byte record is then marked auto-tagged (``media_image_autotags``) in the
-same transaction, so a mark never exists without the write it records. Hand
-tags never mark.
 """
 
 import re
@@ -39,7 +34,6 @@ from .annotation_schema import (
     MAX_LOCATOR_LENGTH,
     METADATA_TABLE,
 )
-from .autotag_schema import AUTOTAG_TABLE
 from .library_commands import _UUID, LibraryCommandError, _validate_epoch
 from .models import utc_now_iso
 from .vocabulary import validate_vocabulary_tag_name
@@ -102,24 +96,12 @@ _TAGS_OF = (
     "JOIN tags t ON t.id=mit.tag_id WHERE mit.byte_id IN ({marks}) "
     "ORDER BY mit.byte_id,mit.position"
 )
-_MARK = f"INSERT OR IGNORE INTO {AUTOTAG_TABLE}(byte_id) VALUES(?)"  # nosec B608
-_MARKED_OF = (
-    f"SELECT byte_id FROM {AUTOTAG_TABLE} WHERE byte_id IN ({{marks}})"  # nosec B608
-)
-_MARKED_LOCATORS = (
-    f"SELECT DISTINCT f.locator FROM {AUTOTAG_TABLE} m "  # nosec B608
-    f"JOIN {BYTES_TABLE} b ON b.id=m.byte_id JOIN {FILES_TABLE} f ON f.id=b.file_id"
-)
-# Tag search (#379): the names that tag at least one image (the tag index
-# answers the EXISTS), then the locators carrying chosen names (by tag_id).
-_IMAGE_TAG_NAMES = (
-    "SELECT t.id,t.name FROM tags t WHERE EXISTS "  # nosec B608
-    f"(SELECT 1 FROM {IMAGE_TAGS_TABLE} mit WHERE mit.tag_id=t.id)"
-)
-_TAG_LOCATORS = (
-    f"SELECT DISTINCT f.locator FROM {IMAGE_TAGS_TABLE} mit "  # nosec B608
-    f"JOIN {BYTES_TABLE} b ON b.id=mit.byte_id "
-    f"JOIN {FILES_TABLE} f ON f.id=b.file_id WHERE mit.tag_id IN ({{marks}})"
+_RECORDS = (
+    "SELECT f.locator,b.id,b.size,b.mtime_ns,t.name "  # nosec B608
+    f"FROM {FILES_TABLE} f JOIN {BYTES_TABLE} b ON b.file_id=f.id "
+    f"LEFT JOIN {IMAGE_TAGS_TABLE} mit ON mit.byte_id=b.id "
+    "LEFT JOIN tags t ON t.id=mit.tag_id "
+    "ORDER BY f.locator,b.first_seen_at,b.id,mit.position"
 )
 
 
@@ -319,17 +301,14 @@ class AnnotationOperations:
         expected_epoch: str,
         expected_tag_revision: int,
         tags: list,
-        mark_autotagged: bool = False,
     ) -> dict:
         """Replace the set of these exact bytes, guarded by epoch and revision.
 
         Creates the owner and byte record when the bytes are new (an explicit
         empty set is a real save). The identical set at the current revision,
         or one behind it (a lost-response retry), is ``replayed`` and writes
-        no tag; any other revision mismatch is ``tag-conflict`` with the
-        current set and no writes. ``mark_autotagged`` marks the bytes
-        auto-tagged on a saved or replayed receipt (the Tag image dialog's
-        save after Generate suggestions).
+        nothing; any other revision mismatch is ``tag-conflict`` with the
+        current set and no writes.
         """
         _validate_target(locator, sha256, size, mtime_ns)
         _validate_epoch(expected_epoch)
@@ -350,8 +329,6 @@ class AnnotationOperations:
             ):
                 if refingerprinted:
                     conn.execute(_BUMP_INDEX)
-                if mark_autotagged:
-                    conn.execute(_MARK, (byte_id,))
                 return _receipt(epoch, sha256, current, revision, True)
             if expected_tag_revision != revision:
                 raise AnnotationCommandError(
@@ -360,8 +337,6 @@ class AnnotationOperations:
                     {"sha256": sha256, "tags": current, "tag_revision": revision},
                 )
             revision = self._write_image_tags(conn, byte_id, tags)
-            if mark_autotagged:
-                conn.execute(_MARK, (byte_id,))
             return _receipt(epoch, sha256, tags, revision, False)
 
     def add_image_tags(
@@ -373,22 +348,16 @@ class AnnotationOperations:
         mtime_ns: int,
         expected_epoch: str,
         tags: list,
-        mark_autotagged: bool = False,
     ) -> dict:
         """Union ``tags`` into the set of these exact bytes, keeping stored spelling.
 
         ``added`` counts the names that were new (case-insensitively). A union
         over ``MAX_IMAGE_TAGS`` is ``tag-limit`` with the current set and no
         writes; a union that adds nothing to an existing record is ``replayed``.
-        ``mark_autotagged`` (a tagging model's result) also marks the bytes
-        auto-tagged, replayed or not; only such a call may pass no tags (the
-        model found none: the image is marked and its set is unchanged).
         """
         _validate_target(locator, sha256, size, mtime_ns)
         _validate_epoch(expected_epoch)
         tags = normalize_image_tags(tags)
-        if not tags and not mark_autotagged:
-            raise ValueError("tags must name at least one tag")
         with self._pair_transaction() as conn:
             epoch = self._library_epoch(conn, expected_epoch)
             now = utc_now_iso()
@@ -406,8 +375,6 @@ class AnnotationOperations:
                     epoch,
                     {"sha256": sha256, "tags": current, "tag_revision": revision},
                 )
-            if mark_autotagged:
-                conn.execute(_MARK, (byte_id,))
             if not created and not added:
                 if refingerprinted:
                     conn.execute(_BUMP_INDEX)
@@ -436,41 +403,6 @@ class AnnotationOperations:
                 conn.execute(_BUMP_INDEX)
             return cursor.rowcount > 0
 
-    @staticmethod
-    def _validated_stats(stats: object) -> dict:
-        if not isinstance(stats, dict):
-            raise ValueError(
-                "stats must map locators to (size, mtime_ns) integer pairs"
-            )
-        for locator, fingerprint in stats.items():
-            _validate_fingerprint(locator, fingerprint)
-        return stats
-
-    @staticmethod
-    def _current_byte_records(conn: sqlite3.Connection, stats: dict) -> dict:
-        """``{locator: byte_id}`` of each locator's current byte record.
-
-        The one rule every cheap read uses: a record is current while its
-        verified ``(size, mtime_ns)`` equals the file's present fingerprint
-        in ``stats``; the most recently verified wins (ties on ``(verified_at,
-        byte_id)``). A locator without a current record is left out. Lookups
-        go in chunks of 500 locators.
-        """
-        locators = list(stats)
-        chosen: dict[str, tuple[tuple[str, str], str]] = {}
-        for start in range(0, len(locators), _LOOKUP_CHUNK):
-            chunk = locators[start : start + _LOOKUP_CHUNK]
-            marks = ",".join("?" * len(chunk))
-            for locator, byte_id, size, mtime_ns, verified_at in conn.execute(
-                _FINGERPRINTS.format(marks=marks), chunk
-            ):
-                if (size, mtime_ns) != stats[locator]:
-                    continue
-                key = (verified_at, byte_id)
-                if locator not in chosen or key > chosen[locator][0]:
-                    chosen[locator] = (key, byte_id)
-        return {locator: byte_id for locator, (_key, byte_id) in chosen.items()}
-
     def current_image_tags(self, stats: dict) -> dict:
         """Image tags of the files whose current ``(size, mtime_ns)`` is verified.
 
@@ -479,11 +411,29 @@ class AnnotationOperations:
         exactly that verified fingerprint; the most recently verified record
         wins when several do. Lookups go in chunks of 500 locators.
         """
-        stats = self._validated_stats(stats)
+        if not isinstance(stats, dict):
+            raise ValueError(
+                "stats must map locators to (size, mtime_ns) integer pairs"
+            )
+        for locator, fingerprint in stats.items():
+            _validate_fingerprint(locator, fingerprint)
+        locators = list(stats)
+        chosen: dict[str, tuple[tuple[str, str], str]] = {}
+        result: dict[str, list[str]] = {}
         with self._annotation_read() as conn:
-            current = self._current_byte_records(conn, stats)
-            owners = {byte_id: locator for locator, byte_id in current.items()}
-            result: dict[str, list[str]] = {locator: [] for locator in current}
+            for start in range(0, len(locators), _LOOKUP_CHUNK):
+                chunk = locators[start : start + _LOOKUP_CHUNK]
+                marks = ",".join("?" * len(chunk))
+                for locator, byte_id, size, mtime_ns, verified_at in conn.execute(
+                    _FINGERPRINTS.format(marks=marks), chunk
+                ):
+                    if (size, mtime_ns) != stats[locator]:
+                        continue
+                    key = (verified_at, byte_id)
+                    if locator not in chosen or key > chosen[locator][0]:
+                        chosen[locator] = (key, byte_id)
+            owners = {byte_id: locator for locator, (_key, byte_id) in chosen.items()}
+            result = {locator: [] for locator in chosen}
             byte_ids = list(owners)
             for start in range(0, len(byte_ids), _LOOKUP_CHUNK):
                 chunk = byte_ids[start : start + _LOOKUP_CHUNK]
@@ -492,60 +442,20 @@ class AnnotationOperations:
                     result[owners[byte_id]].append(name)
         return result
 
-    def autotag_state(self, stats: dict) -> dict:
-        """``{locator: bool}``: is each file's current byte record auto-tagged?
+    def iter_image_tag_records(self) -> Iterator[tuple[str, int, int, list[str]]]:
+        """Stream every byte record as ``(locator, size, mtime_ns, tags)``.
 
-        ``stats`` as for :meth:`current_image_tags`, whose rule picks the
-        current record; a locator without one is False. One read snapshot.
+        One SELECT ordered by locator, then by the bytes' first sighting, with
+        each set's names in position order.
         """
-        stats = self._validated_stats(stats)
-        with self._annotation_read() as conn:
-            current = self._current_byte_records(conn, stats)
-            byte_ids = list(dict.fromkeys(current.values()))
-            marked: set[str] = set()
-            for start in range(0, len(byte_ids), _LOOKUP_CHUNK):
-                chunk = byte_ids[start : start + _LOOKUP_CHUNK]
-                marks = ",".join("?" * len(chunk))
-                marked.update(
-                    row[0]
-                    for row in conn.execute(_MARKED_OF.format(marks=marks), chunk)
-                )
-        return {locator: current.get(locator) in marked for locator in stats}
-
-    def autotagged_locators(self) -> set:
-        """Locators with at least one auto-tagged byte record, current or not.
-
-        No fingerprint is checked (the Tag output images review's estimate).
-        """
-        with self._annotation_read() as conn:
-            return {row[0] for row in conn.execute(_MARKED_LOCATORS)}
-
-    def image_tag_ids(self, wanted, query: str) -> list[int]:
-        """Ids of the tag names on at least one image that a search wants.
-
-        A name counts when it is in ``wanted`` exactly (the Tags filter) or
-        contains ``query`` case-folded (the text search; ``query`` is
-        already folded). One read of the names that tag an image.
-        """
-        wanted = set(wanted)
-        with self._annotation_read() as conn:
-            return [
-                tag_id
-                for tag_id, name in conn.execute(_IMAGE_TAG_NAMES)
-                if name in wanted or (query and query in name.casefold())
-            ]
-
-    def image_tag_locators(self, tag_ids) -> set[str]:
-        """Locators with any byte record (current or not) carrying one of
-        ``tag_ids``, through the tag index, in chunks of 500 ids."""
-        ids = list(dict.fromkeys(tag_ids))
-        found: set[str] = set()
-        with self._annotation_read() as conn:
-            for start in range(0, len(ids), _LOOKUP_CHUNK):
-                chunk = ids[start : start + _LOOKUP_CHUNK]
-                marks = ",".join("?" * len(chunk))
-                found.update(
-                    row[0]
-                    for row in conn.execute(_TAG_LOCATORS.format(marks=marks), chunk)
-                )
-        return found
+        conn = self.model.get_connection()
+        current: tuple | None = None
+        for locator, byte_id, size, mtime_ns, name in conn.execute(_RECORDS):
+            if current is None or current[0] != byte_id:
+                if current is not None:
+                    yield current[1]
+                current = (byte_id, (locator, size, mtime_ns, []))
+            if name is not None:
+                current[1][3].append(name)
+        if current is not None:
+            yield current[1]

database/autotag_schema.py

@@ -1,140 +0,0 @@
-"""Auto-tagged marks (#379): which image bytes a tagging model has handled.
-
-One table, ``media_image_autotags``: one row per byte record of the image
-annotation group (``media_annotation_bytes``) means "a tagging model looked at
-these exact bytes and its result was stored", or that the bytes were found to
-be untaggable. "Skip already tagged" skips an image whose current byte record
-is marked; hand tags never mark. Rows are written only by the image tag store
-(``database/annotations.py``), in the transaction of the tag write they
-record.
-
-The group installs like ``image_favorites``: optional in old backups,
-required once a database is current, and never backfilled. Like the Needs
-review group it is valid only beside a valid image annotation group, because
-every mark cites one byte record (``ON DELETE CASCADE``). Validation reads
-only: the catalog compared after whitespace compaction, the columns and the
-foreign key through the PRAGMAs, then one bounded value pass and the foreign
-key check.
-"""
-
-import re
-import sqlite3
-from typing import Optional
-
-from .annotation_schema import BYTES_TABLE
-from .annotation_schema import TABLES as ANNOTATION_TABLES
-from .annotation_schema import _catalog as _annotation_catalog
-from .annotation_schema import _uuid, annotation_schema_error
-
-AUTOTAG_TABLE = "media_image_autotags"
-_DDL = (
-    f"CREATE TABLE {AUTOTAG_TABLE} (byte_id TEXT PRIMARY KEY "
-    f"REFERENCES {BYTES_TABLE}(id) ON DELETE CASCADE) WITHOUT ROWID"
-)
-# (cid, name, declared type, not null, default, primary key position): the
-# key of a WITHOUT ROWID table is implicitly NOT NULL.
-_COLUMNS = [(0, "byte_id", "TEXT", 1, None, 1)]
-# (column, parent table, parent column, on delete)
-_FOREIGN_KEYS = {("byte_id", BYTES_TABLE, "id", "CASCADE")}
-
-NEEDS_ANNOTATIONS = "Image auto-tag marks need the image annotation tables"
-INVALID_SCHEMA = "Image auto-tag marks have an invalid schema"
-INVALID_VALUES = "Image auto-tag marks contain invalid values"
-MISSING = "Missing image auto-tag marks schema"
-
-
-def _compact(sql: str) -> str:
-    return re.sub(r"\s+", "", sql).lower()
-
-
-def _catalog(conn: sqlite3.Connection) -> list:
-    return conn.execute(
-        "SELECT type,name,sql FROM sqlite_master WHERE name=? OR tbl_name=?",
-        (AUTOTAG_TABLE, AUTOTAG_TABLE),
-    ).fetchall()
-
-
-def autotag_without_annotations_error(conn: sqlite3.Connection) -> Optional[str]:
-    """Catalog only: the marks table present without its annotation tables.
-
-    Startup asks this before the annotation group installs, which would make
-    a marks table copied without it look valid. It reads no rows.
-    """
-    if not _catalog(conn):
-        return None
-    present = {
-        name for kind, name, _sql in _annotation_catalog(conn) if kind == "table"
-    }
-    if present != set(ANNOTATION_TABLES):
-        return NEEDS_ANNOTATIONS
-    return None
-
-
-def autotag_schema_error(
-    conn: sqlite3.Connection,
-    *,
-    allow_missing: bool = True,
-    annotations_valid: bool = False,
-) -> Optional[str]:
-    """Reject an unsupported marks table or invalid marks; reads only.
-
-    A database without the table is acceptable for backups that predate it
-    unless ``allow_missing`` is false. A present table requires a present,
-    valid image annotation group; ``annotations_valid`` says the caller has
-    just validated it (startup's annotation install), so only its presence is
-    checked again.
-    """
-    objects = _catalog(conn)
-    if not objects:
-        return None if allow_missing else MISSING
-    if annotations_valid:
-        if autotag_without_annotations_error(conn):
-            return NEEDS_ANNOTATIONS
-    elif annotation_schema_error(conn, allow_missing=False):
-        return NEEDS_ANNOTATIONS
-    actual = {(kind, name, _compact(sql or "")) for kind, name, sql in objects}
-    if actual != {("table", AUTOTAG_TABLE, _compact(_DDL))}:
-        return INVALID_SCHEMA
-    columns = [
-        (row[0], row[1], row[2].upper(), row[3], row[4], row[5])
-        for row in conn.execute(f"PRAGMA table_info({AUTOTAG_TABLE})")
-    ]
-    if columns != _COLUMNS:
-        return INVALID_SCHEMA
-    foreign_keys = {
-        (row[3], row[2], row[4], row[6])
-        for row in conn.execute(f"PRAGMA foreign_key_list({AUTOTAG_TABLE})")
-    }
-    if foreign_keys != _FOREIGN_KEYS:
-        return INVALID_SCHEMA
-    # Only this module's constants are interpolated into the SQL below.
-    if conn.execute(
-        f"SELECT 1 FROM {AUTOTAG_TABLE} "  # nosec B608
-        f"WHERE NOT ({_uuid('byte_id')}) LIMIT 1"
-    ).fetchone():
-        return INVALID_VALUES
-    if conn.execute(f"PRAGMA foreign_key_check({AUTOTAG_TABLE})").fetchone():
-        return INVALID_VALUES
-    return None
-
-
-def migrate_autotag_state(conn: sqlite3.Connection) -> None:
-    """Install the table atomically; validate before and after creating it.
-
-    Runs after ``migrate_annotation_state`` (which has just validated the
-    annotation group). Creates one empty table: no row is read or copied.
-    """
-    conn.execute("SAVEPOINT media_autotag_schema")
-    try:
-        error = autotag_schema_error(conn, annotations_valid=True)
-        if error:
-            raise sqlite3.DatabaseError(error)
-        conn.execute(_DDL.replace("CREATE TABLE", "CREATE TABLE IF NOT EXISTS", 1))
-        error = autotag_schema_error(conn, allow_missing=False, annotations_valid=True)
-        if error:
-            raise sqlite3.DatabaseError(error)
-        conn.execute("RELEASE media_autotag_schema")
-    except BaseException:
-        conn.execute("ROLLBACK TO media_autotag_schema")
-        conn.execute("RELEASE media_autotag_schema")
-        raise

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/duplicate_copies.py

@@ -11,8 +11,6 @@ IMMEDIATE`` transaction, so no row ever names a deleted file:
 - its favorite;
 - its image tags (``media_image_tags`` of its byte record), joined onto the
   kept copy's byte record as their union, in order;
-- its own image category (#332), copied to the kept copy when that copy has
-  none; the removed copy's row is kept, so a give-back loses nothing;
 - its pending Needs review items, settled: only an item still ``pending`` at
   revision 0 with no decision row is removed (``review._SETTLE_ITEM``), so a
   decided item is never touched.
@@ -24,8 +22,6 @@ import os
 
 from .annotation_schema import BYTES_TABLE, FILES_TABLE
 from .annotations import _BUMP_INDEX
-from .image_categories import COPY_SQL as COPY_CATEGORY_SQL
-from .image_categories import copy_image_category
 from .models import normalize_image_path, utc_now_iso
 from .review import _BUMP_REVIEW_INDEX, _PENDING_OF_LOCATOR, _SETTLE_ITEM
 from .review_changes import notify_review_change
@@ -80,7 +76,6 @@ FILE_LINK_SQL = (
     COPY_BYTE_SQL,
     COPY_TAG_COUNT_SQL,
     PENDING_COUNT_SQL,
-    COPY_CATEGORY_SQL,
 )
 
 
@@ -142,10 +137,8 @@ class DuplicateCopyOperations:
         removed key, kept root key, kept key)`` per listed root holding the
         file), ``removed_locator``,
         ``kept_locator``, ``sha256`` and the kept copy's ``kept_size`` and
-        ``kept_mtime_ns``; ``categories``: ``(removed file key, kept file
-        key)`` pairs of the image categories (#332). Returns ``{moved,
-        merged, favorites, tags, review, categories}`` (``categories``: the
-        image categories copied to the kept copy).
+        ``kept_mtime_ns``. Returns ``{moved, merged, favorites, tags,
+        review}``.
         """
         counts = dict.fromkeys(("moved", "merged", "favorites", "tags", "review"), 0)
         kept_keys = [normalize_image_path(path) for path in move["kept"]]
@@ -181,10 +174,6 @@ class DuplicateCopyOperations:
             for favorite in move.get("favorites", ()):
                 counts["favorites"] += _move_favorite(conn, *favorite)
             counts["tags"] = self._move_copy_tags(conn, move)
-            counts["categories"] = sum(
-                copy_image_category(conn, removed, kept)
-                for removed, kept in move.get("categories", ())
-            )
             for (item_id,) in conn.execute(
                 _PENDING_OF_LOCATOR, (move["removed_locator"],)
             ).fetchall():

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/image_categories.py

@@ -1,249 +0,0 @@
-"""Image categories (#332): an image file's own category.
-
-An image shows its own category when it has one, otherwise the category its
-link supplies (its recipe's, else its positive prompt's); this table holds
-only the own values. A row is keyed by the file key: the deepest configured
-output source that contains the file (its real, case-normalized path) and the
-path below it, case-folded where the OS folds case
-(``py/api/images.py`` ``image_category_key``). Without nested sources the key
-equals a favorite's key. Nothing follows a moved file: its row stays and is
-hidden until a file appears at the same path again.
-
-Writes validate strictly (the route strips the value and applies
-``validate_category``). Startup checks the structure only, so a value saved
-under older rules never stops the library opening; restore also checks the
-values. Optional in old backups, required once a database is current.
-"""
-
-import re
-import sqlite3
-from typing import Iterable
-
-TABLE = "image_categories"
-INDEX = "idx_image_categories_category"
-MAX_KEY_LENGTH = 4096
-MAX_CATEGORY_LENGTH = 100
-_DDL = (
-    f"CREATE TABLE {TABLE} (root_key TEXT NOT NULL, relative_path TEXT NOT NULL, "
-    "category TEXT NOT NULL, updated_at TEXT NOT NULL, "
-    "PRIMARY KEY (root_key, relative_path))"
-)
-_INDEX_DDL = f"CREATE INDEX {INDEX} ON {TABLE}(category)"
-_AUTOINDEX = f"sqlite_autoindex_{TABLE}_1"
-_COLUMNS = (
-    ("root_key", "TEXT", 1, 1),
-    ("relative_path", "TEXT", 1, 2),
-    ("category", "TEXT", 1, 0),
-    ("updated_at", "TEXT", 1, 0),
-)
-# A category may not hold a character below U+0020 (validate_category).
-_CONTROL_GLOB = "*[" + "".join(chr(code) for code in range(1, 32)) + "]*"
-
-CATEGORY_OF_SQL = (
-    f"SELECT category FROM {TABLE} WHERE root_key = ? AND relative_path = ?"
-)
-CATEGORIES_OF_ROOT_SQL = (
-    f"SELECT relative_path, category FROM {TABLE} WHERE root_key = ?"
-)
-UPSERT_SQL = (
-    f"INSERT INTO {TABLE} (root_key, relative_path, category, updated_at) "
-    "VALUES (?, ?, ?, ?) ON CONFLICT(root_key, relative_path) "
-    "DO UPDATE SET category = excluded.category, updated_at = excluded.updated_at"
-)
-DELETE_SQL = f"DELETE FROM {TABLE} WHERE root_key = ? AND relative_path = ?"
-# The duplicate cleanup's copy (#332 MC11): the removed copy's row is copied
-# to the kept copy only when the kept copy has none; it is never deleted.
-COPY_SQL = (
-    f"INSERT OR IGNORE INTO {TABLE} (root_key, relative_path, category, updated_at) "
-    f"SELECT ?, ?, category, updated_at FROM {TABLE} "
-    "WHERE root_key = ? AND relative_path = ?"
-)
-STATEMENTS = (CATEGORY_OF_SQL, CATEGORIES_OF_ROOT_SQL, UPSERT_SQL, DELETE_SQL, COPY_SQL)
-
-
-def _compact(sql: str) -> str:
-    return re.sub(r"\s+", "", sql or "").lower()
-
-
-def _structure_error(
-    conn: sqlite3.Connection, allow_missing: bool, allow_missing_index: bool = False
-) -> str | None:
-    objects = conn.execute(
-        "SELECT type,name,sql FROM sqlite_master WHERE name=? "
-        "OR (type IN ('index','trigger') AND tbl_name=?)",
-        (TABLE, TABLE),
-    ).fetchall()
-    if not objects:
-        return None if allow_missing else "Missing image categories schema"
-    tables = [sql for kind, _name, sql in objects if kind == "table"]
-    others = {(kind, name) for kind, name, _sql in objects if kind != "table"}
-    expected = {("index", _AUTOINDEX), ("index", INDEX)}
-    # Before its install, a table without the category index is repaired by
-    # CREATE INDEX IF NOT EXISTS rather than refused.
-    if allow_missing_index and others == {("index", _AUTOINDEX)}:
-        expected = others
-    if len(tables) != 1 or others != expected:
-        return "Image categories name is reserved by an unsupported schema object"
-    if _compact(tables[0]) != _compact(_DDL):
-        return "Image categories has an invalid table definition"
-    index_sql = next((sql for kind, name, sql in objects if name == INDEX), None)
-    if ("index", INDEX) in expected and _compact(index_sql) != _compact(_INDEX_DDL):
-        return "Image categories has an invalid index"
-    autoindex_sql = next(sql for kind, name, sql in objects if name == _AUTOINDEX)
-    if autoindex_sql is not None:
-        return "Image categories has an invalid index"
-    columns = tuple(
-        (row[1], row[2].upper(), row[3], row[5])
-        for row in conn.execute(f"PRAGMA table_info({TABLE})")
-    )
-    if columns != _COLUMNS:
-        return "Image categories has invalid columns"
-    return None
-
-
-def _values_error(conn: sqlite3.Connection) -> str | None:
-    # Bytes bound characters from above (UTF-8 is at most 4 bytes each).
-    limit = MAX_KEY_LENGTH * 4
-    if conn.execute(
-        f"SELECT 1 FROM {TABLE} WHERE typeof(root_key) != 'text' "  # nosec B608
-        "OR typeof(relative_path) != 'text' OR typeof(category) != 'text' "
-        "OR typeof(updated_at) != 'text' "
-        f"OR length(CAST(root_key AS BLOB)) > {limit} "
-        f"OR length(CAST(relative_path AS BLOB)) > {limit} "
-        "OR length(CAST(updated_at AS BLOB)) > 64 "
-        "OR instr(CAST(category AS BLOB), x'00') > 0 "
-        f"OR length(category) < 1 OR length(category) > {MAX_CATEGORY_LENGTH} "
-        "OR category != TRIM(category) OR category GLOB ? LIMIT 1",
-        (_CONTROL_GLOB,),
-    ).fetchone():
-        return "Image categories contains invalid values"
-    for root, path in conn.execute(
-        f"SELECT CAST(root_key AS BLOB), CAST(relative_path AS BLOB) "  # nosec B608
-        f"FROM {TABLE} WHERE length(CAST(root_key AS BLOB)) > {MAX_KEY_LENGTH} "
-        f"OR length(CAST(relative_path AS BLOB)) > {MAX_KEY_LENGTH}"
-    ):
-        for raw in (root, path):
-            if len(bytes(raw).decode("utf-8", "replace")) > MAX_KEY_LENGTH:
-                return "Image categories contains invalid values"
-    return None
-
-
-def image_categories_schema_error(
-    conn: sqlite3.Connection,
-    *,
-    allow_missing: bool = True,
-    check_values: bool = True,
-) -> str | None:
-    """Reject an unsupported image categories schema (and, optionally, values).
-
-    Reads only. A missing table is acceptable for backups that predate it
-    unless ``allow_missing`` is false. ``check_values`` also refuses a stored
-    value the write path could never have written.
-    """
-    error = _structure_error(conn, allow_missing)
-    if error is not None or not check_values:
-        return error
-    exists = conn.execute(
-        "SELECT 1 FROM sqlite_master WHERE type='table' AND name=?", (TABLE,)
-    ).fetchone()
-    return _values_error(conn) if exists else None
-
-
-def migrate_image_categories(conn: sqlite3.Connection) -> None:
-    """Install the table and its index atomically; structure is checked
-    before and after. Reads only ``sqlite_master`` and this table's PRAGMAs
-    and writes only its own two objects (no backfill)."""
-    conn.execute("SAVEPOINT image_categories_schema")
-    try:
-        error = _structure_error(conn, True, allow_missing_index=True)
-        if error:
-            raise sqlite3.DatabaseError(error)
-        conn.execute(_DDL.replace("CREATE TABLE", "CREATE TABLE IF NOT EXISTS", 1))
-        conn.execute(
-            _INDEX_DDL.replace("CREATE INDEX", "CREATE INDEX IF NOT EXISTS", 1)
-        )
-        error = image_categories_schema_error(
-            conn, allow_missing=False, check_values=False
-        )
-        if error:
-            raise sqlite3.DatabaseError(error)
-        conn.execute("RELEASE image_categories_schema")
-    except BaseException:
-        conn.execute("ROLLBACK TO image_categories_schema")
-        conn.execute("RELEASE image_categories_schema")
-        raise
-
-
-def copy_image_category(conn: sqlite3.Connection, removed_key, kept_key) -> int:
-    """Give the kept copy the removed copy's category when it has none.
-
-    Runs inside the caller's transaction; never deletes the removed copy's
-    row, so a give-back or a failed delete loses nothing. Returns 1 when a
-    row was inserted, else 0.
-    """
-    if tuple(removed_key) == tuple(kept_key):
-        return 0
-    return max(conn.execute(COPY_SQL, (*kept_key, *removed_key)).rowcount, 0)
-
-
-class ImageCategoryOperations:
-    """PromptDatabase mixin: set, clear and read images' own categories.
-
-    Never reads or writes ``prompts``, ``prompt_pairs`` or
-    ``generated_images``.
-    """
-
-    def image_category(self, root_key: str, relative_key: str) -> str | None:
-        """One file's own category, or None."""
-        row = (
-            self.model.get_connection()
-            .execute(CATEGORY_OF_SQL, (root_key, relative_key))
-            .fetchone()
-        )
-        return row[0] if row else None
-
-    def own_categories_of(self, root_keys: Iterable[str]) -> dict:
-        """``{(root key, relative key): category}`` under the given sources.
-
-        One primary-key range read per source.
-        """
-        found = {}
-        conn = self.model.get_connection()
-        for root_key in dict.fromkeys(root_keys):
-            for relative, category in conn.execute(CATEGORIES_OF_ROOT_SQL, (root_key,)):
-                found[(root_key, relative)] = category
-        return found
-
-    def set_image_categories(self, file_keys, category: str) -> dict:
-        """Set *category* on every file key, in one transaction.
-
-        ``file_keys``: ``(root key, relative key)`` pairs from any number of
-        sources. Returns ``{updated, unchanged}``; a file that already had
-        exactly this value is ``unchanged`` and keeps its ``updated_at``.
-        """
-        from .models import utc_now_iso  # models imports this module's schema
-
-        keys = list(dict.fromkeys(tuple(key) for key in file_keys))
-        counts = {"updated": 0, "unchanged": 0}
-        now = utc_now_iso()
-        with self._pair_transaction() as conn:
-            for key in keys:
-                row = conn.execute(CATEGORY_OF_SQL, key).fetchone()
-                if row is not None and row[0] == category:
-                    counts["unchanged"] += 1
-                    continue
-                conn.execute(UPSERT_SQL, (*key, category, now))
-                counts["updated"] += 1
-        return counts
-
-    def clear_image_categories(self, file_keys) -> int:
-        """Remove the own category of every file key (one transaction).
-
-        Returns the number of rows removed.
-        """
-        keys = list(dict.fromkeys(tuple(key) for key in file_keys))
-        removed = 0
-        with self._pair_transaction() as conn:
-            for key in keys:
-                removed += conn.execute(DELETE_SQL, key).rowcount
-        return removed

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,22 +20,15 @@ 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
-from .autotag_schema import (
-    autotag_schema_error,
-    autotag_without_annotations_error,
-    migrate_autotag_state,
-)
 from .review_schema import (
     migrate_review_state,
     review_schema_error,
     review_without_annotations_error,
 )
 from .saved_views import migrate_saved_views, saved_views_schema_error
-from .image_categories import image_categories_schema_error, migrate_image_categories
 from .workflow_documents import (
     DOCUMENT_ID_COLUMNS,
     migrate_workflow_documents,
@@ -45,6 +39,7 @@ from .workflow_documents import (
 from .execution_history_schema import (
     history_schema_error,
     migrate_execution_history,
+    rotate_history_epoch,
 )
 
 # Import logging system
@@ -344,15 +339,8 @@ class PromptModel:
         review_error = review_without_annotations_error(conn)
         if review_error:
             raise sqlite3.DatabaseError(review_error)
-        # The auto-tag marks cite annotation bytes the same way (#379).
-        autotag_error = autotag_without_annotations_error(conn)
-        if autotag_error:
-            raise sqlite3.DatabaseError(autotag_error)
         migrate_annotation_state(conn)
         migrate_review_state(conn)
-        migrate_autotag_state(conn)
-        # Image categories (#332): independent of every table above.
-        migrate_image_categories(conn)
         # Last: the older generated_images rebuilds run only before file_path.
         migrate_workflow_documents(conn)
 
@@ -567,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
@@ -1147,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.
@@ -1158,13 +1143,9 @@ class PromptModel:
         Args:
             path: File to inspect
             require_library_state: Also require the tables every current
-                database has (Library state, image favorites, image
-                categories, saved views, image annotations and the review
-                queue), as a migrated
+                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
@@ -1224,11 +1205,6 @@ class PromptModel:
             )
             if favorites_error:
                 return False, favorites_error
-            categories_error = image_categories_schema_error(
-                conn, allow_missing=not require_library_state
-            )
-            if categories_error:
-                return False, categories_error
             views_error = saved_views_schema_error(
                 conn, allow_missing=not require_library_state
             )
@@ -1244,13 +1220,8 @@ class PromptModel:
             )
             if review_error:
                 return False, review_error
-            autotag_error = autotag_schema_error(
-                conn, allow_missing=not require_library_state
-            )
-            if autotag_error:
-                return False, autotag_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
@@ -1284,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
@@ -1330,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

@@ -7,12 +7,7 @@ import json
 import math
 import datetime
 import os
-from typing import Any, Dict, Iterable, List, Optional, Sequence, Set, Tuple
-
-try:
-    from ..utils.inspection_response import inherited_category
-except ImportError:
-    from utils.inspection_response import inherited_category
+from typing import Optional, List, Dict, Any, Set, Tuple
 
 from .models import PromptModel, normalize_image_path, utc_now_iso
 from .pairs import PairDependencyError, PairOperations  # noqa: F401 (re-exported)
@@ -31,8 +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 .image_categories import ImageCategoryOperations
 from .workflow_documents import (
     DocumentReader,
     documents_of_rows,
@@ -243,17 +236,12 @@ LEFT JOIN prompt_library_state pls ON pls.prompt_id = pp.positive_prompt_id
 WHERE gi.image_path IN ({marks}) OR gi.file_path IN ({marks}){fallback}"""
 # One image row describes a card only when no other row claims the same file
 # (as in get_image_link_summaries, several rows are ambiguous). The pair scope
-# and the linked positive follow _LINK_SUMMARY_SQL; rating, tags and the
-# searchable text and titles come from that positive (spec D12/D13). The raw
-# recipe and positive categories are read for the inherited category, which
-# Python decides (``inherited_category``, #332 MC4); SQL never filters by
-# category. Every
+# and the linked positive follow _LINK_SUMMARY_SQL; category, rating, tags and
+# the searchable text and titles come from that positive (spec D12/D13). Every
 # writer since the 3.2.4 migration stores file_path, so it is the path key.
 # The prompt-level conditions are uncorrelated IN sets SQLite builds once, and
 # the CASE evaluates the per-row ambiguity probe only for admitted rows.
-_LINK_FILTER_SQL = """SELECT gi.file_path AS file_path, p.rating AS rating,
-       {hit} AS matched, p.id AS positive, pp.id IS NOT NULL AS has_pair,
-       pp.category AS pair_category, p.category AS category
+_LINK_FILTER_SQL = """SELECT gi.file_path, p.rating, {hit}, p.id
 FROM generated_images gi
 LEFT JOIN prompt_pairs pp ON pp.id = (
     SELECT CASE WHEN COUNT(DISTINCT ip.pair_id) = 1 THEN MIN(ip.pair_id) END
@@ -262,31 +250,10 @@ JOIN prompts p ON p.id = COALESCE(pp.positive_prompt_id, gi.prompt_id)
 WHERE gi.file_path IS NOT NULL AND CASE WHEN {admit} THEN NOT EXISTS (
     SELECT 1 FROM generated_images other
     WHERE other.file_path = gi.file_path AND other.id <> gi.id) ELSE 0 END"""
-# _LINK_FILTER_SQL's rows as one JSON array, built by SQLite in one step (#354).
-# Python's sqlite3 releases and retakes the GIL around every step, so a read
-# that steps once per linked row waits on a busy ComfyUI thread thousands of
-# times. A BLOB value (no writer stores one) makes the value NULL (or
-# json_array refuses it), and the read streams instead. The raw categories are
-# put in only for a category read (#332), so plain reads stay as small as #354
-# measured them.
-_LINK_MATCHES_JSON_SQL = """SELECT CASE
-    WHEN max({blob}) THEN NULL
-    ELSE json_group_array(json_array({columns})) END
-FROM ({select})"""
-_LINK_PLAIN_COLUMNS = ("file_path", "rating", "matched", "positive")
-_LINK_CATEGORY_COLUMNS = _LINK_PLAIN_COLUMNS + ("has_pair", "pair_category", "category")
-# The columns a BLOB can reach: matched, positive and has_pair are computed.
-_LINK_STORED_COLUMNS = ("file_path", "rating", "pair_category", "category")
-# Set when this SQLite has no JSON functions: every later read streams.
-_one_step_unsupported = False
-# One warning per process when a read falls back to streaming.
-_one_step_warned = False
 # The linked positive of each given path (one unambiguous link, pair scope as
-# in _LINK_FILTER_SQL) with the raw categories of its inherited category; {hit}
-# as in link_filter_query. Used for the few files whose current image tags meet
-# a Tags filter (#249 B3).
-_LINK_FACTS_SQL = """SELECT gi.file_path, p.rating, {hit}, p.id,
-pp.id IS NOT NULL, pp.category, p.category
+# in _LINK_FILTER_SQL) with its category; {hit} as in link_filter_query. Used
+# for the few files whose current image tags meet a Tags filter (#249 B3).
+_LINK_FACTS_SQL = """SELECT gi.file_path, p.rating, {hit}, p.id, p.category
 FROM generated_images gi
 LEFT JOIN prompt_pairs pp ON pp.id = (
     SELECT CASE WHEN COUNT(DISTINCT ip.pair_id) = 1 THEN MIN(ip.pair_id) END
@@ -315,24 +282,8 @@ _LINK_FILTER_TAG = (
 )
 
 
-# One unambiguously linked image's facts for the Images filters, a plain tuple
-# (hit, rating, positive id, inherited category): built per linked row, so no
-# NamedTuple. The category is the inherited one (#332 MC4: the recipe's when
-# set, else the positive's), never the image's own category.
-LinkMatch = Tuple[bool, Optional[int], int, Any]
-
-
-def _link_match(rating, matched, positive, has_pair, pair_category, category):
-    inherited, _scope = inherited_category(category, pair_category, bool(has_pair))
-    return (bool(matched), rating, positive, inherited)
-
-
 def link_filter_query(
-    q: str,
-    tags: List[str],
-    *,
-    every_link: bool = False,
-    category: Optional[str] = None,
+    q: str, category: Optional[str], tags: List[str], *, every_link: bool = False
 ) -> Tuple[str, Dict[str, Any]]:
     """The workspace filter SELECT and its named parameters (all bound).
 
@@ -346,9 +297,7 @@ def link_filter_query(
         params["pattern"] = f"%{escape_like(q)}%"
     admitted = []
     if category is not None:
-        # Only narrows: an inherited category is one of the two raw values;
-        # which one is decided in Python (inherited_category, #332 MC4).
-        admitted.append("(p.category = :category OR pp.category = :category)")
+        admitted.append("p.category = :category")
         params["category"] = category
     for index, tag in enumerate(tags):
         admitted.append(_LINK_FILTER_TAG.format(index=index))
@@ -359,50 +308,6 @@ def link_filter_query(
     return sql, params
 
 
-def link_matches_json_query(sql: str, categories: bool = False) -> str:
-    """*sql* from link_filter_query, wrapped to return its rows as one JSON value.
-
-    With *categories* each row also carries the raw values the inherited
-    category is decided from; otherwise only path, rating, hit and positive.
-    """
-    columns = _LINK_CATEGORY_COLUMNS if categories else _LINK_PLAIN_COLUMNS
-    blob = " OR ".join(
-        f"typeof({name}) = 'blob'" for name in _LINK_STORED_COLUMNS if name in columns
-    )
-    return _LINK_MATCHES_JSON_SQL.format(
-        blob=blob, columns=", ".join(columns), select=sql
-    )
-
-
-def _link_matches_from_rows(
-    rows: Iterable[Sequence[Any]], categories: bool, wanted: Optional[Set[str]]
-) -> Dict[str, LinkMatch]:
-    """LinkMatch per wanted path from link rows (one-step or streamed).
-
-    Without *categories* the inherited category is None, as the caller then
-    never compares it.
-    """
-    matches: Dict[str, LinkMatch] = {}
-    for path, rating, matched, positive, *raw in rows:
-        if wanted is None or path in wanted:
-            if categories:
-                matches[path] = _link_match(rating, matched, positive, *raw[:3])
-            else:
-                matches[path] = (bool(matched), rating, positive, None)
-    return matches
-
-
-def _streamed_link_matches(
-    conn: sqlite3.Connection,
-    sql: str,
-    params: Dict[str, Any],
-    wanted: Optional[Set[str]],
-    categories: bool = False,
-) -> Dict[str, LinkMatch]:
-    """The link read stepped once per row (the fallback of the one-step read)."""
-    return _link_matches_from_rows(conn.execute(sql, params), categories, wanted)
-
-
 _ASCII_FOLD = str.maketrans("ABCDEFGHIJKLMNOPQRSTUVWXYZ", "abcdefghijklmnopqrstuvwxyz")
 
 
@@ -461,8 +366,6 @@ class PromptDatabase(
     MaintenanceOperations,
     DuplicateCopyOperations,
     WorkflowStorageOperations,
-    CategoryImportOperations,
-    ImageCategoryOperations,
 ):
     """Database operations class for managing prompts."""
 
@@ -552,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
@@ -570,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.
@@ -1776,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]]:
         """
@@ -2636,94 +2511,38 @@ class PromptDatabase(
     def get_image_link_matches(
         self,
         q: str,
+        category: Optional[str],
         tags: List[str],
         *,
         every_link: bool = False,
         wanted: Optional[Set[str]] = None,
-        category: Optional[str] = None,
-    ) -> Dict[str, LinkMatch]:
-        """Map normalized paths of unambiguously linked images to a LinkMatch
-        (hit, rating, positive id, inherited category).
+    ) -> Dict[str, Tuple[bool, Optional[int], int]]:
+        """Map normalized paths of unambiguously linked images to
+        (hit, rating, positive id).
 
-        Rows are limited to images whose linked positive has every tag in
-        *tags* (exact names). The category filter is applied by the caller to
-        the effective category (#332). ``hit`` says whether *q* occurs in
+        Rows are limited to images whose linked positive has *category* and
+        every tag in *tags* (exact names). ``hit`` says whether *q* occurs in
         the positive's text, Library title or a tag name; a pair's own title
         names its negative variant and is not searched.
-        Without tags only hits are returned, unless *every_link*
+        Without category or tags only hits are returned, unless *every_link*
         asks for every linked image (the rating sort and the positive count).
-        The positive id is the card's linked positive. With *category* only
-        links whose raw recipe or positive category is that value are read (a
-        superset of the links that inherit it; the caller compares the
-        inherited value) and the inherited category is decided per row;
-        otherwise it is None, which keeps the plain reads cheap.
-
-        One SELECT, returned as one JSON value (#354): SQLite steps once, so
-        the read takes the GIL back a constant two or three times instead of
-        once per linked row while ComfyUI generates. Peak memory therefore
-        grows with the database's matching linked rows (about 530 bytes each,
-        more with the raw categories of a category read, freed on return); the
-        result is bounded by *wanted* (the listing's normalized paths) when
-        given. Where the JSON step fails (no JSON functions, a BLOB value, a
-        JSON text over SQLite's length limit) the rows are streamed as before.
+        The positive id is the card's linked positive. One SELECT whose rows
+        are streamed; with *wanted* (the listing's normalized paths) only those
+        paths are kept, so memory is bounded by the listing, not the database.
         """
-        sql, params = link_filter_query(
-            q, tags, every_link=every_link, category=category
-        )
-        categories = category is not None
+        sql, params = link_filter_query(q, category, tags, every_link=every_link)
+        matches: Dict[str, Tuple[bool, Optional[int], int]] = {}
         with self.model.get_connection() as conn:
-            rows = None
-            if not _one_step_unsupported:
-                rows = self._one_step_link_rows(conn, sql, params, categories)
-            if rows is None:
-                return _streamed_link_matches(conn, sql, params, wanted, categories)
-        return _link_matches_from_rows(rows, categories, wanted)
-
-    def _one_step_link_rows(
-        self,
-        conn: sqlite3.Connection,
-        sql: str,
-        params: Dict[str, Any],
-        categories: bool = False,
-    ) -> Optional[List[List[Any]]]:
-        """*sql*'s rows from one JSON value, or None when this read must stream.
-
-        An interrupted read (Move library retiring the connection) is raised
-        as before, never retried row by row.
-        """
-        global _one_step_unsupported, _one_step_warned
-        error: Optional[str] = None
-        try:
-            cursor = conn.execute(link_matches_json_query(sql, categories), params)
-            try:
-                ((document,),) = cursor.fetchall()
-            finally:
-                cursor.close()  # resets the statement: its snapshot ends now
-        except (sqlite3.OperationalError, sqlite3.DataError) as failure:
-            # DataError: the JSON text is longer than SQLITE_LIMIT_LENGTH.
-            error = str(failure)
-            if error == "interrupted":
-                raise
-            if error.startswith("no such function"):
-                _one_step_unsupported = True
-        else:
-            if document is not None:
-                return json.loads(document)
-            error = "a BLOB value"
-        if not _one_step_warned:
-            _one_step_warned = True
-            self.logger.warning(
-                "Reading image links row by row (slower while ComfyUI "
-                "generates); the one-step read failed: %s",
-                error,
-            )
-        return None
+            for path, rating, matched, positive in conn.execute(sql, params):
+                if wanted is None or path in wanted:
+                    matches[path] = (bool(matched), rating, positive)
+        return matches
 
     def get_image_link_facts(
         self, paths: List[str], q: str = ""
-    ) -> Dict[str, Tuple[bool, Optional[int], int, Any, Tuple[str, ...]]]:
+    ) -> Dict[str, Tuple[bool, Optional[int], int, Optional[str], Tuple[str, ...]]]:
         """Map each normalized path with one unambiguous link to its positive's
-        (hit, rating, positive id, inherited category, tag names).
+        (hit, rating, positive id, category, tag names).
 
         The link is resolved as in get_image_link_matches, and ``hit`` says
         whether *q* occurs in the positive's text, Library title or a tag
@@ -2734,7 +2553,7 @@ class PromptDatabase(
         if q:
             hit = _LINK_FILTER_HIT
             params["pattern"] = f"%{escape_like(q)}%"
-        rows: Dict[str, LinkMatch] = {}
+        rows: Dict[str, Tuple[bool, Optional[int], int, Optional[str]]] = {}
         names: Dict[int, List[str]] = {}
         unique = list(dict.fromkeys(paths))
         with self.model.get_connection() as conn:
@@ -2743,8 +2562,10 @@ class PromptDatabase(
                 bound = {f"path{i}": path for i, path in enumerate(chunk)}
                 marks = ",".join(f":{key}" for key in bound)
                 sql = _LINK_FACTS_SQL.format(hit=hit, marks=marks)
-                for path, *row in conn.execute(sql, {**params, **bound}):
-                    rows[path] = _link_match(*row)
+                for path, rating, matched, positive, category in conn.execute(
+                    sql, {**params, **bound}
+                ):
+                    rows[path] = (bool(matched), rating, positive, category)
             positives = sorted({row[2] for row in rows.values()})
             for start in range(0, len(positives), _FACTS_CHUNK):
                 chunk = positives[start : start + _FACTS_CHUNK]
@@ -2757,16 +2578,20 @@ class PromptDatabase(
             path: (*row, tuple(names.get(row[2], ()))) for path, row in rows.items()
         }
 
-    def get_image_paths_matching(self, q: str, tags: List[str]) -> Set[str]:
-        """Normalized paths whose linked positive matches *q* and *tags*.
+    def get_image_paths_matching(
+        self, q: str, category: Optional[str], tags: List[str]
+    ) -> Set[str]:
+        """Normalized paths whose linked positive matches *q*, *category* and *tags*.
 
         See get_image_link_matches; an empty *q* matches every linked image
-        the tags admit.
+        the category and tags admit.
         """
         return {
             path
-            for path, match in self.get_image_link_matches(q, tags).items()
-            if match[0] or not q
+            for path, (hit, _rating, _positive) in self.get_image_link_matches(
+                q, category, tags
+            ).items()
+            if hit or not q
         }
 
     def get_prompt_id_for_image(self, image_path: str) -> Optional[int]:

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

@@ -229,15 +229,13 @@ def evidence_offers_choice(evidence: Any) -> bool:
     """
     if not isinstance(evidence, dict):
         return False
-    # The saver anchor's one pair (#390) is a suggestion to confirm.
-    needed = 1 if evidence.get("anchor") == "saver" else MIN_CHOOSABLE
     if evidence.get("limited"):
         total = evidence.get("candidate_total")
-        return type(total) is int and total >= needed
+        return type(total) is int and total >= MIN_CHOOSABLE
     candidates = evidence.get("candidates")
     if not isinstance(candidates, list):
         return False
-    return sum(1 for c in candidates if choosable(c)) >= needed
+    return sum(1 for c in candidates if choosable(c)) >= MIN_CHOOSABLE
 
 
 def evidence_digest(text: str) -> str:
@@ -382,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,368 +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.
-
-``recorded_output`` applies the first two rules and returns, for the
-inspector (#386), the one output node (save node) that run reported the file
-from and the texts PromptManager recorded at execution per sampler.
-
-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 dataclasses import dataclass
-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), "
-    "o.output_node_id "
-    "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, nodes)}}``.
-
-    ``nodes`` is the set of output node ids that reported the location in that
-    run. 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, node in rows:
-            runs = found.setdefault((name, subfolder, root_key, style), {})
-            runs.setdefault(run_id, (began, ended, set()))[2].add(node)
-    return found
-
-
-def _recorded_runs(
-    db: Any,
-    image_paths: Iterable[str],
-    output_root: Optional[str],
-    path_style: Optional[str],
-) -> Dict[str, tuple]:
-    """``{path: (run_id, output node ids)}`` for each file history attributes.
-
-    A file is attributed when exactly one recorded run reported its location
-    and it was last written while that run executed.
-    """
-    paths = list(dict.fromkeys(path for path in image_paths if path))
-    if not paths or not output_root:
-        return {}
-    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 {}
-    names = sorted({filename for _key, _sub, filename in located.values()})
-    runs = _runs_by_location(db, names)
-    if not runs:
-        return {}
-    attributed = {}
-    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, nodes)),) = reported.items()
-        if _written_during(path, began, ended):
-            attributed[path] = (run_id, nodes)
-    return attributed
-
-
-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)
-    prompts: Dict[str, Optional[int]] = {}
-    for path, (run_id, _nodes) in _recorded_runs(
-        db, paths, output_root, path_style
-    ).items():
-        if run_id not in prompts:
-            prompts[run_id] = _named_prompt(db, run_id)
-        result[path] = prompts[run_id]
-    return result
-
-
-@dataclass(frozen=True)
-class RecordedOutput:
-    """What recorded history knows about the run that wrote one file (#386).
-
-    ``saver_id`` is the one output node the run reported the file from (None
-    when several did). ``texts`` maps each sampler anchor of the run to the
-    effective texts PromptManager recorded at execution for its roles
-    (``{"positive": text or None, "negative": text or None}``); a role whose
-    text was only inferred from the graph is None.
-    """
-
-    saver_id: Optional[str]
-    texts: Dict[str, Dict[str, Optional[str]]]
-
-
-def _recorded_texts(db: Any, run_id: str) -> Dict[str, Dict[str, Optional[str]]]:
-    texts = {}
-    for context in db.get_execution_contexts(run_id).get("contexts") or []:
-        evidence = context.get("evidence") or {}
-        roles = {}
-        for role in ("positive", "negative"):
-            values = context.get(role) or {}
-            proof = (evidence.get(role) or {}).get("effective") or {}
-            value = values.get("effective")
-            recorded = proof.get("provenance") == "recorded"
-            roles[role] = value if recorded and isinstance(value, str) else None
-        texts[context["anchor_id"]] = roles
-    return texts
-
-
-def recorded_output(
-    db: Any,
-    image_path: str,
-    output_root: Optional[str],
-    path_style: Optional[str] = None,
-) -> Optional[RecordedOutput]:
-    """The recorded run facts for ``image_path``, else None (#386).
-
-    The file must be attributed to one run (``_recorded_runs``: one run
-    reported its location and it was written during that run). Read-only; it
-    never links anything.
-    """
-    if not image_path:
-        return None
-    conn = db.model.get_connection()
-    own_transaction = not conn.in_transaction
-    if own_transaction:  # outputs and texts from one state of history
-        conn.execute("BEGIN")
-    try:
-        found = _recorded_runs(db, [image_path], output_root, path_style)
-        if image_path not in found:
-            return None
-        run_id, nodes = found[image_path]
-        saver = next(iter(nodes)) if len(nodes) == 1 else None
-        return RecordedOutput(saver, _recorded_texts(db, run_id))
-    finally:
-        if own_transaction:
-            conn.rollback()
-
-
-_LOGGER = logging.getLogger("prompt_manager.run_attribution")
-
-
-def recorded_output_lookup(
-    db: Any, *, close: bool = False, reference: Optional[dict] = None
-) -> Callable[[Any], Any]:
-    """``lookup(path) -> RecordedOutput or None`` for the inspect routes (#386).
-
-    Uses ComfyUI's output folder. Any failure (no history, a locked library)
-    is logged and names no node, so the file is judged from its own metadata.
-    ``close`` closes the calling thread's connection afterwards, for routes
-    that close theirs after reading. ``reference`` (a history occurrence's
-    output reference) spells the file as history recorded it: the route's
-    target is case-normalized on Windows, and history matches names exactly.
-    """
-
-    def lookup(path: Any) -> Optional[RecordedOutput]:
-        root = host_output_directory()
-        if reference is not None:
-            if reference.get("folder_type") != "output" or not root:
-                return None
-            path = os.path.join(
-                root, reference.get("subfolder") or "", reference.get("filename") or ""
-            )
-        try:
-            return recorded_output(db, str(path), root)
-        except (sqlite3.Error, OSError, ValueError):
-            _LOGGER.warning("Recorded run lookup failed", exc_info=True)
-            return None
-        except Exception:
-            _LOGGER.exception("Recorded run lookup failed unexpectedly")
-            return None
-        finally:
-            if close:
-                db.model.close()
-
-    return lookup
-
-
-_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/vocabulary.py

@@ -13,9 +13,7 @@ same connection before commit. Owner rows and their timestamps never change.
 
 Category consolidation is previewed in one ``library_snapshot`` and applied in
 one ``_pair_transaction`` that recomputes the owner projection and requires the
-preview's ``impact_token``; only rows carrying the exact source change. Image
-rows holding the source (``image_categories``, #332) are owners too: they are
-counted, hashed into the token and renamed with the prompts and pairs.
+preview's ``impact_token``; only rows carrying the exact source change.
 """
 
 import sqlite3
@@ -99,30 +97,16 @@ def _validate_tag_id(tag_id: object) -> None:
         raise ValueError("Invalid tag ID")
 
 
-# Category values in Tags & categories (#332 §7): the prompt-backed values
-# (nonblank values on eligible parents or on active pairs, grouped exactly, so
-# whitespace and case variants stay distinct; /library/options lists the same
-# prompt-backed set with its own query) plus the values only image rows hold.
-# A prompt-backed value is ordered by its oldest owning positive; an image-only
-# value sorts after all of them (first_pid is SQLite's INTEGER maximum, above
-# any prompt id), then by value. ``image_count`` counts stored rows, including
-# files missing on disk. No FULL OUTER JOIN, so it runs on SQLite 3.31+.
-_IMAGE_ONLY_FIRST_PID = 2**63 - 1
-_CATEGORY_ROWS = (
+# The /library/options universe: nonblank values on eligible parents or on
+# active pairs, grouped exactly (whitespace and case variants stay distinct).
+_CATEGORY_GROUPS = (
     "WITH owners(value,pid) AS ("
     "SELECT p.category,p.id FROM prompts p WHERE p.category IS NOT NULL "
     "AND TRIM(p.category)!='' AND " + _ELIGIBLE + " "
     "UNION SELECT pp.category,pp.positive_prompt_id FROM prompt_pairs pp "
     "WHERE pp.archived=0 AND pp.category IS NOT NULL AND TRIM(pp.category)!=''),"
-    "image_values(value,image_count) AS ("
-    "SELECT category,COUNT(*) FROM image_categories GROUP BY category),"
-    "grouped(value,first_pid,prompt_count) AS ("
-    "SELECT value,MIN(pid),COUNT(DISTINCT pid) FROM owners GROUP BY value "
-    "UNION ALL SELECT value," + str(_IMAGE_ONLY_FIRST_PID) + ",0 FROM image_values "
-    "WHERE value NOT IN (SELECT value FROM owners)),"
-    "counted AS (SELECT g.value,g.first_pid,g.prompt_count,"
-    "COALESCE(i.image_count,0) AS image_count FROM grouped g "
-    "LEFT JOIN image_values i ON i.value=g.value) "
+    "grouped AS (SELECT value,MIN(pid) AS first_pid,"
+    "COUNT(DISTINCT pid) AS prompt_count FROM owners GROUP BY value) "
 )
 
 
@@ -133,23 +117,15 @@ _CATEGORY_COMPONENTS = (
     "WHERE p.category=? ORDER BY p.id"
 )
 _CATEGORY_PAIRS = "SELECT id,archived FROM prompt_pairs WHERE category=? ORDER BY id"
-# Image rows holding one exact value (#332 DC7), an index search.
-_IMAGE_CATEGORY_ROWIDS = (
-    "SELECT rowid FROM image_categories WHERE category=? ORDER BY rowid"
-)
 _CATEGORY_EXISTS = (
     "SELECT EXISTS(SELECT 1 FROM prompts WHERE category=:v)"
     " OR EXISTS(SELECT 1 FROM prompt_pairs WHERE category=:v)"
-    " OR EXISTS(SELECT 1 FROM image_categories WHERE category=:v)"
 )
 
-# Pairs after components and image rows last, so a failing update rolls every
-# earlier one back. An image row is keyed by its file, never by its value, so
-# merging into a value other files already hold cannot conflict.
+# Pairs after components, so a failing pair update rolls both back.
 _CATEGORY_UPDATES = (
     "UPDATE prompts SET category=?,updated_at=? WHERE category=?",
     "UPDATE prompt_pairs SET category=?,updated_at=? WHERE category=?",
-    "UPDATE image_categories SET category=?,updated_at=? WHERE category=?",
 )
 
 
@@ -160,15 +136,8 @@ def category_impact_token(
     target_exists: bool,
     components: list,
     pairs: list,
-    *,
-    images: list = (),
 ) -> str:
-    """Hash a category projection like ``library_edit_token`` (no secret).
-
-    ``images`` are the rowids of the image rows holding ``source`` (#332 DC7).
-    With none the preimage has no ``images`` key, so a prompt-only token keeps
-    the value it had before image categories existed.
-    """
+    """Hash a category projection like ``library_edit_token`` (no secret)."""
     preimage = {
         "epoch": epoch,
         "source": source,
@@ -177,8 +146,6 @@ def category_impact_token(
         "components": sorted([int(i), bool(flag)] for i, flag in components),
         "pairs": sorted([int(i), bool(flag)] for i, flag in pairs),
     }
-    if images:
-        preimage["images"] = sorted(int(i) for i in images)
     return canonical_token(_CATEGORY_DOMAIN, preimage)
 
 
@@ -358,8 +325,7 @@ class VocabularyOperations:
         pairs = [
             [row[0], bool(row[1])] for row in conn.execute(_CATEGORY_PAIRS, (source,))
         ]
-        images = [row[0] for row in conn.execute(_IMAGE_CATEGORY_ROWIDS, (source,))]
-        if not components and not pairs and not images:
+        if not components and not pairs:
             raise LibraryCommandError("vocabulary-conflict", epoch)
         target_exists = bool(
             conn.execute(_CATEGORY_EXISTS, {"v": target}).fetchone()[0]
@@ -373,10 +339,9 @@ class VocabularyOperations:
                 "other_prompts": len(components) - eligible,
                 "negative_variants": len(pairs) - archived,
                 "archived_negative_variants": archived,
-                "images": len(images),
             },
             "impact_token": category_impact_token(
-                epoch, source, target, target_exists, components, pairs, images=images
+                epoch, source, target, target_exists, components, pairs
             ),
         }
 
@@ -400,8 +365,7 @@ class VocabularyOperations:
     def apply_vocabulary_category(
         self, *, expected_epoch: str, source: str, target: str, impact_token: str
     ) -> dict:
-        """Set the exact ``source`` to ``target`` on every component, pair
-        and image row.
+        """Set the exact ``source`` to ``target`` on every component and pair.
 
         The recomputed projection must still match the preview's token; a
         mismatch is ``vocabulary-conflict`` with nothing written.
@@ -458,15 +422,15 @@ class VocabularyOperations:
         _limit(limit)
         key = _category_after(after)
         total = conn.execute(
-            _CATEGORY_ROWS + "SELECT COUNT(*) FROM counted"
+            _CATEGORY_GROUPS + "SELECT COUNT(*) FROM grouped"
         ).fetchone()[0]
         where, params = "", []
         if key is not None:
             where = " WHERE first_pid>? OR (first_pid=? AND value>?)"
             params = [key[0], key[0], key[1]]
         rows = conn.execute(
-            _CATEGORY_ROWS
-            + "SELECT value,first_pid,prompt_count,image_count FROM counted"
+            _CATEGORY_GROUPS
+            + "SELECT value,first_pid,prompt_count FROM grouped"
             + where
             + " ORDER BY first_pid,value LIMIT ?",
             [*params, limit + 1],
@@ -476,11 +440,7 @@ class VocabularyOperations:
         return {
             "library_epoch": epoch,
             "categories": [
-                {
-                    "value": row["value"],
-                    "prompt_count": row["prompt_count"],
-                    "image_count": row["image_count"],
-                }
+                {"value": row["value"], "prompt_count": row["prompt_count"]}
                 for row in rows
             ],
             "total": total,

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

@@ -5,13 +5,10 @@ Split into domain-specific mixins for maintainability:
 - ImageRoutesMixin: gallery, thumbnails, image serving and linking
 - AdminRoutesMixin: duplicates, stats, settings, diagnostics, maintenance, backup, scan
 - LoggingRoutesMixin: log management endpoints
-- LogCleanupMixin: the reviewed rotated-log cleanup (a maintenance plan)
-- DiagnosticsReportMixin: the shareable diagnostic report, without secrets or paths
 - AutotagRoutesMixin: auto-tagging model management and tagging
 - 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
@@ -21,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
@@ -33,7 +29,6 @@ import math
 import ntpath
 import os
 import re
-import threading
 from pathlib import Path
 
 from aiohttp import web
@@ -50,29 +45,22 @@ 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
 from .jobs import JobRegistry
 from .logging_routes import LoggingRoutesMixin
-from .log_cleanup import LogCleanupMixin
-from .diagnostics_report import DiagnosticsReportMixin
 from .autotag_routes import AutotagRoutesMixin
 from .lora_integration import LoraIntegrationMixin
-from .lora_import_routes import LoraImportRoutesMixin
-from .image_categories import ImageCategoryRoutesMixin
 
 try:
     from ...database.operations import PromptDatabase
@@ -94,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.
 
@@ -296,10 +272,6 @@ async def _gzip_middleware(request, handler):
     if len(compressed) >= len(body):
         return response
 
-    # A length the handler declared is the uncompressed one: drop it so the
-    # compressed body's own length is sent (#329: a stale length made the
-    # browser wait for bytes that never came).
-    response.headers.pop("Content-Length", None)
     response.body = compressed
     response.headers["Content-Encoding"] = "gzip"
     response.headers["Vary"] = "Accept-Encoding"
@@ -323,21 +295,15 @@ class PromptManagerAPI(
     JobRoutesMixin,
     ImageTagJobsMixin,
     ThumbnailJobsMixin,
-    ThumbnailConvertMixin,
     AutoThumbnailMixin,
     SystemRoutesMixin,
     LibraryLocationRoutesMixin,
     MaintenanceRoutesMixin,
-    BackupRestoreRoutesMixin,
     WorkflowStorageRoutesMixin,
     DuplicateFilesMixin,
     LoggingRoutesMixin,
-    LogCleanupMixin,
-    DiagnosticsReportMixin,
     AutotagRoutesMixin,
     LoraIntegrationMixin,
-    LoraImportRoutesMixin,
-    ImageCategoryRoutesMixin,
 ):
     """REST API handler for PromptManager operations and web interface.
 
@@ -365,28 +331,13 @@ class PromptManagerAPI(
         # Private media captures of the annotation routes (py/api/annotations.py),
         # created on first use with their restore subscription.
         self._captures = None
-        # Capture tokens Generate suggestions ran on: a save of one marks the
-        # image auto-tagged (#379).
-        self._suggested_tokens = set()
         self._captures_unsubscribe = None
         # Set by close_annotation_captures (shutdown): no store is recreated.
         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 = {}
@@ -422,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:
@@ -506,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 = {}
 
@@ -693,16 +542,12 @@ class PromptManagerAPI(
         self._register_settings_routes(routes)
         self._register_job_routes(routes)
         self._register_system_routes(routes)
-        self._register_diagnostics_report_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)
-        self._register_image_category_routes(routes)
 
         # Register gzip compression middleware (once)
         global _gzip_registered
@@ -767,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()
@@ -782,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
@@ -803,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
@@ -1110,3 +941,196 @@ class PromptManagerAPI(
                         result["parameters"][field] = metadata[field]
 
         return result
+
+    def _extract_readable_prompt(self, parsed_data):
+        """Extract human-readable prompt text from ComfyUI/A1111 data."""
+
+        def safe_to_string(value):
+            if isinstance(value, str):
+                return value
+            elif isinstance(value, list):
+                return " ".join(str(item) for item in value if item)
+            elif value is not None:
+                return str(value)
+            return None
+
+        # First check if we already extracted a positive prompt (A1111 format)
+        if parsed_data.get("positive_prompt"):
+            return parsed_data["positive_prompt"]
+
+        # Check if prompt is already a string
+        if isinstance(parsed_data.get("prompt"), str):
+            return parsed_data["prompt"]
+
+        # Check if prompt is a simple value that can be converted
+        if parsed_data.get("prompt") and not isinstance(
+            parsed_data.get("prompt"), dict
+        ):
+            return safe_to_string(parsed_data["prompt"])
+
+        prompt_data = parsed_data.get("prompt")
+        if isinstance(prompt_data, dict):
+            # Use the enhanced logic from parse-metadata.py
+            positive_prompt = self._extract_positive_prompt_from_comfyui_data(
+                prompt_data
+            )
+            if positive_prompt:
+                return positive_prompt
+
+        # Check workflow data if available
+        workflow_data = parsed_data.get("workflow")
+        if isinstance(workflow_data, dict):
+            positive_prompt = self._extract_positive_prompt_from_comfyui_data(
+                workflow_data
+            )
+            if positive_prompt:
+                return positive_prompt
+
+        # Check parameters for positive prompt
+        if parsed_data.get("parameters", {}).get("positive"):
+            return safe_to_string(parsed_data["parameters"]["positive"])
+
+        return None
+
+    def _get_node_inputs(self, node):
+        """Safely get inputs from a node, handling both dict and list formats.
+
+        Old format: inputs is a dict with direct key-value pairs
+            inputs = {"text": "my prompt", "seed": 123}
+
+        New format: inputs is a list of connection objects
+            inputs = [
+                {"name": "text", "type": "STRING", "link": null,
+                 "widget": {"name": "text"}},
+                {"name": "clip", "type": "CLIP", "link": 11}
+            ]
+        """
+        if not isinstance(node, dict):
+            return {}
+
+        inputs = node.get("inputs", {})
+
+        # If inputs is already a dict, return it
+        if isinstance(inputs, dict):
+            return inputs
+
+        # If inputs is a list, convert to dict format
+        if isinstance(inputs, list):
+            inputs_dict = {}
+            for input_item in inputs:
+                if isinstance(input_item, dict) and "name" in input_item:
+                    name = input_item["name"]
+                    inputs_dict[name] = input_item
+            return inputs_dict
+
+        return {}
+
+    def _find_text_in_node(self, node):
+        """Try to find text content in a node using various strategies.
+
+        Handles both old and new workflow formats.
+        """
+        if not isinstance(node, dict):
+            return None
+
+        # Strategy 1: Check normalized inputs for 'text' field
+        inputs = self._get_node_inputs(node)
+        if "text" in inputs and isinstance(inputs["text"], str):
+            return inputs["text"]
+
+        # Strategy 2: For text encoder nodes, check widgets_values
+        class_type = node.get("class_type", node.get("type", ""))
+        text_encoder_types = [
+            "CLIPTextEncode",
+            "CLIPTextEncodeSDXL",
+            "CLIPTextEncodeSDXLRefiner",
+            "CLIPTextEncodeFlux",
+            "PromptManager",
+            "PromptManagerText",
+            "BNK_CLIPTextEncoder",
+            "Text Encoder",
+            "CLIP Text Encode",
+        ]
+
+        if any(
+            encoder_type.lower() in class_type.lower()
+            for encoder_type in text_encoder_types
+        ):
+            widgets_values = node.get("widgets_values", [])
+            if widgets_values and len(widgets_values) > 0:
+                if isinstance(widgets_values[0], str) and widgets_values[0].strip():
+                    return widgets_values[0]
+
+        return None
+
+    def _extract_positive_prompt_from_comfyui_data(self, data):
+        """Extract positive prompt from ComfyUI data.
+
+        Handles both old and new formats.
+        """
+        if not isinstance(data, dict):
+            return None
+
+        # Build nodes dictionary
+        nodes_by_id = {}
+        if "nodes" in data:
+            # Handle nodes array format
+            for node in data["nodes"]:
+                if isinstance(node, dict):
+                    nid = node.get("id")
+                    if nid is not None:
+                        nodes_by_id[nid] = node
+        else:
+            # Handle flat dictionary format (node_id -> node_data)
+            for nid_str, node in data.items():
+                try:
+                    nid = int(nid_str)
+                except (ValueError, TypeError):
+                    nid = nid_str
+                if isinstance(node, dict):
+                    if "id" in node:
+                        nid = node["id"]
+                    nodes_by_id[nid] = node
+
+        if not nodes_by_id:
+            return None
+
+        # First, try to find positive/negative connection pattern
+        pos_id = None
+        for node in nodes_by_id.values():
+            if isinstance(node, dict):
+                inputs = self._get_node_inputs(node)
+                if "positive" in inputs and "negative" in inputs:
+                    try:
+                        pos_input = inputs["positive"]
+                        if isinstance(pos_input, list) and len(pos_input) > 0:
+                            pos_id = int(pos_input[0])
+                            break
+                    except (ValueError, TypeError, IndexError):
+                        continue
+
+        # Get text from the positive node
+        if pos_id is not None and pos_id in nodes_by_id:
+            text_val = self._find_text_in_node(nodes_by_id[pos_id])
+            if text_val:
+                return text_val
+
+        # Fallback: find any text encoder node with text content
+        text_nodes = []
+        for node in nodes_by_id.values():
+            if isinstance(node, dict):
+                text_val = self._find_text_in_node(node)
+                if text_val:
+                    # Try to determine if this is positive or negative
+                    node_title = node.get("title", "").lower()
+                    if "neg" not in node_title and "negative" not in node_title:
+                        # Prioritize non-negative prompts
+                        text_nodes.insert(0, text_val)
+                    else:
+                        text_nodes.append(text_val)
+
+        # Return the first positive-looking prompt
+        if text_nodes:
+            return text_nodes[0]
+
+        return None

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,39 +36,26 @@ except ImportError:
     from utils.parallel import map_parallel
 
 try:
-    from ...utils import exit_signal
-except ImportError:
-    from utils import exit_signal
-
-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,
         extract_generation_params,
         parse_page_json,
     )
-    from ...utils.prompt_pair_resolver import resolve_prompt_pair, sampler_less_prompt
+    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,
         extract_generation_params,
         parse_page_json,
     )
-    from utils.prompt_pair_resolver import resolve_prompt_pair, sampler_less_prompt
+    from utils.prompt_pair_resolver import resolve_prompt_pair
     from utils.review_capture import reviewable
 
 
@@ -123,7 +111,6 @@ def _collect_media_files(output_dirs, extensions):
         if not os.path.isdir(root):
             continue
         for current, dirnames, filenames in os.walk(root, followlinks=False):
-            exit_signal.checkpoint()  # #376: stop between directories at exit
             depth = 0 if current == root else len(Path(current).relative_to(root).parts)
             dirnames[:] = sorted(
                 d
@@ -159,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):
@@ -495,29 +473,9 @@ def _diagnose_dependencies():
     }
 
 
-def legacy_checks(db_path, public_path=None):
-    """The four checks of ``GET /diagnostics`` (blocking).
-
-    Shared with the diagnostic report (``py/api/diagnostics_report.py``),
-    which passes its own ``public_path`` so a folder outside ComfyUI is never
-    named.
-    """
-    from ..config import GalleryConfig
-
-    return {
-        "database": _diagnose_database(db_path),
-        "dependencies": _diagnose_dependencies(),
-        "comfyui_output": _diagnose_output_dirs(
-            GalleryConfig.MONITORING_DIRECTORIES, public_path
-        ),
-        "image_monitor": _diagnose_image_monitor(public_path),
-    }
-
-
-def _diagnose_output_dirs(configured_dirs, public_path=None):
+def _diagnose_output_dirs(configured_dirs):
     """Configured gallery roots, ComfyUI's output dir, or relative fallbacks."""
     _public_path, _ = _public_helpers()
-    _public_path = public_path or _public_path
     candidates = list(configured_dirs)
     try:
         import folder_paths
@@ -551,10 +509,9 @@ def _diagnose_output_dirs(configured_dirs, public_path=None):
     }
 
 
-def _diagnose_image_monitor(public_path=None):
+def _diagnose_image_monitor():
     """Status of the running image monitor, with public directory names."""
     _public_path, _public_error = _public_helpers()
-    _public_path = public_path or _public_path
     try:
         monitor = _current_image_monitor()
         if monitor is None:
@@ -585,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."""
 
@@ -785,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:
@@ -809,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:
@@ -912,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,
@@ -1082,7 +994,16 @@ class AdminRoutesMixin:
     async def run_diagnostics(self, request):
         """Run comprehensive system diagnostics and health checks."""
         try:
-            results = legacy_checks(self.db.model.db_path)
+            from ..config import GalleryConfig
+
+            results = {
+                "database": _diagnose_database(self.db.model.db_path),
+                "dependencies": _diagnose_dependencies(),
+                "comfyui_output": _diagnose_output_dirs(
+                    GalleryConfig.MONITORING_DIRECTORIES
+                ),
+                "image_monitor": _diagnose_image_monitor(),
+            }
             return web.json_response({"success": True, "diagnostics": results})
 
         except Exception as e:
@@ -1300,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.
 
@@ -1610,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
@@ -1625,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}")
@@ -1636,14 +1764,7 @@ class AdminRoutesMixin:
                 if self._review_file_linked(media_file, roots):
                     outcome = "unchanged"  # already linked: not a review case
                 else:
-                    # The records name the item versions that count; the
-                    # saver anchor (#390) is checked on the captured bytes.
-                    self._record_scanned_review(
-                        media_file,
-                        roots,
-                        review,
-                        scanned=(records.get("canonical"), None),
-                    )
+                    self._record_scanned_review(media_file, roots, review)
             elif untraced and outcome == "unresolved":
                 # Untraced by the default profile: the inspection profile may
                 # still offer a choice (queued for review, never linked).
@@ -1691,7 +1812,6 @@ class AdminRoutesMixin:
         ambiguous=None,
         untraced=None,
         records=None,
-        history=None,
     ):
         """Enrich exact pairs; retain legacy positive-only import for absent pairs.
 
@@ -1704,14 +1824,12 @@ class AdminRoutesMixin:
         ``"ambiguous"`` (nothing linked it) is a Needs review case. An
         ambiguous result with nothing to choose (``reviewable`` is False: fewer
         than two candidates carry a prompt) that nothing links returns
-        ``"unresolved"`` instead, and ``media_file`` goes to ``untraced``.
-        The parsed records of either ambiguous file go to
-        ``records["canonical"]`` when ``records`` is a dict.
+        ``"unresolved"`` instead, and ``media_file`` goes to ``untraced``;
+        its parsed records go to ``records["canonical"]`` when ``records`` is
+        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):
@@ -1721,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:
@@ -1736,8 +1851,6 @@ class AdminRoutesMixin:
                 records["canonical"] = canonical
         elif resolution["state"] == "ambiguous" and ambiguous is not None:
             ambiguous.append(media_file)
-            if records is not None:
-                records["canonical"] = canonical
         if resolution["state"] == "resolved":
             result = ingest_resolved_pair(
                 self.db, str(media_file), canonical, resolution
@@ -1757,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"
@@ -1769,24 +1877,13 @@ class AdminRoutesMixin:
             canonical.get("parameters"), str
         ):
             return resolution["state"]
-        elif canonical.get("prompt"):
-            # No node takes a positive or negative input (a guider or wrapper
-            # graph): the one wired text, never a guess (#252).
-            found = sampler_less_prompt(canonical["prompt"])
-            prompt_text = found["text"]
-            if prompt_text is None and isinstance(canonical.get("parameters"), str):
-                # A metadata saver also wrote A1111 text: its positive prompt.
-                parsed = self._parse_comfyui_prompt(metadata)["positive_prompt"]
-                prompt_text = parsed.strip() if parsed and parsed.strip() else None
-            if prompt_text is None:
-                linked = self._link_recorded_run(
-                    media_file, canonical, detailed, history
-                )
-                if linked is not None:
-                    return linked
-                return "unresolved" if found["state"] == "ambiguous" else "found"
         else:
-            prompt_text = self._parse_comfyui_prompt(metadata)["positive_prompt"]
+            parsed = self._parse_comfyui_prompt(metadata)
+            if not (parsed.get("prompt") or parsed.get("parameters")):
+                return None
+            prompt_text = self._extract_readable_prompt(parsed)
+            if prompt_text is not None and not isinstance(prompt_text, str):
+                prompt_text = str(prompt_text)
             if not (prompt_text and prompt_text.strip()):
                 return "found"
             prompt_text = prompt_text.strip()
@@ -1796,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/annotation_suggest.py

@@ -10,15 +10,12 @@ filesystem or the database.
 
 import math
 
-from ..tagging_defaults import (  # noqa: F401 - re-exported for the route
-    LLM_MODEL_TYPES as LLM_MODELS,
-    MAX_INSTRUCTION_BYTES,
-    MAX_INSTRUCTION_CHARS,
-    MODEL_TYPES,
-    WD14_MODEL_TYPES as WD14_MODELS,
-    validate_template,
-    validate_threshold,
-)
+WD14_MODELS = frozenset({"wd14-swinv2", "wd14-vit"})
+LLM_MODELS = frozenset({"gguf", "hf"})
+MODEL_TYPES = WD14_MODELS | LLM_MODELS
+
+MAX_INSTRUCTION_CHARS = 4000
+MAX_INSTRUCTION_BYTES = 16 * 1024
 
 SUGGEST_FIELDS = frozenset(
     {"target", "capture_token", "expected_epoch", "model_type", "options"}
@@ -27,7 +24,7 @@ _COMMON = frozenset({"suggestion_limit", "use_gpu"})
 _WD14_REQUIRED = frozenset({"general_threshold", "character_threshold"})
 _LLM_REQUIRED = frozenset({"instructions"})
 
-UNAVAILABLE_HINT = "Download it in System › Auto-tagging."
+UNAVAILABLE_HINT = "Download it from the legacy Auto-tag page."
 
 
 class OptionError(ValueError):
@@ -35,17 +32,27 @@ class OptionError(ValueError):
 
 
 def _threshold(name: str, value) -> float:
-    try:
-        return validate_threshold(name, value)
-    except ValueError as error:
-        raise OptionError(str(error)) from None
+    if type(value) not in (int, float) or not math.isfinite(value):
+        raise OptionError(f"{name} must be a finite number")
+    if not 0 <= value <= 1:
+        raise OptionError(f"{name} must be between 0 and 1")
+    return float(value)
 
 
 def _instructions(value) -> str:
+    if not isinstance(value, str) or not value.strip():
+        raise OptionError("instructions must be non-empty text")
+    if len(value) > MAX_INSTRUCTION_CHARS:
+        raise OptionError(
+            f"instructions must be at most {MAX_INSTRUCTION_CHARS} characters"
+        )
     try:
-        return validate_template(value)
-    except ValueError as error:
-        raise OptionError(str(error)) from None
+        encoded = value.encode("utf-8")
+    except UnicodeEncodeError:
+        raise OptionError("instructions must be valid Unicode text") from None
+    if len(encoded) > MAX_INSTRUCTION_BYTES:
+        raise OptionError("instructions are too long")
+    return value
 
 
 def validate_options(model_type, options, *, default_limit: int, max_limit: int):

py/api/annotations.py

@@ -27,12 +27,7 @@ from .annotation_suggest import (
     validate_options,
 )
 from .autotag_routes import model_busy_response
-
-# The target check is shared with the collection routes (#331); both names
-# stay importable from here.
-from .media_target import MAX_TARGET_PATH  # noqa: F401
-from .media_target import media_target as _target
-from .images import _unavailable_link, _verified_title
+from .images import _forbidden, _has_traversal, _unavailable_link, _verified_title
 from .prompts import bad_request
 from .. import model_gate
 
@@ -45,7 +40,7 @@ try:
     )
     from ...database.execution_history import subscribe_history_restore
     from ...database.library_commands import LibraryCommandError
-    from ...utils.media_capture import CaptureError, CaptureStore
+    from ...utils.media_capture import CAPTURE_EXTENSIONS, CaptureError, CaptureStore
 except ImportError:
     from database.annotations import (
         MAX_IMAGE_TAGS,
@@ -55,13 +50,15 @@ except ImportError:
     )
     from database.execution_history import subscribe_history_restore
     from database.library_commands import LibraryCommandError
-    from utils.media_capture import CaptureError, CaptureStore
+    from utils.media_capture import CAPTURE_EXTENSIONS, CaptureError, CaptureStore
 
 # Request bodies of the annotation routes are small (a target plus a tag set).
 MAX_BODY_BYTES = 64 * 1024
+MAX_TARGET_PATH = 1024
 CAPTURE_URL = "/prompt_manager/image-annotations/capture/"
 _PREVIEW_CHUNK = 64 * 1024
 
+_TARGET_FIELDS = frozenset({"root_index", "root_scope", "path"})
 _OBSERVE_FIELDS = frozenset({"target"})
 _SAVE_FIELDS = frozenset(
     {
@@ -191,6 +188,37 @@ def _capture_error(exc: CaptureError) -> web.Response:
     return _coded(exc.code, _MESSAGES.get(exc.code) or str(exc))
 
 
+def _target(data: object):
+    """``((index, scope, relative), None)`` for a target, else ``(None, error)``.
+
+    Only the listing identity is accepted: an int root index, the root's
+    64-hex scope and a bounded root-relative POSIX media path, never an
+    absolute, drive-qualified, backslash or ``..`` path. Nothing here touches
+    the filesystem or the database.
+    """
+    if not isinstance(data, dict) or set(data) != _TARGET_FIELDS:
+        return None, bad_request("target must name root_index, root_scope and path")
+    index, scope, relative = data["root_index"], data["root_scope"], data["path"]
+    if type(index) is not int or index < 0:
+        return None, bad_request("Invalid gallery root")
+    if not isinstance(scope, str) or _HEX64.fullmatch(scope) is None:
+        return None, bad_request("Invalid gallery root scope")
+    if not isinstance(relative, str) or not relative or len(relative) > MAX_TARGET_PATH:
+        return None, bad_request("path must be a relative media path")
+    parts = relative.split("/")
+    if (
+        "\0" in relative
+        or "\\" in relative
+        or relative.startswith("/")
+        or _has_traversal(relative)
+        or any(part in ("", ".", "..") or ":" in part for part in parts)
+    ):
+        return None, _forbidden()
+    if os.path.splitext(parts[-1])[1].lower() not in CAPTURE_EXTENSIONS:
+        return None, _forbidden("Only media files can be tagged")
+    return (index, scope, relative), None
+
+
 def _expires_at(seconds: float | None) -> str:
     moment = datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(
         seconds=max(0.0, seconds or 0.0)
@@ -268,7 +296,6 @@ class AnnotationRoutesMixin:
                 self._captures_closed = True
             unsubscribe, self._captures_unsubscribe = self._captures_unsubscribe, None
             store, self._captures = self._captures, None
-            self._suggested_tokens = set()
         if unsubscribe is not None:
             unsubscribe()
         if store is not None:
@@ -488,7 +515,6 @@ class AnnotationRoutesMixin:
         store = self._captures
         if store is not None and _TOKEN.fullmatch(token) is not None:
             store.release(token)
-        self._suggested_tokens.discard(token)
         return web.json_response(
             {"success": True}, headers={"Cache-Control": "no-store"}
         )
@@ -538,9 +564,6 @@ class AnnotationRoutesMixin:
             return _coded("capture-expired", _OTHER_FILE)
         if facts.sha256 != capture.sha256:
             return _coded("file-changed")
-        # A save after Generate suggestions ran on this capture marks the
-        # image auto-tagged (#379), so a Skip batch leaves the review alone.
-        suggested = token in self._suggested_tokens
         try:
             receipt = await self._run_in_executor(
                 self.db.replace_image_tags,
@@ -551,7 +574,6 @@ class AnnotationRoutesMixin:
                 expected_epoch=expected_epoch,
                 expected_tag_revision=revision,
                 tags=tags,
-                mark_autotagged=suggested,
             )
         except AnnotationCommandError as exc:
             current = exc.current or {}
@@ -568,23 +590,10 @@ class AnnotationRoutesMixin:
         except Exception:
             self.logger.exception("Image tag save failed")
             return _error(500, "save-failed", "The tags could not be saved.")
-        # Dropped only after a saved or replayed receipt: a retry after a
-        # tag-conflict still marks.
-        self._suggested_tokens.discard(token)
         return web.json_response(
             {"success": True, **receipt}, headers={"Cache-Control": "no-store"}
         )
 
-    def _remember_suggested(self, store, token: str) -> None:
-        """Note that Generate ran on *token*; forget tokens whose capture is
-        gone. ``expires_in`` does not reset a capture's idle clock."""
-        self._suggested_tokens = {
-            kept
-            for kept in self._suggested_tokens
-            if store.expires_in(kept) is not None
-        }
-        self._suggested_tokens.add(token)
-
     # -- suggest ---------------------------------------------------------------
 
     async def suggest_image_tags(self, request: web.Request) -> web.Response:
@@ -666,7 +675,6 @@ class AnnotationRoutesMixin:
         finally:
             if not started:
                 store.release_use(token)
-        self._remember_suggested(store, token)
         return web.json_response(
             {
                 "success": True,

py/api/diagnostics_report.py

@@ -1,289 +0,0 @@
-"""The shareable diagnostic report (#329 System S12).
-
-``GET /prompt_manager/system/diagnostics`` answers a report built on the
-server from an explicit list of fields: the project and Viewer.js versions,
-Python and the platform, the four checks of the legacy ``GET /diagnostics``
-(one helper, ``admin.legacy_checks``), the database's public info, source
-counts, the log configuration and statistics, the last health summary and
-the configuration keys that only ``config.json`` holds. It never copies
-``PromptManagerConfig.get_config()``: no path leaf is listed, and the CivitAI
-key is reported only as ``has_civitai_api_key``.
-
-Every path in the report goes through ``report_path``: relative to the
-closest public anchor that is not a filesystem root, else ``"outside
-ComfyUI"``, never a basename that could be a user name. As a backstop,
-``scrub`` replaces any string that still looks like an absolute path, holds
-the saved key or the home folder (with or without its root), and counts each
-replacement in ``redacted`` (0 for a correct builder).
-
-The report opens the database, so it takes a registry lease: it is refused
-(409 ``busy``) while an ``exclusive`` job (a restore) runs, and a restore
-waits for it. It is built off the event loop.
-"""
-
-import datetime
-import json
-import ntpath
-import os
-import platform
-import posixpath
-import re
-from pathlib import Path, PurePosixPath, PureWindowsPath
-
-from aiohttp import web
-
-from . import admin as _admin
-from .job_routes import busy_response
-from .jobs import JobBusy
-from .system import health_summary
-
-try:
-    from ...utils.version import project_version
-except ImportError:  # loaded as the top-level ``py`` package (tests)
-    from utils.version import project_version
-
-DIAGNOSTICS_LEASE = "Diagnostics"
-_ROOT = Path(__file__).resolve().parents[2]
-VIEWERJS_PROVENANCE = str(_ROOT / "web" / "lib" / "viewerjs" / "provenance.json")
-OUTSIDE = "outside ComfyUI"
-REMOVED = "[removed]"
-# The CivitAI key is searched for only when it is long enough to be a key.
-MIN_KEY_LENGTH = 8
-_WINDOWS_ABSOLUTE = re.compile(r"^[A-Za-z]:[\\/]")
-
-
-def anchored_path(canonical, anchors, home, pathmod=os.path):
-    """``canonical`` relative to the closest usable anchor, else ``outside ComfyUI``.
-
-    All three are already canonical (``normcase``) in ``pathmod``'s spelling.
-    A filesystem root is never usable, nor is a strict ancestor of ``home``
-    (``/home``, ``C:\\Users``), whose relative paths would start with a user
-    name; so a path inside the home folder needs an anchor at or below it.
-    """
-    flavor = PureWindowsPath if pathmod is ntpath else PurePosixPath
-    target = flavor(canonical)
-    home_path = flavor(home) if home else None
-    usable = []
-    for anchor in map(flavor, anchors):
-        if anchor.parent == anchor:
-            continue
-        if home_path is not None and home_path != anchor:
-            if home_path.is_relative_to(anchor):
-                continue
-        if target.is_relative_to(anchor):
-            usable.append(anchor)
-    if not usable:
-        return OUTSIDE
-    anchor = max(usable, key=lambda a: len(a.parts))
-    return target.relative_to(anchor).as_posix() or "."
-
-
-def _canonical(path):
-    return os.path.normcase(os.path.realpath(str(path)))
-
-
-def report_path(path):
-    """``path`` relative to a public anchor (POSIX style), else ``outside ComfyUI``."""
-    if not path:
-        return ""
-    from ..config import GalleryConfig
-
-    try:
-        canonical = _canonical(path)
-        anchors = [_canonical(anchor) for anchor in GalleryConfig.path_anchors()]
-        home = os.path.expanduser("~")
-        home = _canonical(home) if home and home != "~" else None
-    except (OSError, ValueError):
-        return OUTSIDE
-    return anchored_path(canonical, anchors, home)
-
-
-def _looks_absolute(text):
-    return (
-        posixpath.isabs(text)
-        or ntpath.isabs(text)
-        or _WINDOWS_ABSOLUTE.match(text) is not None
-        or text.startswith("\\\\")
-    )
-
-
-# The home folder is matched only as whole path parts, never inside a word.
-_PART = r"(?<![\w.-]){}(?![\w.-])"
-MIN_HOME_NAME = 3
-
-
-def _home_patterns():
-    """``(pattern, paths_only)`` for the home folder: in full, rootless, its name.
-
-    Accepted residual risk: only this process's own home folder is known, so
-    another user's home (an output folder under /home/<them> while ComfyUI
-    runs as a service account) can still be named by a report path.
-    """
-    home = os.path.expanduser("~")
-    if not home or home == "~" or len(home) < 4 or home in ("/", "\\"):
-        return ()
-    spellings = {home, home.replace("\\", "/")}
-    relative = os.path.splitdrive(home)[1].strip("\\/")
-    for spelling in (relative, relative.replace("\\", "/")):
-        if "/" in spelling or "\\" in spelling:
-            spellings.add(spelling)
-    patterns = [
-        (re.compile(_PART.format(re.escape(spelling)), re.IGNORECASE), False)
-        for spelling in spellings
-    ]
-    name = re.split(r"[\\/]", relative)[-1] if relative else ""
-    if len(name) >= MIN_HOME_NAME:
-        # The bare name only inside a path ("info/x"), not a word ("INFO").
-        patterns.append(
-            (re.compile(_PART.format(re.escape(name)), re.IGNORECASE), True)
-        )
-    return tuple(patterns)
-
-
-def scrub(report, key):
-    """``report`` with leaked paths and the key replaced, counted in ``redacted``."""
-    key = key if isinstance(key, str) and len(key) >= MIN_KEY_LENGTH else None
-    homes = _home_patterns()
-    count = 0
-
-    def clean(value):
-        nonlocal count
-        if isinstance(value, str):
-            if (
-                _looks_absolute(value)
-                or (key and key in value)
-                or any(
-                    pattern.search(value)
-                    for pattern, paths_only in homes
-                    if not paths_only or "/" in value or "\\" in value
-                )
-            ):
-                count += 1
-                return REMOVED
-            return value
-        if isinstance(value, dict):
-            return {name: clean(item) for name, item in value.items()}
-        if isinstance(value, (list, tuple)):
-            return [clean(item) for item in value]
-        return value
-
-    cleaned = clean(report)
-    cleaned["redacted"] = int(cleaned.get("redacted") or 0) + count
-    return cleaned
-
-
-def viewerjs_version(path=None):
-    """The pinned Viewer.js version from its provenance file, or ``unknown``."""
-    try:
-        with open(path or VIEWERJS_PROVENANCE, encoding="utf-8") as handle:
-            version = json.load(handle).get("version")
-    except (OSError, ValueError, AttributeError):
-        return "unknown"
-    return version if isinstance(version, str) and version else "unknown"
-
-
-def public_config():
-    """The configuration keys only ``config.json`` holds, from an explicit list."""
-    from ..config import GalleryConfig, IntegrationConfig, PromptManagerConfig
-
-    return {
-        "database": {
-            "enable_duplicate_detection": (
-                PromptManagerConfig.ENABLE_DUPLICATE_DETECTION
-            ),
-            "enable_auto_save": PromptManagerConfig.ENABLE_AUTO_SAVE,
-        },
-        "web_ui": {
-            "result_timeout": PromptManagerConfig.RESULT_TIMEOUT,
-            "show_test_button": PromptManagerConfig.SHOW_TEST_BUTTON,
-            "webui_display_mode": PromptManagerConfig.WEBUI_DISPLAY_MODE,
-            "infinite_scroll": PromptManagerConfig.INFINITE_SCROLL,
-        },
-        "performance": {
-            "max_search_results": PromptManagerConfig.MAX_SEARCH_RESULTS,
-            "enable_fuzzy_search": PromptManagerConfig.ENABLE_FUZZY_SEARCH,
-            "auto_backup_interval": PromptManagerConfig.AUTO_BACKUP_INTERVAL,
-            "worker_threads": PromptManagerConfig.WORKER_THREADS,
-        },
-        "gallery": {
-            "processing_delay": GalleryConfig.PROCESSING_DELAY,
-            "prompt_timeout": GalleryConfig.PROMPT_TIMEOUT,
-            "cleanup_interval": GalleryConfig.CLEANUP_INTERVAL,
-            "auto_cleanup_missing_files": GalleryConfig.AUTO_CLEANUP_MISSING_FILES,
-            "max_image_age_days": GalleryConfig.MAX_IMAGE_AGE_DAYS,
-            "max_concurrent_processing": GalleryConfig.MAX_CONCURRENT_PROCESSING,
-            "metadata_extraction_timeout": GalleryConfig.METADATA_EXTRACTION_TIMEOUT,
-        },
-        "integrations": {
-            "lora_manager_enabled": bool(IntegrationConfig.LORA_MANAGER_ENABLED),
-            "has_civitai_api_key": bool(IntegrationConfig.CIVITAI_API_KEY),
-        },
-    }
-
-
-def _source_counts(sources):
-    configured = sources.get("configured") or []
-    effective = sources.get("effective") or []
-    return {
-        "configured": len(configured),
-        "effective": len(effective),
-        "watching": sum(1 for row in effective if row.get("watch") == "watching"),
-        "unavailable": sum(1 for row in configured if row.get("valid") is False),
-    }
-
-
-class DiagnosticsReportMixin:
-    """Mixin providing ``GET /prompt_manager/system/diagnostics``."""
-
-    def _register_diagnostics_report_routes(self, routes):
-        @routes.get("/prompt_manager/system/diagnostics")
-        async def diagnostics_report_route(request):
-            return await self.get_diagnostics_report(request)
-
-    async def get_diagnostics_report(self, request):
-        """The report, built off the loop under a lease (409 ``busy`` in a restore)."""
-        from ..config import IntegrationConfig
-
-        try:
-            async with self._jobs.lease(DIAGNOSTICS_LEASE):
-                report = await self._run_in_executor(self.build_report)
-        except JobBusy as busy:
-            return busy_response(busy)
-        except Exception:
-            self.logger.exception("The diagnostic report could not be built")
-            return web.json_response(
-                {
-                    "success": False,
-                    "code": None,
-                    "error": "The diagnostic report could not be built.",
-                },
-                status=500,
-            )
-        report = scrub(report, IntegrationConfig.CIVITAI_API_KEY)
-        return web.json_response(report, headers={"Cache-Control": "no-store"})
-
-    def build_report(self):
-        """The report's fields (blocking: reads the database and the log folder)."""
-        db = self.db
-        manager = self._get_logger_manager()
-        stats = dict(manager.get_log_stats())
-        stats["log_directory"] = report_path(stats.get("log_directory"))
-        info = dict(db.model.get_database_info() or {})
-        if "database_path" in info:
-            info["database_path"] = report_path(info["database_path"])
-        sources, _monitor = self._source_status()
-        return {
-            "success": True,
-            "generated_at": datetime.datetime.now().replace(microsecond=0).isoformat(),
-            "version": project_version(_ROOT),
-            "python": platform.python_version(),
-            "platform": {"system": platform.system(), "release": platform.release()},
-            "viewerjs": viewerjs_version(VIEWERJS_PROVENANCE),
-            "checks": _admin.legacy_checks(db.model.db_path, report_path),
-            "database_info": info,
-            "sources": _source_counts(sources),
-            "logging": {"config": dict(manager.get_config()), "stats": stats},
-            "health": health_summary(self._current_health_report()),
-            "config": public_config(),
-            "redacted": 0,
-        }

py/api/duplicate_files.py

@@ -589,7 +589,6 @@ class DuplicateFilesMixin:
         spellings = await self._run_in_executor(self._source_spellings)
         removed, failure, keepers = 0, None, {}
         totals = dict.fromkeys(("moved", "merged", "favorites", "tags", "review"), 0)
-        totals["categories"] = 0  # image categories kept on the kept copies (#332)
         for done, target in enumerate(targets, start=1):
             if failure is not None:
                 self._record_target(job, "kept", target, NOT_ATTEMPTED)
@@ -636,9 +635,6 @@ class DuplicateFilesMixin:
             job.log_line(
                 f"Added {_plural(totals['tags'], 'image tag')} to the kept copies"
             )
-        if totals.get("categories"):
-            kept = _plural(totals["categories"], "image category", "image categories")
-            job.log_line(f"Kept {kept} on the kept copies")
         if totals["review"]:
             job.log_line(
                 f"Settled {_plural(totals['review'], 'Needs review item')} "

py/api/duplicate_spellings.py

@@ -18,7 +18,7 @@ Blocking: each lookup stats the file's folders once (cached).
 import os
 from pathlib import Path
 
-from .images import _favorite_relative_key, _favorite_root_key, image_category_key
+from .images import _favorite_relative_key, _favorite_root_key
 
 
 def _identity(path):
@@ -78,15 +78,6 @@ class Spellings:
                 )
         return spelled
 
-    @property
-    def listed_roots(self):
-        """The listed roots (the output sources), in order."""
-        return [root for root, _identity in self._listed]
-
-    def category_key(self, path):
-        """*path*'s image category file key (#332), or None outside every source."""
-        return image_category_key(self.listed_roots, path)
-
     def favorites(self, path):
         """``{listed root: path below it (POSIX)}`` for each listed root holding it."""
         path = os.path.abspath(str(path))
@@ -134,23 +125,9 @@ def copy_move(target, kept_stat, spellings):
         "targets": targets,
         "kept_path": target["keeper_abs"],
         "favorites": favorites,
-        "categories": _category_pairs(target, spellings),
         "removed_locator": target["locator"],
         "kept_locator": target["keeper_locator"],
         "sha256": target["hash"],
         "kept_size": kept_stat.st_size,
         "kept_mtime_ns": kept_stat.st_mtime_ns,
     }
-
-
-def _category_pairs(target, spellings):
-    """``[(removed file key, kept file key)]`` for the image category (#332).
-
-    From the two absolute paths, not the favorites tuples: those follow the
-    listed root, which differs from the file key when sources nest.
-    """
-    removed = spellings.category_key(target["abs"])
-    kept = spellings.category_key(target["keeper_abs"])
-    if removed is None or kept is None:
-        return []
-    return [(removed, kept)]

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

@@ -5,7 +5,6 @@ import base64
 import binascii
 from functools import wraps
 import json
-import os
 import re
 import sqlite3
 from typing import Callable
@@ -21,19 +20,16 @@ from .history_current import (
     _OpenedCurrentMedia,
     _current_media_response,
     _prepare_current_media,
-    accepts_jxl,
     _reauthorize_current_target,
     candidate_locator,
     resolve_current_candidate,
     snapshot_current_output_scope,
 )
 from .inspection_service import CurrentFileChanged, inspect_current_file
-from .images import image_category_key
 
 try:
     from ...database.execution_history import HistoryEpochChanged
     from ...database.history_gallery import read_history_gallery
-    from ...database.run_attribution import recorded_output_lookup
     from ...database.history_reads import (
         HistoryCaptureChanged,
         OutputPosition,
@@ -41,15 +37,10 @@ try:
         WindowPosition,
     )
     from ...utils.history_read_fence import HistoryReadFence
-    from ...utils.inspection_response import (
-        OWN_CATEGORY_UNREAD,
-        apply_own_category,
-        encode_history_inspection_response,
-    )
+    from ...utils.inspection_response import encode_history_inspection_response
 except ImportError:
     from database.execution_history import HistoryEpochChanged
     from database.history_gallery import read_history_gallery
-    from database.run_attribution import recorded_output_lookup
     from database.history_reads import (
         HistoryCaptureChanged,
         OutputPosition,
@@ -57,11 +48,7 @@ except ImportError:
         WindowPosition,
     )
     from utils.history_read_fence import HistoryReadFence
-    from utils.inspection_response import (
-        OWN_CATEGORY_UNREAD,
-        apply_own_category,
-        encode_history_inspection_response,
-    )
+    from utils.inspection_response import encode_history_inspection_response
 
 
 _RUN_MAX_BYTES = 8 * 1024 * 1024
@@ -155,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:
@@ -687,32 +662,6 @@ class HistoryRoutesMixin:
     ) -> web.Response:
         return await self._history_current(request, "inspection")
 
-    def _history_own_category(self, reference: dict, scope):
-        """The recorded output's own category (#332), inside the snapshot.
-
-        The path is the symlink-resolved output folder plus the receipt's
-        subfolder and filename, keyed by ``image_category_key`` over the
-        configured output sources as Images keys it. A temp output or a path
-        no source holds has none. A failed read is OWN_CATEGORY_UNREAD.
-        """
-        if (
-            reference.get("folder_type") != "output"
-            or scope.canonical_output is None
-            or candidate_locator(reference, scope) is None
-        ):
-            return None
-        path = os.path.join(
-            str(scope.canonical_output), reference["subfolder"], reference["filename"]
-        )
-        try:
-            key = image_category_key(self._get_all_output_dirs(), path)
-            return None if key is None else self.db.image_category(*key)
-        except Exception:
-            self.logger.warning(
-                "History image category could not be read", exc_info=True
-            )
-            return OWN_CATEGORY_UNREAD
-
     async def _history_current(
         self, request: web.Request, kind: str
     ) -> web.StreamResponse:
@@ -737,7 +686,6 @@ class HistoryRoutesMixin:
                     if scope.current_scope != current_scope:
                         raise _current_stale()
                     result = db.get_history_occurrence(run_id, node, ordinal)
-                    own = None
                     if result is not None:
                         receipt = result["receipt"]
                         path = candidate_locator(receipt["reference"], scope)
@@ -745,10 +693,6 @@ class HistoryRoutesMixin:
                             db.model.get_connection(),
                             (path,) if path is not None else (),
                         )
-                        if kind == "inspection":
-                            own = self._history_own_category(
-                                receipt["reference"], scope
-                            )
             finally:
                 db.model.close()
             if result is None:
@@ -767,19 +711,9 @@ class HistoryRoutesMixin:
                         resolved.canonical_target,
                         source_label=resolved.public["source_label"],
                         saved=saved.get("saved"),
-                        library=apply_own_category(
-                            saved.get(
-                                "library",
-                                {
-                                    "status": (
-                                        "unavailable" if saved_unavailable else "none"
-                                    )
-                                },
-                            ),
-                            own,
-                        ),
-                        recorded=recorded_output_lookup(
-                            db, close=True, reference=receipt["reference"]
+                        library=saved.get(
+                            "library",
+                            {"status": "unavailable" if saved_unavailable else "none"},
                         ),
                     )
                     _reauthorize_current_target(resolved, scope)
@@ -860,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/image_categories.py

@@ -1,374 +0,0 @@
-"""Image category routes (#332): an image file's own category.
-
-``PUT /prompt_manager/images/category`` sets the own category of up to 500
-listed files; ``DELETE`` removes it (listed or not, so a missing file's
-category can still be removed); ``GET /prompt_manager/images/categories``
-lists the own-category values of files the sources list. Targets are the
-Images listing identity (``{root_index, root_scope, path}``, checked by
-``media_target``) of an output source; LoRA folders are not sources here.
-Instead of ``items`` a request may name ``filter``, the Images listing's own
-query ("Select all N matching", #392), resolved now up to 500 images.
-Each file is stored under its file key (``images.image_category_key``).
-These routes never read or write prompts, recipes or image links.
-"""
-
-import os
-from pathlib import Path
-
-from aiohttp import web
-
-from .image_tag_jobs import MAX_JOB_TARGETS, _parse_targets
-from .images import (
-    _favorite_relative_key,
-    _favorite_root_key,
-    _forbidden,
-    _json_body_or_error,
-    image_category_key,
-)
-from .prompts import bad_request
-
-try:
-    from ...database.image_categories import MAX_CATEGORY_LENGTH, MAX_KEY_LENGTH
-    from ...database.models import normalize_image_path
-    from ...utils.validators import validate_category
-except ImportError:
-    from database.image_categories import MAX_CATEGORY_LENGTH, MAX_KEY_LENGTH
-    from database.models import normalize_image_path
-    from utils.validators import validate_category
-
-CATEGORY_MEDIA_MESSAGE = "Only media files can have a category"
-_PUT_FIELDS = frozenset({"category"})
-_DELETE_FIELDS = frozenset()
-TOO_MANY = f"Select at most {MAX_JOB_TARGETS} images."
-SOURCE_CHANGED_MESSAGE = "The sources changed. Refresh the images and try again."
-WRITE_FAILED = "The category could not be changed."
-READ_FAILED = "Image categories could not be read."
-
-
-def _coded(status: int, code: str, message: str) -> web.Response:
-    return web.json_response(
-        {"success": False, "code": code, "error": message},
-        status=status,
-        headers={"Cache-Control": "no-store"},
-    )
-
-
-def _category_value(raw) -> tuple[str | None, web.Response | None]:
-    """The stripped category, or a 400 (an empty value is a 400: use DELETE)."""
-    if not isinstance(raw, str):
-        return None, bad_request("category must be a string")
-    value = raw.strip()
-    if not value:
-        return None, bad_request("category must not be empty")
-    if len(value) > MAX_CATEGORY_LENGTH:
-        return None, bad_request(
-            f"Category cannot exceed {MAX_CATEGORY_LENGTH} characters"
-        )
-    try:
-        value.encode("utf-8")
-        validate_category(value)
-    except UnicodeEncodeError:
-        return None, bad_request("category must be valid text")
-    except ValueError as exc:
-        return None, bad_request(str(exc))
-    return value, None
-
-
-class _KeyRefused(Exception):
-    """A target has no storable file key (outside every source, or too long)."""
-
-    def __init__(self, message: str = "Access denied"):
-        super().__init__(message)
-        self.message = message
-
-
-def _file_key(roots, root, relative) -> tuple[str, str]:
-    """The target's file key (blocking: resolves the sources)."""
-    key = image_category_key(roots, Path(root) / relative)
-    if key is None:
-        raise _KeyRefused()
-    if max(len(key[0]), len(key[1])) > MAX_KEY_LENGTH:
-        raise _KeyRefused("Path is too long")
-    return key
-
-
-def _nested_sources(root: Path, sources) -> list[tuple[str, str]]:
-    """``[(relative key prefix, source root key)]`` of sources inside *root*.
-
-    Deepest first, so the first prefix that matches is the file's source.
-    """
-    base = os.path.join(os.path.normcase(os.path.realpath(str(root))), "")
-    nested = []
-    for source in sources:
-        real = os.path.realpath(str(source))
-        if not os.path.normcase(real).startswith(base):
-            continue
-        relative = os.path.relpath(real, os.path.realpath(str(root)))
-        nested.append(
-            (
-                _favorite_relative_key(relative.replace(os.sep, "/")),
-                _favorite_root_key(source),
-            )
-        )
-    nested.sort(key=lambda item: item[0].count("/"), reverse=True)
-    return nested
-
-
-def _source_prefix(relative_key: str, nested) -> str | None:
-    """The prefix of the deepest nested source holding *relative_key*."""
-    for prefix, _source_key in nested:
-        if relative_key.startswith(prefix + "/"):
-            return prefix
-    return None
-
-
-class ImageCategoryRoutesMixin:
-    """Routes for images' own categories (#332)."""
-
-    def _register_image_category_routes(self, routes):
-        # Fixed paths beside DELETE /prompt_manager/images/{image_id}, as the
-        # favorite routes are. Registered after it, they still win: aiohttp
-        # (3.10+) looks fixed paths up before dynamic resources
-        # (test_delete_category_never_reaches_delete_image).
-        @routes.put("/prompt_manager/images/category")
-        async def set_image_category_route(request):
-            return await self.set_image_category(request)
-
-        @routes.delete("/prompt_manager/images/category")
-        async def clear_image_category_route(request):
-            return await self.clear_image_category(request)
-
-        @routes.get("/prompt_manager/images/categories")
-        async def list_image_categories_route(request):
-            return await self.list_image_categories(request)
-
-    # -- reading ---------------------------------------------------------------
-
-    def _own_category_map(self, sources, listings) -> dict:
-        """``{normalized listed path: own category}`` for the listed files (blocking).
-
-        One primary-key range read per source; each stored row is matched to
-        the listing of every selected root that holds its source, so the work
-        follows the stored rows, not the files. A file under a nested source
-        is keyed by the deepest one (``image_category_key``). A row whose file
-        is gone matches nothing. A failed read raises.
-        """
-        sources = list(sources)
-        rows = self.db.own_categories_of(_favorite_root_key(s) for s in sources)
-        if not rows:
-            return {}
-        by_source: dict[str, dict[str, str]] = {}
-        for (root_key, relative), category in rows.items():
-            by_source.setdefault(root_key, {})[relative] = category
-        found = {}
-        for _index, root, files in listings:
-            listing = self._favorite_listing(root, files)
-            root_key = _favorite_root_key(root)
-            # normalize_image_path(root / listed) without a call per file: the
-            # listed spellings are clean relative POSIX paths. Windows abspath
-            # also drops a component's trailing dots and spaces, so it keeps
-            # the call there.
-            base = os.path.join(normalize_image_path(str(root)), "")
-
-            def normalized(listed, base=base, root=root):
-                if os.name == "nt":
-                    return normalize_image_path(str(root / listed))
-                return base + os.path.normcase(listed.replace("/", os.sep))
-
-            nested = [
-                item for item in _nested_sources(root, sources) if item[1] != root_key
-            ]
-            for relative, category in by_source.get(root_key, {}).items():
-                listed = listing.get(relative)
-                if listed is not None and _source_prefix(relative, nested) is None:
-                    found[normalized(listed)] = category
-            for prefix, source_key in nested:
-                for relative, category in by_source.get(source_key, {}).items():
-                    full = f"{prefix}/{relative}"
-                    listed = listing.get(full)
-                    if listed is not None and _source_prefix(full, nested) == prefix:
-                        found[normalized(listed)] = category
-        return found
-
-    async def _source_listings(self, roots) -> list[tuple]:
-        return [
-            (index, root, await self._get_gallery_files(root))
-            for index, root in enumerate(roots)
-        ]
-
-    async def list_image_categories(self, request):
-        """GET: the own-category values of listed files, sorted."""
-        try:
-            roots = list(self._get_all_output_dirs())
-            listings = await self._source_listings(roots)
-            found = await self._run_in_executor(self._own_category_map, roots, listings)
-        except Exception:
-            self.logger.exception("Image categories read failed")
-            return _coded(500, "categories-failed", READ_FAILED)
-        return web.json_response(
-            {"success": True, "categories": sorted(set(found.values()))},
-            headers={"Cache-Control": "no-store"},
-        )
-
-    # -- writing ---------------------------------------------------------------
-
-    async def _filter_targets(self, raw):
-        """``(targets, None)`` for an Images listing filter, else ``(None, error)``.
-
-        "Select all N matching" (#392) sends the listing's own query; it is
-        resolved now, up to 500 images (a 400 ``too-many-images`` above).
-        """
-        from .images import ListingSourceChanged, parse_listing_filter
-
-        try:
-            selection = await self.resolve_listing_filter(
-                parse_listing_filter(raw), MAX_JOB_TARGETS
-            )
-        except ListingSourceChanged:
-            return None, _coded(409, "source-changed", SOURCE_CHANGED_MESSAGE)
-        except ValueError as exc:
-            return None, bad_request(str(exc))
-        if selection.truncated:
-            return None, _coded(400, "too-many-images", TOO_MANY)
-        return tuple(selection.targets), None
-
-    async def _category_request(self, request, fields: frozenset):
-        """``(data, targets, roots, None)`` or ``(None, None, None, error)``.
-
-        The images are ``items`` (1 to 500 targets) or ``filter`` (all images
-        an Images listing filter admits), besides *fields*.
-        """
-        data, error = await _json_body_or_error(request)
-        if error is not None:
-            return None, None, None, error
-        names = set(data) - fields
-        if set(data) & fields != fields or names not in ({"items"}, {"filter"}):
-            return (
-                None,
-                None,
-                None,
-                bad_request(
-                    "Request must contain "
-                    + ", ".join(sorted(fields))
-                    + (" and " if fields else "")
-                    + "either items or filter"
-                ),
-            )
-        if "filter" in data:
-            targets, error = await self._filter_targets(data["filter"])
-            if error is not None:
-                return None, None, None, error
-            return data, targets, list(self._get_all_output_dirs()), None
-        items = data["items"]
-        if not isinstance(items, list) or not 1 <= len(items) <= MAX_JOB_TARGETS:
-            return (
-                None,
-                None,
-                None,
-                bad_request(f"items must list 1 to {MAX_JOB_TARGETS} images"),
-            )
-        targets, error = _parse_targets(items, media_message=CATEGORY_MEDIA_MESSAGE)
-        if error is not None:
-            return None, None, None, error
-        try:
-            for _index, _scope, relative in targets:
-                relative.encode("utf-8")
-        except UnicodeEncodeError:
-            return None, None, None, bad_request("path must be valid text")
-        roots = list(self._get_all_output_dirs())
-        for index, scope in dict.fromkeys((t[0], t[1]) for t in targets):
-            if index >= len(roots):
-                return None, None, None, bad_request("Invalid gallery root")
-            error = self._gallery_scope_error(
-                {"root_scope": scope, "root": str(index)}, roots
-            )
-            if error is not None:
-                if error.status == 409:
-                    error = _coded(409, "source-changed", SOURCE_CHANGED_MESSAGE)
-                return None, None, None, error
-        return data, targets, roots, None
-
-    def _listed_file_keys(self, roots, targets, files) -> tuple[list, list]:
-        """``(listed keys, unlisted keys)`` of the targets (blocking).
-
-        A target counts as listed when its source's listing holds it; its key
-        then follows the listed spelling. Targets folding to one key count
-        once, and a key that is listed through any target is listed.
-        """
-        listings, listed, missing = {}, {}, {}
-        for index, _scope, relative in targets:
-            root = roots[index]
-            if index not in listings:
-                listings[index] = self._favorite_listing(root, files[index])
-            spelled = listings[index].get(_favorite_relative_key(relative))
-            key = _file_key(roots, root, spelled or relative)
-            (missing if spelled is None else listed)[key] = True
-        return list(listed), [key for key in missing if key not in listed]
-
-    async def set_image_category(self, request):
-        """PUT ``{items, category}``: set the own category of listed files."""
-        data, targets, roots, error = await self._category_request(request, _PUT_FIELDS)
-        if error is not None:
-            return error
-        category, error = _category_value(data["category"])
-        if error is not None:
-            return error
-        try:
-            files = {}
-            for index in dict.fromkeys(t[0] for t in targets):
-                files[index] = await self._get_gallery_files(roots[index])
-            listed_keys, missing_keys = await self._run_in_executor(
-                self._listed_file_keys, roots, targets, files
-            )
-        except _KeyRefused as refused:
-            return _forbidden(refused.message)
-        except Exception:
-            self.logger.exception("Image category update failed")
-            return _coded(500, "category-failed", WRITE_FAILED)
-        try:
-            if not listed_keys:
-                return _coded(
-                    404,
-                    "files-not-found",
-                    "None of the selected images could be found.",
-                )
-            counts = await self._run_in_executor(
-                self.db.set_image_categories, listed_keys, category
-            )
-        except Exception:
-            self.logger.exception("Image category update failed")
-            return _coded(500, "category-failed", WRITE_FAILED)
-        return web.json_response(
-            {
-                "success": True,
-                "category": category,
-                "updated": counts["updated"],
-                "unchanged": counts["unchanged"],
-                "not_found": len(missing_keys),
-            },
-            headers={"Cache-Control": "no-store"},
-        )
-
-    async def clear_image_category(self, request):
-        """DELETE ``{items}``: remove the own category, listed or not."""
-        _data, targets, roots, error = await self._category_request(
-            request, _DELETE_FIELDS
-        )
-        if error is not None:
-            return error
-        try:
-            keys = await self._run_in_executor(
-                lambda: list(
-                    dict.fromkeys(_file_key(roots, roots[i], r) for i, _s, r in targets)
-                )
-            )
-            cleared = await self._run_in_executor(self.db.clear_image_categories, keys)
-        except _KeyRefused as refused:
-            return _forbidden(refused.message)
-        except Exception:
-            self.logger.exception("Image category removal failed")
-            return _coded(500, "category-failed", WRITE_FAILED)
-        return web.json_response(
-            {"success": True, "cleared": cleared},
-            headers={"Cache-Control": "no-store"},
-        )

py/api/image_tag_jobs.py

@@ -2,9 +2,7 @@
 
 ``POST /prompt_manager/jobs/image-tags`` starts one ``image-tags`` job over
 1..500 listed images, named by the listing identity ``{root_index,
-root_scope, path}``, or over every image a listing ``filter`` admits (at most
-10,000, resolved at start in the listing's order; "Select all N matching",
-#392). The job is record-changing (it writes image tag sets and
+root_scope, path}``. The job is record-changing (it writes image tag sets and
 new vocabulary names), so it never runs beside the metadata scan.
 
 - **Add tags** (``mode: "add"``) hashes each current file and unions a fixed
@@ -20,21 +18,13 @@ the suggestion worker and the storage call ``add_image_tags``. Files are
 handled one at a time and the job stops at a file boundary when cancelled,
 keeping what it already wrote. Rows and log lines carry root-relative paths
 and public root labels only.
-
-Auto-tag marks each image it ran the model on as auto-tagged (#379), with the
-union of its tags. The ``autotag`` job ("Tag output images", started by
-``POST /jobs/autotag``) runs the same per-file loop over every still image the
-output folders list (:meth:`ImageTagJobsMixin._run_autotag_batch`): image
-tags only, never a prompt tag or prompt text.
 """
 
 import asyncio
-import dataclasses
 import functools
 import os
 import time
 from dataclasses import dataclass, field
-from typing import NamedTuple
 
 from aiohttp import web
 
@@ -55,24 +45,10 @@ from .annotations import (
     _submit,
     _target,
 )
-from .autotag_routes import BATCH_CANCELLED, MODEL_BUSY_ERROR, model_busy_response
-from .images import (
-    MAX_LISTING_SELECTION,
-    ListingSourceChanged,
-    _current_fingerprint,
-    _listing_posix,
-    _public_path,
-    parse_listing_filter,
-)
+from .autotag_routes import model_busy_response
+from .images import _public_path
 from .job_routes import busy_response
-from .jobs import (
-    AUTOTAG_BATCH_JOB_KIND,
-    AUTOTAG_GROUP_NAMES,
-    IMAGE_TAG_GROUP_NAMES,
-    IMAGE_TAG_JOB_KIND,
-    JobBusy,
-)
-from .maintenance import disk_plan, short_space_message
+from .jobs import IMAGE_TAG_GROUP_NAMES, IMAGE_TAG_JOB_KIND, JobBusy
 from .prompts import bad_request
 
 try:
@@ -99,11 +75,6 @@ except ImportError:
     from utils.video_metadata import is_video_path
 
 MAX_JOB_TARGETS = 500
-# A filter start resolves on the server, so the request body does not bound it.
-MAX_FILTER_TARGETS = MAX_LISTING_SELECTION
-NO_IMAGES = "No images match this view."
-FILTER_LISTING_FAILED = "The matching images could not be listed. Try again."
-TOO_MANY_IMAGES = "Narrow the view to at most {cap:,} images."
 # 500 maximal targets plus the options: a path of MAX_TARGET_PATH code points
 # takes at most 6 bytes each on the wire (a \uXXXX escape; raw UTF-8 is at most
 # 4), and the root index and scope fit in 256. The annotation routes' 64 KiB
@@ -117,10 +88,9 @@ ADD_TITLE = "Add tags to images"
 AUTO_TITLE = "Auto-tag images"
 GATE_OWNER_KIND = "image-tag-job"
 
-# Each mode's fields besides the images, named by ``targets`` or ``filter``.
 _FIELDS = {
-    "add": frozenset({"mode", "tags"}),
-    "auto": frozenset({"mode", "model_type", "options"}),
+    "add": frozenset({"mode", "targets", "tags"}),
+    "auto": frozenset({"mode", "targets", "model_type", "options"}),
 }
 _VERBS = {"add": "Add tags", "auto": "Auto-tag"}
 _LOG_PREFIXES = {"tagged": "+", "unchanged": "=", "skipped": "-", "errors": "!"}
@@ -137,14 +107,6 @@ READ_FAILED = "The file could not be read."
 SOURCE_CHANGED = "The source changed. Refresh the image collection."
 STORAGE_RESTORED = "Prompt storage was restored; start the job again."
 BUSY_RETRY = "The file could not be read now. Run the job again for it."
-# Tag output images (#379): the per-image batch.
-ALREADY_AUTOTAGGED = "Already auto-tagged"
-LISTING_FAILED = "The output folders could not be listed. Try again."
-LISTING_STATUS = "Listing output images…"
-_INTERNAL_ERROR = "An internal error occurred. Check server logs for details."
-# The pre-pass stats and looks up this many targets at a time, checking for a
-# cancel between chunks.
-PREPASS_CHUNK = 500
 
 _monotonic = time.monotonic  # the job's clock (a test can fake it)
 
@@ -179,8 +141,6 @@ class _Spec:
     tags: tuple = ()
     model_type: str | None = None
     options: dict | None = None
-    # A listing filter the start resolves into ``targets`` (#392).
-    filter: dict | None = None
 
     @property
     def title(self) -> str:
@@ -193,17 +153,13 @@ class _Spec:
         return scope
 
 
-def _parse_targets(raw, **target_options):
-    """Unique validated targets in request order, or ``(None, error)``.
-
-    ``target_options`` reach the target check (the image category routes
-    pass their own ``media_message``, #332).
-    """
+def _parse_targets(raw):
+    """Unique validated targets in request order, or ``(None, error)``."""
     if not isinstance(raw, list) or not 1 <= len(raw) <= MAX_JOB_TARGETS:
         return None, bad_request(f"targets must list 1 to {MAX_JOB_TARGETS} images")
     seen, targets = set(), []
     for item in raw:
-        target, error = _target(item, **target_options)
+        target, error = _target(item)
         if error is not None:
             return None, error
         if target not in seen:
@@ -243,35 +199,21 @@ def parse_image_tag_request(data: dict):
     """A :class:`_Spec` for a start body, or ``(None, error response)``.
 
     ``{mode:"add", targets, tags}`` or ``{mode:"auto", targets, model_type,
-    options}`` exactly; options follow the Tag dialog's Generate rules. A
-    ``filter`` (a listing query object, parse_listing_filter) may stand in for
-    ``targets``; the start resolves it.
+    options}`` exactly; options follow the Tag dialog's Generate rules.
     """
     fields = _FIELDS.get(data.get("mode"))
     if fields is None:
         return None, bad_request('mode must be "add" or "auto"')
-    fields = fields | {"filter" if "filter" in data else "targets"}
     if set(data) != fields:
         return None, bad_request(
             "Request must contain exactly " + ", ".join(sorted(fields))
         )
-    listing_filter, targets = None, ()
-    if "filter" in data:
-        try:
-            listing_filter = parse_listing_filter(data["filter"])
-        except ValueError as exc:
-            return None, bad_request(str(exc))
-    else:
-        targets, error = _parse_targets(data["targets"])
-        if error is not None:
-            return None, error
+    targets, error = _parse_targets(data["targets"])
+    if error is not None:
+        return None, error
     if data["mode"] == "add":
-        spec, error = _parse_add(targets, data)
-    else:
-        spec, error = _parse_auto(targets, data)
-    if spec is not None and listing_filter is not None:
-        spec = dataclasses.replace(spec, filter=listing_filter)
-    return spec, error
+        return _parse_add(targets, data)
+    return _parse_auto(targets, data)
 
 
 def _capture_outcome(exc: CaptureError, root, relative: str):
@@ -304,92 +246,6 @@ async def _capacity_retried(job, attempt):
     return await attempt()
 
 
-class Refusal(NamedTuple):
-    """Why a Tag output images start was refused.
-
-    ``response`` is the native route's JSON answer; ``message`` the sentence
-    a legacy stream frame carries.
-    """
-
-    status: int
-    code: str
-    message: str
-    response: web.Response
-
-
-@dataclass(frozen=True)
-class AutotagRun:
-    """What one Tag output images job runs with (validated at its start)."""
-
-    model_type: str
-    existing: str
-    options: dict
-    keep_in_memory: bool
-    backup_on: bool
-    owner: object
-
-
-@dataclass(frozen=True)
-class _BatchTarget:
-    """One still image of the batch: the job target and its private keys."""
-
-    target: tuple  # (root_index, root_scope, relative): the image-tags target
-    path: str  # the listed file, for the pre-pass stat (never sent out)
-    locator: str  # the image tag key: normcase(join(realpath(root), relative))
-    label: str  # the root's public label
-
-
-def _still_targets(api, index, root, files, seen: set) -> list:
-    """Worker thread: one root's listed still images as _BatchTargets.
-
-    Newest first (the listing's order). A locator an earlier root already
-    produced (overlapping roots) is dropped; ``seen`` collects them.
-    """
-    scope = api._gallery_root_scope(root, index)
-    label = _public_path(root)
-    real = os.path.realpath(root)
-    prefix = os.path.join(str(root), "")
-    found = []
-    for path, _mtime in files:
-        relative = _listing_posix(root, prefix, path)
-        if is_video_path(relative):
-            continue
-        locator = os.path.normcase(os.path.join(real, *relative.split("/")))
-        if locator in seen:
-            continue
-        seen.add(locator)
-        found.append(_BatchTarget((index, scope, relative), str(path), locator, label))
-    return found
-
-
-def _prepass_chunk(db, chunk, skip_marked: bool, max_file: int):
-    """Worker thread: ``(remaining, skips)`` for a chunk of _BatchTargets.
-
-    Stats each file (no open, no hash): gone is "File not found", over the
-    capture limit "Too large to verify"; under "Skip already tagged" a file
-    whose current bytes are marked is "Already auto-tagged". ``skips`` are
-    ``(target, detail)`` pairs in target order.
-    """
-    stats, skips, alive = {}, [], []
-    for item in chunk:
-        fingerprint = _current_fingerprint(item.path)
-        if fingerprint is None:
-            skips.append((item, FILE_NOT_FOUND))
-        elif fingerprint[0] > max_file:
-            skips.append((item, TOO_LARGE))
-        else:
-            stats[item.locator] = fingerprint
-            alive.append(item)
-    marked = db.autotag_state(stats) if skip_marked and stats else {}
-    remaining = []
-    for item in alive:
-        if marked.get(item.locator):
-            skips.append((item, ALREADY_AUTOTAGGED))
-        else:
-            remaining.append(item)
-    return remaining, skips
-
-
 def _load_model(service, model_type: str, use_gpu: bool) -> None:
     """Worker thread: load (or swap to) *model_type*; never downloads."""
     if service.is_model_loaded() and service.get_loaded_model_type() == model_type:
@@ -398,25 +254,6 @@ def _load_model(service, model_type: str, use_gpu: bool) -> None:
         raise RuntimeError(f"{model_type} could not be loaded")
 
 
-def _refusal(status: int, code: str, message: str) -> Refusal:
-    response = web.json_response(
-        {"success": False, "code": code, "error": message}, status=status
-    )
-    return Refusal(status, code, message, response)
-
-
-def _busy_refusal(busy: JobBusy) -> Refusal:
-    title = getattr(busy.running, "title", "") or "Another job"
-    return Refusal(409, "busy", f"{title} already running", busy_response(busy))
-
-
-def _batch_cancelled(job) -> str:
-    """Say the batch was cancelled; its end state (the runner ends the job)."""
-    job.update(status_line=BATCH_CANCELLED)
-    job.log_line(BATCH_CANCELLED)
-    return "cancelled"
-
-
 class ImageTagJobsMixin:
     """The ``image-tags`` job kind: start route and runner."""
 
@@ -433,10 +270,6 @@ class ImageTagJobsMixin:
         spec, error = parse_image_tag_request(data)
         if error is not None:
             return error
-        if spec.filter is not None:
-            spec, error = await self._resolve_job_filter(spec)
-            if error is not None:
-                return error
         roots = await self._run_in_executor(self._job_roots, spec.targets)
         if any(root is None for root, _label in roots.values()):
             return _coded("source-changed")
@@ -468,246 +301,6 @@ class ImageTagJobsMixin:
             job.task.add_done_callback(lambda _task: model_gate.release(owner))
         return web.json_response({"success": True, "job": job.summary()}, status=202)
 
-    # -- Tag output images (#379) ---------------------------------------------
-
-    async def _autotag_targets(self) -> list:
-        """Every still image the output folders list, as _BatchTargets.
-
-        Root by root in configured order, each newest first (the shared
-        listing, ``_get_gallery_files``, used as it is even when stale). Videos
-        are not targets; a file under two overlapping roots is one target.
-        """
-        seen: set = set()
-        found = []
-        for index, root in enumerate(list(self._get_all_output_dirs())):
-            files = await self._get_gallery_files(root)
-            found.extend(
-                await self._run_in_executor(
-                    _still_targets, self, index, root, files, seen
-                )
-            )
-        return found
-
-    async def _start_autotag(
-        self, *, model_type, existing, options, keep_in_memory, title, owner_kind
-    ):
-        """Register a Tag output images job: ``(job, None)`` or ``(None, Refusal)``.
-
-        ``options`` are already validated (``validate_options``). The checks
-        run in this order: 409 ``model-unavailable``; 507
-        ``insufficient-space`` (only when the safety backup is on); 409
-        ``busy`` (another records job); 409 ``model-busy``. No await follows
-        the busy check. The gate is taken before the job registers and
-        released when the task ends, also before its runner ever starts.
-        """
-        from ..autotag import MODELS, get_autotag_service
-
-        backup_on = self._safety_backup_policy() == "on"
-        status = await self._run_in_executor(get_autotag_service().get_models_status)
-        _disk, short, _size = await self._run_in_executor(
-            functools.partial(
-                disk_plan, self.db.model.db_path, backup=backup_on, vacuum=False
-            )
-        )
-        label = MODELS[model_type]["label"]
-        if not (status.get(model_type) or {}).get("downloaded"):
-            message = (
-                f"{label} is not downloaded. Download it in System › Auto-tagging."
-            )
-            return None, _refusal(409, "model-unavailable", message)
-        if backup_on and short is not None:
-            return None, _refusal(507, "insufficient-space", short_space_message(short))
-        busy = self._jobs.blocker(AUTOTAG_BATCH_JOB_KIND, admission="records")
-        if busy is not None:
-            return None, _busy_refusal(JobBusy(busy))
-        owner = model_gate.new_owner(owner_kind)
-        if not model_gate.try_acquire(owner):
-            response = model_busy_response()
-            return None, Refusal(409, "model-busy", MODEL_BUSY_ERROR, response)
-        run = AutotagRun(
-            model_type, existing, options, keep_in_memory, backup_on, owner
-        )
-        try:
-            job = self._jobs.start(
-                AUTOTAG_BATCH_JOB_KIND,
-                title,
-                admission="records",
-                cancellable=True,
-                scope={"model_type": model_type, "existing": existing, "label": label},
-                groups=AUTOTAG_GROUP_NAMES,
-                runner=functools.partial(self._run_autotag_batch, run),
-            )
-        except BaseException as refused:
-            model_gate.release(owner)
-            if isinstance(refused, JobBusy):
-                return None, _busy_refusal(refused)
-            raise
-        job.task.add_done_callback(lambda _task: model_gate.release(owner))
-        return job, None
-
-    async def _run_autotag_batch(self, run: AutotagRun, job) -> None:
-        """The ``autotag`` job: backup, model, listing, pre-pass, per-image loop.
-
-        ``job.cancelled`` is checked between phases (and per pre-pass chunk
-        and per image). Each phase publishes ``{"type": "phase", "phase"}``.
-        With ``keep_in_memory`` false the model is unloaded under the gate.
-        The job ends only after that cleanup and the gate release, so a job
-        that reads as ended never still holds the gate.
-        """
-        state = "failed"
-        try:
-            state = await self._autotag_batch_phases(run, job)
-        except Exception:
-            self.logger.exception("Tag output images failed")
-            job.update(status_line=_INTERNAL_ERROR)
-            job.log_line(f"Tagging failed · {_INTERNAL_ERROR}")
-        finally:
-            try:
-                if not run.keep_in_memory:
-                    await self._unload_batch_model(run.owner)
-                if run.backup_on:
-                    await self._prune_backup_pool(job, self.db)
-            finally:
-                model_gate.release(run.owner)
-                job.publish({"type": state, "progress": job.progress})
-                job.finish(state)
-
-    async def _unload_batch_model(self, owner) -> None:
-        from ..autotag import get_autotag_service
-
-        service = get_autotag_service()
-        try:
-            if service.is_model_loaded():
-                await model_gate.run(owner, service.unload_model)
-        except Exception:
-            self.logger.exception("The tagging model could not be unloaded")
-
-    async def _autotag_batch_phases(self, run: AutotagRun, job) -> str:
-        """Run the phases; the job's end state (the caller ends the job)."""
-        job.publish({"type": "phase", "phase": "backup"})
-        ok, _backup = await self._safety_backup_step(job, self.db, run.backup_on)
-        if not ok:
-            return "failed"
-        if job.cancelled:
-            return _batch_cancelled(job)
-        job.publish({"type": "phase", "phase": "model"})
-        job.update(status_line="Loading the tagging model")
-        spec = _Spec("auto", (), model_type=run.model_type, options=run.options)
-        service = await self._prepare_tagging_model(job, spec, run.owner)
-        if service is None:
-            return "failed"
-        if job.cancelled:
-            return _batch_cancelled(job)
-        job.publish({"type": "phase", "phase": "listing"})
-        job.update(status_line=LISTING_STATUS)
-        epoch = await self._run_in_executor(self.db.get_execution_epoch)
-        try:
-            targets = await self._autotag_targets()
-        except Exception:
-            self.logger.exception("Tag output images could not list the outputs")
-            job.update(status_line=LISTING_FAILED)
-            job.log_line(f"! {LISTING_FAILED}")
-            return "failed"
-        total = len(targets)
-        job.scope["images"] = total
-        job.update(total=total)
-        policy = (
-            "skip images already auto-tagged" if run.existing == "skip" else "merge"
-        )
-        job.log_line(
-            f"Tagging started · {job.scope.get('label') or run.model_type} · "
-            f"{_plural(total, 'image')} · {policy}"
-        )
-        if job.cancelled:
-            return _batch_cancelled(job)
-        remaining = await self._autotag_prepass(job, targets, run.existing == "skip")
-        if remaining is None:
-            return _batch_cancelled(job)
-        done = total - len(remaining)
-        spec = dataclasses.replace(
-            spec, targets=tuple(item.target for item in remaining)
-        )
-        loop_run = _Run(job, spec, epoch, run.owner, service)
-        if not await self._tag_each_file(loop_run, done_before=done):
-            job.update(status_line=STORAGE_RESTORED)
-            job.log_line(f"Tagging stopped · {STORAGE_RESTORED}")
-            return "failed"
-        if job.cancelled:
-            return _batch_cancelled(job)
-        finished = f"Tagged {_plural(job.counters.get('tagged', 0), 'image')}"
-        job.update(status_line=finished, progress=100)
-        job.log_line(finished)
-        return "finished"
-
-    async def _autotag_prepass(self, job, targets, skip_marked: bool):
-        """The targets left for the model, or None when cancelled meanwhile.
-
-        Opens and hashes nothing: one stat per file and one indexed read per
-        chunk. Skips are counted with ``record_counted`` (exact counters, rows
-        up to the cap, no log line each).
-        """
-        max_file = self._capture_store().max_file
-        remaining, skipped = [], 0
-        total = len(targets)
-        for start in range(0, total, PREPASS_CHUNK):
-            if job.cancelled:
-                return None
-            chunk = targets[start : start + PREPASS_CHUNK]
-            left, skips = await self._run_in_executor(
-                _prepass_chunk, self.db, chunk, skip_marked, max_file
-            )
-            remaining.extend(left)
-            if skips:
-                job.record_counted(
-                    "skipped",
-                    len(skips),
-                    [
-                        {
-                            "path": item.target[2],
-                            "root": item.label,
-                            "root_index": item.target[0],
-                            "detail": detail,
-                        }
-                        for item, detail in skips
-                    ],
-                )
-                skipped += len(skips)
-                job.update(processed=skipped, progress=skipped * 100 // total)
-                job.publish({"type": "progress", "progress": job.progress})
-        if skipped:
-            job.log_line(f"Skipped {_plural(skipped, 'image')} before tagging")
-        return remaining
-
-    async def _resolve_job_filter(self, spec: _Spec):
-        """``spec`` with its filter resolved into targets, or ``(None, error)``.
-
-        The listing's own identities, in its order, kept only where a target
-        could have named them (a media path the job can tag).
-        """
-        cap = MAX_FILTER_TARGETS
-        try:
-            selection = await self.resolve_listing_filter(spec.filter, cap)
-        except ListingSourceChanged:
-            return None, _coded("source-changed")
-        except ValueError as exc:
-            return None, bad_request(str(exc))
-        except Exception:
-            # Never echo it: it can carry SQL or database text.
-            self.logger.error("A tagging filter could not be resolved", exc_info=True)
-            return None, _error(500, "listing-failed", FILTER_LISTING_FAILED)
-        if selection.truncated:
-            return None, _error(400, "too-many-images", TOO_MANY_IMAGES.format(cap=cap))
-        targets = []
-        for index, scope, relative in selection.targets:
-            target, error = _target(
-                {"root_index": index, "root_scope": scope, "path": relative}
-            )
-            if error is None:
-                targets.append(target)
-        if not targets:
-            return None, _error(400, "no-images", NO_IMAGES)
-        return dataclasses.replace(spec, targets=tuple(targets)), None
-
     # -- runner ----------------------------------------------------------------
 
     def _job_roots(self, targets) -> dict:
@@ -738,39 +331,28 @@ class ImageTagJobsMixin:
                     job.finish("failed")
                     return
             if not await self._tag_each_file(run):
-                job.update(status_line=STORAGE_RESTORED)
                 job.log_line(f"{verb} stopped · {STORAGE_RESTORED}")
                 job.finish("failed")
                 return
             state = "cancelled" if job.cancelled else "finished"
-            # An ended job never keeps the loop's "about X min left" (#379).
-            ended = f"{verb} {state} · {_plural(job.processed, 'file')} processed"
-            job.update(status_line=ended)
-            job.log_line(ended)
+            job.log_line(f"{verb} {state} · {_plural(job.processed, 'file')} processed")
             job.publish({"type": state, "progress": job.progress})
             job.finish(state)
         finally:
             if owner is not None:
                 model_gate.release(owner)
 
-    async def _tag_each_file(self, run: _Run, *, done_before: int = 0) -> bool:
-        """Tag the targets in order; False when the job had to stop.
-
-        ``done_before`` files were already counted (the batch's pre-pass): file
-        n of this loop is "file done_before + n" of the job, and the time left
-        uses this loop's rate only.
-        """
-        job, count = run.job, len(run.spec.targets)
-        total = done_before + count
+    async def _tag_each_file(self, run: _Run) -> bool:
+        """Tag the targets in order; False when the job had to stop."""
+        job, total = run.job, len(run.spec.targets)
         run.roots = await self._run_in_executor(self._job_roots, run.spec.targets)
         started = _monotonic()
         for number, target in enumerate(run.spec.targets, 1):
             if job.cancelled:
                 break
             # The scan's estimate (D56), with each finished file as one batch.
-            left = _time_left(number - 1, count, number - 1, _monotonic() - started)
-            shown = done_before + number
-            job.update(status_line=f"Processing file {shown:,} of {total:,}{left}")
+            left = _time_left(number - 1, total, number - 1, _monotonic() - started)
+            job.update(status_line=f"Processing file {number:,} of {total:,}{left}")
             job.publish({"type": "progress", "progress": job.progress})
             stopped = False
             try:
@@ -781,7 +363,7 @@ class ImageTagJobsMixin:
                 self.logger.exception("Image tagging failed for one file")
                 group, detail = "errors", SAVE_FAILED
             self._record_tag_outcome(run, target, group, detail)
-            job.update(processed=shown, progress=shown * 100 // total)
+            job.update(processed=number, progress=number * 100 // total)
             if stopped:
                 return False
         return True
@@ -857,17 +439,9 @@ class ImageTagJobsMixin:
             store.release(capture.token)
 
     async def _auto_tag_capture(self, run: _Run, store, capture, root, relative):
-        """Suggest on the capture, then union only onto the same current bytes.
-
-        The bytes are marked auto-tagged with the union, also when the model
-        returned no names; captured bytes no model can read are marked too
-        (and stay skipped), so a "Skip already tagged" run passes them by.
-        """
+        """Suggest on the capture, then union only onto the same current bytes."""
         if not capture.inferable:
-            group, detail = await self._union_image_tags(
-                capture, [], run.epoch, mark_autotagged=True
-            )
-            return (group, detail) if group == "errors" else ("skipped", NOT_A_STILL)
+            return "skipped", NOT_A_STILL
         if store.acquire(capture.token) is None:
             raise _JobStopped  # every capture was invalidated (restore)
         spec = run.spec
@@ -893,30 +467,21 @@ class ImageTagJobsMixin:
         if facts.locator != capture.locator or facts.sha256 != capture.sha256:
             return "skipped", FILE_CHANGED
         names = [str(name) for name, _score in pairs]
-        return await self._union_image_tags(
-            facts, names, run.epoch, mark_autotagged=True
-        )
+        if not names:
+            return "unchanged", NO_NEW_TAGS
+        return await self._union_image_tags(facts, names, run.epoch)
 
-    async def _union_image_tags(
-        self, facts, tags: list, epoch: str, *, mark_autotagged: bool = False
-    ):
-        """``add_image_tags`` on the verified bytes, as a (group, detail).
-
-        ``mark_autotagged`` (a model's result) marks the bytes auto-tagged in
-        the same write; then ``tags`` may be empty.
-        """
+    async def _union_image_tags(self, facts, tags: list, epoch: str):
+        """``add_image_tags`` on the verified bytes, as a (group, detail)."""
         try:
             receipt = await self._run_in_executor(
-                functools.partial(
-                    self.db.add_image_tags,
-                    locator=facts.locator,
-                    sha256=facts.sha256,
-                    size=facts.size,
-                    mtime_ns=facts.mtime_ns,
-                    expected_epoch=epoch,
-                    tags=tags,
-                    mark_autotagged=mark_autotagged,
-                )
+                self.db.add_image_tags,
+                locator=facts.locator,
+                sha256=facts.sha256,
+                size=facts.size,
+                mtime_ns=facts.mtime_ns,
+                expected_epoch=epoch,
+                tags=tags,
             )
         except LibraryCommandError as exc:
             if exc.code == "storage-changed":

py/api/inspection_service.py

@@ -3,7 +3,7 @@
 import os
 import stat
 from pathlib import Path
-from typing import Any, Callable
+from typing import Callable
 
 try:
     from ...utils.prompt_inspector import (
@@ -100,23 +100,18 @@ def inspect_current_file(
     saved: dict | None,
     library: dict,
     image_tags: Callable[[int, int], dict] | None = None,
-    recorded: Callable[[Path], Any] | None = None,
 ) -> dict:
     """Current-file evidence read between two equal stats of *path*.
 
     *image_tags*, when given, is called once with that stable
     ``(st_size, st_mtime_ns)`` and its facet is returned as ``image_tags``
     (spec amendment S1: tags of a byte record verified at exactly that stat).
-    *recorded*, when given, is asked within the same stat window for what
-    recorded run history knows about *path* (``RecordedOutput`` or None: the
-    save node that wrote it and the texts PromptManager recorded, #386).
     """
     before = _current_file_facts(path)
     try:
         inspection = read_inspection_file(path)
     except MetadataReadError:
         inspection = None
-    run = recorded(path) if recorded is not None and inspection is not None else None
     after = _current_file_facts(path)
     fields = ("st_dev", "st_ino", "st_mode", "st_size", "st_mtime_ns", "st_ctime_ns")
     if any(getattr(before, key) != getattr(after, key) for key in fields):
@@ -134,15 +129,8 @@ def inspect_current_file(
         profile = (
             PREVIEW_INSPECTION_PROFILE if _in_host_temp(path) else INSPECTION_PROFILE
         )
-        # The file name anchors on the saver that wrote it (#381); recorded run
-        # history names that saver when the file alone cannot (#386).
         evidence = inspect_prompt_evidence(
-            inspection.metadata,
-            role_saved,
-            profile=profile,
-            file_name=path.name,
-            recorded_saver_id=run.saver_id if run is not None else None,
-            recorded_texts=run.texts if run is not None else None,
+            inspection.metadata, role_saved, profile=profile
         )
     return {
         "file": {

py/api/job_routes.py

@@ -130,14 +130,6 @@ class JobRoutesMixin:
         async def start_image_tag_job_route(request):
             return await self.start_image_tag_job(request)
 
-        @routes.post("/prompt_manager/jobs/model-download")
-        async def start_model_download_job_route(request):
-            return await self.start_model_download_job(request)
-
-        @routes.post("/prompt_manager/jobs/autotag")
-        async def start_autotag_job_route(request):
-            return await self.start_autotag_job(request)
-
         @routes.post("/prompt_manager/jobs/thumbnails")
         async def start_thumbnail_job_route(request):
             return await self.start_thumbnail_job(request)

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
@@ -47,11 +38,6 @@ import time
 import uuid
 from pathlib import PurePosixPath, PureWindowsPath
 
-try:
-    from ...utils import exit_signal
-except ImportError:  # tests import the package top-level
-    from utils import exit_signal
-
 logger = logging.getLogger(__name__)
 # Start and finish order: wall-clock times can tie (coarse Windows clocks).
 _sequence = itertools.count()
@@ -62,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
@@ -92,8 +75,6 @@ SCAN_GROUPS = {
 # Record-changing: it writes image tag sets and new vocabulary names.
 IMAGE_TAG_JOB_KIND = "image-tags"
 IMAGE_TAG_GROUP_NAMES = ("tagged", "unchanged", "skipped", "errors")
-# Tag output images (#328) counts its prompts the same way.
-AUTOTAG_GROUP_NAMES = IMAGE_TAG_GROUP_NAMES
 
 # Thumbnail generation (#249 System S5): previews written, already fresh, failed.
 THUMBNAIL_GROUP_NAMES = ("generated", "skipped", "errors")
@@ -116,8 +97,6 @@ DUPLICATE_CLEANUP_JOB_KIND = "duplicate_cleanup"
 THUMBNAILS_JOB_KIND = "thumbnails"
 LORA_IMPORT_JOB_KIND = "lora_import"
 AUTOTAG_BATCH_JOB_KIND = "autotag"
-# A tagging model download (#328): read admission, not cancellable.
-MODEL_DOWNLOAD_JOB_KIND = "model_download"
 # Duplicate image files (#249 System S6, py/api/duplicate_files.py): the
 # find is a cancellable ``read`` job; the reviewed removal is ``records``.
 DUPLICATES_JOB_KIND = "duplicates"
@@ -200,21 +179,11 @@ class Job:
         self.counters = dict.fromkeys(groups, 0)
         self.outcomes = {group: [] for group in groups}
         self.log = []
-        self._cancel_requested = False
+        self.cancelled = False
         self.last_event = None
         self.task = None
         self._subscribers = set()
 
-    @property
-    def cancelled(self):
-        """Cancel was requested, or the interpreter is exiting (#376): every
-        check a job already makes between files also stops it at exit."""
-        return self._cancel_requested or exit_signal.requested()
-
-    @cancelled.setter
-    def cancelled(self, value):
-        self._cancel_requested = bool(value)
-
     @property
     def record_changing(self):
         return self.admission == "records"
@@ -434,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,
@@ -664,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/log_cleanup.py

@@ -1,207 +0,0 @@
-"""Reviewed rotated-log cleanup as a maintenance plan (#329 System S12).
-
-``POST /prompt_manager/maintenance/preview {operation: "rotated_logs",
-options: {}}`` lists the rotated copies of the active log that Rule R allows
-(``utils/logging_config.py``: ``prompt_manager.log.<n>`` regular files that
-are not links, directly in the log folder) and writes nothing. The plan keeps
-each copy's name, size, ``mtime_ns`` and inode under its token; the response
-is the maintenance ``Plan`` shape with basenames only, a ``none`` backup
-policy (no library record changes) and no ``disk`` key.
-
-``POST /prompt_manager/maintenance/apply {token}`` starts a ``maintenance``
-job titled "Rotated log copies" with admission ``read``: it may run beside a
-scan and is refused only beside another maintenance job or an ``exclusive``
-one. The job deletes exactly the reviewed copies under the logger's files
-lock and the file handler's lock, or nothing, failing ``plan-changed``, when
-any of them is missing, is no longer a rotated copy or differs in size,
-``mtime_ns`` or inode. A copy that cannot be deleted (open in another program
-on Windows) is an ``errors`` row; the others are deleted.
-"""
-
-import datetime
-import json
-
-from aiohttp import web
-
-try:
-    from ...utils.logging_config import RotatedChanged, rotated_sort_key
-except ImportError:  # loaded as the top-level ``py`` package (tests)
-    from utils.logging_config import RotatedChanged, rotated_sort_key
-
-from .jobs import MAINTENANCE_JOB_KIND
-from .maintenance_plans import ScopeTooLarge
-
-ROTATED_LOGS = "rotated_logs"
-LOG_CLEANUP_TITLE = "Rotated log copies"
-LOGS_CHANGED = (
-    "The log files changed since the review; nothing was deleted. Review again."
-)
-LOG_CLEANUP_FAILED = "The log cleanup failed."
-TOO_MANY_LOG_FILES = "Too many log files to review at once."
-LOG_CLEANUP_MEDIA = (
-    "Deletes only the listed log files. No image, video or library record changes."
-)
-_GROUPS = ("changed", "protected", "errors")
-
-
-def size_label(size):
-    """``1000 bytes``, ``2.0 KB``, ``10.0 MB`` or ``1.2 GB`` (1 KB = 1024 bytes)."""
-    size = max(0, int(size or 0))
-    if size < 1024:
-        return f"{size} {'byte' if size == 1 else 'bytes'}"
-    for unit, scale in (("KB", 2**10), ("MB", 2**20)):
-        if size < scale * 1024:
-            return f"{size / scale:.1f} {unit}"
-    return f"{size / 2**30:.1f} GB"
-
-
-def time_label(mtime_ns):
-    """The local modification time as ``YYYY-MM-DD HH:MM``."""
-    try:
-        moment = datetime.datetime.fromtimestamp(mtime_ns / 1e9)
-    except (OSError, OverflowError, ValueError):  # a time before 1970 on Windows
-        return "unknown time"
-    return moment.strftime("%Y-%m-%d %H:%M")
-
-
-def _count(count, singular, plural):
-    return f"{count} {singular if count == 1 else plural}"
-
-
-def _protected_reasons(rows):
-    """The plan's Protected reasons: what the cleanup keeps, zero counts left out."""
-    active = sum(1 for row in rows if row["kind"] == "active")
-    links = sum(1 for row in rows if row["kind"] == "link")
-    other = sum(1 for row in rows if row["kind"] == "other")
-    reasons = []
-    if active:
-        reasons.append("Kept: the active log")
-    if links:
-        reasons.append(f"Kept: {_count(links, 'link', 'links')}")
-    if other:
-        reasons.append(f"Kept: {_count(other, 'other file', 'other files')}")
-    return active + links + other, reasons
-
-
-def _scope_label(files):
-    if not files:
-        return "No rotated log copies"
-    total = sum(row["size"] for row in files)
-    return (
-        f"{_count(len(files), 'rotated log copy', 'rotated log copies')}"
-        f" · {size_label(total)}"
-    )
-
-
-class LogCleanupMixin:
-    """The ``rotated_logs`` maintenance plan and its job.
-
-    The logger manager is reached only through ``_get_logger_manager``
-    (``logging_routes.py``), so the tests can point it at a temporary folder.
-    """
-
-    async def preview_log_cleanup(self):
-        """The ``rotated_logs`` plan (runs inside the preview's lease)."""
-        from . import maintenance
-
-        manager = self._get_logger_manager()
-        try:
-            rows = await self._run_in_executor(manager.scan_log_folder)
-        except Exception:
-            self.logger.exception("Rotated log review failed")
-            return maintenance._failure("Failed to review maintenance", 500)
-        rotated = sorted(
-            (row for row in rows if row["kind"] == "rotated"),
-            key=rotated_sort_key,
-        )
-        files = [
-            {
-                "name": row["name"],
-                "size": row["size"],
-                "mtime_ns": row["mtime_ns"],
-                "ino": row["ino"],
-            }
-            for row in rotated
-        ]
-        protected, reasons = _protected_reasons(rows)
-        store = self._maintenance_plans
-        try:
-            token = store.issue(
-                ROTATED_LOGS,
-                json.dumps(files, sort_keys=True),
-                {"files": files, "protected": protected},
-                (),
-            )
-        except ScopeTooLarge:
-            return maintenance._failure(TOO_MANY_LOG_FILES, 413, "too-large")
-        plan = store.peek(token, ROTATED_LOGS)
-        return web.json_response(
-            {
-                "success": True,
-                "token": token,
-                "operation": ROTATED_LOGS,
-                "expires_at": maintenance._iso(plan.expires_at),
-                "scope": {"count": len(files), "label": _scope_label(files)},
-                "protected": {"count": protected, "reasons": reasons},
-                "backup": {
-                    "policy": "none",
-                    "destination_label": None,
-                    "expected_bytes": None,
-                },
-                "media": {"deletes_files": True, "label": LOG_CLEANUP_MEDIA},
-                "details": [
-                    {
-                        "label": row["name"],
-                        "detail": (
-                            f"{size_label(row['size'])} · {time_label(row['mtime_ns'])}"
-                        ),
-                    }
-                    for row in files
-                ],
-            },
-            headers={"Cache-Control": "no-store"},
-        )
-
-    def _start_log_cleanup(self, plan):
-        """Register the cleanup job (on the loop); raises JobBusy when refused."""
-        return self._jobs.start(
-            MAINTENANCE_JOB_KIND,
-            LOG_CLEANUP_TITLE,
-            admission="read",
-            cancellable=False,
-            scope={"operation": ROTATED_LOGS},
-            groups=_GROUPS,
-            runner=lambda job: self._run_log_cleanup(job, plan),
-        )
-
-    async def _run_log_cleanup(self, job, plan):
-        from . import maintenance
-
-        files = plan.payload["files"]
-        sizes = {row["name"]: row["size"] for row in files}
-        job.update(total=len(files), status_line="Deleting rotated log copies")
-        manager = self._get_logger_manager()
-        try:
-            result = await self._run_in_executor(manager.delete_rotated, files)
-        except RotatedChanged:
-            return maintenance._fail_job(job, "plan-changed", LOGS_CHANGED)
-        except Exception:
-            self.logger.exception("Rotated log cleanup failed")
-            return maintenance._fail_job(job, None, LOG_CLEANUP_FAILED)
-        for name in result["removed"]:
-            detail = f"Deleted · {size_label(sizes.get(name, 0))}"
-            job.record(
-                "changed", {"path": name, "detail": detail}, f"- {name} · {detail}"
-            )
-        for name, error in result["failed"]:
-            detail = self._public_error(error)
-            job.record(
-                "errors", {"path": name, "detail": detail}, f"! {name} · {detail}"
-            )
-        job.record_counted("protected", plan.payload["protected"])
-        removed, failed = len(result["removed"]), len(result["failed"])
-        line = f"Deleted {_count(removed, 'rotated log copy', 'rotated log copies')}"
-        if failed:
-            line += f", {failed} could not be deleted"
-        job.log_line(line)
-        job.update(processed=len(files), progress=100, status_line=line)

py/api/logging_routes.py

@@ -1,21 +1,9 @@
-"""Logging API routes for PromptManager.
-
-Every route that names a log file goes through Rule R (#329,
-``utils/logging_config.py``): a download is served only for a regular,
-non-link file listed directly in the log folder, and Clear deletes only
-rotated copies. File work runs off the event loop.
-"""
+"""Logging API routes for PromptManager."""
 
 import os
-import stat
 
 from aiohttp import web
 
-try:
-    from ...utils.logging_config import ClearRefused, parse_confirmed
-except ImportError:  # loaded as the top-level ``py`` package (tests)
-    from utils.logging_config import ClearRefused, parse_confirmed
-
 # Keys PromptManagerLogger.update_config() understands. Anything else is
 # rejected so a client cannot inject arbitrary entries into the logging config.
 LOG_CONFIG_KEYS = frozenset(
@@ -97,41 +85,6 @@ def _validate_log_config(data):
     return clean, None
 
 
-def _read_log_bytes(path):
-    """The whole file at ``path``, opened without following a link (blocking).
-
-    The file is checked again through the open handle: a regular file with
-    one name and, when ``path`` carries it, the inode it was listed with. A
-    name swapped for a link or another file after it was listed, or a hard
-    link to a file elsewhere, is refused as missing. The handle is closed
-    before this returns.
-    """
-    flags = os.O_RDONLY | getattr(os, "O_BINARY", 0) | getattr(os, "O_NOFOLLOW", 0)
-    # A FIFO swapped in after the listing must not block the executor thread.
-    flags |= getattr(os, "O_NONBLOCK", 0)
-    try:
-        fd = os.open(str(path), flags)
-    except OSError as error:
-        if getattr(os, "O_NOFOLLOW", 0) and os.path.islink(str(path)):
-            raise FileNotFoundError("Log file not found") from error
-        raise
-    listed_ino = getattr(path, "listed_ino", 0)
-    with os.fdopen(fd, "rb") as handle:
-        opened = os.fstat(handle.fileno())
-        if (
-            not stat.S_ISREG(opened.st_mode)
-            or opened.st_nlink > 1  # a hard link to a file elsewhere
-            or (listed_ino and opened.st_ino and opened.st_ino != listed_ino)
-        ):
-            raise FileNotFoundError("Log file not found")
-        return handle.read()
-
-
-def _download(logger_manager, filename):
-    """``bytes`` of a downloadable log file; FileNotFoundError otherwise."""
-    return _read_log_bytes(logger_manager.log_file_entry(filename))
-
-
 class LoggingRoutesMixin:
     """Mixin providing logging-related API endpoints."""
 
@@ -242,16 +195,16 @@ class LoggingRoutesMixin:
                     {"success": False, "error": "Invalid filename"}, status=400
                 )
 
-            try:
-                file_content = await self._run_in_executor(
-                    _download, logger_manager, filename
-                )
-            except FileNotFoundError:
-                # Missing, a link, a folder or not listed: all read as absent.
+            log_file_path = logger_manager.log_dir / filename
+
+            if not log_file_path.exists():
                 return web.json_response(
                     {"success": False, "error": "Log file not found"}, status=404
                 )
 
+            with open(log_file_path, "rb") as f:
+                file_content = f.read()
+
             return web.Response(
                 body=file_content,
                 content_type="text/plain",
@@ -268,43 +221,10 @@ class LoggingRoutesMixin:
             )
 
     async def truncate_logs(self, request):
-        """Clear all logs: what ``{"expected": [...]}`` lists, or all (#389).
-
-        ``expected`` holds the ``{name, identity}`` rows of ``/logs/files`` the
-        confirmation showed. Without a body (the legacy admin page, whose
-        confirmation lists nothing) every rotated copy present now is deleted.
-        A malformed list is 400; a clear that would empty or delete what was
-        not confirmed changes nothing and is 409 with the reason's ``code``.
-        """
+        """Truncate all log files."""
         try:
-            args = ()
-            if request.can_read_body:
-                data, error_response = await self._read_json_body(request)
-                if error_response is not None:
-                    return error_response
-                if "expected" in data:
-                    try:
-                        parse_confirmed(data["expected"])
-                    except ValueError:
-                        return web.json_response(
-                            {
-                                "success": False,
-                                "error": "expected must list name and identity"
-                                " rows from /logs/files",
-                            },
-                            status=400,
-                        )
-                    args = (data["expected"],)
             logger_manager = self._get_logger_manager()
-            try:
-                results = await self._run_in_executor(
-                    logger_manager.truncate_logs, *args
-                )
-            except ClearRefused as refused:
-                return web.json_response(
-                    {"success": False, "error": str(refused), "code": refused.code},
-                    status=409,
-                )
+            results = logger_manager.truncate_logs()
 
             return web.json_response(
                 {
@@ -346,7 +266,7 @@ class LoggingRoutesMixin:
                 return web.json_response({"success": False, "error": error}, status=400)
 
             logger_manager = self._get_logger_manager()
-            await self._run_in_executor(logger_manager.update_config, clean)
+            logger_manager.update_config(clean)
 
             return web.json_response(
                 {

py/api/lora_import_routes.py

@@ -1,520 +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.
-
-        Then the image routes' layout cache is dropped (#362): the import may
-        have linked files under a folder LoraManager created after the cache
-        stored its layout (its first example-image download creates one).
-        """
-        result = await self._run_in_executor(
-            lambda: db.replace_category_prompts(
-                CATEGORY,
-                staged.records,
-                expected_ids=expected_ids,
-                allow_empty=allow_empty,
-            )
-        )
-        lora_utils.clear_layout_cache()
-        return result
-
-    # ── 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

@@ -2,9 +2,7 @@
 
 ``POST /prompt_manager/maintenance/preview {operation, options:{}}`` reviews
 one operation (``duplicate_prompts``, ``optimize``, ``unused_components`` or
-``missing_links``; ``database/maintenance.py``; ``duplicate_files``,
-``py/api/duplicate_files.py``; ``rotated_logs``, the rotated log copies,
-``py/api/log_cleanup.py``, which has its own apply job) off the event loop and
+``missing_links``; ``database/maintenance.py``) off the event loop and
 answers a ``Plan``: ``{success, token, operation, expires_at, scope:{count,
 label}, protected:{count, reasons}, backup:{policy, destination_label},
 media:{deletes_files, label}, details:[≤50 {label, detail}]}``. The preview
@@ -39,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).
 """
@@ -50,44 +47,31 @@ import json
 import os
 import shutil
 import sqlite3
+import tempfile
+from contextlib import closing
 
 from aiohttp import web
 
 from .admin import _prune_safety_backups, _scan_location, _scan_roots
 from .job_routes import busy_response
 from .jobs import MAINTENANCE_JOB_KIND, JobBusy
-from .log_cleanup import ROTATED_LOGS
 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"
 WORKFLOW_STORAGE = "workflow_storage"  # applied by py/api/workflow_storage.py
-# rotated_logs (#329, py/api/log_cleanup.py) reviews log files, not records.
-PREVIEW_OPERATIONS = MAINTENANCE_OPERATIONS + (DUPLICATE_FILES, ROTATED_LOGS)
+PREVIEW_OPERATIONS = MAINTENANCE_OPERATIONS + (DUPLICATE_FILES,)
 # Room left over beyond what a step writes, so a disk is never filled to 0.
 DISK_MARGIN_BYTES = 16 * 2**20
 # The concept's Maintenance row titles, which name each operation's job.
@@ -111,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):
@@ -121,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
 
@@ -243,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)
 
 
@@ -294,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):
@@ -363,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"),
@@ -395,8 +522,6 @@ class MaintenanceRoutesMixin:
             return await self.preview_duplicate_files(options)
         if not isinstance(options, dict) or options:
             return _invalid(f"{operation} takes no options")
-        if operation == ROTATED_LOGS:
-            return await self.preview_log_cleanup()
         db = self.db
         identity = self._database_identity(db)
         try:
@@ -498,17 +623,6 @@ class MaintenanceRoutesMixin:
         if refused is not None:
             return refused
         store = self._maintenance_plans
-        if plan.operation == ROTATED_LOGS:
-            # Log files only: no database identity, backup or disk check.
-            try:
-                job = self._start_log_cleanup(plan)
-            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.
-            store.consume(token, plan.operation, job_id=job.id)
-            return web.json_response(
-                {"success": True, "job": job.summary()}, status=202
-            )
         db = self.db
         if plan.db_identity != self._database_identity(db):
             store.discard(token)
@@ -530,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")
@@ -696,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/media_target.py

@@ -1,54 +0,0 @@
-"""The listing identity of one media file, as a request names it.
-
-Shared by the image-annotation routes and the collection routes (#331): a
-target is ``{root_index, root_scope, path}``, checked here without touching
-the filesystem or the database. The scope is compared with the current roots
-by the caller.
-"""
-
-import os
-import re
-
-from .images import _forbidden, _has_traversal
-from .prompts import bad_request
-
-try:
-    from ...utils.media_capture import CAPTURE_EXTENSIONS
-except ImportError:
-    from utils.media_capture import CAPTURE_EXTENSIONS
-
-MAX_TARGET_PATH = 1024
-TARGET_FIELDS = frozenset({"root_index", "root_scope", "path"})
-_HEX64 = re.compile(r"[0-9a-f]{64}")
-TAGGING_MEDIA_MESSAGE = "Only media files can be tagged"
-
-
-def media_target(data: object, *, media_message: str = TAGGING_MEDIA_MESSAGE):
-    """``((index, scope, relative), None)`` for a target, else ``(None, error)``.
-
-    Only the listing identity is accepted: an int root index, the root's
-    64-hex scope and a bounded root-relative POSIX media path, never an
-    absolute, drive-qualified, backslash or ``..`` path (a 400 for a malformed
-    shape, a 403 for an unsafe or non-media path, carrying *media_message*).
-    """
-    if not isinstance(data, dict) or set(data) != TARGET_FIELDS:
-        return None, bad_request("target must name root_index, root_scope and path")
-    index, scope, relative = data["root_index"], data["root_scope"], data["path"]
-    if type(index) is not int or index < 0:
-        return None, bad_request("Invalid gallery root")
-    if not isinstance(scope, str) or _HEX64.fullmatch(scope) is None:
-        return None, bad_request("Invalid gallery root scope")
-    if not isinstance(relative, str) or not relative or len(relative) > MAX_TARGET_PATH:
-        return None, bad_request("path must be a relative media path")
-    parts = relative.split("/")
-    if (
-        "\0" in relative
-        or "\\" in relative
-        or relative.startswith("/")
-        or _has_traversal(relative)
-        or any(part in ("", ".", "..") or ":" in part for part in parts)
-    ):
-        return None, _forbidden()
-    if os.path.splitext(parts[-1])[1].lower() not in CAPTURE_EXTENSIONS:
-        return None, _forbidden(media_message)
-    return (index, scope, relative), None

py/api/prompts.py

@@ -1178,8 +1178,6 @@ class PromptRoutesMixin:
                 return web.json_response(
                     {"success": False, "error": "Expected a JSON object"}, status=400
                 )
-            if "images_filter" in data:
-                return await self._bulk_category_by_filter(data)
             if not data.get("prompt_ids"):
                 return web.json_response(
                     {"success": False, "error": "No prompt IDs provided"}, status=400
@@ -1216,66 +1214,6 @@ class PromptRoutesMixin:
                 status=500,
             )
 
-    async def _bulk_category_by_filter(self, data: dict) -> web.Response:
-        """Set the category on every linked positive a listing filter admits.
-
-        #392 "Select all N matching": ``{images_filter, category}``, the filter
-        being the Images listing's own query (parse_listing_filter), resolved
-        now. The answer adds ``prompt_count`` (the distinct linked positives)
-        and ``skipped`` (matching images without one); none linked changes
-        nothing.
-        """
-        from .images import (
-            MAX_LISTING_SELECTION,
-            ListingSourceChanged,
-            parse_listing_filter,
-        )
-
-        def refused(message, **extra):
-            return web.json_response(
-                {"success": False, "error": message, **extra}, status=400
-            )
-
-        if set(data) != {"images_filter", "category"}:
-            return refused("Request must contain exactly category, images_filter")
-        category = data["category"]
-        try:
-            params = parse_listing_filter(data["images_filter"])
-            validate_category(category)
-            selection = await self.resolve_listing_filter(params)
-        except ListingSourceChanged:
-            return web.json_response(
-                {
-                    "success": False,
-                    "code": "source-changed",
-                    "error": "The source changed. Refresh the image collection.",
-                },
-                status=409,
-            )
-        except ValueError as exc:
-            return refused(str(exc))
-        if selection.truncated:
-            return refused(
-                f"Narrow the view to at most {MAX_LISTING_SELECTION:,} images.",
-                code="too-many-images",
-            )
-        category = (category or "").strip()
-        ids = selection.positive_ids
-        updated = (
-            await self._run_in_executor(self.db.bulk_set_category, ids, category)
-            if ids
-            else 0
-        )
-        return web.json_response(
-            {
-                "success": True,
-                "message": f"Set category for {updated} prompts",
-                "updated_count": updated,
-                "prompt_count": len(ids),
-                "skipped": selection.unlinked,
-            }
-        )
-
     def _all_prompts_for_export(self):
         """Every prompt, fetched in EXPORT_PAGE_SIZE pages (blocking)."""
         prompts, offset = [], 0

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
@@ -677,14 +659,7 @@ def _verify_and_read(store, capture, item, root, need_metadata: bool):
     facts = store.verify(root, relative)
     captured = None
     if need_metadata:
-        # The file's own name, so an inspection item resolves anchored on its
-        # saver as it was recorded (#390).
-        captured = captured_review(
-            store,
-            capture,
-            item_profile(item["evidence"]),
-            relative.rsplit("/", 1)[-1],
-        )
+        captured = captured_review(store, capture, item_profile(item["evidence"]))
     return relative, facts, captured
 
 
@@ -730,9 +705,6 @@ def _candidate_still_offered(resolution: dict, choice: str) -> bool:
     that rewords the top-level reason or reorders candidates leaves a
     pending item applicable.
     """
-    if isinstance(resolution, dict) and resolution.get("anchor") == "saver":
-        # Only the saver anchor resolves the bytes (#390): its pair alone.
-        resolution = {"state": "ambiguous", "candidates": [resolution]}
     if not isinstance(resolution, dict) or resolution.get("state") != "ambiguous":
         return False
     evidence, _count, limited = review_evidence(resolution)

py/api/review_recording.py

@@ -88,8 +88,7 @@ class ReviewRecordingMixin:
     def _record_scanned_review(self, media_file, roots, review=None, scanned=None):
         """Record one ambiguous, unlinked scanned file (logged and counted).
 
-        ``scanned`` is the scan's ``(metadata, inspection_resolution)``; the
-        resolution is None when the scan did not run the inspection profile.
+        ``scanned`` is the scan's ``(metadata, inspection_resolution)``.
         """
         try:
             outcome = self._record_review_sync(
@@ -200,7 +199,7 @@ class ReviewRecordingMixin:
         key = _memory_key(locator)
         if state is not None and memory.get(key) == state:
             return None
-        resolution = review_capture.inspection_choice(canonical, media_file.name)
+        resolution = review_capture.inspection_choice(canonical)
         if resolution is not None:
             memory.pop(key, None)
             return canonical, resolution

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,26 +41,9 @@ _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 one tagging configuration (#328), published to AutotagConfig.
-    "AUTOTAG_MODEL_TYPE": ("autotag", "defaults", "model_type"),
-    "AUTOTAG_EXISTING": ("autotag", "defaults", "existing"),
-    "AUTOTAG_GENERAL_THRESHOLD": ("autotag", "defaults", "general_threshold"),
-    "AUTOTAG_CHARACTER_THRESHOLD": ("autotag", "defaults", "character_threshold"),
-    "AUTOTAG_TEMPLATE": ("autotag", "defaults", "template"),
-    "AUTOTAG_SUGGESTION_LIMIT": ("autotag", "defaults", "suggestion_limit"),
 }
-# 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"})
-# Attributes that live on AutotagConfig, named without the AUTOTAG_ prefix.
-_AUTOTAG_SETTINGS = frozenset(
-    name for name in _SETTINGS_FILE_KEYS if name.startswith("AUTOTAG_")
-)
-_AUTOTAG_PREFIX = "AUTOTAG_"
 SOURCE_CHANGE_JOB_KIND = "source_change"
 SOURCE_CHANGE_JOB_TITLE = "Source change"
 
@@ -163,63 +143,6 @@ def _set_nested(config, sections, key, value):
     config[sections[0]] = merged
 
 
-def _validate_autotag_settings(data):
-    """The ``autotag_*`` settings as ``{AUTOTAG_ATTR: value}``.
-
-    The first bad value raises ValueError with a message that names the
-    setting by its label in System › Auto-tagging.
-    """
-    from ..config import (
-        EXISTING_POLICIES,
-        MAX_SUGGESTION_LIMIT,
-        MODEL_TYPES,
-        validate_saved_threshold,
-        validate_template,
-    )
-
-    updates = {}
-    if "autotag_model_type" in data:
-        value = data["autotag_model_type"]
-        if not isinstance(value, str) or value not in MODEL_TYPES:
-            raise ValueError(
-                "Tagging model must be one of " + ", ".join(sorted(MODEL_TYPES)) + "."
-            )
-        updates["AUTOTAG_MODEL_TYPE"] = value
-    if "autotag_existing" in data:
-        value = data["autotag_existing"]
-        if not isinstance(value, str) or value not in EXISTING_POLICIES:
-            raise ValueError(
-                "Existing tags must be skip, merge or replace_after_review."
-            )
-        updates["AUTOTAG_EXISTING"] = value
-    for key, label in (
-        ("autotag_general_threshold", "General-tag confidence"),
-        ("autotag_character_threshold", "Character-tag confidence"),
-    ):
-        if key in data:
-            try:
-                value = validate_saved_threshold(label, data[key])
-            except ValueError as error:
-                raise ValueError(f"{error}.") from None
-            updates[key.upper()] = value
-    if "autotag_template" in data:
-        try:
-            updates["AUTOTAG_TEMPLATE"] = validate_template(
-                data["autotag_template"], "LLM tag template"
-            )
-        except ValueError as error:
-            raise ValueError(f"{error}.") from None
-    if "autotag_suggestion_limit" in data:
-        value = data["autotag_suggestion_limit"]
-        if type(value) is not int or not 1 <= value <= MAX_SUGGESTION_LIMIT:
-            raise ValueError(
-                "Suggestions per image must be a whole number from 1 to "
-                f"{MAX_SUGGESTION_LIMIT}."
-            )
-        updates["AUTOTAG_SUGGESTION_LIMIT"] = value
-    return updates
-
-
 async def _read_json(request):
     """Parse a JSON object body through the package's capped reader."""
     from . import _read_json_body
@@ -246,22 +169,19 @@ class SettingsRoutesMixin:
     async def get_settings(self, request):
         """Get current settings."""
         try:
-            from ..config import AutotagConfig, PromptManagerConfig, GalleryConfig
+            from ..config import PromptManagerConfig, GalleryConfig
 
             root_paths = [
                 self._public_path(d) for d in GalleryConfig.MONITORING_DIRECTORIES
             ]
             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,
@@ -269,17 +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,
-                        "autotag_model_type": AutotagConfig.MODEL_TYPE,
-                        "autotag_existing": AutotagConfig.EXISTING,
-                        "autotag_general_threshold": AutotagConfig.GENERAL_THRESHOLD,
-                        "autotag_character_threshold": (
-                            AutotagConfig.CHARACTER_THRESHOLD
-                        ),
-                        "autotag_template": AutotagConfig.TEMPLATE,
-                        "autotag_suggestion_limit": AutotagConfig.SUGGESTION_LIMIT,
                         "cpu_count": PromptManagerConfig.max_worker_threads(),
                         "gallery_root_paths": root_paths,
                         "gallery_root_path": root_paths[0] if root_paths else "",
@@ -386,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(
@@ -466,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).
 
@@ -502,12 +364,7 @@ class SettingsRoutesMixin:
         """
         from ..config import GalleryConfig, PromptManagerConfig
 
-        from ..config import AutotagConfig
-
         for name, value in updates.items():
-            if name in _AUTOTAG_SETTINGS:
-                setattr(AutotagConfig, name[len(_AUTOTAG_PREFIX) :], value)
-                continue
             owner = GalleryConfig if name in _GALLERY_SETTINGS else PromptManagerConfig
             setattr(owner, name, value)
         restart_fields = []
@@ -634,19 +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"]
-            )
-        updates.update(_validate_autotag_settings(data))
         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,25 +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, note_refusal, refused_at_shutdown
+    from ...utils.parallel import map_parallel
 except ImportError:  # tests import the package top-level
-    from utils.parallel import map_parallel, note_refusal, refused_at_shutdown
+    from utils.parallel import map_parallel
 
-try:
-    from ...utils.exit_signal import ExitRequested
-except ImportError:  # tests import the package top-level
-    from utils.exit_signal import ExitRequested
-
-# 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.
@@ -156,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()
 
@@ -181,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
     )
 
 
@@ -194,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)
@@ -232,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)
@@ -250,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"
@@ -415,8 +389,7 @@ class AutoThumbnailer:
 
     def enqueue(self, src, dst, is_video):
         """Queue *dst*'s preview for the worker; False when already queued,
-        full, closed or its worker is refused at interpreter exit. Never
-        blocks on a write."""
+        full or closed. Never blocks on a write."""
         key = _dst_key(dst)
         with self._changed:
             if self._closed or key in self._queued:
@@ -426,47 +399,34 @@ class AutoThumbnailer:
             self._queued.add(key)
             self._queue.append((key, Path(src), Path(dst), bool(is_video)))
             self._busy = True
-            started = True
             if self._start_worker and not self._worker_running:
-                started = self._start_worker_locked()
-            if not started:
-                # Refused at interpreter exit: no worker will take it (#375).
-                self._queue.pop()
-                self._queued.discard(key)
+                self._start_worker_locked()
             self._changed.notify_all()
-        return started
+        return True
 
     def _start_worker_locked(self):
-        """Start the worker (lock held); False only when the interpreter is
-        exiting (#375: logged once at DEBUG, the caller drops the file).
-        Another start failure leaves the file queued and the next enqueue
-        tries again."""
+        """Start the worker (lock held). A start that fails leaves the file
+        queued and the next enqueue tries again."""
         worker = threading.Thread(target=self._run, name=WORKER_NAME, daemon=True)
         worker.pm_preview_token = _MODULE_TOKEN
         worker.pm_preview_close = self.close
         self._worker_running = True
         try:
             worker.start()
-        except RuntimeError as error:
+        except RuntimeError:
             self._worker_running = False
             self._busy = False
-            if refused_at_shutdown(error):
-                note_refusal(self._logger, "The automatic preview worker")
-                return False
             self._logger.warning(
                 "The automatic preview worker could not start; the next output "
                 "tries again",
                 exc_info=True,
             )
-            return True
+            return
         self._worker = worker
-        return True
 
     def _run(self):
         try:
             self._drain()
-        except ExitRequested:
-            pass  # #376: the interpreter is exiting; queued files are dropped
         except Exception:
             self._logger.warning("The automatic preview worker stopped", exc_info=True)
         finally:
@@ -507,16 +467,10 @@ class AutoThumbnailer:
                 f"Automatic preview failed for {src.name}", exc_info=True
             )
 
-    def close(self, timeout=None):
+    def close(self):
         """Stop the worker at its next file boundary (queued files are
-        dropped), kill a running ffmpeg and wait up to ``timeout`` seconds
-        (None: CLOSE_WAIT_SECONDS, read now); a worker still running after
-        that is logged.
-
-        Returns True when there was no worker or it ended; False when it is
-        still running, or when called on the worker itself (it only signals).
-        """
-        wait = CLOSE_WAIT_SECONDS if timeout is None else timeout
+        dropped), kill a running ffmpeg and wait up to CLOSE_WAIT_SECONDS;
+        a worker still running after that is logged."""
         with self._changed:
             self._closed = True
             self._queue.clear()
@@ -529,18 +483,14 @@ class AutoThumbnailer:
                 process.kill()
             except OSError:
                 pass
-        if worker is None:
-            return True
-        if worker is threading.current_thread():
-            return False
-        worker.join(wait)
+        if worker is None or worker is threading.current_thread():
+            return
+        worker.join(CLOSE_WAIT_SECONDS)
         if worker.is_alive():
             self._logger.warning(
                 "The automatic preview worker is still running after "
-                f"{wait} s; it stops at its next file"
+                f"{CLOSE_WAIT_SECONDS} s; it stops at its next file"
             )
-            return False
-        return True
 
     # ── waits (tests and shutdown; never timers) ──────────────────────
 
@@ -638,19 +588,12 @@ class AutoThumbnailMixin:
                 )
             return self._auto_thumbnailer
 
-    def refuse_auto_thumbnails(self):
-        """Refuse every later capture without stopping the worker yet (the
-        package teardown, before ``close_auto_thumbnails(final=True)``)."""
-        with AutoThumbnailMixin._auto_thumbnailer_lock:
-            self._auto_thumbnails_shut = True
-
-    def close_auto_thumbnails(self, final=False, timeout=None):
+    def close_auto_thumbnails(self, final=False):
         """Stop the capture worker and the view pool, and forget them.
 
-        Bounded by ``timeout`` (see AutoThumbnailer.close). ``final`` (the
-        package teardown) also keeps a late monitor event from starting a
-        worker again; a test reset passes False and the next use starts
-        fresh ones. Returns True when no capture worker is left running.
+        Bounded (see AutoThumbnailer.close). ``final`` (the app's cleanup)
+        also keeps a late monitor event from starting a worker again; a
+        test reset passes False and the next use starts fresh ones.
         """
         with AutoThumbnailMixin._auto_thumbnailer_lock:
             if final:
@@ -658,14 +601,10 @@ class AutoThumbnailMixin:
             thumbnailer, self._auto_thumbnailer = self._auto_thumbnailer, None
             pool, self._preview_pool_obj = self._preview_pool_obj, None
             self._preview_gate_obj = None
-        closed = True
         if thumbnailer is not None:
-            closed = thumbnailer.close(timeout)
+            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
-        return closed
 
     def _auto_thumbnail_failures(self):
         thumbnailer = self._auto_thumbnailer
@@ -675,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,
@@ -790,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(
@@ -809,8 +749,8 @@ class AutoThumbnailMixin:
 
         Returns ``queued``, ``fresh`` (its preview is current) or ``skipped``
         (not a media file under a current root, a link, a preview itself,
-        already queued, after the app's cleanup, or when its worker is refused
-        at interpreter exit). Never writes on the caller's thread.
+        already queued, or after the app's cleanup). Never writes on the
+        caller's thread.
         """
         if self._auto_thumbnails_shut:
             return "skipped"
@@ -867,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/autotag.py

@@ -7,7 +7,6 @@ Refactored from standalone_tagger.py for integration with PromptManager API.
 
 import errno
 import gc
-import inspect
 import os
 import sys
 from pathlib import Path
@@ -26,71 +25,6 @@ except ImportError:
     from database.annotations import MAX_IMAGE_TAGS
     from database.vocabulary import validate_vocabulary_tag_name
 
-# The tag template and thresholds live with the saved tagging defaults
-# (#328), so config.py never imports PIL.
-try:
-    from .tagging_defaults import DEFAULT_TAG_TEMPLATE
-except ImportError:
-    from py.tagging_defaults import DEFAULT_TAG_TEMPLATE
-
-try:
-    from ..utils import exit_signal
-except ImportError:
-    from utils import exit_signal
-
-
-def abort_hub_downloads() -> None:
-    """Abort huggingface_hub's Xet transfers (run by the exit hook, #376).
-
-    Xet downloads report progress from native code, which ignores an
-    exception raised in ``tqdm.update``; huggingface_hub aborts them itself
-    on Ctrl+C with ``abort_xet_session``. Nothing happens when
-    huggingface_hub was never imported or has no Xet support.
-    """
-    if "huggingface_hub" not in sys.modules:
-        return
-    try:
-        from huggingface_hub.utils import _xet
-    except ImportError:
-        return
-    abort = getattr(_xet, "abort_xet_session", None)
-    if callable(abort):
-        abort()
-
-
-def _stop_at_exit(download) -> Dict[str, Any]:
-    """Keyword arguments that stop a huggingface_hub download at its next
-    chunk once the interpreter is exiting (#376), or none when this
-    huggingface_hub does not take ``tqdm_class``.
-
-    huggingface_hub 1.x removes its partial temp file on any failure; older
-    versions keep their resumable ``.incomplete`` file. The model's own path
-    is only written by the final rename either way.
-    """
-    try:
-        if "tqdm_class" not in inspect.signature(download).parameters:
-            return {}
-        from huggingface_hub.utils import tqdm as hub_tqdm
-    except (ImportError, TypeError, ValueError):
-        return {}
-
-    class StopAtExit(hub_tqdm):
-        def update(self, n=1):
-            exit_signal.checkpoint()
-            return super().update(n)
-
-    return {"tqdm_class": StopAtExit}
-
-
-def _autotag_config():
-    """The saved defaults; imported late, as config needs ComfyUI's server."""
-    try:
-        from .config import AutotagConfig
-    except ImportError:
-        from py.config import AutotagConfig
-    return AutotagConfig
-
-
 # Try to import logging from utils, fallback to standard logging
 try:
     from ..utils.logging_config import get_logger
@@ -111,12 +45,10 @@ except ImportError:
         return logger
 
 
-# Model configurations - same as standalone_tagger.py. ``label`` is the short
-# name System, Activity and a 409 model-busy show (#328).
+# Model configurations - same as standalone_tagger.py
 MODELS = {
     "gguf": {
         "name": "GGUF (Recommended)",
-        "label": "GGUF JoyCaption",
         "description": "Quantized model, ~4.5GB, faster loading",
         "size": "~4.5GB",
         "repo": "mradermacher/llama-joycaption-beta-one-hf-llava-GGUF",
@@ -127,7 +59,6 @@ MODELS = {
     },
     "hf": {
         "name": "HuggingFace",
-        "label": "HuggingFace JoyCaption",
         "description": "Full precision model, ~16GB, higher quality",
         "size": "~16GB",
         "repo": "fancyfeast/llama-joycaption-beta-one-hf-llava",
@@ -135,7 +66,6 @@ MODELS = {
     },
     "wd14-swinv2": {
         "name": "WD14 SwinV2",
-        "label": "WD14 SwinV2",
         "description": "Fast classifier tagger, ~400MB, no prompt needed",
         "size": "~400MB",
         "repo": "SmilingWolf/wd-swinv2-tagger-v3",
@@ -145,7 +75,6 @@ MODELS = {
     },
     "wd14-vit": {
         "name": "WD14 ViT",
-        "label": "WD14 ViT",
         "description": "Fast classifier tagger, ~400MB, ViT architecture",
         "size": "~400MB",
         "repo": "SmilingWolf/wd-vit-tagger-v3",
@@ -156,7 +85,17 @@ MODELS = {
 }
 
 # Default prompts
-DEFAULT_PROMPT = DEFAULT_TAG_TEMPLATE
+DEFAULT_PROMPT = (
+    "Generate only comma-separated Danbooru tags (lowercase_underscores, no spaces).\n"
+    "Include: subject_count (1girl/1boy/etc), gender, ethnicity (asian, caucasian, "
+    "etc), age_approx (teen, young_woman), body_attributes, face_features, "
+    "hairstyle, appearance, clothing, accessories, pose, expression, action, "
+    "camera_angle, camera_shot, scene_composition (wide_shot, long_shot, "
+    "dutch_angle), environment, background_elements, lighting, mood.\n"
+    "Prioritize visual accuracy.\n"
+    "No sentences, no commentary, no captions. Only tags. Keep length short but "
+    "descriptive."
+)
 
 # Upper bound of one suggestion request: the image tag set cap.
 MAX_SUGGESTION_LIMIT = MAX_IMAGE_TAGS
@@ -240,6 +179,10 @@ class AutoTagService:
         self._current_model_type: Optional[str] = None
         self._custom_prompt: str = DEFAULT_PROMPT
 
+        # WD14 threshold defaults
+        self._wd14_general_threshold: float = 0.35
+        self._wd14_character_threshold: float = 0.85
+
     @property
     def models_config(self) -> Dict[str, Dict[str, Any]]:
         """Get the models configuration dictionary."""
@@ -262,13 +205,19 @@ class AutoTagService:
 
     @property
     def wd14_general_threshold(self) -> float:
-        """The saved General-tag confidence (``autotag.defaults``)."""
-        return _autotag_config().GENERAL_THRESHOLD
+        return self._wd14_general_threshold
+
+    @wd14_general_threshold.setter
+    def wd14_general_threshold(self, value: float):
+        self._wd14_general_threshold = max(0.0, min(1.0, value))
 
     @property
     def wd14_character_threshold(self) -> float:
-        """The saved Character-tag confidence (``autotag.defaults``)."""
-        return _autotag_config().CHARACTER_THRESHOLD
+        return self._wd14_character_threshold
+
+    @wd14_character_threshold.setter
+    def wd14_character_threshold(self, value: float):
+        self._wd14_character_threshold = max(0.0, min(1.0, value))
 
     def get_models_status(self) -> Dict[str, Dict[str, Any]]:
         """Get availability status for all model types.
@@ -446,7 +395,6 @@ class AutoTagService:
                     filename=filename,
                     local_dir=str(model_dir),
                     local_dir_use_symlinks=False,
-                    **_stop_at_exit(hf_hub_download),
                 )
 
         if progress_callback:
@@ -591,13 +539,6 @@ class AutoTagService:
             else:
                 return self._download_hf_model(progress_callback)
         except Exception as e:
-            if exit_signal.requested():
-                # ExitRequested between chunks, or the Xet session aborted
-                # by the exit hook (abort_hub_downloads).
-                self.logger.info(
-                    f"Model download stopped: ComfyUI is exiting ({model_type})"
-                )
-                return False
             self.logger.error(f"Download failed: {e}")
             if progress_callback:
                 progress_callback(f"Error: {str(e)}", 0)
@@ -627,7 +568,6 @@ class AutoTagService:
                 filename=config["filename"],
                 local_dir=str(gguf_dir),
                 local_dir_use_symlinks=False,
-                **_stop_at_exit(hf_hub_download),
             )
             self.logger.info("GGUF model downloaded")
 
@@ -645,7 +585,6 @@ class AutoTagService:
                 filename=config["mmproj_filename"],
                 local_dir=str(gguf_dir),
                 local_dir_use_symlinks=False,
-                **_stop_at_exit(hf_hub_download),
             )
             self.logger.info("mmproj downloaded")
 
@@ -672,7 +611,6 @@ class AutoTagService:
                 repo_id=config["repo"],
                 local_dir=str(model_dir),
                 local_dir_use_symlinks=False,
-                **_stop_at_exit(snapshot_download),
             )
             self.logger.info("HF model downloaded")
 
@@ -816,24 +754,6 @@ class AutoTagService:
 
             self.logger.info("Model unloaded, memory freed")
 
-    def wd14_device(self) -> str:
-        """``"gpu"`` when WD14 runs (or would run) on CUDA, else ``"cpu"``.
-
-        A loaded WD14 session answers from its own first provider; otherwise
-        ONNX Runtime's available providers say whether CUDA would be offered
-        (a session can still fall back to the processor). Loads no model.
-        """
-        tagger = self._tagger
-        if tagger is not None and tagger[0] == "wd14":
-            providers = tagger[1][0].get_providers()
-            return "gpu" if providers[:1] == ["CUDAExecutionProvider"] else "cpu"
-        try:
-            import onnxruntime as ort
-        except ImportError:
-            return "cpu"
-        available = ort.get_available_providers()
-        return "gpu" if "CUDAExecutionProvider" in available else "cpu"
-
     def is_model_loaded(self) -> bool:
         """Check if a model is currently loaded."""
         return self._tagger is not None
@@ -940,12 +860,12 @@ class AutoTagService:
             gen_thresh = (
                 general_threshold
                 if general_threshold is not None
-                else _autotag_config().GENERAL_THRESHOLD
+                else self._wd14_general_threshold
             )
             char_thresh = (
                 character_threshold
                 if character_threshold is not None
-                else _autotag_config().CHARACTER_THRESHOLD
+                else self._wd14_character_threshold
             )
             return self._generate_wd14(
                 session, tags_list, image, gen_thresh, char_thresh

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:
@@ -563,92 +568,18 @@ class IntegrationConfig:
 DEFAULT_SUGGESTION_LIMIT = 10
 MAX_SUGGESTION_LIMIT = 100  # pinned to MAX_IMAGE_TAGS by tests/test_config.py
 
-# The tagging engines, options, template and validators (server-free, #328).
-try:
-    from .tagging_defaults import (  # noqa: F401 - re-exported
-        DEFAULT_TAG_TEMPLATE,
-        EXISTING_POLICIES,
-        LLM_MODEL_TYPES,
-        MAX_INSTRUCTION_BYTES,
-        MAX_INSTRUCTION_CHARS,
-        MODEL_TYPES,
-        WD14_MODEL_TYPES,
-        validate_saved_threshold,
-        validate_template,
-        validate_threshold,
-    )
-except ImportError:
-    from py.tagging_defaults import (  # noqa: F401 - re-exported
-        DEFAULT_TAG_TEMPLATE,
-        EXISTING_POLICIES,
-        LLM_MODEL_TYPES,
-        MAX_INSTRUCTION_BYTES,
-        MAX_INSTRUCTION_CHARS,
-        MODEL_TYPES,
-        WD14_MODEL_TYPES,
-        validate_saved_threshold,
-        validate_template,
-        validate_threshold,
-    )
-
-
-def _valid_model_type(value: Any) -> str:
-    if not isinstance(value, str) or value not in MODEL_TYPES:
-        raise ValueError("must be one of " + ", ".join(sorted(MODEL_TYPES)))
-    return value
-
-
-def _valid_existing(value: Any) -> str:
-    if not isinstance(value, str) or value not in EXISTING_POLICIES:
-        raise ValueError("must be one of " + ", ".join(EXISTING_POLICIES))
-    return value
-
-
-def _valid_suggestion_limit(value: Any) -> int:
-    if type(value) is not int or not 1 <= value <= MAX_SUGGESTION_LIMIT:
-        raise ValueError(f"must be an integer from 1 to {MAX_SUGGESTION_LIMIT}")
-    return value
-
 
 class AutotagConfig:
     """Persisted tagging defaults under ``autotag.defaults`` in config.json.
 
-    One tagging configuration (#328): the model, what a batch does with
-    prompts already tagged, the two WD14 thresholds, the language-model
-    template and how many suggestions Generate returns. Each key is checked
-    alone on load; a hand-edited value that fails its check falls back to
-    its default with one warning rather than failing the load.
+    ``suggestion_limit`` is how many suggestions Generate returns (the top N
+    by score), an integer in ``1..MAX_SUGGESTION_LIMIT``. A hand-edited value
+    outside that range, or of another type, falls back to the default with a
+    warning rather than failing the load.
     """
 
-    MODEL_TYPE = "wd14-swinv2"
-    EXISTING = "skip"
-    GENERAL_THRESHOLD = 0.35
-    CHARACTER_THRESHOLD = 0.85
-    TEMPLATE = DEFAULT_TAG_TEMPLATE
     SUGGESTION_LIMIT = DEFAULT_SUGGESTION_LIMIT
 
-    # config.json key -> (attribute, validator, default)
-    _KEYS = {
-        "model_type": ("MODEL_TYPE", _valid_model_type, "wd14-swinv2"),
-        "existing": ("EXISTING", _valid_existing, "skip"),
-        "general_threshold": (
-            "GENERAL_THRESHOLD",
-            lambda v: validate_saved_threshold("value", v),
-            0.35,
-        ),
-        "character_threshold": (
-            "CHARACTER_THRESHOLD",
-            lambda v: validate_saved_threshold("value", v),
-            0.85,
-        ),
-        "template": ("TEMPLATE", validate_template, DEFAULT_TAG_TEMPLATE),
-        "suggestion_limit": (
-            "SUGGESTION_LIMIT",
-            _valid_suggestion_limit,
-            DEFAULT_SUGGESTION_LIMIT,
-        ),
-    }
-
     @classmethod
     def suggestion_limit(cls) -> int:
         return cls.SUGGESTION_LIMIT
@@ -661,14 +592,7 @@ class AutotagConfig:
 
     @classmethod
     def get_config(cls) -> Dict[str, Any]:
-        """The saved defaults; the template only when it is not the built-in
-        one, so a later built-in template still reaches who never set one."""
-        defaults = {
-            key: getattr(cls, attr) for key, (attr, _v, _d) in cls._KEYS.items()
-        }
-        if defaults["template"] == DEFAULT_TAG_TEMPLATE:
-            del defaults["template"]
-        return {"defaults": defaults}
+        return {"defaults": {"suggestion_limit": cls.SUGGESTION_LIMIT}}
 
     @classmethod
     def update_config(cls, new_config: Any) -> None:
@@ -679,18 +603,17 @@ class AutotagConfig:
         if not isinstance(defaults, dict):
             config_logger.warning("Ignoring autotag.defaults that is not an object")
             return
-        for key, (attr, validate, default) in cls._KEYS.items():
-            if key not in defaults:
-                continue
-            try:
-                setattr(cls, attr, validate(defaults[key]))
-            except ValueError as error:
-                config_logger.warning(
-                    f"autotag.defaults.{key} {error}; using {default!r}"
-                    if key != "template"
-                    else f"autotag.defaults.template {error}; using the built-in one"
-                )
-                setattr(cls, attr, default)
+        if "suggestion_limit" not in defaults:
+            return
+        value = defaults["suggestion_limit"]
+        if cls.valid_suggestion_limit(value):
+            cls.SUGGESTION_LIMIT = value
+            return
+        config_logger.warning(
+            "autotag.defaults.suggestion_limit must be an integer from 1 to "
+            f"{MAX_SUGGESTION_LIMIT}; using {DEFAULT_SUGGESTION_LIMIT}"
+        )
+        cls.SUGGESTION_LIMIT = DEFAULT_SUGGESTION_LIMIT
 
 
 class PromptManagerConfig:
@@ -746,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."""
@@ -811,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(),
@@ -961,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"])
@@ -974,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,229 +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 every scanned sidecar,
-   kept or skipped (path, size, modification time, kept or not, #362) 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 import exit_signal
-    from ..utils.hashing import generate_prompt_hash
-except ImportError:  # pragma: no cover - flat test imports
-    from utils import exit_signal
-    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 every scanned sidecar, kept or
-    skipped, with its path, size, modification time and whether it was kept
-    (#362). 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"))
-    kept = {str(sidecar.metadata_path) for sidecar in discovery.sidecars}
-    for path in discovery.scanned_files:
-        flag = 1 if str(path) in kept else 0
-        try:
-            stat = path.stat()
-            entry = f"{path}\0{stat.st_size}\0{stat.st_mtime_ns}\0{flag}\n"
-        except OSError:
-            entry = f"{path}\0missing\0{flag}\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, and so is the exit signal (#376: the legacy scan's
-    ``cancelled`` does not read it); either 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() or exit_signal.requested():
-            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_layout_cache.py

@@ -1,217 +0,0 @@
-"""A per-process cache of LoraManager's layout for the image hot paths (#362).
-
-Every Library list, prompt detail, inspect, reveal and serve request needs the
-LoRA allow-list (``ImagesMixin._lora_image_dirs``). Building it means finding
-the LoraManager install, reading its plugin settings file and its settings
-file, and resolving every folder. ``LayoutCache`` keeps the last result and
-reuses it while all of these hold:
-
-- the key (the configured install path, stripped) and the home folder the
-  folder guard compares against are the same;
-- the entry is younger than ``MAX_AGE_SECONDS`` (monotonic clock);
-- the plugin settings file and the settings file have the same signature
-  (``st_mtime_ns``, ``st_size``, or ``MISSING``) as when it was stored;
-- the install and every stored media root still resolve to themselves (a
-  folder swapped for a symlink reloads, so the folder guard runs again).
-
-A result is stored only when no watched file is "racy" (modified within
-``RACY_SECONDS`` of the load, git's rule for racily clean index entries),
-every watched file could be checked, the settings file was readable, and no
-``clear()`` ran during the load. What each rule covers: signatures catch a
-settings change on the next request; the racy rule catches a write during the
-load, a half-written file and coarse timestamps; the maximum age bounds the
-inputs no signature sees (``extra_model_paths.yaml``, environment, temporary
-failures); ``clear()`` makes a finished import's new folders servable at once.
-
-Hits and loads take no lock: a slow ``os.stat`` on a network share holds up
-only its own request, and two threads that miss together both load (both
-loads only read). A short lock guards the compare-and-store and the logging
-state; no file I/O runs under it. Standard library only, so it is tested
-without ComfyUI or LoraManager.
-"""
-
-import logging
-import os
-import threading
-import time
-from dataclasses import dataclass
-from pathlib import Path
-from typing import Callable, Optional, Tuple
-
-from .lora_manager_layout import UNREADABLE, LoraManagerLayout, _canonical
-
-# A watched file modified this recently is not trusted: LoraManager writes its
-# settings in place, and FAT/exFAT store modification times in 2 s steps.
-RACY_SECONDS = 3
-# Bounds what no signature sees (unwatched inputs, temporary failures).
-MAX_AGE_SECONDS = 30
-
-# The signature of a watched file that does not exist (a valid state).
-MISSING = object()
-# ERROR_BAD_NETPATH and ERROR_BAD_NET_NAME, which Windows raises as
-# FileNotFoundError.
-_OFFLINE_SHARE_ERRORS = frozenset({53, 67})
-
-logger = logging.getLogger("prompt_manager.lora_layout_cache")
-
-
-@dataclass(frozen=True)
-class _Entry:
-    key: str
-    home: str
-    install: Optional[str]
-    layout: LoraManagerLayout
-    signatures: Tuple[Tuple[str, object], ...]
-    stored_at: float
-
-
-class _CannotValidate(Exception):
-    """A watched file could not be checked (not merely missing)."""
-
-
-class LayoutCache:
-    """At most one ``(install, layout)`` for the active LoraManager config."""
-
-    def __init__(
-        self,
-        resolve: Callable[[str], Optional[str]],
-        load: Callable[[Optional[str]], LoraManagerLayout],
-        *,
-        wall_ns: Callable[[], int] = time.time_ns,
-        monotonic: Callable[[], float] = time.monotonic,
-        stat=os.stat,
-        pathmod=os.path,
-        home: Callable[[], str] = lambda: str(Path.home()),
-    ):
-        self._resolve = resolve
-        self._load = load
-        self._wall_ns = wall_ns
-        self._monotonic = monotonic
-        self._stat = stat
-        self._pathmod = pathmod
-        self._home = home
-        self._entry: Optional[_Entry] = None
-        self._generation = 0
-        self._lock = threading.Lock()
-        # What was last logged; survives clear() so a reload of the same
-        # layout stays quiet.
-        self._logged_layout: Optional[LoraManagerLayout] = None
-        self._logged_refused: Tuple[str, ...] = ()
-
-    def get(self, configured: str) -> Tuple[Optional[str], LoraManagerLayout]:
-        """``(install, layout)`` for the configured path ("" auto-detects)."""
-        key = (configured or "").strip()
-        home = self._home()
-        entry = self._entry
-        if entry is not None and self._valid(entry, key, home):
-            return entry.install, entry.layout
-        with self._lock:
-            if entry is not None and self._entry is entry:
-                self._entry = None
-            generation = self._generation
-        install = self._resolve(key)
-        layout = self._load(install)
-        self._log_refused(layout)
-        try:
-            signatures = tuple(
-                (path, self._signature(path)) for path in self._watched(install, layout)
-            )
-        except _CannotValidate:
-            return install, layout
-        if layout.error == UNREADABLE or self._racy(signatures, self._wall_ns()):
-            return install, layout
-        stored = _Entry(key, home, install, layout, signatures, self._monotonic())
-        changed = False
-        with self._lock:
-            if self._generation == generation:
-                self._entry = stored
-                changed = layout != self._logged_layout
-                if changed:
-                    self._logged_layout = layout
-        if changed:
-            logger.info(
-                f"LoraManager layout changed: {layout.source or 'no'} settings, "
-                f"{layout.mode} storage, {len(layout.media_roots)} media folders"
-            )
-        return install, layout
-
-    def clear(self) -> None:
-        """Drop the entry; a load that started before this stores nothing."""
-        with self._lock:
-            self._entry = None
-            self._generation += 1
-
-    def _log_refused(self, layout: LoraManagerLayout) -> None:
-        """One warning per default LoRA folder newly refused by the guard."""
-        refused = tuple(layout.refused_defaults)
-        with self._lock:
-            if refused == self._logged_refused:
-                return
-            new = [folder for folder in refused if folder not in self._logged_refused]
-            self._logged_refused = refused
-        for folder in new:
-            logger.warning(
-                f"ComfyUI LoRA folder '{folder}' is neither scanned nor served: "
-                "it is a filesystem root, the home folder or a folder that "
-                "contains it"
-            )
-
-    # ── validation ──────────────────────────────────────────────────
-
-    def _valid(self, entry: _Entry, key: str, home: str) -> bool:
-        if entry.key != key or entry.home != home:
-            return False
-        if self._monotonic() - entry.stored_at >= MAX_AGE_SECONDS:
-            return False
-        try:
-            for path, signature in entry.signatures:
-                if self._signature(path) != signature:
-                    return False
-        except _CannotValidate:
-            return False
-        folders = entry.layout.media_roots
-        if entry.install is not None:
-            folders = (entry.install,) + tuple(folders)
-        for folder in folders:
-            try:
-                if _canonical(folder, self._pathmod) != folder:
-                    return False
-            except (OSError, ValueError):
-                return False
-        return True
-
-    def _watched(self, install, layout) -> Tuple[str, ...]:
-        """The plugin settings file, then the settings file, each once."""
-        if install is None:
-            return ()
-        paths = [self._pathmod.join(install, "settings.json")]
-        if layout.settings_path is not None:
-            paths.append(str(layout.settings_path))
-        watched, seen = [], set()
-        for path in paths:
-            identity = self._pathmod.normcase(self._pathmod.abspath(path))
-            if identity not in seen:
-                seen.add(identity)
-                watched.append(path)
-        return tuple(watched)
-
-    def _signature(self, path: str):
-        try:
-            result = self._stat(path)
-        except (FileNotFoundError, NotADirectoryError) as error:
-            # Windows reports an offline share as "not found": that is a
-            # temporary failure, not a missing file.
-            if getattr(error, "winerror", None) in _OFFLINE_SHARE_ERRORS:
-                raise _CannotValidate(path) from error
-            return MISSING
-        except (OSError, ValueError) as error:
-            raise _CannotValidate(path) from error
-        return (result.st_mtime_ns, result.st_size)
-
-    @staticmethod
-    def _racy(signatures, now_ns: int) -> bool:
-        threshold = now_ns - RACY_SECONDS * 10**9
-        return any(
-            signature is not MISSING and signature[0] > threshold
-            for _path, signature in signatures
-        )

py/lora_manager_layout.py

@@ -1,653 +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, and each of
-  ComfyUI's default LoRA folders, passes the folder guard: it must exist and
-  must not be a filesystem root, the home folder or a folder that contains
-  it. Default folders the guard refuses are listed in ``refused_defaults``.
-- ``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 logging
-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, the home folder or a folder "
-    "that contains it"
-)
-
-logger = logging.getLogger("prompt_manager.lora_manager_layout")
-
-
-@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, ...]
-    # ComfyUI's default LoRA folders that exist but that the folder guard
-    # refused (canonical): the layout cache logs them (#362).
-    refused_defaults: 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, every metadata file seen, and those unread."""
-
-    layout: LoraManagerLayout
-    sidecars: List[Sidecar]
-    # Every ``*.metadata.json`` seen, kept or skipped: resolved, once each,
-    # sorted by ``str(path)``. The import's fingerprint covers all of them.
-    scanned_files: Tuple[Path, ...]
-    unreadable: List[str]
-
-    @property
-    def scanned(self) -> int:
-        """How many metadata files were seen."""
-        return len(self.scanned_files)
-
-
-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 _refused(paths, home: str) -> Tuple[str, ...]:
-    """The folders in ``paths`` that exist but that the guard refuses."""
-    refused = []
-    for path in paths:
-        absolute = _absolute(path)
-        if not absolute or not os.path.isdir(absolute):
-            continue
-        if _guard_folder(absolute, home) is None:
-            try:
-                canonical = _canonical(absolute)
-            except (OSError, ValueError):
-                continue
-            if canonical not in refused:
-                refused.append(canonical)
-    return tuple(refused)
-
-
-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())
-    default_list = list(default_roots())
-    defaults = _guarded(default_list, home)
-    refused_defaults = _refused(default_list, 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,
-        refused_defaults=refused_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, refused_defaults
-    )
-
-
-def _layout_from_settings(
-    settings, settings_path, source, defaults, home, refused_defaults=()
-):
-    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]),
-        refused_defaults=refused_defaults,
-    )
-    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, [], (), [])
-    if layout.mode == MODE_CENTRALIZED:
-        folders = [layout.sidecar_root]
-    else:
-        folders = list(layout.lora_roots)
-    seen = set()
-    scanned: List[Path] = []
-    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.append(resolved)
-            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))
-    scanned.sort(key=str)
-    return Discovery(layout, sidecars, tuple(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():
-        if os.path.isabs(url.strip()):
-            yield url.strip()
-        else:
-            # LoraManager writes absolute paths; it would resolve a relative
-            # one against its working directory, not the sidecar folder.
-            logger.debug(
-                "Relative preview_url skipped in %s", sidecar.metadata_path.name
-            )
-    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,17 +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_layout_cache import LayoutCache
-from .lora_manager_layout import (
-    MODE_ALONGSIDE,
-    METADATA_SUFFIX,
-    LoraManagerLayout,
-    discover_sidecars,
-    load_layout,
-)
-
 logger = get_logger("prompt_manager.lora_utils")
 
 # ── LoraManager detection ────────────────────────────────────────────
@@ -96,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
@@ -246,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()))
@@ -278,53 +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``).
-
-    A fresh read: the import review, Start, the legacy scan and the trigger
-    word cache use it. The image hot paths use ``cached_lora_manager_layout``.
-    """
-    return layout_for_install(lora_manager_install(lora_manager_path))
-
-
-# The image hot paths' layout cache (#362). The lambdas look the functions up
-# when called, so a test that patches them here is seen by the cache.
-_layout_cache = LayoutCache(
-    lambda path: lora_manager_install(path),
-    lambda install: layout_for_install(install),
-)
-
-
-def cached_lora_manager_layout(
-    configured: Optional[str],
-) -> Tuple[Optional[str], LoraManagerLayout]:
-    """``(install, layout)`` for the configured path, from the layout cache
-    while LoraManager's settings files are unchanged (``py/lora_layout_cache.py``)."""
-    return _layout_cache.get(configured or "")
-
-
-def clear_layout_cache() -> None:
-    """Drop the cached layout (after an import linked files in new folders)."""
-    _layout_cache.clear()
-
-
 def _get_extra_lora_paths(comfyui_root: Path) -> List[Path]:
     """Parse extra_model_paths.yaml for additional LoRA directories."""
     results = []
@@ -368,7 +292,7 @@ def read_lora_metadata(metadata_path: Path) -> Optional[Dict]:
     try:
         with open(metadata_path, "r", encoding="utf-8") as f:
             return json.load(f)
-    except (ValueError, OSError) as e:  # JSONDecodeError, UnicodeDecodeError
+    except (json.JSONDecodeError, OSError) as e:
         logger.debug(f"Failed to read {metadata_path}: {e}")
         return None
 
@@ -430,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
 
 
@@ -482,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:
@@ -600,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:
@@ -770,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 = []
@@ -818,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
@@ -843,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.
 
@@ -868,89 +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 OSError as error:
-            logger.warning(f"Trigger word cache not refreshed: {error}")
-            return self._failed()
-        except Exception:
-            # Not a disk error: keep the traceback (#362).
-            logger.exception("Trigger word cache not refreshed")
-            return self._failed()
+        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)
 
-    def _failed(self) -> int:
-        """Keep the previous map and note when this load failed."""
-        with self._lock:
-            self._failed_at = time.monotonic()
-            return len(self._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:
@@ -960,7 +675,6 @@ class TriggerWordCache:
         with self._lock:
             self._cache.clear()
             self._loaded = False
-            self._failed_at = None
 
 
 # Module-level singleton

py/tagging_defaults.py

@@ -1,90 +0,0 @@
-"""The tagging configuration's constants and validators (#328).
-
-Server-free on purpose: ``py.api`` must import without ComfyUI's ``server``
-module, which ``py/config.py`` needs; config re-exports all of this.
-"""
-
-import math
-from typing import Any
-
-# The tagging engines (``py/autotag.py`` MODELS) and the options they take.
-WD14_MODEL_TYPES = frozenset({"wd14-swinv2", "wd14-vit"})
-LLM_MODEL_TYPES = frozenset({"gguf", "hf"})
-MODEL_TYPES = WD14_MODEL_TYPES | LLM_MODEL_TYPES
-MAX_INSTRUCTION_CHARS = 4000
-MAX_INSTRUCTION_BYTES = 16 * 1024
-# Tag output images' review estimate (#379): seconds per image for the WD14
-# engines, by where ONNX Runtime runs them. The graphics card figure was
-# measured in PR 1's live check (RTX 4090, CUDA: Auto-tag selected on 100
-# images in 16.7 s with the model load, 0.167 s/image). The processor figure
-# is an upper bound from the maintainer's cancelled CPU run (19 min / 697
-# images, backup, model load and skips included), kept as the fallback. The
-# language-model engines have no figure.
-WD14_SECONDS_PER_IMAGE = 1.6
-WD14_GPU_SECONDS_PER_IMAGE = 0.17
-
-
-def wd14_seconds_per_image(device: str) -> float:
-    """The estimate's rate for ``"gpu"`` or ``"cpu"`` (anything else)."""
-    return WD14_GPU_SECONDS_PER_IMAGE if device == "gpu" else WD14_SECONDS_PER_IMAGE
-
-
-# What a batch does with an image that already has tags (#328, #379).
-EXISTING_POLICIES = ("skip", "merge", "replace_after_review")
-
-# The language-model tag template every page starts from until one is saved.
-DEFAULT_TAG_TEMPLATE = (
-    "Generate only comma-separated Danbooru tags (lowercase_underscores, no spaces).\n"
-    "Include: subject_count (1girl/1boy/etc), gender, ethnicity (asian, caucasian, "
-    "etc), age_approx (teen, young_woman), body_attributes, face_features, "
-    "hairstyle, appearance, clothing, accessories, pose, expression, action, "
-    "camera_angle, camera_shot, scene_composition (wide_shot, long_shot, "
-    "dutch_angle), environment, background_elements, lighting, mood.\n"
-    "Prioritize visual accuracy.\n"
-    "No sentences, no commentary, no captions. Only tags. Keep length short but "
-    "descriptive."
-)
-
-
-def validate_threshold(name: str, value: Any) -> float:
-    """A WD14 confidence threshold in [0, 1], or ValueError naming ``name``."""
-    if type(value) not in (int, float) or not math.isfinite(value):
-        raise ValueError(f"{name} must be a finite number")
-    if not 0 <= value <= 1:
-        raise ValueError(f"{name} must be between 0 and 1")
-    return float(value)
-
-
-# Every page shows the thresholds in steps of 0.05 (the concept's System rows,
-# the Tag image dialogs and the legacy sliders), so a saved one must be on that
-# grid (#369). Per-request thresholds keep their own checks.
-THRESHOLD_STEP = 0.05
-_STEPS_PER_UNIT = round(1 / THRESHOLD_STEP)
-# A computed float can miss the grid by a hair: (0.1 + 0.2) * 20 is 6.000000000000001.
-_STEP_TOLERANCE = 1e-12  # in steps; refuses 0.35000000001
-
-
-def validate_saved_threshold(name: str, value: Any) -> float:
-    """A saved WD14 threshold: in [0, 1] and a multiple of ``THRESHOLD_STEP``,
-    returned exactly on the grid; else ValueError naming ``name``."""
-    value = validate_threshold(name, value)
-    steps = value * _STEPS_PER_UNIT
-    if abs(steps - round(steps)) > _STEP_TOLERANCE:
-        raise ValueError(f"{name} must be a multiple of {THRESHOLD_STEP}")
-    return round(steps) / _STEPS_PER_UNIT
-
-
-def validate_template(value: Any, name: str = "instructions") -> str:
-    """Non-empty language-model instructions within the character and byte
-    caps, or ValueError naming ``name``."""
-    if not isinstance(value, str) or not value.strip():
-        raise ValueError(f"{name} must be non-empty text")
-    if len(value) > MAX_INSTRUCTION_CHARS:
-        raise ValueError(f"{name} must be at most {MAX_INSTRUCTION_CHARS} characters")
-    try:
-        encoded = value.encode("utf-8")
-    except UnicodeEncodeError:
-        raise ValueError(f"{name} must be valid Unicode text") from None
-    if len(encoded) > MAX_INSTRUCTION_BYTES:
-        raise ValueError(f"{name} {'are' if name == 'instructions' else 'is'} too long")
-    return value

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]

requirements-dev.txt

@@ -8,8 +8,8 @@ coverage>=7.16.2
 numpy>=2.2.6  # WD14 engine tests
 
 # Code quality
-black==26.10.1
-flake8==7.4.1
+black>=26.10.1
+flake8>=7.4.1
 
 # Security scanning
 bandit[toml]>=1.9.4

tests/background_stops.py

@@ -1,27 +0,0 @@
-"""Final stops for the background threads a test starts (#301, #302).
-
-Every real ``ImageGenerationHandler``, ``ImageMonitor`` or ``PromptTracker``
-a test constructs ends with its final stop and an assertion, before the
-test's folder and databases go: ``close()`` for a handler,
-``stop_monitoring()`` for a monitor, ``shutdown()`` for a tracker.
-"""
-
-from utils.prompt_tracker import PromptTracker
-
-
-def stop_tracker(testcase, tracker):
-    """Shut a real tracker's cleanup thread down; mocks are left alone."""
-    if isinstance(tracker, PromptTracker):
-        testcase.assertTrue(tracker.shutdown(), "prompt cleanup thread still running")
-
-
-def close_handler(testcase, handler):
-    """Close ``handler`` for good, then stop the tracker it was built with."""
-    testcase.assertTrue(handler.close(), "image worker still running")
-    stop_tracker(testcase, getattr(handler, "prompt_tracker", None))
-
-
-def stop_monitor(testcase, monitor):
-    """Stop ``monitor`` (its observer and worker), then its tracker."""
-    testcase.assertTrue(monitor.stop_monitoring(), "image monitor still running")
-    stop_tracker(testcase, getattr(monitor, "prompt_tracker", None))

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/concept-inventory.mjs

@@ -676,73 +676,3 @@ export function measureInspector(selector) {
             primary:node.classList.contains('ca-primary'),minHeight:getComputedStyle(node).minHeight})),
     };
 }
-
-// #249 System S7 Task 20, shared since S12 (#329): the maintenance plan dialog's measurement and its D100 mapping,
-// moved unchanged from system-maintenance-concept.spec.mjs so the rotated-log review uses the same ones.
-/** Runs in the page: the open review dialog (plan or duplicates): its title, body and the concept's tokens. */
-export 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') })) },
-    };
-}
-
-export 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.
- */
-export 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' }] },
-    };
-}

tests/browser/fast_reset.py

@@ -1,283 +0,0 @@
-"""Run a browser-test fixture seeder off the live database, then publish once (#384).
-
-The seeders make hundreds of small commits. On a slow CI disk the live
-database's commits queue behind WAL checkpoint syncs and a reset took over
-30 s. ``ScratchSeeder.run`` instead:
-
-1. copies the live database into a scratch database (SQLite backup API) whose
-   connections never sync (a crash loses only the copy);
-2. runs the unchanged seeder against an API proxy whose ``db`` is the scratch
-   database; everything else (files, thumbnails, caches, command state) is
-   the live API's, written exactly as before;
-3. replaces the rows of every table the seed changed in the live database, in
-   one transaction on the live connection. Tables the seed left alone are not
-   touched, so state another fixture owns stays as it was.
-
-A commit by any other live connection while the seed ran fails the reset
-instead of being overwritten (``PRAGMA data_version``).
-"""
-
-from __future__ import annotations
-
-import hashlib
-import os
-import shutil
-import sqlite3
-import tempfile
-import weakref
-from pathlib import Path
-from typing import Any, Callable, TypeVar
-
-T = TypeVar("T")
-
-# Set to 1 to run seeders on the live database as before #384 (the equivalence
-# proof, tests/browser/reset_equivalence.py, compares both ways).
-SEED_ON_LIVE_ENV = "PM_TEST_SEED_ON_LIVE"
-SCRATCH_SCHEMA = "reset_seed"
-# API calls a seed makes that must see the published rows (see _SeedApi).
-DEFERRED_CALLS = frozenset({"invalidate_gallery_cache"})
-# Linux's shared-memory tmpfs (present in the Playwright image and on runners).
-MEMORY_ROOT = Path("/dev/shm")
-# The largest fixtures' scratch copy is about 8 MB (database plus a WAL that
-# autocheckpoints near 4 MB). Docker's default /dev/shm is 64 MB, shared with
-# the browsers and the other workers; with less free than this, the scratch
-# copy goes on disk instead.
-MEMORY_FREE_BYTES = 32 * 1024 * 1024
-# Scratch folders are named <prefix><owner pid>-<random>.
-SCRATCH_PREFIX = "pm-reset-"
-
-
-def _quote(name: str) -> str:
-    return '"' + name.replace('"', '""') + '"'
-
-
-def _tables(conn: sqlite3.Connection, schema: str = "main") -> list[str]:
-    rows = conn.execute(
-        f"SELECT name, sql FROM {schema}.sqlite_master WHERE type = 'table' "
-        "ORDER BY name"
-    ).fetchall()
-    for name, sql in rows:
-        if sql and sql.lstrip().upper().startswith("CREATE VIRTUAL"):
-            raise NotImplementedError(f"virtual table {name} cannot be copied")
-    return [name for name, _sql in rows]
-
-
-def _columns(conn: sqlite3.Connection, table: str, schema: str = "main") -> list[str]:
-    """Writable columns (hidden and generated ones excluded), plus ``rowid``
-    when the table has a rowid that no INTEGER PRIMARY KEY column carries."""
-    info = conn.execute(f"PRAGMA {schema}.table_xinfo({_quote(table)})").fetchall()
-    columns = [row[1] for row in info if row[6] == 0]
-    keys = [row for row in info if row[5]]
-    sql = conn.execute(
-        f"SELECT sql FROM {schema}.sqlite_master WHERE type = 'table' AND name = ?",
-        (table,),
-    ).fetchone()[0]
-    without_rowid = sql is not None and "WITHOUT ROWID" in sql.upper()
-    integer_key = len(keys) == 1 and str(keys[0][2]).upper() == "INTEGER"
-    if not without_rowid and not integer_key and table != "sqlite_sequence":
-        columns.insert(0, "rowid")
-    return columns
-
-
-def table_digests(conn: sqlite3.Connection, schema: str = "main") -> dict[str, str]:
-    """A digest of every table's rows (rowids included), by table name."""
-    result = {}
-    for table in _tables(conn, schema):
-        selected = ", ".join(
-            _quote(c) if c != "rowid" else "rowid"
-            for c in _columns(conn, table, schema)
-        )
-        digest = hashlib.sha256()
-        rows = conn.execute(f"SELECT {selected} FROM {schema}.{_quote(table)}")
-        for row in sorted(repr(tuple(row)) for row in rows):
-            digest.update(row.encode("utf-8", "surrogatepass"))
-            digest.update(b"\n")
-        result[table] = digest.hexdigest()
-    return result
-
-
-def _process_alive(pid: int) -> bool:
-    try:
-        os.kill(pid, 0)
-    except ProcessLookupError:
-        return False
-    except OSError:
-        return True  # it exists but belongs to someone else
-    return True
-
-
-def remove_orphaned_scratch(root: Path) -> None:
-    """Remove scratch folders of servers that died without cleaning up.
-
-    A server killed outright (SIGKILL, a crash) never runs ``close``, and
-    tmpfs keeps its folder in memory until reboot. The folder name carries
-    the owner's process id; a folder whose process is gone is removed.
-    """
-    if os.name != "posix":
-        return  # os.kill(pid, 0) would terminate the process on Windows
-    for folder in root.glob(f"{SCRATCH_PREFIX}*-*"):
-        pid = folder.name[len(SCRATCH_PREFIX) :].split("-", 1)[0]
-        if pid.isdigit() and not _process_alive(int(pid)):
-            shutil.rmtree(folder, ignore_errors=True)
-
-
-class _SeedApi:
-    """The live API, except that ``db`` is the scratch database.
-
-    Cache drops the seed asks for (``DEFERRED_CALLS``) are recorded and made
-    after the publish: dropped earlier, a request in between would cache the
-    live database's old rows again.
-    """
-
-    def __init__(self, api: Any, db: Any) -> None:
-        object.__setattr__(self, "_api", api)
-        object.__setattr__(self, "db", db)
-        object.__setattr__(self, "deferred", [])
-
-    def __getattr__(self, name: str) -> Any:
-        if name in DEFERRED_CALLS:
-
-            def record(*args: Any, **kwargs: Any) -> None:
-                self.deferred.append((name, args, kwargs))
-
-            return record
-        return getattr(self._api, name)
-
-    def __setattr__(self, name: str, value: Any) -> None:
-        setattr(self._api, name, value)
-
-
-class ScratchSeeder:
-    """Seed into a scratch copy and publish the changed tables in one commit."""
-
-    def __init__(
-        self,
-        api: Any,
-        directory: Path,
-        *,
-        on_live: bool = False,
-        memory_root: Path | None = MEMORY_ROOT,
-    ) -> None:
-        self._api = api
-        self._fallback = Path(directory)
-        self._memory_root = memory_root
-        self._directory: Path | None = None
-        self._on_live = on_live
-        self._scratch = None
-        self._unsynced: "weakref.WeakSet[sqlite3.Connection]" = weakref.WeakSet()
-
-    def run(self, seed: Callable[[Any], T]) -> T:
-        """Run ``seed(api)`` (blocking; call it in an executor thread)."""
-        if self._on_live:
-            return seed(self._api)
-        live = self._api.db.model.get_connection()
-        if live.in_transaction:
-            raise RuntimeError("the live connection has an open transaction")
-        version = live.execute("PRAGMA data_version").fetchone()[0]
-        scratch = self._scratch_database()
-        target = self._scratch_connection(scratch)
-        with target.using():
-            live.backup(target)
-        before = table_digests(target)
-        target_api = _SeedApi(self._api, scratch)
-        result = seed(target_api)
-        target = self._scratch_connection(scratch)
-        if target.in_transaction:
-            raise RuntimeError("the seed left a scratch transaction open")
-        after = table_digests(target)
-        changed = [table for table in after if after[table] != before.get(table)]
-        if set(before) != set(after):
-            raise RuntimeError("the seed changed the database schema")
-        if live.execute("PRAGMA data_version").fetchone()[0] != version:
-            raise RuntimeError("the live database changed while the seed ran")
-        self._publish(live, scratch.model.db_path, changed, version)
-        for name, args, kwargs in target_api.deferred:
-            getattr(self._api, name)(*args, **kwargs)
-        return result
-
-    def _scratch_database(self):
-        if self._scratch is None:
-            from database.operations import PromptDatabase
-
-            self._directory = self._scratch_directory()
-            self._scratch = PromptDatabase(str(self._directory / "seed.db"))
-        return self._scratch
-
-    def _scratch_connection(self, scratch) -> sqlite3.Connection:
-        """The calling thread's scratch connection, set never to sync."""
-        conn = scratch.model.get_connection()
-        if conn not in self._unsynced:
-            conn.execute("PRAGMA synchronous = OFF")
-            self._unsynced.add(conn)
-        return conn
-
-    @staticmethod
-    def _publish(
-        live: sqlite3.Connection, path: str, tables: list[str], version: int
-    ) -> None:
-        """Replace ``tables`` with the scratch rows in one live transaction.
-
-        ``version`` is the live ``data_version`` read before the seed. It is
-        checked again under the write lock: a writer whose transaction was
-        open during the seed commits before ``BEGIN IMMEDIATE`` returns, and
-        its rows must fail the reset instead of being overwritten.
-        """
-        if not tables:
-            return
-        foreign_keys = live.execute("PRAGMA foreign_keys").fetchone()[0]
-        # Rows are copied as they are; no cascade may reach a table left alone.
-        live.execute("PRAGMA foreign_keys = OFF")
-        try:
-            live.execute(f"ATTACH DATABASE ? AS {SCRATCH_SCHEMA}", (path,))
-            try:
-                live.execute("BEGIN IMMEDIATE")
-                try:
-                    if live.execute("PRAGMA data_version").fetchone()[0] != version:
-                        raise RuntimeError(
-                            "the live database changed while the seed ran"
-                        )
-                    for table in tables:
-                        columns = ", ".join(
-                            _quote(c) if c != "rowid" else "rowid"
-                            for c in _columns(live, table)
-                        )
-                        name = _quote(table)
-                        live.execute(f"DELETE FROM main.{name}")
-                        live.execute(
-                            f"INSERT INTO main.{name} ({columns}) "
-                            f"SELECT {columns} FROM {SCRATCH_SCHEMA}.{name}"
-                        )
-                    live.commit()
-                except BaseException:
-                    live.rollback()
-                    raise
-            finally:
-                live.execute(f"DETACH DATABASE {SCRATCH_SCHEMA}")
-        finally:
-            live.execute(f"PRAGMA foreign_keys = {int(foreign_keys)}")
-
-    def close(self) -> None:
-        """Close every scratch connection, then remove the scratch files."""
-        if self._on_live:
-            return
-        if self._scratch is not None:
-            self._scratch.close_all()
-            self._scratch = None
-        if self._directory is not None:
-            shutil.rmtree(self._directory, ignore_errors=True)
-            self._directory = None
-
-    def _scratch_directory(self) -> Path:
-        """A folder in memory (tmpfs) where there is one, else ``directory``.
-
-        Even unsynced, scratch writes on the runner's disk wait whenever the
-        kernel is writing back the pages they rewrite.
-        """
-        root = self._memory_root
-        if root is not None and root.is_dir() and os.access(root, os.W_OK):
-            remove_orphaned_scratch(root)
-            if shutil.disk_usage(root).free >= MEMORY_FREE_BYTES:
-                prefix = f"{SCRATCH_PREFIX}{os.getpid()}-"
-                return Path(tempfile.mkdtemp(prefix=prefix, dir=root))
-        self._fallback.mkdir(parents=True, exist_ok=True)
-        return self._fallback

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/folder_trash.py

@@ -1,78 +0,0 @@
-"""Empty a browser-test media folder without waiting for the disk (#384).
-
-A reset used to ``shutil.rmtree`` the output and input folders the last
-fixture wrote. Unlinking a file whose pages are still being written back
-waits for that write, so on a slow CI disk a reset stalled in ``rmtree``.
-``replace_folder`` renames the old folder into ``<parent>/reset-trash`` (one
-metadata change) and makes a new empty one; a background thread deletes the
-trash, and ``close_trash`` stops that thread and removes what is left before
-the server's temp root goes.
-"""
-
-from __future__ import annotations
-
-import queue
-import shutil
-import threading
-import uuid
-from pathlib import Path
-
-TRASH_NAME = "reset-trash"
-
-
-class _Trash:
-    def __init__(self, directory: Path) -> None:
-        self.directory = directory
-        self._queue: "queue.SimpleQueue[Path | None]" = queue.SimpleQueue()
-        self._thread = threading.Thread(
-            target=self._work, name="pm-reset-trash", daemon=True
-        )
-        self._thread.start()
-
-    def _work(self) -> None:
-        while (folder := self._queue.get()) is not None:
-            shutil.rmtree(folder, ignore_errors=True)
-
-    def discard(self, folder: Path) -> None:
-        self.directory.mkdir(exist_ok=True)
-        moved = self.directory / f"{folder.name}-{uuid.uuid4().hex}"
-        folder.rename(moved)
-        self._queue.put(moved)
-
-    def close(self) -> None:
-        self._queue.put(None)
-        self._thread.join()
-        shutil.rmtree(self.directory, ignore_errors=True)
-
-
-_trashes: dict[Path, _Trash] = {}
-# Trash folders whose server has cleaned up: a reset still running then
-# deletes in place instead of starting a thread nobody would stop.
-_closed: set[Path] = set()
-_lock = threading.Lock()
-
-
-def replace_folder(folder: Path) -> None:
-    """Make ``folder`` an empty folder; its old content is deleted later."""
-    folder = Path(folder)
-    if folder.exists():
-        directory = folder.parent / TRASH_NAME
-        with _lock:
-            trash = _trashes.get(directory)
-            if trash is None and directory not in _closed:
-                trash = _trashes[directory] = _Trash(directory)
-            if trash is not None:
-                trash.discard(folder)
-        if folder.exists():
-            shutil.rmtree(folder)
-    folder.mkdir()
-
-
-def close_trash(parent: Path) -> None:
-    """Stop deleting under ``parent``'s trash and remove it (blocking)."""
-    directory = Path(parent) / TRASH_NAME
-    with _lock:
-        _closed.add(directory)
-        trash = _trashes.pop(directory, None)
-    if trash is not None:
-        trash.close()

tests/browser/images-concept.spec.mjs

@@ -286,8 +286,7 @@ const continuationText=page=>page.locator('.infinite-continuation > p').first().
 async function searchOf(page,term) {
     const before=await countText(page);
     await page.locator('#search').fill(term);
-    // Production's caption reads "Loading images…" until the search's listing answers (#391); the concept's is instant.
-    await expect.poll(async()=>{const text=await countText(page);return text!==before&&text!=='Loading images…';}).toBe(true);
+    await expect.poll(()=>countText(page)).not.toBe(before);
     await expect.poll(()=>page.locator(CARDS).count()).toBeLessThan(FIXTURE_IMAGES);
     await settle(page);
     const result={count:await countText(page),continuation:await continuationText(page),cards:await page.locator(`${CARDS} .image-open`).evaluateAll(nodes=>nodes.map(node=>node.getAttribute('aria-label')))};

tests/browser/inspector-concept.spec.mjs

@@ -228,8 +228,7 @@ async function productionSendOf(page,context) {
 async function tagOf(page) {
     const before=await page.locator('#result-count').textContent();
     await panelOf(page).locator('.detail-inner > .tags').last().getByRole('button',{name:'cinematic',exact:true}).click();
-    // Production's caption reads "Loading images…" until the tag's listing answers (#391); the concept's search is instant.
-    await expect.poll(async()=>{const text=await page.locator('#result-count').textContent();return text!==before&&text!=='Loading images…';}).toBe(true);
+    await expect.poll(()=>page.locator('#result-count').textContent()).not.toBe(before);
     await settle(page);
     return {count:await page.locator('#result-count').textContent(),
         cards:await page.locator(`${CARDS} .image-open`).evaluateAll(nodes=>nodes.map(node=>node.getAttribute('aria-label')))};
@@ -329,25 +328,6 @@ test('a recipe-linked image without recipe metadata shows its positive prompt me
     await expect(panelOf(page).locator('.detail-footer button')).toHaveText(['Send to ComfyUI','Prompt history']);
 });
 
-// #391: a tag chip replaces the collection; until its listing answers the caption says it is loading, never that the
-// filter matched nothing ("0 of 0 images" was painted before the response and read by a fast reader).
-test('a tag chip collection reads as loading, not empty, until its listing answers (#391)',async({page})=>{
-    await page.setViewportSize({width:1600,height:1100});
-    await openProductionPanel(page,'dark');
-    let release,arrived;
-    const held=new Promise(resolve=>{release=resolve;}),reached=new Promise(resolve=>{arrived=resolve;});
-    await page.route(url=>url.pathname==='/prompt_manager/images/output'&&url.searchParams.get('tags')==='cinematic',
-        async route=>{arrived();await held;await route.continue();},{times:1});
-    const count=page.locator('#result-count');
-    await panelOf(page).locator('.detail-inner > .tags').last().getByRole('button',{name:'cinematic',exact:true}).click();
-    await reached;
-    await expect(count).toHaveText('Loading images…');
-    await expect(page.locator(CARDS)).toHaveCount(0);
-    release();
-    await expect(count).toHaveText(countCopy('8 of 8 images · 2 positive prompts'));
-    await expect(page.locator(CARDS)).toHaveCount(8);
-});
-
 // Task C3 (D88, #249 PR C): the concept's chip row is the image's own tags (`i.tags`, app.js a402). With those names
 // saved as the file's current image tags, production draws the row from them (Tags filter buttons in the panel, plain
 // in the viewer, the linked positive's equal tags not repeated) and still equals the concept, in both sizes.

tests/browser/legacy-autotag.spec.mjs

@@ -1,182 +0,0 @@
-// #328: the legacy admin and gallery auto-tag batch and review keep working beside System › Auto-tagging. Since #330
-// the pages download and unload models only through System (legacy-system-links.spec.mjs); a batch never downloads
-// one. The fixture's fake download (`/__test__/tagging/download`) is held so nothing is ever fetched.
-import { startCoverage, saveCoverage } from '../../tools/vendor/browser-coverage.mjs';
-import { test, expect } from './fixtures.mjs';
-
-async function post(request, url, data) {
-    await expect(await request.post(url, data === undefined ? {} : { data })).toBeOK();
-}
-
-async function downloads(request) {
-    const response = await request.get('/prompt_manager/jobs');
-    await expect(response).toBeOK();
-    return (await response.json()).jobs.filter(job => job.kind === 'model_download');
-}
-
-test.beforeEach(async ({ page, request, browserName }) => {
-    await startCoverage(page, browserName);
-    // The 3.2.0 update notice would cover the admin page's toolbar.
-    await page.addInitScript(() => { localStorage.setItem('pm_update_notice_dismissed', '3.2.0'); });
-    await post(request, '/__test__/jobs/restart');
-    await post(request, '/__test__/tagging/reset');
-    await post(request, '/__test__/tagging/models', { unavailable: ['wd14-vit'] });
-    await post(request, '/__test__/tagging/download', { mode: 'hold' });
-});
-
-test.afterEach(async ({ page, request, browserName }) => {
-    await saveCoverage(page, browserName);
-    // Releases a download a failed test left held, and puts the raising default back.
-    await post(request, '/__test__/tagging/reset');
-    await post(request, '/__test__/jobs/restart');
-});
-
-// (wd14-vit is not downloaded in these tests: beforeEach marks it so the download tests can offer it.)
-// The gallery's batch reader keyed on `data.status` values the server never sends, so its modal never moved or
-// closed (#328 Problem 5). It now reads `type` frames as the admin page does.
-async function watchProgress(page) {
-    await page.evaluate(() => {
-        window.progressSeen = [];
-        const node = document.getElementById('autoTagProgressPercent');
-        // Each change from its own record: frames that land in one task share one
-        // callback, and the node's text by then is only the last of them.
-        new MutationObserver(records => {
-            for (const record of records) {
-                if (record.type === 'characterData') window.progressSeen.push(record.target.data);
-                for (const added of record.addedNodes) window.progressSeen.push(added.textContent);
-            }
-        }).observe(node, { childList: true, characterData: true, subtree: true });
-    });
-}
-
-async function runGalleryBatch(page) {
-    await page.locator('#autoTagBtn').click();
-    await page.locator('input[name="autoTagModel"][value="wd14-swinv2"]').check();
-    await watchProgress(page);
-    const done = page.waitForResponse(response => response.url().includes('/prompt_manager/autotag/start'));
-    await page.locator('#startAutoTagBtn').click();
-    await done;
-    await expect(page.locator('#autoTagProgressModal')).toBeHidden();
-    // #379: the batch counts images, never prompts.
-    await expect(page.getByText(/^Auto tagging complete! Tagged \d+ images?\.$/)).toBeVisible();
-}
-
-const CLOSE_NOTE = 'Closing this window stops tagging. Tags already added are kept. Prompt Manager\'s Activity page shows the '
-    + 'time left.';
-
-async function serverJobs(request) {
-    const response = await request.get('/prompt_manager/jobs');
-    await expect(response).toBeOK();
-    return (await response.json()).jobs;
-}
-
-async function runNativeBatch(request) {
-    const started = await request.post('/prompt_manager/jobs/autotag', { data: { model_type: 'wd14-swinv2', existing: 'skip',
-        options: { general_threshold: 0.35, character_threshold: 0.85 } } });
-    expect(started.status()).toBe(202);
-    const { job } = await started.json();
-    await expect.poll(async () => (await serverJobs(request)).find(item => item.id === job.id)?.state).toBe('finished');
-}
-
-test('gallery batch modal counts progress and closes on complete', async ({ page, request }) => {
-    await page.goto('/prompt_manager/gallery');
-    await runGalleryBatch(page);
-    const seen = await page.evaluate(() => window.progressSeen);
-    // The phase frames (model 5%, listing 8%) then the per-image frames (from 10%) move the bar.
-    expect(seen).toContain('8%');
-    expect(seen.some(value => parseInt(value, 10) >= 10)).toBe(true);
-    await expect(page.locator('#autoTagCloseNote')).toHaveText(CLOSE_NOTE);
-    // The batch ran as the autotag job of the legacy page.
-    expect((await serverJobs(request)).filter(job => job.kind === 'autotag').map(job => [job.title, job.state]))
-        .toEqual([['Tag output images (legacy page)', 'finished']]);
-    expect((await downloads(request)).length).toBe(0);
-});
-
-test('admin batch copy names images, not prompts (#379)', async ({ page }) => {
-    await page.goto('/prompt_manager/admin');
-    await page.locator('#autoTagBtn').click();
-    await expect(page.locator('input[name="autoTagMode"][value="skip"] + span')).toHaveText('Skip images already auto-tagged');
-    await expect(page.getByText('"auto-scanned" is not counted as a real tag')).toHaveCount(0);
-    await expect(page.locator('#autoTagCloseNote')).toHaveText(CLOSE_NOTE);
-    await expect(page.locator('#retagConfirmModal h3')).toHaveText('Image Already Auto-tagged');
-    await expect(page.locator('#retagConfirmModal')).toContainText('A tagging model already tagged this image. Generate new tags?');
-});
-
-test('admin review opens the first image', async ({ page }) => {
-    await page.goto('/prompt_manager/admin');
-    await page.locator('#autoTagBtn').click();
-    await page.locator('input[name="autoTagModel"][value="wd14-swinv2"]').check();
-    await page.locator('#startReviewBtn').click();
-    // #379: no image is auto-tagged yet (prompt tags no longer count), so the review opens on the first image.
-    await expect(page.locator('#retagConfirmModal')).toBeHidden();
-    await expect(page.locator('#autoTagReviewModal')).toBeVisible();
-    await expect(page.locator('#reviewImageName')).not.toHaveText(/^(image_name\.png|Unknown|)$/);
-    await expect(page.getByText('Failed to start review mode')).toHaveCount(0);
-});
-
-/** The admin review lists every row, videos too: Skip any image that is not one until the confirmation shows. */
-async function untilAutoTagged(page, confirm) {
-    // Each image's skip check answers before its confirmation or its error shows.
-    const failed = page.locator('#reviewTagsVisible .text-pm-error');
-    for (let tries = 0; tries < 5; tries++) {
-        await expect.poll(async () => (await confirm.isVisible()) || (await failed.count()) > 0).toBe(true);
-        if (await confirm.isVisible()) return;
-        const answered = page.waitForResponse(item => item.url().endsWith('/prompt_manager/autotag/single'));
-        await page.locator('#skipReviewBtn').click();
-        await answered;
-    }
-    await expect(confirm).toBeVisible();
-}
-
-// #379: the admin review asks before re-tagging an image a model already tagged, and Apply & Next writes that image's
-// tags (its bytes, never its prompt).
-test('admin review: an auto-tagged image asks first; Re-tag then Apply & Next tags the image', async ({ page, request }) => {
-    await runNativeBatch(request);
-    await page.goto('/prompt_manager/admin');
-    await page.locator('#autoTagBtn').click();
-    await page.locator('input[name="autoTagModel"][value="wd14-swinv2"]').check();
-    await page.locator('#startReviewBtn').click();
-    const confirm = page.locator('#retagConfirmModal');
-    await untilAutoTagged(page, confirm);
-    await expect(confirm.locator('#retagExistingTags span').first()).toHaveText('sandstone');
-    await page.locator('#retagConfirmBtn').click();
-    await expect(page.locator('#autoTagReviewModal')).toBeVisible();
-    await expect(page.locator('#reviewTagsVisible .tag-chip').first()).toContainText('sandstone');
-    const applied = page.waitForRequest(item => item.url().endsWith('/prompt_manager/autotag/apply'));
-    const answer = page.waitForResponse(item => item.url().endsWith('/prompt_manager/autotag/apply'));
-    await page.locator('#applyReviewBtn').click();
-    const body = (await applied).postDataJSON();
-    expect(body.prompt_id).toBeUndefined();
-    expect(body.sha256).toMatch(/^[0-9a-f]{64}$/);
-    expect((await answer).status()).toBe(200);
-});
-
-test('admin review: Skip All Tagged passes every auto-tagged image', async ({ page, request }) => {
-    await runNativeBatch(request);
-    await page.goto('/prompt_manager/admin');
-    await page.locator('#autoTagBtn').click();
-    await page.locator('input[name="autoTagModel"][value="wd14-swinv2"]').check();
-    await page.locator('#startReviewBtn').click();
-    const confirm = page.locator('#retagConfirmModal');
-    await untilAutoTagged(page, confirm);
-    await page.locator('#retagSkipAllBtn').click();
-    await expect(page.locator('#retagConfirmModal')).toBeHidden();
-    await expect(page.getByText('Review complete!')).toBeVisible();
-});
-
-test('gallery review: Apply & Next tags the image by its path and bytes', async ({ page }) => {
-    await page.goto('/prompt_manager/gallery');
-    await page.locator('#autoTagBtn').click();
-    await page.locator('input[name="autoTagModel"][value="wd14-swinv2"]').check();
-    const suggested = page.waitForRequest(item => item.url().endsWith('/prompt_manager/autotag/single'));
-    await page.locator('#startReviewBtn').click();
-    expect((await suggested).postDataJSON().existing).toBe('merge');
-    await expect(page.locator('#reviewTagsContainer .tag-chip').first()).toContainText('sandstone');
-    const applied = page.waitForRequest(item => item.url().endsWith('/prompt_manager/autotag/apply'));
-    const answer = page.waitForResponse(item => item.url().endsWith('/prompt_manager/autotag/apply'));
-    await page.locator('#applyReviewBtn').click();
-    const body = (await applied).postDataJSON();
-    expect(Object.keys(body).sort()).toEqual(['path', 'root_index', 'sha256', 'tags'].filter(key => key in body).sort());
-    expect(body.prompt_id).toBeUndefined();
-    expect((await answer).status()).toBe(200);
-});

tests/browser/legacy-system-links.spec.mjs

@@ -1,286 +0,0 @@
-// System S13 (#330): the legacy admin and gallery pages open native System for their System tools. Each replaced
-// control is a plain link (`workspace#/system/<id>`, a new tab), and the legacy flows S13 keeps still work.
-import { startCoverage, saveCoverage } from '../../tools/vendor/browser-coverage.mjs';
-import { test, expect } from './fixtures.mjs';
-
-const PAGES = Object.freeze({ admin: '/prompt_manager/admin', gallery: '/prompt_manager/gallery' });
-const LABELS = Object.freeze({
-    overview: 'Overview',
-    appearance: 'Appearance',
-    sources: 'Sources & scans',
-    integrations: 'Integrations',
-    tagging: 'Auto-tagging',
-    maintenance: 'Maintenance',
-    backups: 'Backup & export',
-    diagnostics: 'Diagnostics & logs',
-});
-
-async function openPageOptions(page) {
-    await page.locator('#pageOptionsBtn').click();
-    await expect(page.locator('#settingsModal')).toBeVisible();
-}
-
-/** The auto-tag modal with its model rows read from /autotag/models. */
-async function openAutoTag(page) {
-    const read = page.waitForResponse(item => item.url().endsWith('/prompt_manager/autotag/models'));
-    await page.locator('#autoTagBtn').click();
-    await read;
-    await expect(page.locator('#autoTagModal')).toBeVisible();
-}
-
-const notDownloaded = (page, request) => post(request, '/__test__/tagging/models', { unavailable: ['gguf'] });
-const modelLoaded = (page, request) => post(request, '/__test__/tagging/loaded', { model: 'wd14-vit' });
-
-// One row per System link of the design's §2 map: the page, the control's label, how to find it, the section it opens
-// and what a test must arrange before the control shows.
-const LINKS = Object.freeze([
-    { page: 'admin', label: 'Settings', locate: page => page.locator('#settingsBtn'), section: 'overview' },
-    { page: 'admin', label: 'Maintenance', locate: page => page.locator('#maintenanceBtn'), section: 'maintenance' },
-    { page: 'admin', label: 'Backup DB', locate: page => page.locator('#backupBtn'), section: 'backups' },
-    { page: 'admin', label: 'Restore DB', locate: page => page.locator('#restoreBtn'), section: 'backups' },
-    { page: 'gallery', label: 'Settings', locate: page => page.locator('#settingsBtn'), section: 'appearance' },
-    { page: 'admin', label: 'Manage in System (model row)', arrange: notDownloaded, reveal: openAutoTag,
-        locate: page => page.locator('#ggufModelStatus a'), section: 'tagging' },
-    { page: 'gallery', label: 'Manage in System (model row)', arrange: notDownloaded, reveal: openAutoTag,
-        locate: page => page.locator('#ggufModelStatus a'), section: 'tagging' },
-    { page: 'gallery', label: 'Manage in System (Unload Model)', arrange: modelLoaded, reveal: openAutoTag,
-        locate: page => page.locator('#unloadModelBtn'), section: 'tagging' },
-    { page: 'gallery', label: 'Page options Maintenance', reveal: openPageOptions,
-        locate: page => page.locator('#pageOptionsMaintenanceLink'), section: 'maintenance' },
-    { page: 'gallery', label: 'Page options Sources & scans', reveal: openPageOptions,
-        locate: page => page.locator('#pageOptionsSourcesLink'), section: 'sources' },
-    { page: 'admin', label: 'Diagnostics', locate: page => page.locator('#diagnosticsBtn'), section: 'diagnostics' },
-    { page: 'admin', label: 'View Logs', locate: page => page.locator('#logsBtn'), section: 'diagnostics' },
-]);
-
-async function post(request, url, data) {
-    await expect(await request.post(url, data === undefined ? {} : { data })).toBeOK();
-}
-
-test.beforeEach(async ({ page, request, browserName }) => {
-    await startCoverage(page, browserName);
-    await post(request, '/__test__/reset');
-    await post(request, '/__test__/system/reset');
-    await post(request, '/__test__/tagging/reset');
-    // The 3.2.0 update notice would cover the admin page's toolbar.
-    await page.addInitScript(() => { localStorage.setItem('pm_update_notice_dismissed', '3.2.0'); });
-    page.legacyErrors = [];
-    page.on('pageerror', error => page.legacyErrors.push(error.message));
-});
-
-test.afterEach(async ({ page, request, browserName }) => {
-    await saveCoverage(page, browserName);
-    await post(request, '/__test__/tagging/reset');
-    await post(request, '/__test__/system/reset');
-    expect(page.legacyErrors).toEqual([]);
-});
-
-/** Opens the legacy page with the link showing; returns the link. */
-async function openLink(page, request, link) {
-    if (link.arrange) await link.arrange(page, request);
-    await page.goto(PAGES[link.page]);
-    if (link.reveal) await link.reveal(page);
-    const control = link.locate(page);
-    await expect(control).toBeVisible();
-    return control;
-}
-
-// Each row opens its section in a new tab and sends no request from the legacy page (the design's `a System link sends
-// no request from the legacy page`, checked per row so one slow page never times out the whole table).
-for (const link of LINKS) {
-    test(`legacy ${link.page} ${link.label} opens System ${link.section}`, async ({ page, context, request }) => {
-        // The gallery's thumbnail startup check (K9) reads its status on a timer of its own; it is off here.
-        await page.addInitScript(() => {
-            localStorage.setItem('gallerySettings', JSON.stringify({ checkThumbnailsAtStartup: false }));
-        });
-        const control = await openLink(page, request, link);
-        const legacyUrl = page.url();
-        await expect(control).toHaveAttribute('href', `workspace#/system/${link.section}`);
-        await expect(control).toHaveAttribute('target', '_blank');
-        await expect(control).toHaveAttribute('rel', 'noopener');
-        // The page's own start-up reads (list, film strips, settings) finish first; then the click must add none.
-        // Lazy thumbnails may still load whenever the layout changes; they are not the click's.
-        await page.waitForLoadState('networkidle');
-        const sent = [];
-        const record = item => { if (item.resourceType() !== 'image') sent.push(`${item.method()} ${item.url()}`); };
-        page.on('request', record);
-        const opened = context.waitForEvent('page');
-        await control.click();
-        const system = await opened;
-        await expect(system).toHaveURL(new RegExp(`/prompt_manager/workspace#/system/${link.section}$`));
-        page.off('request', record);
-        expect(sent, 'a System link sends no request from the legacy page').toEqual([]);
-        // System's page heading is "System"; the open section is the pressed button of its section switcher.
-        const main = system.locator('#workspace-main');
-        await expect(main.getByRole('heading', { level: 1, name: 'System', exact: true })).toBeVisible();
-        await expect(main.getByRole('group', { name: 'System sections', exact: true })
-            .getByRole('button', { name: LABELS[link.section], exact: true })).toHaveAttribute('aria-pressed', 'true');
-        expect(page.url()).toBe(legacyUrl);
-        await system.close();
-    });
-}
-
-test('kept admin flows still work', async ({ page, context }) => {
-    await page.goto(PAGES.admin);
-    const texts = page.locator('#resultsList .prompt-text');
-    await expect(texts.first()).toBeVisible();
-
-    // K1: sorting reorders the list.
-    for (const [value, order] of [['text_asc', 1], ['text_desc', -1]]) {
-        const listed = page.waitForResponse(item => /\/prompt_manager\/(recent|search)\?/.test(item.url()) && item.url().includes(`sort=${value}`));
-        await page.locator('#sortBy').selectOption(value);
-        await listed;
-        await expect.poll(async () => {
-            const shown = await texts.allTextContents();
-            // The server sorts case-insensitively (SQLite NOCASE), not by locale.
-            const key = text => text.toLowerCase();
-            const sorted = [...shown].sort((a, b) => order * (key(a) < key(b) ? -1 : key(a) > key(b) ? 1 : 0));
-            return shown.length > 1 && shown.join('\n') === sorted.join('\n');
-        }).toBe(true);
-    }
-    // K3: Add Prompt saves a prompt the list then shows.
-    await page.locator('#addPromptBtn').click();
-    await page.locator('#addPromptText').fill('Kept flow lighthouse');
-    const saved = page.waitForResponse(item => item.request().method() === 'POST' && item.url().endsWith('/prompt_manager/save'));
-    await page.locator('#saveNewPromptBtn').click();
-    expect((await saved).ok()).toBe(true);
-    await expect(page.locator('#addPromptModal')).toBeHidden();
-    await expect(texts.filter({ hasText: 'Kept flow lighthouse' })).toBeVisible();
-
-    // K1: a search narrows the list, and a selection enables the bulk buttons.
-    const all = await texts.allTextContents();
-    const word = all[0].trim().split(/\s+/)[0];
-    const searched = page.waitForResponse(item => item.url().includes('/prompt_manager/search?') && item.url().includes('text='));
-    await page.locator('#searchText').fill(word);
-    await page.locator('#searchBtn').click();
-    await searched;
-    await expect.poll(async () => {
-        const shown = await texts.allTextContents();
-        return shown.length > 0 && shown.length < all.length && shown.every(text => text.toLowerCase().includes(word.toLowerCase()));
-    }).toBe(true);
-    await expect(page.locator('#bulkDeleteBtn')).toBeDisabled();
-    await page.locator('#resultsList .prompt-checkbox').first().check();
-    for (const id of ['#bulkDeleteBtn', '#bulkTagBtn', '#bulkCategoryBtn']) await expect(page.locator(id)).toBeEnabled();
-
-    // K4: Stats reads the statistics again; Export downloads the prompts.
-    const stats = page.waitForResponse(item => item.url().endsWith('/prompt_manager/stats') && item.ok());
-    await page.locator('#statsBtn').click();
-    await stats;
-    await expect(page.getByText('Stats refreshed successfully!')).toBeVisible();
-    const download = page.waitForEvent('download');
-    await page.locator('#exportBtn').click();
-    expect((await download).suggestedFilename()).toMatch(/^prompts-\d{4}-\d{2}-\d{2}\.json$/);
-
-    // K5: Scan Images opens its dialog (with the quick backup) without starting a scan.
-    await page.locator('#scanBtn').click();
-    await expect(page.locator('#scanModal')).toBeVisible();
-    await expect(page.locator('#quickBackupBtn')).toBeVisible();
-    await page.locator('#cancelScan').click();
-    await expect(page.locator('#scanModal')).toBeHidden();
-
-    // K7: Metadata and Gallery open their pages in a new tab.
-    for (const [id, path] of [['#metadataBtn', '/prompt_manager/gallery.html'], ['#galleryBtn', '/prompt_manager/gallery']]) {
-        const opened = context.waitForEvent('page');
-        await page.locator(id).click();
-        const tab = await opened;
-        await tab.waitForLoadState('domcontentloaded');
-        expect(new URL(tab.url()).pathname).toBe(path);
-        await tab.close();
-    }
-});
-
-test('Page options keeps the page-only settings admin', async ({ page, request }) => {
-    const before = (await (await request.get('/prompt_manager/settings')).json()).settings;
-    await page.goto(PAGES.admin);
-    await expect(page.locator('#resultsList .prompt-text').first()).toBeVisible();
-    await page.locator('#pageOptionsBtn').click();
-    const dialog = page.locator('#settingsModal');
-    await expect(dialog).toBeVisible();
-    await expect(dialog.locator('h3')).toHaveText('Page options');
-    // Exactly the page-only setting (G5): the list's Infinite Scrolling default.
-    expect(await dialog.locator('input, select, textarea').evaluateAll(fields => fields.map(field => field.id)))
-        .toEqual(['infiniteScrollDefault']);
-    await expect(page.locator('#infiniteScrollDefault')).not.toBeChecked();
-    await page.locator('#infiniteScrollDefault').check();
-    const saved = page.waitForRequest(item => item.method() === 'POST' && item.url().endsWith('/prompt_manager/settings'));
-    await page.locator('#saveSettings').click();
-    expect((await saved).postDataJSON()).toEqual({ infinite_scroll: true });
-    await expect(dialog).toBeHidden();
-    // The list header follows the saved default at once; nothing else changed.
-    await expect(page.locator('#infiniteScrollSession')).toBeChecked();
-    const after = (await (await request.get('/prompt_manager/settings')).json()).settings;
-    expect(after).toEqual({ ...before, infinite_scroll: true });
-    await page.reload();
-    // The dialog shows the saved default once the page has read it (the header follows it first).
-    await expect(page.locator('#infiniteScrollSession')).toBeChecked();
-    await page.locator('#pageOptionsBtn').click();
-    await expect(page.locator('#infiniteScrollDefault')).toBeChecked();
-});
-
-test('Page options keeps the page-only settings gallery', async ({ page }) => {
-    // Native Appearance keys and the startup prompt's own keys are in the shared object before the page opens.
-    const stored = { imageQuality: 'high', showImageInfo: false, videoMute: false,
-        autoLoadMetadata: false, workspaceLayout: 'masonry', thumbnailPromptDismissed: 'sig', thumbnailsGenerated: true,
-        checkThumbnailsAtStartup: false, defaultViewMode: 'list' };
-    await page.addInitScript(value => {
-        if (!sessionStorage.getItem('seeded')) {
-            sessionStorage.setItem('seeded', '1');
-            localStorage.setItem('gallerySettings', value);
-        }
-    }, JSON.stringify(stored));
-    const listed = page.waitForResponse(item => item.url().includes('/prompt_manager/images/output?'));
-    await page.goto(PAGES.gallery);
-    await listed;
-    // With no Page options control, a stored default view still opens the page in it.
-    await expect(page.locator('#listViewBtn')).toHaveClass(/bg-pm-accent/);
-    await openPageOptions(page);
-    const dialog = page.locator('#settingsModal');
-    await expect(dialog.locator('h3')).toHaveText('Page options');
-    // Exactly the page-only settings (G5); the default view is System › Appearance's Default layout.
-    expect(await dialog.locator('input, select, textarea').evaluateAll(fields => fields.map(field => field.id))).toEqual([
-        'checkThumbnailsAtStartup', 'lazyLoadingToggle', 'defaultLimitSelect', 'gridColumnsSelect',
-        'infiniteScrollToggle', 'debugModeToggle', 'apiTimeoutInput']);
-    await expect(dialog.getByText('Default View Mode')).toHaveCount(0);
-    await page.locator('#defaultLimitSelect').selectOption('50');
-    await page.locator('#debugModeToggle').check();
-    await page.locator('#saveSettingsBtn').click();
-    await expect(dialog).toBeHidden();
-    const read = () => page.evaluate(() => JSON.parse(localStorage.getItem('gallerySettings')));
-    let saved = await read();
-    expect(saved).toMatchObject({ ...stored, defaultLimit: 50, debugMode: true });
-
-    // Reset puts back only the page options' defaults; the Appearance, startup-prompt and default-view keys stay.
-    await openPageOptions(page);
-    page.once('dialog', dialog => dialog.accept());
-    await page.locator('#resetSettingsBtn').click();
-    await expect(page.getByText('Page options reset to defaults')).toBeVisible();
-    await expect(page.locator('#defaultLimitSelect')).toHaveValue('100');
-    saved = await read();
-    expect(saved).toMatchObject({ defaultViewMode: 'list', imageQuality: 'high', showImageInfo: false, videoMute: false,
-        autoLoadMetadata: false, workspaceLayout: 'masonry', thumbnailPromptDismissed: 'sig', thumbnailsGenerated: true,
-        defaultLimit: 100, debugMode: false, checkThumbnailsAtStartup: true, lazyLoading: true, gridColumns: 8,
-        infiniteScroll: false, apiTimeout: 30 });
-});
-
-test('the legacy auto-tag modal stays open after Manage in System', async ({ page, context, request }) => {
-    for (const legacy of ['admin', 'gallery']) {
-        await post(request, '/__test__/tagging/models', { unavailable: ['gguf'] });
-        await page.goto(PAGES[legacy]);
-        await openAutoTag(page);
-        const link = page.locator('#ggufModelStatus').getByRole('link', { name: 'Manage in System', exact: true });
-        await expect(link).toHaveAttribute('title', 'Opens System › Auto-tagging in a new tab');
-        // A downloaded model keeps its status text.
-        await expect(page.locator('#wd14VitModelStatus')).toHaveText('\u2713 Downloaded');
-        const opened = context.waitForEvent('page');
-        await link.click();
-        const system = await opened;
-        await expect(system).toHaveURL(/#\/system\/tagging$/);
-        await expect(page.locator('#autoTagModal')).toBeVisible();
-        await system.close();
-        // Downloaded in System meanwhile: reopening the modal reads the models again (CUJ 4).
-        await post(request, '/__test__/tagging/models', { unavailable: [] });
-        await page.goto(PAGES[legacy]);
-        await openAutoTag(page);
-        await expect(page.locator('#ggufModelStatus')).toHaveText('\u2713 Downloaded');
-    }
-});

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/reset_equivalence.py

@@ -1,279 +0,0 @@
-"""Prove the scratch-seeded resets leave the state the old resets left (#384).
-
-Run by hand on Linux (the browser server's platform):
-
-    python -m tests.browser.reset_equivalence
-
-It starts the browser server three times: twice seeding on the live database
-as before #384 (``PM_TEST_SEED_ON_LIVE=1``) and once with the scratch seeder.
-Each server gets the same sequence: every reset kind of ``/__test__/reset``
-and ``/__test__/concept/reset``, with other fixtures' resets and API writes
-between them. After every reset it reads every table's rows (by rowid), the
-output and input file trees (size, SHA-256, mtime) and the response body.
-
-Values that differ between the two old runs are wall-clock values (created_at,
-an unpinned concept "now", file mtimes); they are masked. Everything else must
-be equal between the old runs and the new one. Exit status 0 means equal.
-"""
-
-from __future__ import annotations
-
-import hashlib
-import json
-import os
-import sqlite3
-import subprocess
-import sys
-import tempfile
-import time
-import urllib.request
-from pathlib import Path
-
-REPO_ROOT = Path(__file__).resolve().parents[2]
-READY_TIMEOUT_S = 60
-CLOCK = "<clock>"
-
-RESETS = [
-    ("/__test__/reset", {}),
-    ("/__test__/reset", {"extra_images": 2}),
-    ("/__test__/reset", {"extra_images": 108}),
-    ("/__test__/reset", {"include_video": True}),
-    ("/__test__/reset", {"prompt_inspector": True}),
-    ("/__test__/reset", {"native_library": True}),
-    ("/__test__/reset", {"native_library": True, "extra_prompts": 125}),
-    ("/__test__/reset", {"native_library": True, "extra_variants": 41}),
-    ("/__test__/reset", {"workspace_visual": True}),
-    ("/__test__/reset", {"full_inspector": True}),
-    (
-        "/__test__/reset",
-        {"full_inspector": True, "include_video": True, "extra_images": 2},
-    ),
-    ("/__test__/reset", {"chronological_history": True}),
-    ("/__test__/reset", {"chronological_history": True, "history_runs": 85}),
-    ("/__test__/concept/reset", {}),
-    ("/__test__/concept/reset", {"extra_images": 100}),
-    ("/__test__/concept/reset", {"seedless_images": 2, "short_seedless": True}),
-    ("/__test__/concept/reset", {"now": 1_780_000_000}),
-]
-# Writes by other fixtures and the API between resets; the resets must keep or
-# replace them exactly as before.
-DIRTY = [
-    ("/__test__/tagging/reset", {}),
-    ("/__test__/system/reset", None),
-    (
-        "/__test__/saved-views/raw",
-        {"page": "images", "name": "dirty", "state": "{}"},
-    ),
-]
-
-
-class Server:
-    def __init__(self, on_live: bool) -> None:
-        self.tmp = tempfile.TemporaryDirectory(prefix="pm-equivalence-")
-        env = {**os.environ, "TMPDIR": self.tmp.name}
-        env.update(TEMP=self.tmp.name, TMP=self.tmp.name)
-        env.pop("PM_TEST_SEED_ON_LIVE", None)
-        if on_live:
-            env["PM_TEST_SEED_ON_LIVE"] = "1"
-        self.process = subprocess.Popen(
-            [
-                sys.executable,
-                "-m",
-                "tests.browser.server",
-                "--port",
-                "0",
-                "--exit-on-stdin-eof",
-            ],
-            cwd=REPO_ROOT,
-            env=env,
-            stdin=subprocess.PIPE,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.DEVNULL,
-        )
-        line = self.process.stdout.readline().decode()
-        if not line.startswith("PM_TEST_SERVER_PORT="):
-            raise RuntimeError(f"no port line: {line!r}")
-        self.base = f"http://127.0.0.1:{int(line.split('=', 1)[1])}"
-        deadline = time.monotonic() + READY_TIMEOUT_S
-        while True:
-            try:
-                self.post_json("GET", "/prompt_manager/test", None)
-                break
-            except OSError:
-                if time.monotonic() > deadline or self.process.poll() is not None:
-                    raise
-                time.sleep(0.1)
-        (self.root,) = Path(self.tmp.name).glob("pm-browser-*")
-
-    def post_json(self, method: str, path: str, data) -> dict:
-        body = None if data is None else json.dumps(data).encode()
-        request = urllib.request.Request(
-            self.base + path,
-            data=body if method == "POST" else None,
-            method=method,
-            headers={"Content-Type": "application/json"} if body else {},
-        )
-        with urllib.request.urlopen(request, timeout=120) as response:  # nosec B310
-            text = response.read().decode()
-        try:
-            return json.loads(text)
-        except ValueError:
-            return {"text": text[:200]}
-
-    def stop(self) -> None:
-        self.process.stdin.close()
-        self.process.wait(timeout=READY_TIMEOUT_S)
-        self.process.stdout.close()
-        self.tmp.cleanup()
-
-
-def read_tables(path: Path) -> dict:
-    conn = sqlite3.connect(path.as_uri() + "?mode=ro", uri=True)
-    try:
-        tables = {}
-        names = [
-            row[0]
-            for row in conn.execute(
-                "SELECT name FROM sqlite_master WHERE type='table' ORDER BY name"
-            )
-        ]
-        for name in names:
-            quoted = '"' + name.replace('"', '""') + '"'
-            columns = [row[1] for row in conn.execute(f"PRAGMA table_info({quoted})")]
-            try:
-                cursor = conn.execute(f"SELECT rowid, * FROM {quoted} ORDER BY rowid")
-                columns = ["rowid", *columns]
-            except sqlite3.OperationalError:
-                cursor = conn.execute(f"SELECT * FROM {quoted} ORDER BY 1")
-            rows = [
-                [value.hex() if isinstance(value, bytes) else value for value in row]
-                for row in cursor
-            ]
-            tables[name] = {"columns": columns, "rows": rows}
-        return tables
-    finally:
-        conn.close()
-
-
-def read_files(root: Path) -> dict:
-    files = {}
-    for top in ("output", "input"):
-        for path in sorted((root / top).rglob("*")):
-            if path.is_file():
-                stat = path.stat()
-                files[path.relative_to(root).as_posix()] = [
-                    stat.st_size,
-                    hashlib.sha256(path.read_bytes()).hexdigest(),
-                    stat.st_mtime_ns,
-                ]
-    return files
-
-
-def flatten(value, prefix="") -> dict:
-    if isinstance(value, dict):
-        out = {}
-        for key, item in value.items():
-            out.update(flatten(item, f"{prefix}/{key}"))
-        return out
-    if isinstance(value, list):
-        out = {f"{prefix}#len": len(value)}
-        for index, item in enumerate(value):
-            out.update(flatten(item, f"{prefix}[{index}]"))
-        return out
-    return {prefix: value}
-
-
-def snapshot(server: Server, response: dict) -> dict:
-    flat = {}
-    for table, data in read_tables(server.root / "browser.db").items():
-        flat[f"table {table}#rows"] = len(data["rows"])
-        for index, row in enumerate(data["rows"]):
-            for column, value in zip(data["columns"], row):
-                flat[f"table {table}[{index}].{column}"] = value
-    for name, (size, digest, mtime) in read_files(server.root).items():
-        flat[f"file {name}"] = [size, digest]
-        flat[f"file {name}#mtime"] = mtime
-    flat["files#count"] = sum(
-        1 for key in flat if key.startswith("file ") and "#" not in key
-    )
-    for key, value in flatten(response).items():
-        flat[f"response{key}"] = value
-    # Each server has its own temp root and a random storage epoch; name them
-    # instead of masking every column that carries them.
-    epoch = flat.get("table execution_history_metadata[0].storage_epoch")
-    names = [(str(server.root), "<root>")]
-    if isinstance(epoch, str) and epoch:
-        names.append((epoch, "<epoch>"))
-    for key, value in flat.items():
-        if isinstance(value, str):
-            for text, name in names:
-                value = value.replace(text, name)
-            flat[key] = value
-    return flat
-
-
-def run(on_live: bool) -> list[dict]:
-    server = Server(on_live)
-    try:
-        states = []
-        for index, (path, data) in enumerate(RESETS * 2):
-            dirty_path, dirty_data = DIRTY[index % len(DIRTY)]
-            server.post_json("POST", dirty_path, dirty_data)
-            started = time.monotonic()
-            response = server.post_json("POST", path, data)
-            elapsed = time.monotonic() - started
-            print(f"  {'old' if on_live else 'new'} {path} {data}: {elapsed:.2f}s")
-            states.append(snapshot(server, response))
-        return states
-    finally:
-        server.stop()
-
-
-def column_key(key: str) -> str:
-    """``table t[3].created_at`` -> ``table t.created_at`` (mask whole columns)."""
-    if key.startswith("table ") and "[" in key:
-        head, _, tail = key.partition("[")
-        return head + tail.partition("]")[2]
-    return key
-
-
-def main() -> int:
-    old_a, old_b, new = run(True), run(True), run(False)
-    failures = 0
-    masked_all = set()
-    for step, (path, data) in enumerate(RESETS * 2):
-        a, b, n = old_a[step], old_b[step], new[step]
-        masked = {
-            column_key(key)
-            for key in set(a) | set(b)
-            if a.get(key, CLOCK) != b.get(key, CLOCK)
-        }
-        masked_all |= masked
-        keys = set(a) | set(n)
-        diffs = [
-            key
-            for key in sorted(keys)
-            if column_key(key) not in masked
-            and a.get(key, "<missing>") != n.get(key, "<missing>")
-        ]
-        tables = len(
-            {k.split("[")[0].split("#")[0] for k in a if k.startswith("table ")}
-        )
-        status = "EQUAL" if not diffs else f"DIFFERENT ({len(diffs)} values)"
-        print(
-            f"{status}: {path} {json.dumps(data)}: {tables} tables, "
-            f"{a['files#count']} files, {len(keys)} values, "
-            f"{len(masked)} masked columns"
-        )
-        for key in diffs[:20]:
-            old, now = a.get(key, "<missing>"), n.get(key, "<missing>")
-            print(f"    {key}: old {old!r} new {now!r}")
-        failures += bool(diffs)
-    print("masked (differ between the two old runs):")
-    for key in sorted(masked_all):
-        print(f"    {key}")
-    return 1 if failures else 0
-
-
-if __name__ == "__main__":
-    sys.exit(main())

tests/browser/server.py

@@ -19,15 +19,10 @@ from aiohttp.web_runner import GracefulExit
 from PIL import Image
 from PIL.PngImagePlugin import PngInfo
 
-from tests.browser.folder_trash import close_trash, replace_folder
 from tests.browser.request_hold import register_request_holds
 from tests.browser import slow_reset_watch
-from tests.browser.fast_reset import SEED_ON_LIVE_ENV, ScratchSeeder
 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,
@@ -47,10 +42,6 @@ from tests.browser.workspace_library_editor_fixture import (
 from tests.browser.workspace_vocabulary_fixture import register_vocabulary_commands
 from tests.browser.workspace_tagging_fixture import register_tagging_commands
 from tests.browser.workspace_review_fixture import register_review_commands
-from tests.browser.workspace_diagnostics_fixture import (
-    register_diagnostics_commands,
-    repoint_logs,
-)
 
 CANONICAL_ROOT = Path(__file__).resolve().parents[2]
 CANONICAL_ASSETS = {
@@ -78,8 +69,6 @@ class TestModel:
     # Scored names the concept comparisons answer instead of the fixed list
     # (``/__test__/tagging/suggestions``); None keeps the fixed list.
     suggestions: list | None = None
-    # The engine's model table (``py/autotag.py`` MODELS), set at startup.
-    models_config: dict = {}
 
     def get_models_status(self) -> dict:
         return {
@@ -87,7 +76,7 @@ class TestModel:
                 "downloaded": name not in self.unavailable,
                 "loaded": self.loaded == name,
             }
-            for name in self.models_config
+            for name in ("gguf", "hf", "wd14-vit", "wd14-convnext", "wd14-swinv2")
         }
 
     def is_model_loaded(self) -> bool:
@@ -174,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()
@@ -205,8 +181,6 @@ def create_app(root: Path) -> web.Application:
         directory.mkdir()
         setattr(folder_paths, f"get_{name}_directory", lambda path=directory: str(path))
     sys.modules["folder_paths"] = folder_paths
-    # S12: the logger writes into this server's root before any record is written.
-    repoint_logs(root)
 
     from py.config import GalleryConfig, PromptManagerConfig
 
@@ -217,7 +191,6 @@ def create_app(root: Path) -> web.Application:
     from py import autotag
     from utils.hashing import generate_prompt_hash
 
-    TestModel.models_config = autotag.MODELS
     model = TestModel()
     autotag.get_autotag_service = lambda: model
     api = PromptManagerAPI()
@@ -230,14 +203,8 @@ 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)
-    reset_logs = register_diagnostics_commands(app, routes, api, root)
     request_holds = register_request_holds(app, routes)
     slow_reset_watch.install(app, api)
-    # Resets seed a scratch copy and publish it in one commit (#384).
-    seeder = ScratchSeeder(
-        api, root / "reset-scratch", on_live=os.environ.get(SEED_ON_LIVE_ENV) == "1"
-    )
 
     async def canonical_asset(request: web.Request) -> web.Response:
         filename, content_type = CANONICAL_ASSETS[request.path]
@@ -251,7 +218,6 @@ def create_app(root: Path) -> web.Application:
         routes.get(path)(canonical_asset)
 
     def seed(
-        target,
         extra_images: int = 0,
         include_video: bool = False,
         prompt_inspector: bool = False,
@@ -259,7 +225,7 @@ def create_app(root: Path) -> web.Application:
         extra_prompts: int = 0,
         extra_variants: int = 0,
     ) -> None:
-        with target.db.model.get_connection() as conn:
+        with api.db.model.get_connection() as conn:
             for table in (
                 "saved_views",
                 "image_favorites",
@@ -268,7 +234,6 @@ def create_app(root: Path) -> web.Application:
                 "media_image_tags",
                 "media_annotation_bytes",
                 "media_annotation_files",
-                "image_categories",
                 "image_prompt_pairs",
                 "prompt_pair_tags",
                 "prompt_pairs",
@@ -279,7 +244,8 @@ def create_app(root: Path) -> web.Application:
             ):
                 conn.execute(f"DELETE FROM {table}")
         for name in ("output", "input"):
-            replace_folder(root / name)
+            shutil.rmtree(root / name)
+            (root / name).mkdir()
         for index, (directory, text, tag) in enumerate(
             [
                 ("output", "Cat portrait", "cats"),
@@ -322,30 +288,28 @@ def create_app(root: Path) -> web.Application:
                     image.save(image_path, pnginfo=info)
             stamp = time.time() - index * 10
             os.utime(image_path, (stamp, stamp))
-            pid = target.db.save_prompt(
+            pid = api.db.save_prompt(
                 text, tags=[tag], prompt_hash=generate_prompt_hash(text)
             )
-            target.db.link_image_to_prompt(pid, str(image_path))
+            api.db.link_image_to_prompt(pid, str(image_path))
             if index == 0:
                 video_prompt_id = pid
                 for number in range(extra_images):
                     extra = root / directory / "bulk" / f"{number:04}.png"
                     extra.parent.mkdir(exist_ok=True)
                     shutil.copyfile(image_path, extra)
-                    target.db.link_image_to_prompt(pid, str(extra))
+                    api.db.link_image_to_prompt(pid, str(extra))
         if native_library:
-            positive = target.db.get_prompt_by_hash(
-                generate_prompt_hash("Cat portrait")
-            )
+            positive = api.db.get_prompt_by_hash(generate_prompt_hash("Cat portrait"))
             positive_id = positive["id"]
-            target.db.update_prompt_metadata(
+            api.db.update_prompt_metadata(
                 positive_id, category="Animals", tags=["cats", "studio"]
             )
             variants = []
             for index, negative in enumerate(
                 ["blurry, watermark", "low quality", "low contrast", ""]
             ):
-                pair_id = target.db.save_prompt_pair(
+                pair_id = api.db.save_prompt_pair(
                     "Cat portrait",
                     negative,
                     title=f"Portrait variant {index + 1}",
@@ -353,30 +317,28 @@ def create_app(root: Path) -> web.Application:
                     tags=["studio"] if index == 0 else ["outdoors"],
                 )
                 variants.append(pair_id)
-            with target.db.model.get_connection() as conn:
+            with api.db.model.get_connection() as conn:
                 images = conn.execute(
                     "SELECT id FROM generated_images WHERE prompt_id=? ORDER BY id",
                     (positive_id,),
                 ).fetchall()
             for index, image in enumerate(images[:2]):
-                target.db.link_image_to_pair(
+                api.db.link_image_to_pair(
                     variants[index], image["id"], {"source": "fixture", "anchor": index}
                 )
-            target.db.link_image_to_pair(
+            api.db.link_image_to_pair(
                 variants[0], images[0]["id"], {"source": "fixture second evidence"}
             )
-            target.db.record_prompt_pair_use(variants[0], times=3)
+            api.db.record_prompt_pair_use(variants[0], times=3)
             for number in range(extra_variants):
-                target.db.save_prompt_pair(
-                    "Cat portrait", f"Negative extra {number:04}"
-                )
+                api.db.save_prompt_pair("Cat portrait", f"Negative extra {number:04}")
             legacy = root / "output" / "legacy-unassigned.png"
             shutil.copyfile(root / "output" / "shared" / "same.png", legacy)
-            target.db.link_image_to_prompt(positive_id, str(legacy))
-            target.db.save_prompt("Dog landscape", category="Animals", tags=["dogs"])
-            target.db.save_prompt_pair("Dual role portrait", "Cat portrait")
+            api.db.link_image_to_prompt(positive_id, str(legacy))
+            api.db.save_prompt("Dog landscape", category="Animals", tags=["dogs"])
+            api.db.save_prompt_pair("Dual role portrait", "Cat portrait")
             for number in range(extra_prompts):
-                target.db.save_prompt(
+                api.db.save_prompt(
                     f"Library extra {number:04}", category="Bulk", tags=["bulk"]
                 )
         if prompt_inspector:
@@ -394,20 +356,15 @@ 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).
-        target._generate_gallery_thumbnails_sync(
-            target._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"
             shutil.copyfile(
                 Path(__file__).resolve().parents[1] / "fixtures" / "tiny.webm", video
             )
-            target.db.link_image_to_prompt(video_prompt_id, str(video))
-        target.invalidate_gallery_cache()
+            api.db.link_image_to_prompt(video_prompt_id, str(video))
+        api.invalidate_gallery_cache()
 
     history_fixture = None
 
@@ -433,7 +390,6 @@ def create_app(root: Path) -> web.Application:
         # No preview queued by the last test may land in the new fixture.
         await api._run_in_executor(api.close_auto_thumbnails)
         library_editor_commands.reset()
-        await api._run_in_executor(reset_logs)
         data = await request.json() if request.can_read_body else {}
         if not isinstance(data, dict):
             raise web.HTTPBadRequest()
@@ -453,10 +409,7 @@ def create_app(root: Path) -> web.Application:
             raise web.HTTPBadRequest()
         if chronological_history:
             manifest = await api._run_in_executor(
-                seeder.run,
-                lambda target: seed_workspace_history(
-                    target, root, history_runs=history_runs
-                ),
+                lambda: seed_workspace_history(api, root, history_runs=history_runs)
             )
             history_fixture = manifest
             return web.json_response({"success": True, **manifest})
@@ -514,31 +467,25 @@ def create_app(root: Path) -> web.Application:
             raise web.HTTPBadRequest()
         if workspace_visual:
             history_fixture = None
-            await api._run_in_executor(
-                seeder.run, lambda target: seed_workspace_visual(target, root)
-            )
+            await api._run_in_executor(seed_workspace_visual, api, root)
             return web.json_response({"success": True})
         if full_inspector:
             history_fixture = None
             await api._run_in_executor(
-                seeder.run,
-                lambda target: seed_workspace_inspector(
-                    target, root, extra_images=extra, include_video=include_video
-                ),
+                lambda: seed_workspace_inspector(
+                    api, root, extra_images=extra, include_video=include_video
+                )
             )
             return web.json_response({"success": True})
         history_fixture = None
         await api._run_in_executor(
-            seeder.run,
-            lambda target: seed(
-                target,
-                extra,
-                include_video,
-                prompt_inspector,
-                native_library,
-                extra_prompts,
-                extra_variants,
-            ),
+            seed,
+            extra,
+            include_video,
+            prompt_inspector,
+            native_library,
+            extra_prompts,
+            extra_variants,
         )
         return web.json_response({"success": True})
 
@@ -578,15 +525,14 @@ def create_app(root: Path) -> web.Application:
         reveal_stub.reset()
         history_fixture = None
         manifest = await api._run_in_executor(
-            seeder.run,
-            lambda target: seed_workspace_concept(
-                target,
+            lambda: seed_workspace_concept(
+                api,
                 root,
                 extra_images=data.get("extra_images", 0),
                 seedless_images=data.get("seedless_images", 0),
                 short_seedless=data.get("short_seedless", False),
                 now=data.get("now"),
-            ),
+            )
         )
         return web.json_response({"success": True, **manifest})
 
@@ -654,12 +600,9 @@ def create_app(root: Path) -> web.Application:
     async def cleanup(application: web.Application) -> None:
         # A scan of an ambiguous fixture file captures it for Needs review.
         api.close_annotation_captures()
-        seeder.close()
         api.db.close_all()
-        # Old media folders still waiting for deletion go before the temp root.
-        close_trash(root)
 
-    seed(api)
+    seed()
     # Open Needs review change streams end first, as on the real host.
     app.on_shutdown.append(api.close_review_events)
     app.on_cleanup.append(cleanup)

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-diagnostics-concept.spec.mjs

@@ -1,396 +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, measureReview, mapPlanConcept }
-    from './concept-inventory.mjs';
-
-// #249 System S12 Task 7 (#329): System › Diagnostics & logs (app.js renderSystem 694–695) and its log cleanup review
-// (the concept's `maintenancePlan("rotated logs")`, 953–958) against the immutable concept, on the concept-shaped
-// fixture with the logger writing into this server's own root and seeded with the concept's sample (four lines, a
-// 1.4 MB active log, three rotated copies, console logging off). Each concept measurement is mapped only by the recorded
-// deviations (D109, D110, and D100 for the review), each commented where it applies; after that the difference must be
-// empty, and a removed term, a renamed button, a reordered option, a primary Refresh, a squeezed select or a swapped
-// 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();
-    await expect(await request.post('/__test__/logs/reset')).toBeOK();
-    await expect(await request.post('/__test__/logs/seed', { data: { mode: 'concept' } })).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__/logs/reset');
-    await request.post('/__test__/system/reset');
-    expect(page.conceptErrors).toEqual([]);
-});
-
-const REPORT_URL = '/prompt_manager/system/diagnostics';
-const PREVIEW_URL = '/prompt_manager/maintenance/preview';
-const LINE_FORMAT = /^\d\d:\d\d:\d\d [A-Z]+ +\S/;
-
-/** Runs in the page: Diagnostics & logs under `mainSelector`: every surface's text, controls, geometry and tokens. */
-function measureDiagnostics([mainSelector, lineFormat]) {
-    const format = new RegExp(lineFormat);
-    const layout = document.querySelector(`${mainSelector} .settings-layout`);
-    const css = (node, ...keys) => node ? Object.fromEntries(keys.map(key => [key, getComputedStyle(node)[key]])) : null;
-    const tokens = (node, ...names) => Object.fromEntries(names.map(key => [key, getComputedStyle(node).getPropertyValue(key).trim()]));
-    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 });
-    const control = row => {
-        const select = row.querySelector(':scope > select');
-        if (select) return { kind: 'select', id: select.id, options: [...select.options].map(option => option.textContent),
-            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 } : null;
-    };
-    const operations = parent => [...parent.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) }));
-    const toolbarItem = node => ({ name: name(node), text: node.localName === 'select' || node.localName === 'input' ? null : text(node),
-        for: node.localName === 'label' ? node.htmlFor : null, id: node.id || null,
-        options: node.localName === 'select' ? [...node.options].map(option => option.textContent) : null,
-        // The chosen option, so a wrong default level is noticed.
-        selected: node.localName === 'select' ? node.selectedOptions[0]?.textContent ?? null : null,
-        input: node.localName === 'input' ? [node.type, node.min, node.max, node.value] : null,
-        className: node.localName === 'button' ? node.className : null });
-    const surfaces = [...layout.querySelectorAll(':scope > section.surface')];
-    const pre = layout.querySelector('pre');
-    const lines = (pre?.textContent ?? '').split('\n').filter(Boolean);
-    const details = layout.querySelector('details');
-    const firstRow = layout.querySelector('.setting-row');
-    const toolbar = layout.querySelector('.toolbar');
-    return {
-        layout: [...layout.children].map(name),
-        surfaces: surfaces.map(surface => {
-            const heading = surface.querySelector(':scope > .panel-heading');
-            const grid = surface.querySelector(':scope > .meta-grid');
-            return {
-                tree: [...surface.children].map(name),
-                heading: text(surface.querySelector(':scope > h2, :scope > .panel-heading > h2')),
-                panelHeading: heading && [...heading.children].map(node => [name(node), text(node)]),
-                grid: grid && [...grid.children].map(entry => [name(entry), text(entry.querySelector('dt')), text(entry.querySelector('dd'))]),
-                buttons: [...surface.querySelectorAll(':scope > button')].map(button),
-                toolbar: surface.querySelector(':scope > .toolbar') && [...surface.querySelector(':scope > .toolbar').children].map(toolbarItem),
-                pre: surface.querySelector(':scope > pre') && { tabIndex: pre.tabIndex, tree: [...pre.children].map(name), lines,
-                    format: lines.every(line => format.test(line)) },
-                notes: [...surface.querySelectorAll(':scope > p')].map(node => [name(node), text(node), node.getAttribute('role'),
-                    node.getAttribute('aria-label')]),
-                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) })),
-                details: surface.querySelector(':scope > details') && {
-                    summary: text(details.querySelector(':scope > summary')), tree: [...details.children].map(name),
-                    notes: [...details.querySelectorAll(':scope > p')].map(node => [name(node), text(node)]),
-                    buttons: [...details.querySelectorAll(':scope > button')].map(button),
-                    files: [...details.querySelectorAll(':scope > .operation-list > .operation')].map(row => ({
-                        title: text(row.querySelector('h3')), detail: text(row.querySelector('p')), actions: [...row.querySelectorAll('.row-actions > button')].map(item =>
-                            [text(item), item.getAttribute('aria-label')]) })),
-                    operations: operations(details) },
-                operations: operations(surface),
-            };
-        }),
-        tokens: tokens(surfaces[0], '--line', '--panel', '--accent'),
-        surface: css(surfaces[1], 'paddingTop', 'paddingLeft', 'backgroundColor', 'borderTopWidth', 'borderTopColor', 'borderTopLeftRadius',
-            'marginTop'),
-        grid: css(layout.querySelector('.meta-grid'), 'display', 'gridTemplateColumns', 'columnGap', 'rowGap'),
-        toolbar: css(toolbar, 'display', 'flexWrap', 'alignItems', 'columnGap', 'rowGap', 'marginBottom'),
-        pre: css(pre, 'fontFamily', 'fontSize', 'backgroundColor', 'borderTopColor', 'borderTopLeftRadius', 'paddingTop', 'overflowX'),
-        row: css(firstRow, 'display', 'alignItems', 'justifyContent', 'columnGap', 'paddingTop', 'paddingBottom', 'borderTopWidth',
-            'borderTopColor'),
-        label: css(firstRow.querySelector('label'), 'fontSize', 'fontWeight', 'color'),
-        description: css(firstRow.querySelector('p'), 'fontSize', 'color', 'marginTop'),
-        select: css(firstRow.querySelector('select'), 'fontSize', 'minWidth', 'maxWidth', 'backgroundColor', 'color', 'borderTopColor'),
-        summary: css(details.querySelector('summary'), 'fontSize', 'fontWeight', 'color', 'cursor'),
-        small: css(details.querySelector(':scope > p.small'), '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('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 plural = (count, one, many = `${one}s`) => `${count.toLocaleString('en-US')} ${count === 1 ? one : many}`;
-/** The server's size label (1 KB = 1024 bytes), as the section prints it. */
-function sizeText(bytes) {
-    if (bytes < 1024) return plural(bytes, 'byte');
-    if (bytes < 2 ** 20) return `${(bytes / 2 ** 10).toFixed(1)} KB`;
-    if (bytes < 2 ** 30) return `${(bytes / 2 ** 20).toFixed(1)} MB`;
-    return `${(bytes / 2 ** 30).toFixed(1)} GB`;
-}
-
-const KINDS = Object.freeze({ active: 'Active log', rotated: 'Rotated copy', other: 'Other file' });
-const RENDERER_NONE = 'No ComfyUI window is open in this browser, so its renderer is not known.';
-const COPY = Object.freeze({
-    testLink: 'Write a placeholder image record to check that linking works.',
-    runtimeLevel: 'How much the server writes to the log. Applied until the server restarts.',
-    console: 'Print Prompt Manager’s warnings and errors in the ComfyUI console (everything at DEBUG). Applied until the server restarts.',
-    clear: 'Empty the active log and delete its rotated copies.',
-    retention: 'Rotates at 10 MB · keeps 5 rotated copies · file logging on · memory buffer 1,000 entries',
-});
-
-/**
- * The concept's Diagnostics & logs with the recorded deviations applied, for the server's `report` and the seeded
- * `files` (`/logs/files`). The concept's own sample values the fixture reproduces stay as they are: the four log lines,
- * the Viewer.js line, "prompt_manager.log · 1.4 MB · rotated copies: 3", INFO and console logging off.
- */
-function mapDiagnosticsConcept(reference, { report, files, stats }) {
-    const [diagnostics, logs] = reference.surfaces;
-    const [levelLabel, level, refresh, download] = logs.toolbar;
-    const [runtime, consoleRow] = logs.rows;
-    const database = report.checks.database;
-    const { configured, watching, unavailable } = report.sources;
-    const sources = configured === 0 ? `ComfyUI output folder · ${watching ? 'watching' : 'manual scan'}`
-        : unavailable > 0 ? `${plural(configured, 'source')} · ${unavailable} not available`
-            : `${plural(configured, 'source')} · ${watching} watching`;
-    const errors = (stats.level_counts.ERROR ?? 0) + (stats.level_counts.CRITICAL ?? 0);
-    return {
-        ...reference,
-        surfaces: [
-            { ...diagnostics,
-                // D110: the Test image link operation follows the concept's Image-link diagnostics.
-                tree: [...diagnostics.tree, 'div.operation'],
-                // D110: live values. Database and Sources from `GET /system/diagnostics`, Host renderers is D106's
-                // renderer line (no ComfyUI window in this browser); the pinned Viewer.js line is the concept's own.
-                grid: diagnostics.grid.map(([entry, term, value]) => [entry, term, {
-                    Database: `Readable · ${sizeText(report.database_info.database_size_bytes)} · ${plural(database.image_count, 'image')}`,
-                    Sources: sources,
-                    'Host renderers': RENDERER_NONE }[term] ?? value]),
-                // D110: the buttons drop the concept's "sample".
-                buttons: diagnostics.buttons.map(item => ({ ...item, text: item.text.replace('Download sample diagnostic report',
-                    'Download diagnostic report') })),
-                operations: [
-                    // D110: "Inspect" opens the read-only Inspect a file page.
-                    ...diagnostics.operations.map(row => ({ ...row, actions: row.actions.map(item => ({ ...item, text: 'Inspect' })) })),
-                    // D110: the legacy synthetic link (S12-11), enabled: the fixture has a most recent prompt.
-                    { ...diagnostics.operations[0], title: 'Test image link', description: COPY.testLink,
-                        actions: [{ ...diagnostics.operations[0].actions[0], text: 'Create test link…' }] },
-                ] },
-            { ...logs,
-                // D109: the statistics line follows the viewer.
-                tree: [logs.tree[0], logs.tree[1], logs.tree[2], 'p.small', ...logs.tree.slice(3)],
-                toolbar: [
-                    levelLabel,
-                    // D109: all six minimum levels (the concept has three).
-                    { ...level, options: ['All levels', 'DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'] },
-                    // D109: the added Lines control, 1–500, default 100.
-                    { name: 'label.small', text: 'Lines', for: 'log-limit', id: null, options: null, selected: null, input: null,
-                        className: null },
-                    { name: 'input', text: null, for: null, id: 'log-limit', options: null, selected: null,
-                        input: ['number', '1', '500', '100'], className: null },
-                    refresh,
-                    // D109: the active log, not a sample.
-                    { ...download, text: 'Download log' },
-                ],
-                // D109: "Log statistics" (errors are ERROR + CRITICAL).
-                notes: [['p.small', `${plural(stats.buffer_count, 'entry', 'entries')} in memory · ${plural(errors, 'error')} · `
-                    + `${plural(stats.level_counts.WARNING ?? 0, 'warning')} · ${plural(stats.log_files_count, 'file')} · `
-                    + `${sizeText(stats.total_log_size)} on disk`, 'status', 'Log statistics']],
-                rows: [
-                    // D109: CRITICAL after the concept's levels; the value lasts until the server restarts.
-                    { ...runtime, text: [runtime.text[0], ['p', COPY.runtimeLevel, null]],
-                        control: { ...runtime.control, options: [...runtime.control.options, 'CRITICAL'] } },
-                    // D109: what the console setting does and that it lasts until the server restarts (off, as the
-                    // concept's sample, by the fixture's seed).
-                    { ...consoleRow, text: [consoleRow.text[0], ['p', COPY.console, null]] },
-                ],
-                details: { ...logs.details,
-                    // D109: the retention line, the files and Clear all logs follow the concept's line and review.
-                    tree: [...logs.details.tree, 'p.small', 'div.operation-list', 'div.operation'],
-                    notes: [...logs.details.notes, ['p.small', COPY.retention]],
-                    files: files.map(row => ({ title: row.filename, detail: `${sizeText(row.size)} · ${row.modified.slice(0, 16)
-                        .replace('T', ' ')} · ${KINDS[row.kind]}`, actions: [['Download', `Download ${row.filename}`]] })),
-                    operations: [{ tree: ['div', 'div.row-actions'], title: 'Clear all logs', description: COPY.clear,
-                        actions: [{ text: 'Clear all logs…', className: 'danger' }] }] } },
-        ],
-    };
-}
-
-async function conceptDiagnostics(page, theme) {
-    await openConcept(page, 'system', theme);
-    await page.locator('#main .section-nav').getByRole('button', { name: 'Diagnostics & logs', exact: true }).click();
-    await expect(page.locator('#main .settings-layout > section.surface')).toHaveCount(2);
-    await page.mouse.move(0, 0);
-    return page.evaluate(measureDiagnostics, ['#main', LINE_FORMAT.source]);
-}
-
-/** Production's section once every read answered, with the server's report, files and statistics it shows. */
-async function productionDiagnostics(page, request, theme) {
-    await openProduction(page, 'system/diagnostics', theme);
-    const main = page.locator('#workspace-main');
-    await expect(main.locator('.settings-layout > section.surface')).toHaveCount(2);
-    await expect(main.locator('.meta-grid dd')).not.toContainText(['Loading…']);
-    await expect(main.locator('.meta-grid dd').last()).toHaveText(RENDERER_NONE);
-    await expect(main.locator('#log-lines')).not.toHaveText('Loading…');
-    await expect(main.locator('#log-stats')).not.toHaveText('Loading…');
-    await expect(main.locator('details > p.small')).not.toContainText(['Loading…']);
-    await expect(main.locator('#runtime-level')).toBeEnabled();
-    await expect(main.locator('.operation').filter({ hasText: 'Create test link…' }).locator('button')).not.toHaveAttribute('aria-disabled', 'true');
-    await page.mouse.move(0, 0);
-    const production = await page.evaluate(measureDiagnostics, ['#workspace-main', LINE_FORMAT.source]);
-    const read = async url => (await request.get(url)).json();
-    const report = await read(REPORT_URL);
-    const { files } = await read('/prompt_manager/logs/files');
-    const { stats } = await read('/prompt_manager/logs/stats');
-    return { production, report, files, stats };
-}
-
-for (const theme of THEMES) for (const [width, height] of SIZES) {
-    test(`diagnostics and logs match the concept ${theme} ${width}x${height}`, async ({ page, request }, testInfo) => {
-        await page.setViewportSize({ width, height });
-        const concept = await conceptDiagnostics(page, theme);
-        await page.screenshot({ path: testInfo.outputPath(`concept-diagnostics-${theme}-${width}.png`), fullPage: true });
-        const { production, ...live } = await productionDiagnostics(page, request, theme);
-        await page.screenshot({ path: testInfo.outputPath(`production-diagnostics-${theme}-${width}.png`), fullPage: true });
-        expect(diffInventory(mapDiagnosticsConcept(concept, live), production)).toEqual([]);
-        expect(production.surfaces[1].pre.format).toBe(true);
-        expect(production.pageScroll).toBe(false);
-    });
-}
-
-// Below the concept's smallest size: on a 320px phone the Level and Runtime log level selects still show their whole
-// option, without page scroll.
-for (const theme of THEMES) test(`diagnostics selects fit at 320 wide ${theme}`, async ({ page, request }) => {
-    await page.setViewportSize({ width: 320, height: 700 });
-    const { production } = await productionDiagnostics(page, request, theme);
-    expect(production.selectsFit).toEqual([true, true]);
-    expect(production.pageScroll).toBe(false);
-});
-
-/**
- * D100 with D109's rule for this plan: the server's `rotated_logs` plan in the concept's dialog, "Rotated log copies"
- * as its `h3`, the plan's grid values (its Backup row says none is needed), "Listed files (N)", the hold line, no D55
- * backup box (nothing in the library changes) and "Apply reviewed operation".
- */
-function mapCleanupConcept(reference, plan) {
-    const mapped = mapPlanConcept(reference, 'Rotated log copies', plan);
-    return {
-        ...mapped,
-        // D109: no backup box for a plan that changes no library record.
-        tree: mapped.tree.filter(item => item !== 'div.notice'),
-        grid: { ...mapped.grid, rows: mapped.grid.rows.map(([term, value]) =>
-            [term, term === 'Backup' ? 'Not needed: no library record changes' : value]) },
-        backup: null,
-        // D109: the plan lists files, not records.
-        details: { ...mapped.details, summary: `Listed files (${plan.details.length})` },
-    };
-}
-
-async function conceptCleanup(page, theme) {
-    await conceptDiagnostics(page, theme);
-    await page.locator('#main details > summary').click();
-    await page.locator('#main [data-plan="rotated logs"]').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 productionCleanup(page, request, theme) {
-    await productionDiagnostics(page, request, theme);
-    await page.locator('#workspace-main details > summary').click();
-    const answer = page.waitForResponse(response => response.url().endsWith(PREVIEW_URL));
-    await page.locator('#workspace-main').getByRole('button', { name: 'Review log cleanup', exact: true }).click();
-    const plan = await (await answer).json();
-    await expect(page.locator('dialog#modal[open] #modal-body > h3')).toHaveText('Rotated log copies');
-    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(`log cleanup review matches the concept ${theme} ${width}x${height}`, async ({ page, request }, testInfo) => {
-        await page.setViewportSize({ width, height });
-        const concept = await conceptCleanup(page, theme);
-        expect(concept.heading.text).toBe('rotated logs');
-        expect(concept.tree).toEqual(['p.demo-note', 'h3', 'dl.meta-grid', 'p.small', 'div.dialog-actions']);
-        await page.screenshot({ path: testInfo.outputPath(`concept-log-cleanup-${theme}-${width}.png`) });
-        const { plan, production } = await productionCleanup(page, request, theme);
-        expect(plan.operation).toBe('rotated_logs');
-        await page.screenshot({ path: testInfo.outputPath(`production-log-cleanup-${theme}-${width}.png`) });
-        expect(diffInventory(mapCleanupConcept(concept, plan), production)).toEqual([]);
-    });
-}
-
-// Every path where production differs from the unmapped concept: D110's live values (Viewer.js is the concept's own),
-// renamed buttons and added operation, and D109's toolbar, statistics line, runtime rows and log files.
-const DEVIATED_PATHS = [
-    'surfaces.0.buttons.0', 'surfaces.0.grid.0', 'surfaces.0.grid.1', 'surfaces.0.grid.3', 'surfaces.0.operations.0',
-    'surfaces.0.operations.1', 'surfaces.0.operations.length', 'surfaces.0.tree.4', 'surfaces.0.tree.length',
-    'surfaces.1.details.files', 'surfaces.1.details.notes', 'surfaces.1.details.operations', 'surfaces.1.details.tree',
-    'surfaces.1.notes.0', 'surfaces.1.notes.length', 'surfaces.1.rows.0', 'surfaces.1.rows.1', 'surfaces.1.toolbar.1',
-    'surfaces.1.toolbar.2', 'surfaces.1.toolbar.3', 'surfaces.1.toolbar.4', 'surfaces.1.toolbar.5', 'surfaces.1.toolbar.length',
-    'surfaces.1.tree.3', 'surfaces.1.tree.5', 'surfaces.1.tree.6', 'surfaces.1.tree.length'].sort();
-
-test('diagnostics comparison detects mutations', async ({ page, request }) => {
-    await page.setViewportSize({ width: 1600, height: 1100 });
-    const concept = await conceptDiagnostics(page, 'dark');
-    const { production, ...live } = await productionDiagnostics(page, request, 'dark');
-    const expected = mapDiagnosticsConcept(concept, live);
-    expect(diffInventory(expected, production)).toEqual([]);
-    // Unmapped, the section differs only where D109 and D110 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(DEVIATED_PATHS);
-    const measure = () => page.evaluate(measureDiagnostics, ['#workspace-main', LINE_FORMAT.source]);
-    const paths = async () => diffInventory(expected, await measure()).map(item => item.path);
-    // A removed term.
-    const undoTerm = await mutate(page, { remove: ['#workspace-main .meta-grid > div:nth-child(2)'] });
-    expect(await paths()).toEqual(expect.arrayContaining(['surfaces.0.grid.length']));
-    await undoTerm();
-    // A renamed button.
-    await page.evaluate(() => { document.querySelector('#workspace-main section.surface > button').textContent = 'Download report'; });
-    expect(await paths()).toEqual(['surfaces.0.buttons.0.text']);
-    await page.evaluate(() => { document.querySelector('#workspace-main section.surface > button').textContent = 'Download diagnostic report'; });
-    // A reordered level option.
-    await page.evaluate(() => { const select = document.querySelector('#workspace-main #log-level'); select.append(select.options[1]); });
-    expect(await paths()).toEqual(expect.arrayContaining(['surfaces.1.toolbar.1.options.1']));
-    await page.evaluate(() => { const select = document.querySelector('#workspace-main #log-level'); select.insertBefore(select.options[5], select.options[1]); });
-    // A wrong default level.
-    await page.evaluate(() => { document.querySelector('#workspace-main #log-level').value = 'INFO'; });
-    expect(await paths()).toEqual(['surfaces.1.toolbar.1.selected']);
-    await page.evaluate(() => { document.querySelector('#workspace-main #log-level').value = ''; });
-    // A primary Refresh.
-    await page.evaluate(() => { document.querySelectorAll('#workspace-main .toolbar > button')[0].classList.add('ca-primary'); });
-    expect(await paths()).toEqual(expect.arrayContaining(['surfaces.1.toolbar.4.className']));
-    await page.evaluate(() => { document.querySelectorAll('#workspace-main .toolbar > button')[0].classList.remove('ca-primary'); });
-    // A select squeezed until its chosen option is cut.
-    const undoSqueeze = await mutate(page, { css: '#workspace-main #runtime-level { max-width: 30px !important; min-width: 0 !important; }' });
-    expect(await paths()).toEqual(expect.arrayContaining(['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(['tokens.--line', 'row.borderTopColor']));
-    await undoToken();
-    expect(diffInventory(expected, await measure())).toEqual([]);
-
-    // The log cleanup review: a changed grid term, a backup box that came back and a grid token are noticed.
-    const conceptReview = await conceptCleanup(page, 'dark');
-    const { plan } = await productionCleanup(page, request, 'dark');
-    const expectedReview = mapCleanupConcept(conceptReview, plan);
-    const reviewPaths = async () => diffInventory(expectedReview, await page.evaluate(measureReview)).map(item => item.path);
-    expect(await reviewPaths()).toEqual([]);
-    await page.evaluate(() => { document.querySelectorAll('dialog#modal[open] dl.meta-grid dt')[2].textContent = 'Safety'; });
-    expect(await reviewPaths()).toEqual(['grid.rows.2.0']);
-    await page.evaluate(() => { document.querySelectorAll('dialog#modal[open] dl.meta-grid dt')[2].textContent = 'Backup'; });
-    const undoGrid = await mutate(page, { css: 'dialog#modal dl.meta-grid { column-gap: 3px; }' });
-    expect(await reviewPaths()).toEqual(expect.arrayContaining(['grid.columnGap']));
-    await undoGrid();
-    expect(await reviewPaths()).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,266 +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, measureReview, mapPlanConcept }
-    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);
-    });
-}
-
-// 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'],
-]);
-
-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/system-tagging-concept.spec.mjs

@@ -1,418 +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';
-
-// #328 System S11 Task 8: System › Auto-tagging (app.js renderSystem 685–686) and the Tag output images review against
-// the immutable concept, on the concept-shaped fixture with the fake tagging model (every engine downloaded, none
-// loaded). Each concept measurement is mapped only by the recorded deviations (D132, D133, D134), each commented where
-// it applies; after that the difference must be empty, and a mutated label, option, order, class, select width or
-// token must be noticed. The concept has no batch review, so the Tag output images 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);
-    // The tagging reset restores the fake model (nothing loaded, every engine on disk) and the saved tagging defaults;
-    // the concept fixture then replaces its rows and files.
-    await expect(await request.post('/__test__/tagging/reset', { data: {} })).toBeOK();
-    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');
-    await request.post('/__test__/tagging/reset', { data: {} });
-    expect(page.conceptErrors).toEqual([]);
-});
-
-const PREVIEW_URL = '/prompt_manager/autotag/batch/preview';
-const MODEL_OPTIONS = ['WD14 SwinV2 · ~400 MB', 'WD14 ViT · ~400 MB', 'GGUF JoyCaption · ~4.5 GB', 'HuggingFace JoyCaption · ~16 GB'];
-const SUGGESTIONS = 'From 1 to 100: the most suggestions Generate shows for one image.';
-const BATCH = 'Tag each output image from its own pixels with the model above. Prompts are not changed. Review the scope first.';
-
-/** Runs in the page: Auto-tagging's surface under `mainSelector`: rows, field, actions, operation, geometry and tokens. */
-function measureTagging(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');
-        return input ? { kind: `input.${input.type}`, id: input.id, value: input.value, disabled: input.disabled } : null;
-    };
-    const surface = layout.querySelector(':scope > section.surface');
-    const firstRow = surface.querySelector('.setting-row');
-    const field = surface.querySelector(':scope > .field');
-    const actions = surface.querySelector(':scope > .row-actions');
-    return {
-        layout: [...layout.children].map(name),
-        tree: [...surface.children].map(name),
-        heading: text(surface.querySelector(':scope > h2')),
-        intro: text(surface.querySelector(':scope > p')),
-        // Per row: whether it may wrap, and whether its control sits under the text (a wrapped row) or beside it.
-        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), flexWrap: getComputedStyle(row).flexWrap,
-            controlBelow: row.lastElementChild.getBoundingClientRect().top >= row.firstElementChild.getBoundingClientRect().bottom - 0.5 })),
-        field: { tree: [...field.children].map(name), label: [text(field.querySelector('label')), field.querySelector('label').htmlFor],
-            textarea: { id: field.querySelector('textarea').id, value: field.querySelector('textarea').value,
-                ...css(field.querySelector('textarea'), 'fontSize', 'minHeight', 'backgroundColor', 'color', 'borderTopColor') },
-            ...css(field, 'display', 'rowGap', 'fontSize', 'marginTop', 'marginBottom') },
-        actions: { buttons: [...actions.children].map(item => [text(item), item.className]),
-            ...css(actions, 'display', 'flexWrap', 'columnGap', 'justifyContent'),
-            primary: css(actions.querySelector('.ca-primary'), 'backgroundColor', 'color', 'fontSize', 'paddingTop', 'paddingLeft'),
-            plain: css(actions.querySelector('button:not(.ca-primary)'), 'backgroundColor', 'color', 'fontSize', 'borderTopColor') },
-        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(surface, 'paddingTop', 'paddingLeft', 'backgroundColor', 'borderTopWidth', 'borderTopColor', 'borderTopLeftRadius'),
-        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', 'backgroundColor', 'color', 'borderTopColor'),
-        number: css(surface.querySelector('.setting-row input[type="number"]'), 'fontSize', 'minWidth', 'maxWidth', 'backgroundColor',
-            'color', 'borderTopColor'),
-        // 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: [...surface.querySelectorAll('.setting-row > select')].map(select => {
-            const copy = select.cloneNode(false);
-            copy.removeAttribute('id');
-            copy.append(new Option(select.selectedOptions[0]?.textContent ?? ''));
-            // Important inline values: the phone cap is an !important rule (concept.css), which a plain inline style loses to.
-            for (const [key, value] of [['position', 'absolute'], ['visibility', 'hidden'], ['width', 'max-content'], ['min-width', '0'],
-                ['max-width', 'none'], ['flex', 'none']]) copy.style.setProperty(key, value, 'important');
-            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,
-    };
-}
-
-/**
- * The concept's Auto-tagging with the recorded deviations applied, for the fixture (all engines on disk, none loaded).
- * `phone` is a viewport at the concept's 700px breakpoint or below.
- */
-function mapTaggingConcept(reference, { template, phone }) {
-    const [model, existing, general, character] = reference.rows;
-    const [preview] = reference.actions.buttons;
-    return {
-        ...reference,
-        // D133 adds a row after the thresholds; D134 adds the operation after the actions.
-        tree: [...reference.tree.slice(0, 6), 'div.setting-row', ...reference.tree.slice(6), 'div.operation'],
-        rows: [
-            // D132 (OQ5, OQ6): the four real engines with their download size, and the chosen one's live status.
-            { ...model, text: [model.text[0], ['p', 'Downloaded. Not loaded.', null]],
-                control: { ...model.control, options: MODEL_OPTIONS.map(label => [label, false]), selected: MODEL_OPTIONS[0] },
-                // D132: at phone width the row wraps, so the engine select sits whole under its text.
-                ...(phone ? { flexWrap: 'wrap', controlBelow: true } : {}) },
-            existing, general, character,
-            // D133: the persisted suggestion count, on the concept's number row.
-            { ...general, text: [['label', 'Suggestions per image', 'tag-suggestions'], ['p', SUGGESTIONS, null]],
-                control: { ...general.control, id: 'tag-suggestions', value: '10' } },
-        ],
-        // The saved template (the server's default until one is saved) replaces the concept's sample text.
-        field: { ...reference.field, textarea: { ...reference.field.textarea, value: template } },
-        // D132: Download (for an engine already on disk, "Download again") and Unload replace the two simulated jobs.
-        actions: { ...reference.actions, buttons: [preview, ['Download again', ''], ['Unload', '']] },
-        // D134: the prompt-tag batch, reviewed first.
-        operations: [{ tree: ['div', 'div.row-actions'], title: 'Tag output images', description: BATCH, actions: [['Review', '']] }],
-        // D132 (#398): every select shows its whole chosen option at every width (at 390 the concept's 120px cap cuts
-        // them; production lets each grow past it).
-        selectsFit: reference.selectsFit.map(() => true),
-    };
-}
-
-async function conceptTagging(page, theme) {
-    await openConcept(page, 'system', theme);
-    await page.locator('#main .section-nav').getByRole('button', { name: 'Auto-tagging', exact: true }).click();
-    await expect(page.locator('#main #tag-template')).toBeVisible();
-    await page.mouse.move(0, 0);
-    return page.evaluate(measureTagging, '#main');
-}
-
-async function productionTagging(page, theme) {
-    await openProduction(page, 'system/tagging', theme);
-    // Compare once the settings and the model status answered.
-    await expect(page.locator('#workspace-main #tag-model')).toBeEnabled();
-    await expect(page.locator('#workspace-main .setting-row').first().locator('p')).toHaveText('Downloaded. Not loaded.');
-    await page.mouse.move(0, 0);
-    return page.evaluate(measureTagging, '#workspace-main');
-}
-
-async function savedTemplate(request, page) {
-    const response = await request.get('/prompt_manager/settings');
-    await expect(response).toBeOK();
-    return { template: (await response.json()).settings.autotag_template, phone: page.viewportSize().width <= 700 };
-}
-
-for (const theme of THEMES) for (const [width, height] of SIZES) {
-    test(`auto-tagging matches the concept ${theme} ${width}x${height}`, async ({ page, request }, testInfo) => {
-        await page.setViewportSize({ width, height });
-        const concept = await conceptTagging(page, theme);
-        await page.screenshot({ path: testInfo.outputPath(`concept-tagging-${theme}-${width}.png`), fullPage: true });
-        const production = await productionTagging(page, theme);
-        await page.screenshot({ path: testInfo.outputPath(`production-tagging-${theme}-${width}.png`), fullPage: true });
-        expect(diffInventory(mapTaggingConcept(concept, await savedTemplate(request, page)), production)).toEqual([]);
-        expect(production.pageScroll).toBe(false);
-    });
-}
-
-// D132 (#398) at phone width and below the concept's smallest size: every option of every select, once chosen, shows
-// whole, with no page scroll.
-for (const theme of THEMES) for (const width of [390, 320]) {
-    test(`auto-tagging selects fit every option at ${width} wide ${theme}`, async ({ page }, testInfo) => {
-        await page.setViewportSize({ width, height: 844 });
-        await productionTagging(page, theme);
-        await page.locator('#workspace-main #tag-existing').selectOption('replace_after_review');
-        await page.locator('#workspace-main section.surface').screenshot({ path: testInfo.outputPath(`production-tagging-selects-${theme}-${width}.png`) });
-        const selects = page.locator('#workspace-main section.surface > .setting-row > select');
-        await expect(selects).toHaveCount(2);
-        for (let index = 0; index < 2; index += 1) {
-            const select = selects.nth(index);
-            const values = await select.evaluate(node => [...node.options].map(option => option.value));
-            for (const value of values) {
-                await select.selectOption(value);
-                const measured = await page.evaluate(measureTagging, '#workspace-main');
-                expect(measured.selectsFit, `${await select.getAttribute('id')}=${value}`).toEqual([true, true]);
-                expect(measured.pageScroll, value).toBe(false);
-            }
-        }
-    });
-}
-
-test('auto-tagging comparison detects mutations', async ({ page, request }) => {
-    await page.setViewportSize({ width: 1600, height: 1100 });
-    const concept = await conceptTagging(page, 'dark');
-    const saved = await savedTemplate(request, page);
-    const expected = mapTaggingConcept(concept, saved);
-    const production = await productionTagging(page, 'dark');
-    expect(diffInventory(expected, production)).toEqual([]);
-    // Unmapped, the section differs only where D132, D133 and D134 are recorded (and the saved template's text).
-    expect(diffInventory(concept, production).map(item => item.path.split('.').slice(0, 3).join('.'))
-        .filter((path, index, all) => all.indexOf(path) === index).sort()).toEqual([
-        'actions.buttons.1', 'actions.buttons.2', 'field.textarea.value', 'operations.0.actions', 'operations.0.description',
-        'operations.0.title', 'operations.0.tree', 'operations.length', 'rows.0.control', 'rows.0.text', 'rows.4.control', 'rows.4.controlBelow',
-        'rows.4.flexWrap', 'rows.4.text', 'rows.4.tree', 'rows.length', 'tree.6', 'tree.7', 'tree.8', 'tree.9', 'tree.length'].sort());
-    const measure = () => page.evaluate(measureTagging, '#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 > .setting-row:nth-of-type(2)'] });
-    expect(await paths()).toEqual(expect.arrayContaining(['rows.length', 'tree.length']));
-    await undoRow();
-    // A renamed label.
-    await page.evaluate(() => { document.querySelector('#workspace-main label[for="tag-existing"]').textContent = 'Existing'; });
-    expect(await paths()).toEqual(['rows.1.text.0.1']);
-    await page.evaluate(() => { document.querySelector('#workspace-main label[for="tag-existing"]').textContent = 'Existing tags'; });
-    // A reordered option.
-    await page.evaluate(() => { const select = document.querySelector('#workspace-main #tag-existing'); select.append(select.options[0]); });
-    expect(await paths()).toEqual(expect.arrayContaining(['rows.1.control.options.0.0']));
-    await page.evaluate(() => { const select = document.querySelector('#workspace-main #tag-existing'); select.prepend(select.options[2]); });
-    // ca-primary moved to another action.
-    await page.evaluate(() => {
-        const [first, second] = document.querySelectorAll('#workspace-main section.surface > .row-actions > button');
-        first.classList.remove('ca-primary');
-        second.classList.add('ca-primary');
-    });
-    expect(await paths()).toEqual(expect.arrayContaining(['actions.buttons.0.1', 'actions.buttons.1.1']));
-    await page.evaluate(() => {
-        const [first, second] = document.querySelectorAll('#workspace-main section.surface > .row-actions > button');
-        second.classList.remove('ca-primary');
-        first.classList.add('ca-primary');
-    });
-    // A select squeezed until its chosen option is cut.
-    const undoSqueeze = await mutate(page, { css: '#workspace-main #tag-model { max-width: 60px !important; min-width: 0 !important; }' });
-    expect(await paths()).toEqual(expect.arrayContaining(['selectsFit.0']));
-    await undoSqueeze();
-    const undoSqueezeExisting = await mutate(page, { css: '#workspace-main #tag-existing { max-width: 60px !important; min-width: 0 !important; }' });
-    expect(await paths()).toEqual(expect.arrayContaining(['selectsFit.1']));
-    await undoSqueezeExisting();
-    // A row that wraps where the concept's does not.
-    const undoWrap = await mutate(page, { css: '#workspace-main .setting-row:has(> #tag-existing) { flex-wrap: wrap; }' });
-    expect(await paths()).toEqual(['rows.1.flexWrap']);
-    await undoWrap();
-    // 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([]);
-});
-
-// D132 at phone width: only the engine row wraps; Existing tags grows beside its text instead (#398).
-test('auto-tagging at 390 wraps only the engine row', async ({ page, request }) => {
-    await page.setViewportSize({ width: 390, height: 844 });
-    const concept = await conceptTagging(page, 'dark');
-    const production = await productionTagging(page, 'dark');
-    expect(diffInventory(mapTaggingConcept(concept, await savedTemplate(request, page)), production)).toEqual([]);
-    expect(production.rows.map(row => row.flexWrap)).toEqual(['wrap', 'nowrap', 'nowrap', 'nowrap', 'nowrap']);
-    expect(production.selectsFit).toEqual([true, true]);
-});
-
-/** 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') },
-        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') })) },
-    };
-}
-
-const number = value => value.toLocaleString('en-US');
-/** DEC11 (#379): the Time row the preview's estimate reads as (WD14 on the test server's processor). */
-function timeRow(plan) {
-    const minutes = Math.max(1, Math.ceil(plan.estimate_seconds / 60));
-    const text = minutes < 90 ? `about ${minutes} min`
-        : `about ${Math.floor(minutes / 60)} h${minutes % 60 ? ` ${minutes % 60} min` : ''}`;
-    return `${text} on a processor; a graphics card can be faster.`;
-}
-
-/**
- * D134 (#379): the server's batch preview in the concept's review: "Review tag output images" with "Tag output images"
- * as its `h3`, the model, policy, image counts, time estimate and settings in the concept's `dl.meta-grid` (Backup in
- * the concept's wording), the estimate sentence in the concept's `p.small`, the D55 backup box and Cancel / "Start
- * tagging".
- */
-function mapBatchConcept(reference, plan) {
-    const [cancel, start] = reference.actions.buttons;
-    return {
-        ...reference,
-        title: 'Review tag output images',
-        tree: ['h3', 'dl.meta-grid', 'p.small', 'div.notice', 'div.dialog-actions'],
-        heading: { ...reference.heading, text: 'Tag output images' },
-        grid: { ...reference.grid, rows: [['Model', 'WD14 SwinV2 · ~400 MB'], ['Existing tags', 'Merge with existing'],
-            ['Images', number(plan.images)], ['Already auto-tagged', number(plan.already_tagged)],
-            ['Images to tag', `about ${number(plan.to_tag)}`], ['Time', timeRow(plan)],
-            ['Settings', `General 0.35 · Character 0.85 · up to ${number(plan.suggestion_limit)} tags per image`],
-            ['Backup', 'Create and verify before changes']] },
-        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 is written until you start. The number to tag is an estimate: images changed '
-            + 'since they were tagged are tagged again, and missing files are skipped. Activity reports what was tagged.' },
-        actions: { ...reference.actions, buttons: [cancel, { ...start, text: 'Start tagging' }] },
-    };
-}
-
-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, theme) {
-    await productionTagging(page, theme);
-    // Merge reviews every listed still image (#379): a batch with work, the full review the concept's shell is compared
-    // with.
-    await page.locator('#workspace-main #tag-existing').selectOption('merge');
-    const answer = page.waitForResponse(response => response.url().endsWith(PREVIEW_URL));
-    await page.locator('#workspace-main .operation').getByRole('button', { name: 'Review', exact: true }).click();
-    const plan = await (await answer).json();
-    await expect(page.locator('dialog#modal[open] #modal-title')).toHaveText('Review tag output images');
-    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(`tag output images review matches the concept ${theme} ${width}x${height}`, async ({ page }, testInfo) => {
-        await page.setViewportSize({ width, height });
-        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, theme);
-        // Under Merge every listed still image is tagged again: the batch has work to review.
-        expect(plan.to_tag).toBeGreaterThan(0);
-        expect(plan.estimate_device).toBe('cpu');
-        await page.screenshot({ path: testInfo.outputPath(`production-tagging-review-${theme}-${width}.png`) });
-        expect(diffInventory(mapBatchConcept(concept, plan), production)).toEqual([]);
-    });
-}
-
-/**
- * D134 (CUJ 5): Replace after review never runs as a batch: the same review shell with the counts, the reason as its
- * `p.small`, no backup box and only Cancel (the shared close-only review Integrations also uses).
- */
-function mapCancelOnlyConcept(reference, plan) {
-    const [cancel] = reference.actions.buttons;
-    const mapped = mapBatchConcept(reference, plan);
-    return {
-        ...mapped,
-        tree: ['h3', 'dl.meta-grid', 'p.small', 'div.dialog-actions'],
-        grid: { ...mapped.grid, rows: mapped.grid.rows.map(([term, value]) => [term, term === 'Existing tags' ? 'Replace after review' : value]) },
-        backup: null,
-        note: { ...reference.note, text: 'Replacing tags needs a review of each image. Use Preview tagging review, or choose Skip or '
-            + 'Merge for a batch run.' },
-        actions: { ...reference.actions, tree: [reference.actions.tree[0]], buttons: [cancel] },
-    };
-}
-
-test('the Cancel-only review matches the concept review shell', async ({ page }) => {
-    await page.setViewportSize({ width: 1600, height: 1100 });
-    const concept = await conceptReview(page, 'dark');
-    await productionTagging(page, 'dark');
-    await page.locator('#workspace-main #tag-existing').selectOption('replace_after_review');
-    const answer = page.waitForResponse(response => response.url().endsWith(PREVIEW_URL));
-    await page.locator('#workspace-main .operation').getByRole('button', { name: 'Review', exact: true }).click();
-    const plan = await (await answer).json();
-    expect(plan.review_required).toBe(true);
-    await expect(page.locator('dialog#modal[open] #modal-title')).toHaveText('Review tag output images');
-    await page.mouse.move(0, 0);
-    expect(diffInventory(mapCancelOnlyConcept(concept, plan), await page.evaluate(measureReview))).toEqual([]);
-});
-
-test('tag output images review comparison detects mutations', async ({ page }) => {
-    await page.setViewportSize({ width: 1600, height: 1100 });
-    const concept = await conceptReview(page, 'dark');
-    const { plan } = await productionReview(page, 'dark');
-    const expected = mapBatchConcept(concept, plan);
-    const paths = async () => diffInventory(expected, await page.evaluate(measureReview)).map(item => item.path);
-    expect(await paths()).toEqual([]);
-    // Every label of the grid is compared (#379's rows included): a changed one is named by its row.
-    for (const [index, [term]] of expected.grid.rows.entries()) {
-        await page.evaluate(([at, label]) => {
-            document.querySelectorAll('dialog#modal[open] dl.meta-grid dt')[at].textContent = label;
-        }, [index, `${term}!`]);
-        expect(await paths()).toEqual([`grid.rows.${index}.0`]);
-        await page.evaluate(([at, label]) => {
-            document.querySelectorAll('dialog#modal[open] dl.meta-grid dt')[at].textContent = label;
-        }, [index, term]);
-    }
-    expect(await paths()).toEqual([]);
-    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/tagging-concept.spec.mjs

@@ -236,7 +236,7 @@ test('paired Tag dialog captures', async ({ page, request }, testInfo) => {
     await expect(await request.post('/__test__/tagging/models', { data: { unavailable: ['wd14-swinv2'] } })).toBeOK();
     await openTagDialog(page, 'production', 'dark');
     await generateWith(page, 'production').catch(() => {});
-    await expect(status()).toHaveText('WD14 SwinV2 is not downloaded. Download it in System › Auto-tagging.');
+    await expect(status()).toHaveText('WD14 SwinV2 is not downloaded. Download it from the legacy Auto-tag page.');
     await shot('production-unavailable');
     await expect(await request.post('/__test__/tagging/models', { data: { unavailable: [] } })).toBeOK();
 

tests/browser/unseen-restore.mjs

@@ -1,54 +0,0 @@
-// A restore the open workspace page has not noticed yet (#413).
-//
-// Specs that restore through the API while a page is open check what the page does with a restore it did not see:
-// its next write is refused as "Prompt storage was restored since this dialog opened". But the page's Activity store
-// reads the job list every 15 s (activity-store.mjs POLL_MS), and a read the server answers while the restore job runs
-// makes the page follow it: when it finishes, the page is shown again from the restored data (S9, index.mjs
-// onRestoreFinished), which closes any open dialog. On a slow runner a restore can take longer than the time left to
-// the next read (CI run 40646112668: the restore took 16 s), so whether the page saw it depended on timing.
-//
-// `armUnseenRestores(page)`, before the page loads, passes every job-list read of the page through one route, so it
-// knows which reads the server has not answered yet. `unseenRestore(page, restoring)` then closes the gate, waits
-// for those reads' answers (sent before the restore began, they cannot list it), runs `restoring()`, and only after
-// it has answered lets the held reads go on: they read the restore as already ended, as a tab that read its job list
-// just before and just after the restore does. A restore that is never seen running never reloads the page.
-const JOBS = '**/prompt_manager/jobs';
-const gates = new WeakMap();
-
-/** Route `page`'s job-list reads through the restore gate. Call before the page's first navigation. */
-export async function armUnseenRestores(page) {
-    const gate = { closed: null, inFlight: 0, idle: [] };
-    gates.set(page, gate);
-    await page.route(JOBS, async route => {
-        if (gate.closed) {
-            await gate.closed;
-            return route.fallback();
-        }
-        gate.inFlight += 1;
-        try {
-            const response = await route.fetch();
-            await route.fulfill({ response }).catch(() => {});
-        } catch {
-            await route.abort().catch(() => {});
-        } finally {
-            gate.inFlight -= 1;
-            if (gate.inFlight === 0) for (const resolve of gate.idle.splice(0)) resolve();
-        }
-    });
-}
-
-/** Run `restoring()` (an API restore) unseen by `page`'s Activity store; resolves with what it resolves with. */
-export async function unseenRestore(page, restoring) {
-    const gate = gates.get(page);
-    if (!gate) throw new Error('armUnseenRestores(page) must run before the page loads');
-    let open;
-    gate.closed = new Promise(resolve => { open = resolve; });
-    try {
-        // Reads already on their way were sent before the restore: their answers cannot list it.
-        if (gate.inFlight > 0) await new Promise(resolve => gate.idle.push(resolve));
-        return await restoring();
-    } finally {
-        gate.closed = null;
-        open();
-    }
-}

tests/browser/workflows.spec.mjs

@@ -42,13 +42,8 @@ test('actual gallery form saves a prompt that the admin page can edit and reload
     await page.locator(`[data-action="edit"][data-prompt-id="${id}"]`).click();
     const editor = page.locator(`.prompt-text[data-id="${id}"]`);
     await editor.fill('Browser edited portrait');
-    // The page shows the edit at once and saves it after: reload only once the save answered (a reload that wins the
-    // race abandons the PUT, as seen on WebKit in CI).
-    const savedEdit = page.waitForResponse(item => item.request().method() === 'PUT'
-        && item.url().endsWith(`/prompt_manager/prompts/${id}`));
     await editor.press('Enter');
     await expect(page.locator('.prompt-text').filter({ hasText: 'Browser edited portrait' })).toBeVisible();
-    expect((await savedEdit).ok()).toBe(true);
     await page.reload();
     await expect(page.locator('.prompt-text').filter({ hasText: 'Browser edited portrait' })).toBeVisible();
     const saved = await request.post('/prompt_manager/save', { data: { text: 'Browser saved landscape' } });
@@ -104,9 +99,7 @@ for (const leave of ['beforeunload', 'pagehide']) {
     });
 }
 
-
-// #379: the reviewed tags are that image's own tags; no prompt changes.
-test('actual gallery review generates and persists tags for the selected root\'s image', async ({ page, request }) => {
+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);
     await page.locator('#autoTagBtn').click();
@@ -114,15 +107,13 @@ test('actual gallery review generates and persists tags for the selected root\'s
     await page.locator('#startReviewBtn').click();
     const generation = await generated;
     expect(generation.request().postDataJSON().root_index).toBe(0);
-    await expect(page.locator('#reviewTagsContainer')).toContainText('sandstone');
+    await expect(page.locator('#reviewTagsContainer')).toContainText('generated');
     const result = page.waitForResponse(response => response.url().endsWith('/prompt_manager/autotag/apply'));
     await page.locator('#applyReviewBtn').click();
     expect((await (await result).json()).success).toBe(true);
     const data = await (await request.get('/prompt_manager/recent?limit=20')).json();
-    expect(data.results.find(prompt => prompt.text === 'Cat portrait').tags).toEqual(['cats']);
-    expect(data.results.find(prompt => prompt.text === 'Dog landscape').tags).toEqual(['dogs']);
-    const tagged = await (await request.get('/prompt_manager/images/output?mode=workspace&tags=sandstone')).json();
-    expect(tagged.images.map(image => `${image.root_index}:${image.path}`)).toEqual(['0:shared/same.png']);
+    expect(data.results.find(prompt => prompt.text === 'Cat portrait').tags).toContain('generated');
+    expect(data.results.find(prompt => prompt.text === 'Dog landscape').tags).not.toContain('generated');
 });
 
 test('actual Tags page reloads the selected filter and opens its image viewer', async ({ page }) => {
@@ -199,7 +190,7 @@ test('gallery infinite scroll appends a real backend page while retaining existi
     await expect(await request.post('/__test__/reset', { data: { extra_images: 108 } })).toBeOK();
     await page.goto('/prompt_manager/gallery');
     await expect(page.locator('#galleryGrid .image-item')).toHaveCount(100);
-    await page.locator('#pageOptionsBtn').click();
+    await page.locator('#settingsBtn').click();
     await page.locator('#infiniteScrollToggle').check();
     await page.locator('#saveSettingsBtn').click();
     await expect(page.locator('#settingsModal')).toBeHidden();
@@ -219,6 +210,25 @@ async function promptSnapshot(request) {
     })).sort((a, b) => a.id - b.id);
 }
 
+async function downloadBackup(page) {
+    const downloading = page.waitForEvent('download');
+    await page.locator('#backupBtn').click();
+    const download = await downloading;
+    expect(download.suggestedFilename()).toMatch(/^prompts_backup_.*\.db$/);
+    expect(await download.failure()).toBeNull();
+    const chunks = [];
+    for await (const chunk of await download.createReadStream()) chunks.push(chunk);
+    const buffer = Buffer.concat(chunks);
+    expect(buffer.subarray(0, 16).toString()).toBe('SQLite format 3\0');
+    return { name: download.suggestedFilename(), mimeType: 'application/octet-stream', buffer };
+}
+
+async function chooseRestore(page, file) {
+    await page.locator('#restoreBtn').click();
+    await expect(page.locator('#restoreModal')).toBeVisible();
+    await page.locator('#restoreFileInput').setInputFiles(file);
+}
+
 function confirmNextDialog(page, accept, message) {
     page.once('dialog', async dialog => {
         expect(dialog.type()).toBe('confirm');
@@ -234,6 +244,95 @@ async function deletePromptButton(page, text) {
     return page.locator(`[data-action="delete"][data-prompt-id="${id}"]`);
 }
 
+test('downloaded backup restores deleted prompts, tags, and image links through the actual upload form', async ({ page, request }) => {
+    await page.goto('/prompt_manager/admin');
+    await expect(page.locator('.prompt-text')).toHaveCount(2);
+    const before = await promptSnapshot(request);
+    expect(before.map(prompt => prompt.tags)).toEqual([['cats'], ['dogs']]);
+    expect(before.every(prompt => prompt.images.length === 1)).toBe(true);
+    const backup = await downloadBackup(page);
+    const button = await deletePromptButton(page, 'Cat portrait');
+    confirmNextDialog(page, true, 'delete this prompt');
+    await button.click();
+    await expect(page.locator('.prompt-text')).toHaveCount(1);
+    await expect(await request.post('/prompt_manager/save', { data: { text: 'Added after backup', tags: ['temporary'] } })).toBeOK();
+    expect(await promptSnapshot(request)).not.toEqual(before);
+    await chooseRestore(page, backup);
+    confirmNextDialog(page, true, backup.name);
+    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();
+    await expect(page.locator('.prompt-text').filter({ hasText: 'Added after backup' })).toHaveCount(0);
+    expect(await promptSnapshot(request)).toEqual(before);
+    await page.goto('/prompt_manager/admin#/tags');
+    await page.locator('[data-tag-name="cats"]').click();
+    await expect(page.locator('#tagPromptsGrid')).toContainText('Cat portrait');
+    await page.locator('#tagPromptsGrid img').first().click();
+    await expect(page.locator('.viewer-canvas img')).toBeVisible();
+    await expect.poll(() => page.locator('.viewer-canvas img').evaluate(image => image.complete && image.naturalWidth > 0)).toBe(true);
+});
+
+test('restore validation and cancellation preserve live data and allow a valid retry', async ({ page, request }) => {
+    await page.goto('/prompt_manager/admin');
+    const before = await promptSnapshot(request);
+    const backup = await downloadBackup(page);
+    let uploads = 0;
+    page.on('request', request => { if (request.url().endsWith('/prompt_manager/restore')) uploads++; });
+    await page.locator('#restoreBtn').click();
+    await page.locator('#confirmRestore').click();
+    await expect(page.getByText('Please select a database file to restore', { exact: true })).toBeVisible();
+    await page.locator('#restoreFileInput').setInputFiles({ ...backup, name: 'backup.txt' });
+    await page.locator('#confirmRestore').click();
+    await expect(page.getByText('Please select a valid .db file', { exact: true })).toBeVisible();
+    expect(uploads).toBe(0);
+    await page.locator('#restoreFileInput').setInputFiles(backup);
+    confirmNextDialog(page, false, 'replace your current database');
+    await page.locator('#confirmRestore').click();
+    await expect(page.locator('#restoreModal')).toBeVisible();
+    expect(uploads).toBe(0);
+    await page.locator('#restoreFileInput').setInputFiles({ name: 'corrupt.db', mimeType: 'application/octet-stream', buffer: Buffer.from('not a SQLite database') });
+    confirmNextDialog(page, true, 'corrupt.db');
+    const rejected = page.waitForResponse(response => response.url().endsWith('/prompt_manager/restore'));
+    await page.locator('#confirmRestore').click();
+    expect((await rejected).status()).toBe(400);
+    await expect(page.getByText(/Restore failed:/)).toBeVisible();
+    await expect(page.locator('#restoreModal')).toBeVisible();
+    await expect(page.locator('#confirmRestore')).toBeEnabled();
+    expect(await promptSnapshot(request)).toEqual(before);
+    await page.locator('#restoreFileInput').setInputFiles(backup);
+    confirmNextDialog(page, true, backup.name);
+    await page.locator('#confirmRestore').click();
+    await expect(page.locator('#restoreModal')).toBeHidden();
+    expect(await promptSnapshot(request)).toEqual(before);
+});
+
+test('backup and restore recover from interrupted network requests without losing data', async ({ page, request }) => {
+    await page.goto('/prompt_manager/admin');
+    const before = await promptSnapshot(request);
+    await page.route('**/prompt_manager/backup', route => route.abort('failed'), { times: 1 });
+    await page.locator('#backupBtn').click();
+    await expect(page.getByText(/Backup failed:/)).toBeVisible();
+    const backup = await downloadBackup(page);
+    await chooseRestore(page, backup);
+    await page.route('**/prompt_manager/restore', route => route.abort('failed'), { times: 1 });
+    confirmNextDialog(page, true, backup.name);
+    await page.locator('#confirmRestore').click();
+    await expect(page.getByText(/Restore failed:/)).toBeVisible();
+    await expect(page.locator('#confirmRestore')).toBeEnabled();
+    await expect(page.locator('#restoreModal')).toBeVisible();
+    expect(await promptSnapshot(request)).toEqual(before);
+    confirmNextDialog(page, true, backup.name);
+    await page.locator('#confirmRestore').click();
+    await expect(page.locator('#restoreModal')).toBeHidden();
+    expect(await promptSnapshot(request)).toEqual(before);
+});
+
 test('prompt deletion requires confirmation and can retry after a network failure', async ({ page, request }) => {
     await page.goto('/prompt_manager/admin');
     const before = await promptSnapshot(request);
@@ -261,3 +360,98 @@ test('prompt deletion requires confirmation and can retry after a network failur
         await expect(await request.get(url)).toBeOK();
     }
 });
+
+// The duplicate scan reads the output root only, but the fixture's input root holds a different
+// shared/same.png. A bare /images/serve/<path> URL tries every gallery root in turn, so once the
+// output copy is deleted it answers 200 with the input copy: check each file in its own root.
+const serveIn = (root, path) => `/prompt_manager/images/serve/${path.split(/[\\/]/).map(encodeURIComponent).join('/')}?root=${root}`;
+const rootOf = url => new URL(url, 'http://gallery.test').searchParams.get('root');
+
+// Which copy the scan keeps depends on file times: the fixture stamps shared/same.png with the
+// wall clock, and the kernel can stamp its bulk copies a fraction of a millisecond earlier.
+// listOrder rewrites the finished scan's groups so a test can pick the order it needs.
+async function openDuplicateScan(page, request, listOrder = null) {
+    await expect(await request.post('/__test__/reset', { data: { extra_images: 2 } })).toBeOK();
+    if (listOrder) {
+        await page.route('**/prompt_manager/scan_duplicates/stream', async route => {
+            const response = await route.fetch();
+            const body = (await response.text()).replace(/^data: (.*)$/gm, (line, json) => {
+                const event = JSON.parse(json);
+                if (event.type !== 'complete') return line;
+                for (const group of event.duplicates) group.images = listOrder(group.images);
+                return `data: ${JSON.stringify(event)}`;
+            });
+            await route.fulfill({ response, body });
+        });
+    }
+    await page.goto('/prompt_manager/gallery');
+    await expect(page.locator('#galleryGrid .image-item')).toHaveCount(4);
+    const originals = await page.locator('#galleryGrid img[data-original]').evaluateAll(images => images.map(image => image.dataset.original));
+    const output = rootOf(originals.find(url => url.includes('/bulk/')));
+    const input = rootOf(originals.find(url => url.includes('/shared/same.png') && rootOf(url) !== output));
+    expect(output).not.toBeNull();
+    expect(input).not.toBeNull();
+    await page.locator('#settingsBtn').click();
+    await page.locator('#scanDuplicatesBtn').click();
+    await expect(page.locator('#duplicatesCount')).toHaveText('1');
+    const candidates = page.locator('.duplicate-checkbox');
+    await expect(candidates).toHaveCount(2);
+    return { originals, output, input, candidates };
+}
+
+async function expectOnlySelectedGone(page, request, { originals, output, input }, selected, retained) {
+    expect((await request.get(serveIn(output, selected))).status()).toBe(404);
+    await expect(await request.get(serveIn(output, retained))).toBeOK();
+    await expect(await request.get(serveIn(input, 'shared/same.png'))).toBeOK();
+    await page.reload();
+    await expect(page.locator('#galleryGrid .image-item')).toHaveCount(3);
+    const remaining = await page.locator('#galleryGrid img[data-original]').evaluateAll(images => images.map(image => image.dataset.original));
+    expect(remaining).toHaveLength(originals.length - 1);
+    for (const url of remaining) {
+        expect(originals).toContain(url);
+        await expect(await request.get(url)).toBeOK();
+    }
+}
+
+test('duplicate cleanup cancels safely and deletes only the selected file after a retry', async ({ page, request }) => {
+    const scan = await openDuplicateScan(page, request);
+    const { output, candidates } = scan;
+    const selected = await candidates.first().getAttribute('data-image-path');
+    const retained = await candidates.last().getAttribute('data-image-path');
+    await candidates.first().check();
+    let deletes = 0;
+    page.on('request', request => { if (request.url().endsWith('/delete_duplicate_images')) deletes++; });
+    confirmNextDialog(page, false, 'permanently delete 1 duplicate image files');
+    await page.locator('#removeDuplicatesBtn').click();
+    expect(deletes).toBe(0);
+    await expect(await request.get(serveIn(output, selected))).toBeOK();
+    await page.route('**/prompt_manager/delete_duplicate_images', route => route.abort('failed'), { times: 1 });
+    confirmNextDialog(page, true, 'permanently delete 1 duplicate image files');
+    await page.locator('#removeDuplicatesBtn').click();
+    await expect(page.getByText('Failed to delete duplicate images', { exact: true })).toBeVisible();
+    await expect(page.locator('#removeDuplicatesBtn')).toBeEnabled();
+    await expect(await request.get(serveIn(output, selected))).toBeOK();
+    confirmNextDialog(page, true, 'permanently delete 1 duplicate image files');
+    const deleted = page.waitForResponse(response => response.url().endsWith('/delete_duplicate_images'));
+    await page.locator('#removeDuplicatesBtn').click();
+    expect((await (await deleted).json())).toMatchObject({ success: true, deleted_count: 1, failed_count: 0 });
+    await expect(page.locator('#duplicatesModal')).toBeHidden();
+    await expectOnlySelectedGone(page, request, scan, selected, retained);
+});
+
+test('deleting a duplicate whose path another gallery root also holds removes only the scanned copy', async ({ page, request }) => {
+    // The order CI saw: a bulk copy stamped first, so shared/same.png is the first Delete candidate.
+    const ciOrder = ['bulk/0000.png', 'shared/same.png', 'bulk/0001.png'];
+    const rank = image => ciOrder.indexOf(image.path.replace(/\\/g, '/'));
+    const scan = await openDuplicateScan(page, request, images => [...images].sort((a, b) => rank(a) - rank(b)));
+    const selected = await scan.candidates.first().getAttribute('data-image-path');
+    const retained = await scan.candidates.last().getAttribute('data-image-path');
+    expect(selected.replace(/\\/g, '/')).toBe('shared/same.png');
+    await scan.candidates.first().check();
+    confirmNextDialog(page, true, 'permanently delete 1 duplicate image files');
+    const deleted = page.waitForResponse(response => response.url().endsWith('/delete_duplicate_images'));
+    await page.locator('#removeDuplicatesBtn').click();
+    expect((await (await deleted).json())).toMatchObject({ success: true, deleted_count: 1, failed_count: 0 });
+    await expect(page.locator('#duplicatesModal')).toBeHidden();
+    await expectOnlySelectedGone(page, request, scan, selected, retained);
+});

tests/browser/workspace-activity.spec.mjs

@@ -1088,36 +1088,6 @@ test('a held legacy job and the health check show no tiles, no Results and no ma
     await expect(toast(page)).toHaveText('Health check finished.');
 });
 
-// #328: a tagging model download is a job of its own kind with no byte progress and no Cancel; Activity shows it
-// through the generic held view (its title, status line and an indeterminate bar), then its end toast.
-test('a held model download shows its title, an indeterminate bar and no Cancel; its end toast follows', async ({ page, request }) => {
-    await page.setViewportSize({ width: 1600, height: 1100 });
-    const title = 'Tagging model download · WD14 ViT';
-    await expect(await request.post('/__test__/tagging/reset')).toBeOK();
-    await expect(await request.post('/__test__/tagging/download', { data: { mode: 'hold' } })).toBeOK();
-    try {
-        const response = await request.post('/prompt_manager/jobs/model-download', { data: { model_type: 'wd14-vit' } });
-        expect(response.status()).toBe(202);
-        const job = (await response.json()).job;
-        expect([job.kind, job.title, job.cancellable]).toEqual(['model_download', title, false]);
-        await page.goto(`${workspace}#/activity`);
-        const item = items(page).filter({ has: page.getByRole('link', { name: new RegExp(`${title}$`) }) });
-        await expect(item.locator('progress')).not.toHaveAttribute('value');
-        await expect(item.getByRole('button', { name: 'Cancel job', exact: true })).toHaveCount(0);
-        await item.getByRole('link').click();
-        await expect(heading(page).locator('h1')).toHaveText(title);
-        await expect(progressSection(page).locator('.panel-heading > span.small')).toHaveText('Downloading WD14 ViT (~400 MB)');
-        await expect(progressSection(page).locator('progress')).not.toHaveAttribute('value');
-        await expect(progressSection(page).locator('dl.stat-row')).toHaveCount(0);
-        await expect(heading(page).getByRole('button', { name: /^Cancel/ })).toHaveCount(0);
-        await expect(await request.post('/__test__/tagging/download', { data: { mode: 'succeed' } })).toBeOK();
-        await expect(toast(page)).toHaveText(`${title} finished.`);
-        await expect(heading(page).locator('p.muted')).toHaveText(/^Finished \d\d:\d\d$/);
-    } finally {
-        await request.post('/__test__/tagging/reset');
-    }
-});
-
 // S5 review I3: a thumbnail job with nothing to generate ends on the server's final line ("No previews to generate · N
 // already up to date"), never on a stale "Processing file 0 of 0" under the Completed chip.
 test('a finished thumbnail job with nothing to do says so', async ({ page, request }) => {

tests/browser/workspace-history.spec.mjs

@@ -1,6 +1,5 @@
 import {startCoverage,saveCoverage} from '../../tools/vendor/browser-coverage.mjs';
 import {test,expect} from './fixtures.mjs';
-import {armUnseenRestores,unseenRestore} from './unseen-restore.mjs';
 import {readFile,writeFile} from 'node:fs/promises';
 import {createHash} from 'node:crypto';
 
@@ -17,13 +16,13 @@ const marker=(page,id,anchor='10')=>recorded(page).locator(`button[data-run-id="
 const exact=async locator=>locator.evaluate(node=>node.textContent);
 
 test.beforeEach(async({page,request,browserName})=>{
-    await startCoverage(page,browserName);await armUnseenRestores(page);page.historyErrors=[];page.on('pageerror',error=>page.historyErrors.push(error.message));
+    await startCoverage(page,browserName);page.historyErrors=[];page.on('pageerror',error=>page.historyErrors.push(error.message));
     const reset=await request.post('/__test__/reset',{data:{chronological_history:true}});await expect(reset).toBeOK();page.fixture=await reset.json();
 });
 test.afterEach(async({page,browserName})=>{await saveCoverage(page,browserName);expect(page.historyErrors).toEqual([]);});
 
 const command=async(request,data)=>{const response=await request.post('/__test__/history/commands',{data});await expect(response).toBeOK();return response.json();};
-const restoreSnapshot=async(page,request,bytes)=>{const response=await unseenRestore(page,()=>request.post('/prompt_manager/restore',{multipart:{database_file:{name:'history.db',mimeType:'application/octet-stream',buffer:bytes}}}));await expect(response).toBeOK();expect((await response.json()).success).toBe(true);};
+const restoreSnapshot=async(request,bytes)=>{const response=await request.post('/prompt_manager/restore',{multipart:{database_file:{name:'history.db',mimeType:'application/octet-stream',buffer:bytes}}});await expect(response).toBeOK();expect((await response.json()).success).toBe(true);};
 const historyRead=async(request,id)=>{const response=await request.get(`/prompt_manager/library/${id}/history`);await expect(response).toBeOK();return response.json();};
 const frozenContexts=contexts=>contexts.map(({navigation,positive_prompt_id,negative_prompt_id,pair_id,...frozen})=>frozen);
 const immutableReceipts=items=>items.map(({current_candidate,...receipt})=>receipt);
@@ -63,7 +62,7 @@ for(const boundary of ['window','detail','candidate','inspection','media']) test
     await command(request,{action:'arm',boundary});const pending=request.get(target);
     try {
         await expect.poll(async()=> (await(await request.get('/__test__/history/checkpoint')).json()).entered).toBe(true);
-        await restoreSnapshot(page,request,bytes);
+        await restoreSnapshot(request,bytes);
     } finally {await command(request,{action:'release'});}
     const retired=await pending;expect(retired.status()).toBe(409);expect((await retired.json()).code).toBe('history-changed');
     for(const url of [`/prompt_manager/library/${f.detail_id}/history?limit=1&cursor=${encodeURIComponent(firstWindow.next_cursor)}`,`${base}?epoch=${epoch}`,`${base}/outputs?epoch=${epoch}`,`${base}/outputs?epoch=${epoch}&cursor=${encodeURIComponent(outputs.next_cursor)}`,media.url,media.thumbnail_url,media.inspection_url]) {
@@ -131,7 +130,7 @@ test('archive delete merge and prune preserve frozen evidence without repairing
 
 test('actual restore with reused numeric owner rejects stale history and offers explicit saved recovery',async({page,request})=>{
     const f=page.fixture;await open(page,f.detail_id);const original=await exact(saved(page).getByRole('region',{name:'Positive prompt',exact:true}).locator('p.prompt-text'));
-    const source=await request.get('/__test__/history/reused-snapshot');await expect(source).toBeOK();await restoreSnapshot(page,request,await source.body());
+    const source=await request.get('/__test__/history/reused-snapshot');await expect(source).toBeOK();await restoreSnapshot(request,await source.body());
     await marker(page,f.runs.shared).click();await expect(dialog(page)).toContainText('Recorded evidence changed');await page.keyboard.press('Escape');
     await expect(page.locator('.library-parent-status')).toContainText('changed');expect(await exact(saved(page).getByRole('region',{name:'Positive prompt',exact:true}).locator('p.prompt-text'))).toBe(original);
     await expect(recorded(page).getByRole('button',{name:'Reload recorded history',exact:true})).toBeVisible();
@@ -143,12 +142,12 @@ for(const outcome of ['success','error'])test(`delayed actual old browser ${outc
     const f=page.fixture;await open(page,f.detail_id);const snapshot=await request.get('/__test__/history/snapshot');const bytes=await snapshot.body();
     let entered,release;const started=new Promise(resolve=>{entered=resolve;}),held=new Promise(resolve=>{release=resolve;});
     await page.route(new RegExp(`/history/runs/${f.runs.shared}\\?`),async route=>{
-        if(outcome==='error')await restoreSnapshot(page,request,bytes);
+        if(outcome==='error')await restoreSnapshot(request,bytes);
         const response=await route.fetch();expect(response.status()).toBe(outcome==='success'?200:409);entered();await held;
         await route.fulfill({response}).catch(()=>{});
     });
     try {
-        await marker(page,f.runs.shared).click();await started;if(outcome==='success')await restoreSnapshot(page,request,bytes);
+        await marker(page,f.runs.shared).click();await started;if(outcome==='success')await restoreSnapshot(request,bytes);
         await page.evaluate(()=>{location.hash='#/overview';});await expect(page.locator('#workspace-main h1')).toHaveText('Overview');release();
         await page.unroute(new RegExp(`/history/runs/${f.runs.shared}\\?`));await open(page,f.detail_id);
         await expect(recorded(page).locator('button[data-run-id]')).toHaveCount(0);
@@ -259,7 +258,7 @@ test('inspection first discovers a real restore and immediately retires every su
                 if(changed)window.recordedRecoveryStates.push({receipts:run.querySelectorAll('[data-receipt]').length,active:[...run.querySelectorAll('[data-send-role],[data-copy-role],[data-view-receipt]')].filter(node=>!node.disabled&&node.checkVisibility()).length});
             });observer.observe(run,{subtree:true,childList:true,attributes:true,characterData:true});
         });
-        await restoreSnapshot(page,request,await snapshot.body());
+        await restoreSnapshot(request,await snapshot.body());
     } finally {await command(request,{action:'release'});}
     const response=await inspectionRead;expect(response.status()).toBe(409);expect((await response.json()).code).toBe('history-changed');
     await expect(dialog(page).locator('.recorded-run-status')).toContainText('Recorded evidence changed');

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,253 +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']]);
-});
-
-// #392 (D135): file-manager selection beyond the concept's checkbox.
-const selectedCount = page => bulkbar(page).locator('.bulkbar > strong');
-const cardAt = (page, index) => page.locator(`article[data-image-key][data-index="${index}"]`);
-const boxAt = (page, index) => cardAt(page, index).getByRole('checkbox', { name: /^Select / });
-const checkedIndexes = page => page.locator('article[data-image-key]').evaluateAll(nodes => nodes
-    .filter(node => node.querySelector('.image-overlays input[type="checkbox"]').checked)
-    .map(node => Number(node.dataset.index)).sort((a, b) => a - b));
-const range = (from, to) => Array.from({ length: to - from + 1 }, (_, index) => from + index);
-async function bulkReset(page, request) {
-    await page.addInitScript(() => { window.IntersectionObserver = undefined; });
-    await expect(await request.post('/__test__/reset', { data: { extra_images: 200 } })).toBeOK();
-    await page.goto(workspace);
-    await expect(cards(page)).toHaveCount(40);
-}
-/** A touch press on `locator` the way a finger makes one: pointerdown, (held), pointerup. */
-const touchDown = locator => locator.evaluate(node => {
-    const { left, top } = node.getBoundingClientRect();
-    node.dispatchEvent(new PointerEvent('pointerdown', { bubbles: true, isPrimary: true, pointerType: 'touch', clientX: left + 5, clientY: top + 5 }));
-});
-const touchUpAndClick = locator => locator.evaluate(node => {
-    node.dispatchEvent(new PointerEvent('pointerup', { bubbles: true, isPrimary: true, pointerType: 'touch' }));
-    // A tap's click counts one press (`detail` 1); a keyboard click (and `HTMLElement.click()`) counts none.
-    node.dispatchEvent(new MouseEvent('click', { bubbles: true, cancelable: true, detail: 1 }));
-});
-async function touchTap(locator) {
-    await touchDown(locator);
-    await touchUpAndClick(locator);
-}
-
-test('Shift+click selects a range across an appended batch in Grid, List and Masonry', async ({ page, request }) => {
-    await bulkReset(page, request);
-    await page.getByRole('button', { name: 'Load more images', exact: true }).click();
-    await expect(caption(page)).toContainText('80 of 202 images');
-    for (const mode of ['Grid', 'List', 'Masonry']) {
-        await page.getByRole('group', { name: 'Image layout', exact: true }).getByRole('button', { name: mode, exact: true }).click();
-        // The anchor is the last image toggled on its own (List hides the concept's checkbox: the card carries it).
-        await cardAt(page, 3).locator('.media-info h3').click({ modifiers: ['ControlOrMeta'] });
-        await expect(selectedCount(page)).toHaveText('1 selected');
-        // The range runs into the second batch (index 40 on), and backwards from the same anchor.
-        await cardAt(page, 45).locator('.media-info h3').click({ modifiers: ['Shift'] });
-        await expect(selectedCount(page)).toHaveText('43 selected');
-        expect(await checkedIndexes(page)).toEqual(range(3, 45));
-        await cardAt(page, 0).locator('.media-info h3').click({ modifiers: ['Shift'] });
-        await expect(selectedCount(page)).toHaveText('46 selected');
-        expect(await checkedIndexes(page)).toEqual(range(0, 45));
-        await expect(page.locator('dialog[open]')).toHaveCount(0);
-        if (mode !== 'List') {
-            // A Shift+click on a checkbox gives its range the box's new state: here, unchecked.
-            await boxAt(page, 3).uncheck();
-            await boxAt(page, 10).click({ modifiers: ['Shift'] });
-            await expect(boxAt(page, 10)).not.toBeChecked();
-            await expect(selectedCount(page)).toHaveText('38 selected');
-            expect(await checkedIndexes(page)).toEqual([0, 1, 2, ...range(11, 45)]);
-        }
-        await bulkbar(page).getByRole('button', { name: 'Clear', exact: true }).click();
-        await expect(bulkbar(page)).toBeEmpty();
-    }
-});
-
-test('Ctrl/Cmd+click toggles a card without opening it, and a plain click still opens the viewer', async ({ page }) => {
-    await page.goto(workspace);
-    await expect(cards(page)).toHaveCount(2);
-    const first = cards(page).first();
-    const inspectorBefore = await details(page).innerText();
-    await first.getByRole('button', { name: 'Open same.png', exact: true }).click({ modifiers: ['ControlOrMeta'] });
-    await expect(selectedCount(page)).toHaveText('1 selected');
-    await expect(checkbox(first, 'same.png')).toBeChecked();
-    await cards(page).last().getByRole('button', { name: 'Inspect same.png', exact: true }).click({ modifiers: ['ControlOrMeta'] });
-    await expect(selectedCount(page)).toHaveText('2 selected');
-    await star(first, 'same.png').click({ modifiers: ['ControlOrMeta'] });
-    await expect(selectedCount(page)).toHaveText('1 selected');
-    await expect(star(first, 'same.png')).toHaveAttribute('aria-pressed', 'false');
-    await expect(page.locator('dialog[open]')).toHaveCount(0);
-    expect(await details(page).innerText()).toBe(inspectorBefore);
-    // A plain click keeps its meaning: the image opens the viewer.
-    await first.getByRole('button', { name: 'Open same.png', exact: true }).click();
-    await expect(page.locator('#viewer-dialog[open]')).toHaveCount(1);
-    await expect(selectedCount(page)).toHaveText('1 selected');
-});
-
-test('Ctrl/Cmd+A, Select all N matching and Add tags tag every matching image on the server', async ({ page, request }) => {
-    await bulkReset(page, request);
-    // Ctrl/Cmd+A in the search box stays the field's own.
-    await search(page).focus();
-    await page.keyboard.press('ControlOrMeta+a');
-    await expect(bulkbar(page)).toBeEmpty();
-    await cardAt(page, 0).getByRole('button', { name: /^Open / }).focus();
-    await page.keyboard.press('ControlOrMeta+a');
-    await expect(selectedCount(page)).toHaveText('40 selected');
-    const offer = bulkbar(page).getByRole('button', { name: 'Select all 202 matching', exact: true });
-    await expect(offer).toBeVisible();
-    await expect(bulkbar(page).locator('.bulkbar > *').nth(1)).toHaveText('Select all 202 matching');
-    await offer.click();
-    await expect(selectedCount(page)).toHaveText('All 202 matching selected');
-    await expect(offer).toHaveCount(0);
-    await expect(bulkbar(page).getByRole('button', { name: 'Export metadata', exact: true })).toHaveAttribute('aria-disabled', 'true');
-    // A later batch arrives checked.
-    await page.getByRole('button', { name: 'Load more images', exact: true }).click();
-    await expect(caption(page)).toContainText('80 of 202 images');
-    await expect(boxAt(page, 70)).toBeChecked();
-    await expect(selectedCount(page)).toHaveText('All 202 matching selected');
-    // Unchecking one image leaves "all matching": the other loaded images stay selected.
-    await boxAt(page, 0).uncheck();
-    await expect(selectedCount(page)).toHaveText('79 selected');
-    await expect(bulkbar(page).getByRole('button', { name: 'Export metadata', exact: true })).not.toHaveAttribute('aria-disabled', 'true');
-    await cardAt(page, 1).getByRole('button', { name: /^Open / }).focus();
-    await page.keyboard.press('ControlOrMeta+a');
-    await bulkbar(page).getByRole('button', { name: 'Select all 202 matching', exact: true }).click();
-    await expect(selectedCount(page)).toHaveText('All 202 matching selected');
-    // Add tags sends the listing filter, not 202 identities, and the server tags every match.
-    await bulkbar(page).getByRole('button', { name: 'Add tags', exact: true }).click();
-    const dialog = page.getByRole('dialog', { name: 'Tag selected images', exact: true });
-    await dialog.getByRole('textbox', { name: 'Tags, separated by commas', exact: true }).fill('picked392');
-    const started = page.waitForRequest(item => item.method() === 'POST' && new URL(item.url()).pathname === '/prompt_manager/jobs/image-tags');
-    await dialog.getByRole('button', { name: 'Apply', exact: true }).click();
-    expect((await started).postDataJSON()).toEqual({ mode: 'add', filter: { sort: 'newest' }, tags: ['picked392'] });
-    await expect.poll(async () => (await (await request.get('/prompt_manager/images/output?mode=workspace&limit=1&tags=picked392')).json()).total,
-        { timeout: 20000 }).toBe(202);
-    await expect(selectedCount(page)).toHaveText('All 202 matching selected');
-    // Escape in the grid clears the selection.
-    await cardAt(page, 2).getByRole('button', { name: /^Open / }).focus();
-    await page.keyboard.press('Escape');
-    await expect(bulkbar(page)).toBeEmpty();
-    await expect(boxAt(page, 2)).not.toBeChecked();
-});
-
-test('Shift+arrow keys extend the selection from the focused card, and Escape in the bar clears it', async ({ page, request }) => {
-    await bulkReset(page, request);
-    await cardAt(page, 0).getByRole('button', { name: /^Open / }).focus();
-    await page.keyboard.press('Shift+ArrowRight');
-    await page.keyboard.press('Shift+ArrowRight');
-    await expect(cardAt(page, 2).getByRole('button', { name: /^Open / })).toBeFocused();
-    await expect(selectedCount(page)).toHaveText('3 selected');
-    expect(await checkedIndexes(page)).toEqual([0, 1, 2]);
-    // A plain arrow moves without selecting; Shift+End reaches the last loaded card from the same anchor.
-    await page.keyboard.press('ArrowRight');
-    await expect(selectedCount(page)).toHaveText('3 selected');
-    await page.keyboard.press('Shift+End');
-    await expect(selectedCount(page)).toHaveText('40 selected');
-    await bulkbar(page).getByRole('button', { name: 'Clear', exact: true }).focus();
-    await page.keyboard.press('Escape');
-    await expect(bulkbar(page)).toBeEmpty();
-    await expect(page.locator('#workspace-main h1')).toBeFocused();
-});
-
-test('a touch long-press starts selection mode, taps then toggle, and an empty selection ends it', async ({ page }, testInfo) => {
-    await page.goto(workspace);
-    await expect(cards(page)).toHaveCount(2);
-    const [first, second] = [cards(page).first(), cards(page).last()];
-    const open = card => card.getByRole('button', { name: 'Open same.png', exact: true });
-    await touchDown(open(first));
-    // The context menu of a held press belongs to the long press.
-    expect(await open(first).evaluate(node => !node.dispatchEvent(new MouseEvent('contextmenu', { bubbles: true, cancelable: true })))).toBe(true);
-    // Held: the long press selects the card once its delay passed.
-    await expect(selectedCount(page)).toHaveText('1 selected');
-    await touchUpAndClick(open(first));
-    await expect(page.locator('dialog[open]')).toHaveCount(0);
-    await expect(checkbox(first, 'same.png')).toBeChecked();
-    // Taps now toggle instead of opening.
-    if (testInfo.project.name === 'touch') await open(second).tap();
-    else await touchTap(open(second));
-    await expect(selectedCount(page)).toHaveText('2 selected');
-    // A keyboard Enter keeps its meaning in touch selection mode: the image opens.
-    await open(first).focus();
-    await page.keyboard.press('Enter');
-    await expect(page.locator('#viewer-dialog[open]')).toHaveCount(1);
-    await page.keyboard.press('Escape');
-    await expect(page.locator('#viewer-dialog[open]')).toHaveCount(0);
-    await expect(selectedCount(page)).toHaveText('2 selected');
-    await touchTap(open(first));
-    await touchTap(open(second));
-    await expect(bulkbar(page)).toBeEmpty();
-    await expect(page.locator('dialog[open]')).toHaveCount(0);
-    // The selection is empty, so touch selection mode ended: a tap opens the image again.
-    await touchTap(open(first));
-    await expect(page.locator('#viewer-dialog[open]')).toHaveCount(1);
-});
-
-test('all matching sets the category through the listing filter and survives a return visit as the loaded images', async ({ page, request }) => {
-    await bulkReset(page, request);
-    await cardAt(page, 0).getByRole('button', { name: /^Open / }).focus();
-    await page.keyboard.press('ControlOrMeta+a');
-    await bulkbar(page).getByRole('button', { name: 'Select all 202 matching', exact: true }).click();
-    // The offer left with its press: focus moves to the bar's first action.
-    await expect(bulkbar(page).getByRole('button', { name: 'Add tags', exact: true })).toBeFocused();
-    await cardAt(page, 0).getByRole('button', { name: /^Open / }).focus();
-    await page.keyboard.press('ControlOrMeta+a');
-    await expect(selectedCount(page)).toHaveText('All 202 matching selected');
-    // Export metadata waits for loaded images: a press does nothing.
-    const exportButton = bulkbar(page).getByRole('button', { name: 'Export metadata', exact: true });
-    await expect(exportButton).toHaveAttribute('title', 'Export metadata reads each image in the browser, so it works on loaded images only.');
-    // No match linked (a stubbed answer): the nothing-linked sentence, and the selection stays.
-    await page.route('**/prompt_manager/bulk/category', route => route.fulfill({ json: { success: true, updated_count: 0, prompt_count: 0, skipped: 202 } }), { times: 1 });
-    const categorize = page.getByRole('dialog', { name: 'Categorize selected images', exact: true });
-    await bulkbar(page).getByRole('button', { name: 'Set category', exact: true }).click();
-    await categorize.getByRole('textbox', { name: 'Category', exact: true }).fill('Bulk392');
-    await categorize.getByRole('button', { name: 'Apply', exact: true }).click();
-    await expect(toast(page)).toHaveText("None of the selected images is linked to a saved prompt, so there is no prompt category to set.");
-    await expect(selectedCount(page)).toHaveText('All 202 matching selected');
-    // The real write: one request with the filter, every matching image's positive changes.
-    await bulkbar(page).getByRole('button', { name: 'Set category', exact: true }).click();
-    await categorize.getByRole('textbox', { name: 'Category', exact: true }).fill('Bulk392');
-    const posted = page.waitForRequest(item => item.method() === 'POST' && new URL(item.url()).pathname === '/prompt_manager/bulk/category');
-    await categorize.getByRole('button', { name: 'Apply', exact: true }).click();
-    expect((await posted).postDataJSON()).toEqual({ images_filter: { sort: 'newest' }, category: 'Bulk392' });
-    await expect(toast(page)).toHaveText(/^Category set on \d+ prompts?\.$/);
-    await expect(bulkbar(page)).toBeEmpty();
-    const filtered = await (await request.get('/prompt_manager/images/output?mode=workspace&limit=1&category=Bulk392')).json();
-    expect(filtered.total).toBe(202);
-    // A return visit keeps "all matching" as the loaded images, and the offer shows again.
-    await cardAt(page, 0).getByRole('button', { name: /^Open / }).focus();
-    await page.keyboard.press('ControlOrMeta+a');
-    await bulkbar(page).getByRole('button', { name: 'Select all 202 matching', exact: true }).click();
-    await page.evaluate(() => { window.location.hash = '/overview'; });
-    await expect(page.locator('#workspace-main h1')).toHaveText('Overview');
-    await page.evaluate(() => { window.location.hash = '/images'; });
-    await expect(selectedCount(page)).toHaveText('40 selected');
-    await expect(bulkbar(page).getByRole('button', { name: 'Select all 202 matching', exact: true })).toBeVisible();
-    // Escape in the bar with nothing selected does nothing; with a selection it clears.
-    await bulkbar(page).getByRole('button', { name: 'Clear', exact: true }).focus();
-    await page.keyboard.press('Escape');
-    await expect(bulkbar(page)).toBeEmpty();
-});
-
-test('all matching over 10,000 images says so before any dialog or request', async ({ page, request }) => {
-    await page.route(url => url.pathname === '/prompt_manager/images/output' && url.searchParams.get('limit') !== '1', async route => {
-        const response = await route.fetch();
-        const body = await response.json();
-        await route.fulfill({ response, json: { ...body, total: 20002 } });
-    });
-    await bulkReset(page, request);
-    await cardAt(page, 0).getByRole('button', { name: /^Open / }).focus();
-    await page.keyboard.press('ControlOrMeta+a');
-    await bulkbar(page).getByRole('button', { name: 'Select all 20,002 matching', exact: true }).click();
-    await expect(selectedCount(page)).toHaveText('All 20,002 matching selected');
-    let posted = 0;
-    page.on('request', item => { if (item.method() === 'POST') posted += 1; });
-    for (const action of ['Set category', 'Add tags', 'Auto-tag selected']) {
-        await bulkbar(page).getByRole('button', { name: action, exact: true }).click();
-        await expect(toast(page)).toHaveText('Narrow the view to at most 10,000 images.');
-        await expect(page.locator('dialog[open]')).toHaveCount(0);
-    }
-    expect(posted).toBe(0);
+    const jobs = await (await request.get('/prompt_manager/jobs')).json();
+    expect(jobs.jobs).toEqual([]);
 });

tests/browser/workspace-library-editor.spec.mjs

@@ -1,7 +1,6 @@
 import {writeFile} from 'node:fs/promises';
 import {startCoverage,saveCoverage} from '../../tools/vendor/browser-coverage.mjs';
 import {test,expect} from './fixtures.mjs';
-import {armUnseenRestores,unseenRestore} from './unseen-restore.mjs';
 import {captureCanonicalState} from './history-canonical-comparison.mjs';
 import {inventoryOf,mapConcept,diffInventory} from './library-editor-canonical-comparison.mjs';
 
@@ -14,7 +13,7 @@ const RATINGS=[['5','5 / 5'],['4','4 / 5'],['3','3 / 5'],['2','2 / 5'],['1','1 /
 const editorDialog=page=>page.locator('dialog.library-editor');
 
 test.beforeEach(async({page,request,browserName})=>{
-    await startCoverage(page,browserName);await armUnseenRestores(page);
+    await startCoverage(page,browserName);
     const reset=await request.post('/__test__/library-editor/reset',{data:{}});await expect(reset).toBeOK();page.fixture=await reset.json();
     page.editorErrors=[];page.on('pageerror',error=>page.editorErrors.push(error.message));
     page.writes=[];page.on('request',item=>{if(item.method()!=='GET')page.writes.push({method:item.method(),url:new URL(item.url()).pathname,body:item.postDataJSON()});});
@@ -261,8 +260,7 @@ test('recovery states render inline and never replay a write',async({page,reques
     page.writes.length=0;
     dialog=await openEditor(page,{mode:'new'});await ready(dialog);
     const snapshot=await request.get('/__test__/library-editor/snapshot');await expect(snapshot).toBeOK();
-    const buffer=await snapshot.body();
-    const restore=await unseenRestore(page,()=>request.post('/prompt_manager/restore',{multipart:{database_file:{name:'editor.db',mimeType:'application/octet-stream',buffer}}}));
+    const restore=await request.post('/prompt_manager/restore',{multipart:{database_file:{name:'editor.db',mimeType:'application/octet-stream',buffer:await snapshot.body()}}});
     await expect(restore).toBeOK();page.writes.length=0;
     await field(dialog,'Title').fill('After restore');await field(dialog,'Positive prompt').fill('Restored storage prompt');await button(dialog,'Save').click();
     await expect(note(dialog)).toHaveText('Prompt storage was restored since this dialog opened. Nothing was saved.');
@@ -590,7 +588,7 @@ test('saved refresh failure retries only reads',async({page})=>{
 
 test('restored storage after a confirmed save or before an archive offers an explicit Library reload',async({page,request})=>{
     const f=page.fixture;const snapshot=await(await request.get('/__test__/library-editor/snapshot')).body();
-    const restore=()=>unseenRestore(page,()=>request.post('/prompt_manager/restore',{multipart:{database_file:{name:'editor.db',mimeType:'application/octet-stream',buffer:snapshot}}}));
+    const restore=()=>request.post('/prompt_manager/restore',{multipart:{database_file:{name:'editor.db',mimeType:'application/octet-stream',buffer:snapshot}}});
     await openHistory(page,f.positive_id);
     await page.route(`**/prompt_manager/library/${f.positive_id}`,async route=>{
         if(route.request().method()!=='PATCH')return route.continue();
@@ -617,7 +615,7 @@ test('restored storage after a confirmed save or before an archive offers an exp
 const DISCARDS='Leaving this dialog discards your entries.';
 test('restored storage before an Edit or Add negative save offers only the Library reload exit',async({page,request})=>{
     const f=page.fixture;const snapshot=await(await request.get('/__test__/library-editor/snapshot')).body();
-    const restore=()=>unseenRestore(page,()=>request.post('/prompt_manager/restore',{multipart:{database_file:{name:'editor.db',mimeType:'application/octet-stream',buffer:snapshot}}}));
+    const restore=()=>request.post('/prompt_manager/restore',{multipart:{database_file:{name:'editor.db',mimeType:'application/octet-stream',buffer:snapshot}}});
     await openHistory(page,f.positive_id);
     await page.getByRole('button',{name:'Edit metadata',exact:true}).click();let dialog=editorDialog(page);await ready(dialog);
     await expect(await restore()).toBeOK();

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

@@ -1,505 +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();
-}
-
-/**
- * The restore job's own end (#361): its progress stream closes when the job takes its final state, however long the
- * disk-bound publish takes (bounded by the test, not by a 5 s expect), and the job finished. The toast the page shows
- * for it is then the page's reaction alone, checked with the default timeout.
- */
-async function restoreFinished(request, id) {
-    await expect(await request.get(`/prompt_manager/jobs/${id}/events`)).toBeOK();
-    const { job } = await serverJson(request, `/prompt_manager/jobs/${id}`);
-    expect([job.kind, job.state]).toEqual(['restore', 'finished']);
-}
-
-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 restoreFinished(request, 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();
-    const { job } = await (await applied).json();
-    await restoreFinished(request, job.id);
-    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 Backup and Restore routes keep working and the admin page links to System', 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);
-    // #330: the admin page's Backup DB and Restore DB open System › Backup & export.
-    await page.goto('/prompt_manager/admin');
-    for (const id of ['#backupBtn', '#restoreBtn']) await expect(page.locator(id)).toHaveAttribute('href', 'workspace#/system/backups');
-});
-
-/** 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 restoreFinished(request, 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-diagnostics.spec.mjs

@@ -1,611 +0,0 @@
-import { startCoverage, saveCoverage } from '../../tools/vendor/browser-coverage.mjs';
-import { test, expect } from './fixtures.mjs';
-import { seedConcept } from './concept-inventory.mjs';
-
-// System › Diagnostics & logs (#249 System S12, #329) on the concept-shaped fixture, with the logger writing into this
-// server's own root (workspace_diagnostics_fixture.py): the meta-grid's live values, Run checks, the report, Inspect and
-// the test link (D110); the log viewer, statistics, downloads and runtime drafts (D109); and the reviewed rotated-log
-// cleanup (D100) and Clear all logs, which delete only inside that temporary log folder.
-const workspace = '/prompt_manager/workspace';
-const REPORT_URL = '/prompt_manager/system/diagnostics';
-const LOGS_URL = '/prompt_manager/logs';
-const CONFIG_URL = '/prompt_manager/logs/config';
-const PREVIEW_URL = '/prompt_manager/maintenance/preview';
-const APPLY_URL = '/prompt_manager/maintenance/apply';
-const TEST_LINK_URL = '/prompt_manager/diagnostics/test-link';
-const CHANGED = 'The log files changed since the review; nothing was deleted. Review again.';
-const KEY = 'sk-s12-browser-SECRET-0123456789';
-const LEVELS = ['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'];
-
-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();
-    await expect(await request.post('/__test__/logs/reset')).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__/logs/reset');
-    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 surfaceOf = (page, title) => layoutOf(page).locator(':scope > section.surface').filter({
-    has: page.getByRole('heading', { level: 2, name: title, exact: true }) });
-const cell = (page, term) => surfaceOf(page, 'Diagnostics').locator('.meta-grid > div').filter({
-    has: page.locator(`dt:text-is("${term}")`) }).locator('dd');
-const lines = page => page.locator('#log-lines > code');
-const operation = (page, title) => layoutOf(page).locator('.operation').filter({ has: page.locator(`h3:text-is("${title}")`) });
-const settingOf = (page, label) => layoutOf(page).locator('.setting-row').filter({ has: page.locator(`label:text-is("${label}")`) });
-const status = page => page.locator('#settings-status');
-const save = page => page.getByRole('button', { name: 'Save preferences', exact: true });
-
-async function serverJson(request, url) {
-    const response = await request.get(url);
-    await expect(response).toBeOK();
-    return response.json();
-}
-
-async function seedLogs(request, data = {}) {
-    await expect(await request.post('/__test__/logs/seed', { data })).toBeOK();
-}
-
-const names = async request => (await serverJson(request, '/__test__/logs/state')).entries.map(entry => entry.name);
-
-async function openDiagnostics(page) {
-    if (page.url().endsWith('#/system/diagnostics')) await page.reload();
-    else await page.goto(`${workspace}#/system/diagnostics`);
-    await expect(layoutOf(page).locator(':scope > section.surface')).toHaveCount(2);
-    await expect(lines(page)).not.toHaveText('Loading…');
-    await expect(cell(page, 'Database')).not.toHaveText('Loading…');
-    // The renderer line settles first: its text can move the rows below.
-    await expect(cell(page, 'Host renderers')).not.toHaveText('Loading…');
-    await expect(page.locator('#log-stats')).not.toHaveText('Loading…');
-    return layoutOf(page);
-}
-
-async function openFiles(page) {
-    const details = surfaceOf(page, 'Logs').locator('details');
-    if (!(await details.evaluate(node => node.open))) await details.locator('summary').click();
-    await expect(details.locator(':scope > p.small').first()).not.toHaveText('Loading…');
-    return details;
-}
-
-/** The levels of the viewer's lines, in order. */
-const shownLevels = async page => (await lines(page).textContent()).split('\n').filter(Boolean)
-    .map(line => line.split(/ +/)[1]);
-
-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: () => [{ id: '7', label: 'Prompt Manager', type: 'PromptManager', roles: ['positive'],
-                renderer: drawn }], preview() { throw new Error('unused'); }, apply() { throw new Error('unused'); } } });
-    }, renderer);
-    return host;
-}
-
-async function readBlob(download) {
-    const chunks = await (await download.createReadStream()).toArray();
-    return Buffer.concat(chunks).toString('utf8');
-}
-
-// ── Task 4: the Diagnostics surface ─────────────────────────────────────────────────────────────────────────────────
-
-test('meta-grid shows real database and source status, the pinned Viewer.js version and the host renderers',
-    async ({ page, request, context }) => {
-        const mutations = [];
-        page.on('request', item => { if (!['GET', 'HEAD', 'OPTIONS'].includes(item.method())) mutations.push(item.url()); });
-        await openDiagnostics(page);
-        const report = await serverJson(request, REPORT_URL);
-        const surface = surfaceOf(page, 'Diagnostics');
-        await expect(surface.locator(':scope > .panel-heading > h2')).toHaveText('Diagnostics');
-        await expect(surface.locator(':scope > .panel-heading > button')).toHaveText('Run checks');
-        await expect(surface.locator('.meta-grid dt')).toHaveText(['Database', 'Sources', 'Viewer.js', 'Host renderers']);
-        const images = report.checks.database.image_count;
-        await expect(cell(page, 'Database')).toHaveText(new RegExp(`^Readable · [\\d.]+ (bytes|KB|MB|GB) · ${images.toLocaleString('en-US')} images?$`));
-        // The size is the database's real size (`database_size_bytes`), never a missing key read as 0.
-        expect(report.database_info.database_size_bytes).toBeGreaterThan(0);
-        await expect(cell(page, 'Database')).not.toContainText('· 0 bytes ·');
-        const { configured, watching } = report.sources;
-        await expect(cell(page, 'Sources')).toHaveText(configured
-            ? `${configured} source${configured === 1 ? '' : 's'} · ${watching} watching`
-            : `ComfyUI output folder · ${watching ? 'watching' : 'manual scan'}`);
-        await expect(cell(page, 'Viewer.js')).toHaveText('1.15.2 · pinned vendor');
-        await expect(cell(page, 'Host renderers')).toHaveText('No ComfyUI window is open in this browser, so its renderer is not known.');
-        // A ComfyUI window with a Classic node: the line Integrations shows (D106).
-        const host = await fakeComfyWindow(context, 'classic');
-        await openDiagnostics(page);
-        await expect(cell(page, 'Host renderers')).toHaveText('Detected: Classic (1 ComfyUI window).');
-        await host.close();
-        // A refused read names the running job (D57's naming).
-        await page.route(`**${REPORT_URL}`, route => route.fulfill({ status: 409, contentType: 'application/json',
-            body: JSON.stringify({ success: false, code: 'busy', error: 'busy', running: { id: 'a'.repeat(32), title: 'Restore' } }) }));
-        await openDiagnostics(page);
-        await expect(cell(page, 'Database')).toHaveText('Busy: Restore is running.');
-        await page.unroute(`**${REPORT_URL}`);
-        await expect(await request.post('/__test__/system/fail', { data: { path: REPORT_URL, times: 1 } })).toBeOK();
-        await openDiagnostics(page);
-        await expect(cell(page, 'Sources')).toHaveText('Could not be read.');
-        expect(mutations).toEqual([]);
-    });
-
-test('Run checks opens the shared Health report', async ({ page, request }) => {
-    const before = await serverJson(request, '/__test__/system/digest');
-    await openDiagnostics(page);
-    const run = surfaceOf(page, 'Diagnostics').getByRole('button', { name: 'Run checks', exact: true });
-    await run.click();
-    await expect(dialog(page).locator('#modal-title')).toHaveText('Health report');
-    await expect(run).toHaveText('Run checks');
-    await dialog(page).getByRole('button', { name: 'Close', exact: true }).click();
-    await expect(dialog(page)).toHaveCount(0);
-    await expect(run).toBeFocused();
-    // The same report Overview reads: Overview's metric names it.
-    expect((await serverJson(request, '/prompt_manager/system/health')).report).toBeTruthy();
-    expect((await serverJson(request, '/__test__/system/digest')).rows).toEqual(before.rows);
-});
-
-test('report download goes through the api client and holds no secret or absolute path', async ({ page, request }) => {
-    const { revision } = await serverJson(request, '/prompt_manager/settings');
-    await expect(await request.post('/prompt_manager/lora/enable', { data: { enabled: false, trigger_words_enabled: false, path: '',
-        civitai_api_key: KEY, expected_revision: revision } })).toBeOK();
-    await openDiagnostics(page);
-    const reads = [];
-    page.on('request', item => { if (item.url().endsWith(REPORT_URL)) reads.push(item.url()); });
-    const download = page.waitForEvent('download');
-    await surfaceOf(page, 'Diagnostics').getByRole('button', { name: 'Download diagnostic report', exact: true }).click();
-    const file = await download;
-    expect(file.suggestedFilename()).toMatch(/^prompt-manager-diagnostics-\d{8}-\d{4}\.json$/);
-    await expect(toast(page)).toHaveText('Diagnostic report downloaded.');
-    expect(reads).toHaveLength(1);
-    const text = await readBlob(file);
-    const report = JSON.parse(text);
-    expect(report.host_renderers).toBe('No ComfyUI window is open in this browser, so its renderer is not known.');
-    expect(report.config.integrations.has_civitai_api_key).toBe(true);
-    expect(report.redacted).toBe(0);
-    expect(report.viewerjs).toBe('1.15.2');
-    expect(Object.keys(report.checks)).toEqual(['database', 'dependencies', 'comfyui_output', 'image_monitor']);
-    expect(text).not.toContain(KEY);
-    expect(text).not.toContain('pm-browser-');
-    const strings = [];
-    const walk = value => {
-        if (typeof value === 'string') strings.push(value);
-        else if (value && typeof value === 'object') Object.values(value).forEach(walk);
-    };
-    walk(report);
-    expect(strings.filter(value => /^(\/|[A-Za-z]:[\\/]|\\\\)/.test(value))).toEqual([]);
-    // A refused report names the job and saves nothing.
-    await page.route(`**${REPORT_URL}`, route => route.fulfill({ status: 409, contentType: 'application/json',
-        body: JSON.stringify({ success: false, code: 'busy', error: 'busy', running: { id: 'a'.repeat(32), title: 'Restore' } }) }));
-    let saved = false;
-    page.on('download', () => { saved = true; });
-    await surfaceOf(page, 'Diagnostics').getByRole('button', { name: 'Download diagnostic report', exact: true }).click();
-    await expect(toast(page)).toHaveText('Busy: Restore is running. Try again when it ends.');
-    await page.unroute(`**${REPORT_URL}`);
-    await page.route(`**${REPORT_URL}`, route => route.fulfill({ status: 500, contentType: 'application/json',
-        body: JSON.stringify({ success: false, error: 'The diagnostic report could not be built.' }) }));
-    await surfaceOf(page, 'Diagnostics').getByRole('button', { name: 'Download diagnostic report', exact: true }).click();
-    await expect(toast(page)).toHaveText('The diagnostic report could not be downloaded. Nothing was saved to this device.');
-    expect(saved).toBe(false);
-});
-
-test('Inspect opens the Inspect a file page and writes nothing', async ({ page, request }) => {
-    const before = await serverJson(request, '/__test__/system/digest');
-    const mutations = [];
-    page.on('request', item => { if (!['GET', 'HEAD', 'OPTIONS'].includes(item.method())) mutations.push(item.url()); });
-    await openDiagnostics(page);
-    const row = operation(page, 'Image-link diagnostics');
-    await expect(row.locator('p')).toHaveText('Check a file-to-prompt association without changing it.');
-    await row.getByRole('button', { name: 'Inspect', exact: true }).click();
-    await expect(page).toHaveURL(`${workspace}#/inspect`);
-    await expect(page.locator('#workspace-main h1')).toHaveText('Inspect a file');
-    expect(mutations).toEqual([]);
-    expect(await serverJson(request, '/__test__/system/digest')).toEqual(before);
-});
-
-test('Create test link confirms first and names the prompt', async ({ page, request }) => {
-    const [prompt] = (await serverJson(request, '/prompt_manager/recent?limit=1')).results;
-    const posts = [];
-    page.on('request', item => { if (item.url().endsWith(TEST_LINK_URL)) posts.push(item.postDataJSON()); });
-    await openDiagnostics(page);
-    const row = operation(page, 'Test image link');
-    await expect(row.locator('p')).toHaveText('Write a placeholder image record to check that linking works.');
-    const create = row.getByRole('button', { name: 'Create test link…', exact: true });
-    await expect(create).not.toHaveAttribute('aria-disabled', 'true');
-    await create.click();
-    await expect(dialog(page).locator('#modal-title')).toHaveText('Create test link');
-    await expect(dialog(page).locator('#modal-body > p')).toHaveText(new RegExp('^Writes a placeholder image record '
-        + `\\(prompt_manager_test_link\\.png\\) linked to prompt #${prompt.id} “.+”\\. Maintenance › Missing-file links removes it later\\.$`));
-    await dialog(page).getByRole('button', { name: 'Cancel', exact: true }).click();
-    await expect(dialog(page)).toHaveCount(0);
-    expect(posts).toEqual([]);
-    await create.click();
-    await dialog(page).getByRole('button', { name: 'Create', exact: true }).click();
-    await expect(toast(page)).toHaveText(/^Test link created \(image record \d+\)\.$/);
-    expect(posts).toEqual([{ prompt_id: prompt.id }]);
-    // A failed write says nothing was changed.
-    await page.route(`**${TEST_LINK_URL}`, route => route.fulfill({ status: 500, contentType: 'application/json',
-        body: JSON.stringify({ success: false, error: 'Test link failed' }) }));
-    await create.click();
-    await dialog(page).getByRole('button', { name: 'Create', exact: true }).click();
-    await expect(toast(page)).toHaveText('The test link could not be created. Nothing was changed.');
-    // With no prompt to link, the button is unavailable and says why.
-    await page.route('**/prompt_manager/recent?limit=1', route => route.fulfill({ status: 200, contentType: 'application/json',
-        body: JSON.stringify({ success: true, results: [] }) }));
-    await openDiagnostics(page);
-    await expect(operation(page, 'Test image link').locator('p'))
-        .toHaveText('Write a placeholder image record to check that linking works. Add a prompt first.');
-    await expect(operation(page, 'Test image link').getByRole('button')).toHaveAttribute('aria-disabled', 'true');
-});
-
-// ── Task 5: the log viewer, statistics and runtime settings ─────────────────────────────────────────────────────────
-
-test('level filter is minimum-level over all six choices', async ({ page, request }) => {
-    await seedLogs(request);
-    const urls = [];
-    page.on('request', item => { if (new URL(item.url()).pathname === LOGS_URL) urls.push(new URL(item.url()).search); });
-    await openDiagnostics(page);
-    const level = page.locator('#log-level');
-    await expect(level.locator('option')).toHaveText(['All levels', 'DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL']);
-    await expect(page.locator('label[for="log-level"]')).toHaveText('Level');
-    // All levels: the concept's four lines first, newest first, in its format.
-    await expect(lines(page)).toContainText('09:42:18 INFO  Scan completed: 12 enriched, 0 duplicate links\n'
-        + '09:42:18 WARNING 3 images have ambiguous prompt metadata\n09:39:04 INFO  Database backup verified\n'
-        + '09:38:52 INFO  Source monitor started: output');
-    for (const line of (await lines(page).textContent()).split('\n')) expect(line).toMatch(/^\d\d:\d\d:\d\d [A-Z]+ +\S/);
-    expect(urls.at(-1)).toBe('?limit=100');
-    for (const minimum of LEVELS) {
-        await level.selectOption(minimum);
-        await expect.poll(() => urls.at(-1)).toBe(`?limit=100&level=${minimum}`);
-        await expect(lines(page)).toContainText('CRITICAL The database could not be opened');
-        const shown = await shownLevels(page);
-        expect(shown.every(name => LEVELS.indexOf(name) >= LEVELS.indexOf(minimum)), `${minimum}: ${shown}`).toBe(true);
-        if (minimum === 'DEBUG') await expect(lines(page)).toContainText('DEBUG Thumbnail cache lookup');
-        if (minimum === 'WARNING') {
-            await expect(lines(page)).not.toContainText('Database backup verified');
-            await expect(lines(page)).toContainText('ERROR A source folder could not be read');
-        }
-    }
-    await level.selectOption('');
-    await expect.poll(() => urls.at(-1)).toBe('?limit=100');
-});
-
-test('Lines accepts 1 to 500 and sends nothing when invalid', async ({ page, request }) => {
-    await seedLogs(request, { filler: 30 });
-    const urls = [];
-    page.on('request', item => { if (new URL(item.url()).pathname === LOGS_URL) urls.push(new URL(item.url()).search); });
-    await openDiagnostics(page);
-    const limit = page.locator('#log-limit');
-    await expect(page.locator('label[for="log-limit"]')).toHaveText('Lines');
-    await expect(limit).toHaveValue('100');
-    expect(await limit.evaluate(node => [node.type, node.min, node.max, node.title]))
-        .toEqual(['number', '1', '500', 'Lines to show: a whole number from 1 to 500.']);
-    await limit.fill('20');
-    await limit.dispatchEvent('change');
-    await expect.poll(() => urls.at(-1)).toBe('?limit=20');
-    await expect.poll(async () => (await lines(page).textContent()).split('\n').length).toBe(20);
-    const sent = urls.length;
-    for (const value of ['0', '501', '2.5', '']) {
-        await limit.fill(value);
-        await limit.dispatchEvent('change');
-        await expect(limit).toHaveAttribute('aria-invalid', 'true');
-    }
-    // A Level change while Lines is invalid sends nothing either.
-    await page.locator('#log-level').selectOption('WARNING');
-    await page.evaluate(() => new Promise(resolve => requestAnimationFrame(() => requestAnimationFrame(resolve))));
-    expect(urls.length).toBe(sent);
-    await limit.fill('500');
-    await limit.dispatchEvent('change');
-    await expect(limit).not.toHaveAttribute('aria-invalid');
-    await expect.poll(() => urls.at(-1)).toBe('?limit=500&level=WARNING');
-});
-
-test('logs refresh handles empty, error and stale answers', async ({ page, request }) => {
-    await seedLogs(request);
-    await openDiagnostics(page);
-    const level = page.locator('#log-level');
-    const refresh = surfaceOf(page, 'Logs').getByRole('button', { name: 'Refresh', exact: true });
-    // Empty: nothing at this level once the buffer is cleared.
-    await expect(await request.post('/__test__/logs/reset')).toBeOK();
-    await level.selectOption('CRITICAL');
-    await expect(lines(page)).toHaveText('No log entries at this level.');
-    // Error.
-    await page.route(`**${LOGS_URL}?*`, route => route.fulfill({ status: 500, contentType: 'application/json',
-        body: JSON.stringify({ success: false, error: 'boom', logs: [] }) }));
-    await refresh.click();
-    await expect(lines(page)).toHaveText('The log could not be read.');
-    await page.unroute(`**${LOGS_URL}?*`);
-    // Stale: an older answer that arrives after a newer request never paints.
-    await seedLogs(request);
-    await expect(await request.post('/__test__/hold', { data: { path: LOGS_URL } })).toBeOK();
-    await level.selectOption('DEBUG');
-    await expect.poll(async () => (await serverJson(request, '/__test__/hold')).held[LOGS_URL] ?? 0).toBe(1);
-    await level.selectOption('ERROR');
-    await expect.poll(async () => (await serverJson(request, '/__test__/hold')).held[LOGS_URL] ?? 0).toBe(2);
-    await expect(await request.post('/__test__/release')).toBeOK();
-    await expect(lines(page)).toContainText('CRITICAL The database could not be opened');
-    await page.evaluate(() => new Promise(resolve => requestAnimationFrame(() => requestAnimationFrame(resolve))));
-    expect((await shownLevels(page)).every(name => ['ERROR', 'CRITICAL'].includes(name))).toBe(true);
-});
-
-test('log statistics show entries, errors, warnings, files and size', async ({ page, request }) => {
-    await seedLogs(request, { rotated: [2048, 1024], other: true, link: true, active: 512 });
-    await openDiagnostics(page);
-    const stats = page.getByRole('status', { name: 'Log statistics', exact: true });
-    await expect(stats).toHaveAttribute('id', 'log-stats');
-    const text = await stats.textContent();
-    const match = /^([\d,]+) entr(?:y|ies) in memory · (\d+) errors? · (\d+) warnings? · (\d+) files? · (.+) on disk$/.exec(text);
-    expect(match, text).not.toBeNull();
-    const [, entries, errors, warnings, files, size] = match;
-    expect(Number(entries.replace(/,/g, ''))).toBeGreaterThanOrEqual(7);
-    expect(Number(errors)).toBeGreaterThanOrEqual(2);
-    expect(Number(warnings)).toBeGreaterThanOrEqual(1);
-    // The active log, two rotated copies and the .bak; the link is not counted (Rule R).
-    expect(Number(files)).toBe(4);
-    expect(size).toMatch(/^[\d.]+ (bytes|KB|MB)$/);
-});
-
-test('Download log saves the active log', async ({ page, request }) => {
-    await seedLogs(request, { active: 300 });
-    await openDiagnostics(page);
-    const download = page.waitForEvent('download');
-    await surfaceOf(page, 'Logs').getByRole('button', { name: 'Download log', exact: true }).click();
-    const file = await download;
-    expect(file.suggestedFilename()).toBe('prompt_manager.log');
-    expect((await readBlob(file)).length).toBeGreaterThanOrEqual(300);
-    await page.route('**/prompt_manager/logs/download/**', route => route.fulfill({ status: 404, contentType: 'application/json',
-        body: JSON.stringify({ success: false, error: 'Log file not found' }) }));
-    await surfaceOf(page, 'Logs').getByRole('button', { name: 'Download log', exact: true }).click();
-    await expect(toast(page)).toHaveText('The log could not be downloaded.');
-});
-
-test('runtime level (including CRITICAL) and console logging save and say they apply until the server restarts',
-    async ({ page, request }) => {
-        const posts = [];
-        page.on('request', item => { if (item.method() === 'POST' && item.url().endsWith(CONFIG_URL)) posts.push(item.postDataJSON()); });
-        await openDiagnostics(page);
-        const level = settingOf(page, 'Runtime log level');
-        await expect(level.locator('p')).toHaveText('How much the server writes to the log. Applied until the server restarts.');
-        await expect(level.locator('option')).toHaveText(['INFO', 'WARNING', 'DEBUG', 'ERROR', 'CRITICAL']);
-        await expect(level.locator('select')).toHaveValue('INFO');
-        const consoleRow = settingOf(page, 'Console logging');
-        await expect(consoleRow.locator('p')).toHaveText('Print Prompt Manager’s warnings and errors in the ComfyUI console '
-            + '(everything at DEBUG). Applied until the server restarts.');
-        const toggle = consoleRow.locator('input[type="checkbox"]');
-        await expect(toggle).toBeChecked();
-        await level.locator('select').selectOption('CRITICAL');
-        await toggle.uncheck();
-        await expect(status(page)).toHaveText('Unsaved changes.');
-        await save(page).click();
-        await expect(status(page)).toHaveText('Applied until the server restarts.');
-        expect(posts).toEqual([{ level: 'CRITICAL', console_logging: false }]);
-        const { config } = await serverJson(request, CONFIG_URL);
-        expect([config.level, config.console_logging]).toEqual(['CRITICAL', false]);
-        // Read again on a fresh page: the server's values.
-        await openDiagnostics(page);
-        await expect(settingOf(page, 'Runtime log level').locator('select')).toHaveValue('CRITICAL');
-        await expect(settingOf(page, 'Console logging').locator('input[type="checkbox"]')).not.toBeChecked();
-        // Only the changed key is sent.
-        await settingOf(page, 'Runtime log level').locator('select').selectOption('DEBUG');
-        await save(page).click();
-        await expect(status(page)).toHaveText('Applied until the server restarts.');
-        expect(posts.at(-1)).toEqual({ level: 'DEBUG' });
-    });
-
-test('a refused runtime value is marked invalid', async ({ page }) => {
-    await page.route(`**${CONFIG_URL}`, route => (route.request().method() === 'POST'
-        ? route.fulfill({ status: 400, contentType: 'application/json', body: JSON.stringify({ success: false, error: 'Invalid log level' }) })
-        : route.continue()));
-    await openDiagnostics(page);
-    const select = settingOf(page, 'Runtime log level').locator('select');
-    await select.selectOption('WARNING');
-    await save(page).click();
-    await expect(status(page)).toHaveText('Some changes were not saved. Review the highlighted settings.');
-    await expect(select).toHaveAttribute('aria-invalid', 'true');
-    await expect(settingOf(page, 'Console logging').locator('input[type="checkbox"]')).not.toHaveAttribute('aria-invalid');
-    // The draft stays: an edit clears the mark.
-    await expect(select).toHaveValue('WARNING');
-    await select.selectOption('ERROR');
-    await expect(select).not.toHaveAttribute('aria-invalid');
-});
-
-test('runtime values that cannot be read stay disabled and say so', async ({ page }) => {
-    await page.route(`**${CONFIG_URL}`, route => route.fulfill({ status: 500, contentType: 'application/json',
-        body: JSON.stringify({ success: false, error: 'boom' }) }));
-    await openDiagnostics(page);
-    for (const label of ['Runtime log level', 'Console logging']) {
-        const row = settingOf(page, label);
-        await expect(row.locator('p.small')).toHaveText('The current value could not be read.');
-        await expect(row.locator('select, input[type="checkbox"]')).toBeDisabled();
-    }
-});
-
-// ── Task 6: log files, the reviewed cleanup and Clear all logs ─────────────────────────────────────────────────────
-
-const LOG_FOLDER = { rotated: [3000, 2048, 1024], other: true, link: true, active: 100 };
-const LINKS = process.platform === 'win32' ? 0 : 1;
-
-test('Review log cleanup lists only rotated copies and keeps the rest', async ({ page, request }) => {
-    await seedLogs(request, LOG_FOLDER);
-    const before = await names(request);
-    const previews = [];
-    page.on('request', item => { if (item.url().endsWith(PREVIEW_URL)) previews.push(item.postDataJSON()); });
-    await openDiagnostics(page);
-    const details = await openFiles(page);
-    await expect(details.locator(':scope > p.small').first()).toHaveText(/^prompt_manager\.log · [\d.]+ (bytes|KB) · rotated copies: 3$/);
-    await details.getByRole('button', { name: 'Review log cleanup', exact: true }).click();
-    await expect(dialog(page).locator('#modal-title')).toHaveText('Review maintenance plan');
-    await expect(dialog(page).locator('#modal-body > h3')).toHaveText('Rotated log copies');
-    expect(previews).toEqual([{ operation: 'rotated_logs', options: {} }]);
-    const grid = await dialog(page).locator('dl.meta-grid > div').evaluateAll(items => items.map(item =>
-        [item.querySelector('dt').textContent, item.querySelector('dd').textContent]));
-    expect(grid.map(([term]) => term)).toEqual(['Scope', 'Protected', 'Backup', 'Media on disk']);
-    expect(grid[0][1]).toMatch(/^3 rotated log copies · 5\.9 KB$/);
-    expect(grid[1][1]).toBe(['Kept: the active log', ...(LINKS ? ['Kept: 1 link'] : []), 'Kept: 1 other file'].join(' · '));
-    expect(grid[2][1]).toBe('Not needed: no library record changes');
-    expect(grid[3][1]).toBe('Deletes only the listed log files. No image, video or library record changes.');
-    await expect(dialog(page).locator('details > summary')).toHaveText('Listed files (3)');
-    await expect(dialog(page).locator('details pre')).toHaveText(/^prompt_manager\.log\.1 · 2\.9 KB · .+\nprompt_manager\.log\.2 · 2\.0 KB · .+\nprompt_manager\.log\.3 · 1\.0 KB · .+$/);
-    // No D55 backup box: nothing in the library changes.
-    await expect(dialog(page).locator('.notice')).toHaveCount(0);
-    await expect(dialog(page).getByRole('button', { name: 'Back up now' })).toHaveCount(0);
-    await dialog(page).getByRole('button', { name: 'Cancel', exact: true }).click();
-    await expect(dialog(page)).toHaveCount(0);
-    expect(await names(request)).toEqual(before);
-});
-
-test('Apply deletes exactly the listed files and Activity lists them', async ({ page, request }) => {
-    await seedLogs(request, LOG_FOLDER);
-    await openDiagnostics(page);
-    const details = await openFiles(page);
-    await details.getByRole('button', { name: 'Review log cleanup', 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}$/);
-    const job = await ended(request, page.url().split('/').pop());
-    expect([job.kind, job.state, job.title, job.counters.changed]).toEqual(['maintenance', 'finished', 'Rotated log copies', 3]);
-    await expect(toast(page)).toHaveText(/Rotated log copies (started|finished · 3 changed)/);
-    const main = page.locator('#workspace-main');
-    await expect(main.locator('h1')).toHaveText('Rotated log copies');
-    for (const name of ['prompt_manager.log.1', 'prompt_manager.log.2', 'prompt_manager.log.3']) await expect(main).toContainText(name);
-    // Only those three are gone: the active log, the user's .bak and the link are kept.
-    expect(await names(request)).toEqual(['prompt_manager.log', ...(LINKS ? ['prompt_manager.log.4'] : []), 'prompt_manager.log.bak']);
-});
-
-test('a rollover after the review deletes nothing and Activity offers Review again', async ({ page, request }) => {
-    await seedLogs(request, LOG_FOLDER);
-    await openDiagnostics(page);
-    const details = await openFiles(page);
-    await details.getByRole('button', { name: 'Review log cleanup', exact: true }).click();
-    await expect(dialog(page).locator('#modal-body > h3')).toHaveText('Rotated log copies');
-    await expect(await request.post('/__test__/logs/rotate')).toBeOK();
-    const rolled = await serverJson(request, '/__test__/logs/state');
-    await dialog(page).getByRole('button', { name: 'Apply reviewed operation', exact: true }).click();
-    await expect(page).toHaveURL(/#\/activity\/[0-9a-f]{32}$/);
-    const job = await ended(request, page.url().split('/').pop());
-    expect([job.state, job.scope.failure]).toEqual(['failed', 'plan-changed']);
-    await expect(page.locator('#workspace-main')).toContainText(CHANGED);
-    expect((await serverJson(request, '/__test__/logs/state')).entries.map(entry => entry.name))
-        .toEqual(rolled.entries.map(entry => entry.name));
-    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-body > h3')).toHaveText('Rotated log copies');
-    expect(previews).toEqual([{ operation: 'rotated_logs', options: {} }]);
-});
-
-test('Clear all logs states both counts, confirms first and reads everything again', async ({ page, request }) => {
-    await seedLogs(request, LOG_FOLDER);
-    const truncates = [];
-    page.on('request', item => { if (item.url().endsWith('/prompt_manager/logs/truncate')) truncates.push(item.postDataJSON()); });
-    await openDiagnostics(page);
-    await expect(lines(page)).toContainText('Database backup verified');
-    const details = await openFiles(page);
-    const clearRow = operation(page, 'Clear all logs');
-    await expect(clearRow.locator('p')).toHaveText('Empty the active log and delete its rotated copies.');
-    const clear = clearRow.getByRole('button', { name: 'Clear all logs…', exact: true });
-    await expect(clear).toHaveClass(/\bdanger\b/);
-    await clear.click();
-    await expect(dialog(page).locator('#modal-title')).toHaveText('Clear all logs');
-    await expect(dialog(page).locator('#modal-body > p')).toHaveText('Empties prompt_manager.log, deletes 3 rotated copies (5.9 KB) '
-        + 'and clears the lines shown here. The other files in the log folder are kept. This cannot be undone.');
-    await dialog(page).getByRole('button', { name: 'Cancel', exact: true }).click();
-    await expect(dialog(page)).toHaveCount(0);
-    expect(truncates).toEqual([]);
-    await clear.click();
-    await dialog(page).getByRole('button', { name: 'Clear', exact: true }).click();
-    await expect(toast(page)).toHaveText('Logs cleared · 3 rotated copies deleted.');
-    expect(truncates).toHaveLength(1);
-    // #389: Clear sends back exactly the files the dialog was built from, each with its identity string.
-    expect(truncates[0].expected.map(row => row.name).sort()).toEqual(['prompt_manager.log', 'prompt_manager.log.1',
-        'prompt_manager.log.2', 'prompt_manager.log.3']);
-    for (const row of truncates[0].expected) expect(row.identity).toMatch(/^\d+:\d+:\d+$/);
-    // Read again: the viewer, the file line and the list.
-    await expect(lines(page)).not.toContainText('Database backup verified');
-    await expect(details.locator(':scope > p.small').first()).toHaveText(/rotated copies: 0$/);
-    const kept = ['prompt_manager.log', 'prompt_manager.log.bak', ...(LINKS ? ['prompt_manager.log.4'] : [])];
-    // The server lists newest first: compare as a set.
-    await expect.poll(async () => (await details.locator('.operation-list h3').allTextContents()).sort()).toEqual([...kept].sort());
-    expect(await names(request)).toEqual(['prompt_manager.log', ...(LINKS ? ['prompt_manager.log.4'] : []), 'prompt_manager.log.bak']);
-});
-
-test('Clear all logs reads the files again before it states what it deletes', async ({ page, request }) => {
-    await seedLogs(request, { rotated: [1024], active: 100 });
-    await openDiagnostics(page);
-    const details = await openFiles(page);
-    await expect(details.locator(':scope > p.small').first()).toHaveText(/rotated copies: 1$/);
-    // The log rolls over while the page stays open: Clear names what it deletes now, not the count shown.
-    await seedLogs(request, { records: false, rotated: [1024, 1024, 1024] });
-    await operation(page, 'Clear all logs').getByRole('button', { name: 'Clear all logs…', exact: true }).click();
-    await expect(dialog(page).locator('#modal-body > p')).toHaveText(/^Empties prompt_manager\.log, deletes 3 rotated copies \(3\.0 KB\) /);
-    await expect(details.locator(':scope > p.small').first()).toHaveText(/rotated copies: 3$/);
-    await dialog(page).getByRole('button', { name: 'Cancel', exact: true }).click();
-    // A list that cannot be read gives the general sentence, never an old count.
-    await page.route('**/prompt_manager/logs/files', route => route.fulfill({ status: 500, contentType: 'application/json',
-        body: JSON.stringify({ success: false, error: 'boom', files: [] }) }));
-    await operation(page, 'Clear all logs').getByRole('button', { name: 'Clear all logs…', exact: true }).click();
-    await expect(dialog(page).locator('#modal-body > p')).toHaveText(/^Empties prompt_manager\.log, deletes its rotated copies and clears/);
-    await dialog(page).getByRole('button', { name: 'Cancel', exact: true }).click();
-    expect(await names(request)).toEqual(['prompt_manager.log', 'prompt_manager.log.1', 'prompt_manager.log.2', 'prompt_manager.log.3']);
-});
-
-test('a rollover while Clear all logs is open deletes nothing and says why (#389)', async ({ page, request }) => {
-    await seedLogs(request, { rotated: [1024, 1024], active: 100 });
-    await openDiagnostics(page);
-    await openFiles(page);
-    await operation(page, 'Clear all logs').getByRole('button', { name: 'Clear all logs…', exact: true }).click();
-    await expect(dialog(page).locator('#modal-body > p')).toHaveText(/^Empties prompt_manager\.log, deletes 2 rotated copies /);
-    // The log rolls over after the confirmation was built: the copies it listed are not the ones there now.
-    await expect(await request.post('/__test__/logs/rotate')).toBeOK();
-    const rolled = await names(request);
-    const answer = page.waitForResponse(response => response.url().endsWith('/prompt_manager/logs/truncate'));
-    await dialog(page).getByRole('button', { name: 'Clear', exact: true }).click();
-    expect((await answer).status()).toBe(409);
-    await expect(toast(page)).toHaveText('The log files changed since you confirmed; nothing was cleared. '
-        + 'Read the list again and clear again.');
-    expect(await names(request)).toEqual(rolled);
-});
-
-test('each listed file downloads by its returned name and a link has no Download', async ({ page, request }) => {
-    await seedLogs(request, LOG_FOLDER);
-    await openDiagnostics(page);
-    const details = await openFiles(page);
-    await expect(details.locator(':scope > p.small').nth(1))
-        .toHaveText('Rotates at 10 MB · keeps 5 rotated copies · file logging on · memory buffer 1,000 entries');
-    const list = details.locator('.operation-list');
-    expect((await list.locator('h3').allTextContents()).sort()).toEqual(['prompt_manager.log', 'prompt_manager.log.1',
-        'prompt_manager.log.2', 'prompt_manager.log.3', ...(LINKS ? ['prompt_manager.log.4'] : []), 'prompt_manager.log.bak'].sort());
-    const item = name => list.locator('.operation').filter({ has: page.locator(`h3:text-is("${name}")`) });
-    await expect(item('prompt_manager.log.1').locator('p')).toHaveText(/^2\.9 KB · \d{4}-\d\d-\d\d \d\d:\d\d · Rotated copy$/);
-    await expect(item('prompt_manager.log.bak').locator('p')).toHaveText(/^0 bytes · .+ · Other file$/);
-    if (LINKS) {
-        await expect(item('prompt_manager.log.4').locator('p')).toHaveText(/ · Link, not downloaded$/);
-        await expect(item('prompt_manager.log.4').getByRole('button')).toHaveCount(0);
-    }
-    for (const name of ['prompt_manager.log.1', 'prompt_manager.log.bak']) {
-        const download = page.waitForEvent('download');
-        await item(name).getByRole('button', { name: `Download ${name}`, exact: true }).click();
-        const file = await download;
-        expect(file.suggestedFilename()).toBe(name);
-        if (name === 'prompt_manager.log.1') expect((await readBlob(file)).length).toBe(3000);
-    }
-});