fix(viewer): destroy a pending viewer whose element left the stage

rebuild() empties the stage while a view is pending, and the deferred destroy then failed on the viewer's null parent: a page error, and the image kept its src. The destroy now finishes and the src is released.
test(viewer): wait for the viewer's first fit before reading it
2026-10-30 18:32:57 -07:00 · 2026-10-30 18:32:56 -07:00 · 2026-10-30 16:54:50 -07:00 · 2026-10-30 16:54:50 -07:00 · 2026-10-30 16:54:50 -07:00 · 2026-10-30 16:54:50 -07:00
136 changed files with 1408 additions and 1875 deletions
@@ -1,9 +1,9 @@
-name: Windows
+name: Windows and macOS

 permissions:
  contents: read

-# Non-blocking Windows runs (#420; macOS dropped from CI in #571): never on pull requests or in the merge queue, and no context
+# 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:
@@ -25,7 +25,10 @@ env:
 # run counts (tests/vendor/ci-workflow.test.mjs recomputes it, #493).
 # Measured 2026-10-29 on main runs 40935337099 (dd247e3), 40938407252 (dd247e3), 40941240624 (dd247e3):
 #   slowest leg: 7m24s (py3.12 windows) / 7m31s (py3.13 windows) / 7m32s (py3.14 windows) -> 15 min
-#     (windows 4m56s-7m32s)
+#     (windows 4m56s-7m32s, macos 4m39s-6m14s)
+#   native-trash (#499) has no green main runs yet: its probe, run 40949370943 (2026-10-29), took
+#     about 1 minute per macOS leg, so ceil(1.5 x 2) + 3 gives it 6 minutes (step 4). Recalibrate
+#     after three green runs.
 #   native-trash-linux (#543) has no green main runs yet: it installs the dev requirements and runs
 #     one test module, about 1 minute by the same estimate, so ceil(1.5 x 2) + 3 gives it 6 minutes.
 #     Recalibrate after three green runs.
@@ -37,7 +40,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [windows-latest]
+        os: [windows-latest, macos-latest]
        python-version: ["3.12", "3.13", "3.14"]

    steps:
@@ -57,7 +60,7 @@ jobs:

      # The runner's TEMP is on C:, the OS disk, where a flush took about 6 ms
      # and a test database's create-to-delete about 111 ms; on the D: work
-      # disk the same took 0.5 ms and 23 ms. Tests write their
+      # disk the same took 0.5 ms and 23 ms (macOS: 19 ms). Tests write their
      # databases under TEMP, so it moves to a folder on D: (measured in #487,
      # run 40915866444). The runner's TEMP was an 8.3 short name
      # (C:\Users\RUNNER~1\...), so the new one is spelled by its short name too
@@ -80,6 +83,31 @@ jobs:
          PM_TEST_SLOWEST: "40"
        run: python -m tests.run_suite -v

+  # The real Trash on both macOS CPUs (#499 design §10.2). It runs apart from the suite, so a red
+  # suite never skips the native proof.
+  native-trash:
+    name: native trash on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 6
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [macos-latest, macos-15-intel]
+
+    steps:
+      - uses: actions/checkout@v7
+
+      - name: Set up Python
+        uses: actions/setup-python@v7
+        with:
+          python-version: "3.12"
+
+      - name: Native trash proof
+        timeout-minutes: 4
+        env:
+          PM_NATIVE_TRASH: macos
+        run: python -m unittest tests.test_trash_macos_native tests.test_trash_macos -v
+
  # The same tests as the fake mount table, on a real ext4 mount used as the output root (#543). A
  # runner can mount with sudo; the tests run as the normal user, so owner and mode checks are real.
  native-trash-linux:
@@ -28,7 +28,7 @@ env:
 #   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 moved to portability.yml (#420; macOS left CI in #571), which has its own measured limit (#493);
+#     Windows and macOS moved to portability.yml (#420), which has its own measured limit (#493);
 #     this Linux-only matrix keeps 27 minutes until it is re-measured.
 #   real ComfyUI compatibility: 13m32s / 8m55s / 11m46s -> 24 min
 #   coverage gate (85%): 7m26s / 7m22s / 7m54s -> 15 min
@@ -39,7 +39,7 @@ env:
 # 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 runs in portability.yml (push to main, nightly, on demand) and never gate a merge.
+# 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 }}
@@ -41,13 +41,9 @@ concurrency:
 # 7.3m-12.2m), because --shard splits by test count and the slow concept specs sort into shard 1. The page
 # workflows now run in three shards per browser with the limits unchanged; the per-shard times are
 # re-measured after three green main runs.
-# #563: coverage shards reached their 18-minute step limit three times on 2026-10-31 with no failing
-# test (PR #560 shard 2/3: 814 passed in 17.9m; queue run 41206495451 shard 1/3: 827 passed; PR #564
-# shard 2/3 twice), against recent green shards of 11m-17m. Coverage now runs in four shards with the
-# limits unchanged; the per-shard times are re-measured after three green main runs.
 jobs:
  frontend-coverage:
-    name: frontend coverage (shard ${{ matrix.shard }}/4)
+    name: frontend coverage (shard ${{ matrix.shard }}/3)
    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;
@@ -63,7 +59,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        shard: [1, 2, 3, 4]
+        shard: [1, 2, 3]
    steps:
      - uses: actions/checkout@v7
      # The image's own Python 3.12 and Node 24: setup-python/setup-node install the runner's toolcache
@@ -92,13 +88,13 @@ jobs:
      - run: npm ci --prefix tools/vendor --ignore-scripts
      # Shard 1 also runs the node units and the viewer suite, so the vendor pins and the tooling tests
      # run on the lightest shard instead.
-      - if: matrix.shard == 4
+      - if: matrix.shard == 3
        run: npm run --prefix tools/vendor check
-      - if: matrix.shard == 4
+      - if: matrix.shard == 3
        run: npm run --prefix tools/vendor test
-      - name: Page workflows with coverage, shard ${{ matrix.shard }}/4
+      - name: Page workflows with coverage, shard ${{ matrix.shard }}/3
        timeout-minutes: 18
-        run: npm run --prefix tools/vendor test:coverage:shard -- ${{ matrix.shard }}/4
+        run: npm run --prefix tools/vendor test:coverage:shard -- ${{ matrix.shard }}/3
      - name: Upload raw coverage
        uses: actions/upload-artifact@v7
        with:
@@ -140,13 +136,13 @@ jobs:
        with:
          pattern: coverage-raw-*
          path: ${{ runner.temp }}/coverage-raw
-      # coverage:merge only checks that raw files exist; merging three of four shards would report
+      # coverage:merge only checks that raw files exist; merging two of three shards would report
      # partial coverage, so a missing or empty shard artifact fails here.
      - name: Verify every shard's raw coverage arrived
        shell: bash
        env:
          STAGED_RAW: ${{ runner.temp }}/coverage-raw
-          EXPECTED_SHARDS: 4
+          EXPECTED_SHARDS: 3
        run: |
          found=0
          for shard in $(seq 1 "$EXPECTED_SHARDS"); do
@@ -74,14 +74,14 @@ V8 files it writes under `coverage/js/raw`:

 ```sh
 PM_TEST_WORKERS=8 npm run --prefix tools/vendor test:coverage            # whole run, one report
-npm run --prefix tools/vendor test:coverage:shard -- 1/4                 # node units, viewer suite, workflows 1/4
-npm run --prefix tools/vendor test:coverage:shard -- 2/4                 # workflows 2/4 (likewise 3/4, 4/4)
+npm run --prefix tools/vendor test:coverage:shard -- 1/3                 # node units, viewer suite, workflows 1/3
+npm run --prefix tools/vendor test:coverage:shard -- 2/3                 # workflows 2/3 (likewise 3/3)
 npm run --prefix tools/vendor coverage:merge                             # report and baseline check of every raw file
 npm run --prefix tools/vendor test:workflows -- --project webkit --shard 2/2
 ```

 `coverage:merge` refuses an empty raw directory; it does not count shards, so run
-every shard first (CI's merge job checks all four arrived). Measured on a 32-CPU
+every shard first (CI's merge job checks all three arrived). Measured on a 32-CPU
 machine in the pinned image (2026-10-21): `test:coverage` takes about 5 minutes
 with 8 workers and 24 minutes with 1; all four projects, 8 workers, each test 3
 times (6132 tests), 24 minutes. A CI-sized run (`docker run --cpus=4`,
@@ -189,14 +189,14 @@ check, so run it before pushing a new or deleted frontend file instead of
 waiting for the `frontend coverage` jobs.

 The `viewerjs` check runs on every PR, including backend-only changes. It is an
-aggregate job. It requires the four `frontend coverage (shard N/4)` jobs and
+aggregate job. It requires the three `frontend coverage (shard N/3)` jobs and
 `frontend coverage (merge)` to succeed on every event. The four
 `page workflows (firefox|webkit, shard N/2)` jobs run only in the merge queue,
 on `main` and on `workflow_dispatch` (see "Pull requests and the merge queue").
 `viewerjs` requires them to be skipped on a pull request and to succeed
 everywhere else. Any other failed, cancelled or skipped job fails it. Every browser job runs with `PM_TEST_WORKERS: 3` (the public
-runners have 4 vCPUs). Each coverage shard runs `test:coverage:shard -- N/4`
-(shard 1 also runs the node units and the viewer suite, shard 4 the vendor pins
+runners have 4 vCPUs). Each coverage shard runs `test:coverage:shard -- N/3`
+(shard 1 also runs the node units and the viewer suite, shard 3 the vendor pins
 and tooling tests) and uploads its raw V8 files as `coverage-raw-N` (kept 3
 days). The merge job downloads them, fails unless all three arrived with raw
 files and without clashing names, then runs `coverage:merge` (report plus
@@ -261,7 +261,7 @@ the process exits non-zero.
  job fails anyway and the dump is what matters.
 - `PM_TEST_SLOWEST=N` (off by default) lists the N slowest tests after the
  summary, each timed from its `start:` line to the next one like the hang
-  limit. The Windows jobs (`portability.yml`) set it to 40, so every
+  limit. The Windows and macOS jobs (`portability.yml`) set it to 40, so every
  run shows where its time went (#487). The list prints only when the run
  ends: a job GitHub cancels or a watchdog exit prints none, so read the
  timestamps between `start:` lines instead.
@@ -327,7 +327,7 @@ Python 3.13/3.14, real ComfyUI and Firefox/WebKit failures first show up in the
 merge queue, on the merge-group commit rather than the
 pushed one. Find that run with `gh run list --event merge_group --workflow test.yml`
 (or `viewerjs-check.yml`) and match its head branch
-(`gh-readonly-queue/main/pr-<N>-...`). Windows failures show up only
+(`gh-readonly-queue/main/pr-<N>-...`). Windows and macOS failures show up only
 after the merge, in `gh run list --workflow portability.yml`.

 Start fixing as soon as a failed log shows the cause, but push the fix only after
@@ -450,7 +450,7 @@ measurement: `ubuntu-latest`, one Python, no coverage, only the wall-clock tests
 It runs on every push to `main` and on `workflow_dispatch`, never on pull
 requests, because shared-runner timing must not block a merge. Dispatch it on a
 branch to measure before merging.
-Shared Windows runners do not run them; the structural tests cover
+Shared Windows and macOS runners do not run them; the structural tests cover
 portability. Run it locally with
 `PROMPTMANAGER_PERF_BUDGET=1 python -m unittest tests.test_api_workspace_images.TestWorkspaceImages.test_filter_budget`
 and quote the printed p95 in the PR body.
@@ -646,10 +646,10 @@ Before changing paths, SQLite, streams, restore or cleanup:
  ordinary busy timeout; cross-thread handoffs wait on events with generous
  ceilings, never a short wall clock (#242).
 - Run native Windows CI early for these changes. Pull requests and the merge
-  queue run only Linux, so start Windows on the branch with
+  queue run only Linux, so start Windows and macOS on the branch with
  `gh workflow run portability.yml --ref <branch>`.
-  Include a Windows impact and evidence note in the PR. All three Windows
-  legs in that run, every Linux leg and every applicable
+  Include a Windows impact and evidence note in the PR. All six Windows/macOS
+  combinations in that run, every Linux leg and every applicable
  exact-head check must pass before merge. Portable `ntpath`/`PureWindowsPath`
  controls do not establish native filesystem, locking or cleanup success.

@@ -664,11 +664,11 @@ what runs:
 | `py3.13 on ubuntu-latest`, `py3.14 on ubuntu-latest` | not created | run |
 | `real ComfyUI compatibility` | skipped | runs |
 | `coverage gate (85%)`, `black and flake8`, `frontend modules`, `bandit (high severity)` | run | run |
-| `frontend coverage (shard N/4)`, `frontend coverage (merge)` (vendor pins and tooling tests on shard 4) | run | run |
+| `frontend coverage (shard N/3)`, `frontend coverage (merge)` (vendor pins and tooling tests on shard 3) | run | run |
 | `page workflows (firefox\|webkit, shard N/2)` | skipped | run |
 | `all tests`, `viewerjs` (gates) | run | run |
 | `perf budget` | skipped | push and dispatch only (not in the queue) |
-| `py3.12-3.14 on windows-latest` (`portability.yml`) | not run | push to `main`, nightly, `workflow_dispatch` only; never required |
+| `py3.12-3.14 on windows-latest/macos-latest` (`portability.yml`) | not run | push to `main`, nightly, `workflow_dispatch` only; never required |

 GitHub has one required set for pull requests and the queue. A job skipped by
 its `if:` reports Success. A dropped matrix leg never reports, so it would stay
@@ -681,9 +681,8 @@ guarantee:
 So a merge group cannot turn green unless all three Linux Python legs, real
 ComfyUI and the four browser shards passed.

-Windows (Python 3.12-3.14) is out of the blocking path for now
-(maintainer, 2026-10-28). macOS is not tested in CI (maintainer, 2026-10-31, #571);
-its code stays and support is best-effort. They run in `portability.yml` on every push to `main`,
+Windows and macOS (Python 3.12-3.14) are out of the blocking path for now
+(maintainer, 2026-10-28). They run in `portability.yml` on every push to `main`,
 nightly and on demand, and no context there is required. A red portability run
 is still a failure: fix it at its cause, not by rerunning, and have every one
 green before the workspace cutover (#334). `tests/vendor/ci-workflow.test.mjs` pins the
@@ -2550,8 +2549,8 @@ files to the system trash. **No code path unlinks or overwrites a media file.**
  ("Moving files to the Recycle Bin isn't available on Windows: files larger than the bin's
  capacity would be deleted permanently."). Library-only removal works everywhere. Tests use `tests/fake_trash.py`; the
  browser test server installs it, so no test touches a real trash. The native proof,
-  `tests/test_trash_macos_native.py`, runs only with `PM_NATIVE_TRASH=macos` on a Mac, by hand
-  (CI dropped its `native-trash` macOS job in #571; it last passed on `macos-latest` and `macos-15-intel`): the startup
+  `tests/test_trash_macos_native.py`, runs only with `PM_NATIVE_TRASH=macos` in
+  portability.yml's `native-trash` job (`macos-latest` and `macos-15-intel`): the startup
  volume, a name clash, fresh APFS and FAT32 disk images, an image used as an output root,
  a read-only image and an unwritable folder (design and probe:
  `docs/egm/499-macos-trash/`, local).
@@ -6798,7 +6797,7 @@ checkout or point this harness at a live ComfyUI checkout.

 The package-qualified config import also corrects #211: the configured database
 path is honored when PromptManager runs as a ComfyUI custom node. Follow the
-[database path compatibility and safe backup sequence](README-legacy.md#database-path-compatibility-211)
+[database path compatibility and safe backup sequence](README.md#database-path-compatibility-211)
 before restarting an existing deployment.

 The ledger records only new dequeued jobs and observed outcomes. Existing
@@ -120,7 +120,6 @@ except Exception as e:
        logger = get_logger("prompt_manager.init")
        logger.error(f"Failed to register API routes: {e}")
    except Exception:
-        # logging failed too; a report must never stop the node loading
        pass

 # Shared database, set up with the monitoring system below. Stays None when that
@@ -412,7 +411,6 @@ except Exception as e:
            f"Failed to register the exit signal: {e}"
        )
    except Exception:
-        # logging failed too; a report must never stop the node loading
        pass

 try:
@@ -430,7 +428,6 @@ except Exception as e:
            f"Failed to register the background work teardown: {e}"
        )
    except Exception:
-        # logging failed too; a report must never stop the node loading
        pass

 __all__ = ["NODE_CLASS_MAPPINGS", "NODE_DISPLAY_NAME_MAPPINGS", "WEB_DIRECTORY"]
@@ -590,7 +590,6 @@ class _Move:
            try:
                os.rmdir(self.plan.target_dir)
            except OSError:
-                # not empty or already gone: the undo leaves it alone
                pass


@@ -35,51 +35,38 @@ from __future__ import annotations

 import contextlib
 import logging
-import operator
-import sys
 import threading
 import time
 import weakref
-from collections import deque
-from typing import Any, Callable, Iterable, Iterator, List, Optional
+from typing import Iterable, Iterator, List, Optional

 import sqlite3

 CLOSED_MESSAGE = "Cannot operate on a closed database."
 # Rows fetched per step when a cursor is iterated: the connection is marked
 # in use once per chunk instead of once per row (iteration costs about what
-# a plain cursor costs). Prefetched rows belong to the cursor so iteration
-# and explicit fetches always advance the same position.
+# a plain cursor costs). A loop that stops early leaves up to this many rows
+# fetched; ``fetchone``/``fetchmany`` after a partial loop skip them.
 ITER_CHUNK = 128


 class ManagedCursor(sqlite3.Cursor):
    """A cursor whose calls into SQLite count as its connection being in use."""

-    def __init__(self, *args: Any, **kwargs: Any) -> None:
-        super().__init__(*args, **kwargs)
-        self._pending = deque()
-        self._closed = False
-
    def execute(self, sql, parameters=(), /):
-        return self._run_statement(super().execute, sql, parameters)
-
-    def executemany(self, sql, seq_of_parameters, /):
-        return self._run_statement(super().executemany, sql, seq_of_parameters)
-
-    def _run_statement(self, operation: Callable, *args: Any) -> ManagedCursor:
        conn = self.connection
        conn._enter()
-        description = self.description
-        completed = False
        try:
-            result = operation(*args)
-            completed = True
-            return result
+            return super().execute(sql, parameters)
+        finally:
+            conn._leave()
+
+    def executemany(self, sql, seq_of_parameters, /):
+        conn = self.connection
+        conn._enter()
+        try:
+            return super().executemany(sql, seq_of_parameters)
        finally:
-            # Argument parsing can fail before SQLite replaces the old statement.
-            if completed or self.description is not description:
-                self._pending.clear()
            conn._leave()

    def executescript(self, sql_script, /):
@@ -94,8 +81,6 @@ class ManagedCursor(sqlite3.Cursor):
        conn = self.connection
        conn._enter()
        try:
-            if self._pending and not self._closed:
-                return self._pending.popleft()
            return super().fetchone()
        finally:
            conn._leave()
@@ -104,20 +89,7 @@ class ManagedCursor(sqlite3.Cursor):
        conn = self.connection
        conn._enter()
        try:
-            # Let SQLite validate the original arguments, including version-specific
-            # handling of zero/negative sizes, before touching prefetched rows.
-            rows = super().fetchmany(*args, **kwargs)
-            if not self._pending:
-                return rows
-            size = operator.index(
-                kwargs.get("size", args[0] if args else self.arraysize)
-            )
-            # Python 3.12 reads all rows for size=0; 3.13+ reads none.
-            if size == 0 and sys.version_info >= (3, 13):
-                return rows
-            self._pending.extend(rows)
-            count = len(self._pending) if size <= 0 else min(size, len(self._pending))
-            return [self._pending.popleft() for _ in range(count)]
+            return super().fetchmany(*args, **kwargs)
        finally:
            conn._leave()

@@ -125,31 +97,25 @@ class ManagedCursor(sqlite3.Cursor):
        conn = self.connection
        conn._enter()
        try:
-            rows = super().fetchall()
-            pending = list(self._pending)
-            self._pending.clear()
-            return pending + rows
+            return super().fetchall()
        finally:
            conn._leave()

    def __iter__(self) -> Iterator:
-        return self
+        return self._chunks()
+
+    def _chunks(self) -> Iterator:
+        while True:
+            rows = self.fetchmany(ITER_CHUNK)
+            if not rows:
+                return
+            yield from rows

    def __next__(self):
        conn = self.connection
-        pending = self._pending
-        # Buffered Python rows need no SQLite lock, but retirement and cursor
-        # close must still stop an iterator obtained before either operation.
-        if conn._retired or self._closed:
-            raise sqlite3.ProgrammingError(CLOSED_MESSAGE)
-        if pending:
-            return pending.popleft()
        conn._enter()
        try:
-            pending.extend(super().fetchmany(ITER_CHUNK))
-            if not pending:
-                raise StopIteration
-            return pending.popleft()
+            return super().__next__()
        finally:
            conn._leave()

@@ -160,10 +126,7 @@ class ManagedCursor(sqlite3.Cursor):
        except sqlite3.ProgrammingError:
            return super().close()  # the connection is closed or closing
        try:
-            result = super().close()
-            self._pending = deque()
-            self._closed = True
-            return result
+            return super().close()
        finally:
            conn._leave()

@@ -330,9 +293,6 @@ class ManagedConnection(sqlite3.Connection):
            cursors = list(self._cursors)
        try:
            for cursor in cursors:
-                if isinstance(cursor, ManagedCursor):
-                    cursor._pending = deque()
-                    cursor._closed = True
                with contextlib.suppress(sqlite3.Error):
                    sqlite3.Cursor.close(cursor)
            super().close()
@@ -34,7 +34,7 @@ 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
+from .category_import import CategoryImportOperations, EmptyReplacement  # noqa: F401
 from .image_categories import ImageCategoryOperations
 from .workflow_documents import (
    DocumentReader,
@@ -46,7 +46,6 @@ def remove_quietly(*paths):
            if path and os.path.exists(path):
                os.remove(path)
        except OSError:
-            # cleanup after a failure must not replace that failure
            pass


@@ -66,6 +66,7 @@ def _tag_rows(page: str, order: str = "page.id") -> str:
    )


+_TAG_PAGE = _tag_rows("SELECT id,name FROM tags WHERE id>? ORDER BY id LIMIT ?")
 # #444 tag sorts: sort -> (key expression on tags/counted, direction). Ties and
 # "created" follow the id, so every order is total and keyset pages are exact.
 TAG_SORTS = {
@@ -176,7 +176,7 @@ def _physical_file_key(path, stat):
    volumes on Windows) falls back to the resolved, case-folded path.
    """
    if stat.st_ino:
-        return ("inode", (stat.st_dev, stat.st_ino))
+        return ("inode", stat.st_dev, stat.st_ino)
    return ("path", os.path.normcase(os.path.realpath(str(path))))


@@ -539,7 +539,6 @@ def _diagnose_output_dirs(configured_dirs, public_path=None):

        candidates.append(folder_paths.get_output_directory())
    except ImportError:
-        # outside ComfyUI there is no output folder to add
        pass

    output_dirs = []
@@ -13,6 +13,7 @@ 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,
@@ -424,7 +424,6 @@ class AutotagRoutesMixin:
        title = f"Tagging model download · {label}"
        _download_titles.clear()
        _download_titles[owner] = title
-        admitted = False
        try:
            job = self._jobs.start(
                MODEL_DOWNLOAD_JOB_KIND,
@@ -440,13 +439,13 @@ class AutotagRoutesMixin:
                    self._run_model_download, service, model_type, owner
                ),
            )
-            admitted = True
-        except JobBusy as refused:
-            return None, busy_response(refused)
-        finally:
-            if not admitted:  # JobBusy, or anything else: give the gate back.
-                model_gate.release(owner)
-                _download_titles.pop(owner, None)
+        except BaseException as refused:
+            # JobBusy, or anything else the registry raised: give the gate back.
+            model_gate.release(owner)
+            _download_titles.pop(owner, None)
+            if isinstance(refused, JobBusy):
+                return None, busy_response(refused)
+            raise

        def ended(_task):
            model_gate.release(owner)
@@ -1042,12 +1041,12 @@ class AutotagRoutesMixin:
                return self._bad_request('existing must be "skip" or "merge"')
            try:
                options = self._single_options(data, model_type)
-            except OptionError as error:
-                return self._bad_request(str(error))
            except (ValueError, TypeError):
                return self._bad_request(
                    "general_threshold and character_threshold must be numeric"
                )
+            except OptionError as error:
+                return self._bad_request(str(error))
            target, error = await self._select_autotag_target(data)
            if error is not None:
                return error
@@ -971,7 +971,6 @@ class BackupRestoreRoutesMixin:
        line = restored_line(staged.summary)
        job.log_line(line)
        job.update(progress=100, status_line=line)
-        return None


 async def _outlive_cancel(future):
@@ -574,13 +574,12 @@ class DuplicateFilesMixin:
            return _fail_job(job, "sources-changed", SOURCES_CHANGED)
        ok, backup = await self._safety_backup_step(job, db, backup_on)
        if not ok:
-            return None
+            return
        try:
            await self._remove_duplicates(job, db, plan, backup)
        finally:
            if backup:
                await self._prune_backup_pool(job, db)
-        return None

    async def _remove_duplicates(self, job, db, plan, backup):
        targets = plan.payload["targets"]
@@ -27,7 +27,7 @@ def _identity(path):
    except OSError:
        return None
    if info.st_ino:
-        return ("inode", (info.st_dev, info.st_ino))
+        return ("inode", info.st_dev, info.st_ino)
    return ("path", os.path.normcase(os.path.realpath(str(path))))


@@ -330,13 +330,12 @@ class ImageDeleteMixin:
            return _fail_job(job, "sources-changed", SOURCES_CHANGED)
        ok, backup = await self._safety_backup_step(job, db, backup_on)
        if not ok:
-            return None
+            return
        try:
            await self._delete_images(job, db, targets, mode, backup)
        finally:
            if backup:
                await self._prune_backup_pool(job, db)
-        return None

    async def _delete_images(self, job, db, targets, mode, backup):
        job.update(total=len(targets), status_line=TITLES[mode])
@@ -531,7 +531,6 @@ class ImageTagJobsMixin:
        run = AutotagRun(
            model_type, existing, options, keep_in_memory, backup_on, owner
        )
-        admitted = False
        try:
            job = self._jobs.start(
                AUTOTAG_BATCH_JOB_KIND,
@@ -542,12 +541,11 @@ class ImageTagJobsMixin:
                groups=AUTOTAG_GROUP_NAMES,
                runner=functools.partial(self._run_autotag_batch, run),
            )
-            admitted = True
-        except JobBusy as refused:
-            return None, _busy_refusal(refused)
-        finally:
-            if not admitted:
-                model_gate.release(owner)
+        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

@@ -39,8 +39,10 @@ from .thumbnail_encode import (
    PREVIEW_HELD,
    EncoderClosed,
    PreviewWriteHeld,
+    replace_unless_held,
    run_encoder,
    sweep_stray_temps,
+    temp_sibling,
    thumbnail_frame,
    writer_settings,
    write_thumbnail,
@@ -337,6 +339,11 @@ def _thumbnail_batch_size(workers):
    return max(4, workers * 2)


+# Preview files are written by thumbnail_encode in the configured format
+# (thumbnail_settings, #317); these names stay importable from here.
+_temp_sibling = temp_sibling
+_replace_unless_held = replace_unless_held
+
 # A preview that could not be replaced (#249 S5 M6). Windows refuses to rename
 # over a file another process has open (WinError 5 or 32), such as a preview
 # the gallery is serving; the old preview stays and the file counts as an error.
@@ -389,7 +396,6 @@ def _video_placeholder_image(thumbnail_size):
            font=font,
        )
    except (OSError, AttributeError):
-        # a placeholder without its label still works
        pass
    return img

@@ -493,7 +499,6 @@ def _preview_names(folders, folder):
                    except OSError:
                        continue
        except OSError:
-            # an unreadable folder lists as empty; nothing there to cache
            pass
        folders[folder] = names
    return names
@@ -250,7 +250,7 @@ class JobRoutesMixin:
        try:
            await response.write(_summary_event(job))
            async with contextlib.aclosing(job.events()) as events:
-                async for _ in events:
+                async for _payload in events:
                    await response.write(_summary_event(job))
            # The last event is published before the job takes its final state.
            await response.write(_summary_event(job))
@@ -207,7 +207,6 @@ class LibraryLocationRoutesMixin:
        try:
            size = os.path.getsize(location.db_path)
        except OSError:
-            # no library file yet: report size 0
            pass
        return {
            "path": self._library_public_path(location.db_path),
@@ -374,7 +373,6 @@ class LibraryLocationRoutesMixin:
        line += ". Logs move at the next restart."
        job.log_line(line)
        job.update(progress=100, status_line=line)
-        return None

    @staticmethod
    def _fail_library_move(job, code, message):
@@ -205,4 +205,3 @@ class LogCleanupMixin:
            line += f", {failed} could not be deleted"
        job.log_line(line)
        job.update(processed=len(files), progress=100, status_line=line)
-        return None
@@ -436,7 +436,7 @@ class LoraImportRoutesMixin:
            job.log_line(f"{CANCELLED} {CACHE_NOTE}")
            job.update(status_line=CANCELLED)
            job.finish("cancelled")
-            return None
+            return
        except Exception:
            self.logger.exception("LoRA import staging failed")
            return _fail_job(job, "import-failed", f"{FAILED} {CACHE_NOTE}")
@@ -455,10 +455,10 @@ class LoraImportRoutesMixin:
            job.log_line(f"{CANCELLED} {CACHE_NOTE}")
            job.update(status_line=CANCELLED)
            job.finish("cancelled")
-            return None
+            return
        ok, _backup = await self._safety_backup_step(job, db, backup_on)
        if not ok:
-            return None
+            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.
@@ -466,7 +466,6 @@ class LoraImportRoutesMixin:
            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)
-        return None

    def _count_downloads(self, job, staged):
        downloaded = staged.stats.get("downloaded", 0)
@@ -519,4 +518,3 @@ class LoraImportRoutesMixin:
            staged.stats.get("download_errors", 0),
        )
        job.update(progress=100, processed=job.total, status_line=line)
-        return None
@@ -44,7 +44,6 @@ _FILES_CHANGED = (
    "The LoRA metadata files changed during the scan; the previous imports "
    "were kept. Run the scan again."
 )
-_LORA_SCAN_FAILED = "The LoRA import failed. Check the server log for details."
 _IMPORTS_CHANGED = (
    "The imported LoRA prompts changed during the scan; the previous imports "
    "were kept. Run the scan again."
@@ -408,21 +407,10 @@ class LoraIntegrationMixin:
            return
        if isinstance(error, PlanChanged):
            message = _IMPORTS_CHANGED
-        elif isinstance(
-            error,
-            (
-                LoraFilesChanged,
-                LoraSettingsUnusable,
-                EmptyReplacement,
-                PairDependencyError,
-            ),
-        ):
+        elif isinstance(error, (LoraFilesChanged, LoraSettingsUnusable)):
            message = str(error)
-        elif isinstance(error, OSError):
-            # Reduced to its reason and the file's basename.
-            message = self._public_error(error)
        else:
-            message = _LORA_SCAN_FAILED
+            message = self._public_error(error)
        if isinstance(
            error,
            (
@@ -548,7 +536,6 @@ class LoraIntegrationMixin:
                except asyncio.CancelledError:
                    interrupted = True
                except Exception:
-                    # the await after this loop raises it for the caller
                    pass
            if interrupted:
                raise asyncio.CancelledError
@@ -673,7 +673,6 @@ class MaintenanceRoutesMixin:
        line = _changed_line(plan.operation, result["changed"], result.get("marks", 0))
        job.log_line(line)
        job.update(progress=100, status_line=f"{line} · {backup_note(backup)}")
-        return None

    def _maintenance_rows(self, operation, described):
        """Outcome rows for the changed records (root-relative paths only)."""
@@ -533,7 +533,6 @@ class AutoThumbnailer:
            try:
                process.kill()
            except OSError:
-                # the process has already exited
                pass
        if worker is None:
            return True
@@ -158,7 +158,6 @@ def _unlink_quietly(path):
    try:
        Path(path).unlink()
    except FileNotFoundError:
-        # already gone, which is what was wanted
        pass
    except OSError as exc:
        logger.debug(f"Could not remove temp file {Path(path).name}: {exc}")
@@ -222,7 +221,6 @@ def shutdown_encoders():
        try:
            process.kill()
        except OSError:
-            # the process has already exited
            pass


@@ -361,12 +359,10 @@ def thumbnail_frame(img, edge):
    try:
        img.seek(0)
    except (EOFError, AttributeError, ValueError):
-        # not seekable or a single frame: use the current one
        pass
    try:
        img.draft("RGB", (edge, edge))  # JPEG: decode at a reduced scale
    except (AttributeError, ValueError, OSError):
-        # draft is only a speedup; the full decode below still works
        pass
    frame = img.convert("RGB") if img.mode != "RGB" else img.copy()
    frame.thumbnail((edge, edge), Image.Resampling.LANCZOS)
@@ -275,4 +275,3 @@ class WorkflowStorageRoutesMixin:
        job.record_counted("changed", 1)
        job.log_line(line)
        job.update(progress=100, status_line=line)
-        return None
@@ -109,7 +109,6 @@ def _write_atomically(path: str, payload: bytes) -> None:
        try:
            os.unlink(temp_path)
        except OSError:
-            # nothing to clean up; the original error is raised below
            pass
        raise

@@ -642,7 +642,6 @@ def layout_summary(layout: LoraManagerLayout, home: Path) -> Dict:
            relative = Path(settings_file).relative_to(home)
            settings_file = os.path.join("~", str(relative))
        except ValueError:
-            # outside the home folder: show the full path
            pass
    return {
        "source": layout.source,
@@ -585,7 +585,6 @@ def _read_capped(resp, cap: int) -> Optional[bytes]:
            if int(declared) > cap:
                return None
        except ValueError:
-            # a bad header says nothing; the read below enforces the cap
            pass

    chunks = []
@@ -708,7 +707,6 @@ def _save_atomically(image, local_path: Path) -> None:
        try:
            os.remove(temp)
        except OSError:
-            # nothing to clean up; the original error is raised below
            pass
        raise

@@ -1,10 +1,10 @@
 [project]
 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.4.1"
+version = "3.3.1"
 license = {file = "LICENSE"}
 requires-python = ">=3.12"
-dependencies = ["watchdog>=2.1.0,<7", "Pillow>=8.0.0"]
+dependencies = ["watchdog>=2.1.0", "Pillow>=8.0.0"]

 [build-system]
 requires = ["setuptools>=84.2.1"]
@@ -1,5 +1,5 @@
 # Runtime dependencies
-watchdog>=6.0.0,<7
+watchdog>=6.0.0
 Pillow>=12.3.0
 aiohttp>=3.14.5

@@ -1,4 +1,4 @@
 # Runtime dependencies for PromptManager.
 # aiohttp, numpy and torch come from ComfyUI itself and are not listed here.
-watchdog>=2.1.0,<7            # Output directory monitoring
+watchdog>=2.1.0              # Output directory monitoring
 Pillow>=8.0.0                # Image metadata extraction and thumbnails
@@ -6,6 +6,7 @@ import { THEMES, seedConcept, openConcept, openProduction, diffInventory, mutate
 // app.js 1428–1432) and its backup box with the concept's System `.notice`; the differences are D55. The job view
 // has no concept counterpart: it is compared with the approved mockup `activity-scan.html` (a local, ignored file),
 // whose structure and CSS values are restated below (D56). Each comparison is shown to notice a mutation.
+const workspace = '/prompt_manager/workspace';

 test.beforeEach(async ({ page, request, browserName }) => {
    await startCoverage(page, browserName);
@@ -109,7 +109,6 @@ class ResetWatch:
            stream.write(text)
            stream.flush()
        except (OSError, ValueError):
-            # the stream closed; a watcher must not fail the server
            pass


@@ -156,9 +156,8 @@ test('at 390px the window fits the screen, actions stay reachable and the page s
    expect(frame.bottom-frame.top).toBeLessThan(844);
    expect(frame.bottom-frame.top).toBeGreaterThanOrEqual(280);
    expect(await page.evaluate(()=>document.documentElement.scrollWidth)).toBeLessThanOrEqual(390);
-    // The first page's last row's actions can be scrolled to inside the window and fit its width.
-    // Pinned to row 100: reaching it loads the next page (D183), and last() would then follow row 200.
-    const last=rows(page).nth(99).getByRole('button',{name:'Rename / merge',exact:true});
+    // The last row's actions can be scrolled to inside the window and fit its width.
+    const last=rows(page).last().getByRole('button',{name:'Rename / merge',exact:true});
    await last.scrollIntoViewIfNeeded();await expect(last).toBeInViewport();
    const [button]=await boxes(last);const [after]=await boxes(tagWindow(page));
    expect(button.right).toBeLessThanOrEqual(after.right);
@@ -233,7 +233,7 @@ test('a view stored under older rules still lists and opens with its usable valu
 // D153 (#447): the workspace no longer offers "Highest rated"; the API still stores such a view as it was saved.
 test('a view saved under Highest rated opens on Recently added on Images and the Library', async ({ page, request }) => {
    const images = await create(request, { page: 'images', name: 'Rated cats', state: { ...IMAGE_DEFAULTS, q: 'cat', sort: 'rating' } });
-    await create(request, { page: 'library', name: 'Rated dogs', state: { q: 'dog', category: '', sort: 'rating', tags: [], tag_mode: 'all', folder: '' } });
+    const library = await create(request, { page: 'library', name: 'Rated dogs', state: { q: 'dog', category: '', sort: 'rating', tags: [], tag_mode: 'all', folder: '' } });
    expect((await listed(request)).map(view => view.state.sort)).toEqual(['rating', 'rating']);
    const listings = [];
    page.on('request', item => {
@@ -60,7 +60,7 @@ async function openReview(page, request, items = 30) {
 const inViewport = (rect, page) => rect.top >= 0 && rect.bottom <= page.viewportSize().height;

 test.beforeEach(async ({ page, browserName }) => { await startCoverage(page, browserName); });
-test.afterEach(async ({ page, browserName }) => { await saveCoverage(page, browserName); });
+test.afterEach(async ({ page, browserName }, testInfo) => { await saveCoverage(page, browserName, testInfo); });

 for (const viewport of [null, PHONE]) {
    const label = viewport ? ' at 390px' : '';
@@ -11,6 +11,7 @@ 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';
@@ -21,6 +21,14 @@ function jsonResponse(status, body) {
        json: async () => body };
 }

+function sseResponse(frames) {
+    const bytes = new TextEncoder().encode(frames.map(frame => `data: ${JSON.stringify(frame)}\n\n`).join(''));
+    let sent = false;
+    return { ok: true, status: 200, body: { getReader: () => ({
+        read: async () => (sent ? { done: true } : (sent = true, { done: false, value: bytes })),
+    }) } };
+}
+
 function load(file, className, fetchUrl, extra = {}, dom = elements()) {
    const timers = [];
    const notifications = [];
@@ -55,6 +63,8 @@ function load(file, className, fetchUrl, extra = {}, dom = elements()) {
    return { page, dom, timers, notifications, storage };
 }

+const BUSY = 'Scan for metadata already running';
+
 test('admin settings save shows why config.json refused it', async () => {
    const message = 'config.json cannot be read, so nothing was saved. Fix or remove the file, then save again.';
    const { page, notifications } = load('admin.js', 'PromptAdmin',
@@ -2584,7 +2584,7 @@ class TestActivityJobs(AdminAPITestCase):
    async def test_cancel_after_first_batch_keeps_partial_counts(self):
        """Review M7: the real scan stops at the batch boundary, keeping batch 1."""
        import threading
-        import unittest.mock as mock
+        from unittest import mock

        from py.api import admin

@@ -600,33 +600,6 @@ class TestAutotagSingleEdgeCases(AutotagAPITestCase):
            {"path": str(image), "general_threshold": "high"},
        )
        self.assertEqual(resp.status, 400)
-        self.assertEqual(
-            (await resp.json())["error"],
-            "general_threshold and character_threshold must be numeric",
-        )
-
-    async def test_invalid_single_options_report_the_validation_error(self) -> None:
-        image = self._make_image(self.output_dir)
-        cases = (
-            (
-                {"model_type": "wd14-vit", "general_threshold": 2},
-                "general_threshold must be between 0 and 1",
-            ),
-            (
-                {"model_type": "gguf", "prompt": "x" * 4001},
-                "instructions must be at most 4000 characters",
-            ),
-        )
-        for options, message in cases:
-            with self.subTest(options=options["model_type"]):
-                resp = await self._post_json(
-                    "/prompt_manager/autotag/single",
-                    {"path": str(image), **options},
-                )
-                self.assertEqual(resp.status, 400)
-                self.assertEqual(
-                    await resp.json(), {"success": False, "error": message}
-                )

    async def test_prompt_lookup_failure_still_returns_tags(self):
        image = self._make_image(self.output_dir)
@@ -1178,9 +1151,7 @@ class TestModelStatus(AutotagAPITestCase):
        )
        # Kept fields legacy pages and the workspace read.
        for model in models.values():
-            self.assertLessEqual(
-                {"name", "description", "size", "downloaded"}, set(model)
-            )
+            self.assertTrue({"name", "description", "size", "downloaded"} <= set(model))
        self.assertTrue(data["model_loaded"])
        self.assertEqual(data["loaded_model_type"], "wd14-vit")

@@ -351,6 +351,8 @@ class TestLongJobLock(unittest.TestCase):
        self.api = PromptManagerAPI(db=database)

    def _run(self, coro):
+        import asyncio
+
        return asyncio.run(coro)

    def test_second_acquire_is_refused_until_first_releases(self):
@@ -823,6 +825,8 @@ class TestInstanceHelpers(FolderPathsFixture):
        self.addCleanup(setattr, GalleryConfig, "MONITORING_DIRECTORIES", orig_dirs)

    def _run(self, coro):
+        import asyncio
+
        return asyncio.run(coro)

    def test_run_in_executor_with_kwargs(self):
@@ -16,7 +16,7 @@ import re
 import sqlite3
 import sys
 import unittest
-import unittest.mock as mock
+from unittest import mock
 from unittest.mock import MagicMock

 _mock_server = MagicMock()
@@ -381,7 +381,7 @@ class TestAnotherMount(SafetyTestCase):
        self.assertTrue(other.is_file() and keeper.is_file())

    async def test_a_volume_without_file_ids_is_named_truthfully(self):
-        self.mount("x.png", "x.png")
+        keeper, other, patches = self.mount("x.png", "x.png")

        def zero(path, *args, **kwargs):
            return _fake_stat(self.real_stat(path), st_dev=0, st_ino=0)
@@ -3713,7 +3713,7 @@ class TestSharedListing(ImageAPITestCase):

    async def test_a_root_read_again_after_the_roots_change_listens_again(self):
        make_png(self.output_dir / "a.png")
-        await self._listed()
+        record = await self._listed()
        self.api.reset_gallery_roots_cache()
        record = await self._listed()  # still configured: read and walked
        self._interval(0)
@@ -840,23 +840,6 @@ class TestLoraScanRoute(LoraAPITestCase):
            ("error", error["message"], 0),
        )

-    async def test_unexpected_scan_error_is_generic_in_the_stream(self):
-        self._enable()
-        secret = str(self.tmp_root / "x.db")
-        err = RuntimeError(f"could not open {secret}")
-        with patch.object(self.api.db, "replace_category_prompts", side_effect=err):
-            with self.assertLogs("prompt_manager.api", level="ERROR") as logs:
-                resp = await self.client.request("POST", "/prompt_manager/lora/scan")
-                body = await resp.text()  # the stream ends inside the patch
-        self.assertNotIn("x.db", body)
-        error = self._sse_events(body)[-1]
-        self.assertEqual(
-            (error["type"], error["status"], error["progress"]),
-            ("error", error["message"], 0),
-        )
-        self.assertIn("server log", error["message"])
-        self.assertIn(secret, "\n".join(logs.output))
-
    @staticmethod
    def _sse_events(text):
        return [
@@ -675,7 +675,7 @@ class TestBackupPoolAndDiskSpace(ApplyTestCase):
        self.assertEqual(len(backups), MAX_SAFETY_BACKUPS)
        self.assertNotIn(restore_style[0], backups)
        self.assertNotIn(restore_style[1], backups)
-        self.assertLessEqual(set(maintenance_style), set(backups))
+        self.assertTrue(set(maintenance_style) <= set(backups))
        # A restore prunes the same pool, maintenance backups included.
        self.old_backup("prompts.db.backup_20020101_000000", 3000)
        _prune_safety_backups(self.api.db.model.db_path)
@@ -11,7 +11,7 @@ import time
 import types
 import unittest
 from pathlib import Path
-import unittest.mock as mock
+from unittest import mock

 try:
    from tests.open_handles import assert_closed
@@ -6,7 +6,7 @@ Large frees then go back to the OS instead of fragmenting per-thread arenas.
 import ctypes
 import sys
 import unittest
-import unittest.mock as mock
+from unittest import mock

 from tests.browser import malloc_tuning

@@ -46,6 +46,7 @@ class TestResetWatch(unittest.TestCase):
        self.assertFalse(is_reset_path("/__test__/reset/extra"))

    def test_a_stalled_reset_reports_state_and_stacks_while_it_waits(self):
+        stream = io.StringIO()
        reported = threading.Event()

        class Stream(io.StringIO):
@@ -385,8 +385,8 @@ class TestArchivedReaders(LibraryDeleteCase):

    def setUp(self):
        super().setUp()
-        self.kept, _, _ = self.paired("Kept cat", "kept blur")
-        self.gone, _, _ = self.paired("Gone cat", "gone blur")
+        self.kept, _kn, _kp = self.paired("Kept cat", "kept blur")
+        self.gone, _gn, _gp = self.paired("Gone cat", "gone blur")
        for pid, category, tag in ((self.kept, "keep", "k"), (self.gone, "gone", "g")):
            self.db.update_prompt_metadata(pid, category=category, tags=[tag])
        self.apply([self.gone])
@@ -642,7 +642,7 @@ class TestPairedDelete(LibraryDeleteCase):
        # The negatives stay, and the image file stays on disk.
        self.assertTrue((self.root / "owl.png").exists())
        texts = [row[0] for row in rows(self.db, "SELECT text FROM prompts")]
-        self.assertLessEqual({"dark", "fog", "Bystander"}, set(texts))
+        self.assertTrue({"dark", "fog", "Bystander"} <= set(texts))

    def test_a_negative_used_by_another_positive_is_archived_never_deleted(self):
        shared = save(self.db, "Shared")
@@ -14,7 +14,7 @@ import threading
 import types
 import unittest
 from collections import namedtuple
-import unittest.mock as mock
+from unittest import mock

 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))

@@ -140,10 +140,8 @@ class TestIdempotentMigrations(MigrationTestCase):
    def test_stale_prompts_new_from_a_failed_rebuild_does_not_block_startup(self):
        self._legacy_db(
            [
-                (
-                    "INSERT INTO prompts (text, hash, workflow_name)"
-                    " VALUES ('a', 'h1', 'wf')"
-                ),
+                "INSERT INTO prompts (text, hash, workflow_name)"
+                " VALUES ('a', 'h1', 'wf')",
                "CREATE TABLE prompts_new (id INTEGER PRIMARY KEY, junk TEXT)",
                "INSERT INTO prompts_new (junk) VALUES ('leftover')",
            ]
@@ -159,14 +157,10 @@ class TestIdempotentMigrations(MigrationTestCase):
        # DROP TABLE prompts with foreign keys ON cascades into generated_images
        self._legacy_db(
            [
-                (
-                    "INSERT INTO prompts (text, hash, workflow_name)"
-                    " VALUES ('a', 'h1', 'wf')"
-                ),
-                (
-                    "INSERT INTO generated_images (prompt_id, image_path, filename)"
-                    " VALUES (1, '/out/a.png', 'a.png')"
-                ),
+                "INSERT INTO prompts (text, hash, workflow_name)"
+                " VALUES ('a', 'h1', 'wf')",
+                "INSERT INTO generated_images (prompt_id, image_path, filename)"
+                " VALUES (1, '/out/a.png', 'a.png')",
            ]
        )

@@ -178,15 +172,11 @@ class TestIdempotentMigrations(MigrationTestCase):
    def test_rebuild_keeps_library_state_rows(self):
        self._legacy_db(
            [
-                (
-                    "INSERT INTO prompts (text, hash, workflow_name)"
-                    " VALUES ('a', 'h1', 'wf')"
-                ),
-                (
-                    "CREATE TABLE prompt_library_state (prompt_id INTEGER PRIMARY KEY,"
-                    " title TEXT, FOREIGN KEY(prompt_id) REFERENCES prompts(id)"
-                    " ON DELETE CASCADE)"
-                ),
+                "INSERT INTO prompts (text, hash, workflow_name)"
+                " VALUES ('a', 'h1', 'wf')",
+                "CREATE TABLE prompt_library_state (prompt_id INTEGER PRIMARY KEY,"
+                " title TEXT, FOREIGN KEY(prompt_id) REFERENCES prompts(id)"
+                " ON DELETE CASCADE)",
                "INSERT INTO prompt_library_state VALUES (1, 'kept')",
            ]
        )
@@ -242,59 +232,43 @@ class TestIdempotentMigrations(MigrationTestCase):
        byte_id = "6a1b2c3d-4e5f-4a6b-8c9d-0e1f2a3b4c5d"
        self._legacy_db(
            [
-                (
-                    "INSERT INTO prompts (text, hash, workflow_name)"
-                    " VALUES ('a', 'h1', 'wf')"
-                ),
-                (
-                    "CREATE TABLE tags (id INTEGER PRIMARY KEY AUTOINCREMENT,"
-                    " name TEXT NOT NULL UNIQUE)"
-                ),
+                "INSERT INTO prompts (text, hash, workflow_name)"
+                " VALUES ('a', 'h1', 'wf')",
+                "CREATE TABLE tags (id INTEGER PRIMARY KEY AUTOINCREMENT,"
+                " name TEXT NOT NULL UNIQUE)",
                "INSERT INTO tags (id, name) VALUES (3, 'img-only')",
-                (
-                    "CREATE TABLE media_annotation_metadata (singleton_id INTEGER"
-                    " PRIMARY KEY CHECK(singleton_id=1), schema_version INTEGER NOT"
-                    " NULL CHECK(schema_version=1), image_index_revision INTEGER NOT"
-                    " NULL DEFAULT 0 CHECK(image_index_revision>=0))"
-                ),
+                "CREATE TABLE media_annotation_metadata (singleton_id INTEGER"
+                " PRIMARY KEY CHECK(singleton_id=1), schema_version INTEGER NOT"
+                " NULL CHECK(schema_version=1), image_index_revision INTEGER NOT"
+                " NULL DEFAULT 0 CHECK(image_index_revision>=0))",
                "INSERT INTO media_annotation_metadata VALUES (1, 1, 4)",
-                (
-                    "CREATE TABLE media_annotation_files (id TEXT PRIMARY KEY"
-                    " CHECK(length(id)=36), locator TEXT NOT NULL UNIQUE,"
-                    " created_at TEXT NOT NULL)"
-                ),
+                "CREATE TABLE media_annotation_files (id TEXT PRIMARY KEY"
+                " CHECK(length(id)=36), locator TEXT NOT NULL UNIQUE,"
+                " created_at TEXT NOT NULL)",
                f"INSERT INTO media_annotation_files VALUES ('{file_id}',"
                " '/out/a.png', '2026-10-22T00:00:00.000000+00:00')",
-                (
-                    "CREATE TABLE media_annotation_bytes (id TEXT PRIMARY KEY"
-                    " CHECK(length(id)=36), file_id TEXT NOT NULL REFERENCES"
-                    " media_annotation_files(id) ON DELETE CASCADE, sha256 TEXT NOT"
-                    " NULL CHECK(length(sha256)=64 AND sha256 NOT GLOB"
-                    " '*[^0-9a-f]*'), size INTEGER NOT NULL CHECK(size>=0), mtime_ns"
-                    " INTEGER NOT NULL, verified_at TEXT NOT NULL, first_seen_at TEXT"
-                    " NOT NULL, tag_revision INTEGER NOT NULL DEFAULT 0"
-                    " CHECK(tag_revision>=0), UNIQUE(file_id, sha256))"
-                ),
-                (
-                    "CREATE INDEX idx_media_annotation_bytes_fingerprint ON"
-                    " media_annotation_bytes(file_id, size, mtime_ns)"
-                ),
+                "CREATE TABLE media_annotation_bytes (id TEXT PRIMARY KEY"
+                " CHECK(length(id)=36), file_id TEXT NOT NULL REFERENCES"
+                " media_annotation_files(id) ON DELETE CASCADE, sha256 TEXT NOT"
+                " NULL CHECK(length(sha256)=64 AND sha256 NOT GLOB"
+                " '*[^0-9a-f]*'), size INTEGER NOT NULL CHECK(size>=0), mtime_ns"
+                " INTEGER NOT NULL, verified_at TEXT NOT NULL, first_seen_at TEXT"
+                " NOT NULL, tag_revision INTEGER NOT NULL DEFAULT 0"
+                " CHECK(tag_revision>=0), UNIQUE(file_id, sha256))",
+                "CREATE INDEX idx_media_annotation_bytes_fingerprint ON"
+                " media_annotation_bytes(file_id, size, mtime_ns)",
                f"INSERT INTO media_annotation_bytes VALUES ('{byte_id}',"
                f" '{file_id}', '{'a' * 64}', 3, 1700000000000000000,"
                " '2026-10-22T00:00:00.000000+00:00',"
                " '2026-10-22T00:00:00.000000+00:00', 2)",
-                (
-                    "CREATE TABLE media_image_tags (byte_id TEXT NOT NULL REFERENCES"
-                    " media_annotation_bytes(id) ON DELETE CASCADE, tag_id INTEGER"
-                    " NOT NULL REFERENCES tags(id) ON DELETE CASCADE, position"
-                    " INTEGER NOT NULL CHECK(position>=0), PRIMARY KEY(byte_id,"
-                    " tag_id))"
-                ),
+                "CREATE TABLE media_image_tags (byte_id TEXT NOT NULL REFERENCES"
+                " media_annotation_bytes(id) ON DELETE CASCADE, tag_id INTEGER"
+                " NOT NULL REFERENCES tags(id) ON DELETE CASCADE, position"
+                " INTEGER NOT NULL CHECK(position>=0), PRIMARY KEY(byte_id,"
+                " tag_id))",
                "CREATE INDEX idx_media_image_tags_tag ON media_image_tags(tag_id)",
-                (
-                    "CREATE UNIQUE INDEX idx_media_image_tags_position ON"
-                    " media_image_tags(byte_id, position)"
-                ),
+                "CREATE UNIQUE INDEX idx_media_image_tags_position ON"
+                " media_image_tags(byte_id, position)",
                f"INSERT INTO media_image_tags VALUES ('{byte_id}', 3, 0)",
            ]
        )
@@ -393,28 +367,18 @@ class TestIdempotentMigrations(MigrationTestCase):
    def test_image_table_is_rebuilt_with_uniqueness_by_full_path(self):
        self._legacy_db(
            [
-                (
-                    "INSERT INTO prompts (text, hash, workflow_name)"
-                    " VALUES ('a', 'h1', 'wf')"
-                ),
+                "INSERT INTO prompts (text, hash, workflow_name)"
+                " VALUES ('a', 'h1', 'wf')",
                # same basename in two folders: both must survive
-                (
-                    "INSERT INTO generated_images (prompt_id, image_path, filename)"
-                    " VALUES (1, '/out/2026-01-01/a.png', 'a.png')"
-                ),
-                (
-                    "INSERT INTO generated_images (prompt_id, image_path, filename)"
-                    " VALUES (1, '/out/2026-01-02/a.png', 'a.png')"
-                ),
+                "INSERT INTO generated_images (prompt_id, image_path, filename)"
+                " VALUES (1, '/out/2026-01-01/a.png', 'a.png')",
+                "INSERT INTO generated_images (prompt_id, image_path, filename)"
+                " VALUES (1, '/out/2026-01-02/a.png', 'a.png')",
                # two spellings of one file: only the newest row survives
-                (
-                    "INSERT INTO generated_images (prompt_id, image_path, filename)"
-                    " VALUES (1, '/out/x/../b.png', 'b.png')"
-                ),
-                (
-                    "INSERT INTO generated_images (prompt_id, image_path, filename)"
-                    " VALUES (1, '/out/b.png', 'b.png')"
-                ),
+                "INSERT INTO generated_images (prompt_id, image_path, filename)"
+                " VALUES (1, '/out/x/../b.png', 'b.png')",
+                "INSERT INTO generated_images (prompt_id, image_path, filename)"
+                " VALUES (1, '/out/b.png', 'b.png')",
            ]
        )

@@ -182,7 +182,7 @@ class TestAdminEndpointsUseConfigPath(unittest.TestCase):
                self.assertIsNone(warning)
                self.assertEqual(os.path.dirname(snapshot), folder)
                with open(snapshot, "rb") as handle:
-                    self.assertEqual(handle.read(16), b"SQLite format 3\x00")
+                    self.assertTrue(handle.read(16) == b"SQLite format 3\x00")
            finally:
                os.unlink(snapshot)
        finally:
@@ -31,20 +31,6 @@ def message(kind, job_id=JOB, **fields):
    return (kind, {"prompt_id": job_id, **fields})


-def hash_recording_kind():
-    """A str subclass for event kinds, and the list of hashes taken of it."""
-    hashed = []
-
-    class OversizedKind(str):
-        __eq__ = str.__eq__
-
-        def __hash__(self):
-            hashed.append(len(self))
-            return str.__hash__(self)
-
-    return OversizedKind, hashed
-
-
 def finish(messages, completed=True):
    return make_finish(SESSION, 0, EPOCH, Status("success", completed, messages), 500)

@@ -360,10 +346,13 @@ class ExecutionHistoryEventsTests(unittest.TestCase):
        self.assertLessEqual(len(encode_command(command)), 2048)

    def test_oversized_unknown_kind_is_ignored_without_hashing(self):
-        kind_class, hashed = hash_recording_kind()
+        class OversizedKind(str):
+            def __hash__(self):
+                raise AssertionError("Oversized event kind must not be hashed")
+
        command = finish(
            [
-                message(kind_class("x" * 1_000_000)),
+                message(OversizedKind("x" * 1_000_000)),
                message("execution_success", timestamp=300),
            ]
        )
@@ -372,16 +361,19 @@ class ExecutionHistoryEventsTests(unittest.TestCase):
            (result.outcome, result.reason), ("succeeded", "terminal_success")
        )
        self.assertLessEqual(len(encode_command(command)), 2048)
-        self.assertEqual(hashed, [], "Oversized event kind must not be hashed")

    def test_encoder_rejects_oversized_kind_without_hashing(self):
-        kind_class, hashed = hash_recording_kind()
+        class OversizedKind(str):
+            def __hash__(self):
+                raise AssertionError("Oversized event kind must not be hashed")
+
        command = finish([message("execution_success")])
-        event = LifecycleEvent(kind_class("x" * 1_000_000), JOB, None, None, None, None)
+        event = LifecycleEvent(
+            OversizedKind("x" * 1_000_000), JOB, None, None, None, None
+        )
        with self.assertRaises(ValueError):
            encode_command(
                replace(
                    command, evidence=TerminalEvidence((event,), False, False, False)
                )
            )
-        self.assertEqual(hashed, [], "Oversized event kind must not be hashed")
@@ -17,7 +17,7 @@ class Hostile:
        raise AssertionError("host scalar coercion")

    def __bool__(self):
-        raise TypeError("host truth test")
+        raise AssertionError("host truth test")

    def __eq__(self, other):
        raise AssertionError("host equality")
@@ -24,7 +24,7 @@ import tempfile
 import textwrap
 import threading
 import unittest
-import unittest.mock as mock
+from unittest import mock

 ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 sys.path.insert(0, ROOT)
@@ -26,7 +26,7 @@ import types
 import unittest
 from concurrent.futures import ThreadPoolExecutor
 from pathlib import Path
-import unittest.mock as mock
+from unittest import mock

 from py.api import thumbnail_auto
 from utils import image_monitor, parallel
@@ -7,7 +7,7 @@ I/O: history comes in through ``lookup``.

 import json
 import unittest
-import unittest.mock as mock
+from unittest import mock

 from database.run_attribution import RecordedOutput
 from tests.test_pair_scan import flux_graph, sampled_graph
@@ -2,7 +2,7 @@

 import logging
 import unittest
-import unittest.mock as mock
+from unittest import mock

 from prompt_manager import PromptManager, PromptManagerFocused
 from utils.prompt_graph import positive_prompt_nodes, run_prompt_nodes
@@ -312,7 +312,7 @@ class RootContainsTests(unittest.TestCase):
        root = os.path.normcase(os.path.realpath(tempfile.gettempdir()))
        inside = os.path.join(root, "x.png")
        self.assertTrue(root_contains(root, inside))
-        self.assertEqual(root_contains(root, inside.upper()), os.name == "nt")
+        self.assertTrue(root_contains(root, inside.upper()) == (os.name == "nt"))


 if __name__ == "__main__":
@@ -527,7 +527,7 @@ class TestPackageLoggerIsolation(unittest.TestCase):
        def log_from_background_thread():
            try:
                logging.getLogger("prompt_manager.late_emitter").warning(message)
-            except Exception as error:
+            except BaseException as error:
                errors.append(error)

        self.handler.addFilter(pause_before_handler_lock)
@@ -143,6 +143,8 @@ class TestLibrary(unittest.TestCase):
            self.db.get_library_positive(positive, variant_limit=201)

    def test_sorts_keysets_survive_anchor_deletion_and_insertions_without_writes(self):
+        import sqlite3
+
        a = self.save("Alpha", rating=2, tags=["tag"])
        b = self.save("beta", rating=5)
        c = self.save("charlie")
@@ -297,7 +297,7 @@ class TestLibraryDeleteRoutes(LibraryDeleteRouteCase):
        )
        page = await response.json()
        self.assertEqual(page["archived_total"], 3)
-        self.assertLessEqual(set(item["id"] for item in page["items"]), set(kept))
+        self.assertTrue(set(item["id"] for item in page["items"]) <= set(kept))
        response = await self.client.request(
            "GET",
            "/prompt_manager/library?limit=2&shelf=archived"
@@ -135,7 +135,6 @@ class TestLogsAndCache(_EnvCase):

            get_logger_manager()._setup_loggers()
        except Exception:
-            # best effort restore in teardown; must not hide the test result
            pass

    def test_lora_image_cache_follows_the_data_folder(self):
@@ -18,7 +18,7 @@ import tempfile
 import threading
 import types
 import unittest
-import unittest.mock as mock
+from unittest import mock

 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))

@@ -22,7 +22,7 @@ import sqlite3
 import sys
 import threading
 import unittest
-import unittest.mock as mock
+from unittest import mock

 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))

@@ -1112,10 +1112,10 @@ class LocalProjectionParityTests(unittest.TestCase):
                self.assertEqual(_canonical_bytes(local), _canonical_bytes(server))
                seen.update(server["record_formats"].values())
                seen.add(server["workflow_graph"]["status"])
-        self.assertLessEqual(
-            {"reserialized-json", "original-text", "invalid", "limited"}, seen
+        self.assertTrue(
+            {"reserialized-json", "original-text", "invalid", "limited"} <= seen
        )
-        self.assertLessEqual({"parsed", "malformed", "limited"}, seen)
+        self.assertTrue({"parsed", "malformed", "limited"} <= seen)


 def _server_evidence(records, file_name=None):
@@ -1287,7 +1287,7 @@ class LocalResolverParityTests(unittest.TestCase):
    def test_local_roles_match_selection_record_sets(self):
        answers = self._compare(selection_cases.selection_cases())
        reasons = {answer["resolution"]["reason"] for answer in answers.values()}
-        self.assertLessEqual(
+        self.assertTrue(
            {
                "Every sampler branch uses the same prompt pair",
                "Multiple sampler branches",
@@ -1301,8 +1301,8 @@ class LocalResolverParityTests(unittest.TestCase):
                "Negative prompt delimiter is absent",
                "Parameters exceed the length limit",
                "No A1111 parameters",
-            },
-            reasons,
+            }
+            <= reasons
        )
        # A stage reaching only previews is dropped: one sampler is named.
        self.assertEqual(
@@ -1352,7 +1352,7 @@ class LocalResolverParityTests(unittest.TestCase):
    def test_local_roles_match_golden_record_sets(self):
        answers = self._compare(resolver_cases.golden_cases())
        codes = {answer["resolution"]["reason_code"] for answer in answers.values()}
-        self.assertLessEqual(
+        self.assertTrue(
            {
                "malformed",
                "unsupported-node",
@@ -1364,16 +1364,16 @@ class LocalResolverParityTests(unittest.TestCase):
                "graph-ceiling",
                "no-sampler",
                None,
-            },
-            codes,
+            }
+            <= codes
        )
        sources = {
            side["source"]
            for answer in answers.values()
            for side in answer["prompts"].values()
        }
-        self.assertLessEqual(
-            {"execution", "graph-inferred", "zeroed-conditioning"}, sources
+        self.assertTrue(
+            {"execution", "graph-inferred", "zeroed-conditioning"} <= sources
        )

    def test_committed_resolver_vectors_are_current(self):
@@ -197,7 +197,7 @@ class TestGetPromptSubfolders(LoraDBTestCase):

    def test_subfolders_use_forward_slashes_on_every_platform(self):
        """Clients split folders on "/" whatever separator the OS produced."""
-        import unittest.mock as mock
+        from unittest import mock

        import database.operations as operations

@@ -584,6 +584,9 @@ class CentralizedDiscoveryTests(LayoutTestCase):
    def test_an_unlistable_folder_raises(self):
        layout = self.load()

+        def refuse(error):
+            raise error
+
        def failing_walk(top, onerror=None, followlinks=False):
            onerror(PermissionError(13, "denied", top))
            return iter(())
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Vito Sansevero	95478a0aed	fix(viewer): destroy a pending viewer whose element left the stage rebuild() empties the stage while a view is pending, and the deferred destroy then failed on the viewer's null parent: a page error, and the image kept its src. The destroy now finishes and the src is released.	2026-10-30 18:32:57 -07:00
Vito Sansevero	df0a798eea	test(viewer): wait for the viewer's first fit before reading it The keys spec read the fit as soon as Zoom enabled, a frame before the viewer fits the image to the stage. Under load it then compared 873.6px with 901.2px. Failed 3 of 3 under --cpus=2 on WebKit, on the combined head and on #534's own head; with the wait the spec passes 96 of 96.	2026-10-30 18:32:56 -07:00
Vito Sansevero	2ebc5d9280	fix(nodes): Pair node fills the prompt's empty category and tags (#551 ) Closes #546	2026-10-30 16:54:50 -07:00
Vito Sansevero	7f414e7c45	fix(workspace): Overview cards show the sidebar's counts (#549 ) Closes #547	2026-10-30 16:54:50 -07:00
Vito Sansevero	096e2472bd	docs(testing): record D190, the trash review primary that cannot act	2026-10-30 16:54:50 -07:00
Vito Sansevero	4a25db545c	test(trash): classify the Needs review link route and prove it refuses a trashed file POST /review/items/{id}/link needs a capture of the item's bytes. A capture is refused for a path in a trash folder, and a capture taken earlier stops working when its file moves to a trash folder or its folder becomes a link to one, so no code change is needed. The decision route takes the same path, so it moves to the same audit group.	2026-10-30 16:54:50 -07:00
Vito Sansevero	cdaf4122de	fix(trash): trash on an output folder that is a mount point (#543 ) (#544 ) Closes #543	2026-10-30 16:54:50 -07:00
Vito Sansevero	4be48c2ee5	test(workspace): wait for the delete job before its end toast in the sticky chrome spec	2026-10-30 16:54:22 -07:00
Vito Sansevero	e272c84efd	feat(workspace): selection bars stay in view, Back to top, side panels stay with you (#531 ) (#541 ) Closes #531	2026-10-30 16:52:45 -07:00
Vito Sansevero	494a5d0bfa	fix(viewer): arrow keys navigate from anywhere; a shortcuts overlay (#532 ) (#534 ) Closes #532	2026-10-30 16:52:44 -07:00
Vito Sansevero	06ea91da66	feat(review): link an image to a library prompt from Needs review (#536 ) (#540 ) Closes #536	2026-10-30 16:52:42 -07:00
Vito Sansevero	07c2442e23	fix(send): name ComfyUI windows by their tab and explain why a send is blocked (#539 ) Closes #535	2026-10-30 16:52:41 -07:00
Vito Sansevero	e6e425ed35	fix(workspace): level two-column cards, window the Reusable tags list, full-width System (#530 ) (#538 ) Closes #530	2026-10-30 16:52:41 -07:00
Vito Sansevero	db1c7ef20d	fix(images): show every Show in folder outcome above the viewer and report opener failures (#537 ) Closes #533	2026-10-30 16:52:38 -07:00
Vito Sansevero	0f2f88d48c	test(images): wait for the delete and return jobs, not 5 s (#554 ) Closes #553	2026-10-30 16:52:37 -07:00