Merge remote-tracking branch 'origin/main' into fix/369-threshold-step

# Conflicts:
#	tests/browser/workspace_system_fixture.py

.github/branch-protection.json

@@ -1,6 +1,6 @@
 {
   "required_status_checks": {
-    "strict": false,
+    "strict": true,
     "contexts": [
       "py3.12 on ubuntu-latest",
       "py3.13 on ubuntu-latest",

.github/workflows/code-quality.yml

@@ -4,7 +4,6 @@ permissions:
   contents: read
 
 on:
-  merge_group:
   push:
     branches: [main]
   pull_request:

.github/workflows/test.yml

@@ -4,7 +4,6 @@ permissions:
   contents: read
 
 on:
-  merge_group:
   pull_request:
     branches: [main]
   push:
@@ -64,18 +63,16 @@ jobs:
   comfyui:
     name: real ComfyUI compatibility
     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
     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: |
@@ -100,42 +97,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

.github/workflows/viewerjs-check.yml

@@ -1,7 +1,6 @@
 name: Viewer.js vendor and compatibility
 
 on:
-  merge_group:
   pull_request:
     branches: [main]
   push:

TESTING.md

@@ -282,12 +282,11 @@ PromptManager's own background threads stop through one package teardown,
 works against one 10 s deadline. Each step gets the smaller of its own bound
 and the time left. The steps, in order:
 
-1. Refuse new previews (`refuse_auto_thumbnails()`), then detach the
-   monitor's callbacks (Needs review recorder, preview queue, Images listing
-   listener).
-2. `ImageMonitor.stop_monitoring` works against one 5 s deadline. Closing the
-   image handler joins the image worker; watchdog's `observer.stop()` (not
-   bounded here) and the observer join get what is left, which can be 0 s.
+1. Detach the monitor's callbacks (Needs review recorder, preview queue,
+   Images listing listener).
+2. `ImageMonitor.stop_monitoring` closes the image handler, which joins the
+   image worker (5 s). It then calls watchdog's `observer.stop()`, which is
+   not bounded here, and joins the observer (5 s).
 3. `close_auto_thumbnails(final=True)` stops the preview worker (30 s) and
    kills ffmpeg.
 4. `PromptTracker.shutdown` stops the prompt cleanup thread (2 s).
@@ -296,11 +295,7 @@ A failing step, or a second Ctrl+C, is logged with its traceback and does not
 skip the later steps. A clean run logs one INFO line to PromptManager's log:
 `Background work stopped in 0.4 s: monitor=ok thumbnails=ok tracker=ok`. If
 any part is still running, one WARNING goes to the console:
-`Background work not stopped in time (10.0 s): monitor`. A Ctrl+C that lands
-between two steps (each step catches its own) is re-raised after the result is
-stored, with the parts not reached False, and the `atexit` callback is
-removed: the later steps are skipped, no summary line is logged, and a later
-call returns that result and runs nothing.
+`Background work not stopped in time (10.0 s): monitor`.
 
 ComfyUI never runs aiohttp's `on_cleanup` hooks, because it never calls
 `runner.cleanup()`. So `atexit` is the live host's path. It runs on Ctrl+C
@@ -745,55 +740,11 @@ with a literal true `strip_newlines` is `replace("\n", "").strip()`;
 (`N` = `inputcount`) after the literal delimiter unless missing or exactly `""`, and
 ignores later inputs. A linked setting is `unsupported-node`; a list output
 (`return_list` true or linked) and `PromptSearchList` are `runtime-value` ("Text is
-decided at run time"), never one list item. Every
+decided at run time"), never one list item. Unverified text nodes (LoRAfromText,
+RegexReplace, XYZPrompt, ImpactWildcardProcessor) stay `unsupported-node`. Every
 intermediate text is length-checked and charged to the scanned-character budget. If
 the table cannot be loaded, graph inspection is `unresolved` ("Inspection node
 semantics are unavailable") and ingestion is unaffected, because it never imports the table.
-Unknown nodes pass through (#381, maintainer-approved 2026-10-27; no per-node
-inventory): an output whose class the table, its `facts`, `lineage` and the code's
-adapters never name is read through, not refused. A `text` input is its text (the
-legacy encoder rule, so RegexReplace or LoRAfromText show their input text), except
-that a string output of a node with a seed input (`seed`, `noise_seed`,
-`sampling_mode.seed`) and no linked `conditioning`/`positive`/`negative` input is
-generated at run time (a language model such as TextGenerate, a wildcard):
-`runtime-value` naming it. Else, at output slot 0 or 1 of a node with a `positive` or
-`negative` input, only `positive` (slot 1, `negative`) is followed, nothing when it
-is not linked; else a linked `conditioning` alone; else every linked input except
-the table's `pass_through.skip_inputs` (core type inputs: model, clip, vae, image,
-latent, ...), each traced with kind `any`. A followed input with no text adds
-nothing; limits and selector choices propagate; another failure (`runtime-value`,
-`composite`, `malformed`) blocks, unless a PromptManager node was reached: this
-repository's own nodes are authoritative, and then only their texts count. One
-distinct text resolves; several make the sampler `ambiguous` "Several prompts reach
-the sampler" with one candidate per distinct outcome, in input order (at most 32,
-else `work-limit`). A PromptManagerPair's execution record is what ran: while its
-inputs are checked against it, a walk through an unknown node that fails, diverges
-or passes text through is unverifiable and never overrides the record. No text
-at all is `unsupported-node` naming the outermost unknown node. An unlisted output
-of a listed class (a sampler, a loader, a lineage node) stays `unsupported-node`, so
-the walk never reads another stage's prompt. `INSPECTION_RESOLVER_VERSION` is 2 for
-this rule; ingestion keeps the default profile (`RESOLVER_VERSION` 1). The legacy
-parity gate (`tests/test_legacy_parity_gate.py`) records, per corpus (the
-generation-params vectors, the inspection parity fixtures, the local resolver golden
-and selection cases, the unknown-node shapes in `tests/unknown_node_graphs.py`),
-every graph whose inspection positive equals the legacy parser's; a graph may join
-that list (`python3 -m tests.test_legacy_parity_gate --write`), never leave it. A graph
-may read differently from legacy only when `LEGACY_WRONG` there states why (legacy's
-first-sampler pick on a branch the file name identifies).
-Saver anchoring (#381): an inspected file's name (`path.name` on the server, the chosen
-file's name locally) anchors an unanchored inspection on the one node whose
-`filename_prefix` (literal, or traced as a string) has a last path part that makes the
-file's stem `<prefix>_<digits>` with an optional trailing `_`. That node's linked inputs
-are walked like a detailer's image ancestry, through any image node, and the listed
-samplers found are the candidates. No match, several matches, a walk that fails or no
-sampler found means no anchor: nothing is guessed and the file stays "several possible
-prompts". Ingestion ignores file names. Shared-conditioning stages: in a sampler's
-latent walk, an earlier sampler reading the very same conditioning links (positive and
-negative, or a guider; compared by node ID text and slot) is the same prompt, not an
-unattributed stage, when it is a plain first stage: not a detailer, no prompt override
-set, and no listed sampler in its own latent ancestry (else it stays unattributed) (`tests/test_resolver_saver_anchor.py`, shapes in
-`tests/saver_anchor_graphs.py` from the maintainer's `gpu_unlock_bench`, dataset and
-ANIMA runs; browser parity through the `anchor-*` cases, which carry `__file_name`).
 
 `tools/inspection_corpus.py --root DIR --out JSONL [--workers N] [--baseline JSONL]
 [--summary TXT] [--code TREE]` measures a media folder read-only against the #240
@@ -1683,9 +1634,6 @@ targets of the longest legal path (1024 code points, even escaped as `\uXXXX`) f
     unchanged, `-` skipped and `!` error.
   - The progress line is the scan's: "Processing file N of M · about X min left", the
     estimate (D56's `_time_left`) shown once two files are done, each file one batch.
-    An ended job never keeps it: its status line becomes "<Add tags | Auto-tag>
-    <finished | cancelled> · N files processed" (or the storage-restored sentence),
-    pinned by `test_an_ended_job_shows_no_time_left` (#379 live check).
   - Download report saves `prompt-manager-image-tags-<YYYYMMDD-HHMM>.json`.
   - The start toasts are "Tagging started." / "Auto-tagging started." (D85); the end
     toasts follow the design's pattern with the job's counts, as the scan's: "<title>
@@ -2705,8 +2653,7 @@ the connection's `total_changes` is 0 at close and the data reads back unchanged
 `-shm` bytes are not compared: every WAL reader rewrites its read marks there, so no
 reader can keep it byte-identical (`test_health_check_never_writes`).
 
-Recorded deviations (plan D60–D75, D79–D82 renumbered D92–D107, D109–D110 and D111–D114; D121–D134 assigned). D94,
-the per-section hand-off panel, was retired by S12 (#329): every section is native.
+Recorded deviations (plan D60–D75, D79–D82 renumbered D92–D107 and D111–D114; D121–D134 assigned):
 
 - **D92** (shell): no "Sample configuration" chip. The Save status is truthful: "No
   unsaved changes.", "Unsaved changes.", "Saved in this browser." / "Saved to the server
@@ -2738,6 +2685,10 @@ the per-section hand-off panel, was retired by S12 (#329): every section is nati
   "N output sources" with "Monitoring and enrichment share one source list.", prefixed
   by "M of N configured sources available." or "None configured is available; ComfyUI's
   output folder is used." when that is the case.
+- **D94** (all sections): a section not delivered yet shows the hand-off panel "Your
+  current tools are ready" with a link to each legacy tool that still owns it (the
+  plan's legacy coverage table); retired section by section, gone after S12. Since S11
+  (#328) only Diagnostics & logs hands off (`SECTION_HANDOFFS`, to the admin page).
 - **D95** (health report): the concept's `health-check` dialog titled "Health report",
   with no sample note. It lists every check in the server's order: Integrity check,
   Foreign keys & pair references, Canonical hashes, Pair uniqueness (added), Missing
@@ -2768,7 +2719,7 @@ the per-section hand-off panel, was retired by S12 (#329): every section is nati
 - **D123** (Maintenance): the concept's Maintenance notice
   ("Check first. Review changes. Then apply." + Run health checks) was delivered ahead of
   the rest of Maintenance (S2), as the native place that runs the health check; since S7
-  the section's two surfaces follow it and its hand-off panel is gone. A press shows "Checking…" (`aria-disabled`) and opens the report; a
+  the section's two surfaces follow it and its D94 hand-off is gone. A press shows "Checking…" (`aria-disabled`) and opens the report; a
   failed check toasts "The health check could not finish. Nothing was changed."
 - **D97** (Appearance): added rows for the legacy gallery settings the concept leaves
   out, after its own rows: "Show image details on cards" (`showImageInfo`; off hides a
@@ -2889,11 +2840,6 @@ the per-section hand-off panel, was retired by S12 (#329): every section is nati
   and the media hashes, `GET /__test__/system/digest`). `plan dialogs match the concept`
   (system-maintenance-concept.spec, both themes and sizes) compares each of the four
   operations' dialogs with the concept's, mapped by these values only.
-  S12 (#329): the `rotated_logs` plan (Diagnostics & logs › Review log cleanup, `h3`
-  "Rotated log copies") changes no library record: its Backup reads "Not needed: no
-  library record changes" (`backup.policy: "none"`), it has no D55 backup box, and its
-  `details` reads "Listed files (N)" (`a plan without a database change reads Not needed
-  and shows no backup box`, `rotated_logs details read Listed files`).
 - **D101** (Maintenance, S7): Duplicate image files → Find duplicates starts the
   duplicate search (Activity, D111); its job view adds "Review groups" after Download
   report once it finished with groups. The concept's `duplicates` dialog ("Review
@@ -3152,88 +3098,25 @@ the per-section hand-off panel, was retired by S12 (#329): every section is nati
   the persisted count the Tag image dialog's Suggestions field (D91) starts from. Pinned
   by the comparison's mapping (it inserts the row) and `defaults save through Save
   preferences and the Tag image dialog uses them`.
-- **D134** (Auto-tagging, S11, OQ2/OQ3/OQ7/OQ8; amended by #379): an `.operation` "Tag
-  output images" with "Review" follows `.row-actions`: the per-image batch (#379), whose
-  description reads "Tag each output image from its own pixels with the model above.
-  Prompts are not changed. Review the scope first.". Review is
+- **D134** (Auto-tagging, S11, OQ2/OQ3/OQ7/OQ8): an `.operation` "Tag output images"
+  with "Review" follows `.row-actions`: the legacy prompt-tag batch. Review is
   `aria-disabled` (the press explains) while the chosen engine is not downloaded or a
   value it uses is invalid; otherwise it posts `/autotag/batch/preview` with the drafted
   engine and policy (read-only) and opens "Review tag output images" in the concept's
   record-changing review (its `maintenancePlan` shell): `h3` "Tag output images", the
-  `dl.meta-grid` Model, Existing tags, Images, Already auto-tagged, Images to tag
-  ("about N"), Time, Settings ("General <g> · Character <c>" or "Template of N
-  characters", then " · up to L tags per image" with the preview's saved
-  `suggestion_limit`) and Backup, the estimate sentence ("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.") in the
-  `p.small`, the D55 backup box and Cancel / "Start tagging", which starts the
-  cancellable `autotag` job and opens it. Time (DEC11) is `m = max(1,
-  ceil(estimate_seconds / 60))` read "about m min" under 90 and "about H h M min" (or
-  "about H h") from 90, followed by " on a processor; a graphics card can be faster."
-  or, when the preview says WD14 runs on CUDA, " on the graphics card."; the language
-  models read "Language-model engines take longer per image. Activity shows the time
-  left once tagging starts.". The option label "Skip already tagged" is the concept's;
-  for this batch it skips images already auto-tagged (hand tags do not count). Replace
-  after review, a model not on disk, a short disk, no image and nothing to tag each show
-  the rows with only Cancel and the reason ("Replacing tags needs a review of each
-  image. Use Preview tagging review, or choose Skip or Merge for a batch run.", "The
-  output folders contain no images to tag.", "Every output image is already
-  auto-tagged.", "Not enough free disk space: the safety backup needs about X MB and Y
-  MB is free. Nothing is written until there is room.") in the close-only review
-  Integrations shares (`openCloseOnlyReview`). Pinned by
+  `dl.meta-grid` Model, Existing tags, Images linked, Prompts, Already tagged, Prompts
+  to tag ("up to N"), Settings ("General <g> · Character <c>" or "Template of N
+  characters") and Backup, the upper-bound sentence in the `p.small`, the D55 backup box
+  and Cancel / "Start tagging", which starts the cancellable `autotag` job and opens it.
+  Replace after review, a model not on disk, a short disk, no linked image and nothing to
+  tag each show the rows with only Cancel and the reason ("Replacing tags needs a review
+  of each image. Use Preview tagging review, or choose Skip or Merge for a batch run.",
+  "Every prompt with an output image is already tagged.", "Not enough free disk space:
+  the safety backup needs about X MB and Y MB is free. Nothing is written until there is
+  room.") in the close-only review Integrations shares (`openCloseOnlyReview`). Pinned by
   `tag output images review matches the concept`, its mutation check and `the
   Cancel-only review matches the concept review shell` (system-tagging-concept.spec) and
-  the batch tests of workspace-system-tagging.spec; the mutation check renames each grid
-  label in turn.
-- **D109** (Logs, S12, #329): the concept's Logs surface on the live server. The toolbar
-  keeps "Level", Refresh and the download (renamed "Download log": the active log,
-  `/logs/download/prompt_manager.log`, through the api client), with all six minimum
-  levels (All levels, DEBUG, INFO, WARNING, ERROR, CRITICAL; the concept has three) and an
-  added `label` "Lines" + `input#log-limit[type=number]` 1–500 (default 100): a value that
-  is not a whole number 1–500 after trimming gets `aria-invalid` and sends nothing, a
-  Level change included. The `pre` shows the in-memory buffer newest first as `HH:MM:SS
-  LEVEL message` ("No log entries at this level." / "The log could not be read."); a
-  newer read wins. Added after it, `p.small#log-stats[role=status]` "Log statistics":
-  "N entries in memory · E errors · W warnings · F files · S on disk" (errors are ERROR +
-  CRITICAL, singular for 1, links not counted). "Runtime log level" adds CRITICAL after
-  the concept's INFO, WARNING, DEBUG, ERROR; it and "Console logging" are runtime drafts
-  saved by Save preferences (`POST /logs/config`, only the changed keys) and read the
-  server's values; their descriptions say "Applied until the server restarts." (the
-  concept's say a gallery toggle is replaced and output stays quiet). Inside "Log files &
-  retention", after the concept's line ("prompt_manager.log · <size> · rotated copies:
-  N", N the `rotated` rows) and Review log cleanup (D100's `rotated_logs` plan): a
-  `p.small` "Rotates at M MB · keeps K rotated copies · file logging on|off · memory
-  buffer B entries" (read-only), an `.operation-list` of `/logs/files` (`h3` name, `p`
-  "<size> · <YYYY-MM-DD HH:MM> · Active log | Rotated copy | Other file | Link, not
-  downloaded", "Download" named "Download <name>" except for a link), and the danger
-  `.operation` "Clear all logs" / "Empty the active log and delete its rotated copies." /
-  "Clear all logs…", which confirms ("Empties prompt_manager.log, deletes N rotated
-  copies (S) and clears the lines shown here. The other files in the log folder are
-  kept. This cannot be undone."), runs `POST /logs/truncate`, toasts "Logs cleared · N
-  rotated copies deleted." (plus " · K could not be deleted") and reads the viewer,
-  statistics, files and configuration again. Pinned by workspace-system-diagnostics.spec's
-  Task 5 and Task 6 tests.
-- **D110** (Diagnostics, S12, #329): the concept's Diagnostics surface with live values.
-  The `div.meta-grid` `dd`s read one `GET /system/diagnostics`: Database "Readable ·
-  <size> · N images" or "Not readable: <message>"; Sources "N sources · M watching", "N
-  sources · K not available", or with none configured "ComfyUI output folder · watching
-  | manual scan"; Viewer.js "<pinned version> · pinned vendor". Host renderers is D106's
-  renderer line from the send bridge. Each reads "Loading…" first, "Busy: <job> is
-  running." when an exclusive job refuses the read (D57's naming) and "Could not be
-  read." on any other failure. Run checks opens the shared Health report (D95). The
-  buttons drop the concept's "sample": "Download diagnostic report" saves a fresh report
-  plus `host_renderers` as `prompt-manager-diagnostics-YYYYMMDD-HHMM.json` (local time)
-  and toasts "Diagnostic report downloaded." ("Busy: <job> is running. Try again when it
-  ends." / "The diagnostic report could not be downloaded. Nothing was saved to this
-  device."); "Inspect" opens `#/inspect`, which reads a file and writes nothing. An added
-  `.operation` "Test image link" / "Write a placeholder image record to check that
-  linking works." / "Create test link…" keeps the legacy synthetic link (S12-11): it
-  reads the most recent prompt on mount (`aria-disabled` with "Add a prompt first." or
-  "The most recent prompt could not be read." added to the description), confirms in
-  "Create test link" naming the prompt and how Missing-file links removes the record,
-  and toasts "Test link created (image record N)." or "The test link could not be
-  created. Nothing was changed.". Pinned by workspace-system-diagnostics.spec's Task 4
-  tests.
+  the batch tests of workspace-system-tagging.spec.
 - **D124** (inspector): with "Load metadata on selection" off, the Images panel and
   the viewer's details show "Metadata loads when you ask for it." and a "Load metadata"
   button instead of reading the file. The concept has no such state, so no concept
@@ -3608,9 +3491,7 @@ workflow (README changelog).
 ### LoRA reference import contract (#221, #249 System S10)
 
 The LoRA import is staged (`py/lora_import.py`): discover the LoraManager
-`*.metadata.json` files and fingerprint every scanned one, kept or skipped (path, size,
-modification time and whether it was kept, #362; a skipped sidecar added, removed or edited
-after the review refuses Start with `plan-changed`, `test_start_refused_when_a_skipped_sidecar_changed`); stage each
+`*.metadata.json` files and fingerprint them (path, size, modification time); stage each
 record (CivitAI example images go into the image cache first, best effort, counted in
 `downloaded` / `download_errors`; each image is written to a temp file beside its cache
 entry and moved in place, so a half-written image is never seen as cached); the files are
@@ -3676,67 +3557,25 @@ the kept, readable LoRAs and `skipped` the rest. Media per LoRA, without repeats
 preview (`preview_url`, else LoraManager's `PREVIEW_EXTENSIONS` order), then every file in
 `<example-images root>[/<library>]/<sha256>/` in natural order; a leading video yields to the
 first still. A file counts only with a servable extension and inside the guarded media
-roots. Only an absolute `preview_url` is used; a relative one is skipped with a DEBUG line
-naming the sidecar. A sidecar that is not valid UTF-8 JSON is skipped like any unreadable
-one (#362). CivitAI downloads run only for a LoRA without local media; a record's
-images are linked in reverse order, so its first image (the cover) is the newest link and
-the card image. The folder guard keeps a folder from the settings, and each of ComfyUI's
-default LoRA folders (`models/loras`, `extra_model_paths.yaml`, `folder_paths`), only when
-it exists and is neither a filesystem root (`/`, `C:\`, a UNC share root) nor the home
-folder or a folder that contains it (realpath + `normcase`); a refused default folder that
-exists is listed in the layout's `refused_defaults` and logged as one warning each time the
-refused set changes (`RefusedDefaultsTests`). An unusable layout (no install, unreadable /
-non-JSON / non-object / oversized settings, no `platformdirs`, a missing or refused
-centralized sidecar root, "the sidecar folder is a filesystem root, the home folder or a
-folder that contains it") gives a review without a token ("LoraManager settings: not
-usable: <reason>. Nothing was changed."), a legacy scan error with that reason, the default
-LoRA roots for serving (no example-images root), and trigger words from the default roots
-in alongside mode. A folder discovery cannot list answers the review with 500, code
-`folder-unreadable` ("A LoRA folder could not be listed (...). Nothing was changed.").
-`TriggerWordCache.load` never raises: an `OSError` is a warning, anything else is logged
-with its traceback (#362), both keep the previous map, and a running node retries a failed
-load only after 60 s (`TRIGGER_RETRY_SECONDS`). `tests/run_suite.py` and `tests/browser/server.py` point
+roots. CivitAI downloads run only for a LoRA without local media. The folder guard keeps a
+settings folder only when it exists and is neither a filesystem root (`/`, `C:\`, a UNC
+share root) nor the home folder or one of its ancestors (realpath + `normcase`). An
+unusable layout (no install, unreadable / non-JSON / non-object / oversized settings, no
+`platformdirs`, a missing or refused centralized sidecar root) gives a review without a
+token ("LoraManager settings: not usable: <reason>. Nothing was changed."), a legacy scan
+error with that reason, the default LoRA roots for serving, and trigger words from the
+default roots in alongside mode. `tests/run_suite.py` and `tests/browser/server.py` point
 `LORA_MANAGER_SETTINGS_DIR` at a disposable folder, so no test reads the developer's real
 LoraManager settings; tests that call `load_layout` inject their own folder too.
 
-**Linked-only gate and the layout cache (#362).** While the integration is on, the LoRA
-allow-list (`ImagesMixin._lora_image_dirs`) is the layout's `media_roots` plus the CivitAI
-download cache, and `_media_roots(outputs)` appends it after the output folders for Library
-previews, the Library prompt detail, the per-prompt images page, `serve_output_image` for a
-root past the outputs, `inspect_image` and `reveal_image`. Under such a root only a file the
-database records as a linked image is served, inspected or revealed (`_linked_only_error`,
-by its given and its real path); anything else answers 403. Library responses mark that
-media `linked_only`: no preview file, no favorite, no Tag button. The allow-list's layout
-comes from `py/lora_layout_cache.py` (`tests/test_lora_layout_cache.py`, which injects the
-clocks, `stat` and `ntpath` and never sleeps): one entry keyed by the stripped configured
-path, reused while the plugin settings file's and the settings file's `(st_mtime_ns,
-st_size)` (or "missing") are unchanged, the install and every media root still resolve to
-themselves (a folder swapped for a symlink reloads and the guard runs again), and the entry
-is under `MAX_AGE_SECONDS` (30 s, monotonic clock) old. A load is stored only when no
-watched file was modified within `RACY_SECONDS` (3 s) of the load (git's racy rule: a write
-during the load, LoraManager's in-place write, FAT/HFS+ coarse times), every watched file
-could be checked (any `stat` error but not-found, and an offline Windows share, is "cannot
-validate"), the settings were readable, and no `clear()` ran meanwhile (generation
-counter). Hits take no lock; concurrent misses each load. A finished import (System job or
-legacy scan, both through `replace_lora_imports`) clears it. The integration-off check runs
-before it, and the configured-path rule (a configured path that is not an install under
-`custom_nodes` adds no folders) on its result; a hit also needs the same home folder, which
-the guard compares against. `serve_image` builds the allow-list in the
-executor. The cache writes one INFO line, "LoraManager layout changed: <source> settings,
-<mode> storage, <n> media folders", when a stored layout differs from the last one logged.
-The review, Start, the legacy scan and the trigger cache read the layout fresh. Image route
-tests clear the per-process cache in `ImageRouteCoverageCase.setUp`; `write_settings` in
-`TestLoraManagerMediaServing` back-dates its file 10 s so the first load is stored.
-
 `tests/browser/workspace_integrations_fixture.py` (`/__test__/integrations/*`) makes a fake
 LoraManager install and LoRA folder under the server's temp root, holds or fails the
 import, saves a blocking pair and answers CivitAI downloads with a stub opener, so no
 test reaches the network.
 
 ```sh
-python3 -m unittest tests.test_lora_layout_cache tests.test_lora_manager_layout \
-  tests.test_lora_import tests.test_api_lora tests.test_lora_database tests.test_lora_utils \
-  tests.test_api_images -v
+python3 -m unittest tests.test_lora_manager_layout tests.test_lora_import tests.test_api_lora \
+  tests.test_lora_database tests.test_lora_utils -v
 node --test tests/js/workspace-system-integrations.test.js tests/js/prompt-bridge-adapter.test.js
 npm run --prefix tools/vendor test:workflows -- workspace-system-integrations.spec.mjs \
   system-integrations-concept.spec.mjs \
@@ -3792,45 +3631,19 @@ images", "Tag output images (legacy page)", "Tagging one image (legacy page)",
   `409 busy`; the legacy SSE route attaches to the same job and keeps its frames.
 - **Unload**: `POST /prompt_manager/autotag/unload` answers `{success, message}` or
   `409 model-busy`.
-- **Tag output images** (per image since #379; prompt tags and prompt text are never
-  written): its targets are every still image the output folders list (the Images
-  listing of each root, linked to a prompt or not; videos are not targets; a file under
-  two overlapping roots is one target). `POST /prompt_manager/autotag/batch/preview
-  {model_type, existing}` writes nothing and opens or stats no image file (it may wait
-  for the shared listing walk); it answers `images`, `already_tagged` (images with any
-  auto-tagged byte record), `to_tag` (`images − already_tagged` under Skip, `images`
-  under Merge; both estimates), `estimate_seconds` (WD14: `to_tag` × 1.6 s on the
-  processor or × `WD14_GPU_SECONDS_PER_IMAGE` when ONNX Runtime offers CUDA, see
-  `py/tagging_defaults.py`; `null` for GGUF and HF), `estimate_device` (`cpu`, `gpu`,
-  or `null`), `suggestion_limit` (the saved count the run uses), `model {type, label,
-  size_label, downloaded}`, `existing`, `review_required`, `backup {policy}` and
-  `disk`. `POST
+- **Tag output images**: `POST /prompt_manager/autotag/batch/preview {model_type,
+  existing}` writes nothing and opens no file; it answers `images`, `prompts`,
+  `already_tagged`, `to_tag` (an upper bound), `model {type, label, size_label,
+  downloaded}`, `existing`, `review_required`, `backup {policy}` and `disk`. `POST
   /prompt_manager/jobs/autotag {model_type, existing, options}` (WD14: both thresholds;
   GGUF/HF: `instructions`, the template) starts the cancellable `autotag` job (202),
   title "Tag output images", admission `records`, a safety backup by the policy first.
-  The job runs the `image-tags` loop (`_tag_each_file`) on each image: a capture, at
-  most `suggestion_limit` model tags, a re-hash, then a union into that image's tags
-  that also marks its bytes auto-tagged (`media_image_autotags`, one row per byte
-  record; an empty result and an unsupported still are marked too; File changed, File
-  not found, Too large to verify, read, inference and tag-limit errors are not). Phases,
-  each checked for Cancel: backup, model load, listing ("Listing output images…"), a
-  pre-pass that stats each file without opening it (gone: "File not found", over 256
-  MiB: "Too large to verify", under Skip a marked current record: "Already
-  auto-tagged"; counted with `record_counted`, rows up to the cap, no log line each),
-  then the loop ("Processing file {k + n} of {T}", the time left from the model's own
-  rate, D56 unchanged). It ends "Tagged N images", "Cancelled. Tags already added were
-  kept.", or failed with "Prompt storage was restored; start the job again.", "The
-  output folders could not be listed. Try again." or the model's refusal.
   Refusals: `400 review-required` (Replace after review never runs as a batch), `409
   model-unavailable` ("<label> is not downloaded. Download it in System ›
   Auto-tagging."), `507 insufficient-space`, `409 busy`, `409 model-busy`. The section
   toasts `model-busy` with its operation, the other three with the server's sentence,
   `busy` with the running job (D57), anything else "<what> could not start. Try again.".
   Outcomes: Tagged / Unchanged / Skipped / Errors (the `image-tags` descriptor, D111).
-  `tests/test_autotag_batch.py` pins it, including two images of one prompt getting
-  different tags with no `prompts` or `prompt_tags` row changed; the marks' schema group
-  is pinned by `tests/test_autotag_schema.py` (forward-only: one empty `WITHOUT ROWID`
-  table, optional in old backups, refused without the annotation group).
 
 No browser test downloads or runs a model: the injected `TestModel` answers, its
 `download_model` raises unless `/__test__/tagging/download {mode: hold | succeed |
@@ -3839,153 +3652,6 @@ it. Every workspace-system-tagging test asserts no `/autotag/download/` request.
 Changing the routes or `py/config.py` needs a ComfyUI restart; the section itself is
 HTML, CSS and JS only.
 
-### Logs and diagnostics contract (#249 System S12)
-
-System › Diagnostics & logs (`web/js/workspace/system-diagnostics.mjs`, D109–D110)
-reads and deletes only through the routes below; the legacy admin Logs and Diagnostics
-modals use the same routes and keep working.
-
-- **Rule R** (`utils/logging_config.py`): a file may be deleted as a rotated copy only
-  when it is a direct entry of the log folder named `prompt_manager.log.<n>` (`<n>` a
-  decimal integer ≥ 1 with no leading zero, compared after `normcase`) and a regular
-  file that is not a link or junction (`lstat`). Every other entry is `active`, `link`
-  or `other` and is never deleted. `/logs/files` rows carry that `kind`; links are listed
-  with their own `lstat` size and are not counted or sized by `/logs/stats`. A download
-  is served only for a regular, non-link file of the folder (a link, a folder or a name
-  not listed is 404), read off the event loop.
-- **Reviewed cleanup**: `POST /maintenance/preview {operation: "rotated_logs", options:
-  {}}` lists every rotated copy (basenames, size and time) and writes nothing; `POST
-  /maintenance/apply {token}` starts the `maintenance` job "Rotated log copies"
-  (admission `read`, not cancellable). Under the manager's files lock and every file
-  handler's lock it re-scans; when any listed file is missing, no longer rotated or
-  differs in size, `mtime_ns` or a non-zero inode, it deletes nothing and fails
-  `plan-changed` ("The log files changed since the review; nothing was deleted. Review
-  again.", Activity offers Review again). Otherwise it deletes exactly the listed files;
-  each is a Changed row ("Deleted · <size>"), a file that cannot be removed an Errors
-  row. Two Prompt Manager processes sharing one log folder are not locked against each
-  other: each file's identity is checked just before its unlink.
-- **Clear all logs** (`POST /logs/truncate`, also the admin page's Clear) empties the
-  active log through its handler, deletes the rotated copies (Rule R) and clears the
-  buffer; other files and links are kept. Response keys are unchanged.
-- **Runtime settings** (`GET/POST /logs/config`): the level (DEBUG…CRITICAL) and console
-  logging apply until the server restarts; the retention values are shown read-only in
-  the workspace and the API keeps accepting them.
-- **Report** (`GET /system/diagnostics`): built on the server from an explicit list of
-  fields (version, Python, platform, Viewer.js version, the four legacy checks, database
-  info, source counts, log configuration and statistics, the session's health summary
-  and the non-path configuration with `has_civitai_api_key`). Every path is relative to
-  a ComfyUI anchor or reads "outside ComfyUI"; a backstop scrub replaces any absolute
-  path or the saved key and counts it in `redacted`, which the tests require to be 0. It
-  takes a registry lease (409 `busy` while an exclusive job such as a restore runs).
-- **Compressed downloads**: the gzip middleware drops a handler's declared
-  `Content-Length` before it compresses a body, so the response declares the compressed
-  length. A stale length made a browser wait for bytes that never came: the log download
-  of any file over 1 KB hung (`test_compressed_body_declares_its_own_length`).
-
-The browser server writes its logs into `<server root>/logs`
-(`tests/browser/workspace_diagnostics_fixture.py`), whose hooks seed records with fixed
-times, rotated copies, a link (POSIX) and a user's `.bak`, and roll the copies over; no
-test reads or deletes a real log folder.
-
-`tests/browser/system-diagnostics-concept.spec.mjs` compares the section and its log
-cleanup review with the concept (dark and light, 1600x1100 and 390x844, no page scroll;
-both selects show their whole option at 320 wide). The fixture's `{mode: "concept"}` seed
-reproduces the concept's Logs sample: only its four buffer lines, a 1.4 MB active log with
-three rotated copies and console logging off, so those values are compared as the concept
-prints them. `mapDiagnosticsConcept` applies only D109 and D110, and `mapCleanupConcept`
-D100 (the shared `mapPlanConcept`) with D109's rule for this plan (no backup box, "Not
-needed: no library record changes", "Listed files"). The mutation check asserts that the
-unmapped difference is exactly the deviated paths. The comparison found that the Database
-line read `database_info.size_bytes`, a key the report does not have, so it always said
-"0 bytes"; it reads `database_size_bytes`, the key `get_database_info()` returns.
-
-### Legacy System capability coverage
-
-Every System capability of the legacy admin and gallery pages has an owner (#249 System
-S12, #329). Status is `covered` (a native control replaces it), `kept in legacy` (it stays
-on the legacy page, which keeps working) or `approved removal` (a ruling retired it). Native
-control is `` `<section>` · <role> · "<accessible name>" ``, `<section>` a System hash id
-and `<role>` one of button, combobox, switch, slider, spinbutton, textbox, group, status or
-term, followed by ` · in "<row title>"` when several rows of the section share the name.
-Every `covered` row names one, except the rows in `CONTROL_EXEMPTIONS`
-(`tools/vendor/legacy-coverage.mjs`), each with its reason: today only "Gallery per-image
-auto-tag / review", which the Images selection bar owns, not a System section. A row that
-is not `covered` names none (`—`). Test is the exact title of a test that runs, then its
-file. Anchors are line numbers on `main` at this PR.
-
-`tests/vendor/legacy-coverage.test.mjs` fails on a row with any of these problems:
-- no owner, or a status outside the three;
-- a malformed Native control cell;
-- a covered row without a control (unless exempt), or a control on a row that is not
-  covered;
-- a test title its file does not declare: `test(` or `it(` (`.only` and `.slow` count),
-  or a `def test_` at function or method indentation;
-- a title whose test is only declared with `.skip`, `.fixme` or `.fail`.
-
-A title that appears only in a comment or a Python docstring does not count. CI running
-those tests green is what proves them. `every covered legacy System capability has its
-native control` (workspace-system.spec) opens each covered row's section and finds the
-control by role and accessible name, inside its row when the cell names one. The shared
-"Review plan" of the per-operation review row and the Sources "Refresh" of the monitoring
-list stay unscoped: any row's control proves them.
-
-| Capability | Legacy anchor | Owner | Status | Native control | Test |
-| --- | --- | --- | --- | --- | --- |
-| Image scan directories add/remove | `admin.html:377–390`; `admin.js:200,1273–1323` | S4 Sources | covered | `sources` · button · "+ Add source" | Add source validates on the server, then marks the host draft dirty; Save persists (workspace-system-sources.spec.mjs) |
-| Currently monitoring list + Refresh | `admin.html:392–400`; `admin.js:1032` | S4 Sources | covered | `sources` · button · "Refresh" | watching only with a live observer; restart pending otherwise (workspace-system-sources.spec.mjs) |
-| Monitoring enabled | `py/config.py:212,248` | S4 Sources | covered | `sources` · switch · "Watch for new outputs" | Watch for new outputs saves monitoring_enabled; a restart applies it (workspace-system-sources.spec.mjs) |
-| Search results auto-hide `result_timeout` | `admin.html:407–412` | S3 Appearance | covered | `appearance` · spinbutton · "Node search auto-hide (seconds)" | host fields round-trip through /settings with revision (workspace-system.spec.mjs) |
-| Web UI display mode | `admin.html:414–422` | S3 Appearance | covered | `appearance` · combobox · "Open from ComfyUI" | host fields round-trip through /settings with revision (workspace-system.spec.mjs) |
-| Infinite scrolling default | `admin.html:424–430`; `admin.js:689–727` | Legacy prompt list (README continuous browsing); read-only in the report | kept in legacy | — | shouldLoadMore asks for the next page only near the bottom with pages left (list-state.test.js) |
-| Worker threads | `admin.html:437–445` | S4 Sources | covered | `sources` · slider · "Worker threads" | worker range max is cpu_count (workspace-system-sources.spec.mjs) |
-| LoraManager badge, enable, path, trigger words, CivitAI key, clear key | `admin.html:448–490`; `admin.js:1052–1156` | S10 Integrations | covered | `integrations` · switch · "LoraManager integration" | LoRA rows show detected / enabled / cache-loaded separately (workspace-system-integrations.spec.mjs) |
-| LoRA data import with progress | `admin.html:492–498,517–541`; `admin.js:1157` | S10 Integrations | covered | `integrations` · button · "Review import" | Review import shows replacement, blocked items and network effects with the backup box; Start opens the job (D107) (workspace-system-integrations.spec.mjs) |
-| Statistics | `admin.html:159`; `admin.js:1627` | S2 Overview | covered | `overview` · button · "Explore" | statistics dialog lists runs by category and library totals (workspace-system.spec.mjs) |
-| Export components JSON `/export` | `admin.html:163`; `admin.js:1607`; `py/api/prompts.py:238` | S9 Backup & export | covered | `backups` · button · "Export all prompts JSON" | Export JSON downloads /library/export; secondary buttons download all prompts (/export) and /pairs/export (D103) (workspace-system-backups.spec.mjs) |
-| Saved pairs export | `py/api/pairs.py:84` | S9 Backup & export | covered | `backups` · button · "Export saved pairs JSON" | Export JSON downloads /library/export; secondary buttons download all prompts (/export) and /pairs/export (D103) (workspace-system-backups.spec.mjs) |
-| Library export | `py/api/library.py:223` | S9 Backup & export | covered | `backups` · button · "Export JSON" | Export JSON downloads /library/export; secondary buttons download all prompts (/export) and /pairs/export (D103) (workspace-system-backups.spec.mjs) |
-| Diagnostics run | `admin.html:171,659`; `admin.js:1984` | S12 Diagnostics | covered | `diagnostics` · button · "Run checks" | Run checks opens the shared Health report (workspace-system-diagnostics.spec.mjs) |
-| Synthetic image-link test | `admin.html:662`; `admin.js:2101` | S12 Diagnostics | covered | `diagnostics` · button · "Create test link…" | Create test link confirms first and names the prompt (workspace-system-diagnostics.spec.mjs) |
-| Maintenance cleanup_duplicates, vacuum, cleanup_orphaned_images, prune_orphaned_prompts | `admin.html:692–748`; `admin.js:1834` | S6/S7 Maintenance | covered | `maintenance` · button · "Review plan" · in "Duplicate prompt text" | Apply reviewed operation closes, toasts, opens the job in Activity (workspace-system-maintenance.spec.mjs) |
-| Maintenance check_hash_duplicates, check_consistency | `admin.html:692–748`; `admin.js:1834` | S2 Health report (Maintenance notice, D123) | covered | `maintenance` · button · "Run health checks" | Run health checks opens Health report and updates metric 4 (workspace-system.spec.mjs) |
-| Maintenance statistics (database info) | `admin.html:692–748`; `admin.js:1834` | S12 Diagnostics | covered | `diagnostics` · term · "Database" | meta-grid shows real database and source status, the pinned Viewer.js version and the host renderers (workspace-system-diagnostics.spec.mjs) |
-| Maintenance select all / clear all / run | `admin.html:754–762`; `admin.js:1822–1833` | S7 per-operation review | covered | `maintenance` · button · "Review plan" | plan dialog shows the server's scope, protected, backup policy and media lines with the backup box (D100); Cancel writes nothing (workspace-system-maintenance.spec.mjs) |
-| Prompt cleanup `/cleanup` | `py/api/admin.py:620` | S6/S7 Maintenance | covered | `maintenance` · button · "Review plan" · in "Duplicate prompt text" | test_duplicate_prompts_plan_counts_the_legacy_groups (test_maintenance_plans.py) |
-| Database backup | `admin.html:179,824`; `admin.js:2139,2454` | S9 Backup & export | covered | `backups` · button · "Back up" | Back up downloads through the api client and revokes the object URL (D103) (workspace-system-backups.spec.mjs) |
-| Restore from file | `admin.html:183,616–642`; `admin.js:2177–2248` | S8/S9 Backup & export | covered | `backups` · button · "Review restore…" | Review restore stages the chosen file and shows the real summary with the backup box (D105) (workspace-system-backups.spec.mjs) |
-| Metadata scan with progress, cancel, pill | `admin.html:187,805–865`; `admin.js:2336–2500` | S4 Sources | covered | `sources` · button · "Review scan" | Review scan opens the shared Review metadata scan with all sources (workspace-system-sources.spec.mjs) |
-| Rescan-required notice + dismiss | `admin.html:1367–1410`; `admin.js:991–1011` | S4 Sources | covered | `sources` · button · "Later" | notice Later persists the 3.2.0 dismissal (pm_update_notice_dismissed) without scanning (workspace-system-sources.spec.mjs) |
-| View logs with level and limit | `admin.html:195,885–907,974`; `admin.js:2579–2641` | S12 Logs | covered | `diagnostics` · combobox · "Level" | level filter is minimum-level over all six choices (workspace-system-diagnostics.spec.mjs) |
-| Log statistics | `admin.html:921–941`; `admin.js:2512` | S12 Logs | covered | `diagnostics` · status · "Log statistics" | log statistics show entries, errors, warnings, files and size (workspace-system-diagnostics.spec.mjs) |
-| Log files list and download | `admin.html:910,982–985`; `admin.js:2545,2642,2679` | S12 Logs | covered | `diagnostics` · button · "Download log" | each listed file downloads by its returned name and a link has no Download (workspace-system-diagnostics.spec.mjs) |
-| Clear/truncate logs | `admin.html:915`; `admin.js:2704` | S12 Logs | covered | `diagnostics` · button · "Clear all logs…" | Clear all logs states both counts, confirms first and reads everything again (workspace-system-diagnostics.spec.mjs) |
-| Rotated-log cleanup (new, #329) | — | S12 Logs | covered | `diagnostics` · button · "Review log cleanup" | Review log cleanup lists only rotated copies and keeps the rest (workspace-system-diagnostics.spec.mjs) |
-| Set log level (incl. CRITICAL), console logging | `admin.html:948–966`; `admin.js:2530,2729` | S12 Logs | covered | `diagnostics` · combobox · "Runtime log level" | runtime level (including CRITICAL) and console logging save and say they apply until the server restarts (workspace-system-diagnostics.spec.mjs) |
-| Log file_logging / max_file_size / backup_count / buffer_size | `py/api/logging_routes.py:56,285–299` | S12 Logs (read-only) | covered | `diagnostics` · group · "Log files & retention" | each listed file downloads by its returned name and a link has no Download (workspace-system-diagnostics.spec.mjs) |
-| Auto-tag model list with status | `admin.html:1095–1148`; `admin.js:3641` | S11 Auto-tagging | covered | `tagging` · combobox · "Tagging model" | model options are the four real engines with size and the description shows live status (workspace-system-tagging.spec.mjs) |
-| Auto-tag model download | `admin.html:1413–1438`; `admin.js:3680–3747`; `gallery.js:3412` | S11 Auto-tagging | covered | `tagging` · button · "Download" | Download starts the job and Activity shows it without Cancel (workspace-system-tagging.spec.mjs) |
-| Unload model | `gallery.js:3480` | S11 Auto-tagging | covered | `tagging` · button · "Unload" | Unload is enabled only while a model is loaded, and a held gate's refusal names the operation (workspace-system-tagging.spec.mjs) |
-| Tag template, WD14 thresholds, already-tagged mode | `admin.html:1150–1198`; `admin.js:3748` | S11 Auto-tagging | covered | `tagging` · combobox · "Existing tags" | defaults save through Save preferences and the Tag image dialog uses them (workspace-system-tagging.spec.mjs) |
-| Batch auto-tag output images | `admin.html:191,1210,1279–1318`; `admin.js:3748–3840` | S11 Auto-tagging | covered | `tagging` · button · "Review" | Tag output images reviews the images, tags each one and never a prompt (#379) (workspace-system-tagging.spec.mjs) |
-| Batch review loop | `admin.html:1206,1218–1364`; `admin.js:3841–4172` | S11 + image-tagging plan | covered | `tagging` · button · "Preview tagging review" | Preview tagging review opens the Tag image dialog for the selected image (workspace-system-tagging.spec.mjs) |
-| Gallery per-image auto-tag / review | `gallery.html:601,605`; `gallery.js:3506,3674–3753` | Image-tagging plan (selection bar) | covered | — | Auto-tag selected with Apply automatically runs a job with the chosen model, thresholds and suggestion count (workspace-tagging-bulk.spec.mjs) |
-| Gallery thumbnail generation | `gallery.js:1852,1967` | S5/S7 | covered | `sources` · button · "Review options" · in "Thumbnail generation" | Start closes the dialog, toasts, and opens the job in Activity (workspace-system-sources.spec.mjs) |
-| Clear server thumbnails | `gallery.js:2175–2192` | S7 Maintenance | covered | `maintenance` · button · "Review options" · in "Thumbnail cache" | Thumbnail cache opens the S5 dialog (workspace-system-maintenance.spec.mjs) |
-| Browser cache clear | `gallery.js:2194–2207` | S7 Maintenance | covered | `maintenance` · button · "Review plan" · in "Metadata cache" | Metadata cache reviews and clears only owned browser entries when there are some (D102) (workspace-system-maintenance.spec.mjs) |
-| Refresh file listing | `gallery.js:2209` | S4 Sources | covered | `sources` · button · "Refresh" · in "Refresh files" | Refresh files calls /gallery/rescan and toasts its counts (workspace-system-sources.spec.mjs) |
-| Duplicate image scan, review, delete | `gallery.js:2234–2577` | S6/S7 Maintenance | covered | `maintenance` · button · "Find duplicates" | Find duplicates starts a job; its view links Review groups; Keep radios build a duplicate_files plan (D101) (workspace-system-maintenance.spec.mjs) |
-| Default view mode, image quality | `gallery-settings.js:26–27` | S3 Appearance | covered | `appearance` · combobox · "Default layout" | defaults apply to a new visit but not to the current view or a saved view (workspace-system.spec.mjs) |
-| Auto-load metadata, cache metadata, show file paths | `gallery-settings.js:31–33` | S3 Appearance | covered | `appearance` · switch · "Load metadata on selection" | metadata off shows an explicit load and loads once on request (workspace-system.spec.mjs) |
-| Video autoplay, mute, loop | `gallery-settings.js:40–42` | S3 Appearance | covered | `appearance` · switch · "Autoplay videos" | video defaults reach the viewer (workspace-system.spec.mjs) |
-| Image info on cards; sidebar collapsed | `gallery-settings.js:30,34` | S3 Appearance | covered | `appearance` · switch · "Show image details on cards" | added rows reach their consumers (workspace-system.spec.mjs) |
-| Reset gallery settings | `gallery.js:1813` | S3 Appearance | covered | `appearance` · button · "Reset" | reset restores defaults without touching other keys (workspace-system.spec.mjs) |
-| Lazy loading | `gallery-settings.js:25` | Legacy gallery (native always lazy) | kept in legacy | — | a legacy gallery Save keeps the workspace keys and every other stored key (gallery-settings.test.js) |
-| Results per page / grid columns / paged mode | `gallery-settings.js:28–29,35` | README continuous browsing | approved removal | — | numeric strings from <select> values are accepted and columns are clamped (gallery-settings.test.js) |
-| Startup thumbnail prompt | `gallery-settings.js:38–39`; `gallery.js:2578` | README; Overview thumbnail row | approved removal | — | thumbnail row reflects the status endpoint (workspace-system.spec.mjs) |
-| Client debug output `debugMode` | `gallery-settings.js:36` | Legacy gallery (S12-10) | kept in legacy | — | a legacy gallery Save keeps the workspace keys and every other stored key (gallery-settings.test.js) |
-| API timeout `apiTimeout` | `gallery-settings.js:37` | Legacy gallery (S12-10; read by no request) | kept in legacy | — | defaults are a complete, sane settings object (gallery-settings.test.js) |
-| config.json-only keys | `py/config.py:212–234,722–739`; `py/api/diagnostics_report.py:185` | S12 report (read-only) | covered | `diagnostics` · button · "Download diagnostic report" | test_report_lists_config_only_keys (test_api_diagnostics_report.py) |
-
 ### Browser cache ownership (#222)
 
 The legacy gallery's Clear cache used to delete every localStorage key starting `pm_` or
@@ -4380,17 +4046,8 @@ impact and command receipts report `image_count` / `images` /
 `(size, mtime_ns)` equals its verified fingerprint; an in-place rewrite that
 preserves both keeps the old set matching until the file is next observed. The
 Images Tags filter (a file matches when every tag is on its linked positive or
-its current image tag set) and `q` search find their candidates through the tag
-index (#379), never by streaming every image tag row: `image_tag_ids` reads the
-tag names that tag at least one image (an `EXISTS` on `idx_media_image_tags_tag`)
-and keeps a name when it equals a Tags filter tag exactly or contains `q`
-case-folded; `image_tag_locators` reads the files carrying those ids (`tag_id IN`,
-500 ids a chunk). Only the listed ones among them are stat'ed, and only their
-current records count; a linked positive's prompt tags still combine with the
-image tags under a Tags filter. `test_indexed_candidates_equal_the_full_stream`
-compares the lookup with the old full stream (kept in the test as the reference)
-and `test_tag_search_reads_image_tags_only_by_tag_id` traces every statement; the
-
+its current image tag set) and `q` search stream the tagged records once and
+stat only the listed files whose records carry a filter tag or a `q` hit; the
 inspector's `image_tags` facet (`current` / `none` / `unavailable`) uses the
 inspection's own stable stat (`tests/test_api_workspace_images.py`
 `TestWorkspaceImageTags`, `tests/test_api_prompt_inspector.py`). The

__init__.py

@@ -23,20 +23,24 @@ Features:
 """
 
 import atexit
+import re
 import threading
 import time
 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
@@ -264,89 +268,78 @@ def _stop_background_work():
 
     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.
+    copy of the first result.
     """
     global _background_work_result
     with _background_work_lock:
         if _background_work_result is not None:
             return dict(_background_work_result)
+        logger = _teardown_logger()
+        began = _clock()
+        deadline = began + TEARDOWN_SECONDS
+
+        def left(own_bound):
+            return max(0.0, min(own_bound, deadline - _clock()))
+
         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
+        result = {}
+        if monitor is not None:
 
-            def left(own_bound):
-                return max(0.0, min(own_bound, deadline - _clock()))
+            def stop_monitor():
+                from .utils.image_monitor import OBSERVER_JOIN_SECONDS
 
-            if monitor is not None:
+                # 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))
 
-                def stop_monitor():
-                    from .utils.image_monitor import OBSERVER_JOIN_SECONDS
+            result["monitor"] = _teardown_step(
+                "the image monitor", stop_monitor, logger
+            )
+        if thumbnails is not None:
 
-                    # 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))
+            def close_previews():
+                from .py.api.thumbnail_auto import CLOSE_WAIT_SECONDS
 
-                result["monitor"] = _teardown_step(
-                    "the image monitor", stop_monitor, logger
+                return thumbnails.close_auto_thumbnails(
+                    final=True, timeout=left(CLOSE_WAIT_SECONDS)
                 )
-            if thumbnails is not None:
 
-                def close_previews():
-                    from .py.api.thumbnail_auto import CLOSE_WAIT_SECONDS
+            result["thumbnails"] = _teardown_step(
+                "the preview worker", close_previews, logger
+            )
+        if tracker is not None:
 
-                    return thumbnails.close_auto_thumbnails(
-                        final=True, timeout=left(CLOSE_WAIT_SECONDS)
-                    )
+            def stop_tracker():
+                from .utils.prompt_tracker import TRACKER_JOIN_SECONDS
 
-                result["thumbnails"] = _teardown_step(
-                    "the preview worker", close_previews, logger
-                )
-            if tracker is not None:
+                return tracker.shutdown(left(TRACKER_JOIN_SECONDS))
 
-                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)
+            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}")
+        _background_work_result = result
+        atexit.unregister(_stop_background_work)
         return dict(result)
 
 

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

@@ -23,11 +23,6 @@ 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,
@@ -343,13 +338,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)
         # Last: the older generated_images rebuilds run only before file_path.
         migrate_workflow_documents(conn)
 
@@ -1235,11 +1225,6 @@ 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
             )

py/api/__init__.py

@@ -5,8 +5,6 @@ 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
@@ -67,8 +65,6 @@ 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
@@ -295,10 +291,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"
@@ -331,8 +323,6 @@ class PromptManagerAPI(
     WorkflowStorageRoutesMixin,
     DuplicateFilesMixin,
     LoggingRoutesMixin,
-    LogCleanupMixin,
-    DiagnosticsReportMixin,
     AutotagRoutesMixin,
     LoraIntegrationMixin,
     LoraImportRoutesMixin,
@@ -688,7 +678,6 @@ 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)

py/api/admin.py

@@ -489,29 +489,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
@@ -545,10 +525,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:
@@ -1076,7 +1055,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:

py/api/autotag_routes.py

@@ -15,11 +15,12 @@ from urllib.parse import quote
 from .job_routes import busy_response
 from .jobs import (
     AUTOTAG_BATCH_JOB_KIND,
+    AUTOTAG_GROUP_NAMES,
     MODEL_DOWNLOAD_JOB_KIND,
     JobBusy,
 )
-
-from .maintenance import disk_plan
+from .admin import _plural, _scan_location, _scan_roots
+from .maintenance import disk_plan, short_space_message
 from .prompts import thumbnail_url_for
 from . import thumbnail_settings
 from .. import model_gate
@@ -28,7 +29,7 @@ from aiohttp import web
 
 _INTERNAL_ERROR = "An internal error occurred. Check server logs for details."
 
-# Tag output images (#328, per image since #379).
+# Tag output images (#328): the native prompt-tag batch.
 AUTOTAG_JOB_TITLE = "Tag output images"
 AUTOTAG_PREVIEW_LEASE = "Tag output images review"
 AUTOTAG_OWNER_KIND = "autotag-job"
@@ -199,18 +200,6 @@ async def _refusal(title):
     yield {"type": "error", "status": "error", "message": message}
 
 
-def wd14_device(service) -> str:
-    """Worker thread: ``"gpu"`` when WD14 runs (or would run) on CUDA, else
-    ``"cpu"``; a service without the probe is ``"cpu"``."""
-    probe = getattr(service, "wd14_device", None)
-    if not callable(probe):
-        return "cpu"
-    try:
-        return "gpu" if probe() == "gpu" else "cpu"
-    except Exception:
-        return "cpu"
-
-
 class AutotagRoutesMixin:
     """Mixin providing auto-tagging API endpoints."""
 
@@ -813,8 +802,6 @@ class AutotagRoutesMixin:
 
     async def _preview_autotag_batch(self, request):
         from ..autotag import get_autotag_service
-        from ..config import AutotagConfig
-        from ..tagging_defaults import WD14_MODEL_TYPES, wd14_seconds_per_image
 
         data, error = await self._batch_body(
             request, ("model_type", "existing"), BATCH_PREVIEW_BODY_MAX
@@ -826,14 +813,11 @@ class AutotagRoutesMixin:
             return self._bad_request(message)
         model_type, existing = data["model_type"], data["existing"]
         policy = self._safety_backup_policy()
-        service = get_autotag_service()
         try:
-            targets = await self._autotag_targets()
-            marked = await self._run_in_executor(self.db.autotagged_locators)
-            status = await self._run_in_executor(service.get_models_status)
-            device = None
-            if model_type in WD14_MODEL_TYPES:
-                device = await self._run_in_executor(wd14_device, service)
+            candidates = await self._run_in_executor(self.db.autotag_batch_candidates)
+            status = await self._run_in_executor(
+                get_autotag_service().get_models_status
+            )
             disk, _short, _size = await self._run_in_executor(
                 functools.partial(
                     disk_plan,
@@ -847,21 +831,16 @@ class AutotagRoutesMixin:
             return web.json_response(
                 {"success": False, "error": self._public_error(e)}, status=500
             )
-        images = len(targets)
-        tagged = sum(1 for item in targets if item.locator in marked)
-        to_tag = images - tagged if existing == "skip" else images
-        estimate = None
-        if device is not None:
-            estimate = round(to_tag * wd14_seconds_per_image(device), 3)
+        prompts = {row["prompt_id"]: row["prompt_tags"] for row in candidates}
+        tagged = sum(1 for tags in prompts.values() if self._real_tags(tags))
+        to_tag = len(prompts) - tagged if existing == "skip" else len(prompts)
         return web.json_response(
             {
                 "success": True,
-                "images": images,
+                "images": len(candidates),
+                "prompts": len(prompts),
                 "already_tagged": tagged,
                 "to_tag": to_tag,
-                "estimate_seconds": estimate,
-                "estimate_device": device,
-                "suggestion_limit": AutotagConfig.suggestion_limit(),
                 "model": {
                     "type": model_type,
                     "label": config["label"],
@@ -883,9 +862,9 @@ class AutotagRoutesMixin:
         In order: 400 body or options, 400 ``review-required``; 409
         ``model-unavailable``; 507 ``insufficient-space``; 409 ``busy``
         (another records job, the legacy batch's hold included); 409
-        ``model-busy``. No await follows the busy check. The job tags each
-        output image (``_run_autotag_batch``), never a prompt (#379).
+        ``model-busy``. No await follows the busy check.
         """
+        from ..autotag import get_autotag_service
         from ..config import MAX_SUGGESTION_LIMIT, AutotagConfig
         from .annotation_suggest import OptionError, validate_options
 
@@ -894,7 +873,7 @@ class AutotagRoutesMixin:
         )
         if error is not None:
             return error
-        _config, message = self._batch_choice(data)
+        config, message = self._batch_choice(data)
         if message:
             return self._bad_request(message)
         model_type, existing, options = (
@@ -918,24 +897,144 @@ class AutotagRoutesMixin:
                 {"success": False, "code": "review-required", "error": REVIEW_REQUIRED},
                 status=400,
             )
+        service = get_autotag_service()
+        backup_on = self._safety_backup_policy() == "on"
         try:
-            job, refusal = await self._start_autotag(
-                model_type=model_type,
-                existing=existing,
-                options=options,
-                keep_in_memory=True,
-                title=AUTOTAG_JOB_TITLE,
-                owner_kind=AUTOTAG_OWNER_KIND,
+            status = await self._run_in_executor(service.get_models_status)
+            candidates = await self._run_in_executor(self.db.autotag_batch_candidates)
+            _disk, short, _size = await self._run_in_executor(
+                functools.partial(
+                    disk_plan, self.db.model.db_path, backup=backup_on, vacuum=False
+                )
             )
         except Exception as e:
             self.logger.exception("Tag output images could not start")
             return web.json_response(
                 {"success": False, "error": self._public_error(e)}, status=500
             )
-        if refusal is not None:
-            return refusal.response
+        if not (status.get(model_type) or {}).get("downloaded"):
+            return web.json_response(
+                {
+                    "success": False,
+                    "code": "model-unavailable",
+                    "error": f"{config['label']} is not downloaded. "
+                    "Download it in System › Auto-tagging.",
+                },
+                status=409,
+            )
+        if backup_on and short is not None:
+            return web.json_response(
+                {
+                    "success": False,
+                    "code": "insufficient-space",
+                    "error": short_space_message(short),
+                },
+                status=507,
+            )
+        busy = self._jobs.blocker(AUTOTAG_BATCH_JOB_KIND, admission="records")
+        if busy is not None:
+            return busy_response(JobBusy(busy))
+        owner = model_gate.new_owner(AUTOTAG_OWNER_KIND)
+        if not model_gate.try_acquire(owner):
+            return model_busy_response()
+        opts = {
+            "model_type": model_type,
+            "existing": existing,
+            "keep_in_memory": True,
+            "gate_owner": owner,
+            "general_threshold": options.get("general_threshold"),
+            "character_threshold": options.get("character_threshold"),
+            "prompt": options.get("instructions"),
+        }
+        try:
+            job = self._jobs.start(
+                AUTOTAG_BATCH_JOB_KIND,
+                AUTOTAG_JOB_TITLE,
+                admission="records",
+                cancellable=True,
+                scope={
+                    "model_type": model_type,
+                    "existing": existing,
+                    "images": len(candidates),
+                    "label": config["label"],
+                },
+                groups=AUTOTAG_GROUP_NAMES,
+                runner=functools.partial(
+                    self._run_autotag_job, service, opts, backup_on
+                ),
+            )
+        except BaseException as refused:
+            model_gate.release(owner)
+            if isinstance(refused, JobBusy):
+                return busy_response(refused)
+            raise
+        job.task.add_done_callback(lambda _task: model_gate.release(owner))
         return web.json_response({"success": True, "job": job.summary()}, status=202)
 
+    async def _run_autotag_job(self, service, opts, backup_on, job):
+        ok, _backup = await self._safety_backup_step(job, self.db, backup_on)
+        if not ok:
+            return
+        try:
+            await self._tag_output_images(service, opts, job)
+        except Exception:
+            self.logger.exception("Tag output images failed")
+            job.update(status_line=_INTERNAL_ERROR)
+            job.log_line(f"Tagging failed · {_INTERNAL_ERROR}")
+            job.finish("failed")
+        finally:
+            if backup_on:
+                await self._prune_backup_pool(job, self.db)
+
+    async def _tag_output_images(self, service, opts, job):
+        roots = _scan_roots(self._get_all_output_dirs())
+        job.log_line(
+            f"Tagging started · {job.scope['label']} · "
+            + ("skip prompts already tagged" if opts["existing"] == "skip" else "merge")
+        )
+        job.update(status_line="Loading the tagging model")
+
+        def on_item(index, total, group, image_path, detail):
+            path, root, root_index = _scan_location(image_path or "", roots)
+            job.update(
+                processed=index + 1,
+                total=total,
+                progress=100 * (index + 1) // total,
+                status_line=f"Tagging {index + 1} of {total}",
+            )
+            job.record(
+                group,
+                {
+                    "path": path,
+                    "root": root,
+                    "root_index": root_index,
+                    "detail": detail,
+                },
+                f"{path}: {detail}",
+            )
+            job.publish({"type": "progress", "progress": job.progress})
+
+        final = None
+        async for event in self._autotag_batch_events(
+            service,
+            {**opts, "cancelled": lambda: job.cancelled, "on_item": on_item},
+        ):
+            if event.get("type") in ("complete", "error"):
+                final = event
+        if final is not None and final["type"] == "error":
+            job.update(status_line=final["message"])
+            job.log_line(f"Tagging failed · {final['message']}")
+            job.finish("failed")
+        elif job.cancelled:  # a cancel wins over a run that then completed
+            job.update(status_line=BATCH_CANCELLED)
+            job.log_line(BATCH_CANCELLED)
+            job.finish("cancelled")
+        else:
+            done = f"Tagged {_plural(job.counters.get('tagged', 0), 'prompt')}"
+            job.update(status_line=done, progress=100)
+            job.log_line(done)
+            job.finish("finished")
+
     def _gated_runner(self, owner):
         """Executor calls under the model gate *owner* holds (plain when None)."""
         if owner is None:

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

@@ -18,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
 
@@ -53,17 +45,10 @@ from .annotations import (
     _submit,
     _target,
 )
-from .autotag_routes import BATCH_CANCELLED, MODEL_BUSY_ERROR, model_busy_response
-from .images import _current_fingerprint, _listing_posix, _public_path
+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:
@@ -122,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)
 
@@ -269,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:
@@ -363,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."""
 
@@ -429,216 +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
-
     # -- runner ----------------------------------------------------------------
 
     def _job_roots(self, targets) -> dict:
@@ -669,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:
@@ -712,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
@@ -788,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
@@ -824,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/images.py

@@ -575,6 +575,12 @@ def _current_fingerprint(path: Path) -> tuple[int, int] | None:
     return observed.st_size, observed.st_mtime_ns
 
 
+def _image_tags_relevant(names: list, wanted: set, query: str) -> bool:
+    if wanted and not wanted.isdisjoint(names):
+        return True
+    return bool(query) and any(query in name.casefold() for name in names)
+
+
 def _workspace_key(entry: tuple, order: str) -> tuple:
     """The keyset sort key of *entry* (a _Listed or a 4-tuple entry)."""
     if not isinstance(entry, _Listed):
@@ -2085,9 +2091,8 @@ class ImageRoutesMixin:
     def _image_tag_matches(self, listings: list[tuple], filters: dict) -> dict:
         """Normalized path -> _ImageTagMatch for files whose image tags count.
 
-        Looks the relevant tag names up (exact under Tags, a case-folded
-        substring for ``q``) and their files through the tag index, keeping
-        only listed locators; only those candidates are
+        Streams the tagged byte records once and keeps only listed locators
+        carrying a filter tag or a ``q`` hit; only those candidates are
         stat'ed (never every listed file), and a candidate's tags count only
         while a byte record is verified at its present ``(size, mtime_ns)``
         (spec amendment S1). Under a Tags filter the candidates' linked
@@ -2096,15 +2101,16 @@ class ImageRoutesMixin:
         tags, query, category = filters["tags"], filters["query"], filters["category"]
         wanted = set(tags)
         located = self._workspace_locators(listings)
-        # The tag index answers which files carry a relevant name (#379); no
-        # read streams every image tag row.
-        tag_ids = self.db.image_tag_ids(wanted, query)
         candidates = {}
-        if tag_ids:
-            for locator in self.db.image_tag_locators(tag_ids):
+        records = self.db.iter_image_tag_records()
+        try:
+            for locator, _size, _mtime_ns, names in records:
                 entry = located.get(locator)
-                if entry is not None:
-                    candidates[locator] = entry
+                if entry is not None and locator not in candidates:
+                    if _image_tags_relevant(names, wanted, query):
+                        candidates[locator] = entry
+        finally:
+            records.close()
         stats = {}
         for locator, entry in candidates.items():
             fingerprint = _current_fingerprint(entry.path)
@@ -2266,8 +2272,7 @@ class ImageRoutesMixin:
                 )
 
             image_path = Path(image["image_path"])
-            lora_dirs = await self._run_in_executor(self._lora_image_dirs)
-            allowed_dirs = list(self._get_all_output_dirs()) + lora_dirs
+            allowed_dirs = list(self._get_all_output_dirs()) + self._lora_image_dirs()
 
             denied = _media_access_error(image_path, allowed_dirs)
             if denied is not None:
@@ -2315,10 +2320,7 @@ class ImageRoutesMixin:
         LoraManager's guarded LoRA roots, sidecar root and example-images
         root (``lora_manager_layout.media_roots``, #355) and PromptManager's
         CivitAI download cache. An unusable LoraManager layout gives the
-        default LoRA roots and the cache. The layout comes from the layout
-        cache (``lora_utils.cached_lora_manager_layout``, #362), which reloads
-        when LoraManager's settings files change; blocking, so the routes
-        call it in the executor.
+        default LoRA roots and the cache.
         """
         try:
             from ..config import IntegrationConfig
@@ -2326,18 +2328,25 @@ class ImageRoutesMixin:
             if not IntegrationConfig.LORA_MANAGER_ENABLED:
                 return []
             from ..lora_utils import (
-                cached_lora_manager_layout,
                 get_lora_image_cache_dir,
+                layout_for_install,
+                lora_manager_layout,
             )
 
-            configured = IntegrationConfig.LORA_MANAGER_PATH or ""
-            install, layout = cached_lora_manager_layout(configured)
-            if configured.strip() and install is None:
+            lora_root = IntegrationConfig.LORA_MANAGER_PATH or ""
+            if lora_root.strip():
                 # A configured path comes from config.json, which can be hand
                 # edited: only a LoraManager install under custom_nodes may
                 # widen the serving allow-list. An empty path keeps the
                 # auto-detection, which itself only scans custom_nodes.
-                return []
+                from ..lora_utils import resolve_lora_manager_path
+
+                lora_root = resolve_lora_manager_path(lora_root)
+                if not lora_root:
+                    return []
+                layout = layout_for_install(lora_root)
+            else:
+                layout = lora_manager_layout("")
 
             dirs = [Path(d) for d in layout.media_roots]
             # Named, not made: listing and serving never create the cache.

py/api/inspection_service.py

@@ -129,9 +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).
         evidence = inspect_prompt_evidence(
-            inspection.metadata, role_saved, profile=profile, file_name=path.name
+            inspection.metadata, role_saved, profile=profile
         )
     return {
         "file": {

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,13 +1,6 @@
-"""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
 
@@ -92,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."""
 
@@ -237,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",
@@ -266,7 +224,7 @@ class LoggingRoutesMixin:
         """Truncate all log files."""
         try:
             logger_manager = self._get_logger_manager()
-            results = await self._run_in_executor(logger_manager.truncate_logs)
+            results = logger_manager.truncate_logs()
 
             return web.json_response(
                 {
@@ -308,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

@@ -194,13 +194,8 @@ class LoraImportRoutesMixin:
             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(
+        """Swap the collection for ``staged.records`` in one transaction."""
+        return await self._run_in_executor(
             lambda: db.replace_category_prompts(
                 CATEGORY,
                 staged.records,
@@ -208,8 +203,6 @@ class LoraImportRoutesMixin:
                 allow_empty=allow_empty,
             )
         )
-        lora_utils.clear_layout_cache()
-        return result
 
     # ── preview ───────────────────────────────────────────────────────
 

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
@@ -56,7 +54,6 @@ 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:
@@ -86,8 +83,7 @@ MAINTENANCE_PREVIEW_LEASE = "Maintenance preview"
 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.
@@ -395,8 +391,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 +492,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)

py/autotag.py

@@ -756,24 +756,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

py/lora_import.py

@@ -12,10 +12,9 @@ last writes to the database:
    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.
+   a model inside a LoRA root. ``fingerprint`` covers the kept sidecars (path,
+   size and modification time) and the layout; ``preview`` adds the counts a
+   review shows. Nothing is written and nothing is requested.
 2. **stage**: read each sidecar and build its record. Its LoraManager preview
    and example images are linked where they are (``local_media``); only a
    LoRA without any local image downloads its CivitAI example images into the
@@ -70,10 +69,9 @@ def discover(lora_manager_path: Optional[str]) -> Discovery:
 
 
 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."""
+    """What a review saw: the layout, then each kept sidecar's path, size and
+    modification time (a LoraManager save that changes unrelated settings
+    leaves it as it was)."""
     layout = discovery.layout
     digest = hashlib.sha256()
     for value in (
@@ -89,14 +87,13 @@ def fingerprint(discovery: Discovery) -> str:
         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
+    for sidecar in discovery.sidecars:
+        path = sidecar.metadata_path
         try:
             stat = path.stat()
-            entry = f"{path}\0{stat.st_size}\0{stat.st_mtime_ns}\0{flag}\n"
+            entry = f"{path}\0{stat.st_size}\0{stat.st_mtime_ns}\n"
         except OSError:
-            entry = f"{path}\0missing\0{flag}\n"
+            entry = f"{path}\0missing\n"
         digest.update(entry.encode("utf-8", "surrogatepass"))
     return "sha256:" + digest.hexdigest()
 

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

@@ -12,10 +12,8 @@ server share one definition:
   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``.
+  LoraManager library. Every folder from the settings passes the folder
+  guard (exists, not a filesystem root, not the home folder itself).
 - ``discover_sidecars`` finds every sidecar whose model file exists inside a
   LoRA root: beside the models in ``alongside`` mode, under the sidecar root
   (matched to its model by ``file_path``) in ``centralized`` mode.
@@ -27,7 +25,6 @@ it is testable outside ComfyUI.
 """
 
 import json
-import logging
 import os
 import re
 from dataclasses import dataclass, replace
@@ -101,12 +98,7 @@ 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")
+BAD_SIDECAR_ROOT = "the sidecar folder is a filesystem root or the home folder"
 
 
 @dataclass(frozen=True)
@@ -122,9 +114,6 @@ class LoraManagerLayout:
     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)
@@ -137,20 +126,13 @@ class Sidecar:
 
 @dataclass(frozen=True)
 class Discovery:
-    """The sidecars kept, every metadata file seen, and those unread."""
+    """The sidecars kept, how many metadata files were 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, ...]
+    scanned: int
     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."""
@@ -333,23 +315,6 @@ def _guarded(paths, home: str) -> Tuple[str, ...]:
     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]:
@@ -386,9 +351,7 @@ def load_layout(
     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)
+    defaults = _guarded(default_roots(), home)
     fallback = LoraManagerLayout(
         settings_path=None,
         source=None,
@@ -399,7 +362,6 @@ def load_layout(
         example_images_root=None,
         library="default",
         media_roots=defaults,
-        refused_defaults=refused_defaults,
     )
     if not lora_manager_path:
         return fallback
@@ -415,14 +377,10 @@ def load_layout(
     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
-    )
+    return _layout_from_settings(settings, settings_path, source, defaults, home)
 
 
-def _layout_from_settings(
-    settings, settings_path, source, defaults, home, refused_defaults=()
-):
+def _layout_from_settings(settings, settings_path, source, defaults, home):
     library, entry, libraries = _active_library(settings)
     lora_roots = _media_roots(
         defaults,
@@ -442,7 +400,6 @@ def _layout_from_settings(
         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
@@ -525,13 +482,13 @@ def discover_sidecars(layout: LoraManagerLayout) -> Discovery:
     cannot see every folder must not replace the collection with part of it.
     """
     if layout.error is not None:
-        return Discovery(layout, [], (), [])
+        return Discovery(layout, [], 0, [])
     if layout.mode == MODE_CENTRALIZED:
         folders = [layout.sidecar_root]
     else:
         folders = list(layout.lora_roots)
     seen = set()
-    scanned: List[Path] = []
+    scanned = 0
     unreadable: List[str] = []
     sidecars = []
     for folder in folders:
@@ -541,13 +498,12 @@ def discover_sidecars(layout: LoraManagerLayout) -> Discovery:
             if key in seen:
                 continue
             seen.add(key)
-            scanned.append(resolved)
+            scanned += 1
             model = _model_for(resolved, layout, unreadable)
             if model is not None:
                 sidecars.append(Sidecar(resolved, Path(os.path.realpath(model))))
     sidecars.sort(key=lambda sidecar: str(sidecar.metadata_path))
-    scanned.sort(key=str)
-    return Discovery(layout, sidecars, tuple(scanned), unreadable)
+    return Discovery(layout, sidecars, scanned, unreadable)
 
 
 # ── images ──────────────────────────────────────────────────────────
@@ -570,15 +526,8 @@ def _example_files(folder: str) -> List[str]:
 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
-            )
+    if isinstance(url, str) and url.strip() and os.path.isabs(url.strip()):
+        yield url.strip()
     base = sidecar.metadata_path.name[: -len(METADATA_SUFFIX)]
     for suffix in PREVIEW_EXTENSIONS:
         yield str(sidecar.metadata_path.parent / f"{base}{suffix}")

py/lora_utils.py

@@ -30,7 +30,6 @@ except ImportError:
 
 from dataclasses import replace
 
-from .lora_layout_cache import LayoutCache
 from .lora_manager_layout import (
     MODE_ALONGSIDE,
     METADATA_SUFFIX,
@@ -296,35 +295,10 @@ def layout_for_install(install: Optional[str]) -> LoraManagerLayout:
 
 
 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``.
-    """
+    """Where LoraManager keeps its files (``py/lora_manager_layout.py``)."""
     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 +342,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
 
@@ -883,13 +857,11 @@ class TriggerWordCache:
         """
         try:
             new_cache = self._build(lora_manager_path)
-        except OSError as error:
+        except Exception 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()
+            with self._lock:
+                self._failed_at = time.monotonic()
+                return len(self._cache)
 
         with self._lock:
             self._cache = new_cache
@@ -901,12 +873,6 @@ class TriggerWordCache:
         )
         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)

py/tagging_defaults.py

@@ -13,23 +13,7 @@ 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).
+# What a batch does with a prompt that already has tags (#328).
 EXISTING_POLICIES = ("skip", "merge", "replace_after_review")
 
 # The language-model tag template every page starts from until one is saved.

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/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/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,10 +19,8 @@ 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 (
@@ -47,10 +45,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 = {
@@ -205,8 +199,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
 
@@ -231,13 +223,8 @@ def create_app(root: Path) -> web.Application:
     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 +238,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 +245,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",
@@ -278,7 +264,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"),
@@ -321,30 +308,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}",
@@ -352,30 +337,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:
@@ -396,8 +379,8 @@ def create_app(root: Path) -> web.Application:
         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(), ThumbnailSettings("webp", 80, 150)
         )
         if include_video:
             # Seed after thumbnail generation to exercise a real unthumbnailed video.
@@ -405,8 +388,8 @@ def create_app(root: Path) -> web.Application:
             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
 
@@ -432,7 +415,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()
@@ -452,10 +434,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})
@@ -513,31 +492,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})
 
@@ -577,15 +550,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})
 
@@ -653,12 +625,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-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-maintenance-concept.spec.mjs

@@ -1,7 +1,6 @@
 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';
+import { SIZES, THEMES, seedConcept, openConcept, openProduction, diffInventory, mutate } from './concept-inventory.mjs';
 
 // #249 System S7 Task 20: System › Maintenance (app.js renderSystem 688–690), its plan dialog (`maintenancePlan`,
 // 953–958) for each operation and its duplicates dialog (`duplicates`, 1457–1461) against the immutable concept, on
@@ -104,6 +103,47 @@ for (const theme of THEMES) for (const [width, height] of SIZES) {
     });
 }
 
+/** Runs in the page: the open review dialog (plan or duplicates): its title, body and the concept's tokens. */
+function measureReview() {
+    const dialog = document.querySelector('dialog#modal[open]');
+    const css = (node, ...keys) => node ? Object.fromEntries(keys.map(key => [key, getComputedStyle(node)[key]])) : null;
+    const name = node => [node.localName, ...[...node.classList].sort()].join('.');
+    const text = node => node?.textContent.trim() ?? null;
+    const body = dialog.querySelector('#modal-body');
+    const grid = body.querySelector(':scope > dl.meta-grid');
+    const compare = body.querySelector('.compare-grid');
+    const item = compare?.querySelector('.compare-item');
+    const notes = [...body.querySelectorAll(':scope > p.small')];
+    const note = notes.at(-1);
+    const actions = body.querySelector(':scope > .dialog-actions');
+    return {
+        title: text(dialog.querySelector('#modal-title')),
+        tree: [...body.children].map(name),
+        heading: body.querySelector(':scope > h3') && { text: text(body.querySelector(':scope > h3')),
+            ...css(body.querySelector(':scope > h3'), 'fontSize', 'fontWeight', 'color', 'marginBottom') },
+        grid: grid && { rows: [...grid.children].map(row => [text(row.querySelector('dt')), text(row.querySelector('dd'))]),
+            ...css(grid, 'display', 'gridTemplateColumns', 'columnGap', 'rowGap'),
+            dt: css(grid.querySelector('dt'), 'fontSize', 'color', 'textTransform'), dd: css(grid.querySelector('dd'), 'fontSize', 'color') },
+        details: body.querySelector(':scope > details') && { summary: text(body.querySelector(':scope > details > summary')),
+            tree: [...body.querySelector(':scope > details').children].map(name) },
+        backup: body.querySelector(':scope > .notice') && { tree: [...body.querySelector(':scope > .notice').children].map(name),
+            text: [...body.querySelectorAll(':scope > .notice > div:first-child > *')].map(node => [node.localName, text(node)]),
+            buttons: [...body.querySelectorAll(':scope > .notice button')].map(text) },
+        compare: compare && { tree: [...compare.children].map(name), ...css(compare, 'display', 'gridTemplateColumns', 'columnGap'),
+            items: [...compare.children].map(entry => ({ tree: [...entry.children].map(name), label: text(entry.querySelector('label')),
+                checked: entry.querySelector('input[type=radio]').checked, image: entry.querySelector('img')?.className ?? null })),
+            item: css(item, 'paddingTop', 'paddingLeft', 'backgroundColor', 'borderTopWidth', 'borderTopColor', 'borderTopLeftRadius'),
+            image: css(item.querySelector('img'), 'width', 'objectFit'),
+            label: css(item.querySelector('label'), 'fontSize', 'color'),
+            radio: { name: item.querySelector('input[type=radio]').name.startsWith('keep-') ? 'keep-*' : 'other',
+                type: item.querySelector('input').type } },
+        note: note && { text: text(note), ...css(note, 'fontSize', 'color', 'marginTop') },
+        actions: { tree: [...actions.children].map(name), ...css(actions, 'display', 'justifyContent', 'columnGap', 'marginTop'),
+            buttons: [...actions.children].map(item => ({ text: text(item), className: item.className,
+                ...css(item, 'backgroundColor', 'color', 'fontSize', 'paddingTop', 'paddingLeft', 'borderTopColor') })) },
+    };
+}
+
 // The concept's plan names (`data-plan`) and production's operation, row and button for each.
 const PLANS = Object.freeze([
     ['duplicate prompts', 'duplicate_prompts', 'Duplicate prompt text'],
@@ -111,6 +151,32 @@ const PLANS = Object.freeze([
     ['unused prompt components', 'unused_components', 'Unused prompt components'],
     ['missing-file links', 'missing_links', 'Missing-file links'],
 ]);
+const BACKUP_BOX = Object.freeze({ tree: ['div', 'div.row-actions'], text: [['h3', 'Back up the database first (recommended)'],
+    ['p', 'Downloads a copy of the prompts database before this operation changes any records.']], buttons: ['Back up now'] });
+
+/**
+ * D100: the server's plan in the concept's dialog: the operation's row title as its `h3` (the concept prints its
+ * `data-plan` name), the four rows with the plan's values, the listed records (`details`), the hold line in the
+ * concept's `p.small`, the D55 backup box before the actions, and "Apply reviewed operation". No sample note.
+ */
+function mapPlanConcept(reference, title, plan) {
+    const backup = plan.backup.policy === 'off' ? 'No safety backup (the policy is off)'
+        : `Create and verify before changes (${plan.backup.destination_label})`;
+    const tree = ['h3', 'dl.meta-grid', ...(plan.details.length ? ['details'] : []), 'p.small', 'div.notice', 'div.dialog-actions'];
+    const [cancel, apply] = reference.actions.buttons;
+    return {
+        ...reference,
+        tree,
+        heading: { ...reference.heading, text: title },
+        grid: { ...reference.grid, rows: [['Scope', plan.scope.label],
+            ['Protected', plan.protected.reasons.length ? plan.protected.reasons.join(' · ') : 'Nothing is protected'],
+            ['Backup', backup], ['Media on disk', plan.media.label]] },
+        details: plan.details.length ? { summary: `Listed records (${plan.details.length})`, tree: ['summary', 'pre'] } : null,
+        backup: BACKUP_BOX,
+        note: { ...reference.note, text: 'Nothing changes until you apply. This review holds for 15 minutes.' },
+        actions: { ...reference.actions, buttons: [cancel, { ...apply, text: 'Apply reviewed operation' }] },
+    };
+}
 
 async function conceptPlan(page, theme, name) {
     await conceptMaintenance(page, theme);

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

@@ -33,7 +33,7 @@ test.afterEach(async ({ page, request, browserName }) => {
 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.';
+const BATCH = 'Add tags to each prompt from its linked output images with the model above. Review the scope first.';
 
 /** Runs in the page: Auto-tagging's surface under `mainSelector`: rows, field, actions, operation, geometry and tokens. */
 function measureTagging(mainSelector) {
@@ -272,19 +272,11 @@ function measureReview() {
 }
 
 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".
+ * D134: the server's batch preview in the concept's review: "Review tag output images" with "Tag output images" as its
+ * `h3`, the model, policy, counts and settings in the concept's `dl.meta-grid` (Backup in the concept's wording), the
+ * upper-bound 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;
@@ -294,14 +286,13 @@ function mapBatchConcept(reference, plan) {
         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`],
+            ['Images linked', number(plan.images)], ['Prompts', number(plan.prompts)], ['Already tagged', number(plan.already_tagged)],
+            ['Prompts to tag', `up to ${number(plan.to_tag)}`], ['Settings', 'General 0.35 · Character 0.85'],
             ['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.' },
+        note: { ...reference.note, text: 'Nothing is written until you start. Missing files and files outside the output folders '
+            + 'are counted, so the prompts to tag are an upper bound; Activity reports what was tagged.' },
         actions: { ...reference.actions, buttons: [cancel, { ...start, text: 'Start tagging' }] },
     };
 }
@@ -317,8 +308,8 @@ async function conceptReview(page, theme) {
 
 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.
+    // Every concept-fixture prompt with an image is already tagged, so under the saved Skip there is nothing to start
+    // (the Cancel-only review). Merge reviews 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();
@@ -335,9 +326,8 @@ for (const theme of THEMES) for (const [width, height] of SIZES) {
         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.
+        // Under Merge every prompt with a linked 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([]);
     });
@@ -382,17 +372,9 @@ test('tag output images review comparison detects mutations', async ({ page }) =
     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([]);
+    await page.evaluate(() => { document.querySelectorAll('dialog#modal[open] dl.meta-grid dt')[5].textContent = 'To tag'; });
+    expect(await paths()).toEqual(['grid.rows.5.0']);
+    await page.evaluate(() => { document.querySelectorAll('dialog#modal[open] dl.meta-grid dt')[5].textContent = 'Prompts to tag'; });
     const undoGrid = await mutate(page, { css: 'dialog#modal dl.meta-grid { column-gap: 3px; }' });
     expect(await paths()).toEqual(expect.arrayContaining(['grid.columnGap']));
     await undoGrid();

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' } });

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

@@ -1,590 +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.url()); });
-    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);
-    // 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('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);
-    }
-});

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

@@ -429,9 +429,7 @@ test('Rebuild all is explicit and the plan line says every preview is regenerate
     await expect(page).toHaveURL(/#\/activity\/[0-9a-f]{32}$/);
     expect(seen.starts).toEqual([{ mode: 'rebuild' }]);
     const id = page.url().split('/').pop();
-    // Rebuild regenerates all 24 previews with real image work: on a busy CI
-    // runner that took over 5 s (12 of 24 done at the default poll budget).
-    await expect.poll(async () => (await serverJson(request, `/prompt_manager/jobs/${id}`)).job.state, { timeout: 30000 }).toBe('finished');
+    await expect.poll(async () => (await serverJson(request, `/prompt_manager/jobs/${id}`)).job.state).toBe('finished');
 });
 
 test('a plan that cannot be read says so; Start still starts', async ({ page }) => {

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

@@ -315,28 +315,22 @@ test('Preview tagging review without a selection toasts the D115 sentence', asyn
     await expect(tagDialog(page)).toHaveCount(0);
 });
 
-test('Tag output images reviews the images, tags each one and never a prompt (#379)', async ({ page, request }) => {
+test('Tag output images reviews the scope and starts a batch job', async ({ page, request }) => {
     const before = await serverJson(request, '/__test__/tagging/snapshot');
     await openTagging(page);
-    // The saved policy is Skip: no image is auto-tagged yet, so every listed still image is to tag.
+    // The fixture's one prompt is already tagged: under Merge it is tagged again with what its images give.
+    await page.locator('#tag-existing').selectOption('merge');
     const previewed = page.waitForResponse(item => new URL(item.url()).pathname === PREVIEW_URL);
     await reviewButton(page).click();
     const answer = await previewed;
-    expect(answer.request().postDataJSON()).toEqual({ model_type: 'wd14-swinv2', existing: 'skip' });
+    expect(answer.request().postDataJSON()).toEqual({ model_type: 'wd14-swinv2', existing: 'merge' });
     const plan = await answer.json();
-    // Four still images (two linked, a copy, an unlinked one); the video is not a target.
-    expect([plan.images, plan.already_tagged, plan.to_tag]).toEqual([4, 0, 4]);
-    expect(plan.prompts).toBeUndefined();
     await expect(dialog(page).locator('#modal-title')).toHaveText('Review tag output images');
     await expect(dialog(page).locator('#modal-body > h3')).toHaveText('Tag output images');
-    expect(await gridOf(page)).toEqual([['Model', 'WD14 SwinV2 · ~400 MB'], ['Existing tags', 'Skip already tagged'],
-        ['Images', '4'], ['Already auto-tagged', '0'], ['Images to tag', 'about 4'],
-        ['Time', 'about 1 min on a processor; a graphics card can be faster.'],
-        ['Settings', `General 0.35 · Character 0.85 · up to ${plan.suggestion_limit} tags per image`],
+    expect(await gridOf(page)).toEqual([['Model', 'WD14 SwinV2 · ~400 MB'], ['Existing tags', 'Merge with existing'],
+        ['Images linked', String(plan.images)], ['Prompts', String(plan.prompts)], ['Already tagged', String(plan.already_tagged)],
+        ['Prompts to tag', `up to ${plan.to_tag}`], ['Settings', 'General 0.35 · Character 0.85'],
         ['Backup', 'Create and verify before changes']]);
-    await expect(dialog(page).locator('#modal-body > p.small')).toHaveText('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.');
     await expect(dialog(page).locator('#modal-body > .notice h3')).toHaveText('Back up the database first (recommended)');
     // The review wrote nothing.
     expect(await serverJson(request, '/__test__/tagging/snapshot')).toEqual(before);
@@ -344,23 +338,15 @@ test('Tag output images reviews the images, tags each one and never a prompt (#3
     const started = page.waitForResponse(item => new URL(item.url()).pathname === '/prompt_manager/jobs/autotag');
     await dialog(page).getByRole('button', { name: 'Start tagging', exact: true }).click();
     const start = await started;
-    expect(start.request().postDataJSON()).toEqual({ model_type: 'wd14-swinv2', existing: 'skip',
+    expect(start.request().postDataJSON()).toEqual({ model_type: 'wd14-swinv2', existing: 'merge',
         options: { general_threshold: 0.35, character_threshold: 0.85 } });
     const { job } = await start.json();
     await expect(page).toHaveURL(`${workspace}#/activity/${job.id}`);
     await expect(page.locator('#workspace-main h1')).toHaveText('Tag output images');
     const finished = await ended(request, job.id);
     expect(finished.state).toBe('finished');
-    expect(finished.status_line).toBe('Tagged 4 images');
-    // Each image got its own tags; no prompt, pair or link row changed.
-    expect(await serverJson(request, '/__test__/tagging/snapshot')).toEqual(before);
-
-    // Under Skip every image is now auto-tagged: nothing to start.
-    await openTagging(page);
-    await reviewButton(page).click();
-    await expect(dialog(page).locator('#modal-body > p.small')).toHaveText('Every output image is already auto-tagged.');
-    expect((await gridOf(page)).slice(2, 5)).toEqual([['Images', '4'], ['Already auto-tagged', '4'], ['Images to tag', 'about 0']]);
-    await expect(dialog(page).locator('.dialog-actions button')).toHaveText(['Cancel']);
+    const after = await serverJson(request, '/__test__/tagging/snapshot');
+    expect(after.prompt_tags.length).toBeGreaterThan(before.prompt_tags.length);
 });
 
 test('Replace after review shows only Cancel with the reason', async ({ page, request }) => {
@@ -369,13 +355,18 @@ test('Replace after review shows only Cancel with the reason', async ({ page, re
     await page.locator('#tag-existing').selectOption('replace_after_review');
     await reviewButton(page).click();
     await expect(dialog(page).locator('#modal-title')).toHaveText('Review tag output images');
-    expect((await gridOf(page)).map(([term]) => term)).toEqual(['Model', 'Existing tags', 'Images', 'Already auto-tagged',
-        'Images to tag', 'Time', 'Settings', 'Backup']);
+    expect((await gridOf(page)).map(([term]) => term)).toEqual(['Model', 'Existing tags', 'Images linked', 'Prompts', 'Already tagged',
+        'Prompts to tag', 'Settings', 'Backup']);
     await expect(dialog(page).locator('#modal-body > p.small')).toHaveText('Replacing tags needs a review of each image. '
         + 'Use Preview tagging review, or choose Skip or Merge for a batch run.');
     await expect(dialog(page).locator('.dialog-actions button')).toHaveText(['Cancel']);
     await dialog(page).getByRole('button', { name: 'Cancel', exact: true }).click();
     await expect(dialog(page)).toHaveCount(0);
+    // Under Skip the fixture's only prompt is already tagged: nothing to start either.
+    await page.locator('#tag-existing').selectOption('skip');
+    await reviewButton(page).click();
+    await expect(dialog(page).locator('#modal-body > p.small')).toHaveText('Every prompt with an output image is already tagged.');
+    await expect(dialog(page).locator('.dialog-actions button')).toHaveText(['Cancel']);
     expect(await serverJson(request, '/__test__/tagging/snapshot')).toEqual(before);
     expect((await serverJson(request, '/prompt_manager/jobs')).jobs.filter(item => item.kind === 'autotag')).toEqual([]);
 });

tests/browser/workspace-system.spec.mjs

@@ -1,7 +1,6 @@
 import { startCoverage, saveCoverage } from '../../tools/vendor/browser-coverage.mjs';
 import { test, expect } from './fixtures.mjs';
 import { seedConcept } from './concept-inventory.mjs';
-import { readCoverageTable, parseControl, CONTROL_EXEMPTIONS } from '../../tools/vendor/legacy-coverage.mjs';
 
 // System › Overview (#249 System S2 Task 6) on the concept-shaped real fixture: the metrics, rows, Statistics dialog and
 // Health report read the server, never sample values (D93, D95, D96). The hooks are workspace_system_fixture.py's.
@@ -413,16 +412,15 @@ test('out-of-order overview responses never repaint a newer section', async ({ p
     await nav.getByRole('button', { name: 'Appearance', exact: true }).click();
     await nav.getByRole('button', { name: 'Overview', exact: true }).click();
     await expect.poll(held).toBe(2);
-    // Diagnostics & logs is native (S12): its body is its two surfaces.
+    // Diagnostics still hands off (S12), so its body is one known panel.
     await nav.getByRole('button', { name: 'Diagnostics & logs', exact: true }).click();
-    await expect(layout.locator(':scope > section.surface')).toHaveCount(2);
     await expect(await request.post('/__test__/release')).toBeOK();
     await expect.poll(held).toBe(0);
     // Both late answers reached a section that had left: Diagnostics keeps its own body.
+    await expect(layout.locator(':scope > section.handoff')).toBeVisible();
     await page.evaluate(() => new Promise(resolve => requestAnimationFrame(() => requestAnimationFrame(resolve))));
     await expect(layout.locator('.summary-metrics')).toHaveCount(0);
-    expect(await layout.evaluate(node => [...node.children].map(child => `${child.localName}.${child.className}`)))
-        .toEqual(['section.surface', 'section.surface', 'div.save-row']);
+    expect(await layout.evaluate(node => [...node.children].map(child => child.className))).toEqual(['surface handoff', 'save-row']);
     // Back on Overview, one fresh read paints one set of metrics.
     await nav.getByRole('button', { name: 'Overview', exact: true }).click();
     await expect(layout.locator('.summary-metrics')).toHaveCount(1);
@@ -795,45 +793,3 @@ test('reset restores defaults without touching other keys', async ({ page }) =>
     expect(stored).toEqual({ gridColumns: 5, defaultLimit: 200, thumbnailPromptDismissed: 'kept', workspaceLayout: 'grid',
         videoMute: true, showImageInfo: true });
 });
-
-// TESTING.md "Legacy System capability coverage" (#249 System S12, #329): each `covered` row's native control is on its
-// System section, found by role and accessible name (a `term` by its text, a disclosure by its summary). Collapsed
-// `details` are opened first, so a control inside one counts once it is shown. tests/vendor/legacy-coverage.test.mjs
-// checks the rest of each row.
-test('every covered legacy System capability has its native control', async ({ page, request }) => {
-    // Download is offered for a model that is not on disk ("Download again" otherwise): the selected default's file is
-    // missing here.
-    await expect(await request.post('/__test__/tagging/models', { data: { unavailable: ['wd14-swinv2'] } })).toBeOK();
-    try {
-        await findControls(page);
-    } finally {
-        await request.post('/__test__/tagging/reset', { data: {} });
-    }
-});
-
-async function findControls(page) {
-    const covered = readCoverageTable().filter(row => row.Status === 'covered')
-        .map(row => ({ capability: row.Capability, ...parseControl(row['Native control']) }));
-    // A covered row without a control is one of the recorded exemptions, never silently skipped.
-    expect(covered.filter(row => !row.section).map(row => row.capability)).toEqual(Object.keys(CONTROL_EXEMPTIONS));
-    const controls = covered.filter(row => row.section);
-    expect(controls.length).toBeGreaterThan(40);
-    const sections = [...new Set(controls.map(row => row.section))];
-    for (const section of sections) {
-        await page.goto(`${workspace}#/system/${section}`);
-        const main = page.locator('#workspace-main');
-        await expect(layoutOf(page).locator(':scope > *').first()).toBeVisible();
-        for (const details of await main.locator('details:not([open]) > summary').all()) await details.click();
-        for (const { capability, role, name, row } of controls.filter(item => item.section === section)) {
-            // A name several rows share is looked up inside the row the table names.
-            const within = row ? main.locator('.operation').filter({ has: page.locator(`h3:text-is("${row}")`) }) : main;
-            const exact = new RegExp(`^${name.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}$`);
-            // A `dt` (term) and a `details` disclosure (group) have no name from content: the term's text, the summary's.
-            const control = role === 'term' ? within.getByRole('term').filter({ hasText: exact })
-                : role === 'group' ? within.locator('details').filter({ has: page.locator(':scope > summary', { hasText: exact }) })
-                    .or(within.getByRole('group', { name, exact: true }))
-                    : within.getByRole(role, { name, exact: true });
-            await expect(control.first(), `${capability}: ${section} · ${role} · "${name}"${row ? ` in "${row}"` : ''}`).toBeVisible();
-        }
-    }
-}

tests/browser/workspace-tagging.spec.mjs

@@ -513,41 +513,6 @@ test('search finds an image by its image tag', async ({ page, request }) => {
     await expect(card(page, UNLINKED)).toBeVisible();
 });
 
-// #379 CUJ 8: the Tags filter finds images by their own image tags through the tag index; no prompt carries them, and
-// selecting a match shows its prompt. A linked prompt's tag still combines with the image tags.
-test('the Tags filter finds images by image tags only, and selecting one shows its prompt (#379)', async ({ page, request }) => {
-    await saveImageTags(request, FIRST, ['beach', '1girl', 'waves']);
-    await saveImageTags(request, SECOND, ['beach', 'waves']);
-    await saveImageTags(request, UNLINKED, ['beach', '1girl', 'waves', 'gulls']);
-    await page.goto(images);
-    await expect(page.locator('.gallery-body article[data-image-key]')).toHaveCount(manifest.files.length);
-    const filters = page.locator('#workspace-main search.toolbar').getByRole('button', { name: /^Filters(?: · \d+)?$/ });
-    const refine = page.getByRole('dialog', { name: 'Refine this view', exact: true });
-    const applyTags = async value => {
-        await filters.click();
-        await refine.getByLabel('Tags', { exact: true }).fill(value);
-        const listing = page.waitForRequest(item => item.url().includes('/images/output?')
-            && new URL(item.url()).searchParams.get('tags') !== null);
-        await refine.getByRole('button', { name: 'Apply filters', exact: true }).click();
-        await listing;
-    };
-    await applyTags('beach, 1girl, waves');
-    // Every listed image whose image tags hold all three; SECOND lacks 1girl.
-    await expect(page.locator('.gallery-body article[data-image-key]')).toHaveCount(2);
-    await expect(card(page, FIRST)).toBeVisible();
-    await expect(card(page, UNLINKED)).toBeVisible();
-    await expect(card(page, SECOND)).toHaveCount(0);
-    // The newest match is selected; the inspector shows its linked prompt.
-    await infoButton(page, FIRST).click();
-    await expect(card(page, FIRST)).toHaveClass(/\bselected\b/);
-    await expect(panel(page).locator('.panel-heading h2')).toHaveText(manifest.title);
-    // The linked positive's own tag combines: SECOND has beach and waves itself and minimal through its prompt.
-    await applyTags(`beach, waves, ${manifest.prompt_tags[0]}`);
-    await expect(page.locator('.gallery-body article[data-image-key]')).toHaveCount(2);
-    await expect(card(page, FIRST)).toBeVisible();
-    await expect(card(page, SECOND)).toBeVisible();
-});
-
 // Task C4 rulings: a save re-reads the selected file's details without a loading flash, and under a Tags filter or a
 // search the loaded listing is re-read in place (scroll and selection kept while the file still matches).
 const cards = page => page.locator('.gallery-body article[data-image-key]');

tests/browser/workspace.spec.mjs

@@ -18,7 +18,7 @@ const routes = [
     ['tags', 'Tags & categories', null],
     // #249 local Inspect: the native Inspect a file page; Overview's tool card still links the legacy metadata page.
     ['inspect', 'Inspect a file', null],
-    // #249 System S2: native System; every section native since S12 (D94 retired, asserted below).
+    // #249 System S2: native System; its undelivered sections hand off per section (D94, asserted below).
     ['system', 'System', null],
     // #249 D51: SAVED VIEWS' Favorites, Images filtered to favorites.
     ['favorites', 'Favorites', null],
@@ -395,7 +395,7 @@ const SURFACE = {
     intro: { fontSize: '12px', marginTop: '7px' },
 };
 
-for (const width of [1600, 390]) test(`overview renders with concept surfaces and no System section hands off ${width}`, async ({ page }) => {
+for (const width of [1600, 390]) test(`overview and handoff render with concept surfaces ${width}`, async ({ page }) => {
     await page.setViewportSize({ width, height: 900 });
     await page.goto(`${workspace}#/overview`);
     const main = page.locator('#workspace-main');
@@ -412,23 +412,23 @@ for (const width of [1600, 390]) test(`overview renders with concept surfaces an
     expect(await page.evaluate(() => document.documentElement.scrollWidth <= window.innerWidth)).toBe(true);
 
     await sidebarLink(page, 'System').click();
-    // Every System section is native (S12 retired D94): the last one, Diagnostics & logs, shows concept surfaces.
+    // System's Overview is native (S2 Task 6); a section not delivered yet still hands off (D94).
     await main.locator('.section-nav').getByRole('button', { name: 'Diagnostics & logs', exact: true }).click();
-    const logs = main.locator('.settings-layout > section.surface').last();
-    await expect(logs.locator(':scope > h2')).toHaveText('Logs');
-    expect(await logs.evaluate(surfaceStyle)).toMatchObject(SURFACE);
-    await expect(main.locator('.handoff')).toHaveCount(0);
+    const handoff = main.locator('section.handoff');
+    await expect(handoff).toHaveClass(/\bsurface\b/);
+    expect(await handoff.evaluate(surfaceStyle)).toMatchObject(SURFACE);
+    await expect(handoff.locator('a[href="/prompt_manager/admin"]')).toBeVisible();
     await expect(main.locator('.panel')).toHaveCount(0);
     expect(await page.evaluate(() => document.documentElement.scrollWidth <= window.innerWidth)).toBe(true);
 });
 
-// #249 System S2 Task 5: the concept's renderSystem shell (app.js 698–706) at `#/system/<section>`, every section native
-// (S12 retired the D94 hand-off), and the Save row's truthful status (D92).
+// #249 System S2 Task 5: the concept's renderSystem shell (app.js 698–706) at `#/system/<section>`, every section a D94
+// hand-off until its PR, and the Save row's truthful status (D92).
 const SYSTEM_SECTION_LABELS = ['Overview', 'Appearance', 'Sources & scans', 'Integrations', 'Auto-tagging', 'Maintenance',
     'Backup & export', 'Diagnostics & logs'];
 const SYSTEM_HASHES = ['overview', 'appearance', 'sources', 'integrations', 'tagging', 'maintenance', 'backups', 'diagnostics'];
 
-test('System is native: the concept shell, section navigation, sections and the Save row', async ({ page }) => {
+test('System is native: the concept shell, section navigation, sections, hand-offs and the Save row', async ({ page }) => {
     const mutations = [];
     page.on('request', item => { if (!['GET', 'HEAD', 'OPTIONS'].includes(item.method())) mutations.push(item.url()); });
     await page.goto(`${workspace}#/system`);
@@ -466,8 +466,7 @@ test('System is native: the concept shell, section navigation, sections and the
         // (S4 Task 11, workspace-system-sources.spec.mjs, its update notice shown in a fresh browser), Integrations (S10
         // Task 27, workspace-system-integrations.spec.mjs), Maintenance (S7 Task 19,
         // workspace-system-maintenance.spec.mjs), Backup & export (S9 Task 24, workspace-system-backups.spec.mjs) and
-        // Auto-tagging (S11 Task 6, workspace-system-tagging.spec.mjs) and Diagnostics & logs (S12,
-        // workspace-system-diagnostics.spec.mjs): none hands off.
+        // Auto-tagging (S11 Task 6, workspace-system-tagging.spec.mjs); every other section hands off.
         if (hash === 'tagging') await expect(layout.locator('#tag-model')).toBeVisible();
         if (hash === 'overview') await expect(layout.locator(':scope > .summary-metrics')).toBeVisible();
         if (hash === 'sources') await expect(layout.locator('#source-list .operation')).toHaveCount(2);
@@ -477,9 +476,13 @@ test('System is native: the concept shell, section navigation, sections and the
                 integrations: ['section.surface', 'section.surface', 'div.save-row'],
                 maintenance: ['div.notice', 'section.surface', 'section.surface', 'div.save-row'],
                 backups: ['div.two-col', 'section.surface', 'div.save-row'],
-                tagging: ['section.surface', 'div.save-row'],
-                diagnostics: ['section.surface', 'section.surface', 'div.save-row'] }[hash]);
-        await expect(layout.locator('.handoff')).toHaveCount(0);
+                tagging: ['section.surface', 'div.save-row'] }[hash]
+                ?? ['section.surface handoff', 'div.save-row']);
+        if (['overview', 'appearance', 'sources', 'integrations', 'tagging', 'maintenance', 'backups'].includes(hash)) continue;
+        const handoff = layout.locator('section.handoff');
+        await expect(handoff.locator('h2')).toHaveText('Your current tools are ready');
+        expect(await handoff.locator('a.workspace-link').evaluateAll(links => links.map(link => link.getAttribute('href'))))
+            .toEqual(['/prompt_manager/admin']);
         await expect(layout.locator('#settings-status')).toHaveText('No unsaved changes.');
         await expect(page.locator('aside.sidebar a[href="#/system"]')).toHaveAttribute('aria-current', 'page');
     }

tests/browser/workspace_concept_fixture.py

@@ -16,6 +16,7 @@ import json
 import math
 import os
 from pathlib import Path
+import shutil
 import time
 from types import SimpleNamespace
 from typing import TYPE_CHECKING
@@ -33,7 +34,6 @@ from utils.execution_contexts import (
 from utils.execution_history_events import make_finish, make_start
 from utils.execution_outputs import OutputBundle, OutputReference, snapshot_output_roots
 from utils.pair_execution import EXECUTION_KEY
-from tests.browser.folder_trash import replace_folder
 
 if TYPE_CHECKING:
     from py.api import PromptManagerAPI
@@ -300,7 +300,8 @@ def _clear(api: PromptManagerAPI, root: Path) -> None:
         for table in _TABLES:
             conn.execute(f"DELETE FROM {table}")
     for name in ("output", "input"):
-        replace_folder(root / name)
+        shutil.rmtree(root / name)
+        (root / name).mkdir()
 
 
 def _record_run(

tests/browser/workspace_diagnostics_fixture.py

@@ -1,267 +0,0 @@
-"""System › Diagnostics & logs test hooks for the browser tests (#249 System S12).
-
-The logger writes into ``<server root>/logs`` (``repoint_logs``, called by
-``create_app`` before any record is written), so no test reads or deletes a
-real log folder. Every route refuses a log folder outside the server root.
-
-- ``POST /__test__/logs/reset`` restores the default logging configuration,
-  empties the active log, removes every other entry of the log folder (a
-  link is removed, never followed) and clears the in-memory buffer. The
-  global ``/__test__/reset`` calls it too;
-- ``POST /__test__/logs/seed`` ``{records, filler, rotated, active, link,
-  other}`` writes buffer records with fixed times (``records``: the concept's
-  four lines, then one DEBUG, ERROR and CRITICAL record, older; ``filler``
-  more INFO records older still), ``active`` bytes into the active log,
-  rotated copies ``prompt_manager.log.<n>`` of the listed sizes (fixed
-  times), on POSIX a symlink ``prompt_manager.log.<n+1>`` to a file outside
-  the folder (``link``) and a user's ``prompt_manager.log.bak`` (``other``).
-  ``{mode: "concept"}`` reproduces the concept's Logs sample (app.js 695)
-  for the comparison: the buffer holds only its four lines, the active log
-  is 1.4 MB with three rotated copies ("prompt_manager.log · 1.4 MB · rotated
-  copies: 3") and console logging is off, as the concept's toggle;
-- ``POST /__test__/logs/rotate`` rolls the copies over as the handler does
-  (``.2`` → ``.3``, ``.1`` → ``.2``, a new ``.1``), so a reviewed plan no
-  longer matches;
-- ``GET /__test__/logs/state`` answers the folder's entries (name, size, link)
-  and the buffer's length.
-"""
-
-import datetime
-import logging
-import os
-import shutil
-from pathlib import Path
-
-from aiohttp import web
-
-ACTIVE = "prompt_manager.log"
-SEED_DAY = datetime.datetime(2026, 10, 26)
-# The concept's four lines (app.js 695), oldest first: the viewer shows them
-# newest first.
-CONCEPT_RECORDS = (
-    ("09:38:52", logging.INFO, "Source monitor started: output"),
-    ("09:39:04", logging.INFO, "Database backup verified"),
-    ("09:42:18", logging.WARNING, "3 images have ambiguous prompt metadata"),
-    ("09:42:18", logging.INFO, "Scan completed: 12 enriched, 0 duplicate links"),
-)
-# Older than the concept's lines, so they come after them: the levels the
-# concept does not show.
-LEVEL_RECORDS = (
-    ("09:30:01", logging.DEBUG, "Thumbnail cache lookup"),
-    ("09:30:02", logging.ERROR, "A source folder could not be read"),
-    ("09:30:03", logging.CRITICAL, "The database could not be opened"),
-)
-ROTATED_TIME = datetime.datetime(2026, 10, 25, 14, 2)
-# The concept's "prompt_manager.log · 1.4 MB · rotated copies: 3": the active
-# log stays under 1.45 MB while the server writes its own lines.
-CONCEPT_ACTIVE = int(1.4 * 1024 * 1024)
-CONCEPT_ROTATED = (3072, 2048, 1024)
-MAX_SEED_BYTES = 64 * 1024 * 1024
-DEFAULT_CONFIG = {
-    "level": "INFO",
-    "max_file_size": 10 * 1024 * 1024,
-    "backup_count": 5,
-    "console_logging": True,
-    "file_logging": True,
-    "buffer_size": 1000,
-}
-
-
-def _manager():
-    from utils.logging_config import get_logger_manager
-
-    return get_logger_manager()
-
-
-def repoint_logs(root: Path) -> Path:
-    """Point the logger at ``<root>/logs`` before anything is logged.
-
-    The logger is built while ``logs_dir`` answers that folder, so its first
-    handler never opens a log file anywhere else (a node folder with a legacy
-    database would otherwise name a real log folder).
-    """
-    from utils import library_location
-
-    folder = Path(root) / "logs"
-    folder.mkdir(exist_ok=True)
-    original = library_location.logs_dir
-    library_location.logs_dir = lambda **_kwargs: str(folder)
-    try:
-        manager = _manager()
-    finally:
-        library_location.logs_dir = original
-    with manager._files_lock:
-        manager.log_dir = folder
-        manager._setup_loggers()
-    return folder
-
-
-def _require_inside(root: Path, folder: Path) -> None:
-    resolved = Path(os.path.realpath(folder))
-    if Path(os.path.realpath(root)) not in resolved.parents:
-        raise web.HTTPForbidden(text="The log folder is outside the test server root")
-
-
-def _record(time_text, level, message, index):
-    record = logging.LogRecord(
-        "prompt_manager.test", level, __file__, index, message, None, None
-    )
-    hours, minutes, seconds = (int(part) for part in time_text.split(":"))
-    moment = SEED_DAY.replace(hour=hours, minute=minutes, second=seconds)
-    # Equal times keep their order: each later record is a microsecond newer.
-    record.created = moment.timestamp() + index / 1e6
-    return record
-
-
-def _touch(path: Path, size: int, moment: datetime.datetime) -> None:
-    # A link at this name is replaced, never written through.
-    if path.is_symlink():
-        path.unlink()
-    with open(path, "wb") as handle:
-        handle.write(b"x" * size)
-    stamp = moment.timestamp()
-    os.utime(path, (stamp, stamp))
-
-
-def _bounded(value, name, top=MAX_SEED_BYTES):
-    if isinstance(value, bool) or not isinstance(value, int) or not 0 <= value <= top:
-        raise web.HTTPBadRequest(text=f"{name} must be an integer 0..{top}")
-    return value
-
-
-def register_diagnostics_commands(app, routes, api, root: Path):
-    """Register the hooks; returns ``reset()`` for the global reset."""
-
-    def folder() -> Path:
-        path = Path(_manager().log_dir)
-        _require_inside(root, path)
-        return path
-
-    def reset() -> None:
-        manager = _manager()
-        log_dir = folder()
-        if manager.get_config() != DEFAULT_CONFIG:
-            manager.update_config(dict(DEFAULT_CONFIG))
-        with manager._files_lock:
-            held = manager._acquire_file_handlers()
-            try:
-                with os.scandir(log_dir) as entries:
-                    found = list(entries)
-                for entry in found:
-                    path = Path(entry.path)
-                    if entry.name == ACTIVE and entry.is_file(follow_symlinks=False):
-                        manager._truncate_main_log(path)
-                    elif entry.is_dir(follow_symlinks=False):
-                        shutil.rmtree(path)
-                    else:
-                        os.unlink(path)
-            finally:
-                manager._release_handlers(held)
-        with manager._buffer_lock:
-            manager._log_buffer.clear()
-
-    def seed_concept() -> None:
-        manager = _manager()
-        log_dir = folder()
-        manager.update_config({"console_logging": False})
-        with manager._buffer_lock:
-            manager._log_buffer.clear()
-        for index, (time_text, level, message) in enumerate(CONCEPT_RECORDS):
-            record = _record(time_text, level, message, index)
-            manager.add_to_buffer(record, record.getMessage())
-        with open(log_dir / ACTIVE, "ab") as handle:
-            handle.write(b"x" * CONCEPT_ACTIVE)
-        for number, size in enumerate(CONCEPT_ROTATED, start=1):
-            moment = ROTATED_TIME - datetime.timedelta(hours=number)
-            _touch(log_dir / f"{ACTIVE}.{number}", size, moment)
-
-    def seed(data) -> None:
-        if data.get("mode") == "concept":
-            seed_concept()
-            return
-        manager = _manager()
-        log_dir = folder()
-        with_records = data.get("records", True) is not False
-        filler = _bounded(data.get("filler", 0), "filler", 900)
-        older = [
-            (f"08:{index // 60:02}:{index % 60:02}", logging.INFO, f"Filler {index}")
-            for index in range(filler)
-        ]
-        named = list(LEVEL_RECORDS) + list(CONCEPT_RECORDS) if with_records else []
-        ordered = older + named
-        for index, (time_text, level, message) in enumerate(ordered):
-            record = _record(time_text, level, message, index)
-            manager.add_to_buffer(record, record.getMessage())
-        active = _bounded(data.get("active", 0), "active")
-        if active:
-            with open(log_dir / ACTIVE, "ab") as handle:
-                handle.write(b"x" * active)
-        rotated = data.get("rotated", [])
-        if not isinstance(rotated, list) or len(rotated) > 20:
-            raise web.HTTPBadRequest(text="rotated must be a list of sizes")
-        for number, size in enumerate(rotated, start=1):
-            moment = ROTATED_TIME - datetime.timedelta(hours=number)
-            _touch(log_dir / f"{ACTIVE}.{number}", _bounded(size, "size"), moment)
-        if data.get("link") and os.name != "nt":
-            target = Path(root) / "outside-log-target.txt"
-            target.write_bytes(b"not a log of this folder")
-            os.symlink(target, log_dir / f"{ACTIVE}.{len(rotated) + 1}")
-        if data.get("other"):
-            _touch(log_dir / f"{ACTIVE}.bak", 0, ROTATED_TIME)
-
-    def rotate() -> None:
-        manager = _manager()
-        log_dir = folder()
-        with manager._files_lock:
-            held = manager._acquire_file_handlers()
-            try:
-                for number in (2, 1):
-                    source = log_dir / f"{ACTIVE}.{number}"
-                    if source.is_file() and not source.is_symlink():
-                        os.replace(source, log_dir / f"{ACTIVE}.{number + 1}")
-                _touch(log_dir / f"{ACTIVE}.1", 4096, datetime.datetime.now())
-            finally:
-                manager._release_handlers(held)
-
-    def state():
-        manager = _manager()
-        log_dir = folder()
-        entries = []
-        with os.scandir(log_dir) as listing:
-            found = sorted(listing, key=lambda item: item.name)
-        for entry in found:
-            info = entry.stat(follow_symlinks=False)
-            entries.append(
-                {"name": entry.name, "size": info.st_size, "link": entry.is_symlink()}
-            )
-        with manager._buffer_lock:
-            buffered = len(manager._log_buffer)
-        return {"entries": entries, "buffer": buffered, "config": manager.get_config()}
-
-    async def body(request):
-        data = await request.json() if request.can_read_body else {}
-        if not isinstance(data, dict):
-            raise web.HTTPBadRequest()
-        return data
-
-    @routes.post("/__test__/logs/reset")
-    async def logs_reset(request: web.Request) -> web.Response:
-        await api._run_in_executor(reset)
-        return web.json_response({"success": True})
-
-    @routes.post("/__test__/logs/seed")
-    async def logs_seed(request: web.Request) -> web.Response:
-        data = await body(request)
-        await api._run_in_executor(seed, data)
-        return web.json_response({"success": True})
-
-    @routes.post("/__test__/logs/rotate")
-    async def logs_rotate(request: web.Request) -> web.Response:
-        await api._run_in_executor(rotate)
-        return web.json_response({"success": True})
-
-    @routes.get("/__test__/logs/state")
-    async def logs_state(request: web.Request) -> web.Response:
-        return web.json_response(await api._run_in_executor(state))
-
-    return reset

tests/browser/workspace_library_editor_fixture.py

@@ -3,11 +3,11 @@
 from __future__ import annotations
 
 from pathlib import Path
+import shutil
 from typing import TYPE_CHECKING
 
 from aiohttp import web
 from PIL import Image
-from tests.browser.folder_trash import replace_folder
 
 if TYPE_CHECKING:
     from py.api import PromptManagerAPI
@@ -51,7 +51,8 @@ def seed_library_editor(api: PromptManagerAPI, root: Path) -> dict:
         for table in _TABLES:
             conn.execute(f"DELETE FROM {table}")
     for name in ("output", "input"):
-        replace_folder(root / name)
+        shutil.rmtree(root / name)
+        (root / name).mkdir()
     epoch = db.get_execution_epoch()
     receipt = db.create_library_recipe(
         EDITOR_POSITIVE,

tests/browser/workspace_review_fixture.py

@@ -52,7 +52,6 @@ from typing import TYPE_CHECKING
 from aiohttp import web
 from PIL import Image
 from PIL.PngImagePlugin import PngInfo
-from tests.browser.folder_trash import replace_folder
 
 if TYPE_CHECKING:
     from py.api import PromptManagerAPI
@@ -226,7 +225,8 @@ def seed_review(
             conn.execute(f"DELETE FROM {table}")
     api.close_annotation_captures()
     for name in ("output", "input"):
-        replace_folder(root / name)
+        shutil.rmtree(root / name)
+        (root / name).mkdir()
     shutil.rmtree(root / "temp" / "review", ignore_errors=True)
     output = root / "output"
     files = []

tests/browser/workspace_tagging_fixture.py

@@ -19,7 +19,6 @@ from typing import TYPE_CHECKING
 from aiohttp import web
 from PIL import Image
 from PIL.PngImagePlugin import PngInfo
-from tests.browser.folder_trash import replace_folder
 
 if TYPE_CHECKING:
     from py.api import PromptManagerAPI
@@ -99,7 +98,8 @@ def seed_tagging(api: PromptManagerAPI, root: Path, extra_images: int = 0) -> di
         for table in _TABLES:
             conn.execute(f"DELETE FROM {table}")
     for name in ("output", "input"):
-        replace_folder(root / name)
+        shutil.rmtree(root / name)
+        (root / name).mkdir()
     output = root / "output"
     _png(output / FILES[0][0], (196, 140, 92))
     _png(output / FILES[1][0], (150, 110, 80))

tests/browser/workspace_visual_fixture.py

@@ -5,13 +5,13 @@ from __future__ import annotations
 import json
 import os
 from pathlib import Path
+import shutil
 from typing import TYPE_CHECKING
 
 from PIL import Image, ImageDraw
 from PIL.PngImagePlugin import PngInfo
 
 from utils.hashing import generate_prompt_hash
-from tests.browser.folder_trash import replace_folder
 
 if TYPE_CHECKING:
     from py.api import PromptManagerAPI
@@ -129,7 +129,8 @@ def seed_workspace_visual(api: PromptManagerAPI, root: Path) -> None:
         ):
             conn.execute(f"DELETE FROM {table}")
     for name in ("output", "input"):
-        replace_folder(root / name)
+        shutil.rmtree(root / name)
+        (root / name).mkdir()
     for parent_index, (positive, negatives) in enumerate(zip(_POSITIVES, _NEGATIVES)):
         category = ("Architecture", "Landscape", "Abstract")[parent_index % 3]
         tags = ["geometric", ("warm", "cool")[parent_index % 2]]

tests/browser/workspace_vocabulary_fixture.py

@@ -7,10 +7,10 @@ in concept order, so tag creation order and category first use match the mock.
 from __future__ import annotations
 
 from pathlib import Path
+import shutil
 from typing import TYPE_CHECKING
 
 from aiohttp import web
-from tests.browser.folder_trash import replace_folder
 
 if TYPE_CHECKING:
     from py.api import PromptManagerAPI
@@ -120,7 +120,8 @@ def seed_vocabulary(
         for table in _TABLES:
             conn.execute(f"DELETE FROM {table}")
     for name in ("output", "input"):
-        replace_folder(root / name)
+        shutil.rmtree(root / name)
+        (root / name).mkdir()
     epoch = db.get_execution_epoch()
     recipes = []
     for recipe in CONCEPT_RECIPES:

tests/comfyui/fixtures/ledger_nodes.py

@@ -292,8 +292,7 @@ async def image_monitor(request: web.Request) -> web.Response:
         config.MONITORING_ENABLED = True
         monitor.start_monitoring([folder_paths.get_output_directory()])
     else:
-        # Joins the image worker and the observer (one shared 5 s deadline),
-        # so it runs on a worker thread, not on the event loop.
+        # Joins the image worker and the observer (up to 5 s each): off the loop.
         await asyncio.to_thread(monitor.stop_monitoring)
         config.MONITORING_ENABLED = False
     return web.json_response({"monitoring": monitor.is_monitoring})

tests/fixtures/local-inspect/legacy-agreement.json

@@ -1,107 +0,0 @@
-{
- "generation_params": [
-  "case:basic",
-  "case:shared-prompt-pipeline",
-  "tests/fixtures/inspection_parity/f02.png",
-  "tests/fixtures/inspection_parity/f03.png",
-  "tests/fixtures/inspection_parity/f06c.png",
-  "tests/fixtures/inspection_parity/f06e.png",
-  "tests/fixtures/inspection_parity/f07a.png",
-  "tests/fixtures/inspection_parity/f07b.png",
-  "tests/fixtures/inspection_parity/f08.png",
-  "tests/fixtures/inspection_parity/f09.png",
-  "tests/fixtures/inspection_parity/f10.png",
-  "tests/fixtures/inspection_parity/f11.png",
-  "tests/fixtures/inspection_parity/f15.png",
-  "tests/fixtures/inspection_parity/f16.png",
-  "tests/fixtures/inspection_parity/f23.png"
- ],
- "inspection_parity": [
-  "f02",
-  "f03",
-  "f06c",
-  "f06e",
-  "f07a",
-  "f07b",
-  "f08",
-  "f09",
-  "f10",
-  "f11",
-  "f14",
-  "f15",
-  "f16",
-  "f23"
- ],
- "local_resolver": [
-  "anchor-first-stage-no-latent",
-  "anchor-same-links",
-  "anchor-same-links-unanchored",
-  "built-chars",
-  "class-type-missing",
-  "class-type-number",
-  "combine-equal",
-  "controlnet-slot1",
-  "custom-cfg",
-  "duplicate-key",
-  "encode",
-  "int-id",
-  "latent-encode",
-  "overwritten-bad-workflow",
-  "pair-execution",
-  "pair-execution-bad-json",
-  "pair-execution-mismatch",
-  "pair-execution-negative-changed",
-  "pair-execution-other-node",
-  "pair-execution-truncated",
-  "pair-execution-two-records",
-  "pair-execution-version-float",
-  "pair-execution-version-true",
-  "pair-graph",
-  "pass-through-unknown-role-inputs",
-  "passthrough",
-  "prompt-and-parameters",
-  "prompt-manager",
-  "select-detailer-chain-same",
-  "select-detailer-no-sampler-upstream",
-  "select-detailer-output-walk-exhausted",
-  "select-detailer-same-prompt",
-  "select-edge-hires-fix-denoised-slot",
-  "select-edge-hires-fix-lineage-cycle",
-  "select-edge-hires-fix-two-refiners",
-  "select-flux-concat",
-  "select-flux-reroute-input",
-  "select-flux-three-stage",
-  "select-hires-fix",
-  "select-hires-fix-both-saved",
-  "select-hires-fix-reroute",
-  "select-hires-fix-unlisted",
-  "select-multistage-latent",
-  "select-preview-dropped",
-  "select-preview-through-bad-node",
-  "select-runtime-flux-other-full-prompt",
-  "select-runtime-flux-trigger",
-  "select-runtime-search-list-append",
-  "select-runtime-through-chained",
-  "select-runtime-through-concat",
-  "select-runtime-through-text-encode",
-  "select-runtime-traced-prepend",
-  "select-runtime-trigger-append-single",
-  "select-runtime-trigger-pair",
-  "select-runtime-trigger-prepend",
-  "select-three-identical-one-advanced",
-  "select-two-identical",
-  "select-unconsumed-stage-kept",
-  "several-samplers",
-  "smz-false",
-  "text-at-limit",
-  "unknown-encoder",
-  "workflow-type-dict",
-  "workflow-type-in-subgraph",
-  "workflow-type-list",
-  "workflow-type-without-id",
-  "zeroed"
- ],
- "unknown_nodes": [
-  "unknown-role-inputs"
- ]
-}

tests/js/support/local-inspect-oracle.mjs

@@ -40,7 +40,7 @@ const semantics = compileSemantics(JSON.parse(fs.readFileSync(path.join(here, '.
 const { extractGenerationFacts } = require(path.join(here, '..', '..', '..', 'web', 'js', 'comfy-metadata.js'));
 
 /** The local evidence for one set of record texts. */
-const resolved = (records, fileName = null) => ({ evidence: resolveLocalEvidence(records, semantics, fileName) });
+const resolved = records => ({ evidence: resolveLocalEvidence(records, semantics) });
 
 /** The local wire's evidence and six facts for one read (no legacy fill, as in the vectors' own harness). */
 function localPayload(read, file, classification) {
@@ -59,14 +59,14 @@ const output = {};
 for (const entry of JSON.parse(Buffer.concat(chunks).toString('utf8'))) {
     const { name } = entry;
     if (entry.mode === 'resolve') {
-        if (entry.records !== undefined) { output[name] = resolved(entry.records, entry.fileName ?? null); continue; }
+        if (entry.records !== undefined) { output[name] = resolved(entry.records); continue; }
         const blob = await fs.openAsBlob(entry.path);
         const { classification, result } = await readLocalFile(blob, { pngMetadata });
         const read = classification === null ? null : toInspectionRead(classification, result).read;
         if (classification === null) { output[name] = { unreadable: true }; continue; }
         // The evidence is the local wire's own (buildLocalPayload), and it equals resolveLocalEvidence of the records.
         const local = localPayload(result, { name: path.basename(entry.path), size: blob.size }, classification);
-        const direct = read === null ? unreadableEvidence() : resolved(read.records, path.basename(entry.path)).evidence;
+        const direct = read === null ? unreadableEvidence() : resolved(read.records).evidence;
         if (JSON.stringify(direct) !== JSON.stringify(local.evidence)) throw new Error(`${name}: the wire's roles are not the resolver's`);
         output[name] = read === null ? { unreadable: true, ...local } : local;
         continue;

tests/js/workspace-local-resolver.test.js

@@ -155,9 +155,7 @@ test('committed server answers equal the local evidence', () => {
         value !== null && typeof value === 'object' ? Object.fromEntries(Object.keys(value).sort().map(key => [key, canonical(value[key])])) : value;
     let compared = 0;
     for (const {name, records, evidence} of vectors) {
-        // A case may name the inspected file (`__file_name`, #381 saver anchoring); it is no record.
-        const {__file_name: fileName = null, ...roles} = records;
-        assert.deepEqual(canonical(resolver.resolveLocalEvidence(roles, semantics, fileName)), canonical(evidence), name);
+        assert.deepEqual(canonical(resolver.resolveLocalEvidence(records, semantics)), canonical(evidence), name);
         compared++;
     }
     assert.ok(compared > 280, `compared ${compared}`);

tests/js/workspace-state.test.js

@@ -23,7 +23,7 @@ test('tags is a native route titled Tags; only unbuilt routes hand off to legacy
         assert.equal(routeTitle(route), route.label);
     }
     assert.equal(routeTitle(resolveRoute('#/library/7')), 'Prompt library');
-    // System is native from S2 (#249 System), and every section of it from S12 (D94 retired), not the route.
+    // System is native from S2 (#249 System): its undelivered sections hand off per section (D94), not the route.
     for (const id of ['images', 'library', 'tags', 'inspect', 'overview', 'activity', 'review', 'system']) assert.equal(isHandoff(resolveRoute(`#/${id}`)), false, id);
 });
 

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

@@ -1,193 +0,0 @@
-// System › Diagnostics & logs (#249 System S12, #329): the concept's two surfaces (app.js 694–695) with live values: the
-// meta-grid texts, the report's name and merge (D110), the log viewer's lines, Lines validation, statistics, retention
-// and file rows, and the Clear all logs copy (D109).
-const test = require('node:test');
-const assert = require('node:assert/strict');
-const fs = require('node:fs');
-const path = require('node:path');
-
-const diagnostics = import('../../web/js/workspace/system-diagnostics.mjs');
-
-const CONCEPT = fs.readFileSync(path.join(__dirname, '../../docs/concepts/workspace/app.js'), 'utf8');
-const SOURCE = fs.readFileSync(path.join(__dirname, '../../web/js/workspace/system-diagnostics.mjs'), 'utf8');
-const SYSTEM = fs.readFileSync(path.join(__dirname, '../../web/js/workspace/system.mjs'), 'utf8');
-
-const REPORT = {
-    checks: { database: { status: 'ok', prompt_count: 4210, has_images_table: true, image_count: 19956 } },
-    database_info: { database_path: 'user/__promptmanager/prompts.db', database_size_bytes: 1717986918 },
-    sources: { configured: 2, effective: 2, watching: 2, unavailable: 0 },
-    viewerjs: '1.15.2',
-};
-
-test('the section keeps the concept surfaces, terms, rows and labels; no sample copy ships', () => {
-    const start = CONCEPT.indexOf('case "diagnostics":');
-    const body = CONCEPT.slice(start, CONCEPT.indexOf('break;', start));
-    const terms = [...body.matchAll(/<dt>([^<]+)<\/dt>/g)].map(([, term]) => term);
-    assert.deepEqual(terms, ['Database', 'Sources', 'Viewer.js', 'Host renderers']);
-    for (const text of ["'Diagnostics'", "'Logs'", "'Run checks'", "'Refresh'", "'Level'", "'Log files & retention'",
-        "'Review log cleanup'", "'Runtime log level'", "'Console logging'", "'Image-link diagnostics'"]) {
-        assert.ok(SOURCE.includes(text), text);
-    }
-    for (const id of ['runtime-level', 'console-log']) assert.ok(body.includes(`setting("${id}"`) && SOURCE.includes(`id: '${id}'`), id);
-    assert.ok(SOURCE.includes("'toolbar spaced-16'") && body.includes('class="toolbar spaced-16"'));
-    // Prototype copy is never shipped.
-    for (const sample of ['sample', 'Sample']) assert.ok(!SOURCE.includes(`'${sample}`) && !/Download sample|Inspect sample/.test(SOURCE), sample);
-});
-
-test('D94 is retired: Diagnostics & logs is a delivered section and nothing hands off', () => {
-    assert.ok(SYSTEM.includes('diagnostics: mountDiagnostics'));
-    assert.ok(!SYSTEM.includes('SECTION_HANDOFFS'));
-    assert.ok(!SYSTEM.includes('handoff('));
-    assert.ok(!SYSTEM.includes('NOT_DELIVERED'));
-});
-
-test('database text covers readable, not readable, busy and loading', async () => {
-    const { databaseText, LOADING, UNREADABLE } = await diagnostics;
-    assert.equal(databaseText({ report: REPORT }), 'Readable · 1.6 GB · 19,956 images');
-    assert.equal(databaseText({ report: { ...REPORT, checks: { database: { status: 'ok', image_count: 1 } },
-        database_info: { database_size_bytes: 2048 } } }), 'Readable · 2.0 KB · 1 image');
-    assert.equal(databaseText({ report: { checks: { database: { status: 'error', message: 'Database error: locked' } } } }),
-        'Not readable: Database error: locked');
-    assert.equal(databaseText({ loading: true }), LOADING);
-    assert.equal(LOADING, 'Loading…');
-    assert.equal(databaseText({ error: { code: 'busy', running: { id: 'j1', title: 'Restore' } } }), 'Busy: Restore is running.');
-    assert.equal(databaseText({ error: { code: 'busy' } }), 'Busy: another job is running.');
-    assert.equal(databaseText({ error: new Error('offline') }), UNREADABLE);
-    assert.equal(UNREADABLE, 'Could not be read.');
-});
-
-test('sources text follows the precedence table', async () => {
-    const { sourcesText } = await diagnostics;
-    const of = sources => sourcesText({ report: { sources } });
-    assert.equal(of({ configured: 0, effective: 1, watching: 1, unavailable: 0 }), 'ComfyUI output folder · watching');
-    assert.equal(of({ configured: 0, effective: 1, watching: 0, unavailable: 0 }), 'ComfyUI output folder · manual scan');
-    // Unavailable wins over watching.
-    assert.equal(of({ configured: 3, effective: 2, watching: 2, unavailable: 1 }), '3 sources · 1 not available');
-    assert.equal(of({ configured: 2, effective: 2, watching: 2, unavailable: 0 }), '2 sources · 2 watching');
-    assert.equal(of({ configured: 1, effective: 1, watching: 0, unavailable: 0 }), '1 source · 0 watching');
-    assert.equal(of(undefined), 'ComfyUI output folder · manual scan');
-});
-
-test('Viewer.js reads the pinned vendor version', async () => {
-    const { viewerText } = await diagnostics;
-    assert.equal(viewerText({ report: REPORT }), '1.15.2 · pinned vendor');
-    assert.equal(viewerText({ report: {} }), 'unknown · pinned vendor');
-});
-
-test('report filename uses local time', async () => {
-    const { reportFilename } = await diagnostics;
-    assert.equal(reportFilename(new Date(2026, 9, 6, 7, 5)), 'prompt-manager-diagnostics-20261006-0705.json');
-    assert.equal(reportFilename(new Date(2026, 11, 31, 23, 59)), 'prompt-manager-diagnostics-20261231-2359.json');
-});
-
-test('merged report adds only host_renderers', async () => {
-    const { mergeReport } = await diagnostics;
-    const merged = mergeReport(REPORT, 'Detected: Classic (1 ComfyUI window).');
-    assert.deepEqual(Object.keys(merged).sort(), [...Object.keys(REPORT), 'host_renderers'].sort());
-    assert.equal(merged.host_renderers, 'Detected: Classic (1 ComfyUI window).');
-    assert.equal(mergeReport(REPORT, null).host_renderers, null);
-    assert.equal(mergeReport(REPORT, undefined).host_renderers, null);
-    // The server's fields are not changed.
-    assert.equal(merged.sources, REPORT.sources);
-});
-
-test('sizes read as the server labels them (1 KB = 1024 bytes)', async () => {
-    const { sizeText } = await diagnostics;
-    assert.equal(sizeText(0), '0 bytes');
-    assert.equal(sizeText(1), '1 byte');
-    assert.equal(sizeText(1000), '1,000 bytes');
-    assert.equal(sizeText(2048), '2.0 KB');
-    assert.equal(sizeText(10 * 2 ** 20), '10.0 MB');
-    assert.equal(sizeText(1717986918), '1.6 GB');
-    assert.equal(sizeText(undefined), '0 bytes');
-});
-
-test("log line uses the concept's format", async () => {
-    const { logLine } = await diagnostics;
-    assert.equal(logLine({ timestamp: '2026-10-26T09:42:18.123456', level: 'INFO', message: 'Database backup verified' }),
-        '09:42:18 INFO  Database backup verified');
-    assert.equal(logLine({ timestamp: '2026-10-26T09:42:18', level: 'WARNING', message: '3 images have ambiguous prompt metadata' }),
-        '09:42:18 WARNING 3 images have ambiguous prompt metadata');
-    assert.match(logLine({ timestamp: '2026-10-26T09:42:18', level: 'ERROR', message: 'x' }), /^\d\d:\d\d:\d\d [A-Z]+ +\S/);
-    // The concept's sample lines read the same way.
-    assert.ok(CONCEPT.includes('09:42:18 INFO  Scan completed'));
-});
-
-test('Lines accepts whole numbers 1 to 500 only', async () => {
-    const { validLimit, logsUrl } = await diagnostics;
-    for (const [value, expected] of [['1', 1], ['500', 500], [' 20 ', 20], ['100', 100]]) assert.equal(validLimit(value), expected, value);
-    for (const value of ['0', '501', '2.5', '', ' ', '-1', '1e2', 'abc', undefined]) assert.equal(validLimit(value), null, String(value));
-    assert.equal(logsUrl('', 20), '/prompt_manager/logs?limit=20');
-    assert.equal(logsUrl('WARNING', 20), '/prompt_manager/logs?limit=20&level=WARNING');
-});
-
-test('the level filter offers all six minimum levels; the runtime level adds CRITICAL after the concept four', async () => {
-    const { LEVEL_OPTIONS, RUNTIME_LEVELS } = await diagnostics;
-    assert.deepEqual(LEVEL_OPTIONS.map(([, label]) => label), ['All levels', 'DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL']);
-    assert.equal(LEVEL_OPTIONS[0][0], '');
-    assert.deepEqual(RUNTIME_LEVELS, ['INFO', 'WARNING', 'DEBUG', 'ERROR', 'CRITICAL']);
-    assert.ok(CONCEPT.includes('["INFO", "WARNING", "DEBUG", "ERROR"]'));
-});
-
-test('statistics text uses singular forms for one', async () => {
-    const { statsText } = await diagnostics;
-    assert.equal(statsText({ buffer_count: 1000, level_counts: { INFO: 980, WARNING: 12, ERROR: 2, CRITICAL: 1 },
-        log_files_count: 5, total_log_size: 43201024 }), '1,000 entries in memory · 3 errors · 12 warnings · 5 files · 41.2 MB on disk');
-    assert.equal(statsText({ buffer_count: 1, level_counts: { WARNING: 1, CRITICAL: 1 }, log_files_count: 1, total_log_size: 1 }),
-        '1 entry in memory · 1 error · 1 warning · 1 file · 1 byte on disk');
-    assert.equal(statsText({}), '0 entries in memory · 0 errors · 0 warnings · 0 files · 0 bytes on disk');
-});
-
-test('retention, file line and file rows read the server values', async () => {
-    const { retentionText, fileLine, fileDetail } = await diagnostics;
-    assert.equal(retentionText({ max_file_size: 10485760, backup_count: 5, file_logging: true, buffer_size: 1000 }),
-        'Rotates at 10 MB · keeps 5 rotated copies · file logging on · memory buffer 1,000 entries');
-    assert.equal(retentionText({ max_file_size: 1572864, backup_count: 1, file_logging: false, buffer_size: 1 }),
-        'Rotates at 1.5 MB · keeps 1 rotated copy · file logging off · memory buffer 1 entry');
-    const files = [
-        { filename: 'prompt_manager.log', kind: 'active', size: 1468006, modified: '2026-10-26T09:42:18' },
-        { filename: 'prompt_manager.log.1', kind: 'rotated', size: 10485760, modified: '2026-10-25T14:02:00' },
-        { filename: 'prompt_manager.log.4', kind: 'link', size: 20, modified: '2026-10-25T14:02:00' },
-        { filename: 'prompt_manager.log.bak', kind: 'other', size: 0, modified: '2026-10-24T08:00:00' },
-    ];
-    assert.equal(fileLine(files), 'prompt_manager.log · 1.4 MB · rotated copies: 1');
-    assert.equal(fileLine([]), 'prompt_manager.log · not written yet · rotated copies: 0');
-    assert.equal(fileDetail(files[1]), '10.0 MB · 2026-10-25 14:02 · Rotated copy');
-    assert.equal(fileDetail(files[2]), '20 bytes · 2026-10-25 14:02 · Link, not downloaded');
-    assert.equal(fileDetail(files[3]), '0 bytes · 2026-10-24 08:00 · Other file');
-    assert.equal(fileDetail(files[0]), '1.4 MB · 2026-10-26 09:42 · Active log');
-});
-
-test('Clear all logs states both counts and its toast says what was done', async () => {
-    const { clearSentence, clearToast } = await diagnostics;
-    const rotated = size => ({ kind: 'rotated', size });
-    const files = [{ kind: 'active', size: 10 }, rotated(10 * 2 ** 20), rotated(10 * 2 ** 20), rotated(8.4 * 2 ** 20), { kind: 'other', size: 5 }];
-    assert.equal(clearSentence(files), 'Empties prompt_manager.log, deletes 3 rotated copies (28.4 MB) and clears the lines shown '
-        + 'here. The other files in the log folder are kept. This cannot be undone.');
-    assert.equal(clearSentence([{ kind: 'active', size: 1 }]), 'Empties prompt_manager.log and clears the lines shown here. '
-        + 'The other files in the log folder are kept. This cannot be undone.');
-    assert.match(clearSentence(null), /^Empties prompt_manager.log, deletes its rotated copies and clears/);
-    assert.equal(clearToast({ truncated: ['prompt_manager.log', 'prompt_manager.log.1', 'prompt_manager.log.2', 'prompt_manager.log.3'],
-        errors: [] }), 'Logs cleared · 3 rotated copies deleted.');
-    assert.equal(clearToast({ truncated: ['prompt_manager.log', 'prompt_manager.log.1', 'prompt_manager.log.2'],
-        errors: ['Failed to truncate prompt_manager.log.3: in use'] }), 'Logs cleared · 2 rotated copies deleted · 1 could not be deleted.');
-    assert.equal(clearToast({ truncated: ['prompt_manager.log', 'prompt_manager.log.1'], errors: [] }), 'Logs cleared · 1 rotated copy deleted.');
-    assert.equal(clearToast(undefined), 'Logs cleared · 0 rotated copies deleted.');
-});
-
-test('the test-link dialog names the prompt and how Missing-file links removes the record', async () => {
-    const { testLinkSentence, promptName } = await diagnostics;
-    assert.equal(testLinkSentence({ id: 812, text: 'Misty harbor' }), 'Writes a placeholder image record '
-        + '(prompt_manager_test_link.png) linked to prompt #812 “Misty harbor”. Maintenance › Missing-file links removes it later.');
-    assert.equal(promptName({ text: '  a\n  b ' }), 'a b');
-    assert.equal(promptName({ text: 'x'.repeat(80) }).length, 60);
-});
-
-test('runtime values and body map config.level to runtime_level and back', async () => {
-    const { runtimeValues, runtimeBody } = await diagnostics;
-    assert.deepEqual(runtimeValues({ level: 'INFO', console_logging: true, max_file_size: 1 }), { runtime_level: 'INFO', console_logging: true });
-    assert.deepEqual(runtimeBody({ runtime_level: 'CRITICAL' }), { level: 'CRITICAL' });
-    assert.deepEqual(runtimeBody({ console_logging: false }), { console_logging: false });
-    assert.deepEqual(runtimeBody({ runtime_level: 'DEBUG', console_logging: true }), { level: 'DEBUG', console_logging: true });
-    assert.deepEqual(runtimeBody({}), {});
-});

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

@@ -169,44 +169,3 @@ test('a plan with nothing to do offers no Apply (S7 live test)', async () => {
     assert.equal(hasWork({ ...PLAN, scope: {} }), true);
     assert.equal(NOTHING_TO_APPLY, 'There is nothing to apply; nothing was changed.');
 });
-
-// S12 (#329): the rotated-log cleanup plan changes no library record: its Backup reads "Not needed", the review shows no
-// D55 backup box, and its details are files.
-const LOG_PLAN = { operation: 'rotated_logs', token: 't', expires_at: '2026-10-26T23:15:00',
-    scope: { count: 3, label: '3 rotated log copies · 28.4 MB' },
-    protected: { count: 3, reasons: ['Kept: the active log', 'Kept: 1 link', 'Kept: 1 other file'] },
-    backup: { policy: 'none', destination_label: null, expected_bytes: null },
-    media: { deletes_files: true, label: 'Deletes only the listed log files. No image, video or library record changes.' },
-    details: [{ label: 'prompt_manager.log.1', detail: '10.0 MB · 2026-10-25 14:02' }] };
-
-test('a plan without a database change reads Not needed and shows no backup box', async () => {
-    const { planGrid, backupText, backupBox, BACKUP_COPY, OPERATION_TITLES } = await review;
-    assert.equal(backupText({ policy: 'none' }), 'Not needed: no library record changes');
-    assert.deepEqual(planGrid(LOG_PLAN), [
-        ['Scope', '3 rotated log copies · 28.4 MB'],
-        ['Protected', 'Kept: the active log · Kept: 1 link · Kept: 1 other file'],
-        ['Backup', 'Not needed: no library record changes'],
-        ['Media on disk', 'Deletes only the listed log files. No image, video or library record changes.'],
-    ]);
-    const onBackup = () => {};
-    assert.equal(backupBox(LOG_PLAN, onBackup), null);
-    // Every database plan keeps its D55 box.
-    assert.deepEqual(backupBox({ ...LOG_PLAN, operation: 'optimize', backup: { policy: 'required' } }, onBackup), { copy: BACKUP_COPY, onBackup });
-    assert.deepEqual(backupBox({ operation: 'missing_links' }, onBackup), { copy: BACKUP_COPY, onBackup });
-    // Its title heads the dialog and lets Activity offer Review again.
-    assert.equal(OPERATION_TITLES.rotated_logs, 'Rotated log copies');
-});
-
-test('rotated_logs details read Listed files', async () => {
-    const { detailsSummary, detailLines } = await review;
-    assert.equal(detailsSummary(LOG_PLAN, 3), 'Listed files (3)');
-    assert.equal(detailsSummary({ ...LOG_PLAN, scope: { count: 60 } }, 50), 'Listed files (50 of 60)');
-    assert.equal(detailsSummary({ operation: 'missing_links', scope: { count: 2 } }, 2), 'Listed records (2)');
-    assert.deepEqual(detailLines(LOG_PLAN), ['prompt_manager.log.1 · 10.0 MB · 2026-10-25 14:02']);
-});
-
-test('a rotated-log cleanup the log overtook offers Review again (S12)', async () => {
-    const { reviewAgainOf } = await jobView;
-    assert.deepEqual(reviewAgainOf({ kind: 'maintenance', state: 'failed', scope: { operation: 'rotated_logs', failure: 'plan-changed' } }),
-        { operation: 'rotated_logs' });
-});

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

@@ -420,12 +420,3 @@ test('a partial host save keeps what saved, adopts its revision and fails only t
     assert.equal((await drafts.save()).host, 'failed');
     assert.equal(drafts.statusText(), SETTINGS_STATUS.partial);
 });
-
-// S12 (#329): System's runtime domain is the running server's log level and console setting (`/logs/config`).
-test('runtime adapter maps config.level to runtime_level and back', async () => {
-    const { runtimeValues, runtimeBody } = await import('../../web/js/workspace/system-diagnostics.mjs');
-    assert.deepEqual(runtimeValues({ level: 'WARNING', console_logging: false, backup_count: 5 }),
-        { runtime_level: 'WARNING', console_logging: false });
-    assert.deepEqual(runtimeBody({ runtime_level: 'WARNING' }), { level: 'WARNING' });
-    assert.deepEqual(runtimeBody({ runtime_level: 'CRITICAL', console_logging: true }), { level: 'CRITICAL', console_logging: true });
-});

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

@@ -360,23 +360,19 @@ test('Preview tagging review opens the Tag image dialog with the section’s val
     } finally { scope.dispose(); dom.restore(); }
 });
 
-const PLAN = { images: 3, already_tagged: 1, to_tag: 2, estimate_seconds: 3.2, estimate_device: 'cpu', suggestion_limit: 10,
+const PLAN = { images: 3, prompts: 2, already_tagged: 1, to_tag: 1,
     model: { type: 'wd14-swinv2', label: 'WD14 SwinV2', size_label: '~400 MB', downloaded: true }, existing: 'skip',
     review_required: false, backup: { policy: 'on' }, disk: { free_bytes: 10 * 2 ** 30, required_bytes: 2 ** 20, sufficient: true } };
 
-test('the batch review grid, body and Cancel-only reasons (D134, #379, CUJ 4–5)', async () => {
-    const { batchGrid, batchBody, batchCloseNote, existingLabel, REPLACE_NOTE, NOTHING_TO_TAG, NO_IMAGES } = await tagging;
+test('the batch review grid, body and Cancel-only reasons (D134, CUJ 4–5)', async () => {
+    const { batchGrid, batchBody, batchCloseNote, existingLabel, REPLACE_NOTE, NOTHING_TO_TAG, NO_LINKED_IMAGES } = await tagging;
     assert.deepEqual(batchGrid(PLAN, HOST), [['Model', 'WD14 SwinV2 · ~400 MB'], ['Existing tags', 'Skip already tagged'],
-        ['Images', '3'], ['Already auto-tagged', '1'], ['Images to tag', 'about 2'],
-        ['Time', 'about 1 min on a processor; a graphics card can be faster.'],
-        ['Settings', 'General 0.35 · Character 0.85 · up to 10 tags per image'], ['Backup', 'Create and verify before changes']]);
+        ['Images linked', '3'], ['Prompts', '2'], ['Already tagged', '1'], ['Prompts to tag', 'up to 1'],
+        ['Settings', 'General 0.35 · Character 0.85'], ['Backup', 'Create and verify before changes']]);
     const llm = { ...HOST, autotag_model_type: 'gguf' };
-    assert.deepEqual(batchGrid({ ...PLAN, model: { type: 'gguf' }, backup: { policy: 'off' }, estimate_seconds: null,
-        estimate_device: null, suggestion_limit: 4 }, llm).slice(-3),
-    [['Time', 'Language-model engines take longer per image. Activity shows the time left once tagging starts.'],
-        ['Settings', 'Template of 27 characters · up to 4 tags per image'], ['Backup', 'No safety backup (the policy is off)']]);
+    assert.deepEqual(batchGrid({ ...PLAN, model: { type: 'gguf' }, backup: { policy: 'off' } }, llm).slice(-2),
+        [['Settings', 'Template of 27 characters'], ['Backup', 'No safety backup (the policy is off)']]);
     assert.equal(batchGrid({}, HOST)[2][1], '0');
-    assert.equal(batchGrid({}, HOST)[6][1], 'General 0.35 · Character 0.85');
     assert.equal(existingLabel('odd'), 'odd');
     assert.deepEqual(batchBody(HOST), { model_type: 'wd14-swinv2', existing: 'skip',
         options: { general_threshold: 0.35, character_threshold: 0.85 } });
@@ -389,31 +385,9 @@ test('the batch review grid, body and Cancel-only reasons (D134, #379, CUJ 4–5
     assert.equal(batchCloseNote({ ...PLAN, model: { ...PLAN.model, downloaded: false } }), 'WD14 SwinV2 is not downloaded. Download it first.');
     assert.equal(batchCloseNote({ ...PLAN, disk: { free_bytes: 2 ** 20, required_bytes: 2 ** 21, sufficient: false } }),
         'Not enough free disk space: the safety backup needs about 2.0 MB and 1.0 MB is free. Nothing is written until there is room.');
-    assert.equal(batchCloseNote({ ...PLAN, images: 0, to_tag: 0 }), NO_IMAGES);
-    assert.equal(batchCloseNote({ ...PLAN, images: undefined }), NO_IMAGES);
-    assert.equal(NO_IMAGES, 'The output folders contain no images to tag.');
+    assert.equal(batchCloseNote({ ...PLAN, prompts: 0, to_tag: 0 }), NO_LINKED_IMAGES);
     assert.equal(batchCloseNote({ ...PLAN, to_tag: 0 }), NOTHING_TO_TAG);
-    assert.equal(NOTHING_TO_TAG, 'Every output image is already auto-tagged.');
-});
-
-test('the review Time row (DEC11, #379): minutes, hours and the engine it runs on', async () => {
-    const { durationText, timeText, TIME_UNKNOWN } = await tagging;
-    assert.equal(durationText(1), 'about 1 min');
-    assert.equal(durationText(0), 'about 1 min');
-    assert.equal(durationText(89), 'about 89 min');
-    assert.equal(durationText(90), 'about 1 h 30 min');
-    assert.equal(durationText(120), 'about 2 h');
-    assert.equal(durationText(631), 'about 10 h 31 min');
-    assert.equal(durationText(Number.NaN), 'about 1 min');
-    // 23,645 images at 1.6 s on a processor (the design's CUJ 1).
-    assert.equal(timeText({ estimate_seconds: 37832, estimate_device: 'cpu' }),
-        'about 10 h 31 min on a processor; a graphics card can be faster.');
-    assert.equal(timeText({ estimate_seconds: 59, estimate_device: 'gpu' }), 'about 1 min on the graphics card.');
-    assert.equal(timeText({ estimate_seconds: 0, estimate_device: 'cpu' }), 'about 1 min on a processor; a graphics card can be faster.');
-    for (const plan of [{ estimate_seconds: null }, {}, { estimate_seconds: -1 }, { estimate_seconds: Infinity }, null]) {
-        assert.equal(timeText(plan), TIME_UNKNOWN);
-    }
-    assert.equal(TIME_UNKNOWN, 'Language-model engines take longer per image. Activity shows the time left once tagging starts.');
+    assert.equal(NOTHING_TO_TAG, 'Every prompt with an output image is already tagged.');
 });
 
 test('showBatchPlan opens the review with the backup box, or the Cancel-only review', async () => {

tests/local_resolver_cases.py

@@ -26,8 +26,6 @@ VECTORS_PATH = (
     / "local-inspect"
     / "resolver-vectors.json"
 )
-# A case may name the inspected file (#381 saver anchoring); it is no record.
-FILE_NAME = "__file_name"
 # Committed record sets stay small; the large bound cases are built at test time.
 MAX_VECTOR_CHARS = 20_000
 COMMITTED_FUZZ = (0, 60)
@@ -908,60 +906,6 @@ def golden_cases():
             },
         ),
     )
-    # #381: unknown nodes between the prompt and the sampler pass through.
-    try:
-        from tests import unknown_node_graphs
-    except ImportError:  # pragma: no cover - discover -s tests puts tests/ first
-        import unknown_node_graphs
-    for name, graph in unknown_node_graphs.shapes().items():
-        add(f"pass-through-{name}", graph)
-    for name, records in {
-        **unknown_node_graphs.recorded_shapes(),
-        **unknown_node_graphs.review_shapes(),
-    }.items():
-        cases[f"pass-through-{name}"] = records
-    try:
-        from tests import saver_anchor_graphs as anchor
-    except ImportError:  # pragma: no cover - discover -s tests puts tests/ first
-        import saver_anchor_graphs as anchor
-    for name, graph, file_name in [
-        ("branch-3", anchor.branch_bench(), "s45_branch_3_00002_.png"),
-        ("branch-unanchored", anchor.branch_bench(), None),
-        ("branch-no-match", anchor.branch_bench(), "photo_00001_.png"),
-        ("branch-linked", anchor.linked_prefix_bench(), "s45_branch_2_00007_.png"),
-        (
-            "branch-unknown-saver",
-            anchor.branch_bench(saver="VendorSaveImage"),
-            "s45_branch_4_00001.webp",
-        ),
-        ("shared-prefix", anchor.shared_prefix(), "IMG_GEN_00371_.png"),
-        ("same-links", anchor.two_stage_same_conditioning(), "final_00003_.png"),
-        ("same-links-unanchored", anchor.two_stage_same_conditioning(), None),
-        (
-            "other-links",
-            anchor.two_stage_same_conditioning(["91", 0]),
-            "final_00003_.png",
-        ),
-        ("hidden-earlier", anchor.hidden_earlier_prompt(), "out_00001_.png"),
-        (
-            "hidden-override",
-            anchor.hidden_earlier_prompt(override=True),
-            "out_00001_.png",
-        ),
-    ] + [
-        (f"first-stage-{kind}", anchor.first_stage_variant(kind), "final_00003_.png")
-        for kind in (
-            "no-latent",
-            "literal-latent",
-            "missing-latent",
-            "cyclic-latent",
-            "stage-shaped",
-            "detailer",
-        )
-    ]:
-        cases[f"anchor-{name}"] = {"prompt": _dump(graph)}
-        if file_name is not None:
-            cases[f"anchor-{name}"][FILE_NAME] = file_name
     cases["parameters-only"] = {
         "parameters": "a fox\nNegative prompt: blur\nSteps: 20, Sampler: euler"
     }
@@ -1115,8 +1059,7 @@ def boundary_cases():
                 ["7", 0],
                 {
                     "\U0001f600"
-                    # No text and no links: still named, not passed through (#381).
-                    * 70: {"class_type": long_name, "inputs": {"seed": 1}},
+                    * 70: {"class_type": long_name, "inputs": {"text": "x"}},
                     "7": _encode("b"),
                 },
             )
@@ -1444,10 +1387,7 @@ def committed_vectors():
             "name": name,
             "records": records,
             "evidence": inspect_prompt_evidence(
-                {key: value for key, value in records.items() if key != FILE_NAME},
-                None,
-                profile=INSPECTION_PROFILE,
-                file_name=records.get(FILE_NAME),
+                records, None, profile=INSPECTION_PROFILE
             ),
         }
         for name, records in cases.items()

tests/saver_anchor_graphs.py

@@ -1,216 +0,0 @@
-"""Synthetic graphs for saver anchoring and shared-conditioning stages (#381).
-
-``branch_bench`` reproduces the maintainer's ``gpu_unlock_bench`` run: four
-KSampler branches with different prompts, each saved by its own SaveImage whose
-literal prefix names the branch (``bench/run/s45_branch_N``). ``shared_prefix``
-is the dataset run's shape: every branch's saver uses one prefix, so the file
-name cannot name the branch. ``two_stage_same_conditioning`` reproduces the
-ANIMA run: a hires stage whose latent passes an unlisted node and reads the
-same positive and negative links as the first stage. Texts are neutral.
-"""
-
-BRANCH_TEXTS = (
-    "a knit beanie on a wooden table",
-    "an old fishing boat at dawn",
-    "a red vintage car in the rain",
-    "a cozy library with tall shelves",
-)
-NEGATIVE = "blurry, lowres"
-
-
-def _encode(text):
-    return {"class_type": "CLIPTextEncode", "inputs": {"text": text, "clip": ["1", 1]}}
-
-
-def _ksampler(positive, negative, latent, denoise=1.0):
-    return {
-        "class_type": "KSampler",
-        "inputs": {
-            "seed": 1,
-            "steps": 20,
-            "cfg": 7.0,
-            "sampler_name": "euler",
-            "scheduler": "normal",
-            "denoise": denoise,
-            "model": ["1", 0],
-            "positive": positive,
-            "negative": negative,
-            "latent_image": latent,
-        },
-    }
-
-
-def _base():
-    return {
-        "1": {"class_type": "CheckpointLoaderSimple", "inputs": {"ckpt_name": "m"}},
-        "2": {"class_type": "EmptyLatentImage", "inputs": {"width": 64}},
-        "3": _encode(NEGATIVE),
-    }
-
-
-def branch_bench(prefixes=None, saver="SaveImage"):
-    """Four branches; ``prefixes`` replaces each saver's ``filename_prefix``."""
-    prefixes = prefixes or [
-        f"bench/run/s45_branch_{index}" for index in range(1, len(BRANCH_TEXTS) + 1)
-    ]
-    graph = _base()
-    for index, text in enumerate(BRANCH_TEXTS, start=1):
-        base = index * 10
-        graph[str(base)] = _encode(text)
-        graph[str(base + 1)] = _ksampler([str(base), 0], ["3", 0], ["2", 0])
-        graph[str(base + 2)] = {
-            "class_type": "VAEDecode",
-            "inputs": {"samples": [str(base + 1), 0], "vae": ["1", 2]},
-        }
-        graph[str(base + 3)] = {
-            "class_type": saver,
-            "inputs": {
-                "filename_prefix": prefixes[index - 1],
-                "images": [str(base + 2), 0],
-            },
-        }
-    return graph
-
-
-def linked_prefix_bench():
-    """The branch run with each prefix coming from a PrimitiveString."""
-    graph = branch_bench(prefixes=[["90", 0], ["91", 0], ["92", 0], ["93", 0]])
-    for index in range(4):
-        graph[str(90 + index)] = {
-            "class_type": "PrimitiveString",
-            "inputs": {"value": f"bench/run/s45_branch_{index + 1}"},
-        }
-    return graph
-
-
-def shared_prefix():
-    """Every branch saved with one prefix: the file name names no branch."""
-    return branch_bench(prefixes=["dataset/IMG_GEN"] * len(BRANCH_TEXTS))
-
-
-def two_stage_same_conditioning(second_positive=None):
-    """Base and hires stage on the same links; the hires latent passes an
-    unlisted node (``VendorGpuCleaner``), so the stages' lineage is unknown."""
-    graph = _base()
-    graph["90"] = _encode(BRANCH_TEXTS[0])
-    graph["63"] = _ksampler(["90", 0], ["3", 0], ["2", 0])
-    graph["30"] = {
-        "class_type": "VAEDecode",
-        "inputs": {"samples": ["63", 0], "vae": ["1", 2]},
-    }
-    graph["98"] = {
-        "class_type": "SaveImage",
-        "inputs": {"filename_prefix": "draft", "images": ["30", 0]},
-    }
-    graph["110"] = {"class_type": "VendorGpuCleaner", "inputs": {"anything": ["63", 0]}}
-    graph["108"] = {
-        "class_type": "LatentUpscaleBy",
-        "inputs": {
-            "upscale_method": "nearest-exact",
-            "scale_by": 1.2,
-            "samples": ["110", 0],
-        },
-    }
-    graph["114"] = _ksampler(second_positive or ["90", 0], ["3", 0], ["108", 0], 0.5)
-    graph["113"] = {
-        "class_type": "VAEDecode",
-        "inputs": {"samples": ["114", 0], "vae": ["1", 2]},
-    }
-    graph["115"] = {
-        "class_type": "VendorGpuCleaner",
-        "inputs": {"anything": ["113", 0]},
-    }
-    graph["107"] = {
-        "class_type": "SaveImage",
-        "inputs": {"filename_prefix": "final", "images": ["115", 0]},
-    }
-    if second_positive is not None:
-        graph["91"] = _encode(BRANCH_TEXTS[1])
-    return graph
-
-
-def hidden_earlier_prompt(override=False):
-    """Review shape: the skipped same-links stage continues a different prompt.
-
-    10 (cat) -> 11 (dog) -> unlisted LatentBlend -> 13 (dog, same links as 11)
-    -> VAEDecode -> SaveImage ``out``. With ``override``, 11 is a
-    ``KSampler (Efficient)`` with a linked ``script``.
-    """
-    graph = _base()
-    graph["5"] = _encode("cat X")
-    graph["6"] = _encode("dog Y")
-    graph["10"] = _ksampler(["5", 0], ["3", 0], ["2", 0])
-    graph["11"] = _ksampler(["6", 0], ["3", 0], ["10", 0])
-    if override:
-        graph["11"] = _ksampler(["6", 0], ["3", 0], ["2", 0])
-        graph["11"]["class_type"] = "KSampler (Efficient)"
-        graph["11"]["inputs"]["script"] = ["40", 0]
-        graph["40"] = {"class_type": "XY Plot", "inputs": {"grid_spacing": 0}}
-    graph["12"] = {
-        "class_type": "LatentBlend",
-        "inputs": {"samples1": ["11", 0], "samples2": ["2", 0], "blend_factor": 0.5},
-    }
-    graph["13"] = _ksampler(["6", 0], ["3", 0], ["12", 0], 0.5)
-    graph["14"] = {
-        "class_type": "VAEDecode",
-        "inputs": {"samples": ["13", 0], "vae": ["1", 2]},
-    }
-    graph["15"] = {
-        "class_type": "SaveImage",
-        "inputs": {"filename_prefix": "out", "images": ["14", 0]},
-    }
-    return graph
-
-
-def deep_prefixes(chain):
-    """Review shape: two branches whose savers both trace the prefix ``dup``.
-
-    Saver A's prefix runs through ``chain`` DisplayText nodes; saver B's
-    through one more, so a short visit allowance can finish only one trace.
-    """
-    graph = branch_bench(prefixes=[["p0", 0], ["q", 0], "x_1", "x_2"])
-    graph["pz"] = {"class_type": "StringConstant", "inputs": {"string": "dup"}}
-    previous = "pz"
-    for index in range(chain - 1, -1, -1):
-        graph[f"p{index}"] = {
-            "class_type": "DisplayText",
-            "inputs": {"text": [previous, 0]},
-        }
-        previous = f"p{index}"
-    graph["q"] = {"class_type": "DisplayText", "inputs": {"text": ["p0", 0]}}
-    return graph
-
-
-def first_stage_variant(kind):
-    """``two_stage_same_conditioning`` whose first stage (63) is not plain.
-
-    ``no-latent`` drops its latent input (still plain); ``literal-latent``,
-    ``missing-latent``, ``cyclic-latent``, ``stage-shaped`` and ``detailer``
-    each make it something other than a plain first stage, so the later
-    stage stays unattributed.
-    """
-    graph = two_stage_same_conditioning()
-    inputs = graph["63"]["inputs"]
-    if kind == "no-latent":
-        del inputs["latent_image"]
-    elif kind == "literal-latent":
-        inputs["latent_image"] = "latent"
-    elif kind == "missing-latent":
-        inputs["latent_image"] = ["999", 0]
-    elif kind == "cyclic-latent":
-        graph["70"] = {"class_type": "VendorLatentOp", "inputs": {"samples": ["63", 0]}}
-        inputs["latent_image"] = ["70", 0]
-    elif kind == "stage-shaped":
-        graph["70"] = {
-            "class_type": "VendorSampler",
-            "inputs": {
-                "model": ["1", 0],
-                "positive": ["90", 0],
-                "latent_image": ["2", 0],
-            },
-        }
-        inputs["latent_image"] = ["70", 0]
-    elif kind == "detailer":
-        graph["63"]["class_type"] = "FaceDetailer"
-        inputs["image"] = ["30", 0]
-    return graph

tests/test_annotation_schema.py

@@ -35,8 +35,6 @@ REVIEW_TABLES = (
     "media_review_items",
     "media_review_metadata",
 )
-# The auto-tag marks (#379) cite annotation bytes too; an old backup lacks them.
-CITING_TABLES = REVIEW_TABLES + ("media_image_autotags",)
 # The exact DDL the plan pins; the module must produce precisely these objects.
 DDL = {
     METADATA: (
@@ -216,7 +214,7 @@ class AnnotationSchemaTests(unittest.TestCase):
         """
         with closing(sqlite3.connect(path)) as raw, raw:
             raw.execute("PRAGMA foreign_keys=OFF")
-            for table in CITING_TABLES + tuple(reversed(TABLES)):
+            for table in REVIEW_TABLES + tuple(reversed(TABLES)):
                 raw.execute(f"DROP TABLE {table}")
 
     def test_fresh_install_and_reopen_is_idempotent(self):

tests/test_annotations.py

@@ -430,9 +430,7 @@ class ReplaceImageTagsTests(AnnotationTestCase):
             self.assertTrue(
                 self.db.refresh_image_fingerprint(loc, DIGEST_A, SIZE, MTIME + 1)
             )
-            self.assertEqual(
-                self.db.image_tag_locators(self.db.image_tag_ids(["img"], "")), {loc}
-            )
+            list(self.db.iter_image_tag_records())
         self.assertEqual(self.db.get_prompt_by_id(prompt)["tags"], ["prompt-tag"])
 
 
@@ -553,162 +551,14 @@ class CurrentImageTagsTests(AnnotationTestCase):
         self.assertEqual(current, {locators[0]: ["z", "y"], locators[502]: ["x"]})
         lookups = [s for s in statements if "media_annotation_files" in s]
         self.assertEqual(len(lookups), 2)
-        # The tag search finds every record's file by tag id, and the empty
-        # set's file never.
         self.assertEqual(
-            self.db.image_tag_locators(self.db.image_tag_ids(["z", "x"], "")),
-            {locators[0], locators[502]},
+            list(self.db.iter_image_tag_records()),
+            [
+                (locators[0], SIZE, MTIME, ["z", "y"]),
+                (locators[250], SIZE, MTIME + 1, []),
+                (locators[502], SIZE, MTIME + 2, ["x"]),
+            ],
         )
-        self.assertEqual(
-            self.db.current_image_tags({locators[250]: (SIZE, MTIME + 1)}),
-            {locators[250]: []},
-        )
-
-    def test_tag_locators_cover_more_ids_than_one_chunk(self):
-        # A broad text search can match more than 500 names: every id's file
-        # comes back across the chunks.
-        locators = [self.locator(f"t{i:04}.png") for i in range(503)]
-        for i, loc in enumerate(locators):
-            self.replace(loc, tags=[f"name_{i:04}"])
-        ids = self.db.image_tag_ids([], "name_")
-        self.assertEqual(len(ids), 503)
-        self.assertEqual(self.db.image_tag_locators(ids), set(locators))
-
-
-class AutotagMarkTests(AnnotationTestCase):
-    """The auto-tagged mark (#379): per byte record, written with the tags."""
-
-    def marked(self):
-        conn = self.db.model.get_connection()
-        return sorted(
-            row[0] for row in conn.execute("SELECT * FROM media_image_autotags")
-        )
-
-    def byte_id(self, loc, digest=DIGEST_A):
-        conn = self.db.model.get_connection()
-        return conn.execute(
-            "SELECT b.id FROM media_annotation_bytes b JOIN media_annotation_files f "
-            "ON f.id=b.file_id WHERE f.locator=? AND b.sha256=?",
-            (loc, digest),
-        ).fetchone()[0]
-
-    def test_hand_tags_never_mark(self):
-        loc = self.locator("a.png")
-        self.replace(loc, tags=["keeper"])
-        self.add(loc, tags=["more"])
-        self.assertEqual(self.marked(), [])
-        self.assertEqual(self.db.autotag_state({loc: (SIZE, MTIME)}), {loc: False})
-        self.assertEqual(self.db.autotagged_locators(), set())
-
-    def test_model_union_marks_including_replayed_and_empty_results(self):
-        loc = self.locator("a.png")
-        receipt = self.add(loc, tags=["bird"], mark_autotagged=True)
-        self.assertEqual((receipt["added"], receipt["replayed"]), (1, False))
-        self.assertEqual(self.marked(), [self.byte_id(loc)])
-        # A replayed union and an empty result still mark (idempotently).
-        other = self.locator("b.png")
-        self.replace(other, DIGEST_B, ["keeper"])
-        replayed = self.add(other, DIGEST_B, ["KEEPER"], mark_autotagged=True)
-        self.assertTrue(replayed["replayed"])
-        empty = self.locator("c.png")
-        nothing = self.add(empty, tags=[], mark_autotagged=True)
-        self.assertEqual((nothing["tags"], nothing["added"]), ([], 0))
-        self.add(empty, tags=[], mark_autotagged=True)
-        self.assertEqual(
-            self.marked(),
-            sorted(
-                [self.byte_id(loc), self.byte_id(other, DIGEST_B), self.byte_id(empty)]
-            ),
-        )
-        self.assertEqual(
-            self.db.autotag_state(
-                {loc: (SIZE, MTIME), other: (SIZE, MTIME), empty: (SIZE, MTIME)}
-            ),
-            {loc: True, other: True, empty: True},
-        )
-        self.schema_clean()
-
-    def test_empty_union_without_mark_is_refused(self):
-        with self.assertRaises(ValueError):
-            self.add(self.locator("a.png"), tags=[])
-        self.assertEqual(self.counts()["media_annotation_files"], 0)
-
-    def test_tag_limit_union_writes_no_tag_and_no_mark(self):
-        loc = self.locator("a.png")
-        self.replace(loc, tags=[f"t{i}" for i in range(100)])
-        before = self.rows(*ANNOTATION_TABLES, "tags")
-        with self.assertRaises(AnnotationCommandError) as ctx:
-            self.add(loc, tags=["one more"], mark_autotagged=True)
-        self.assertEqual(ctx.exception.code, "tag-limit")
-        self.assertEqual(self.rows(*ANNOTATION_TABLES, "tags"), before)
-        self.assertEqual(self.marked(), [])
-
-    def test_replace_marks_on_saved_and_replayed_receipts_not_on_conflict(self):
-        loc = self.locator("a.png")
-        saved = self.replace(loc, tags=["a"], mark_autotagged=True)
-        self.assertFalse(saved["replayed"])
-        self.assertEqual(self.marked(), [self.byte_id(loc)])
-        other = self.locator("b.png")
-        self.replace(other, DIGEST_B, ["x"])
-        replayed = self.replace(
-            other, DIGEST_B, ["x"], revision=1, mark_autotagged=True
-        )
-        self.assertTrue(replayed["replayed"])
-        third = self.locator("c.png")
-        self.replace(third, tags=["y"])
-        with self.assertRaises(AnnotationCommandError):
-            self.replace(third, tags=["z"], revision=5, mark_autotagged=True)
-        self.assertEqual(
-            self.marked(), sorted([self.byte_id(loc), self.byte_id(other, DIGEST_B)])
-        )
-
-    def test_mark_follows_the_bytes_not_the_file(self):
-        loc = self.locator("a.png")
-        self.add(loc, tags=["bird"], mark_autotagged=True)
-        # The file's bytes changed: the new record is current and unmarked.
-        self.replace(loc, DIGEST_B, ["hand"], mtime_ns=MTIME + 1)
-        self.assertEqual(self.db.autotag_state({loc: (SIZE, MTIME + 1)}), {loc: False})
-        self.assertEqual(self.db.autotag_state({loc: (SIZE, MTIME)}), {loc: True})
-        # The review's estimate counts any marked record of the locator.
-        self.assertEqual(self.db.autotagged_locators(), {loc})
-        missing = self.locator("none.png")
-        self.assertEqual(self.db.autotag_state({missing: (1, 1)}), {missing: False})
-
-    def test_state_and_tags_choose_the_same_current_record(self):
-        loc = self.locator("a.png")
-        # Two records with the same verified fingerprint: the newest wins.
-        self.replace(loc, DIGEST_A, ["old bytes"])
-        with patch.object(
-            annotations_module, "utc_now_iso", return_value="2099-01-01T00:00:00"
-        ):
-            self.add(loc, DIGEST_B, ["new bytes"], mark_autotagged=True)
-        stats = {loc: (SIZE, MTIME)}
-        self.assertEqual(self.db.current_image_tags(stats), {loc: ["new bytes"]})
-        self.assertEqual(self.db.autotag_state(stats), {loc: True})
-        with patch.object(
-            annotations_module, "utc_now_iso", return_value="2199-01-01T00:00:00"
-        ):
-            self.add(loc, DIGEST_A, ["older bytes again"])
-        self.assertEqual(
-            self.db.current_image_tags(stats), {loc: ["old bytes", "older bytes again"]}
-        )
-        self.assertEqual(self.db.autotag_state(stats), {loc: False})
-
-    def test_marks_never_touch_prompt_rows(self):
-        conn = self.db.model.get_connection()
-        prompt_id = self.db.save_prompt("a beach", tags=["beach"])
-        before = [
-            [tuple(row) for row in conn.execute(f"SELECT * FROM {table} ORDER BY 1")]
-            for table in ("prompts", "prompt_tags")
-        ]
-        self.add(self.locator("a.png"), tags=["bird"], mark_autotagged=True)
-        self.replace(self.locator("b.png"), DIGEST_B, ["waves"], mark_autotagged=True)
-        after = [
-            [tuple(row) for row in conn.execute(f"SELECT * FROM {table} ORDER BY 1")]
-            for table in ("prompts", "prompt_tags")
-        ]
-        self.assertIsNotNone(prompt_id)
-        self.assertEqual(after, before)
 
 
 class AnnotationIsolationTests(AnnotationTestCase):

tests/test_api_autotag.py

@@ -1893,15 +1893,13 @@ class TestTagOutputImagesPreview(BatchJobTestCase):
         self.assertEqual(self.service.generate_calls, [])
         self.assertEqual(self.service.load_calls, [])
 
-    async def test_preview_counts_listed_still_images_not_prompts(self):
+    async def test_preview_counts_skip_and_merge(self):
         self._seed()
         skip = await (await self._preview(existing="skip")).json()
-        # t, f1, f2 and m are listed; gone.png is missing, o.png is outside.
         self.assertEqual(
-            {k: skip[k] for k in ("images", "already_tagged", "to_tag")},
-            {"images": 4, "already_tagged": 0, "to_tag": 4},
+            {k: skip[k] for k in ("images", "prompts", "already_tagged", "to_tag")},
+            {"images": 6, "prompts": 5, "already_tagged": 1, "to_tag": 4},
         )
-        self.assertNotIn("prompts", skip)
         self.assertEqual(
             skip["model"],
             {
@@ -1918,7 +1916,7 @@ class TestTagOutputImagesPreview(BatchJobTestCase):
             set(skip["disk"]), {"free_bytes", "required_bytes", "sufficient"}
         )
         merge = await (await self._preview(existing="merge")).json()
-        self.assertEqual(merge["to_tag"], 4)
+        self.assertEqual(merge["to_tag"], 5)
         leaked = [s for s in _strings(skip) if _absolute(s)]
         self.assertEqual(leaked, [])
 
@@ -1926,7 +1924,7 @@ class TestTagOutputImagesPreview(BatchJobTestCase):
         self._seed()
         data = await (await self._preview(existing="replace_after_review")).json()
         self.assertTrue(data["review_required"])
-        self.assertEqual(data["images"], 4)
+        self.assertEqual(data["prompts"], 5)
 
     async def test_preview_refuses_bad_bodies(self):
         for body in (
@@ -1981,6 +1979,119 @@ class TestTagOutputImagesJob(BatchJobTestCase):
             "WD14 ViT is not downloaded. Download it in System › Auto-tagging.",
         )
 
+    async def test_job_writes_what_legacy_writes(self):
+        ids = self._seed()
+        await self._run_job(existing="skip")
+        native = {name: sorted(self._tags(pid)) for name, pid in ids.items()}
+        # The same library through the legacy batch, in a fresh database.
+        for name, pid in ids.items():
+            self.api.db.update_prompt_metadata(
+                pid,
+                tags=(
+                    ["existing"]
+                    if name == "tagged"
+                    else (["auto-scanned"] if name == "marked" else [])
+                ),
+            )
+        resp = await self.client.post(
+            "/prompt_manager/autotag/start?model_type=wd14-vit&skip_tagged=true"
+        )
+        self.assertEqual(self._sse_events(await resp.text())[-1]["type"], "complete")
+        legacy = {name: sorted(self._tags(pid)) for name, pid in ids.items()}
+        self.assertEqual(native, legacy)
+        self.assertEqual(native["tagged"], ["existing"])
+        self.assertEqual(native["fresh"], ["1girl", "smile"])
+
+    async def test_job_outcomes_follow_the_mapping(self):
+        ids = self._seed()
+        self.api.db.update_prompt_metadata(
+            ids["marked"], tags=["auto-scanned", "1girl", "smile"]
+        )
+
+        def details(job):
+            return {
+                group: sorted(row["detail"] for row in rows)
+                for group, rows in job.outcomes.items()
+            }
+
+        merged = await self._run_job(existing="merge")
+        self.assertEqual(merged.state, "finished")
+        self.assertEqual(
+            details(merged),
+            {
+                "tagged": ["Added 2 tags", "Added 2 tags"],
+                "unchanged": ["No new tags"],
+                "skipped": [
+                    "File not found",
+                    "Outside the output folders",
+                    "Prompt handled by another image",
+                ],
+                "errors": [],
+            },
+        )
+        self.assertEqual(merged.status_line, "Tagged 2 prompts")
+
+        skipped = await self._run_job(existing="skip")
+        self.assertEqual(details(skipped)["tagged"], [])
+        self.assertEqual(details(skipped)["skipped"].count("Prompt already tagged"), 3)
+        self.assertEqual(skipped.status_line, "Tagged 0 prompts")
+
+    async def test_tagging_errors_are_fixed_strings(self):
+        self._seed()
+        self.service.generate_error = RuntimeError("/srv/secret/model exploded")
+        job = await self._run_job(existing="merge")
+        self.assertTrue(job.outcomes["errors"])
+        self.assertEqual(
+            {r["detail"] for r in job.outcomes["errors"]}, {"Tagging failed"}
+        )
+        self.assertNotIn("/srv/secret", json.dumps(job.report()))
+
+    async def test_job_progress_is_determinate(self):
+        self._seed()
+        seen = []
+        original = self.service.generate_tags
+
+        def generate(*args, **kwargs):
+            job = self.api._jobs.active("autotag")
+            seen.append((job.processed, job.total))
+            return original(*args, **kwargs)
+
+        self.service.generate_tags = generate
+        job = await self._run_job(existing="merge")
+        self.assertEqual((job.processed, job.total, job.progress), (6, 6, 100))
+        self.assertTrue(all(total == 6 for _p, total in seen[1:]), seen)
+        self.assertTrue(job.cancellable)
+
+    async def test_job_cancel_stops_before_the_next_image_and_keeps_writes(self):
+        ids = self._seed()
+        started = threading.Event()
+        proceed = threading.Event()
+        calls = []
+
+        def slow(image_path, **kwargs):
+            calls.append(image_path)
+            started.set()
+            proceed.wait(30)
+            return ["slow"]
+
+        self.service.generate_tags = slow
+        resp = await self._start_job(existing="merge")
+        job = self.api._jobs.get((await resp.json())["job"]["id"])
+        try:
+            await asyncio.get_running_loop().run_in_executor(None, started.wait, 30)
+            cancel = await self.client.post(f"/prompt_manager/jobs/{job.id}/cancel")
+            self.assertTrue((await cancel.json())["cancellation_requested"])
+        finally:
+            proceed.set()
+        await asyncio.wait_for(asyncio.shield(job.task), 30)
+        self.assertEqual(job.state, "cancelled")
+        self.assertEqual(job.status_line, "Cancelled. Tags already added were kept.")
+        self.assertEqual(len(calls), 1)
+        tagged = [n for n, pid in ids.items() if "slow" in self._tags(pid)]
+        self.assertEqual(len(tagged), 1)
+        self.assertIsNone(model_gate.holder())
+        self.assertEqual(self.service.unload_calls, 0)
+
     async def test_job_refused_while_legacy_batch_holds(self):
         async with self.api._jobs.hold(
             "autotag", "Tag output images (legacy page)", admission="records"
@@ -1992,6 +2103,41 @@ class TestTagOutputImagesJob(BatchJobTestCase):
         self.assertEqual(data["running"]["title"], "Tag output images (legacy page)")
         self.assertIsNone(model_gate.holder())
 
+    async def test_legacy_refused_while_job_runs(self):
+        self._seed()
+        started, proceed = threading.Event(), threading.Event()
+
+        def slow(image_path, **kwargs):
+            started.set()
+            proceed.wait(30)
+            return ["slow"]
+
+        self.service.generate_tags = slow
+        resp = await self._start_job(existing="merge")
+        job = self.api._jobs.get((await resp.json())["job"]["id"])
+        try:
+            await asyncio.get_running_loop().run_in_executor(None, started.wait, 30)
+            self.assertTrue(model_gate.holder().startswith("autotag-job:"))
+            legacy = await self.client.post("/prompt_manager/autotag/start")
+            # Both legacy pages read a stream: the refusal is one error frame
+            # that names the running job.
+            self.assertEqual(legacy.status, 200)
+            self.assertEqual(
+                self._sse_events(await legacy.text()),
+                [
+                    {
+                        "type": "error",
+                        "status": "error",
+                        "message": "Tag output images already running",
+                    }
+                ],
+            )
+            unload = await self.client.post("/prompt_manager/autotag/unload")
+            self.assertEqual((await unload.json())["operation"], "Tag output images")
+        finally:
+            proceed.set()
+        await asyncio.wait_for(asyncio.shield(job.task), 30)
+
     async def test_job_releases_gate_when_start_is_refused(self):
         class Running:
             id = "other"
@@ -2039,7 +2185,7 @@ class TestTagOutputImagesJob(BatchJobTestCase):
             ("database folder", "the safety backup", 10, 1),
             10,
         )
-        with patch("py.api.image_tag_jobs.disk_plan", return_value=short):
+        with patch("py.api.autotag_routes.disk_plan", return_value=short):
             resp = await self._start_job()
         data = await resp.json()
         self.assertEqual(resp.status, 507)
@@ -2057,6 +2203,14 @@ class TestTagOutputImagesJob(BatchJobTestCase):
         inside = [row for row in rows if row["root_index"] == 0]
         self.assertTrue(inside)
 
+    async def test_native_batch_leaves_custom_prompt_unchanged(self):
+        self._seed()
+        self.service.custom_prompt = "legacy page prompt"
+        await self._run_job(existing="merge", model_type="gguf")
+        self.assertEqual(self.service.custom_prompt, "legacy page prompt")
+        prompts = {call[1] for call in self.service.generate_calls}
+        self.assertEqual(prompts, {"Tags please."})
+
 
 # The legacy batch's per-image frames over BatchJobTestCase's library, newest
 # first, with every throttle check passing (pinned from main's generator).
@@ -2188,7 +2342,7 @@ class TestTagOutputImagesEdges(BatchJobTestCase):
     async def test_unexpected_error_fails_the_job_with_a_reason(self):
         self._seed()
         with patch.object(
-            self.api, "_autotag_prepass", side_effect=RuntimeError("/srv/x")
+            self.api.db, "autotag_batch_candidates", side_effect=[[], RuntimeError("x")]
         ):
             job = await self._run_job(existing="merge")
         self.assertEqual(job.state, "failed")

tests/test_api_core.py

@@ -1,6 +1,5 @@
 """Tests for the core API module (py/api/__init__.py): helpers and base routes."""
 
-import asyncio
 import json
 import os
 import shutil
@@ -166,19 +165,8 @@ class TestGzipMiddleware(AioHTTPTestCase):
             await resp.write_eof()
             return resp
 
-        async def declared_length(request):
-            # The log download (#329) declares its length before the middleware
-            # compresses it.
-            body = b"x" * 3000
-            return web.Response(
-                body=body,
-                content_type="text/plain",
-                headers={"Content-Length": str(len(body))},
-            )
-
         app = web.Application(middlewares=[api_module._gzip_middleware])
         app.router.add_get("/prompt_manager/big", big_json)
-        app.router.add_get("/prompt_manager/declared", declared_length)
         app.router.add_get("/prompt_manager/small", small_json)
         app.router.add_get("/prompt_manager/encoded", already_encoded)
         app.router.add_get("/prompt_manager/binary", binary)
@@ -205,18 +193,6 @@ class TestGzipMiddleware(AioHTTPTestCase):
 
         self.assertIn(b'"data"', gzip.decompress(await resp.read()))
 
-    async def test_compressed_body_declares_its_own_length(self):
-        # A stale Content-Length (the uncompressed size) makes a browser wait
-        # for bytes that never come (#329: Download log hung on any log > 1 KB).
-        resp = await self._get("/prompt_manager/declared")
-        self.assertEqual(resp.headers.get("Content-Encoding"), "gzip")
-        # Bounded: a stale length would otherwise wait for the missing bytes.
-        body = await asyncio.wait_for(resp.read(), timeout=10)
-        self.assertEqual(int(resp.headers["Content-Length"]), len(body))
-        import gzip
-
-        self.assertEqual(gzip.decompress(body), b"x" * 3000)
-
     async def test_small_body_not_compressed(self):
         resp = await self._get("/prompt_manager/small")
         self.assertIsNone(resp.headers.get("Content-Encoding"))

tests/test_api_diagnostics_report.py

@@ -1,409 +0,0 @@
-"""The shareable diagnostic report (#329, py/api/diagnostics_report.py).
-
-``GET /prompt_manager/system/diagnostics`` builds the report on the server
-from an explicit list of fields: the project version, the four legacy checks,
-public paths only and no secret. A scrub replaces anything that still looks
-like an absolute path or holds the CivitAI key and counts it in ``redacted``;
-these tests require ``redacted == 0`` so a builder mistake fails instead of
-being hidden.
-"""
-
-import json
-import ntpath
-import os
-import posixpath
-import re
-import sqlite3
-import sys
-import unittest
-from unittest import mock
-from unittest.mock import MagicMock
-
-_mock_server = MagicMock()
-_mock_server.PromptServer.instance.routes = MagicMock()
-sys.modules.setdefault("server", _mock_server)
-
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-from py.api import admin, diagnostics_report  # noqa: E402
-from py.api.diagnostics_report import OUTSIDE, report_path, scrub  # noqa: E402
-from py.config import (
-    GalleryConfig,
-    IntegrationConfig,
-    PromptManagerConfig,
-)  # noqa: E402
-
-try:
-    from tests.test_api_log_cleanup import LogCleanupTestCase  # noqa: E402
-except ImportError:  # discovered with tests/ as the top-level directory
-    from test_api_log_cleanup import LogCleanupTestCase  # noqa: E402
-
-REPORT = "/prompt_manager/system/diagnostics"
-KEY = "civitai-secret-0123456789abcdef"
-SEEDED_PATHS = (
-    "/home/someone/private/LoraManager",
-    "/srv/someone/renders",
-    "C:\\Users\\someone\\Documents\\renders",
-    "D:/Users/someone/prompts.db",
-    "\\\\nas\\share\\someone\\renders",
-)
-_WINDOWS_ABSOLUTE = re.compile(r"^[A-Za-z]:[\\/]")
-TOP_KEYS = {
-    "success",
-    "generated_at",
-    "version",
-    "python",
-    "platform",
-    "viewerjs",
-    "checks",
-    "database_info",
-    "sources",
-    "logging",
-    "health",
-    "config",
-    "redacted",
-}
-CONFIG = {
-    "database": {"enable_duplicate_detection", "enable_auto_save"},
-    "web_ui": {
-        "result_timeout",
-        "show_test_button",
-        "webui_display_mode",
-        "infinite_scroll",
-    },
-    "performance": {
-        "max_search_results",
-        "enable_fuzzy_search",
-        "auto_backup_interval",
-        "worker_threads",
-    },
-    "gallery": {
-        "processing_delay",
-        "prompt_timeout",
-        "cleanup_interval",
-        "auto_cleanup_missing_files",
-        "max_image_age_days",
-        "max_concurrent_processing",
-        "metadata_extraction_timeout",
-    },
-    "integrations": {"lora_manager_enabled", "has_civitai_api_key"},
-}
-
-
-def _strings(value):
-    if isinstance(value, str):
-        yield value
-    elif isinstance(value, dict):
-        for key, item in value.items():
-            yield str(key)
-            yield from _strings(item)
-    elif isinstance(value, (list, tuple)):
-        for item in value:
-            yield from _strings(item)
-
-
-class DiagnosticsReportTestCase(LogCleanupTestCase):
-    """The admin app with its logger manager on a temporary log folder."""
-
-    async def get_application(self):
-        app = await super().get_application()
-        saved = IntegrationConfig.get_config()
-        self.addCleanup(IntegrationConfig.update_config, saved)
-        return app
-
-    async def report(self, status=200):
-        response = await self.client.request("GET", REPORT)
-        text = await response.text()
-        self.assertEqual(response.status, status, text)
-        return json.loads(text), text
-
-    def seed_secrets(self):
-        IntegrationConfig.update_config(
-            {
-                "lora_manager": {
-                    "enabled": True,
-                    "path": SEEDED_PATHS[0],
-                    "civitai_api_key": KEY,
-                }
-            }
-        )
-        GalleryConfig.MONITORING_DIRECTORIES = list(SEEDED_PATHS[1:3]) + [
-            SEEDED_PATHS[4]
-        ]
-        PromptManagerConfig.update_config(
-            {"database": {"default_path": SEEDED_PATHS[3]}}
-        )
-
-    def assert_no_paths_or_key(self, report, text):
-        self.assertNotIn(KEY, text)
-        self.assertNotIn(self.tmpdir, text)
-        self.assertNotIn(self.tmpdir.replace("\\", "/"), text)
-        for seeded in SEEDED_PATHS:
-            self.assertNotIn(seeded, text)
-            self.assertNotIn(json.dumps(seeded)[1:-1], text)
-        self.assertNotIn("someone", text)
-        for value in _strings(report):
-            self.assertFalse(posixpath.isabs(value), value)
-            self.assertFalse(ntpath.isabs(value), value)
-            self.assertIsNone(_WINDOWS_ABSOLUTE.match(value), value)
-            self.assertFalse(value.startswith("\\\\"), value)
-
-
-class TestReport(DiagnosticsReportTestCase):
-    async def test_report_has_version_viewerjs_and_the_four_checks(self):
-        report, _text = await self.report()
-        self.assertEqual(set(report), TOP_KEYS)
-        self.assertTrue(report["success"])
-        with open(
-            os.path.join(os.path.dirname(os.path.dirname(__file__)), "pyproject.toml"),
-            encoding="utf-8",
-        ) as handle:
-            version = re.search(r'version\s*=\s*["\']([^"\']+)["\']', handle.read())
-        self.assertEqual(report["version"], version.group(1))
-        self.assertRegex(report["viewerjs"], r"^\d+\.\d+\.\d+$")
-        self.assertRegex(report["python"], r"^3\.\d+\.\d+")
-        self.assertEqual(set(report["platform"]), {"system", "release"})
-        self.assertEqual(
-            set(report["checks"]),
-            {"database", "dependencies", "comfyui_output", "image_monitor"},
-        )
-        self.assertEqual(report["checks"]["database"]["status"], "ok")
-        self.assertEqual(
-            set(report["sources"]),
-            {"configured", "effective", "watching", "unavailable"},
-        )
-        self.assertEqual(set(report["logging"]), {"config", "stats"})
-        self.assertIsNone(report["health"])
-        self.assertEqual(report["redacted"], 0)
-        self.assertRegex(report["generated_at"], r"^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\d$")
-
-    async def test_report_has_no_secret_or_absolute_path(self):
-        self.seed_secrets()
-        with mock.patch.object(
-            admin.sqlite3,
-            "connect",
-            side_effect=sqlite3.DatabaseError("file is not a database"),
-        ):
-            report, text = await self.report()
-        self.assertEqual(report["checks"]["database"]["status"], "error")
-        self.assertTrue(report["config"]["integrations"]["has_civitai_api_key"])
-        self.assertTrue(report["config"]["integrations"]["lora_manager_enabled"])
-        self.assertEqual(report["sources"]["configured"], 3)
-        self.assert_no_paths_or_key(report, text)
-        self.assertEqual(report["redacted"], 0)
-
-    async def test_report_leaves_get_config_unchanged(self):
-        self.seed_secrets()
-        before = json.dumps(PromptManagerConfig.get_config(), sort_keys=True)
-        directories = GalleryConfig.MONITORING_DIRECTORIES
-        await self.report()
-        self.assertEqual(
-            json.dumps(PromptManagerConfig.get_config(), sort_keys=True), before
-        )
-        self.assertIs(GalleryConfig.MONITORING_DIRECTORIES, directories)
-        self.assertEqual(IntegrationConfig.CIVITAI_API_KEY, KEY)
-
-    def test_outside_path_reads_outside_comfyui(self):
-        inside = os.path.join(str(self.comfy_dir), "user", "__promptmanager", "logs")
-        self.assertEqual(report_path(inside), "user/__promptmanager/logs")
-        self.assertEqual(
-            report_path(os.path.join(str(self.outside_dir), "vito")), "outside ComfyUI"
-        )
-        self.assertEqual(report_path(""), "")
-        self.assertEqual(report_path(None), "")
-
-    def test_a_filesystem_root_anchor_never_makes_a_path_public(self):
-        # --output-directory /renders makes "/" an anchor; a path outside
-        # ComfyUI must still read "outside ComfyUI", never "home/<user>/...".
-        root = os.path.abspath(os.sep)
-        anchors = [str(self.comfy_dir), root]
-        with mock.patch.object(GalleryConfig, "path_anchors", return_value=anchors):
-            self.assertEqual(
-                report_path(os.path.join(str(self.outside_dir), "x")), OUTSIDE
-            )
-            self.assertEqual(
-                report_path(os.path.join(str(self.comfy_dir), "output")), "output"
-            )
-
-    def test_scrub_removes_the_home_folder_without_its_root(self):
-        home = os.path.expanduser("~")
-        relative = os.path.splitdrive(home)[1].lstrip("\\/").replace("\\", "/")
-        cleaned = scrub({"a": f"{relative}/area/prompts.db", "redacted": 0}, None)
-        self.assertEqual(cleaned, {"a": "[removed]", "redacted": 1})
-
-    def test_the_home_folder_is_matched_as_a_whole_path_part(self):
-        with mock.patch.object(
-            diagnostics_report.os.path, "expanduser", return_value="/root"
-        ):
-            cleaned = scrub(
-                {
-                    "a": "output/rootfiles",
-                    "b": "output/root/x",
-                    "c": "see /root/x",
-                    "redacted": 0,
-                },
-                None,
-            )
-        self.assertEqual(cleaned["a"], "output/rootfiles")
-        # The home folder's name is a whole path part here: removed.
-        self.assertEqual(cleaned["b"], "[removed]")
-        self.assertEqual(cleaned["c"], "[removed]")
-        self.assertEqual(cleaned["redacted"], 2)
-
-    async def test_report_reads_only_the_temporary_log_folder(self):
-        self.write("prompt_manager.log.1", b"x" * 1234)
-        report, _text = await self.report()
-        stats = report["logging"]["stats"]
-        self.assertEqual(stats["log_files_count"], 2)
-        self.assertEqual(
-            stats["total_log_size"],
-            1234 + os.path.getsize(self.path("prompt_manager.log")),
-        )
-
-    def test_an_ancestor_of_home_is_never_an_anchor_on_linux(self):
-        anchored = diagnostics_report.anchored_path
-        home = "/home/someone"
-        anchors = ["/home", "/opt/ComfyUI"]
-        self.assertEqual(
-            anchored("/home/someone/renders/a.png", anchors, home, posixpath), OUTSIDE
-        )
-        self.assertEqual(
-            anchored("/home/other/renders", anchors, home, posixpath), OUTSIDE
-        )
-        self.assertEqual(
-            anchored("/opt/ComfyUI/output", anchors, home, posixpath), "output"
-        )
-
-    def test_an_ancestor_of_home_is_never_an_anchor_on_windows(self):
-        anchored = diagnostics_report.anchored_path
-        home = ntpath.normcase("C:\\Users\\someone")
-        anchors = [ntpath.normcase(a) for a in ("C:\\Users", "C:\\", "D:\\ComfyUI")]
-        path = ntpath.normcase("C:\\Users\\someone\\renders\\a.png")
-        self.assertEqual(anchored(path, anchors, home, ntpath), OUTSIDE)
-        inside = ntpath.normcase("D:\\ComfyUI\\output\\x")
-        self.assertEqual(anchored(inside, anchors, home, ntpath), "output/x")
-
-    def test_an_anchor_that_is_home_names_no_user(self):
-        anchored = diagnostics_report.anchored_path
-        home = "/home/someone"
-        self.assertEqual(
-            anchored("/home/someone/ComfyUI/output", [home], home, posixpath),
-            "ComfyUI/output",
-        )
-        self.assertEqual(
-            anchored(
-                "/home/someone/ComfyUI/output",
-                [home, "/home/someone/ComfyUI"],
-                home,
-                posixpath,
-            ),
-            "output",
-        )
-
-    def test_the_home_folder_name_is_removed_only_from_paths(self):
-        with mock.patch.object(
-            diagnostics_report.os.path, "expanduser", return_value="/home/info"
-        ):
-            cleaned = scrub({"level": "INFO", "p": "logs/info/x", "redacted": 0}, None)
-        self.assertEqual(cleaned, {"level": "INFO", "p": "[removed]", "redacted": 1})
-
-    def test_scrub_removes_the_home_folder_name(self):
-        with mock.patch.object(
-            diagnostics_report.os.path, "expanduser", return_value="/home/someone"
-        ):
-            cleaned = scrub(
-                {"a": "someone/renders", "b": "someones", "redacted": 0}, None
-            )
-        self.assertEqual(cleaned["a"], "[removed]")
-        self.assertEqual(cleaned["b"], "someones")
-
-    def test_scrub_removes_a_leaked_path_and_counts_it(self):
-        leaked = {
-            "a": "/home/someone/x",
-            "b": ["C:\\Users\\someone", "D:/data", "\\\\nas\\share", "ok"],
-            "c": {"d": f"token {KEY} here", "e": 3, "f": None, "g": "relative/path"},
-            "redacted": 0,
-        }
-        cleaned = scrub(leaked, KEY)
-        self.assertEqual(cleaned["redacted"], 5)
-        self.assertEqual(cleaned["a"], "[removed]")
-        self.assertEqual(cleaned["b"], ["[removed]"] * 3 + ["ok"])
-        self.assertEqual(
-            cleaned["c"], {"d": "[removed]", "e": 3, "f": None, "g": "relative/path"}
-        )
-        # A short key is not searched for (it would match ordinary words).
-        self.assertEqual(scrub({"x": "abc", "redacted": 0}, "abc")["redacted"], 0)
-
-    async def test_report_refused_while_exclusive_job_runs(self):
-        async with self.api._jobs.hold(
-            "restore", "Database restore", admission="exclusive"
-        ) as restore:
-            report, _text = await self.report(status=409)
-        self.assertEqual(report["code"], "busy")
-        self.assertEqual(
-            report["running"], {"id": restore.id, "title": "Database restore"}
-        )
-
-    async def test_report_lists_config_only_keys(self):
-        self.seed_secrets()
-        report, _text = await self.report()
-        self.assertEqual({k: set(v) for k, v in report["config"].items()}, CONFIG)
-        self.assertNotIn("default_path", json.dumps(report["config"]))
-        self.assertNotIn("directories", json.dumps(report["config"]))
-        self.assertNotIn(
-            "civitai_api_key",
-            json.dumps(report["config"]).replace("has_civitai_api_key", ""),
-        )
-
-    async def test_report_logging_has_public_directory(self):
-        report, _text = await self.report()
-        stats = report["logging"]["stats"]
-        self.assertFalse(posixpath.isabs(stats["log_directory"]))
-        self.assertIn("level", report["logging"]["config"])
-
-    async def test_report_survives_an_unreadable_viewerjs_provenance(self):
-        with mock.patch.object(
-            diagnostics_report,
-            "VIEWERJS_PROVENANCE",
-            os.path.join(self.tmpdir, "nope.json"),
-        ):
-            report, _text = await self.report()
-        self.assertEqual(report["viewerjs"], "unknown")
-
-    async def test_a_build_failure_is_coded_without_details(self):
-        with mock.patch.object(
-            self.api, "build_report", side_effect=RuntimeError(self.tmpdir)
-        ):
-            with self.assertLogs("prompt_manager", "ERROR"):
-                report, text = await self.report(status=500)
-        self.assertNotIn(self.tmpdir, text)
-        self.assertFalse(report["success"])
-
-
-class TestLegacyDiagnostics(DiagnosticsReportTestCase):
-    async def test_legacy_diagnostics_keeps_its_four_checks(self):
-        response = await self.client.request("GET", "/prompt_manager/diagnostics")
-        data = await response.json()
-        self.assertEqual(response.status, 200)
-        self.assertEqual(set(data), {"success", "diagnostics"})
-        self.assertEqual(
-            set(data["diagnostics"]),
-            {"database", "dependencies", "comfyui_output", "image_monitor"},
-        )
-        report, _text = await self.report()
-        self.assertEqual(report["checks"]["database"], data["diagnostics"]["database"])
-        self.assertEqual(
-            report["checks"]["dependencies"], data["diagnostics"]["dependencies"]
-        )
-
-    async def test_both_routes_build_their_checks_with_one_helper(self):
-        with mock.patch.object(
-            admin, "legacy_checks", wraps=admin.legacy_checks
-        ) as spy:
-            await self.client.request("GET", "/prompt_manager/diagnostics")
-            await self.report()
-        self.assertEqual(spy.call_count, 2)
-
-
-if __name__ == "__main__":
-    unittest.main()

tests/test_api_images.py

@@ -9,11 +9,9 @@ import asyncio
 import json
 import os
 import pathlib
-import shutil
 import sys
 import tempfile
 import threading
-import time
 import types
 import unittest
 from contextlib import ExitStack
@@ -38,8 +36,6 @@ from PIL import Image  # noqa: E402
 from database.operations import PromptDatabase  # noqa: E402
 import py.api.images as images_module
 from py.api import gallery_listing  # noqa: E402
-from py import lora_utils  # noqa: E402
-from py import lora_manager_layout as layout_module  # noqa: E402
 from py.api.thumbnail_settings import ThumbnailSettings  # noqa: E402
 from py.api import PromptManagerAPI  # noqa: E402
 from py.api.prompts import MAX_PAGE_LIMIT  # noqa: E402
@@ -115,25 +111,13 @@ class ImageAPITestCase(AioHTTPTestCase):
         self.assertGreater(image_id, 0, "fixture: image link failed")
         return image_id
 
-    def _make_symlink(self, target, link, target_is_directory=False):
+    def _make_symlink(self, target, link):
         """Create a symlink or skip the test when the platform refuses."""
         try:
-            os.symlink(str(target), str(link), target_is_directory=target_is_directory)
+            os.symlink(str(target), str(link))
         except (OSError, NotImplementedError, AttributeError) as exc:
             self.skipTest(f"symlinks unavailable: {exc}")
 
-    def _spy_executor(self):
-        """Record the __name__ of every callable sent to _run_in_executor."""
-        original = self.api._run_in_executor
-        calls = []
-
-        async def spy(func, *args, **kwargs):
-            calls.append(getattr(func, "__name__", repr(func)))
-            return await original(func, *args, **kwargs)
-
-        self.api._run_in_executor = spy
-        return calls
-
 
 class TestServeOutputImage(ImageAPITestCase):
     """GET /prompt_manager/images/serve/{filepath}"""
@@ -404,6 +388,18 @@ class ThumbnailTestCase(ImageAPITestCase):
 
     PROGRESS_URL = "/prompt_manager/images/generate-thumbnails/progress"
 
+    def _spy_executor(self):
+        """Record the __name__ of every callable sent to _run_in_executor."""
+        original = self.api._run_in_executor
+        calls = []
+
+        async def spy(func, *args, **kwargs):
+            calls.append(getattr(func, "__name__", repr(func)))
+            return await original(func, *args, **kwargs)
+
+        self.api._run_in_executor = spy
+        return calls
+
     def _thumb_path(self, name, suffix=".webp"):
         return self.output_dir / "thumbnails" / f"{name}_thumb{suffix}"
 
@@ -1220,13 +1216,6 @@ def _raise(*_args, **_kwargs):
 class ImageRouteCoverageCase(ImageAPITestCase):
     """Helpers for driving success and failure branches of each route."""
 
-    def setUp(self):
-        # #362: the LoraManager layout cache is per process; every test here
-        # starts and ends with it empty (runs before the subclasses' setUpAsync).
-        super().setUp()
-        lora_utils.clear_layout_cache()
-        self.addCleanup(lora_utils.clear_layout_cache)
-
     def _break_db(self, db_method):
         setattr(self.api.db, db_method, _raise)
 
@@ -1338,9 +1327,6 @@ class TestServeErrorBranches(ImageRouteCoverageCase):
                 )
                 self.assertEqual(resp.status, 200)
 
-            # The cache does not watch default_lora_roots (#362): without a
-            # clear the next request would reuse the folders above.
-            lora_utils.clear_layout_cache()
             with (
                 patch.object(IntegrationConfig, "LORA_MANAGER_ENABLED", True),
                 patch.object(IntegrationConfig, "LORA_MANAGER_PATH", ""),
@@ -1433,39 +1419,32 @@ class TestLoraManagerMediaServing(ImageRouteCoverageCase):
         self.cache = root / "cache"
         for folder in (self.sidecars, self.examples, self.cache):
             folder.mkdir()
-        self.root = root
         self.write_settings(str(self.sidecars))
         self.enabled = patch.object(IntegrationConfig, "LORA_MANAGER_ENABLED", True)
-        self.default_roots = patch("py.lora_utils.default_lora_roots", return_value=[])
         for item in (
             self.enabled,
             patch.object(IntegrationConfig, "LORA_MANAGER_PATH", str(self.lm)),
             patch(
                 "py.lora_utils.custom_nodes_directories", return_value=[custom_nodes]
             ),
-            self.default_roots,
+            patch("py.lora_utils.default_lora_roots", return_value=[]),
             patch("py.lora_utils.get_lora_image_cache_dir", return_value=self.cache),
             patch.dict(os.environ, {"LORA_MANAGER_SETTINGS_DIR": str(self.settings)}),
         ):
             item.start()
             self.addCleanup(item.stop)
 
-    def write_settings(self, sidecar_root, examples=None):
-        path = self.settings / "settings.json"
-        path.write_text(
+    def write_settings(self, sidecar_root):
+        (self.settings / "settings.json").write_text(
             json.dumps(
                 {
                     "sidecar_storage_mode": "centralized",
                     "sidecar_storage_path": sidecar_root,
-                    "example_images_path": str(examples or self.examples),
+                    "example_images_path": str(self.examples),
                     "civitai_api_key": "never-served",
                 }
             )
         )
-        # Ten seconds old, so the layout cache (real clock here) stores the
-        # first load instead of treating the file as being written (#362).
-        stamp = time.time_ns() - 10 * 10**9
-        os.utime(path, ns=(stamp, stamp))
 
     async def _status(self, image_id):
         resp = await self.client.request(
@@ -1485,65 +1464,11 @@ class TestLoraManagerMediaServing(ImageRouteCoverageCase):
 
         for image_id in ids:
             self.assertEqual(await self._status(image_id), 200)
-        # A warm layout cache does not outlive the integration (#362).
-        self.assertIsNotNone(lora_utils._layout_cache._entry)
         self.enabled.stop()
         for image_id in ids:
             self.assertEqual(await self._status(image_id), 403)
         self.enabled.start()
 
-    def _example(self, folder=None, name="1.mp4"):
-        path = (folder or self.examples) / "ab12" / name
-        path.parent.mkdir(exist_ok=True)
-        path.write_bytes(b"video")
-        return path
-
-    async def test_unchanged_settings_reuse_the_cached_layout(self):
-        image_id = self._link_image(self._example())
-        self.assertEqual(await self._status(image_id), 200)
-        self.assertIsNotNone(lora_utils._layout_cache._entry)
-        self.assertEqual(await self._status(image_id), 200)
-        self.assertEqual(lora_utils.default_lora_roots.call_count, 1)
-
-    async def test_a_settings_change_is_seen_without_a_clear(self):
-        image_id = self._link_image(self._example())
-        self.assertEqual(await self._status(image_id), 200)
-        self.assertIsNotNone(lora_utils._layout_cache._entry)
-        moved = self.root / "examples-moved"
-        moved.mkdir()
-        self.write_settings(str(self.sidecars), examples=moved)
-        self.assertEqual(await self._status(image_id), 403)
-
-    async def test_a_cached_folder_swapped_for_a_symlink_to_home_is_refused(self):
-        # CUJ 7: the example-images folder becomes a symlink to a folder that
-        # holds the home folder; the same recorded file is refused.
-        outer = self.root / "outer"
-        (outer / "home").mkdir(parents=True)
-        self._example(outer)
-        image_id = self._link_image(self._example())
-        with patch.object(layout_module.Path, "home", return_value=outer / "home"):
-            self.assertEqual(await self._status(image_id), 200)
-            self.assertIsNotNone(lora_utils._layout_cache._entry)
-            # A skip after the rmtree is safe: setUp builds a fresh tree.
-            shutil.rmtree(self.examples)
-            self._make_symlink(outer, self.examples, target_is_directory=True)
-            self.assertEqual(await self._status(image_id), 403)
-
-    async def test_a_configured_path_outside_custom_nodes_adds_nothing(self):
-        from py.config import IntegrationConfig
-
-        self.assertEqual(await self._status(self._link_image(self._example())), 200)
-        self.assertIsNotNone(lora_utils._layout_cache._entry)
-        with patch.object(IntegrationConfig, "LORA_MANAGER_PATH", str(self.sidecars)):
-            self.assertEqual(self.api._lora_image_dirs(), [])
-        # The warm entry for the real install was never handed out for it.
-        self.assertIsNone(lora_utils.cached_lora_manager_layout(str(self.sidecars))[0])
-
-    async def test_serve_image_builds_the_allow_list_in_the_executor(self):
-        calls = self._spy_executor()
-        self.assertEqual(await self._status(self._link_image(self._example())), 200)
-        self.assertIn("_lora_image_dirs", calls)
-
     async def test_a_filesystem_root_as_sidecar_folder_adds_nothing(self):
         self.write_settings(os.path.abspath(os.sep))
         dirs = self.api._lora_image_dirs()

tests/test_api_log_cleanup.py

@@ -1,419 +0,0 @@
-"""Reviewed rotated-log cleanup as a maintenance plan (#329, py/api/log_cleanup.py).
-
-``POST /maintenance/preview {operation: "rotated_logs"}`` lists exactly the
-rotated copies Rule R allows and writes nothing; ``POST /maintenance/apply``
-deletes exactly those as a ``maintenance`` job (admission ``read``), or
-nothing, failing ``plan-changed``, when any of them changed after the review.
-
-Every test runs on a real ``PromptManagerLogger`` whose log folder is a
-temporary folder, never the real one.
-"""
-
-import asyncio
-import json
-import logging
-import ntpath
-import os
-import posixpath
-import re
-import sys
-import threading
-import unittest
-import unittest.mock as mock
-
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-from py.api.maintenance_plans import PlanStore  # noqa: E402
-from utils import logging_config  # noqa: E402
-from utils.logging_config import PromptManagerLogger, get_logger_manager  # noqa: E402
-
-try:
-    from tests.open_handles import assert_closed  # noqa: E402
-    from tests.test_api_maintenance import MaintenanceAPITestCase  # noqa: E402
-except ImportError:  # discovered with tests/ as the top-level directory
-    from open_handles import assert_closed  # noqa: E402
-    from test_api_maintenance import MaintenanceAPITestCase  # noqa: E402
-
-WAIT = 10
-PREVIEW = "/prompt_manager/maintenance/preview"
-APPLY = "/prompt_manager/maintenance/apply"
-CHANGED = "The log files changed since the review; nothing was deleted. Review again."
-MEDIA = "Deletes only the listed log files. No image, video or library record changes."
-_WINDOWS_ABSOLUTE = re.compile(r"^[A-Za-z]:[\\/]")
-
-
-def _strings(value):
-    if isinstance(value, str):
-        yield value
-    elif isinstance(value, dict):
-        for item in value.values():
-            yield from _strings(item)
-    elif isinstance(value, (list, tuple)):
-        for item in value:
-            yield from _strings(item)
-
-
-class LogCleanupTestCase(MaintenanceAPITestCase):
-    async def get_application(self):
-        app = await super().get_application()
-        package = os.path.join(self.tmpdir, "pkg")
-        os.makedirs(os.path.join(package, "utils"))
-        fake_file = os.path.join(package, "utils", "logging_config.py")
-        with mock.patch.object(logging_config, "__file__", fake_file):
-            self.manager = object.__new__(PromptManagerLogger)  # bypass singleton
-            self.manager.__init__()
-        self.addCleanup(self._restore_global_logging)
-        self.manager.update_config({"console_logging": False})
-        self._only_this_thread()
-        self.log_dir = str(self.manager.log_dir)
-        self.app_logger = logging.getLogger("prompt_manager.log_cleanup_test")
-        self.app_logger.info("active log line")
-        self.api._get_logger_manager = lambda: self.manager
-        self.outside = os.path.join(self.tmpdir, "link-targets")
-        os.makedirs(self.outside)
-        return app
-
-    def _only_this_thread(self):
-        """Only this test's records reach the temporary log (not other threads')."""
-        this_thread = threading.get_ident()
-        for handler in self.manager.logger.handlers:
-            handler.filters.clear()
-            handler.addFilter(lambda record: record.thread == this_thread)
-
-    def _restore_global_logging(self):
-        for handler in logging.getLogger("prompt_manager").handlers[:]:
-            handler.close()
-        assert_closed(self, self.log_dir)
-        get_logger_manager()._setup_loggers()
-
-    def path(self, name):
-        return os.path.join(self.log_dir, name)
-
-    def write(self, name, data=b"rotated\n"):
-        with open(self.path(name), "wb") as handle:
-            handle.write(data)
-
-    def symlink(self, name):
-        target = os.path.join(self.outside, "secret.txt")
-        with open(target, "wb") as handle:
-            handle.write(b"secret " * 100)
-        try:
-            os.symlink(target, self.path(name))
-        except (OSError, NotImplementedError):  # pragma: no cover - no privilege
-            return False
-        return True
-
-    def names(self):
-        return sorted(os.listdir(self.log_dir))
-
-    def snapshot(self):
-        """Every entry but the active log, with its bytes (None for a folder)."""
-        state = {}
-        for name in self.names():
-            if name == "prompt_manager.log":
-                continue
-            path = self.path(name)
-            if os.path.islink(path):
-                state[name] = ("link", os.readlink(path))
-            elif os.path.isdir(path):
-                state[name] = None
-            else:
-                with open(path, "rb") as handle:
-                    state[name] = handle.read()
-        return state
-
-    def seed(self):
-        """CUJ 5's folder: three rotated copies, a .bak, a folder and a link."""
-        self.write("prompt_manager.log.1", b"a" * 1000)
-        self.write("prompt_manager.log.2", b"b" * 2000)
-        self.write("prompt_manager.log.3", b"c" * 3000)
-        self.write("prompt_manager.log.bak", b"mine")
-        os.makedirs(self.path("prompt_manager.log.9"))
-        return self.symlink("prompt_manager.log.4")
-
-    async def preview(self, status=200, **body):
-        return await self.post(
-            PREVIEW, {"operation": "rotated_logs", "options": {}, **body}, status
-        )
-
-    async def apply(self, token, status=202):
-        return await self.post(APPLY, {"token": token}, status)
-
-    async def run_apply(self, plan):
-        body = await self.apply(plan["token"])
-        job = self.api._jobs.get(body["job"]["id"])
-        await asyncio.wait_for(asyncio.shield(job.task), WAIT)
-        return body["job"], job
-
-
-class TestPreview(LogCleanupTestCase):
-    async def test_preview_lists_only_rotated_copies(self):
-        linked = self.seed()
-        plan = await self.preview()
-        self.assertEqual(
-            set(plan),
-            {
-                "success",
-                "token",
-                "operation",
-                "expires_at",
-                "scope",
-                "protected",
-                "backup",
-                "media",
-                "details",
-            },
-        )
-        self.assertEqual(plan["operation"], "rotated_logs")
-        self.assertEqual(
-            plan["scope"], {"count": 3, "label": "3 rotated log copies · 5.9 KB"}
-        )
-        self.assertEqual(
-            [row["label"] for row in plan["details"]],
-            ["prompt_manager.log.1", "prompt_manager.log.2", "prompt_manager.log.3"],
-        )
-        self.assertRegex(
-            plan["details"][2]["detail"], r"^2\.9 KB · \d{4}-\d\d-\d\d \d\d:\d\d$"
-        )
-        reasons = ["Kept: the active log"]
-        if linked:
-            reasons.append("Kept: 1 link")
-        reasons.append("Kept: 2 other files")
-        self.assertEqual(
-            plan["protected"], {"count": len(reasons) + 1, "reasons": reasons}
-        )
-        self.assertEqual(
-            plan["backup"],
-            {"policy": "none", "destination_label": None, "expected_bytes": None},
-        )
-        self.assertEqual(plan["media"], {"deletes_files": True, "label": MEDIA})
-        self.assertTrue(plan["expires_at"].endswith("+00:00"))
-        self.assertNotIn("mtime_ns", json.dumps(plan))
-
-    async def test_preview_writes_nothing(self):
-        self.seed()
-        before = self.snapshot()
-        await self.preview()
-        self.assertEqual(self.snapshot(), before)
-
-    async def test_preview_has_no_paths(self):
-        self.seed()
-        plan = await self.preview()
-        for text in _strings(plan):
-            self.assertFalse(posixpath.isabs(text), text)
-            self.assertFalse(ntpath.isabs(text), text)
-            self.assertIsNone(_WINDOWS_ABSOLUTE.match(text), text)
-
-    async def test_preview_rejects_non_empty_options(self):
-        for options in ({"all": True}, [], "x"):
-            with self.subTest(options=options):
-                reply = await self.preview(status=400, options=options)
-                self.assertEqual(reply["code"], "invalid-request")
-
-    async def test_preview_too_large_is_413(self):
-        self.seed()
-        self.api._maintenance_plans = PlanStore(max_bytes=10)
-        reply = await self.preview(status=413)
-        self.assertEqual(
-            reply,
-            {
-                "success": False,
-                "code": "too-large",
-                "error": "Too many log files to review at once.",
-            },
-        )
-
-    async def test_empty_folder_plan_has_scope_zero(self):
-        plan = await self.preview()
-        self.assertEqual(plan["scope"], {"count": 0, "label": "No rotated log copies"})
-        self.assertEqual(plan["details"], [])
-        self.assertEqual(
-            plan["protected"], {"count": 1, "reasons": ["Kept: the active log"]}
-        )
-
-    async def test_preview_refused_while_an_exclusive_job_runs(self):
-        async with self.api._jobs.hold(
-            "restore", "Database restore", admission="exclusive"
-        ):
-            reply = await self.preview(status=409)
-        self.assertEqual(reply["code"], "busy")
-
-
-class TestApply(LogCleanupTestCase):
-    async def test_apply_deletes_exactly_the_reviewed_files(self):
-        linked = self.seed()
-        plan = await self.preview()
-        summary, job = await self.run_apply(plan)
-        self.assertEqual(summary["kind"], "maintenance")
-        self.assertEqual(summary["title"], "Rotated log copies")
-        self.assertEqual(summary["admission"], "read")
-        self.assertFalse(summary["cancellable"])
-        self.assertEqual(summary["scope"], {"operation": "rotated_logs"})
-        self.assertEqual(job.state, "finished", job.log)
-        self.assertEqual(
-            job.counters,
-            {"changed": 3, "protected": plan["protected"]["count"], "errors": 0},
-        )
-        expected = [
-            "prompt_manager.log",
-            "prompt_manager.log.9",
-            "prompt_manager.log.bak",
-        ]
-        if linked:
-            expected.append("prompt_manager.log.4")
-        self.assertEqual(self.names(), sorted(expected))
-        self.assertEqual(job.status_line, "Deleted 3 rotated log copies")
-        report = json.dumps(job.report())
-        self.assertNotIn(self.tmpdir, report)
-
-    async def test_apply_rows_name_each_file(self):
-        self.seed()
-        plan = await self.preview()
-        _summary, job = await self.run_apply(plan)
-        self.assertEqual(
-            job.outcomes["changed"],
-            [
-                {
-                    "path": "prompt_manager.log.1",
-                    "root": "",
-                    "root_index": None,
-                    "detail": "Deleted · 1000 bytes",
-                },
-                {
-                    "path": "prompt_manager.log.2",
-                    "root": "",
-                    "root_index": None,
-                    "detail": "Deleted · 2.0 KB",
-                },
-                {
-                    "path": "prompt_manager.log.3",
-                    "root": "",
-                    "root_index": None,
-                    "detail": "Deleted · 2.9 KB",
-                },
-            ],
-        )
-        log = "\n".join(job.log)
-        for n in (1, 2, 3):
-            self.assertIn(f"prompt_manager.log.{n}", log)
-
-    async def test_apply_after_rollover_fails_plan_changed_and_deletes_nothing(self):
-        self.seed()
-        plan = await self.preview()
-        handler = next(
-            h
-            for h in self.manager.logger.handlers
-            if isinstance(h, logging.FileHandler)
-        )
-        handler.acquire()
-        try:
-            handler.doRollover()  # every listed name now holds another file
-        finally:
-            handler.release()
-        before = self.snapshot()
-        _summary, job = await self.run_apply(plan)
-        self.assertEqual(job.state, "failed")
-        self.assertEqual(job.scope["failure"], "plan-changed")
-        self.assertEqual(job.status_line, CHANGED)
-        self.assertEqual(job.counters["changed"], 0)
-        self.assertEqual(self.snapshot(), before)
-
-    async def test_apply_reports_a_file_in_use(self):
-        self.seed()
-        plan = await self.preview()
-        real_unlink = os.unlink
-        held = self.path("prompt_manager.log.2")
-
-        def unlink(path, *args, **kwargs):
-            if os.fspath(path) == held:
-                error = PermissionError(
-                    13,
-                    "The process cannot access the file because it is being "
-                    "used by another process",
-                    held,
-                )
-                error.winerror = 32
-                raise error
-            return real_unlink(path, *args, **kwargs)
-
-        with mock.patch.object(logging_config.os, "unlink", unlink):
-            _summary, job = await self.run_apply(plan)
-        self.assertEqual(job.counters["changed"], 2)
-        self.assertEqual(job.counters["errors"], 1)
-        [row] = job.outcomes["errors"]
-        self.assertEqual(row["path"], "prompt_manager.log.2")
-        self.assertIn("being used by another process", row["detail"])
-        self.assertNotIn(self.tmpdir, json.dumps(job.report()))
-        self.assertIn("prompt_manager.log.2", self.names())
-        self.assertEqual(
-            job.status_line, "Deleted 2 rotated log copies, 1 could not be deleted"
-        )
-
-    async def test_token_is_single_use(self):
-        self.seed()
-        plan = await self.preview()
-        summary, _job = await self.run_apply(plan)
-        again = await self.apply(plan["token"], 409)
-        self.assertEqual(again["code"], "plan-used")
-        self.assertEqual(
-            again["job"], {"id": summary["id"], "title": "Rotated log copies"}
-        )
-
-    async def test_apply_runs_beside_a_scan(self):
-        self.seed()
-        plan = await self.preview()
-        async with self.api._jobs.hold("scan", "Metadata scan", admission="records"):
-            _summary, job = await self.run_apply(plan)
-        self.assertEqual(job.state, "finished", job.log)
-        self.assertNotIn("prompt_manager.log.1", self.names())
-
-    async def test_apply_refused_while_restore_runs(self):
-        self.seed()
-        plan = await self.preview()
-        async with self.api._jobs.hold(
-            "restore", "Database restore", admission="exclusive"
-        ) as restore:
-            busy = await self.apply(plan["token"], 409)
-        self.assertEqual(busy["code"], "busy")
-        self.assertEqual(
-            busy["running"], {"id": restore.id, "title": "Database restore"}
-        )
-        self.assertIn("prompt_manager.log.1", self.names())
-        # The refused apply kept the token.
-        _summary, job = await self.run_apply(plan)
-        self.assertEqual(job.state, "finished", job.log)
-
-    async def test_apply_refused_beside_another_maintenance_job(self):
-        self.seed()
-        plan = await self.preview()
-        async with self.api._jobs.hold(
-            "maintenance", "Optimize database", admission="records"
-        ):
-            busy = await self.apply(plan["token"], 409)
-        self.assertEqual(busy["code"], "busy")
-
-    async def test_active_log_survives_and_keeps_growing(self):
-        self.seed()
-        plan = await self.preview()
-        await self.run_apply(plan)
-        self.app_logger.info("written after the cleanup")
-        with open(self.path("prompt_manager.log"), "rb") as handle:
-            content = handle.read()
-        self.assertIn(b"active log line", content)
-        self.assertIn(b"written after the cleanup", content)
-
-    async def test_an_unexpected_failure_fails_the_job_without_details(self):
-        self.seed()
-        plan = await self.preview()
-        with mock.patch.object(
-            self.manager, "delete_rotated", side_effect=RuntimeError(self.tmpdir)
-        ):
-            with self.assertLogs("prompt_manager", "ERROR"):
-                _summary, job = await self.run_apply(plan)
-        self.assertEqual(job.state, "failed")
-        self.assertNotIn(self.tmpdir, json.dumps(job.report()))
-        self.assertEqual(job.status_line, "The log cleanup failed.")
-
-
-if __name__ == "__main__":
-    unittest.main()

tests/test_api_logging.py

@@ -5,10 +5,9 @@ import os
 import shutil
 import sys
 import tempfile
-import threading
 import unittest
 from pathlib import Path
-from unittest.mock import MagicMock, patch
+from unittest.mock import MagicMock
 
 _mock_server = MagicMock()
 _mock_server.PromptServer.instance.routes = MagicMock()
@@ -21,9 +20,7 @@ from aiohttp.test_utils import AioHTTPTestCase  # noqa: E402
 
 from database.operations import PromptDatabase  # noqa: E402
 from py.api import PromptManagerAPI  # noqa: E402
-from py.api import logging_routes  # noqa: E402
 from py.api.logging_routes import LOG_CONFIG_KEYS  # noqa: E402
-from utils import logging_config  # noqa: E402
 
 
 class FakeLoggerManager:
@@ -41,16 +38,11 @@ class FakeLoggerManager:
         }
         self.update_calls = []
         self.logs = []
-        self.threads = {}
 
     def update_config(self, new_config):
-        self.threads["update_config"] = threading.current_thread()
         self.update_calls.append(dict(new_config))
         self.config.update(new_config)
 
-    def log_file_entry(self, name):
-        return logging_config.log_file_entry(self.log_dir, name)
-
     def get_config(self):
         return dict(self.config)
 
@@ -62,36 +54,23 @@ class FakeLoggerManager:
 
     def get_log_files(self):
         files = []
-        for row in sorted(
-            logging_config.scan_log_folder(self.log_dir), key=lambda r: r["name"]
-        ):
-            if row["_dir"]:
-                continue
+        for path in sorted(self.log_dir.glob("*.log*")):
             files.append(
                 {
-                    "filename": row["name"],
-                    "path": str(self.log_dir / row["name"]),
-                    "size": row["size"],
+                    "filename": path.name,
+                    "path": str(path),
+                    "size": path.stat().st_size,
                     "modified": "2026-10-07T00:00:00",
-                    "is_main": row["kind"] == "active",
-                    "kind": row["kind"],
+                    "is_main": path.name == "prompt_manager.log",
                 }
             )
         return files
 
     def truncate_logs(self):
-        """Rule R: empty the active log, delete rotated copies, keep the rest."""
-        self.threads["truncate_logs"] = threading.current_thread()
         truncated = []
-        for row in logging_config.scan_log_folder(self.log_dir):
-            path = self.log_dir / row["name"]
-            if row["kind"] == "active":
-                path.write_text("")
-            elif row["kind"] == "rotated":
-                path.unlink()
-            else:
-                continue
-            truncated.append(row["name"])
+        for path in self.log_dir.glob("prompt_manager.log*"):
+            path.write_text("")
+            truncated.append(path.name)
         return {"truncated": truncated, "errors": []}
 
     def get_log_stats(self):
@@ -399,129 +378,12 @@ class TestLogFilesAndDownload(LoggingAPITestCase):
         self.assertEqual(resp.status, 400)
 
     async def test_download_read_failure_is_500(self):
-        # Rewritten (#329): a directory is now a 404; inject a read error.
-        (self.log_dir / "prompt_manager.log").write_bytes(b"x")
-        secret = os.path.join(self.tmpdir, "logs", "prompt_manager.log")
-
-        def fail(path):
-            raise PermissionError(13, "Permission denied", secret)
-
-        with patch.object(logging_routes, "_read_log_bytes", fail):
-            resp = await self.client.request(
-                "GET", "/prompt_manager/logs/download/prompt_manager.log"
-            )
+        (self.log_dir / "dir.log").mkdir()
+        resp = await self.client.request("GET", "/prompt_manager/logs/download/dir.log")
         body = await resp.text()
         self.assertEqual(resp.status, 500)
         self.assertNotIn(self.tmpdir, body)
 
-    async def test_directory_download_is_404(self):
-        (self.log_dir / "dir.log").mkdir()
-        resp = await self.client.request("GET", "/prompt_manager/logs/download/dir.log")
-        self.assertEqual(resp.status, 404)
-
-    async def test_download_refuses_a_symlink(self):
-        secret = Path(self.tmpdir) / "secret.txt"
-        secret.write_text("the key")
-        try:
-            os.symlink(secret, self.log_dir / "prompt_manager.log.3")
-        except (OSError, NotImplementedError):  # pragma: no cover
-            self.skipTest("this account cannot create symlinks")
-        resp = await self.client.request(
-            "GET", "/prompt_manager/logs/download/prompt_manager.log.3"
-        )
-        body = await resp.text()
-        self.assertEqual(resp.status, 404)
-        self.assertNotIn("the key", body)
-
-    async def test_download_refuses_a_hard_link(self):
-        secret = Path(self.tmpdir) / "secret.txt"
-        secret.write_text("the key")
-        try:
-            os.link(secret, self.log_dir / "prompt_manager.log.3")
-        except (OSError, NotImplementedError):  # pragma: no cover
-            self.skipTest("this filesystem cannot create hard links")
-        resp = await self.client.request(
-            "GET", "/prompt_manager/logs/download/prompt_manager.log.3"
-        )
-        self.assertEqual(resp.status, 404)
-        self.assertNotIn("the key", await resp.text())
-
-    async def test_download_refuses_a_file_swapped_after_it_was_listed(self):
-        (self.log_dir / "prompt_manager.log.2").write_text("listed")
-        other = Path(self.tmpdir) / "other.txt"
-        other.write_text("swapped in")
-        real_entry = self.manager.log_file_entry
-
-        def entry_then_swap(name):
-            path = real_entry(name)
-            os.replace(other, path)  # another file now has the listed name
-            return path
-
-        self.manager.log_file_entry = entry_then_swap
-        resp = await self.client.request(
-            "GET", "/prompt_manager/logs/download/prompt_manager.log.2"
-        )
-        self.assertEqual(resp.status, 404)
-        self.assertNotIn("swapped in", await resp.text())
-
-    @unittest.skipUnless(hasattr(os, "mkfifo"), "FIFOs are POSIX only")
-    async def test_download_refuses_a_fifo_without_blocking(self):
-        os.mkfifo(self.log_dir / "pipe.log")
-        resp = await self.client.request(
-            "GET", "/prompt_manager/logs/download/pipe.log"
-        )
-        self.assertEqual(resp.status, 404)
-
-    async def test_download_reads_off_the_loop(self):
-        (self.log_dir / "prompt_manager.log").write_bytes(b"line\n")
-        seen = []
-        real = logging_routes._read_log_bytes
-
-        def read(path):
-            seen.append(threading.current_thread())
-            return real(path)
-
-        with patch.object(logging_routes, "_read_log_bytes", read):
-            resp = await self.client.request(
-                "GET", "/prompt_manager/logs/download/prompt_manager.log"
-            )
-        self.assertEqual(resp.status, 200)
-        self.assertEqual(len(seen), 1)
-        self.assertIsNot(seen[0], threading.current_thread())
-
-    async def test_download_keeps_its_response_shape(self):
-        (self.log_dir / "prompt_manager.log.2").write_bytes(b"a\nb\n")
-        resp = await self.client.request(
-            "GET", "/prompt_manager/logs/download/prompt_manager.log.2"
-        )
-        self.assertEqual(resp.status, 200)
-        self.assertEqual(resp.content_type, "text/plain")
-        self.assertEqual(
-            resp.headers["Content-Disposition"],
-            'attachment; filename="prompt_manager.log.2"',
-        )
-        self.assertEqual(resp.headers["Content-Length"], "4")
-        self.assertEqual(await resp.read(), b"a\nb\n")
-
-    async def test_log_files_rows_carry_their_kind(self):
-        for name in (
-            "prompt_manager.log",
-            "prompt_manager.log.1",
-            "prompt_manager.log.bak",
-        ):
-            (self.log_dir / name).write_text("x")
-        resp = await self.client.request("GET", "/prompt_manager/logs/files")
-        data = await resp.json()
-        kinds = {row["filename"]: row["kind"] for row in data["files"]}
-        self.assertEqual(
-            kinds,
-            {
-                "prompt_manager.log": "active",
-                "prompt_manager.log.1": "rotated",
-                "prompt_manager.log.bak": "other",
-            },
-        )
-
 
 class TestTruncateConfigAndStats(LoggingAPITestCase):
 
@@ -533,40 +395,6 @@ class TestTruncateConfigAndStats(LoggingAPITestCase):
         self.assertEqual(data["results"]["truncated"], ["prompt_manager.log"])
         self.assertEqual((self.log_dir / "prompt_manager.log").read_text(), "")
 
-    async def test_truncate_keeps_other_files(self):
-        for name in (
-            "prompt_manager.log",
-            "prompt_manager.log.1",
-            "prompt_manager.log.bak",
-        ):
-            (self.log_dir / name).write_text("data")
-        resp = await self.client.request("POST", "/prompt_manager/logs/truncate")
-        data = await resp.json()
-        self.assertEqual(resp.status, 200)
-        self.assertEqual(set(data), {"success", "message", "results"})
-        self.assertEqual(
-            sorted(data["results"]["truncated"]),
-            ["prompt_manager.log", "prompt_manager.log.1"],
-        )
-        self.assertEqual(
-            sorted(p.name for p in self.log_dir.iterdir()),
-            ["prompt_manager.log", "prompt_manager.log.bak"],
-        )
-
-    async def test_truncate_runs_off_the_loop(self):
-        resp = await self.client.request("POST", "/prompt_manager/logs/truncate")
-        self.assertEqual(resp.status, 200)
-        self.assertIsNot(
-            self.manager.threads["truncate_logs"], threading.current_thread()
-        )
-
-    async def test_update_config_runs_off_the_loop(self):
-        resp = await self._post_config({"level": "DEBUG"})
-        self.assertEqual(resp.status, 200)
-        self.assertIsNot(
-            self.manager.threads["update_config"], threading.current_thread()
-        )
-
     async def test_truncate_failure_is_500(self):
         def boom():
             raise RuntimeError("locked")

tests/test_api_lora.py

@@ -876,18 +876,6 @@ class TestLoraScanRoute(LoraAPITestCase):
         resp = await self.client.request("POST", "/prompt_manager/lora/scan")
         self.assertEqual(resp.status, 400)
 
-    async def test_a_finished_scan_clears_the_layout_cache(self):
-        # #362: the legacy scan replaces through the same method.
-        self._enable()
-        loras = self.tmp_root / "loras"
-        loras.mkdir()
-        _write_metadata(loras, "plain")
-        (loras / "plain.png").write_bytes(_png_bytes())
-        with patch("py.lora_utils.clear_layout_cache") as clear:
-            resp, events, _calls = await self._scan(loras)
-        self.assertEqual(events[-1]["type"], "complete", events)
-        clear.assert_called_once_with()
-
     async def test_scan_imports_loras_with_images_and_links_existing(self):
         self._enable()
         loras = self.tmp_root / "loras"

tests/test_api_prompt_inspector.py

@@ -190,8 +190,7 @@ class TestPromptInspector(ImageAPITestCase):
                     "inputs": {"positive": ["5", 0], "negative": ["2", 0]},
                 }
             else:
-                # No text and no links: nothing passes through it (#381).
-                source["1"] = {"class_type": "UnknownEncoder", "inputs": {"seed": 1}}
+                source["1"]["class_type"] = "UnknownEncoder"
             png(
                 path,
                 prompt=source,
@@ -216,7 +215,7 @@ class TestPromptInspector(ImageAPITestCase):
             result["prompts"]["negative"], self.side("", "embedded-parameters")
         )
         source = graph()
-        source["2"] = {"class_type": "UnknownEncoder", "inputs": {"seed": 1}}
+        source["2"]["class_type"] = "UnknownEncoder"
         png(path, prompt=source)
         _, result = await self.inspect()
         self.assertEqual(result["prompts"]["positive"], self.side("portrait"))

tests/test_api_workspace_images.py

@@ -1831,39 +1831,6 @@ class TestWorkspaceCursorEncoding(unittest.TestCase):
                 self.assertEqual(_workspace_cursor_key(token, "scope", order), key)
 
 
-# The pre-#379 candidate read, kept as the differential reference for the
-# indexed lookup (`image_tag_ids` + `image_tag_locators`): every byte record
-# streamed with its tag names, a locator kept when any record's names are
-# relevant (`_image_tags_relevant`).
-_REFERENCE_RECORDS = (
-    "SELECT f.locator,b.id,t.name FROM media_annotation_files f "
-    "JOIN media_annotation_bytes b ON b.file_id=f.id "
-    "LEFT JOIN media_image_tags 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"
-)
-
-
-def _image_tags_relevant(names, wanted, query):
-    if wanted and not wanted.isdisjoint(names):
-        return True
-    return bool(query) and any(query in name.casefold() for name in names)
-
-
-def reference_candidates(db, wanted, query):
-    """Locators the old full stream admitted for (``wanted``, ``query``)."""
-    records = {}
-    for locator, byte_id, name in db.model.get_connection().execute(_REFERENCE_RECORDS):
-        names = records.setdefault((locator, byte_id), [])
-        if name is not None:
-            names.append(name)
-    return {
-        locator
-        for (locator, _byte), names in records.items()
-        if _image_tags_relevant(names, set(wanted), query)
-    }
-
-
 class TestWorkspaceImageTags(ImageAPITestCase):
     """B3: image tags in the Tags filter and search (spec amendment S1)."""
 
@@ -2071,7 +2038,7 @@ class TestWorkspaceImageTags(ImageAPITestCase):
         leak = "no such table: media_annotation_files"
         with patch.object(
             self.api.db,
-            "image_tag_locators",
+            "iter_image_tag_records",
             side_effect=sqlite3.OperationalError(leak),
         ):
             # As a failed link read does under a Tags filter: a fixed coded
@@ -2089,140 +2056,6 @@ class TestWorkspaceImageTags(ImageAPITestCase):
         self.assertEqual(self.names(body), ["dunes_by_name.png"])
         self.assertIn("image tags", "\n".join(logged.output))
 
-    def seed_differential(self):
-        """Mixed-case and underscore names, a stale record, an unlisted file."""
-        a = self.media("a.png", mtime=101)
-        b = self.media("b.png", mtime=102)
-        c = self.media("c.png", mtime=103)
-        self.tag(a, ["Beach", "long_hair", "1girl"])
-        self.tag(b, ["beach", "waves"])
-        self.tag(c, ["Sunset"])
-        # c's bytes change: its old record (Sunset) is stale, the new one current.
-        make_png(c, size=(5, 5))
-        os.utime(c, (104, 104))
-        self.tag(c, ["night_sky", "BEACH"])
-        outside = Path(self._output_tmp.name) / "elsewhere" / "x.png"
-        outside.parent.mkdir(parents=True, exist_ok=True)
-        make_png(outside)
-        self.tag(outside, ["beach", "outside_only"])
-
-    async def test_indexed_candidates_equal_the_full_stream(self):
-        self.seed_differential()
-        cases = [
-            (["beach"], ""),
-            (["Beach"], ""),
-            (["long_hair", "waves"], ""),
-            ([], "beach"),
-            ([], "hair"),
-            ([], "_"),
-            ([], "sun"),
-            (["nope"], "zzz"),
-            (["outside_only"], ""),
-            (["beach"], "night"),
-        ]
-        db = self.api.db
-        for wanted, query in cases:
-            with self.subTest(wanted=wanted, query=query):
-                indexed = set(db.image_tag_locators(db.image_tag_ids(wanted, query)))
-                self.assertEqual(indexed, reference_candidates(db, wanted, query))
-        # The API answers are the indexed lookup's: exact names under Tags, a
-        # case-folded substring under q, current records only.
-        _, body = await self.get(tags="beach")
-        self.assertEqual(sorted(self.names(body)), ["b.png"])
-        _, body = await self.get(q="beach")
-        self.assertEqual(sorted(self.names(body)), ["a.png", "b.png", "c.png"])
-        _, body = await self.get(q="sunset")
-        self.assertEqual(self.names(body), [])
-
-    async def test_tag_search_reads_image_tags_only_by_tag_id(self):
-        self.seed_differential()
-        statements = []
-        original = self.api.db.model.get_connection
-
-        def trace_connection():
-            connection = original()
-            connection.set_trace_callback(statements.append)
-            return connection
-
-        with patch.object(
-            self.api.db.model, "get_connection", side_effect=trace_connection
-        ):
-            for params in ({"tags": "beach"}, {"q": "hair"}):
-                response, _ = await self.get(**params)
-                self.assertEqual(response.status, 200)
-        reads = [
-            sql
-            for sql in statements
-            if "media_image_tags" in sql and sql.lstrip().upper().startswith("SELECT")
-        ]
-        self.assertTrue(reads)
-        for sql in reads:
-            # Only a tag-id lookup, an EXISTS probe on the tag index, or the
-            # current records' own tags (byte_id IN) read the junction.
-            self.assertTrue(
-                "tag_id IN" in sql or "EXISTS" in sql or "byte_id IN" in sql, sql
-            )
-
-    async def test_the_image_tag_lookup_never_reads_prompt_tags(self):
-        self.seed_differential()
-        linked = self.media("linked.png", mtime=105)
-        prompt = self._save_prompt(
-            "Prompt with its own tag", tags=["prompt_only_beach"]
-        )
-        self.api.db.link_image_to_prompt(prompt, str(linked))
-        db = self.api.db
-        # The tag is only on a prompt: the image-tag lookup never yields it,
-        # under the Tags filter or the text search.
-        self.assertEqual(db.image_tag_ids(["prompt_only_beach"], ""), [])
-        self.assertEqual(db.image_tag_ids([], "prompt_only"), [])
-        self.assertEqual(
-            db.image_tag_locators(db.image_tag_ids([], "beach")),
-            reference_candidates(db, [], "beach"),
-        )
-        # The search still matches through the linked positive's prompt tags
-        # (the design keeps that, #379 "Behavior that does not change").
-        _, body = await self.get(q="prompt_only")
-        self.assertEqual(self.names(body), ["linked.png"])
-
-    @unittest.skipUnless(os.environ.get("PM_PERF") == "1", "timing run (PM_PERF=1)")
-    async def test_tag_search_timing(self):
-        """Linux timing for the PR body: 23,600 records, 10 tags each."""
-        import hashlib
-        import statistics
-        import time
-
-        db = self.api.db
-        epoch = db.get_execution_epoch()
-        names = [f"name_{n:04d}" for n in range(2000)]
-        root = os.path.realpath(self.output_dir)
-        for n in range(23_600):
-            path = self.output_dir / "perf" / f"{n:05d}.png"
-            path.parent.mkdir(exist_ok=True)
-            path.write_bytes(b"x")
-            os.utime(path, (n + 1, n + 1))
-            stat = path.stat()
-            db.replace_image_tags(
-                locator=os.path.normcase(os.path.join(root, "perf", path.name)),
-                sha256=hashlib.sha256(str(n).encode()).hexdigest(),
-                size=stat.st_size,
-                mtime_ns=stat.st_mtime_ns,
-                expected_epoch=epoch,
-                expected_tag_revision=0,
-                tags=[names[(n * 7 + k) % 2000] for k in range(10)],
-            )
-        await self.get(limit=1)  # the listing, warm
-        for label, params in (
-            ("one tag", {"tags": "name_0042"}),
-            ("text", {"q": "e_1"}),
-        ):
-            times = []
-            for _ in range(5):
-                started = time.perf_counter()
-                response, _ = await self.get(limit=100, **params)
-                times.append(time.perf_counter() - started)
-                self.assertEqual(response.status, 200)
-            print(f"PM_PERF {label}: median {statistics.median(times) * 1000:.0f} ms")
-
     async def test_legacy_output_failure_logs_its_traceback(self):
         self.media("legacy.png", mtime=100)
         with (

tests/test_autotag_batch.py

@@ -1,696 +0,0 @@
-"""Tag output images tags each image, never its prompt (#379, PR 1).
-
-``POST /prompt_manager/jobs/autotag`` runs the ``image-tags`` loop over every
-still image the output folders list, linked to a prompt or not: each image
-gets its own model tags in its image tag set and is marked auto-tagged.
-"Skip already tagged" skips images whose current bytes are marked, counted
-before the loop without opening them. Prompt tags and prompt text never
-change. No real model is loaded: the engine is a fake that answers per image.
-"""
-
-import asyncio
-import json
-import ntpath
-import os
-import posixpath
-import re
-import sqlite3
-import threading
-from pathlib import Path
-from unittest.mock import patch
-
-try:
-    from test_api_images import make_png
-    from test_image_tag_jobs import HookedTagger, ImageTagJobTestCase
-except ImportError:
-    from tests.test_api_images import make_png
-    from tests.test_image_tag_jobs import HookedTagger, ImageTagJobTestCase
-
-from database.execution_history_schema import rotate_history_epoch
-from py import model_gate
-from py.api import admin as admin_module
-from py.api import image_tag_jobs as jobs_module
-from py.config import PromptManagerConfig
-from utils.hashing import generate_prompt_hash
-
-JOB = "/prompt_manager/jobs/autotag"
-PREVIEW = "/prompt_manager/autotag/batch/preview"
-WAIT = 30.0
-WD14 = {"general_threshold": 0.35, "character_threshold": 0.85}
-CANCELLED = "Cancelled. Tags already added were kept."
-_DRIVE = re.compile(r"^[A-Za-z]:[\\/]")
-
-
-class PerImageTagger(HookedTagger):
-    """Answers each image from its own bytes: ``by_bytes`` maps exact file
-    contents to the names the "model" sees; any other image gets SCORED."""
-
-    def __init__(self):
-        super().__init__()
-        self.by_bytes = {}
-
-    def generate_tag_suggestions(self, image_path, **kwargs):
-        result = super().generate_tag_suggestions(image_path, **kwargs)
-        names = self.by_bytes.get(self.read_bytes[-1])
-        if names is None:
-            return result
-        return [(name, 0.9) for name in names][: kwargs["limit"]]
-
-
-def _strings(value):
-    if isinstance(value, str):
-        yield value
-    elif isinstance(value, dict):
-        for item in value.values():
-            yield from _strings(item)
-    elif isinstance(value, (list, tuple)):
-        for item in value:
-            yield from _strings(item)
-
-
-def _absolute(text):
-    return posixpath.isabs(text) or ntpath.isabs(text) or bool(_DRIVE.match(text))
-
-
-class BatchTestCase(ImageTagJobTestCase):
-    async def get_application(self):
-        app = await super().get_application()
-        self.tagger = PerImageTagger()
-        patcher = patch("py.autotag.get_autotag_service", return_value=self.tagger)
-        patcher.start()
-        self.addCleanup(patcher.stop)
-        backup = PromptManagerConfig.SAFETY_BACKUP
-        self.addCleanup(setattr, PromptManagerConfig, "SAFETY_BACKUP", backup)
-        PromptManagerConfig.SAFETY_BACKUP = False
-        return app
-
-    # -- helpers ---------------------------------------------------------
-
-    def image(self, name, color, sees=None):
-        path = make_png(self.output_dir / name, size=(8, 6), color=color)
-        if sees is not None:
-            self.tagger.by_bytes[path.read_bytes()] = list(sees)
-        return path
-
-    async def relist(self):
-        """Walk the output folder again (a cached listing is used as it is)."""
-        await self.api._listing(self.output_dir, fresh=True)
-
-    def prompt(self, text, tags=()):
-        return self.api.db.save_prompt(
-            text=text,
-            category=None,
-            tags=list(tags),
-            rating=None,
-            prompt_hash=generate_prompt_hash(text),
-        )
-
-    def link(self, prompt_id, path):
-        return self.api.db.link_image_to_prompt(prompt_id, str(path))
-
-    def prompt_rows(self):
-        conn = sqlite3.connect(self._temp_db.name)
-        try:
-            return {
-                table: conn.execute(f"SELECT * FROM {table} ORDER BY 1,2").fetchall()
-                for table in ("prompts", "prompt_tags")
-            }
-        finally:
-            conn.close()
-
-    def marked(self):
-        conn = sqlite3.connect(self._temp_db.name)
-        try:
-            return {
-                row[0]
-                for row in conn.execute(
-                    "SELECT f.locator FROM media_image_autotags m JOIN "
-                    "media_annotation_bytes b ON b.id=m.byte_id JOIN "
-                    "media_annotation_files f ON f.id=b.file_id"
-                )
-            }
-        finally:
-            conn.close()
-
-    async def preview(self, existing="skip", model_type="wd14-vit"):
-        response = await self.client.post(
-            PREVIEW, json={"model_type": model_type, "existing": existing}
-        )
-        return response.status, await self.json_of(response)
-
-    async def start_batch(self, existing="skip", model_type="wd14-vit", options=None):
-        if options is None:
-            options = (
-                dict(WD14)
-                if model_type.startswith("wd14")
-                else {"instructions": "Tags please."}
-            )
-        response = await self.client.post(
-            JOB,
-            json={"model_type": model_type, "existing": existing, "options": options},
-        )
-        return response.status, await self.json_of(response)
-
-    async def run_batch(self, **kwargs):
-        status, data = await self.start_batch(**kwargs)
-        self.assertEqual(status, 202, data)
-        job = self.api._jobs.get(data["job"]["id"])
-        await asyncio.wait_for(asyncio.shield(job.task), WAIT)
-        return job
-
-
-class TestPerImageWrites(BatchTestCase):
-    async def test_two_images_of_one_prompt_get_their_own_tags_and_no_prompt_changes(
-        self,
-    ):
-        prompt_id = self.prompt("a girl at the beach", tags=["beach"])
-        a = self.image("a.png", (10, 20, 30), sees=["1girl", "bird"])
-        b = self.image("b.png", (40, 50, 60), sees=["1girl", "waves"])
-        self.link(prompt_id, a)
-        self.link(prompt_id, b)
-        before = self.prompt_rows()
-
-        job = await self.run_batch(existing="skip")
-
-        self.assertEqual(job.state, "finished", job.status_line)
-        self.assertEqual(self.stored("a.png")["tags"], ["1girl", "bird"])
-        self.assertEqual(self.stored("b.png")["tags"], ["1girl", "waves"])
-        self.assertEqual(self.prompt_rows(), before)
-        self.assertEqual(self.api.db.get_prompt_by_id(prompt_id)["tags"], ["beach"])
-        self.assertEqual(self.marked(), {self.locator("a.png"), self.locator("b.png")})
-        self.assertEqual(
-            job.counters, {"tagged": 2, "unchanged": 0, "skipped": 0, "errors": 0}
-        )
-        self.assertEqual(job.status_line, "Tagged 2 images")
-        self.assertEqual((job.processed, job.total, job.progress), (2, 2, 100))
-        self.assertEqual(job.scope["images"], 2)
-        # Inference read the private captures, one per image.
-        self.assertEqual(len(self.tagger.calls), 2)
-
-    async def test_unlinked_images_are_tagged_and_videos_are_not_targets(self):
-        self.image("free.png", (1, 2, 3), sees=["tree"])
-        (self.output_dir / "clip.mp4").write_bytes(b"\x00\x00\x00\x18ftypmp42" * 8)
-
-        job = await self.run_batch()
-
-        self.assertEqual(self.stored("free.png")["tags"], ["tree"])
-        self.assertEqual(job.total, 1)
-        self.assertEqual(job.status_line, "Tagged 1 image")
-        rows = [row["path"] for rows in job.outcomes.values() for row in rows]
-        self.assertNotIn("clip.mp4", rows)
-
-    async def test_hand_tags_do_not_block_a_skip_run(self):
-        path = self.image("c.png", (7, 7, 7), sees=["bird"])
-        self.saved_set("c.png", path.read_bytes(), ["keeper"])
-
-        job = await self.run_batch(existing="skip")
-
-        self.assertEqual(self.stored("c.png")["tags"], ["keeper", "bird"])
-        self.assertEqual(job.counters["tagged"], 1)
-
-    async def test_skip_counts_marked_images_without_opening_them_and_merge_retags(
-        self,
-    ):
-        self.image("a.png", (1, 1, 1), sees=["bird"])
-        self.image("b.png", (2, 2, 2), sees=["cat"])
-        first = await self.run_batch()
-        self.assertEqual(first.counters["tagged"], 2)
-        self.tagger.calls.clear()
-
-        captures = []
-        store = self.api._capture_store()
-        real_capture = store.capture
-
-        def spy(*args, **kwargs):
-            captures.append(args)
-            return real_capture(*args, **kwargs)
-
-        with patch.object(store, "capture", side_effect=spy):
-            skipped = await self.run_batch(existing="skip")
-        self.assertEqual(captures, [])
-        self.assertEqual(self.tagger.calls, [])
-        self.assertEqual(
-            skipped.counters, {"tagged": 0, "unchanged": 0, "skipped": 2, "errors": 0}
-        )
-        self.assertEqual(
-            sorted(self.rows(skipped, "skipped")),
-            [("a.png", "Already auto-tagged"), ("b.png", "Already auto-tagged")],
-        )
-        self.assertFalse(any("Already auto-tagged" in line for line in skipped.log))
-        self.assertEqual((skipped.processed, skipped.total), (2, 2))
-        self.assertEqual(skipped.status_line, "Tagged 0 images")
-
-        self.tagger.by_bytes[(self.output_dir / "a.png").read_bytes()] = ["bird", "sky"]
-        merged = await self.run_batch(existing="merge")
-        self.assertEqual(len(self.tagger.calls), 2)
-        self.assertEqual(self.stored("a.png")["tags"], ["bird", "sky"])
-        self.assertEqual(self.rows(merged, "tagged"), [("a.png", "Added 1 tag")])
-        self.assertEqual(self.rows(merged, "unchanged"), [("b.png", "No new tags")])
-
-    async def test_changed_bytes_are_tagged_again(self):
-        self.image("a.png", (1, 1, 1), sees=["bird"])
-        await self.run_batch()
-        self.image("a.png", (9, 9, 9), sees=["cat"])
-        job = await self.run_batch(existing="skip")
-        self.assertEqual(self.rows(job, "tagged"), [("a.png", "Added 1 tag")])
-        self.assertEqual(self.stored("a.png")["tags"], ["cat"])
-
-    async def test_an_image_with_no_model_tags_is_marked_and_skipped_next_time(self):
-        self.image("plain.png", (3, 3, 3), sees=[])
-        job = await self.run_batch()
-        self.assertEqual(self.rows(job, "unchanged"), [("plain.png", "No new tags")])
-        self.assertEqual(self.marked(), {self.locator("plain.png")})
-        again = await self.run_batch()
-        self.assertEqual(
-            self.rows(again, "skipped"), [("plain.png", "Already auto-tagged")]
-        )
-
-    async def test_unsupported_still_is_marked_and_skipped_by_the_next_run(self):
-        (self.output_dir / "broken.png").write_bytes(b"not an image")
-        job = await self.run_batch()
-        self.assertEqual(
-            self.rows(job, "skipped"), [("broken.png", "Not a supported still image")]
-        )
-        self.assertEqual(self.marked(), {self.locator("broken.png")})
-        again = await self.run_batch()
-        self.assertEqual(
-            self.rows(again, "skipped"), [("broken.png", "Already auto-tagged")]
-        )
-        self.assertEqual(self.tagger.calls, [])
-
-    async def test_too_large_is_skipped_before_any_copy(self):
-        self.image("big.png", (5, 5, 5))
-        self.api._capture_store().max_file = 16
-        store = self.api._capture_store()
-        with patch.object(store, "capture", side_effect=AssertionError("copied")):
-            job = await self.run_batch()
-        self.assertEqual(
-            self.rows(job, "skipped"), [("big.png", "Too large to verify")]
-        )
-        self.assertEqual(self.marked(), set())
-
-    async def test_overlapping_roots_list_a_file_once(self):
-        self.image("sub/a.png", (4, 4, 4), sees=["bird"])
-        sub = self.output_dir / "sub"
-        self.api._get_all_output_dirs = lambda: [self.output_dir, sub]
-        job = await self.run_batch()
-        self.assertEqual(job.total, 1)
-        self.assertEqual(len(self.tagger.calls), 1)
-        self.assertEqual(self.rows(job, "tagged"), [("sub/a.png", "Added 1 tag")])
-        status, data = await self.preview()
-        self.assertEqual((status, data["images"]), (200, 1))
-
-    async def test_rows_log_and_status_carry_no_absolute_paths(self):
-        self.image("a.png", (1, 1, 1))
-        (self.output_dir / "broken.png").write_bytes(b"not an image")
-        job = await self.run_batch()
-        leaked = [s for s in _strings(job.report()) if _absolute(s)]
-        self.assertEqual(leaked, [])
-        self.assertNotIn(str(self.output_dir), json.dumps(job.report()))
-
-
-class TestBatchLifecycle(BatchTestCase):
-    async def test_cancel_after_one_image_keeps_it_and_the_rerun_skips_it(self):
-        for n in range(3):
-            self.image(f"{n}.png", (n, n, n), sees=[f"t{n}"])
-        entered, proceed = threading.Event(), threading.Event()
-        self.tagger.block = (entered, proceed)
-        status, data = await self.start_batch()
-        self.assertEqual(status, 202, data)
-        job = self.api._jobs.get(data["job"]["id"])
-        try:
-            await self.wait_for(entered)
-            cancel = await self.client.post(f"/prompt_manager/jobs/{job.id}/cancel")
-            self.assertEqual(cancel.status, 200)
-        finally:
-            self.tagger.block = None
-            proceed.set()
-        await asyncio.wait_for(asyncio.shield(job.task), WAIT)
-        self.assertEqual(job.state, "cancelled")
-        self.assertEqual(job.status_line, CANCELLED)
-        self.assertEqual(job.counters["tagged"], 1)
-        self.assertEqual(len(self.marked()), 1)
-        self.assertIsNone(model_gate.holder())
-
-        lines = []
-        real_update = type(job).update
-
-        def spy(self_job, **kwargs):
-            if kwargs.get("status_line"):
-                lines.append(kwargs["status_line"])
-            return real_update(self_job, **kwargs)
-
-        with patch.object(type(job), "update", spy):
-            rerun = await self.run_batch()
-        self.assertEqual(rerun.counters["skipped"], 1)
-        self.assertEqual(rerun.counters["tagged"], 2)
-        self.assertIn("Processing file 2 of 3", lines)
-        self.assertIn("Processing file 3 of 3", lines)
-        self.assertNotIn("Processing file 1 of 3", lines)
-        self.assertEqual((rerun.processed, rerun.total), (3, 3))
-
-    async def test_cancel_in_each_phase_writes_nothing(self):
-        self.image("a.png", (1, 1, 1))
-        for phase in (
-            "_safety_backup_step",
-            "_prepare_tagging_model",
-            "_autotag_targets",
-        ):
-            with self.subTest(phase):
-                real = getattr(self.api, phase)
-
-                async def cancelling(*args, _real=real, **kwargs):
-                    result = await _real(*args, **kwargs)
-                    self.api._jobs.active("autotag").cancelled = True
-                    return result
-
-                with patch.object(self.api, phase, side_effect=cancelling):
-                    job = await self.run_batch()
-                self.assertEqual(job.state, "cancelled")
-                self.assertEqual(job.status_line, CANCELLED)
-                self.assertEqual(self.marked(), set())
-                self.assertEqual(self.tagger.calls, [])
-                self.assertIsNone(model_gate.holder())
-
-    async def test_cancel_between_prepass_chunks_keeps_counts(self):
-        for n in range(3):
-            self.image(f"{n}.png", (n, n, n))
-        await self.run_batch()
-        seen = []
-        real = jobs_module._prepass_chunk
-
-        def chunk(db, items, skip_marked, max_file):
-            result = real(db, items, skip_marked, max_file)
-            job = self.api._jobs.active("autotag")
-            seen.append(job.processed)
-            job.cancelled = True  # cancel after the first chunk
-            return result
-
-        with (
-            patch.object(jobs_module, "PREPASS_CHUNK", 1),
-            patch.object(jobs_module, "_prepass_chunk", side_effect=chunk),
-        ):
-            job = await self.run_batch()
-        self.assertEqual(job.state, "cancelled")
-        self.assertEqual(job.counters["skipped"], 1)
-        self.assertEqual((job.processed, job.total), (1, 3))
-        self.assertEqual(seen, [0])
-
-    async def test_the_job_ends_only_after_its_cleanup(self):
-        self.image("a.png", (1, 1, 1))
-        PromptManagerConfig.SAFETY_BACKUP = True
-        states = []
-
-        async def prune(job, _db):
-            states.append((job.state, model_gate.holder() is not None))
-
-        with (
-            patch("py.api.maintenance.take_safety_backup", return_value="db.backup_x"),
-            patch.object(self.api, "_prune_backup_pool", side_effect=prune),
-        ):
-            job = await self.run_batch()
-        self.assertEqual(job.state, "finished")
-        self.assertEqual(states, [("running", True)])
-        self.assertIsNone(model_gate.holder())
-
-    async def test_prepass_publishes_its_progress(self):
-        for n in range(2):
-            self.image(f"{n}.png", (n, n, n))
-        await self.run_batch()
-        published = []
-        real = type(self.api._jobs).start
-
-        def start(registry, *args, **kwargs):
-            job = real(registry, *args, **kwargs)
-            original = job.publish
-            job.publish = lambda payload: (
-                published.append(dict(payload)),
-                original(payload),
-            )
-            return job
-
-        with patch.object(type(self.api._jobs), "start", start):
-            await self.run_batch()
-        self.assertIn({"type": "progress", "progress": 100}, published)
-        self.assertEqual(published[-1], {"type": "finished", "progress": 100})
-
-    async def test_restore_mid_run_fails_the_job(self):
-        self.image("a.png", (1, 1, 1))
-        self.image("b.png", (2, 2, 2))
-
-        def restore(_path):
-            conn = sqlite3.connect(self._temp_db.name)
-            try:
-                rotate_history_epoch(conn)
-            finally:
-                conn.close()
-
-        self.tagger.on_generate = restore
-        job = await self.run_batch()
-        self.assertEqual(job.state, "failed")
-        self.assertEqual(
-            job.status_line, "Prompt storage was restored; start the job again."
-        )
-
-    async def test_listing_error_fails_the_job(self):
-        self.image("a.png", (1, 1, 1))
-        with patch.object(
-            self.api, "_get_gallery_files", side_effect=OSError("/secret/out")
-        ):
-            job = await self.run_batch()
-        self.assertEqual(job.state, "failed")
-        self.assertEqual(
-            job.status_line, "The output folders could not be listed. Try again."
-        )
-        self.assertNotIn("/secret", json.dumps(job.report()))
-
-    async def test_model_that_cannot_load_fails_the_job(self):
-        self.image("a.png", (1, 1, 1))
-        self.tagger.load_error = RuntimeError("no CUDA")
-        job = await self.run_batch()
-        self.assertEqual(job.state, "failed")
-        self.assertEqual(
-            job.status_line, "Auto-tagging failed. Check server logs for details."
-        )
-        self.assertIsNone(model_gate.holder())
-
-    async def test_zero_targets_finish_with_tagged_zero(self):
-        job = await self.run_batch()
-        self.assertEqual(job.state, "finished")
-        self.assertEqual(job.status_line, "Tagged 0 images")
-        self.assertEqual((job.processed, job.total), (0, 0))
-
-    async def test_runner_unloads_after_a_cancel_when_not_kept_in_memory(self):
-        self.image("a.png", (1, 1, 1))
-        owner = model_gate.new_owner("legacy-batch")
-        self.assertTrue(model_gate.try_acquire(owner))
-        run = jobs_module.AutotagRun(
-            model_type="wd14-vit",
-            existing="skip",
-            options={**WD14, "use_gpu": True, "suggestion_limit": 10},
-            keep_in_memory=False,
-            backup_on=False,
-            owner=owner,
-        )
-
-        from py.api.jobs import AUTOTAG_GROUP_NAMES, Job as RealJob
-
-        job = RealJob(
-            "autotag",
-            "Tag output images",
-            admission="records",
-            groups=AUTOTAG_GROUP_NAMES,
-        )
-        real_targets = self.api._autotag_targets
-
-        async def cancel_after_listing():
-            targets = await real_targets()
-            job.cancelled = True
-            return targets
-
-        with patch.object(
-            self.api, "_autotag_targets", side_effect=cancel_after_listing
-        ):
-            await self.api._run_autotag_batch(run, job)
-        self.assertEqual(job.state, "cancelled")
-        self.assertEqual(self.tagger.unload_calls, 1)
-        self.assertIsNone(model_gate.holder())
-
-    async def test_time_left_uses_the_models_rate_only(self):
-        for n in range(4):
-            self.image(f"{n}.png", (n, n, n))
-        await self.run_batch()
-        for n in range(4, 8):
-            self.image(f"{n}.png", (n, n, n))
-        await self.relist()
-        calls = []
-        real = jobs_module._time_left
-
-        def spy(*args):
-            calls.append(args)
-            return real(*args)
-
-        with patch.object(jobs_module, "_time_left", side_effect=spy):
-            job = await self.run_batch()
-        self.assertEqual(job.counters["skipped"], 4)
-        # (done, total, batches, elapsed): over the 4 images the model runs on.
-        self.assertEqual(
-            [(c[0], c[1], c[2]) for c in calls], [(n, 4, n) for n in range(4)]
-        )
-        # The shared D56 text is unchanged.
-        self.assertEqual(admin_module._time_left(5, 10, 5, 300), " · about 5 min left")
-
-
-class TestStartRefusals(BatchTestCase):
-    async def test_unavailable_model_and_bad_bodies(self):
-        self.tagger.downloaded["wd14-vit"] = False
-        status, data = await self.start_batch()
-        self.assertEqual((status, data["code"]), (409, "model-unavailable"))
-        status, data = await self.start_batch(existing="replace_after_review")
-        self.assertEqual((status, data["code"]), (400, "review-required"))
-        status, _data = await self.start_batch(options={**WD14, "suggestion_limit": 3})
-        self.assertEqual(status, 400)
-        self.assertEqual(self.api._jobs.list(), [])
-        self.assertIsNone(model_gate.holder())
-
-    async def test_model_busy_when_the_gate_is_held(self):
-        owner = model_gate.new_owner("image-annotations")
-        self.assertTrue(model_gate.try_acquire(owner))
-        try:
-            status, data = await self.start_batch()
-        finally:
-            model_gate.release(owner)
-        self.assertEqual((status, data["code"]), (409, "model-busy"))
-
-
-class TestBatchBeside(BatchTestCase):
-    async def test_legacy_batch_and_unload_are_refused_while_the_job_runs(self):
-        self.image("a.png", (1, 1, 1))
-        entered, proceed = threading.Event(), threading.Event()
-        self.tagger.block = (entered, proceed)
-        status, data = await self.start_batch()
-        self.assertEqual(status, 202, data)
-        job = self.api._jobs.get(data["job"]["id"])
-        try:
-            await self.wait_for(entered)
-            self.assertTrue(model_gate.holder().startswith("autotag-job:"))
-            legacy = await self.client.post("/prompt_manager/autotag/start")
-            self.assertEqual(legacy.status, 200)
-            frames = [
-                json.loads(line[len("data: ") :])
-                for line in (await legacy.text()).splitlines()
-                if line.startswith("data: ")
-            ]
-            self.assertEqual(
-                frames,
-                [
-                    {
-                        "type": "error",
-                        "status": "error",
-                        "message": "Tag output images already running",
-                    }
-                ],
-            )
-            unload = await self.client.post("/prompt_manager/autotag/unload")
-            self.assertEqual((await unload.json())["operation"], "Tag output images")
-        finally:
-            self.tagger.block = None
-            proceed.set()
-        await asyncio.wait_for(asyncio.shield(job.task), WAIT)
-        self.assertEqual(job.state, "finished")
-
-    async def test_language_model_batch_passes_instructions_per_call(self):
-        self.image("a.png", (1, 1, 1))
-        job = await self.run_batch(model_type="gguf")
-        self.assertEqual(job.state, "finished", job.status_line)
-        self.assertEqual(self.tagger.calls[0]["prompt"], "Tags please.")
-        self.assertEqual(self.tagger.custom_prompt, "legacy prompt")
-
-    async def test_inference_errors_are_fixed_strings_and_not_marked(self):
-        self.image("a.png", (1, 1, 1))
-
-        def explode(_path):
-            raise RuntimeError("/srv/secret/model exploded")
-
-        self.tagger.on_generate = explode
-        job = await self.run_batch()
-        self.assertEqual(
-            self.rows(job, "errors"),
-            [("a.png", "Auto-tagging failed. Check server logs for details.")],
-        )
-        self.assertNotIn("/srv/secret", json.dumps(job.report()))
-        self.assertEqual(self.marked(), set())
-
-
-class TestPreview(BatchTestCase):
-    async def test_preview_counts_images_and_estimates_time(self):
-        prompt_id = self.prompt("p")
-        a = self.image("a.png", (1, 1, 1))
-        self.image("b.png", (2, 2, 2))
-        self.image("c.png", (3, 3, 3))
-        self.link(prompt_id, a)
-        (self.output_dir / "clip.mp4").write_bytes(b"\x00\x00\x00\x18ftypmp42" * 8)
-        status, fresh = await self.preview()
-        self.assertEqual(status, 200, fresh)
-        self.assertEqual(
-            {k: fresh[k] for k in ("images", "already_tagged", "to_tag")},
-            {"images": 3, "already_tagged": 0, "to_tag": 3},
-        )
-        self.assertNotIn("prompts", fresh)
-        self.assertEqual(fresh["suggestion_limit"], 10)
-        self.assertEqual(fresh["estimate_device"], "cpu")
-        self.assertAlmostEqual(fresh["estimate_seconds"], 3 * 1.6)
-
-        self.tagger.block = None
-        await self.run_batch()
-        self.image("d.png", (4, 4, 4))
-        await self.relist()
-        skip = (await self.preview("skip"))[1]
-        self.assertEqual(
-            {k: skip[k] for k in ("images", "already_tagged", "to_tag")},
-            {"images": 4, "already_tagged": 3, "to_tag": 1},
-        )
-        merge = (await self.preview("merge"))[1]
-        self.assertEqual(merge["to_tag"], 4)
-        for model_type in ("gguf", "hf"):
-            llm = (await self.preview(model_type=model_type))[1]
-            self.assertIsNone(llm["estimate_seconds"])
-            self.assertIsNone(llm["estimate_device"])
-        self.assertEqual([s for s in _strings(skip) if _absolute(s)], [])
-
-    async def test_preview_uses_the_graphics_card_rate_when_wd14_runs_on_cuda(self):
-        self.image("a.png", (1, 1, 1))
-        self.tagger.wd14_device = lambda: "gpu"
-        data = (await self.preview())[1]
-        self.assertEqual(data["estimate_device"], "gpu")
-        from py.tagging_defaults import WD14_GPU_SECONDS_PER_IMAGE
-
-        self.assertAlmostEqual(data["estimate_seconds"], WD14_GPU_SECONDS_PER_IMAGE)
-
-    async def test_preview_writes_nothing_and_opens_no_media_file(self):
-        self.image("a.png", (1, 1, 1))
-        await self.run_batch()
-        self.image("b.png", (2, 2, 2))
-        await self.relist()  # the listing, primed
-        files = [self._temp_db.name + suffix for suffix in ("", "-wal")]
-        before = [Path(f).read_bytes() if os.path.exists(f) else None for f in files]
-        media = str(self.output_dir)
-        real_open, real_stat = open, os.stat
-
-        def guarded_open(file, *args, **kwargs):
-            if str(file).startswith(media):
-                raise AssertionError(f"opened {file}")
-            return real_open(file, *args, **kwargs)
-
-        def guarded_stat(path, *args, **kwargs):
-            if str(path).startswith(media) and str(path) != media:
-                raise AssertionError(f"stat {path}")
-            return real_stat(path, *args, **kwargs)
-
-        with patch("builtins.open", guarded_open), patch("os.stat", guarded_stat):
-            status, data = await self.preview()
-        self.assertEqual(status, 200, data)
-        after = [Path(f).read_bytes() if os.path.exists(f) else None for f in files]
-        self.assertEqual(after, before)
-        self.assertEqual(data["to_tag"], 1)
-        self.assertEqual(self.tagger.calls[1:], [])

tests/test_autotag_engine.py

@@ -884,29 +884,3 @@ class TestImageConversion(EngineTestCase):
 
 if __name__ == "__main__":
     unittest.main()
-
-
-class TestWd14Device(EngineTestCase):
-    """Where WD14 runs, for the Tag output images estimate (#379)."""
-
-    def test_loaded_session_answers_from_its_first_provider(self):
-        cpu = FakeOnnxSession([0.5] * len(WD14_TAGS))
-        service = self._service(("wd14", (cpu, WD14_TAGS)))
-        _touch_model_files(self.models_dir, "wd14-vit")
-        service.load_model("wd14-vit")
-        self.assertEqual(service.wd14_device(), "cpu")
-        cpu.get_providers = lambda: ["CUDAExecutionProvider", "CPUExecutionProvider"]
-        self.assertEqual(service.wd14_device(), "gpu")
-
-    def test_without_a_session_the_available_providers_answer(self):
-        service = self._service(None)
-        fake = types.SimpleNamespace(
-            get_available_providers=lambda: ["CUDAExecutionProvider"]
-        )
-        with patch.dict(sys.modules, {"onnxruntime": fake}):
-            self.assertEqual(service.wd14_device(), "gpu")
-        fake.get_available_providers = lambda: ["CPUExecutionProvider"]
-        with patch.dict(sys.modules, {"onnxruntime": fake}):
-            self.assertEqual(service.wd14_device(), "cpu")
-        with patch.dict(sys.modules, {"onnxruntime": None}):
-            self.assertEqual(service.wd14_device(), "cpu")

tests/test_autotag_schema.py

@@ -1,318 +0,0 @@
-"""Auto-tagged marks schema group (#379): install, validation and restore."""
-
-import hashlib
-import re
-import shutil
-import sqlite3
-import tempfile
-import unittest
-from contextlib import closing
-from pathlib import Path
-
-try:
-    from tests.open_handles import assert_closed
-except ImportError:  # discovered with tests/ as the top-level directory
-    from open_handles import assert_closed
-
-from database.models import PromptModel
-
-try:  # guarded so a missing module fails assertions, not test loading
-    from database.autotag_schema import (
-        AUTOTAG_TABLE,
-        autotag_schema_error,
-        autotag_without_annotations_error,
-        migrate_autotag_state,
-    )
-except ImportError:
-    AUTOTAG_TABLE = None
-    autotag_schema_error = None
-    autotag_without_annotations_error = None
-    migrate_autotag_state = None
-
-TABLE = "media_image_autotags"
-DDL = (
-    f"CREATE TABLE {TABLE} (byte_id TEXT PRIMARY KEY "
-    "REFERENCES media_annotation_bytes(id) ON DELETE CASCADE) WITHOUT ROWID"
-)
-ANNOTATION_TABLES = (
-    "media_annotation_metadata",
-    "media_annotation_files",
-    "media_annotation_bytes",
-    "media_image_tags",
-)
-REVIEW_TABLES = (
-    "media_review_metadata",
-    "media_review_items",
-    "media_review_decisions",
-)
-FILE_ID = "0f8e4b2a-1c3d-4e5f-8a9b-0c1d2e3f4a5b"
-BYTE_ID = "6a1b2c3d-4e5f-4a6b-8c9d-0e1f2a3b4c5d"
-OTHER_ID = "7b2c3d4e-5f6a-4b7c-9d0e-1f2a3b4c5d6e"
-DIGEST = hashlib.sha256(b"img").hexdigest()
-NOW = "2026-10-27T00:00:00.000000+00:00"
-NEEDS_ANNOTATIONS = "Image auto-tag marks need the image annotation tables"
-INVALID_VALUES = "Image auto-tag marks contain invalid values"
-INVALID_SCHEMA = "Image auto-tag marks have an invalid schema"
-
-
-def _compact(sql):
-    return re.sub(r"\s+", "", sql or "").lower()
-
-
-def catalog(conn):
-    return {
-        (kind, name, _compact(sql))
-        for kind, name, sql in conn.execute(
-            "SELECT type,name,sql FROM sqlite_master WHERE name=? OR tbl_name=?",
-            (TABLE, TABLE),
-        )
-    }
-
-
-def marks(conn):
-    return [tuple(row) for row in conn.execute(f"SELECT byte_id FROM {TABLE}")]
-
-
-def insert_byte(conn, file_id=FILE_ID, byte_id=BYTE_ID, locator="/out/img.png"):
-    conn.execute(
-        "INSERT INTO media_annotation_files VALUES(?,?,?)", (file_id, locator, NOW)
-    )
-    conn.execute(
-        "INSERT INTO media_annotation_bytes VALUES(?,?,?,?,?,?,?,0)",
-        (byte_id, file_id, DIGEST, 3, 1_700_000_000_000_000_000, NOW, NOW),
-    )
-
-
-class AutotagSchemaTests(unittest.TestCase):
-    def setUp(self):
-        self.temp = tempfile.TemporaryDirectory()
-        self.addCleanup(self.temp.cleanup)
-        self.addCleanup(assert_closed, self, self.temp.name)
-        self.addCleanup(PromptModel.reset_schema_cache)
-        self.models = []
-        self.addCleanup(self.close_models)
-        self.path = str(Path(self.temp.name) / "live.db")
-
-    def close_models(self):
-        for model in self.models:
-            model.close_all()
-
-    def model(self, path=None):
-        model = PromptModel(path or self.path)
-        self.models.append(model)
-        return model
-
-    def require_module(self):
-        self.assertIsNotNone(
-            autotag_schema_error, "database.autotag_schema is not implemented"
-        )
-
-    def raw(self, path, *statements, foreign_keys=False):
-        with closing(sqlite3.connect(path)) as raw, raw:
-            raw.execute(f"PRAGMA foreign_keys={'ON' if foreign_keys else 'OFF'}")
-            for statement in statements:
-                if isinstance(statement, tuple):
-                    raw.execute(*statement)
-                else:
-                    raw.execute(statement)
-
-    def closed_current(self, name="current.db", *, with_mark=True):
-        """A closed, current database with one byte record (and its mark)."""
-        path = str(Path(self.temp.name) / name)
-        model = self.model(path)
-        with model.get_connection() as conn:
-            insert_byte(conn)
-            if with_mark:
-                conn.execute(f"INSERT INTO {TABLE} VALUES(?)", (BYTE_ID,))
-        model.close_all()
-        return path
-
-    def test_fresh_install_has_exactly_the_pinned_table(self):
-        self.require_module()
-        self.assertEqual(AUTOTAG_TABLE, TABLE)
-        model = self.model()
-        with model.get_connection() as conn:
-            # WITHOUT ROWID with a primary key: no sqlite_autoindex row.
-            self.assertEqual(catalog(conn), {("table", TABLE, _compact(DDL))})
-            self.assertEqual(
-                [tuple(row) for row in conn.execute(f"PRAGMA table_info({TABLE})")],
-                [(0, "byte_id", "TEXT", 1, None, 1)],
-            )
-            self.assertIsNone(autotag_schema_error(conn, allow_missing=False))
-            self.assertEqual(marks(conn), [])
-        self.assertEqual(
-            PromptModel.verify_database_file(self.path, require_library_state=True),
-            (True, "ok"),
-        )
-
-    def test_reopen_and_rerun_are_idempotent(self):
-        self.require_module()
-        path = self.closed_current()
-        for _ in range(2):
-            PromptModel.reset_schema_cache()
-            model = self.model(path)
-            with model.get_connection() as conn:
-                migrate_autotag_state(conn)
-                self.assertEqual(marks(conn), [(BYTE_ID,)])
-                self.assertEqual(catalog(conn), {("table", TABLE, _compact(DDL))})
-            model.close_all()
-
-    def test_old_database_without_the_table_gains_it_and_keeps_its_rows(self):
-        self.require_module()
-        path = self.closed_current(with_mark=False)
-        self.raw(path, f"DROP TABLE {TABLE}")
-        with closing(sqlite3.connect(path)) as raw:
-            before = raw.execute("SELECT * FROM media_annotation_bytes").fetchall()
-            self.assertIsNone(autotag_schema_error(raw))
-            self.assertEqual(
-                autotag_schema_error(raw, allow_missing=False),
-                "Missing image auto-tag marks schema",
-            )
-        self.assertTrue(PromptModel.verify_database_file(path)[0])
-        self.assertEqual(
-            PromptModel.verify_database_file(path, require_library_state=True),
-            (False, "Missing image auto-tag marks schema"),
-        )
-        PromptModel.reset_schema_cache()
-        model = self.model(path)
-        with model.get_connection() as conn:
-            self.assertEqual(catalog(conn), {("table", TABLE, _compact(DDL))})
-            self.assertEqual(
-                [
-                    tuple(row)
-                    for row in conn.execute("SELECT * FROM media_annotation_bytes")
-                ],
-                before,
-            )
-        model.close_all()
-
-    def test_table_without_annotation_group_is_refused(self):
-        self.require_module()
-        path = self.closed_current(with_mark=False)
-        self.raw(
-            path,
-            *(
-                f"DROP TABLE {t}"
-                for t in REVIEW_TABLES + tuple(reversed(ANNOTATION_TABLES))
-            ),
-        )
-        with closing(sqlite3.connect(path)) as raw:
-            self.assertEqual(autotag_without_annotations_error(raw), NEEDS_ANNOTATIONS)
-            for allow_missing in (True, False):
-                self.assertEqual(
-                    autotag_schema_error(raw, allow_missing=allow_missing),
-                    NEEDS_ANNOTATIONS,
-                )
-        self.assertEqual(
-            PromptModel.verify_database_file(path), (False, NEEDS_ANNOTATIONS)
-        )
-        PromptModel.reset_schema_cache()
-        with self.assertRaises(sqlite3.DatabaseError) as raised:
-            self.model(path)
-        self.assertIn(NEEDS_ANNOTATIONS, str(raised.exception))
-
-    def test_invalid_values_are_refused_without_repair(self):
-        self.require_module()
-        cases = {
-            "not-a-uuid": (f"INSERT INTO {TABLE} VALUES('not-a-uuid')",),
-            "upper-uuid": ((f"INSERT INTO {TABLE} VALUES(?)", (OTHER_ID.upper(),)),),
-            "dangling": ((f"INSERT INTO {TABLE} VALUES(?)", (OTHER_ID,)),),
-        }
-        for name, statements in cases.items():
-            with self.subTest(name):
-                path = self.closed_current(f"{name}.db", with_mark=False)
-                self.raw(path, *statements)
-                with closing(sqlite3.connect(path)) as raw:
-                    self.assertEqual(autotag_schema_error(raw), INVALID_VALUES)
-                    before = marks(raw)
-                self.assertEqual(
-                    PromptModel.verify_database_file(path), (False, INVALID_VALUES)
-                )
-                PromptModel.reset_schema_cache()
-                with self.assertRaises(sqlite3.DatabaseError):
-                    self.model(path)
-                with closing(sqlite3.connect(path)) as raw:
-                    self.assertEqual(marks(raw), before)
-
-    def test_altered_definitions_are_refused(self):
-        self.require_module()
-        cases = {
-            "rowid": f"CREATE TABLE {TABLE} (byte_id TEXT PRIMARY KEY "
-            "REFERENCES media_annotation_bytes(id) ON DELETE CASCADE)",
-            "restrict": f"CREATE TABLE {TABLE} (byte_id TEXT PRIMARY KEY "
-            "REFERENCES media_annotation_bytes(id) ON DELETE RESTRICT) WITHOUT ROWID",
-            "extra column": f"CREATE TABLE {TABLE} (byte_id TEXT PRIMARY KEY "
-            "REFERENCES media_annotation_bytes(id) ON DELETE CASCADE, engine TEXT) "
-            "WITHOUT ROWID",
-        }
-        for name, ddl in cases.items():
-            with self.subTest(name):
-                path = self.closed_current(f"{name}.db", with_mark=False)
-                self.raw(path, f"DROP TABLE {TABLE}", ddl)
-                with closing(sqlite3.connect(path)) as raw:
-                    self.assertEqual(autotag_schema_error(raw), INVALID_SCHEMA)
-                self.assertFalse(PromptModel.verify_database_file(path)[0])
-        path = self.closed_current("index.db", with_mark=False)
-        self.raw(path, f"CREATE INDEX idx_extra ON {TABLE}(byte_id)")
-        with closing(sqlite3.connect(path)) as raw:
-            self.assertEqual(autotag_schema_error(raw), INVALID_SCHEMA)
-
-    def test_deleting_the_byte_record_cascades_to_its_mark(self):
-        self.require_module()
-        model = self.model()
-        with model.get_connection() as conn:
-            insert_byte(conn)
-            conn.execute(f"INSERT INTO {TABLE} VALUES(?)", (BYTE_ID,))
-            conn.execute(f"INSERT OR IGNORE INTO {TABLE} VALUES(?)", (BYTE_ID,))
-            self.assertEqual(marks(conn), [(BYTE_ID,)])
-            conn.execute("DELETE FROM media_annotation_files")
-            self.assertEqual(marks(conn), [])
-
-    def test_restore_of_a_pre_change_backup_migrates(self):
-        self.require_module()
-        src = self.closed_current("backup.db", with_mark=False)
-        self.raw(src, f"DROP TABLE {TABLE}")
-        live = self.model()
-        live.restore_from_file(src)
-        with closing(sqlite3.connect(self.path)) as raw:
-            self.assertEqual(catalog(raw), {("table", TABLE, _compact(DDL))})
-            self.assertEqual(
-                raw.execute("SELECT id FROM media_annotation_bytes").fetchall(),
-                [(BYTE_ID,)],
-            )
-        self.assertEqual(
-            PromptModel.verify_database_file(self.path, require_library_state=True),
-            (True, "ok"),
-        )
-        with closing(sqlite3.connect(src)) as raw:  # the source is untouched
-            self.assertEqual(catalog(raw), set())
-
-    def test_install_failure_rolls_back(self):
-        self.require_module()
-        src = self.closed_current("copy.db", with_mark=False)
-        self.raw(src, f"DROP TABLE {TABLE}")
-        path = str(Path(self.temp.name) / "rollback.db")
-        shutil.copyfile(src, path)
-        with closing(sqlite3.connect(path)) as raw:
-            raw.execute("BEGIN")
-            raw.execute("CREATE TABLE marker(x)")
-            # An invalid group already present: nothing created, outer work kept.
-            raw.execute(f"CREATE TABLE {TABLE}(byte_id TEXT)")
-            with self.assertRaises(sqlite3.DatabaseError):
-                migrate_autotag_state(raw)
-            self.assertEqual(
-                raw.execute(
-                    f"SELECT sql FROM sqlite_master WHERE name='{TABLE}'"
-                ).fetchone()[0],
-                f"CREATE TABLE {TABLE}(byte_id TEXT)",
-            )
-            self.assertIsNotNone(
-                raw.execute(
-                    "SELECT 1 FROM sqlite_master WHERE name='marker'"
-                ).fetchone()
-            )
-            raw.rollback()
-
-
-if __name__ == "__main__":
-    unittest.main()

tests/test_browser_fast_reset.py

@@ -1,335 +0,0 @@
-"""Browser-test resets seed a scratch copy and publish it in one commit (#384)."""
-
-import hashlib
-import os
-import sqlite3
-import subprocess
-import sys
-import tempfile
-import threading
-import time
-import types
-import unittest
-from pathlib import Path
-from unittest import mock
-
-try:
-    from tests.open_handles import assert_closed
-except ImportError:  # discovered with tests/ as the top-level directory
-    from open_handles import assert_closed
-
-from database.operations import PromptDatabase
-from tests.browser import fast_reset
-from tests.browser.fast_reset import ScratchSeeder, table_digests
-
-
-def digests(db: PromptDatabase) -> dict:
-    return table_digests(db.model.get_connection())
-
-
-def add_prompt(db: PromptDatabase, text: str) -> int:
-    with db.model.get_connection() as conn:
-        return conn.execute(
-            "INSERT INTO prompts (text, hash, created_at, updated_at) "
-            "VALUES (?, ?, '2026-01-01 00:00:00', '2026-01-01 00:00:00')",
-            (text, hashlib.sha256(text.encode()).hexdigest()),
-        ).lastrowid
-
-
-def add_image(db: PromptDatabase, prompt_id: int, name: str) -> int:
-    with db.model.get_connection() as conn:
-        return conn.execute(
-            "INSERT INTO generated_images (prompt_id, image_path, filename, "
-            "generation_time) VALUES (?, ?, ?, '2026-01-01 00:00:00')",
-            (prompt_id, f"/out/{name}", name),
-        ).lastrowid
-
-
-def reseed(api) -> str:
-    """A seeder in the old style: clears its tables, then many small commits."""
-    db = api.db
-    with db.model.get_connection() as conn:
-        for table in ("generated_images", "prompt_tags", "tags", "prompts"):
-            conn.execute(f"DELETE FROM {table}")
-    for index in range(30):
-        prompt_id = add_prompt(db, f"seeded {index}")
-        add_image(db, prompt_id, f"seeded-{index}.png")
-        with db.model.get_connection() as conn:
-            tag_id = conn.execute(
-                "INSERT INTO tags (name) VALUES (?)", (f"tag{index}",)
-            ).lastrowid
-            conn.execute(
-                "INSERT INTO prompt_tags (prompt_id, tag_id) VALUES (?, ?)",
-                (prompt_id, tag_id),
-            )
-    return "manifest"
-
-
-class TestScratchSeeder(unittest.TestCase):
-    def setUp(self):
-        self.tmp = tempfile.TemporaryDirectory()
-        self.addCleanup(self.tmp.cleanup)
-        self.root = Path(self.tmp.name)
-        self.addCleanup(assert_closed, self, self.tmp.name)
-        self.live = self.database("live.db")
-        self.api = types.SimpleNamespace(db=self.live, marker="live api")
-        self.seeder = ScratchSeeder(self.api, self.root / "scratch", memory_root=None)
-        self.addCleanup(self.seeder.close)
-        # Rows from "earlier tests": AUTOINCREMENT positions have moved on.
-        for index in range(5):
-            add_image(self.live, add_prompt(self.live, f"old {index}"), f"o{index}")
-        with self.live.model.get_connection() as conn:
-            conn.execute("DELETE FROM prompts WHERE text = 'old 4'")
-
-    def database(self, name: str) -> PromptDatabase:
-        db = PromptDatabase(str(self.root / name))
-        self.addCleanup(db.close_all)
-        return db
-
-    def oracle(self, seed):
-        """Run ``seed`` the old way, on a copy of the live database."""
-        path = self.root / "oracle.db"
-        target = sqlite3.connect(path)
-        try:
-            self.live.model.get_connection().backup(target)
-        finally:
-            target.close()
-        db = self.database("oracle.db")
-        seed(types.SimpleNamespace(db=db))
-        return digests(db)
-
-    def test_publishes_exactly_what_the_seed_writes_on_live(self):
-        expected = self.oracle(reseed)
-        self.assertEqual(self.seeder.run(reseed), "manifest")
-        self.assertEqual(digests(self.live), expected)
-        with self.live.model.get_connection() as conn:
-            first = conn.execute("SELECT MIN(id) FROM prompts").fetchone()[0]
-        self.assertEqual(first, 6, "AUTOINCREMENT continues as on live")
-
-    def test_runs_twice_from_the_state_the_first_run_left(self):
-        self.seeder.run(reseed)
-        expected = self.oracle(reseed)
-        self.seeder.run(reseed)
-        self.assertEqual(digests(self.live), expected)
-
-    def test_tables_the_seed_did_not_change_keep_their_rows(self):
-        before = digests(self.live)
-
-        def rename(api):
-            with api.db.model.get_connection() as conn:
-                conn.execute("UPDATE prompts SET text = 'renamed' WHERE id = 1")
-
-        self.seeder.run(rename)
-        after = digests(self.live)
-        changed = {table for table in after if after[table] != before[table]}
-        self.assertEqual(changed, {"prompts"})
-        with self.live.model.get_connection() as conn:
-            images = conn.execute("SELECT COUNT(*) FROM generated_images").fetchone()
-        # Replacing prompts' rows never cascades into generated_images.
-        self.assertEqual(images[0], 4)
-
-    def test_the_seed_sees_the_scratch_database_and_the_live_api(self):
-        seen = {}
-
-        def seed(api):
-            seen["db"] = api.db
-            seen["marker"] = api.marker
-            api.note = "set by the seed"
-
-        self.seeder.run(seed)
-        self.assertIsNot(seen["db"], self.live)
-        self.assertNotEqual(seen["db"].model.db_path, self.live.model.db_path)
-        self.assertEqual(seen["marker"], "live api")
-        self.assertEqual(self.api.note, "set by the seed")
-        self.assertIs(self.api.db, self.live)
-
-    def test_cache_drops_wait_until_the_rows_are_published(self):
-        seen = []
-
-        def invalidate_gallery_cache(retire=False):
-            with self.live.model.get_connection() as conn:
-                count = conn.execute("SELECT COUNT(*) FROM tags").fetchone()[0]
-            seen.append((count, retire))
-
-        self.api.invalidate_gallery_cache = invalidate_gallery_cache
-
-        def seed(api):
-            reseed(api)
-            api.invalidate_gallery_cache(retire=True)
-            self.assertEqual(seen, [], "not dropped while live has the old rows")
-
-        self.seeder.run(seed)
-        self.assertEqual(seen, [(30, True)])
-
-    def test_a_failing_seed_drops_no_cache(self):
-        seen = []
-        self.api.invalidate_gallery_cache = lambda: seen.append(True)
-
-        def broken(api):
-            api.invalidate_gallery_cache()
-            raise ValueError("seed failed")
-
-        with self.assertRaises(ValueError):
-            self.seeder.run(broken)
-        self.assertEqual(seen, [])
-
-    def test_a_failing_seed_leaves_live_untouched(self):
-        before = digests(self.live)
-
-        def broken(api):
-            reseed(api)
-            raise ValueError("seed failed")
-
-        with self.assertRaisesRegex(ValueError, "seed failed"):
-            self.seeder.run(broken)
-        self.assertEqual(digests(self.live), before)
-        self.assertIs(self.api.db, self.live)
-
-    def test_a_concurrent_live_commit_fails_the_reset(self):
-        other = self.database("live.db")
-
-        def racing(api):
-            reseed(api)
-            add_prompt(other, "written to live meanwhile")
-
-        with self.assertRaisesRegex(RuntimeError, "changed while"):
-            self.seeder.run(racing)
-        with self.live.model.get_connection() as conn:
-            texts = [row[0] for row in conn.execute("SELECT text FROM prompts")]
-        self.assertIn("written to live meanwhile", texts)
-        self.assertNotIn("seeded 0", texts)
-
-    def test_a_write_open_during_the_seed_and_committed_later_fails_it(self):
-        other = self.database("live.db")
-        began, finished = threading.Event(), []
-
-        def write():
-            with other.model.get_connection() as conn:
-                conn.execute("BEGIN IMMEDIATE")
-                conn.execute(
-                    "INSERT INTO prompts (text, hash) VALUES ('concurrent', 'c')"
-                )
-                began.set()
-                time.sleep(0.5)  # the publish waits on this lock meanwhile
-            other.model.close()
-            finished.append(True)
-
-        writer = threading.Thread(target=write)
-
-        def racing(api):
-            reseed(api)
-            writer.start()
-            self.assertTrue(began.wait(10))
-
-        with self.assertRaisesRegex(RuntimeError, "changed while"):
-            self.seeder.run(racing)
-        writer.join()
-        self.assertEqual(finished, [True])
-        with self.live.model.get_connection() as conn:
-            texts = [row[0] for row in conn.execute("SELECT text FROM prompts")]
-        self.assertIn("concurrent", texts)
-        self.assertNotIn("seeded 0", texts)
-        self.assert_live_connection_restored()
-
-    def test_a_failed_publish_leaves_live_and_its_connection_as_they_were(self):
-        before = digests(self.live)
-        columns = fast_reset._columns
-
-        def broken_columns(conn, table, *schema):
-            # The publish asks for the live table's columns without a schema.
-            return columns(conn, table, *schema) if schema else ["no_such_column"]
-
-        with mock.patch.object(fast_reset, "_columns", broken_columns):
-            with self.assertRaises(sqlite3.OperationalError):
-                self.seeder.run(reseed)
-        self.assertEqual(digests(self.live), before)
-        self.assert_live_connection_restored()
-
-    def assert_live_connection_restored(self):
-        conn = self.live.model.get_connection()
-        self.assertFalse(conn.in_transaction)
-        self.assertEqual(conn.execute("PRAGMA foreign_keys").fetchone()[0], 1)
-        names = [row[1] for row in conn.execute("PRAGMA database_list")]
-        self.assertEqual(names, ["main"])
-
-    def test_the_live_connection_is_left_as_it_was(self):
-        self.seeder.run(reseed)
-        conn = self.live.model.get_connection()
-        self.assertFalse(conn.in_transaction)
-        self.assertEqual(conn.execute("PRAGMA foreign_keys").fetchone()[0], 1)
-        names = [row[1] for row in conn.execute("PRAGMA database_list")]
-        self.assertEqual(names, ["main"])
-        self.assertEqual(conn.execute("PRAGMA foreign_key_check").fetchall(), [])
-
-    def test_on_live_mode_runs_the_seed_on_the_live_api(self):
-        seeder = ScratchSeeder(
-            self.api, self.root / "unused", on_live=True, memory_root=self.root
-        )
-        self.addCleanup(seeder.close)
-        expected = self.oracle(reseed)
-        seen = []
-        self.assertEqual(
-            seeder.run(lambda api: seen.append(api) or reseed(api)), "manifest"
-        )
-        self.assertIs(seen[0], self.api)
-        self.assertEqual(digests(self.live), expected)
-        self.assertFalse((self.root / "unused").exists())
-
-    def test_the_scratch_lives_under_the_memory_root_when_there_is_one(self):
-        memory = self.root / "memory"
-        memory.mkdir()
-        seeder = ScratchSeeder(self.api, self.root / "fallback", memory_root=memory)
-        self.addCleanup(seeder.close)
-        expected = self.oracle(reseed)
-        seeder.run(reseed)
-        self.assertEqual(digests(self.live), expected)
-        self.assertEqual(len(list(memory.glob("pm-reset-*/seed.db"))), 1)
-        self.assertFalse((self.root / "fallback").exists())
-        seeder.close()
-        self.assertEqual(list(memory.iterdir()), [])
-
-    def test_a_full_memory_root_puts_the_scratch_on_disk(self):
-        memory = self.root / "memory"
-        memory.mkdir()
-        seeder = ScratchSeeder(self.api, self.root / "fallback", memory_root=memory)
-        self.addCleanup(seeder.close)
-        full = mock.patch.object(
-            fast_reset.shutil,
-            "disk_usage",
-            return_value=types.SimpleNamespace(free=fast_reset.MEMORY_FREE_BYTES - 1),
-        )
-        with full:
-            seeder.run(reseed)
-        self.assertEqual(list(memory.iterdir()), [])
-        self.assertTrue((self.root / "fallback" / "seed.db").exists())
-
-    @unittest.skipUnless(os.name == "posix", "process probe is POSIX only")
-    def test_scratch_folders_of_dead_servers_are_removed(self):
-        memory = self.root / "memory"
-        memory.mkdir()
-        dead = subprocess.Popen([sys.executable, "-c", "pass"])
-        dead.wait()
-        orphan = memory / f"pm-reset-{dead.pid}-abc"
-        alive = memory / f"pm-reset-{os.getpid()}-def"
-        other = memory / "pm-reset-notapid"
-        for folder in (orphan, alive, other):
-            folder.mkdir()
-            (folder / "seed.db").write_bytes(b"x")
-        seeder = ScratchSeeder(self.api, self.root / "fallback", memory_root=memory)
-        self.addCleanup(seeder.close)
-        seeder.run(reseed)
-        self.assertFalse(orphan.exists())
-        self.assertTrue(alive.exists())
-        self.assertTrue(other.exists())
-        own = [p for p in memory.glob(f"pm-reset-{os.getpid()}-*") if p != alive]
-        self.assertEqual(len(own), 1)
-
-    def test_close_releases_the_scratch_files(self):
-        self.seeder.run(reseed)
-        self.seeder.close()
-        assert_closed(self, self.root / "scratch")
-        self.seeder.close()  # idempotent
-
-
-if __name__ == "__main__":
-    unittest.main()

tests/test_browser_folder_trash.py

@@ -1,67 +0,0 @@
-"""Browser-test media folders are emptied by a rename, deleted later (#384)."""
-
-import tempfile
-import threading
-import unittest
-from pathlib import Path
-
-from tests.browser.folder_trash import TRASH_NAME, close_trash, replace_folder
-
-
-class TestFolderTrash(unittest.TestCase):
-    def setUp(self):
-        self.tmp = tempfile.TemporaryDirectory()
-        self.addCleanup(self.tmp.cleanup)
-        self.root = Path(self.tmp.name)
-        self.addCleanup(close_trash, self.root)
-
-    def trash_threads(self):
-        return [t for t in threading.enumerate() if t.name == "pm-reset-trash"]
-
-    def test_replaces_the_folder_with_an_empty_one(self):
-        folder = self.root / "output"
-        (folder / "nested").mkdir(parents=True)
-        (folder / "nested" / "image.png").write_bytes(b"png")
-        replace_folder(folder)
-        self.assertTrue(folder.is_dir())
-        self.assertEqual(list(folder.iterdir()), [])
-        close_trash(self.root)
-        self.assertFalse((self.root / TRASH_NAME).exists())
-        self.assertEqual(self.trash_threads(), [])
-
-    def test_a_missing_folder_is_created_without_a_trash(self):
-        replace_folder(self.root / "input")
-        self.assertTrue((self.root / "input").is_dir())
-        self.assertFalse((self.root / TRASH_NAME).exists())
-        self.assertEqual(self.trash_threads(), [])
-
-    def test_repeated_replacements_share_one_thread_and_all_are_removed(self):
-        folder = self.root / "output"
-        for number in range(5):
-            folder.mkdir(exist_ok=True)
-            (folder / f"{number}.png").write_bytes(b"png")
-            replace_folder(folder)
-        self.assertEqual(len(self.trash_threads()), 1)
-        close_trash(self.root)
-        self.assertEqual(list(folder.iterdir()), [])
-        self.assertFalse((self.root / TRASH_NAME).exists())
-        close_trash(self.root)  # idempotent
-
-
-class TestFolderTrashAfterClose(unittest.TestCase):
-    def test_a_replacement_after_close_deletes_in_place_without_a_thread(self):
-        with tempfile.TemporaryDirectory() as tmp:
-            root = Path(tmp)
-            close_trash(root)
-            folder = root / "output"
-            folder.mkdir()
-            (folder / "late.png").write_bytes(b"png")
-            replace_folder(folder)
-            self.assertEqual(list(folder.iterdir()), [])
-            self.assertFalse((root / TRASH_NAME).exists())
-            names = [t.name for t in threading.enumerate()]
-            self.assertNotIn("pm-reset-trash", names)
-
-
-if __name__ == "__main__":
-    unittest.main()

tests/test_browser_slow_reset_watch.py

@@ -221,12 +221,12 @@ class TestSlowResetOnTheServer(unittest.TestCase):
             self.assertRegex(
                 text, r"kernel: asyncio_\d+ \(0x[0-9a-f]{16}\) state \w, waiting in "
             )
-        # The plain reset seeds a scratch copy (#384), then waits to publish it.
-        self.assertRegex(text, r"line \d+ in _publish\n")
+        # The plain reset's seed() waits on its first DELETE.
+        self.assertRegex(text, r"line \d+ in seed\n")
         self.assertIn("POST /__test__/reset answered 200 after", text)
         self.assertRegex(
             text,
-            r"executor call ScratchSeeder.run: queued \d+\.\d+s, ran \d+\.\d+s",
+            r"executor call create_app.<locals>.seed: queued \d+\.\d+s, ran \d+\.\d+s",
         )
 
 

tests/test_database_backup.py

@@ -468,7 +468,6 @@ class TestRestoreFromFile(BackupTestCase):
 
     def test_restore_old_backup_without_annotations(self):
         tables = (
-            "media_image_autotags",
             "media_review_decisions",
             "media_review_items",
             "media_review_metadata",

tests/test_execution_history_hooks.py

@@ -356,8 +356,6 @@ class HistoryHooksTests(unittest.TestCase):
             self.assertGreaterEqual(time.monotonic() - began, 1.8)
             self.assertLess(time.monotonic() - began, CEILING_SECONDS)
             release.set()
-            # Drain first: the 2 s bound is not under test here (#370).
-            self.drain(registration)
             self.assertTrue(registration.dispose(2))
 
     def test_restore_disables_capture_and_clears_handles_before_fresh_epoch(self):

tests/test_execution_output_hooks.py

@@ -399,10 +399,6 @@ class OutputHooksTests(fixtures.unittest.TestCase):
             self.queue.task_done(1, history("rejected.png"), fixtures.status())
             registration.writer.invalidate()
             release.set()
-            # Let the writer work through the 1,024 queued commands first
-            # (#370's pattern): on a busy Windows runner that took longer
-            # than dispose's 2 s bound (merge queue, #382).
-            self.drain(registration)
             self.assertTrue(registration.dispose(2))
         self.assertEqual(self.outputs(0)["state"], "not_captured")
         self.assertEqual(len(self.rows()), 1)

tests/test_execution_output_writer.py

@@ -28,11 +28,6 @@ except ImportError:
 # Upper bound a blocked fake write waits for its release. Tests prove ordering
 # with events, so this only caps a failing run and never decides a pass.
 BLOCK_SECONDS = 10
-# A restore is a full verify/migrate/backup/replace cycle and is bound by the
-# disk: a busy Windows runner took over 10 s (merge queue, #382). Waits that
-# span a restore use this ceiling, which stays under the runner's 120 s hang
-# watchdog, so a real hang still fails with the thread dump.
-RESTORE_SECONDS = 90
 
 
 class OutputWriterTests(fixtures.unittest.TestCase):
@@ -322,8 +317,8 @@ class OutputWriterTests(fixtures.unittest.TestCase):
 
         Returns the patch and an event set once that rotation has returned on
         the worker. A restore is a full verify/migrate/backup/replace cycle, so
-        the handoff waits on this event with the ``RESTORE_SECONDS`` ceiling
-        instead of the short worker-behavior deadline (TESTING.md,
+        the handoff waits on this event with the generous ``BLOCK_SECONDS``
+        ceiling instead of the short worker-behavior deadline (TESTING.md,
         Windows portability preflight).
         """
         backup = os.path.join(self.directory.name, f"restore-{start.run_id}.db")
@@ -366,7 +361,7 @@ class OutputWriterTests(fixtures.unittest.TestCase):
                         )
                         with rotation:
                             self.finalization(writer, start)
-                            self.assertTrue(rotated.wait(RESTORE_SECONDS))
+                            self.assertTrue(rotated.wait(BLOCK_SECONDS))
                             self.wait_for(lambda: writer.status().pending == 0)
                         self.assertEqual(
                             self.db.get_execution_outputs(start.run_id)["state"],
@@ -408,7 +403,7 @@ class OutputWriterTests(fixtures.unittest.TestCase):
             self.assertEqual(writer.status().pending, 1)
             self.assertEqual(writer.context_budget.charged_bytes, charge)
             release.set()
-            self.assertTrue(rotated.wait(RESTORE_SECONDS))
+            self.assertTrue(rotated.wait(BLOCK_SECONDS))
             self.wait_for(lambda: writer.status().pending == 0)
         self.assertEqual(writer.context_budget.charged_bytes, 0)
         self.assertFalse(writer.status().accepting)
@@ -572,8 +567,6 @@ class OutputWriterTests(fixtures.unittest.TestCase):
                 self.assertIs(replacement.context_budget, writer.context_budget)
                 self.assertIsNone(replacement.context_budget.reserve(8388608))
                 release.set()
-                # Drain first: the 2 s bound is not under test here (#370).
-                drain_writer(writer)
                 self.assertTrue(writer.close(2))
         finally:
             release.set()
@@ -615,8 +608,6 @@ class OutputWriterTests(fixtures.unittest.TestCase):
             writer.invalidate()
             self.assertEqual(writer.context_budget.charged_bytes, 0)
             release.set()
-        # Drain first: the 2 s bound is not under test here (#370).
-        drain_writer(writer)
         self.assertTrue(writer.close(2))
 
     def test_malformed_context_omission_preserves_independent_valid_output(self):
@@ -707,8 +698,6 @@ class OutputWriterTests(fixtures.unittest.TestCase):
                 release.set()
                 invalidator.join(BLOCK_SECONDS)
             self.assertFalse(invalidator.is_alive())
-            # Drain first: the 2 s bound is not under test here (#370).
-            drain_writer(writer)
             self.assertTrue(writer.close(2))
         self.assertEqual(
             self.db.get_execution_outputs(start.run_id)["state"], "complete"

tests/test_image_monitor_singleton.py

@@ -365,39 +365,11 @@ class TestStartStop(unittest.TestCase):
     def test_stop_monitoring_reports_an_observer_stop_that_raised(self):
         fake = FakeObserver(stop_error=OSError("descriptor gone"))
         self._start_with(fake)
-        fake.stopped = True  # its thread has ended; stop() still raises
         with self.assertLogs("prompt_manager.image_monitor", "WARNING") as logs:
             self.assertFalse(self.monitor.stop_monitoring())
-        text = "\n".join(logs.output)
-        self.assertIn("Error while stopping image monitoring", text)
-        self.assertNotIn("watchdog observer still running", text)
+        self.assertIn("Error while stopping image monitoring", "\n".join(logs.output))
         fake.stop_error = None  # tearDown's stop calls stop() again
 
-    def test_the_still_running_warning_names_the_time_the_join_got(self):
-        fake = FakeObserver(stay_alive=True)
-        handler = self._start_with(fake)
-        now = [100.0]
-        recorded_close = handler.close
-
-        def close_that_uses_the_deadline(timeout=im_mod.WORKER_JOIN_SECONDS):
-            ok = recorded_close(timeout)
-            now[0] += 5.0  # a busy worker took the whole deadline
-            return ok
-
-        handler.close = close_that_uses_the_deadline
-        with (
-            patch.object(
-                im_mod, "time", types.SimpleNamespace(monotonic=lambda: now[0])
-            ),
-            self.assertLogs("prompt_manager.image_monitor", "WARNING") as logs,
-        ):
-            self.assertFalse(self.monitor.stop_monitoring(timeout=5.0))
-        self.assertEqual(fake.calls[-1], ("join", 0.0))
-        self.assertIn(
-            "watchdog observer still running after 0.0 s", "\n".join(logs.output)
-        )
-        fake.stay_alive = False  # it ends; tearDown's stop waits for it
-
     def test_stop_monitoring_without_an_observer_returns_true(self):
         self.assertTrue(self.monitor.stop_monitoring())
 

tests/test_image_tag_jobs.py

@@ -690,32 +690,6 @@ class TestFixRound(ImageTagJobTestCase):
             ],
         )
 
-    async def test_an_ended_job_shows_no_time_left(self):
-        """#379 live check: a finished or cancelled job never says "min left"."""
-        for index in range(3):
-            self.png(f"f{index}.png", color=(index, 7, 7))
-        clock = iter([0.0, 0.0, 120.0, 240.0])
-        with patch(
-            "py.api.image_tag_jobs._monotonic", side_effect=lambda: next(clock, 240.0)
-        ):
-            job = await self.run_job(self.auto_body([f"f{i}.png" for i in range(3)]))
-        self.assertEqual(job.state, "finished")
-        self.assertEqual(job.status_line, "Auto-tag finished · 3 files processed")
-
-        self.png("g0.png", color=(1, 1, 1))
-        self.png("g1.png", color=(2, 2, 2))
-        entered, proceed = threading.Event(), threading.Event()
-        self.tagger.block = (entered, proceed)
-        job = await self.start_ok(self.auto_body(["g0.png", "g1.png"]))
-        await self.wait_for(entered)
-        await self.client.post(f"/prompt_manager/jobs/{job.id}/cancel")
-        self.tagger.block = None
-        proceed.set()
-        await asyncio.wait_for(asyncio.shield(job.task), WAIT)
-        self.assertEqual(job.state, "cancelled")
-        self.assertEqual(job.status_line, "Auto-tag cancelled · 1 file processed")
-        self.assertNotIn("left", job.status_line)
-
     def maximal_target(self, number):
         """A distinct target whose path is 1024 non-ASCII code points long."""
         head = f"{number:03d}/" + ("界" * 200 + "/") * 5

tests/test_init_package.py

@@ -603,24 +603,6 @@ def hooked_app():
     )
 
 
-WAIT_SECONDS = 30  # ceiling for every Event wait (TESTING.md test rules)
-
-
-def start_busy_worker(package, folder, name="busy.png"):
-    """The image worker alive in its processing delay."""
-    handler = package._global_image_monitor.handler
-    if handler is None:
-        raise AssertionError("the package's monitor did not start")
-    handler.processing_delay = 3600
-    # Outside the watched folder, so the observer does not schedule it first.
-    path = os.path.join(folder, name)
-    with open(path, "wb") as image:
-        image.write(b"x" * 16)
-    if not handler.schedule(path) or not handler._worker.is_alive():
-        raise AssertionError("the image worker did not start")
-    return handler._worker
-
-
 class PackageTeardownCase(unittest.TestCase):
     """Each test loads its own package (#301): the teardown runs once."""
 
@@ -649,83 +631,54 @@ class PackageTeardownCase(unittest.TestCase):
         return package
 
     def busy_worker(self, package, name="busy.png"):
-        return start_busy_worker(package, self.tmp.name, name)
-
-    def hold_a_preview(self, package, *, advance, kill_releases):
-        """A preview worker held inside a fake encode that tracks a fake
-        ffmpeg, and a package clock that the monitor step moves by
-        ``advance`` seconds. Cleanups release the encode first."""
-        # Not the watched folder. Real path for both the file and the root:
-        # macOS /var vs /private/var, Windows short names.
-        previews = os.path.realpath(os.path.join(self.tmp.name, "previews"))
-        os.makedirs(previews)
-        from PIL import Image
-
-        image = os.path.join(previews, "held.png")
-        Image.new("RGB", (8, 8), "red").save(image)
-        held = types.SimpleNamespace(
-            entered=threading.Event(),
-            release=threading.Event(),
-            killed=threading.Event(),
-            stop_seen=[],
-            timeouts=[],
-            now=[100.0],
-        )
-
-        class FakeFfmpeg:
-            def poll(self):  # _track keeps only processes still running
-                return None
-
-            def kill(self):
-                held.killed.set()
-                if kill_releases:
-                    held.release.set()
-
-        def held_encode(src, dst, settings, is_video, *, stop, guard, track):
-            track(FakeFfmpeg())
-            held.entered.set()
-            held.release.wait(WAIT_SECONDS)
-            held.stop_seen.append(stop())
-            return {"action": "skipped"}
-
-        api = package.api
-        monitor = package._global_image_monitor
-        real_stop = monitor.stop_monitoring
-        real_close = api.close_auto_thumbnails
-
-        def stop_then_advance(timeout):
-            ok = real_stop(timeout)
-            held.now[0] += advance
-            return ok
-
-        def recorded_close(final=False, timeout=None):
-            held.timeouts.append(timeout)
-            return real_close(final=final, timeout=timeout)
-
-        for target, name, value in (
-            (api, "_get_all_output_dirs", lambda: [Path(previews)]),
-            (api, "_generate_one", held_encode),
-            (api, "close_auto_thumbnails", recorded_close),
-            (monitor, "stop_monitoring", stop_then_advance),
-            (package, "_clock", lambda: held.now[0]),
-        ):
-            patcher = mock.patch.object(target, name, value)
-            patcher.start()
-            self.addCleanup(patcher.stop)
-        self.assertEqual(api.queue_capture_thumbnail(image), "queued")
-        self.addCleanup(held.release.set)
-        self.assertTrue(held.entered.wait(WAIT_SECONDS), "the encode never started")
-        held.thumbnailer = api._auto_thumbnailer  # the teardown drops the API's
-        held.worker = held.thumbnailer._worker
-        # Cleanups run newest first: release the encode, then join the worker
-        # (even when an assertion failed first), then end the patches.
-        self.addCleanup(held.worker.join, WAIT_SECONDS)
-        self.addCleanup(held.release.set)
-        self.assertTrue(held.worker.is_alive())
-        return held
+        """The image worker alive in its processing delay."""
+        handler = package._global_image_monitor.handler
+        self.assertIsNotNone(handler, "the package's monitor did not start")
+        handler.processing_delay = 3600
+        # Outside the watched folder, so the observer does not schedule it first.
+        path = os.path.join(self.tmp.name, name)
+        with open(path, "wb") as image:
+            image.write(b"x" * 16)
+        self.assertTrue(handler.schedule(path))
+        self.assertTrue(handler._worker.is_alive())
+        return handler._worker
 
 
 class TestPackageTeardown(PackageTeardownCase):
+    def test_teardown_stops_every_part_once(self):
+        package = self.load()
+        monitor = package._global_image_monitor
+        observer = monitor.observer
+        tracker_thread = package._global_prompt_tracker.cleanup_thread
+        worker = self.busy_worker(package)
+
+        with self.assertLogs("prompt_manager.init", "INFO") as logs:
+            result = package._stop_background_work()
+
+        self.assertEqual(result, {"monitor": True, "thumbnails": True, "tracker": True})
+        self.assertEqual(list(result), ["monitor", "thumbnails", "tracker"])
+        self.assertIn("Background work stopped in", "\n".join(logs.output))
+        self.assertIn("monitor=ok thumbnails=ok tracker=ok", "\n".join(logs.output))
+        self.assertFalse(worker.is_alive())
+        self.assertFalse(observer.is_alive())
+        self.assertFalse(tracker_thread.is_alive())
+        result["monitor"] = False  # a copy: the stored result is unchanged
+        with mock.patch.object(monitor, "stop_monitoring") as again:
+            self.assertEqual(
+                package._stop_background_work(),
+                {"monitor": True, "thumbnails": True, "tracker": True},
+            )
+        again.assert_not_called()
+
+    def test_teardown_detaches_the_monitor_callbacks(self):
+        package = self.load()
+        monitor = package._global_image_monitor
+        self.assertIsNotNone(monitor.review_recorder)
+        package._stop_background_work()
+        self.assertIsNone(monitor.review_recorder)
+        self.assertIsNone(monitor.thumbnail_queue)
+        self.assertIsNone(monitor.output_listener)
+
     def test_an_image_in_hand_queues_no_preview_during_teardown(self):
         package = self.load()
         monitor = package._global_image_monitor
@@ -759,17 +712,11 @@ class TestPackageTeardown(PackageTeardownCase):
         self.assertIsNone(seen["worker"])
         self.assertTrue(all(result.values()), result)
 
-    def test_teardown_kills_ffmpeg_and_stops_the_preview_worker(self):
+    def test_teardown_removes_its_atexit_callback(self):
         package = self.load()
-        held = self.hold_a_preview(package, advance=4.0, kill_releases=True)
-
-        result = package._stop_background_work()
-
-        self.assertTrue(held.killed.is_set())
-        self.assertEqual(held.timeouts, [6.0])  # min(30, 10 - 4)
-        self.assertTrue(result["thumbnails"], result)
-        self.assertFalse(held.worker.is_alive())
-        self.assertEqual(held.stop_seen, [True])
+        with mock.patch("atexit.unregister", wraps=atexit.unregister) as unregister:
+            package._stop_background_work()
+        unregister.assert_called_once_with(package._stop_background_work)
 
     def test_on_cleanup_runs_the_teardown(self):
         app = hooked_app()
@@ -802,74 +749,6 @@ class TestPackageTeardown(PackageTeardownCase):
         )
 
 
-class ListHandler(logging.Handler):
-    def __init__(self):
-        super().__init__(logging.INFO)
-        self.lines = []
-
-    def emit(self, record):
-        self.lines.append(f"{record.levelname}:{record.getMessage()}")
-
-
-class TestPackageTeardownOnce(PackageTestCase):
-    """The tests that only observe one plain teardown share one package.
-
-    The teardown runs once, so it runs here in ``setUpClass`` (per-test
-    ``assertLogs`` cannot wrap it); the tests read what it recorded.
-    """
-
-    package_name = "pm_teardown_once"
-
-    @classmethod
-    def setUpClass(cls):
-        with contextlib.redirect_stdout(io.StringIO()):
-            super().setUpClass()
-        package = cls.package
-        cls.monitor = package._global_image_monitor
-        cls.observer = cls.monitor.observer
-        cls.tracker_thread = package._global_prompt_tracker.cleanup_thread
-        cls.worker = start_busy_worker(package, cls.tmp.name)
-        cls.recorder_before = cls.monitor.review_recorder
-        logger = logging.getLogger("prompt_manager.init")
-        handler, level = ListHandler(), logger.level
-        logger.addHandler(handler)
-        logger.setLevel(logging.INFO)  # otherwise set by the config
-        try:
-            with mock.patch("atexit.unregister", wraps=atexit.unregister) as unregister:
-                cls.result = package._stop_background_work()
-        finally:
-            logger.removeHandler(handler)
-            logger.setLevel(level)
-        cls.log = "\n".join(handler.lines)
-        cls.unregister_calls = unregister.call_args_list
-
-    def test_teardown_stops_every_part_once(self):
-        expected = {"monitor": True, "thumbnails": True, "tracker": True}
-        self.assertEqual(self.result, expected)
-        self.assertEqual(list(self.result), ["monitor", "thumbnails", "tracker"])
-        self.assertIn("Background work stopped in", self.log)
-        self.assertIn("monitor=ok thumbnails=ok tracker=ok", self.log)
-        self.assertFalse(self.worker.is_alive())
-        self.assertFalse(self.observer.is_alive())
-        self.assertFalse(self.tracker_thread.is_alive())
-        copy = self.package._stop_background_work()
-        copy["monitor"] = False  # a copy: the stored result is unchanged
-        with mock.patch.object(self.monitor, "stop_monitoring") as again:
-            self.assertEqual(self.package._stop_background_work(), expected)
-        again.assert_not_called()
-
-    def test_teardown_detaches_the_monitor_callbacks(self):
-        self.assertIsNotNone(self.recorder_before)
-        self.assertIsNone(self.monitor.review_recorder)
-        self.assertIsNone(self.monitor.thumbnail_queue)
-        self.assertIsNone(self.monitor.output_listener)
-
-    def test_teardown_removes_its_atexit_callback(self):
-        self.assertEqual(
-            self.unregister_calls, [mock.call(self.package._stop_background_work)]
-        )
-
-
 class TestPackageTeardownFailures(PackageTeardownCase):
     """A failing step never skips the later ones (design D14, R2)."""
 
@@ -896,50 +775,6 @@ class TestPackageTeardownFailures(PackageTeardownCase):
     def test_second_interrupt_does_not_skip_the_tracker(self):
         self.assert_tracker_stops_after(KeyboardInterrupt())
 
-    def test_an_interrupt_between_steps_still_records_the_teardown(self):
-        package = self.load(require_stopped=False)
-        real_step = package._teardown_step
-
-        def interrupted_before_the_previews(name, stop, logger):
-            if name == "the preview worker":
-                raise KeyboardInterrupt  # outside the step's own try
-            return real_step(name, stop, logger)
-
-        with (
-            mock.patch.object(
-                package, "_teardown_step", interrupted_before_the_previews
-            ),
-            mock.patch("atexit.unregister", wraps=atexit.unregister) as unregister,
-            self.assertRaises(KeyboardInterrupt),
-        ):
-            package._stop_background_work()
-        expected = {"monitor": True, "thumbnails": False, "tracker": False}
-        self.assertEqual(package._background_work_result, expected)
-        unregister.assert_called_once_with(package._stop_background_work)
-        with mock.patch.object(
-            package._global_image_monitor, "stop_monitoring"
-        ) as again:
-            self.assertEqual(package._stop_background_work(), expected)
-        again.assert_not_called()
-
-    def test_teardown_reports_a_preview_worker_still_held(self):
-        package = self.load(require_stopped=False)
-        held = self.hold_a_preview(package, advance=9.95, kill_releases=False)
-
-        with self.assertLogs("prompt_manager.init", "WARNING") as logs:
-            result = package._stop_background_work()
-
-        self.assertTrue(held.killed.is_set())
-        self.assertEqual(len(held.timeouts), 1)
-        self.assertAlmostEqual(held.timeouts[0], 0.05, places=6)
-        self.assertTrue(held.thumbnailer.closed)
-        self.assertFalse(result["thumbnails"], result)
-        self.assertRegex("\n".join(logs.output), r"not stopped in time .*thumbnails")
-        held.release.set()
-        held.worker.join(WAIT_SECONDS)
-        self.assertFalse(held.worker.is_alive())
-        self.assertEqual(held.stop_seen, [True])
-
     def test_teardown_shares_one_deadline(self):
         package = self.load(require_stopped=False)
         now = [100.0]

tests/test_inspection_semantics.py

@@ -59,7 +59,6 @@ def _minimal():
             {"class": "VAEEncode", "slot": 0, "strategy": "continue", "input": "pixels"}
         ],
         "stage_inputs": {"shaped": ["positive"], "with_model": ["samples"]},
-        "pass_through": {"skip_inputs": ["clip"]},
         "facts": {
             "configuration_outputs": {},
             "model_outputs": {},
@@ -691,18 +690,6 @@ class ValidationTest(_TableCase):
             (lambda d: d["stage_inputs"].update(shaped="pipe"), "input name"),
             (lambda d: d["stage_inputs"].update(with_model=["positive"]), "both"),
             (lambda d: d["stage_inputs"].update(shaped=["model"]), "model"),
-            (lambda d: d.pop("pass_through"), "category"),
-            (lambda d: d["pass_through"].update(extra=["x"]), "pass_through"),
-            (lambda d: d["pass_through"].update(skip_inputs="clip"), "input name"),
-            (lambda d: d["pass_through"].update(skip_inputs=[]), "input name"),
-            (
-                lambda d: d["pass_through"].update(skip_inputs=["clip", "clip"]),
-                "repeated",
-            ),
-            (
-                lambda d: d["pass_through"].update(skip_inputs=["conditioning"]),
-                "carries text",
-            ),
             (
                 lambda d: d["facts"]["configuration_outputs"].update(
                     X={"kind": "sigmas", "fields": ["steps"], "type_fields": []}

tests/test_legacy_parity_gate.py

@@ -1,187 +0,0 @@
-"""Legacy parity gate for the inspection resolver (#381, the PR #170 floor).
-
-The legacy parser (``utils.generation_params``, the port of the browser's
-``extractGenerationParams``) is the floor: a graph whose positive prompt it
-found, and that the inspection resolver resolved to the same text, must keep
-resolving to that text. ``legacy-agreement.json`` records those graphs per
-corpus: the generation-params vectors, the inspection parity fixtures, the
-local resolver golden and selection cases, and the unknown-node shapes of
-#381. A graph may join the list, never leave it; regenerate with::
-
-    python3 -m tests.test_legacy_parity_gate --write
-"""
-
-import argparse
-import json
-import unittest
-from pathlib import Path
-
-from utils import prompt_pair_resolver as resolver
-from utils.generation_params import (
-    GenerationParamsError,
-    extract_generation_params,
-    parse_js_json,
-)
-
-try:
-    from tests import inspection_parity as parity
-    from tests import local_resolver_cases as cases
-    from tests import local_resolver_selection_cases as selection
-    from tests import unknown_node_graphs as unknown
-except ImportError:  # discovered with ``-s tests``
-    import inspection_parity as parity
-    import local_resolver_cases as cases
-    import local_resolver_selection_cases as selection
-    import unknown_node_graphs as unknown
-
-HERE = Path(__file__).resolve().parent
-AGREEMENT_PATH = HERE / "fixtures" / "local-inspect" / "legacy-agreement.json"
-VECTORS_PATH = HERE / "fixtures" / "generation_params" / "vectors.json"
-NOT_FOUND = "No prompt found"
-
-
-def _parsed(value):
-    return parse_js_json(value) if isinstance(value, str) else value
-
-
-def corpora() -> dict:
-    """Corpus name to ``{case name: (prompt graph, workflow or None[, file])}``."""
-    vectors = json.loads(VECTORS_PATH.read_text(encoding="utf-8"))
-    named = {**cases.golden_cases(), **selection.selection_cases()}
-    return {
-        "generation_params": {
-            item["name"]: (_parsed(item["prompt"]), _parsed(item.get("workflow")))
-            for item in vectors
-        },
-        "inspection_parity": {
-            name: (parity.build(name)["prompt"], parity.build(name)["workflow"])
-            for name in parity.COMMITTED
-        },
-        "local_resolver": {
-            name: (
-                _parsed(records["prompt"]),
-                _parsed(records.get("workflow")),
-                records.get(cases.FILE_NAME),
-            )
-            for name, records in named.items()
-            if "prompt" in records
-        },
-        "unknown_nodes": {
-            name: (graph, None) for name, graph in unknown.shapes().items()
-        },
-    }
-
-
-def legacy_positive(graph, workflow):
-    """The positive prompt the legacy parser found, or ``None``."""
-    try:
-        found = extract_generation_params({"prompt": graph, "workflow": workflow})
-    except GenerationParamsError:
-        return None
-    text = found["positivePrompt"]
-    return None if text == NOT_FOUND else text
-
-
-def inspected(graph, workflow=None, file_name=None) -> dict:
-    """The inspection resolver's answer, anchored by ``file_name`` when given."""
-    metadata = {"prompt": graph}
-    if workflow is not None:
-        metadata["workflow"] = workflow
-    return resolver.resolve_prompt_pair(
-        metadata, profile=resolver.INSPECTION_PROFILE, file_name=file_name
-    )
-
-
-# Graphs where the legacy parser's positive is wrong and the inspector's
-# differs on purpose: (corpus, case) -> (the inspector's positive, why).
-LEGACY_WRONG = {
-    ("local_resolver", "anchor-branch-3"): (
-        "a red vintage car in the rain",
-        "legacy shows the first sampler's prompt for every branch; the file "
-        "name s45_branch_3_00002_ names branch 3's saver (gpu_unlock_bench)",
-    ),
-    ("local_resolver", "anchor-branch-linked"): (
-        "an old fishing boat at dawn",
-        "legacy shows branch 1; the traced prefix names branch 2's saver",
-    ),
-    ("local_resolver", "anchor-branch-unknown-saver"): (
-        "a cozy library with tall shelves",
-        "legacy shows branch 1; the file name names branch 4's saver",
-    ),
-}
-
-
-def agreeing(graphs: dict) -> list:
-    """Names whose inspection positive equals the legacy parser's, sorted."""
-    names = []
-    for name, case in graphs.items():
-        graph, workflow = case[0], case[1]
-        if not isinstance(graph, dict):
-            continue
-        expected = legacy_positive(graph, workflow)
-        if expected is None:
-            continue
-        result = inspected(*case)
-        positive = result["positive"]
-        if (
-            result["state"] == "resolved"
-            and isinstance(positive, dict)
-            and positive["text"] == expected
-        ):
-            names.append(name)
-    return sorted(names)
-
-
-class LegacyParityGateTest(unittest.TestCase):
-    def test_every_legacy_difference_is_stated(self):
-        """A graph may read differently from legacy only with a stated reason."""
-        all_graphs = corpora()
-        for (corpus, name), (expected, why) in LEGACY_WRONG.items():
-            with self.subTest(case=name, why=why):
-                case = all_graphs[corpus][name]
-                legacy = legacy_positive(case[0], case[1])
-                self.assertIsNotNone(legacy)
-                result = inspected(*case)
-                positive = result["positive"]
-                text = positive["text"] if isinstance(positive, dict) else None
-                if result["state"] != "resolved":
-                    text = None
-                self.assertEqual(text, expected)
-                self.assertNotEqual(text, legacy)
-
-    def test_no_graph_leaves_the_legacy_agreement(self):
-        recorded = json.loads(AGREEMENT_PATH.read_text(encoding="utf-8"))
-        current = {name: agreeing(graphs) for name, graphs in corpora().items()}
-        self.assertEqual(set(recorded), set(current))
-        for corpus, names in recorded.items():
-            with self.subTest(corpus=corpus):
-                lost = sorted(set(names) - set(current[corpus]))
-                self.assertEqual(lost, [], "these graphs no longer match legacy")
-
-    def test_every_unknown_node_shape_legacy_reads_still_agrees(self):
-        graphs = corpora()["unknown_nodes"]
-        legacy = {name for name, pair in graphs.items() if legacy_positive(*pair)}
-        self.assertLessEqual(legacy, set(agreeing(graphs)))
-
-    def test_the_reported_graph_reads_better_than_legacy(self):
-        # Legacy found no positive here (cf0cef3 showed the positive text as
-        # the negative); the floor is met, and the inspector now reads it.
-        graph = unknown.any_switch_graph()
-        self.assertIsNone(legacy_positive(graph, None))
-        result = resolver.resolve_prompt_pair(
-            {"prompt": graph}, profile=resolver.INSPECTION_PROFILE
-        )
-        self.assertEqual(result["positive"]["text"], unknown.POSITIVE)
-
-
-def main():
-    parser = argparse.ArgumentParser(description=__doc__.splitlines()[0])
-    parser.add_argument("--write", action="store_true", help="record the agreement")
-    if parser.parse_args().write:
-        current = {name: agreeing(graphs) for name, graphs in corpora().items()}
-        text = json.dumps(current, indent=1, sort_keys=True, ensure_ascii=False)
-        AGREEMENT_PATH.write_text(text + "\n", encoding="utf-8", newline="\n")
-
-
-if __name__ == "__main__":
-    main()

tests/test_local_inspect_parity.py

@@ -1118,17 +1118,8 @@ class LocalProjectionParityTests(unittest.TestCase):
         self.assertTrue({"parsed", "malformed", "limited"} <= seen)
 
 
-def _server_evidence(records, file_name=None):
-    return inspect_prompt_evidence(
-        records, None, profile=INSPECTION_PROFILE, file_name=file_name
-    )
-
-
-FILE_NAME = resolver_cases.FILE_NAME
-
-
-def _records(case):
-    return {key: value for key, value in case.items() if key != FILE_NAME}
+def _server_evidence(records):
+    return inspect_prompt_evidence(records, None, profile=INSPECTION_PROFILE)
 
 
 class LocalResolverParityTests(unittest.TestCase):
@@ -1152,12 +1143,7 @@ class LocalResolverParityTests(unittest.TestCase):
         observed = _run_oracle(
             self,
             [
-                {
-                    "name": name,
-                    "mode": "resolve",
-                    "records": _records(records),
-                    "fileName": records.get(FILE_NAME),
-                }
+                {"name": name, "mode": "resolve", "records": records}
                 for name, records in cases.items()
             ],
         )
@@ -1165,7 +1151,7 @@ class LocalResolverParityTests(unittest.TestCase):
         for name, records in cases.items():
             with self.subTest(case=name):
                 local = observed[name]
-                server = _server_evidence(_records(records), records.get(FILE_NAME))
+                server = _server_evidence(records)
                 answers[name] = server
                 self.assertEqual(
                     _canonical_bytes(local["evidence"]), _canonical_bytes(server)
@@ -1204,7 +1190,7 @@ class LocalResolverParityTests(unittest.TestCase):
                 # The single-chain subset (Task 8); the rest is Task 9's test below.
                 if not resolver_cases.single_chain(records):
                     continue
-                server = _server_evidence(records, Path(path).name)
+                server = _server_evidence(records)
                 self.assertEqual(
                     _canonical_bytes(local["evidence"]), _canonical_bytes(server)
                 )
@@ -1251,8 +1237,7 @@ class LocalResolverParityTests(unittest.TestCase):
                 local, expect = observed[name], vector["expect"]
                 try:
                     server = _server_evidence(
-                        read_inspection_file(files[name]).metadata,
-                        Path(files[name]).name,
+                        read_inspection_file(files[name]).metadata
                     )
                 except MetadataReadError:
                     server = unreadable_evidence()

tests/test_lora_import.py

@@ -529,16 +529,6 @@ class LoraImportRouteTests(LoraImportAPITestCase):
         resp, body = await self._post(APPLY, {"token": plan["token"]})
         self.assertEqual((resp.status, body["code"]), (409, "plan-used"))
 
-    async def test_a_finished_import_clears_the_layout_cache(self):
-        # #362: the import may link files under a folder LoraManager created
-        # after the image routes cached its layout.
-        self._two_loras()
-        with patch("py.lora_utils.clear_layout_cache") as clear:
-            _plan, job = await self._apply_reviewed()
-            await job.task
-        self.assertEqual(job.state, "finished", job.log)
-        clear.assert_called_once_with()
-
     async def test_discovery_failure_keeps_previous_imports(self):
         self._two_loras()
         before = _snapshot(self.api.db)
@@ -946,35 +936,6 @@ class LoraImportRefusalTests(LoraImportAPITestCase):
         self.assertEqual((job.state, job.scope["failure"]), ("failed", "plan-changed"))
         self.assertEqual(_snapshot(self.api.db), before)
 
-    async def test_a_refused_import_keeps_the_layout_cache(self):
-        self._two_loras()
-        resp, plan = await self._post(PREVIEW)
-        self.api.db.save_prompt(
-            text="late", category=CATEGORY, prompt_hash=generate_prompt_hash("late")
-        )
-        with patch("py.lora_utils.clear_layout_cache") as clear:
-            resp, body = await self._post(APPLY, {"token": plan["token"]})
-            job = self.api._jobs.get(body["job"]["id"])
-            await job.task
-        self.assertEqual(job.scope["failure"], "plan-changed")
-        clear.assert_not_called()
-
-    async def test_start_refused_when_a_skipped_sidecar_changed(self):
-        # #362 CUJ 4: the review counted the orphan as skipped.
-        self._two_loras()
-        orphan = self.loras / "orphan.metadata.json"
-        orphan.write_text(json.dumps({"model_name": "orphan"}))
-        resp, plan = await self._post(PREVIEW)
-        self.assertEqual(resp.status, 200, plan)
-        self.assertEqual((plan["lora_files"], plan["skipped"]), (3, 1))
-        before = _snapshot(self.api.db)
-        orphan.write_text(orphan.read_text() + "  ")
-        resp, body = await self._post(APPLY, {"token": plan["token"]})
-        self.assertEqual(resp.status, 409, body)
-        self.assertEqual(body["code"], "plan-changed")
-        self.assertEqual(self.api._jobs.list(), [])
-        self.assertEqual(_snapshot(self.api.db), before)
-
     async def test_a_pair_saved_after_the_review_blocks_the_job(self):
         self._two_loras()
         resp, plan = await self._post(PREVIEW)
@@ -1226,62 +1187,6 @@ class LoraImportStageTests(unittest.TestCase):
         )
         self.assertNotEqual(lora_import.fingerprint(self.discover()), first)
 
-    # #362: a skipped sidecar is part of what the review counted.
-
-    def _assert_fingerprint_follows(self, change):
-        first = lora_import.fingerprint(self.discover())
-        self.assertEqual(lora_import.fingerprint(self.discover()), first)
-        change()
-        self.assertNotEqual(lora_import.fingerprint(self.discover()), first)
-
-    def _assert_add_edit_remove_change_it(self, path, text):
-        self._assert_fingerprint_follows(lambda: path.write_text(text))
-        self._assert_fingerprint_follows(
-            lambda: path.write_text(path.read_text() + "  ")
-        )
-        self._assert_fingerprint_follows(path.unlink)
-
-    def _centralized(self):
-        sidecars = self.tmp / "sidecars"
-        sidecars.mkdir()
-        self.settings_file(
-            {
-                "sidecar_storage_mode": "centralized",
-                "sidecar_storage_path": str(sidecars),
-            }
-        )
-        model = self.loras / "kept.safetensors"
-        model.write_bytes(b"m")
-        (sidecars / "kept.metadata.json").write_text(
-            json.dumps({"file_path": str(model)})
-        )
-        return sidecars
-
-    def test_fingerprint_follows_a_centralized_sidecar_whose_model_is_missing(self):
-        sidecars = self._centralized()
-        gone = self.loras / "gone.safetensors"
-        self._assert_add_edit_remove_change_it(
-            sidecars / "gone.metadata.json", json.dumps({"file_path": str(gone)})
-        )
-        self.assertEqual(len(self.discover().sidecars), 1)
-
-    def test_fingerprint_follows_a_checkpoint_sidecar_outside_the_lora_roots(self):
-        sidecars = self._centralized()
-        checkpoints = self.tmp / "checkpoints"
-        checkpoints.mkdir()
-        ckpt = checkpoints / "base.safetensors"
-        ckpt.write_bytes(b"c")
-        self._assert_add_edit_remove_change_it(
-            sidecars / "base.metadata.json", json.dumps({"file_path": str(ckpt)})
-        )
-
-    def test_fingerprint_follows_an_alongside_sidecar_without_its_model(self):
-        _write_metadata(self.loras, "kept")
-        self._assert_add_edit_remove_change_it(
-            self.loras / "orphan.metadata.json", json.dumps({"model_name": "orphan"})
-        )
-        self.assertEqual(len(self.discover().sidecars), 1)
-
     def test_fingerprint_follows_a_missing_file_between_stat_calls(self):
         meta = _write_metadata(self.loras, "one")
         discovery = self.discover()

tests/test_lora_layout_cache.py

@@ -1,590 +0,0 @@
-"""The LoraManager layout cache for the image hot paths (#362).
-
-``py/lora_layout_cache.py``. Every test injects the install resolver, the
-layout loader (both counting calls), the wall clock, the monotonic clock and,
-where needed, ``stat`` and ``pathmod``, over a temporary folder. No test
-sleeps: modification times are set with ``os.utime`` and the clocks are
-plain attributes the test moves.
-"""
-
-import ntpath
-import os
-import shutil
-import sys
-import tempfile
-import threading
-import time
-import unittest
-from dataclasses import replace
-from pathlib import Path, PureWindowsPath
-from types import SimpleNamespace
-from unittest.mock import patch
-
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-from py import lora_layout_cache as cache_module
-from py.lora_layout_cache import (
-    MAX_AGE_SECONDS,
-    MISSING,
-    RACY_SECONDS,
-    LayoutCache,
-)
-from py.lora_manager_layout import UNREADABLE, LoraManagerLayout, _canonical
-
-SECOND_NS = 10**9
-# NTFS keeps modification times in 100 ns steps and FAT in 2 s steps: every
-# time a test sets is a whole millisecond, and a test whose file system rounds
-# it anyway skips (``set_mtime``).
-TICK_NS = 10**6
-
-
-def make_layout(settings_path=None, media_roots=(), error=None, source="user config"):
-    return LoraManagerLayout(
-        settings_path=settings_path,
-        source=source,
-        error=error,
-        mode="alongside",
-        lora_roots=tuple(media_roots),
-        sidecar_root=None,
-        example_images_root=None,
-        library="default",
-        media_roots=tuple(media_roots),
-    )
-
-
-class CacheTestCase(unittest.TestCase):
-    """An install, its plugin settings file, a settings file and a LoRA root."""
-
-    def setUp(self):
-        self.tmp = Path(tempfile.mkdtemp()).resolve()
-        self.addCleanup(shutil.rmtree, self.tmp)
-        self.install_dir = self.tmp / "custom_nodes" / "ComfyUI-Lora-Manager"
-        self.install_dir.mkdir(parents=True)
-        self.plugin_settings = self.install_dir / "settings.json"
-        self.settings = self.tmp / "user-config" / "settings.json"
-        self.settings.parent.mkdir()
-        self.root_dir = self.tmp / "loras"
-        self.root_dir.mkdir()
-        # Files are written ten minutes before the injected wall clock, so
-        # nothing is racy unless a test sets a recent modification time.
-        self.now_ns = time.time_ns() // TICK_NS * TICK_NS
-        self.mono = 1000.0
-        self.resolved = []
-        self.loaded = []
-        self.install = _canonical(str(self.install_dir))
-        self.layout = make_layout(
-            settings_path=self.settings,
-            media_roots=(_canonical(str(self.root_dir)),),
-        )
-        self.write(self.settings, "{}")
-
-    def write(self, path, text, mtime_ns=None):
-        Path(path).write_text(text, encoding="utf-8")
-        stamp = mtime_ns if mtime_ns is not None else self.now_ns - 600 * SECOND_NS
-        self.set_mtime(path, stamp)
-
-    def set_mtime(self, path, stamp):
-        os.utime(path, ns=(stamp, stamp))
-        if os.stat(path).st_mtime_ns != stamp:
-            self.skipTest("this file system rounds modification times")
-
-    def resolve(self, key):
-        self.resolved.append(key)
-        return self.install
-
-    def load(self, install):
-        self.loaded.append(install)
-        return self.layout
-
-    def cache(self, **kwargs):
-        kwargs.setdefault("wall_ns", lambda: self.now_ns)
-        kwargs.setdefault("monotonic", lambda: self.mono)
-        return LayoutCache(
-            kwargs.pop("resolve", self.resolve), kwargs.pop("load", self.load), **kwargs
-        )
-
-
-class ValidationTests(CacheTestCase):
-    def test_hit_reuses_the_entry_without_resolving_or_loading(self):
-        cache = self.cache()
-        first = cache.get("")
-        second = cache.get("")
-        self.assertEqual(len(self.resolved), 1)
-        self.assertEqual(len(self.loaded), 1)
-        self.assertIs(first[1], second[1])
-        self.assertIs(first[0], second[0])
-        self.assertEqual(first, (self.install, self.layout))
-
-    def test_settings_size_change_reloads_once(self):
-        cache = self.cache()
-        cache.get("")
-        stamp = self.settings.stat().st_mtime_ns
-        self.write(self.settings, '{"a": 1}', mtime_ns=stamp)
-        cache.get("")
-        cache.get("")
-        self.assertEqual(len(self.loaded), 2)
-
-    def test_settings_mtime_change_reloads_once(self):
-        cache = self.cache()
-        cache.get("")
-        self.set_mtime(self.settings, self.settings.stat().st_mtime_ns + TICK_NS)
-        cache.get("")
-        cache.get("")
-        self.assertEqual(len(self.loaded), 2)
-
-    def test_settings_deletion_reloads_once(self):
-        cache = self.cache()
-        cache.get("")
-        self.settings.unlink()
-        cache.get("")
-        cache.get("")
-        self.assertEqual(len(self.loaded), 2)
-
-    def test_settings_creation_reloads_once(self):
-        self.settings.unlink()
-        cache = self.cache()
-        cache.get("")
-        self.write(self.settings, "{}")
-        cache.get("")
-        cache.get("")
-        self.assertEqual(len(self.loaded), 2)
-
-    def test_plugin_settings_change_reloads_once(self):
-        cache = self.cache()
-        cache.get("")
-        self.write(self.plugin_settings, '{"use_portable_settings": true}')
-        cache.get("")
-        cache.get("")
-        self.assertEqual(len(self.loaded), 2)
-
-    def test_a_different_configured_path_reloads(self):
-        cache = self.cache()
-        cache.get("")
-        cache.get("other")
-        self.assertEqual(self.resolved, ["", "other"])
-        self.assertEqual(len(self.loaded), 2)
-
-    def test_a_different_home_folder_reloads(self):
-        # The folder guard compares against the home folder: a cached layout
-        # must not outlive a change of it.
-        home = {"value": str(self.tmp / "home-a")}
-        cache = self.cache(home=lambda: home["value"])
-        cache.get("")
-        cache.get("")
-        home["value"] = str(self.tmp / "home-b")
-        cache.get("")
-        self.assertEqual(len(self.loaded), 2)
-
-    def test_configured_path_is_stripped_for_the_key_and_the_resolver(self):
-        cache = self.cache()
-        cache.get("  x ")
-        cache.get("x")
-        self.assertEqual(self.resolved, ["x"])
-        self.assertEqual(len(self.loaded), 1)
-
-    def test_a_recently_modified_file_is_not_stored(self):
-        self.write(self.settings, "{}", mtime_ns=self.now_ns - SECOND_NS)
-        cache = self.cache()
-        cache.get("")
-        cache.get("")
-        self.assertEqual(len(self.loaded), 2)
-        self.assertIsNone(cache._entry)
-        self.now_ns += RACY_SECONDS * SECOND_NS
-        cache.get("")
-        self.assertIsNotNone(cache._entry)
-        cache.get("")
-        self.assertEqual(len(self.loaded), 3)
-
-    def test_racy_boundary(self):
-        # Exactly RACY_SECONDS old is trusted; anything newer is not.
-        boundary = self.now_ns - RACY_SECONDS * SECOND_NS
-        self.write(self.settings, "{}", mtime_ns=boundary + TICK_NS)
-        cache = self.cache()
-        cache.get("")
-        self.assertIsNone(cache._entry)
-        self.set_mtime(self.settings, boundary)
-        cache.get("")
-        self.assertIsNotNone(cache._entry)
-
-    def test_a_modification_time_in_the_future_is_racy(self):
-        self.write(self.plugin_settings, "{}", mtime_ns=self.now_ns + 60 * SECOND_NS)
-        cache = self.cache()
-        cache.get("")
-        cache.get("")
-        self.assertEqual(len(self.loaded), 2)
-        self.assertIsNone(cache._entry)
-
-    def test_a_missing_file_is_not_racy(self):
-        self.assertFalse(self.plugin_settings.exists())
-        self.settings.unlink()
-        cache = self.cache()
-        cache.get("")
-        self.assertIsNotNone(cache._entry)
-        signatures = dict(cache._entry.signatures)
-        self.assertTrue(all(value is MISSING for value in signatures.values()))
-        self.assertEqual(len(signatures), 2)
-
-    def test_entry_is_reused_below_the_maximum_age_and_reloaded_at_it(self):
-        cache = self.cache()
-        cache.get("")
-        stored_at = self.mono
-        self.mono = stored_at + MAX_AGE_SECONDS - 0.5
-        cache.get("")
-        self.assertEqual(len(self.loaded), 1)
-        self.mono = stored_at + MAX_AGE_SECONDS
-        cache.get("")
-        self.assertEqual(len(self.loaded), 2)
-
-    def test_a_wall_clock_moved_backward_does_not_extend_the_age(self):
-        cache = self.cache()
-        cache.get("")
-        self.now_ns -= 3600 * SECOND_NS
-        self.mono += MAX_AGE_SECONDS
-        # The old entry is too old; the new load sees files "from the future"
-        # (racy) and is not stored, but it does load.
-        cache.get("")
-        self.assertEqual(len(self.loaded), 2)
-
-    def test_stat_failure_on_a_hit_reloads(self):
-        failing = {"on": False}
-
-        def stat(path):
-            if failing["on"]:
-                raise PermissionError(13, "sharing violation", path)
-            return os.stat(path)
-
-        cache = self.cache(stat=stat)
-        cache.get("")
-        failing["on"] = True
-        cache.get("")
-        self.assertEqual(len(self.loaded), 2)
-        self.assertIsNone(cache._entry)
-
-    def test_stat_failure_on_a_miss_leaves_the_layout_unstored(self):
-        def stat(path):
-            raise PermissionError(13, "sharing violation", path)
-
-        cache = self.cache(stat=stat)
-        self.assertEqual(cache.get(""), (self.install, self.layout))
-        self.assertIsNone(cache._entry)
-        cache.get("")
-        self.assertEqual(len(self.loaded), 2)
-
-    def test_an_unreadable_settings_layout_is_not_stored(self):
-        self.layout = make_layout(settings_path=self.settings, error=UNREADABLE)
-        cache = self.cache()
-        self.assertEqual(cache.get("")[1].error, UNREADABLE)
-        cache.get("")
-        self.assertEqual(len(self.loaded), 2)
-        self.assertIsNone(cache._entry)
-
-    def test_other_layout_errors_are_stored(self):
-        self.layout = make_layout(
-            settings_path=self.settings, error="the settings file is not valid JSON"
-        )
-        cache = self.cache()
-        cache.get("")
-        cache.get("")
-        self.assertEqual(len(self.loaded), 1)
-
-    def _symlink(self, link, target):
-        try:
-            os.symlink(target, link, target_is_directory=True)
-        except (OSError, NotImplementedError) as error:
-            self.skipTest(f"symlinks are not available here: {error}")
-
-    def test_a_media_root_swapped_for_a_symlink_reloads(self):
-        elsewhere = self.tmp / "elsewhere"
-        elsewhere.mkdir()
-        cache = self.cache()
-        cache.get("")
-        shutil.rmtree(self.root_dir)
-        self._symlink(self.root_dir, elsewhere)
-        cache.get("")
-        self.assertEqual(len(self.loaded), 2)
-
-    def test_an_install_swapped_for_a_symlink_reloads(self):
-        elsewhere = self.tmp / "elsewhere-lm"
-        elsewhere.mkdir()
-        cache = self.cache()
-        cache.get("")
-        moved = self.tmp / "moved-lm"
-        self.install_dir.rename(moved)
-        self._symlink(self.install_dir, elsewhere)
-        cache.get("")
-        self.assertEqual(len(self.loaded), 2)
-
-    def test_a_root_whose_realpath_fails_reloads(self):
-        cache = self.cache()
-        cache.get("")
-        with patch.object(
-            cache_module, "_canonical", side_effect=OSError("realpath failed")
-        ):
-            cache.get("")
-        self.assertEqual(len(self.loaded), 2)
-
-    def test_a_stat_value_error_cannot_validate(self):
-        def stat(path):
-            raise ValueError("embedded null character in path")
-
-        cache = self.cache(stat=stat)
-        cache.get("")
-        self.assertIsNone(cache._entry)
-
-    def test_not_a_directory_is_missing(self):
-        def stat(path):
-            raise NotADirectoryError(20, "Not a directory", path)
-
-        cache = self.cache(stat=stat)
-        cache.get("")
-        self.assertTrue(
-            all(value is MISSING for _path, value in cache._entry.signatures)
-        )
-        cache.get("")
-        self.assertEqual(len(self.loaded), 1)
-
-    def test_an_offline_windows_share_cannot_validate(self):
-        def stat(path):
-            error = FileNotFoundError(2, "The network path was not found", path)
-            error.winerror = 53
-            raise error
-
-        cache = self.cache(stat=stat)
-        cache.get("")
-        self.assertIsNone(cache._entry)
-
-    def test_a_failed_reload_leaves_no_stale_entry(self):
-        failing = {"on": False}
-
-        def load(install):
-            self.loaded.append(install)
-            if failing["on"]:
-                raise RuntimeError("boom")
-            return self.layout
-
-        cache = self.cache(load=load)
-        cache.get("")
-        self.mono += MAX_AGE_SECONDS
-        failing["on"] = True
-        with self.assertRaises(RuntimeError):
-            cache.get("")
-        self.assertIsNone(cache._entry)
-
-    def test_a_resolve_failure_propagates_and_stores_nothing(self):
-        def resolve(key):
-            raise RuntimeError("boom")
-
-        cache = self.cache(resolve=resolve)
-        with self.assertRaises(RuntimeError):
-            cache.get("")
-        self.assertIsNone(cache._entry)
-
-    def test_without_a_settings_path_only_the_plugin_file_is_watched(self):
-        self.layout = make_layout(media_roots=self.layout.media_roots)
-        cache = self.cache()
-        cache.get("")
-        self.assertEqual(
-            [path for path, _sig in cache._entry.signatures],
-            [os.path.join(self.install, "settings.json")],
-        )
-
-    def test_portable_settings_are_watched_once(self):
-        self.layout = make_layout(settings_path=self.install_dir / "settings.json")
-        cache = self.cache()
-        cache.get("")
-        self.assertEqual(len(cache._entry.signatures), 1)
-
-    def test_a_load_failure_propagates_and_stores_nothing(self):
-        calls = []
-
-        def load(install):
-            calls.append(install)
-            if len(calls) == 1:
-                raise RuntimeError("boom")
-            return self.layout
-
-        cache = self.cache(load=load)
-        with self.assertRaises(RuntimeError):
-            cache.get("")
-        self.assertIsNone(cache._entry)
-        self.assertEqual(cache.get(""), (self.install, self.layout))
-        self.assertEqual(len(calls), 2)
-
-    def test_without_an_install_nothing_is_watched_and_the_entry_ages_out(self):
-        stats = []
-
-        def stat(path):
-            stats.append(path)
-            return os.stat(path)
-
-        self.layout = make_layout(media_roots=self.layout.media_roots, source=None)
-        cache = self.cache(resolve=lambda key: self.resolved.append(key), stat=stat)
-        self.assertEqual(cache.get(""), (None, self.layout))
-        self.assertEqual(cache._entry.signatures, ())
-        cache.get("")
-        self.assertEqual(len(self.loaded), 1)
-        self.assertEqual(stats, [])
-        self.mono += MAX_AGE_SECONDS
-        cache.get("")
-        self.assertEqual(len(self.loaded), 2)
-
-    def test_windows_paths_differing_only_in_case_are_watched_once(self):
-        stats = []
-
-        def stat(path):
-            stats.append(path)
-            return SimpleNamespace(st_mtime_ns=self.now_ns - 600 * SECOND_NS, st_size=2)
-
-        install = _canonical("C:\\ComfyUI\\custom_nodes\\LM", ntpath)
-        # The hit check needs ntpath's realpath to be idempotent here.
-        self.assertEqual(install, _canonical(install, ntpath))
-        self.layout = make_layout(
-            settings_path=PureWindowsPath(
-                "C:\\ComfyUI\\custom_nodes\\lm\\SETTINGS.JSON"
-            )
-        )
-        cache = self.cache(resolve=lambda key: install, stat=stat, pathmod=ntpath)
-        cache.get("")
-        self.assertEqual(len(cache._entry.signatures), 1)
-        self.assertEqual(len(stats), 1)
-        cache.get("")
-        self.assertEqual(len(self.loaded), 1)
-        self.assertEqual(len(stats), 2)
-
-
-class ConcurrencyTests(CacheTestCase):
-    def test_a_load_that_started_before_clear_stores_nothing(self):
-        started = threading.Event()
-        release = threading.Event()
-
-        def load(install):
-            self.loaded.append(install)
-            if len(self.loaded) == 1:
-                started.set()
-                self.assertTrue(release.wait(10))
-            return self.layout
-
-        cache = self.cache(load=load)
-        results = []
-        worker = threading.Thread(target=lambda: results.append(cache.get("")))
-        worker.start()
-        self.assertTrue(started.wait(10))
-        cache.clear()
-        release.set()
-        worker.join(10)
-        self.assertFalse(worker.is_alive())
-        self.assertEqual(results, [(self.install, self.layout)])
-        self.assertIsNone(cache._entry)
-        cache.get("")
-        self.assertEqual(len(self.loaded), 2)
-        self.assertIsNotNone(cache._entry)
-
-    def test_concurrent_misses_all_get_a_layout_and_one_entry_is_stored(self):
-        cache = self.cache()
-        count = 6
-        barrier = threading.Barrier(count)
-        results = []
-        lock = threading.Lock()
-
-        def worker():
-            barrier.wait(10)
-            result = cache.get("")
-            with lock:
-                results.append(result)
-
-        threads = [threading.Thread(target=worker) for _ in range(count)]
-        for thread in threads:
-            thread.start()
-        for thread in threads:
-            thread.join(10)
-        self.assertEqual(results, [(self.install, self.layout)] * count)
-        self.assertIsNotNone(cache._entry)
-        loads = len(self.loaded)
-        cache.get("")
-        self.assertEqual(len(self.loaded), loads)
-
-    def test_a_valid_hit_takes_no_lock(self):
-        cache = self.cache()
-        cache.get("")
-        results = []
-        with cache._lock:
-            worker = threading.Thread(target=lambda: results.append(cache.get("")))
-            worker.start()
-            worker.join(10)
-            alive = worker.is_alive()
-        worker.join(10)
-        self.assertFalse(alive)
-        self.assertEqual(results, [(self.install, self.layout)])
-
-    def test_clear_forces_a_reload(self):
-        cache = self.cache()
-        cache.get("")
-        cache.clear()
-        self.assertIsNone(cache._entry)
-        cache.get("")
-        self.assertEqual(len(self.loaded), 2)
-
-
-class LoggingTests(CacheTestCase):
-    LOGGER = "prompt_manager.lora_layout_cache"
-
-    def get(self, cache):
-        with self.assertLogs(self.LOGGER, "DEBUG") as logs:
-            cache.get("")
-            # assertLogs needs one record; this marker is not counted.
-            cache_module.logger.debug("marker")
-        return [r for r in logs.records if r.getMessage() != "marker"]
-
-    def test_a_new_layout_logs_one_info_line(self):
-        cache = self.cache()
-        records = self.get(cache)
-        self.assertEqual([r.levelname for r in records], ["INFO"])
-        self.assertEqual(
-            records[0].getMessage(),
-            "LoraManager layout changed: user config settings, alongside storage, "
-            "1 media folders",
-        )
-        self.mono += MAX_AGE_SECONDS
-        self.assertEqual(self.get(cache), [])  # an equal layout, reloaded
-        cache.clear()
-        self.assertEqual(self.get(cache), [])
-        self.layout = replace(self.layout, media_roots=(), lora_roots=())
-        self.mono += MAX_AGE_SECONDS
-        self.assertEqual(len(self.get(cache)), 1)
-
-    def test_no_settings_source_prints_no(self):
-        self.layout = replace(self.layout, source=None)
-        records = self.get(self.cache())
-        self.assertIn("layout changed: no settings,", records[0].getMessage())
-
-    def test_an_unstored_load_logs_no_info_line(self):
-        self.write(self.settings, "{}", mtime_ns=self.now_ns)
-        self.assertEqual(
-            [r for r in self.get(self.cache()) if r.levelname == "INFO"], []
-        )
-
-    def test_a_newly_refused_default_folder_logs_one_warning(self):
-        self.layout = replace(self.layout, refused_defaults=("/home",))
-        cache = self.cache()
-        records = self.get(cache)
-        warnings = [r for r in records if r.levelname == "WARNING"]
-        self.assertEqual(len(warnings), 1)
-        self.assertIn("/home", warnings[0].getMessage())
-        self.mono += MAX_AGE_SECONDS
-        self.assertEqual(self.get(cache), [])
-        cache.clear()
-        self.assertEqual(self.get(cache), [])
-        self.layout = replace(self.layout, refused_defaults=("/home", "/"))
-        self.mono += MAX_AGE_SECONDS
-        warnings = [r for r in self.get(cache) if r.levelname == "WARNING"]
-        self.assertEqual([w.getMessage().count("'/'") for w in warnings], [1])
-
-
-class ModuleTests(unittest.TestCase):
-    def test_constants(self):
-        self.assertEqual(cache_module.RACY_SECONDS, 3)
-        self.assertEqual(cache_module.MAX_AGE_SECONDS, 30)
-
-
-if __name__ == "__main__":
-    unittest.main()

tests/test_lora_manager_layout.py

@@ -33,10 +33,6 @@ MEDIA = frozenset(
     {".png", ".jpg", ".jpeg", ".webp", ".gif", ".mp4", ".webm", ".mov", ".bmp"}
 )
 MARKER = "marker-from-unkept-settings-0123"
-BAD_SIDECAR_REASON = (
-    "the sidecar folder is a filesystem root, the home folder or a folder "
-    "that contains it"
-)
 
 
 class LayoutTestCase(unittest.TestCase):
@@ -265,25 +261,10 @@ class UnusableLayoutTests(LayoutTestCase):
             {"sidecar_storage_mode": "centralized", "sidecar_storage_path": "/"},
         )
         layout = self.load()
-        self.assertEqual(layout.error, BAD_SIDECAR_REASON)
-        self.assertNotIn(os.path.normcase(os.path.realpath("/")), layout.media_roots)
-
-    def test_a_centralized_sidecar_root_that_contains_home(self):
-        home = self.tmp / "outer" / "me"
-        home.mkdir(parents=True)
-        self.write_settings(
-            self.user_config,
-            {
-                "sidecar_storage_mode": "centralized",
-                "sidecar_storage_path": str(self.tmp / "outer"),
-            },
-        )
-        with patch.object(layout_module.Path, "home", return_value=home):
-            layout = self.load()
-        self.assertEqual(layout.error, BAD_SIDECAR_REASON)
         self.assertEqual(
-            layout.media_roots, (os.path.normcase(str(self.default_loras)),)
+            layout.error, "the sidecar folder is a filesystem root or the home folder"
         )
+        self.assertNotIn(os.path.normcase(os.path.realpath("/")), layout.media_roots)
 
 
 class SecretTests(LayoutTestCase):
@@ -520,31 +501,6 @@ class CentralizedDiscoveryTests(LayoutTestCase):
         self.assertEqual(discovery.scanned, 3)
         self.assertEqual(discovery.sidecars, [])
 
-    def test_every_scanned_file_is_listed_resolved_and_sorted(self):
-        # #362: the fingerprint covers every scanned sidecar, kept or skipped.
-        ckpt = self.model(self.checkpoints, "base")
-        alpha = self.model(self.loras, "alpha")
-        self.sidecar(self.sidecars / "z", "base", {"file_path": str(ckpt)})
-        self.sidecar(self.sidecars / "a", "alpha", {"file_path": str(alpha)})
-        self.sidecar(self.sidecars / "m", "nopath", {"model_name": "x"})
-        discovery = discover_sidecars(self.load())
-        files = discovery.scanned_files
-        self.assertIsInstance(files, tuple)
-        self.assertEqual(len(files), 3)
-        self.assertEqual(discovery.scanned, len(files))
-        self.assertEqual([str(f) for f in files], sorted(str(f) for f in files))
-        self.assertEqual(
-            [f.name for f in files],
-            [
-                f"alpha{METADATA_SUFFIX}",
-                f"nopath{METADATA_SUFFIX}",
-                f"base{METADATA_SUFFIX}",
-            ],
-        )
-        for path in files:
-            self.assertEqual(str(path), os.path.realpath(path))
-        self.assertEqual(len(discovery.sidecars), 1)
-
     def test_leftover_sidecars_beside_models_are_not_scanned(self):
         model = self.model(self.loras, "alpha")
         self.sidecar(self.loras, "alpha", {"file_path": str(model)})
@@ -655,16 +611,6 @@ class LocalMediaTests(LayoutTestCase):
         self.touch(self.default_loras / "alpha.webp")
         self.assertEqual(self.media({"preview_url": preview}), [preview])
 
-    def test_a_relative_preview_url_is_logged_and_skipped(self):
-        fallback = self.touch(self.default_loras / "alpha.webp")
-        self.touch(self.default_loras / "relative.png")
-        with self.assertLogs("prompt_manager.lora_manager_layout", "DEBUG") as logs:
-            media = self.media({"preview_url": "relative.png"})
-        self.assertEqual(media, [fallback])
-        self.assertEqual(len(logs.records), 1)
-        self.assertEqual(logs.records[0].levelname, "DEBUG")
-        self.assertIn(self.meta.name, logs.output[0])
-
     def test_preview_url_outside_media_roots_or_not_servable_is_ignored(self):
         outside = self.touch(self.tmp / "elsewhere" / "p.png")
         avif = self.touch(self.default_loras / "p.avif")
@@ -864,63 +810,6 @@ class FolderGuardTests(unittest.TestCase):
         self.assertFalse(layout_module._inside(str(self.tmp / "other.png"), (root,)))
 
 
-class RefusedDefaultsTests(LayoutTestCase):
-    """#362: ComfyUI's default LoRA folders pass the same guard; the refused
-    ones that exist are listed so the layout cache can warn about them."""
-
-    def setUp(self):
-        super().setUp()
-        self.outer = self.tmp / "outer"
-        self.home = self.outer / "me"
-        self.home.mkdir(parents=True)
-        self.fs_root = os.path.abspath(os.sep)
-        self.defaults = [
-            str(self.home),
-            str(self.outer),
-            self.fs_root,
-            str(self.tmp / "missing"),
-            str(self.default_loras),
-        ]
-        self.expected = (
-            layout_module._canonical(str(self.home)),
-            layout_module._canonical(str(self.outer)),
-            layout_module._canonical(self.fs_root),
-        )
-        home_patch = patch.object(layout_module.Path, "home", return_value=self.home)
-        home_patch.start()
-        self.addCleanup(home_patch.stop)
-
-    def load_defaults(self, path="__plugin__"):
-        return self.load(path, default_roots=lambda: list(self.defaults))
-
-    def test_refused_existing_defaults_are_listed_on_a_usable_layout(self):
-        self.write_settings(self.user_config, {})
-        layout = self.load_defaults()
-        self.assertIsNone(layout.error)
-        self.assertEqual(layout.refused_defaults, self.expected)
-        self.assertEqual(
-            layout.lora_roots, (os.path.normcase(str(self.default_loras)),)
-        )
-
-    def test_they_are_listed_on_an_unusable_centralized_layout(self):
-        self.write_settings(
-            self.user_config,
-            {"sidecar_storage_mode": "centralized", "sidecar_storage_path": "/"},
-        )
-        layout = self.load_defaults()
-        self.assertEqual(layout.error, BAD_SIDECAR_REASON)
-        self.assertEqual(layout.refused_defaults, self.expected)
-
-    def test_they_are_listed_without_an_install(self):
-        layout = self.load_defaults(None)
-        self.assertEqual(layout.error, "no LoraManager install found")
-        self.assertEqual(layout.refused_defaults, self.expected)
-
-    def test_nothing_is_listed_when_every_default_is_accepted(self):
-        self.write_settings(self.user_config, {})
-        self.assertEqual(self.load().refused_defaults, ())
-
-
 class SummaryTests(LayoutTestCase):
 
     def test_summary_names_what_the_import_read(self):

tests/test_lora_utils.py

@@ -224,14 +224,6 @@ class TestReadLoraMetadata(unittest.TestCase):
         result = read_lora_metadata(Path("/nonexistent/file.metadata.json"))
         self.assertIsNone(result)
 
-    def test_returns_none_for_a_file_that_is_not_utf8(self):
-        # #362: one malformed sidecar is skipped; it must not fail the whole
-        # trigger-word load (now logged with a traceback) or the review.
-        with tempfile.TemporaryDirectory() as folder:
-            path = Path(folder) / "bad.metadata.json"
-            path.write_bytes(b'{"model_name": "\xff\xfe"}')
-            self.assertIsNone(read_lora_metadata(path))
-
 
 class TestGetLoraImageCacheDir(unittest.TestCase):
     """Test get_lora_image_cache_dir — returns and creates cache path."""
@@ -1799,34 +1791,6 @@ class TestTriggerWordCacheLayout(unittest.TestCase):
         self.assertTrue(cache.is_loaded)
         self.assertTrue(cache.retry_due())
 
-    def test_an_os_error_is_a_warning_without_a_traceback(self):
-        cache = TriggerWordCache()
-        cache._cache = {"old": ["word"]}
-        with (
-            patch.object(TriggerWordCache, "_build", side_effect=OSError("denied")),
-            self.assertLogs("prompt_manager.lora_utils", level="WARNING") as logs,
-        ):
-            self.assertEqual(cache.load(str(self.lm)), 1)
-        self.assertEqual([r.levelname for r in logs.records], ["WARNING"])
-        self.assertIsNone(logs.records[0].exc_info)
-        self.assertEqual(cache.get_trigger_words("old"), ["word"])
-        self.assertFalse(cache.retry_due())
-
-    def test_an_unexpected_failure_logs_its_traceback(self):
-        # #362: a programming error must not look like a disk error.
-        cache = TriggerWordCache()
-        cache._cache = {"old": ["word"]}
-        with (
-            patch.object(TriggerWordCache, "_build", side_effect=ValueError("bug")),
-            self.assertLogs("prompt_manager.lora_utils", level="WARNING") as logs,
-        ):
-            self.assertEqual(cache.load(str(self.lm)), 1)
-        self.assertEqual(len(logs.records), 1)
-        self.assertIsNotNone(logs.records[0].exc_info)
-        self.assertIs(logs.records[0].exc_info[0], ValueError)
-        self.assertEqual(cache.get_trigger_words("old"), ["word"])
-        self.assertFalse(cache.retry_due())
-
     def test_any_other_failure_never_raises(self):
         cache = TriggerWordCache()
         with (

tests/test_prompt_pair_resolver.py

@@ -1019,8 +1019,7 @@ class TestResolverProfiles(unittest.TestCase):
 
     def test_unsupported_node_names_the_blocking_node(self):
         source = graph()
-        # No text and no links: nothing passes through it (#381).
-        source["1"] = {"class_type": "UnknownEncoder", "inputs": {"seed": 1}}
+        source["1"]["class_type"] = "UnknownEncoder"
         result = resolve_prompt_pair(source, profile=resolver.INSPECTION_PROFILE)
         self.assertEqual(result["reason_code"], "unsupported-node")
         self.assertEqual(result["node"], {"id": "1", "class_type": "UnknownEncoder"})
@@ -1162,9 +1161,14 @@ class TestGuiderSamplers(unittest.TestCase):
 
     def test_unsupported_node_names_first_blocking_node(self):
         source = _guided()
-        # No links: nothing passes through them (#381).
-        source["30"] = {"class_type": "FutureConditioner", "inputs": {"seed": 1}}
-        source["31"] = {"class_type": "OtherConditioner", "inputs": {"seed": 2}}
+        source["30"] = {
+            "class_type": "FutureConditioner",
+            "inputs": {"conditioning": ["6", 0]},
+        }
+        source["31"] = {
+            "class_type": "OtherConditioner",
+            "inputs": {"conditioning": ["7", 0]},
+        }
         source["21"]["inputs"]["positive"] = ["30", 0]
         source["21"]["inputs"]["negative"] = ["31", 0]
         result = _inspect(source)
@@ -1544,8 +1548,7 @@ class TestConditioningSemantics(unittest.TestCase):
     def test_diverging_branch_that_cannot_be_traced_is_never_guessed(self):
         extra = {
             "10": _encoded(parity.POS),
-            # No text and no links: nothing passes through it (#381).
-            "11": {"class_type": "FutureEncoder", "inputs": {"strength": 1.0}},
+            "11": {"class_type": "FutureEncoder", "inputs": {"text": WOLF}},
             "12": _image_exists(),
         }
         source = _with_positive(_if_else(["12", 1], ["10", 0], ["11", 0]), extra)
@@ -2045,17 +2048,12 @@ class TestEncoderAndStringSemantics(unittest.TestCase):
                 result = _inspect(_with_positive(node))
                 self.assertEqual(result["reason_code"], "malformed")
 
-    def test_unknown_text_nodes_pass_their_text_through(self):
-        # #381: an unlisted node's ``text`` input is its text (the legacy rule);
-        # without one, and with nothing linked, it is still named.
+    def test_unverified_text_nodes_stay_unsupported_and_named(self):
+        # TextBoxMira was verified in its source in Task 2.7b and is listed.
         for name in ("LoRAfromText", "RegexReplace", "XYZPrompt"):
             with self.subTest(node=name):
                 node = {"class_type": name, "inputs": {"text": parity.POS}}
                 result = _inspect(_string_positive(node))
-                self.assertEqual(result["state"], "resolved")
-                self.assertEqual(result["positive"]["text"], parity.POS)
-                node = {"class_type": name, "inputs": {"pattern": parity.POS}}
-                result = _inspect(_string_positive(node))
                 self.assertEqual(result["reason_code"], "unsupported-node")
                 self.assertEqual(result["node"], {"id": "10", "class_type": name})
 
@@ -2315,8 +2313,7 @@ class TestDetailerStages(unittest.TestCase):
 
     def test_unresolved_stage_blocks_the_chain(self):
         source = _detailed(same_prompt=True)
-        # No links: nothing passes through it (#381).
-        source["30"] = {"class_type": "FutureConditioner", "inputs": {"c": 1.0}}
+        source["30"] = {"class_type": "FutureConditioner", "inputs": {"c": ["6", 0]}}
         source["3"]["inputs"]["positive"] = ["30", 0]
         source["50"]["inputs"]["positive"] = ["10", 0]
         result = _inspect(source)
@@ -2665,13 +2662,11 @@ class TestLatentAncestry(unittest.TestCase):
             },
             {
                 "50": {"class_type": "LoadImage", "inputs": {"image": "a.png"}},
-                # Its own encoder (#381: the same links would be one prompt).
-                "73": parity._enc(parity.POS),
                 "70": {
                     "class_type": "KSampler",
                     "inputs": {
                         "model": ["4", 0],
-                        "positive": ["73", 0],
+                        "positive": ["6", 0],
                         "negative": ["7", 0],
                         "latent_image": ["72", 0],
                     },
@@ -2974,8 +2969,7 @@ class TestLatentAncestry(unittest.TestCase):
         source["60"]["class_type"] = "UltimateSDUpscale"
         result = _inspect(source, output_node_id="9")
         self.assertEqual((result["state"], result["sampler_id"]), ("resolved", "3"))
-        # Reached only through an unlisted image node, it stays unattributed:
-        # a detailer is never a plain first stage, even on the same links (#381).
+        # Reached only through an unlisted image node, it stays unattributed.
         source["61"] = {"class_type": "MysteryFilter", "inputs": {"image": ["60", 0]}}
         source["5"]["inputs"]["pixels"] = ["61", 0]
         result = _inspect(source, output_node_id="9")

tests/test_resolver_generic_pass_through.py

@@ -1,391 +0,0 @@
-"""Unknown nodes between the prompt and the sampler pass through (#381).
-
-The inspection resolver no longer needs a node class on an allow-list to read
-through it. An output the semantics table does not describe passes through: a
-``text`` input is the text, a ``positive``/``negative`` input routes by output
-slot, a ``conditioning`` input is followed alone, otherwise every linked input
-except core type inputs (``pass_through.skip_inputs``) is followed. One text,
-or several equal texts, resolve; PromptManager nodes are authoritative; several
-different texts are one candidate each. Ingestion (the default profile) is
-unchanged. Every graph here is synthetic, with neutral texts.
-"""
-
-import json
-import unittest
-
-from utils import prompt_pair_resolver as resolver
-from utils.prompt_inspector import inspect_prompt_evidence
-from utils.prompt_pair_resolver import resolve_prompt_pair
-
-try:
-    from tests import unknown_node_graphs as graphs
-except ImportError:  # discovered with ``-s tests``
-    import unknown_node_graphs as graphs
-
-POSITIVE, OTHER, NEGATIVE = graphs.POSITIVE, graphs.OTHER, graphs.NEGATIVE
-any_switch_graph = graphs.any_switch_graph
-_encode, _pair, _with = graphs.encode, graphs.pair, graphs.with_nodes
-
-
-def _inspect(graph, **options):
-    return resolve_prompt_pair(
-        {"prompt": graph}, profile=resolver.INSPECTION_PROFILE, **options
-    )
-
-
-def _texts(result):
-    return tuple(
-        result[role]["text"] if isinstance(result[role], dict) else None
-        for role in ("positive", "negative")
-    )
-
-
-class TestTheReportedGraph(unittest.TestCase):
-    def test_prompt_manager_pair_through_any_switch_resolves(self):
-        result = _inspect(any_switch_graph())
-        self.assertEqual(result["state"], "resolved", result["reason"])
-        self.assertEqual(_texts(result), (POSITIVE, ""))
-        self.assertEqual(result["sampler_id"], "17")
-        self.assertIsNone(result["reason_code"])
-        path = [step["node_id"] for step in result["positive"]["provenance"]["path"]]
-        self.assertEqual(path, ["15", "10"])
-
-    def test_the_inspector_shows_the_prompt(self):
-        evidence = inspect_prompt_evidence({"prompt": json.dumps(any_switch_graph())})
-        self.assertEqual(evidence["resolution"]["state"], "resolved")
-        self.assertEqual(evidence["prompts"]["positive"]["status"], "resolved")
-        self.assertEqual(evidence["prompts"]["positive"]["text"], POSITIVE)
-
-    def test_ingestion_is_unchanged(self):
-        result = resolve_prompt_pair({"prompt": any_switch_graph()})
-        self.assertEqual(result["state"], "unresolved")
-        # Its first failure is the custom latent node, as before this change.
-        self.assertEqual(result["reason"], "Unsupported latent ancestry")
-
-    def test_the_inspection_version_moves(self):
-        self.assertEqual(resolver.INSPECTION_RESOLVER_VERSION, 2)
-        self.assertEqual(resolver.RESOLVER_VERSION, 1)
-
-
-class TestSourcesThroughUnknownNodes(unittest.TestCase):
-    def test_several_inputs_with_one_text_resolve(self):
-        graph = any_switch_graph(any_01=["10", 0], any_02=["10", 0])
-        self.assertEqual(_texts(_inspect(graph)), (POSITIVE, ""))
-
-    def test_equal_texts_from_different_nodes_resolve(self):
-        graph = _with(
-            any_switch_graph(any_01=["20", 0], any_02=["21", 0]),
-            **{"20": _encode(OTHER), "21": _encode(OTHER)},
-        )
-        result = _inspect(graph)
-        self.assertEqual(result["state"], "resolved")
-        self.assertEqual(_texts(result)[0], OTHER)
-
-    def test_different_texts_are_candidates_not_a_refusal(self):
-        graph = _with(
-            any_switch_graph(any_01=["20", 0], any_02=["21", 0]),
-            **{"20": _encode(POSITIVE), "21": _encode(OTHER)},
-        )
-        result = _inspect(graph)
-        self.assertEqual(result["state"], "ambiguous")
-        self.assertEqual(result["reason"], resolver.SEVERAL_SOURCES_REASON)
-        self.assertEqual(
-            [_texts(item) for item in result["candidates"]],
-            [(POSITIVE, ""), (OTHER, "")],
-        )
-        for item in result["candidates"]:
-            self.assertEqual(item["state"], "resolved")
-            self.assertEqual(item["sampler_id"], "17")
-
-    def test_prompt_manager_is_authoritative(self):
-        graph = _with(
-            any_switch_graph(any_01=["20", 0], any_02=["10", 0]),
-            **{"20": _encode(OTHER)},
-        )
-        result = _inspect(graph)
-        self.assertEqual(result["state"], "resolved")
-        self.assertEqual(_texts(result), (POSITIVE, ""))
-
-    def test_prompt_manager_wins_over_an_unreadable_branch(self):
-        graph = _with(
-            any_switch_graph(any_01=["20", 0], any_02=["10", 0]),
-            **{
-                "20": {
-                    "class_type": "CLIPTextEncode",
-                    "inputs": {"text": ["21", 0], "clip": ["7", 0]},
-                },
-                "21": {"class_type": "PromptSearchList", "inputs": {"search": "x"}},
-            },
-        )
-        self.assertEqual(_texts(_inspect(graph)), (POSITIVE, ""))
-
-    def test_an_unreadable_branch_blocks_without_prompt_manager(self):
-        graph = _with(
-            any_switch_graph(any_01=["20", 0], any_02=["22", 0]),
-            **{
-                "20": {
-                    "class_type": "CLIPTextEncode",
-                    "inputs": {"text": ["21", 0], "clip": ["7", 0]},
-                },
-                "21": {"class_type": "PromptSearchList", "inputs": {"search": "x"}},
-                "22": _encode(OTHER),
-            },
-        )
-        result = _inspect(graph)
-        self.assertEqual(result["state"], "unresolved")
-        self.assertEqual(result["reason_code"], "runtime-value")
-
-    def test_chained_unknown_nodes(self):
-        graph = _with(
-            any_switch_graph(any_01=["20", 0]),
-            **{
-                "20": {
-                    "class_type": "Router Node (vendor)",
-                    "inputs": {"in": ["10", 0]},
-                }
-            },
-        )
-        self.assertEqual(_texts(_inspect(graph)), (POSITIVE, ""))
-
-    def test_no_text_names_the_unknown_node(self):
-        graph = any_switch_graph(any_01=["7", 0])
-        result = _inspect(graph)
-        self.assertEqual(result["state"], "unresolved")
-        self.assertEqual(result["reason_code"], "unsupported-node")
-        self.assertEqual(
-            result["node"], {"id": "15", "class_type": "Any Switch (rgthree)"}
-        )
-
-    def test_another_sampler_is_never_entered(self):
-        graph = any_switch_graph(any_01=["17", 0], any_02=["10", 0])
-        graph["30"] = {
-            "class_type": "KSampler",
-            "inputs": {**graph["17"]["inputs"], "positive": ["31", 0]},
-        }
-        graph["31"] = _encode(OTHER)
-        graph["15"]["inputs"]["any_01"] = ["30", 0]
-        result = _inspect(graph)
-        found = {item["sampler_id"]: _texts(item) for item in result["candidates"]}
-        self.assertEqual(found["17"], (POSITIVE, ""))
-
-
-class TestLegacyShapedRules(unittest.TestCase):
-    def test_a_text_input_is_the_text(self):
-        graph = _with(
-            any_switch_graph(any_01=["20", 0]),
-            **{
-                "20": {
-                    "class_type": "VendorTextEncode",
-                    "inputs": {"text": OTHER, "clip": ["9", 1]},
-                }
-            },
-        )
-        self.assertEqual(_texts(_inspect(graph))[0], OTHER)
-
-    def test_role_inputs_route_by_output_slot(self):
-        graph = any_switch_graph()
-        graph["20"] = {
-            "class_type": "VendorControlApply",
-            "inputs": {
-                "positive": ["21", 0],
-                "negative": ["22", 0],
-                "control_net": ["8", 0],
-                "image": ["8", 0],
-            },
-        }
-        graph["21"] = _encode(POSITIVE)
-        graph["22"] = _encode(NEGATIVE)
-        graph["17"]["inputs"]["positive"] = ["20", 0]
-        graph["17"]["inputs"]["negative"] = ["20", 1]
-        self.assertEqual(_texts(_inspect(graph)), (POSITIVE, NEGATIVE))
-
-    def test_a_conditioning_input_is_followed_alone(self):
-        graph = _with(
-            any_switch_graph(any_01=["20", 0]),
-            **{
-                "20": {
-                    "class_type": "VendorStyleApply",
-                    "inputs": {"conditioning": ["10", 0], "style": ["21", 0]},
-                },
-                "21": _encode(OTHER),
-            },
-        )
-        self.assertEqual(_texts(_inspect(graph)), (POSITIVE, ""))
-
-    def test_core_type_inputs_are_skipped(self):
-        # The vendor encoder's ``clip`` reaches a loader with its own ``text``:
-        # that text is a lora tag, never the prompt.
-        graph = _with(
-            any_switch_graph(any_01=["20", 0]),
-            **{
-                "20": {
-                    "class_type": "VendorPromptEncode",
-                    "inputs": {"prompt": ["21", 0], "clip": ["22", 1]},
-                },
-                "21": {"class_type": "PrimitiveString", "inputs": {"value": OTHER}},
-                "22": {
-                    "class_type": "VendorLoraLoader",
-                    "inputs": {"text": "<lora:x:1>", "clip": ["7", 0]},
-                },
-            },
-        )
-        result = _inspect(graph)
-        self.assertEqual(result["state"], "resolved")
-        self.assertEqual(_texts(result)[0], OTHER)
-
-
-class TestBounds(unittest.TestCase):
-    def test_a_long_unknown_chain_reaches_the_depth_limit(self):
-        graph = any_switch_graph(any_01=["100", 0])
-        for index in range(100, 100 + resolver.INSPECTION_PROFILE.max_depth + 2):
-            graph[str(index)] = {
-                "class_type": "Router Node (vendor)",
-                "inputs": {"in": [str(index + 1), 0]},
-            }
-        graph[str(index + 1)] = _pair()
-        result = _inspect(graph)
-        self.assertEqual(result["state"], "unresolved")
-        self.assertEqual(result["reason_code"], "depth-limit")
-
-    def test_many_different_sources_hit_the_candidate_cap(self):
-        inputs = {}
-        graph = any_switch_graph()
-        for index in range(resolver._MAX_BRANCH_CANDIDATES + 1):
-            graph[str(200 + index)] = _encode(f"{OTHER} {index}")
-            inputs[f"any_{index:02}"] = [str(200 + index), 0]
-        graph["15"]["inputs"] = inputs
-        result = _inspect(graph)
-        self.assertEqual(result["state"], "unresolved")
-        self.assertEqual(result["reason_code"], "work-limit")
-
-
-if __name__ == "__main__":
-    unittest.main()
-
-
-class TestGeneratedAndTransformedText(unittest.TestCase):
-    def test_a_seeded_text_node_is_generated_at_run_time(self):
-        result = _inspect(graphs.generated_text_graph())
-        self.assertEqual(result["state"], "unresolved")
-        self.assertEqual(result["reason_code"], "runtime-value")
-        self.assertEqual(
-            result["node"], {"id": "30", "class_type": "VendorTextGenerate"}
-        )
-
-    def test_the_recorded_text_is_authoritative(self):
-        # The record is what ran: a generated or transformed text is never
-        # checked against the generator's or transform's inputs.
-        for name, records in graphs.recorded_shapes().items():
-            with self.subTest(shape=name):
-                metadata = {
-                    "prompt": json.loads(records["prompt"]),
-                    "comfyassets_prompt_pairs": records["comfyassets_prompt_pairs"],
-                }
-                result = resolve_prompt_pair(
-                    metadata, profile=resolver.INSPECTION_PROFILE
-                )
-                self.assertEqual(result["state"], "resolved", result["reason"])
-                self.assertEqual(_texts(result), (graphs.GENERATED, ""))
-                self.assertEqual(
-                    result["positive"]["provenance"]["text_source"], "execution"
-                )
-
-    def test_a_seeded_conditioning_node_still_passes_through(self):
-        graph = _with(
-            any_switch_graph(any_01=["20", 0]),
-            **{
-                "20": {
-                    "class_type": "VendorConditioningNoise",
-                    "inputs": {"conditioning": ["10", 0], "seed": 3},
-                }
-            },
-        )
-        self.assertEqual(_texts(_inspect(graph)), (POSITIVE, ""))
-
-
-class TestReviewFindings(unittest.TestCase):
-    """Shapes from the independent review of the first #381 commit."""
-
-    def _recorded(self, text_source: dict) -> dict:
-        graph = any_switch_graph()
-        graph["10"]["inputs"]["text"] = ["30", 0]
-        graph.update(text_source)
-        metadata = {
-            "prompt": graph,
-            "comfyassets_prompt_pairs": graphs.execution("10", graphs.GENERATED),
-        }
-        return resolve_prompt_pair(metadata, profile=resolver.INSPECTION_PROFILE)
-
-    def test_a_failing_walk_never_overrides_the_recorded_text(self):
-        sources = {
-            "missing": {"30": {"class_type": "XLLM", "inputs": {"src": ["99", 0]}}},
-            "composite": {
-                "30": {"class_type": "XLLM", "inputs": {"src": ["31", 0]}},
-                "31": {
-                    "class_type": "ConditioningCombine",
-                    "inputs": {
-                        "conditioning_1": ["32", 0],
-                        "conditioning_2": ["33", 0],
-                    },
-                },
-                "32": _encode(POSITIVE),
-                "33": _encode(OTHER),
-            },
-            "several": {
-                "30": {
-                    "class_type": "XLLM",
-                    "inputs": {"a": ["31", 0], "b": ["32", 0]},
-                },
-                "31": {"class_type": "PrimitiveString", "inputs": {"value": POSITIVE}},
-                "32": {"class_type": "PrimitiveString", "inputs": {"value": OTHER}},
-            },
-            "list-text": {"30": {"class_type": "XLLM", "inputs": {"text": [1, 2, 3]}}},
-        }
-        for name, source in sources.items():
-            with self.subTest(source=name):
-                result = self._recorded(source)
-                self.assertEqual(result["state"], "resolved", result["reason"])
-                self.assertEqual(_texts(result)[0], graphs.GENERATED)
-
-    def test_the_seed_rule_reads_only_string_outputs(self):
-        graph = _with(
-            any_switch_graph(any_01=["20", 0]),
-            **{
-                "20": {"class_type": "XNoise", "inputs": {"conditioning": ["21", 0]}},
-                "21": {
-                    "class_type": "XSeedEncode",
-                    "inputs": {"clip": ["7", 0], "text": OTHER, "seed": 3},
-                },
-            },
-        )
-        self.assertEqual(_texts(_inspect(graph))[0], OTHER)
-
-    def test_an_unlinked_role_input_adds_nothing(self):
-        graph = any_switch_graph()
-        graph["20"] = {
-            "class_type": "XApply",
-            "inputs": {"positive": ["21", 0], "negative_opt": ""},
-        }
-        graph["21"] = _encode(POSITIVE)
-        graph["17"]["inputs"]["positive"] = ["20", 0]
-        graph["17"]["inputs"]["negative"] = ["20", 1]
-        result = _inspect(graph)
-        self.assertEqual(result["state"], "unresolved")
-        self.assertEqual(result["reason_code"], "unsupported-node")
-        self.assertEqual(result["node"], {"id": "20", "class_type": "XApply"})
-
-    def test_one_text_offered_twice_is_one_candidate(self):
-        graph = _with(
-            any_switch_graph(any_01=["20", 0], any_02=["23", 0]),
-            **{
-                "20": {"class_type": "XB", "inputs": {"p": ["21", 0], "q": ["22", 0]}},
-                "21": _encode(POSITIVE),
-                "22": _encode(OTHER),
-                "23": _encode(POSITIVE),
-            },
-        )
-        result = _inspect(graph)
-        self.assertEqual(result["state"], "ambiguous")
-        self.assertEqual(
-            [_texts(item)[0] for item in result["candidates"]], [POSITIVE, OTHER]
-        )

tests/test_resolver_pass_through.py

@@ -72,24 +72,16 @@ class TestHiresFixChain(unittest.TestCase):
     def test_an_unlisted_image_node_breaks_the_lineage(self):
         # The walk still finds the earlier sampler, but not through listed
         # pass-through nodes: the stages are never compared.
-        graph = shapes.hires_fix(
-            second_positive=shapes.POSITIVE, filter_class="MysteryImageEffect"
-        )
-        result = _inspect(graph)
+        result = _inspect(shapes.hires_fix(filter_class="MysteryImageEffect"))
         self.assertEqual(result["state"], "ambiguous")
         later = next(
             item for item in result["candidates"] if item["sampler_id"] == "20"
         )
         self.assertEqual(later["reason"], resolver.MULTISTAGE_UNATTRIBUTED_REASON)
-        # Stages on the very same conditioning links are one prompt (#381).
-        result = _inspect(shapes.hires_fix(filter_class="MysteryImageEffect"))
-        self.assertEqual(result["state"], "resolved")
 
     def test_a_second_earlier_sampler_in_the_ancestry_stays_unattributed(self):
         graph = shapes.hires_fix()
-        # Its own encoder: the same links would be one prompt (#381).
-        graph["33"] = shapes.encode(shapes.POSITIVE)
-        graph["30"] = shapes.ksampler(["33", 0], ["3", 0], ["4", 0])
+        graph["30"] = shapes.ksampler(["2", 0], ["3", 0], ["4", 0])
         graph["31"] = {"class_type": "VAEDecode", "inputs": {"samples": ["30", 0]}}
         graph["32"] = {
             "class_type": "ImageBlend",

tests/test_resolver_saver_anchor.py

@@ -1,151 +0,0 @@
-"""Saver anchoring by file name and shared-conditioning stages (#381).
-
-An inspected file's name anchors the walk on the one saver whose
-``filename_prefix`` (literal or traced) makes ``<prefix>_<digits>[_]``; the
-samplers in that saver's image ancestry are the candidates. When no saver or
-more than one matches, nothing is guessed: the file stays "several possible
-prompts". A later stage reading the same positive and negative links as the
-earlier stage has the same prompt whatever its latent ancestry. Shapes come
-from the maintainer's runs (``tests/saver_anchor_graphs.py``).
-"""
-
-import json
-import unittest
-
-from utils import prompt_pair_resolver as resolver
-from utils.prompt_inspector import inspect_prompt_evidence
-
-try:
-    from tests import saver_anchor_graphs as shapes
-except ImportError:  # discovered with ``-s tests``
-    import saver_anchor_graphs as shapes
-
-
-def _inspect(graph, file_name=None):
-    return resolver.resolve_prompt_pair(
-        {"prompt": graph}, profile=resolver.INSPECTION_PROFILE, file_name=file_name
-    )
-
-
-def _positive(result):
-    side = result["positive"]
-    return side["text"] if isinstance(side, dict) else None
-
-
-class TestSaverAnchor(unittest.TestCase):
-    def test_the_file_name_picks_its_branch(self):
-        for index, text in enumerate(shapes.BRANCH_TEXTS, start=1):
-            for name in (
-                f"s45_branch_{index}_00002_.png",
-                f"s45_branch_{index}_00002.webp",
-            ):
-                with self.subTest(file=name):
-                    result = _inspect(shapes.branch_bench(), name)
-                    self.assertEqual(result["state"], "resolved")
-                    self.assertEqual(_positive(result), text)
-                    self.assertEqual(result["sampler_id"], str(index * 10 + 1))
-
-    def test_unanchored_branches_stay_several(self):
-        self.assertEqual(_inspect(shapes.branch_bench())["state"], "ambiguous")
-
-    def test_a_traced_prefix_anchors(self):
-        result = _inspect(shapes.linked_prefix_bench(), "s45_branch_3_00007_.png")
-        self.assertEqual(_positive(result), shapes.BRANCH_TEXTS[2])
-
-    def test_an_unknown_saver_class_anchors_too(self):
-        result = _inspect(
-            shapes.branch_bench(saver="VendorSaveImage"), "s45_branch_2_00001_.png"
-        )
-        self.assertEqual(_positive(result), shapes.BRANCH_TEXTS[1])
-
-    def test_no_guessing_when_the_name_matches_none_or_several(self):
-        cases = {
-            "no saver matches": (shapes.branch_bench(), "photo_00001_.png"),
-            "not a counter": (shapes.branch_bench(), "s45_branch_3_final.png"),
-            "prefix of another branch": (
-                shapes.branch_bench(),
-                "s45_branch_00001_.png",
-            ),
-            "shared prefix": (shapes.shared_prefix(), "IMG_GEN_00371_.png"),
-        }
-        for label, (graph, name) in cases.items():
-            with self.subTest(case=label):
-                result = _inspect(graph, name)
-                self.assertEqual(result["state"], "ambiguous")
-                self.assertEqual(len(result["candidates"]), len(shapes.BRANCH_TEXTS))
-
-    def test_the_inspector_passes_the_file_name(self):
-        records = {"prompt": json.dumps(shapes.branch_bench())}
-        evidence = inspect_prompt_evidence(records, file_name="s45_branch_4_00009_.png")
-        self.assertEqual(
-            evidence["prompts"]["positive"]["text"], shapes.BRANCH_TEXTS[3]
-        )
-        self.assertEqual(
-            inspect_prompt_evidence(records)["resolution"]["state"], "ambiguous"
-        )
-
-    def test_ingestion_ignores_the_file_name(self):
-        result = resolver.resolve_prompt_pair(
-            {"prompt": shapes.branch_bench()}, file_name="s45_branch_1_00001_.png"
-        )
-        self.assertEqual(result["state"], "ambiguous")
-
-
-class TestSharedConditioningStages(unittest.TestCase):
-    def test_a_later_stage_on_the_same_links_resolves(self):
-        for name in (None, "final_00003_.png"):
-            with self.subTest(file=name):
-                result = _inspect(shapes.two_stage_same_conditioning(), name)
-                self.assertEqual(result["state"], "resolved", result["reason"])
-                self.assertEqual(_positive(result), shapes.BRANCH_TEXTS[0])
-
-    def test_different_links_stay_unattributed(self):
-        graph = shapes.two_stage_same_conditioning(second_positive=["91", 0])
-        result = _inspect(graph, "final_00003_.png")
-        self.assertEqual(result["state"], "unresolved")
-        self.assertEqual(result["reason"], resolver.MULTISTAGE_UNATTRIBUTED_REASON)
-
-
-if __name__ == "__main__":
-    unittest.main()
-
-
-class TestReviewFindings(unittest.TestCase):
-    """Shapes from the independent review of the saver-anchor commit."""
-
-    def test_a_skipped_stage_never_hides_its_own_earlier_prompt(self):
-        result = _inspect(shapes.hidden_earlier_prompt(), "out_00001_.png")
-        self.assertNotEqual(result["state"], "resolved")
-        self.assertEqual(result["reason"], resolver.MULTISTAGE_UNATTRIBUTED_REASON)
-
-    def test_a_skipped_stage_never_hides_its_override(self):
-        result = _inspect(shapes.hidden_earlier_prompt(override=True), "out_00001_.png")
-        self.assertNotEqual(result["state"], "resolved")
-
-    def test_an_unfinished_prefix_scan_anchors_nothing(self):
-        graph = shapes.deep_prefixes(9)
-        for visits in range(10, 30):
-            with self.subTest(visits=visits):
-                result = resolver.resolve_prompt_pair(
-                    {"prompt": graph},
-                    profile=resolver.INSPECTION_PROFILE,
-                    max_visits=visits,
-                    file_name="dup_00001_.png",
-                )
-                self.assertNotEqual(result["state"], "resolved")
-
-
-class TestPlainFirstStage(unittest.TestCase):
-    def test_only_a_plain_first_stage_is_skipped(self):
-        expected = {
-            "no-latent": "resolved",
-            "literal-latent": "unresolved",
-            "missing-latent": "unresolved",
-            "cyclic-latent": "unresolved",
-            "stage-shaped": "unresolved",
-            "detailer": "unresolved",
-        }
-        for kind, state in expected.items():
-            with self.subTest(kind=kind):
-                result = _inspect(shapes.first_stage_variant(kind), "final_00003_.png")
-                self.assertEqual(result["state"], state, result["reason"])

tests/test_review_inspection.py

@@ -864,11 +864,7 @@ class TestInspectionResolverVersion(InspectionTestCase):
             }
 
         with (
-            patch.object(
-                review_capture,
-                "INSPECTION_RESOLVER_VERSION",
-                review_capture.INSPECTION_RESOLVER_VERSION + 1,
-            ),
+            patch.object(review_capture, "INSPECTION_RESOLVER_VERSION", 2),
             patch.object(review_capture, "resolve_inspection", side_effect=newer),
         ):
             self.assertNotEqual(_version(), version)

tests/test_review_schema.py

@@ -371,10 +371,7 @@ class ReviewSchemaTests(unittest.TestCase):
         self.require_module()
         for label, dropped in (
             ("annotations only", TABLES),
-            (
-                "predates annotations",
-                ("media_image_autotags",) + ANNOTATION_TABLES + TABLES,
-            ),
+            ("predates annotations", ANNOTATION_TABLES + TABLES),
         ):
             with self.subTest(label):
                 path = str(Path(self.temp.name) / f"{label.replace(' ', '-')}.db")

tests/test_utils_logging_config.py

@@ -1,10 +1,8 @@
 """PromptManagerLogger: memory buffer, file rotation, level changes, truncation."""
 
 import logging
-import ntpath
 import os
 import pathlib
-import stat
 import sys
 import tempfile
 import threading
@@ -13,20 +11,14 @@ import unittest.mock as mock
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from utils import logging_config  # noqa: E402
-from utils.logging_config import (  # noqa: E402
+from utils import logging_config
+from utils.logging_config import (
     MemoryBufferHandler,
     PromptManagerLogger,
-    RotatedChanged,
     get_logger,
     get_logger_manager,
 )
 
-try:
-    from tests.open_handles import assert_closed  # noqa: E402
-except ImportError:  # discovered with tests/ as the top-level directory
-    from open_handles import assert_closed  # noqa: E402
-
 
 class IsolatedLoggerTestCase(unittest.TestCase):
     """A logger manager whose log directory is a temporary folder."""
@@ -40,7 +32,6 @@ class IsolatedLoggerTestCase(unittest.TestCase):
         with mock.patch.object(logging_config, "__file__", fake_file):
             self.manager = object.__new__(PromptManagerLogger)  # bypass singleton
             self.manager.__init__()
-        self.allowed_thread_names = set()
         self.manager.update_config({"console_logging": False})
         # Drop the "Updated logging configuration" entry.
         self.manager._log_buffer.clear()
@@ -62,21 +53,12 @@ class IsolatedLoggerTestCase(unittest.TestCase):
 
     def _filter_to_this_thread(self):
         this_thread = threading.get_ident()
-        # A test may let named helper threads of its own through too.
-        allowed_names = self.allowed_thread_names
-
-        def allowed(record):
-            return record.thread == this_thread or record.threadName in allowed_names
-
         for handler in self.manager.logger.handlers:
-            handler.filters.clear()
-            handler.addFilter(allowed)
+            handler.addFilter(lambda record: record.thread == this_thread)
 
     def _restore_global_logging(self):
         for handler in logging.getLogger("prompt_manager").handlers[:]:
             handler.close()
-        # Windows refuses to delete an open log: prove every handle is closed.
-        assert_closed(self, self.tmp.name)
         get_logger_manager()._setup_loggers()
         self.tmp.cleanup()
 
@@ -193,14 +175,15 @@ class TestFilesAndRotation(IsolatedLoggerTestCase):
 
     def test_unreadable_files_are_skipped_in_the_listing(self):
         self.logger.info("something")
-        original_lstat = os.lstat
+        original_stat = pathlib.Path.stat
 
-        def lstat_failing_for_logs(path, *args, **kwargs):
-            if str(path).endswith(".log"):
+        def stat_failing_for_logs(path, *args, **kwargs):
+            if path.suffix == ".log":
                 raise OSError("denied")
-            return original_lstat(path, *args, **kwargs)
+            return original_stat(path, *args, **kwargs)
 
-        with mock.patch.object(logging_config.os, "lstat", lstat_failing_for_logs):
+        with mock.patch.object(pathlib.Path, "stat", autospec=True) as stat:
+            stat.side_effect = stat_failing_for_logs
             self.assertEqual(self.manager.get_log_files(), [])
 
     def test_truncate_does_not_roll_the_log_over_while_deleting_backups(self):
@@ -245,522 +228,10 @@ class TestFilesAndRotation(IsolatedLoggerTestCase):
 
     def test_truncate_reports_files_it_cannot_remove(self):
         self._rotate()
-
-        def busy(path, *args, **kwargs):
-            raise PermissionError(13, "busy", str(path))
-
-        with mock.patch.object(logging_config.os, "unlink", busy):
+        with mock.patch.object(pathlib.Path, "unlink", side_effect=OSError("busy")):
             result = self.manager.truncate_logs()
         self.assertEqual(len(result["errors"]), 2)
         self.assertEqual(result["truncated"], ["prompt_manager.log"])
-        for error in result["errors"]:
-            self.assertNotIn(self.tmp.name, error)
-            self.assertRegex(error, r"prompt_manager\.log\.[12]")
-
-
-class TestRotatedCopyRule(IsolatedLoggerTestCase):
-    """Rule R (#329): only prompt_manager.log.<n> regular files are deletable."""
-
-    def setUp(self):
-        super().setUp()
-        self.logger.info("active log line")  # the active log exists
-        self.outside = os.path.join(self.tmp.name, "outside")
-        os.makedirs(self.outside)
-
-    def _path(self, name):
-        return os.path.join(self.log_dir, name)
-
-    def _write(self, name, data=b"rotated\n"):
-        with open(self._path(name), "wb") as handle:
-            handle.write(data)
-        return self._path(name)
-
-    def _symlink(self, name, target_name="secret.txt", data=b"secret " * 1000):
-        """A symlink in the log folder to a file outside it, or None."""
-        target = os.path.join(self.outside, target_name)
-        with open(target, "wb") as handle:
-            handle.write(data)
-        try:
-            os.symlink(target, self._path(name))
-        except (OSError, NotImplementedError):  # pragma: no cover - no privilege
-            return None
-        return target
-
-    def _require_symlink(self, name, **kwargs):
-        target = self._symlink(name, **kwargs)
-        if target is None:  # pragma: no cover - Windows without the privilege
-            self.skipTest("this account cannot create symlinks")
-        return target
-
-    def _kinds(self):
-        return {row["name"]: row["kind"] for row in self.manager.scan_log_folder()}
-
-    def _rotated_rows(self):
-        return [r for r in self.manager.scan_log_folder() if r["kind"] == "rotated"]
-
-    def _names(self):
-        return sorted(os.listdir(self.log_dir))
-
-    def _file_handler(self):
-        return next(
-            h
-            for h in self.manager.logger.handlers
-            if isinstance(h, logging.FileHandler)
-        )
-
-    def test_scan_classes_rotated_active_link_and_other(self):
-        for name in ("prompt_manager.log.1", "prompt_manager.log.2"):
-            self._write(name)
-        self._write("prompt_manager.log.3", b"x" * 3000)
-        for name in (
-            "prompt_manager.log.0",
-            "prompt_manager.log.01",
-            "prompt_manager.log.bak",
-            "prompt_manager.log.1.gz",
-            "prompt_manager.log.-1",
-            "notes.txt",
-        ):
-            self._write(name)
-        os.makedirs(self._path("prompt_manager.log.5"))
-        self._require_symlink("prompt_manager.log.4")
-        kinds = self._kinds()
-        self.assertEqual(
-            kinds,
-            {
-                "prompt_manager.log": "active",
-                "prompt_manager.log.1": "rotated",
-                "prompt_manager.log.2": "rotated",
-                "prompt_manager.log.3": "rotated",
-                "prompt_manager.log.0": "other",
-                "prompt_manager.log.01": "other",
-                "prompt_manager.log.bak": "other",
-                "prompt_manager.log.1.gz": "other",
-                "prompt_manager.log.-1": "other",
-                "notes.txt": "other",
-                "prompt_manager.log.5": "other",
-                "prompt_manager.log.4": "link",
-            },
-        )
-        row = next(
-            r
-            for r in self.manager.scan_log_folder()
-            if r["name"] == "prompt_manager.log.3"
-        )
-        self.assertEqual(
-            set(row), {"name", "kind", "size", "mtime_ns", "ino", "modified"}
-        )
-        stat = os.lstat(self._path("prompt_manager.log.3"))
-        self.assertEqual(row["size"], 3000)
-        self.assertEqual(row["mtime_ns"], stat.st_mtime_ns)
-        self.assertEqual(row["ino"], stat.st_ino)
-
-    def test_scan_matches_names_case_insensitively_on_windows(self):
-        self._write("PROMPT_MANAGER.LOG.2")
-        if os.name == "nt":  # pragma: no cover - native case folding
-            self.assertEqual(self._kinds()["PROMPT_MANAGER.LOG.2"], "rotated")
-            return
-        # POSIX names are case-sensitive: another file, never deleted.
-        self.assertEqual(self._kinds()["PROMPT_MANAGER.LOG.2"], "other")
-        with mock.patch.object(logging_config, "_name_key", ntpath.normcase):
-            self.assertEqual(self._kinds()["PROMPT_MANAGER.LOG.2"], "rotated")
-            result = self.manager.delete_rotated(self._rotated_rows())
-        self.assertEqual(result["removed"], ["PROMPT_MANAGER.LOG.2"])
-
-    def test_a_junction_is_classed_as_a_link_and_kept(self):
-        # Portable control: whatever os.path.isjunction reports is a link.
-        self._write("prompt_manager.log.4")
-        self._write("prompt_manager.log.1")
-        junction = self._path("prompt_manager.log.4")
-        real_isjunction = os.path.isjunction
-
-        def isjunction(path):
-            return os.fspath(path) == junction or real_isjunction(path)
-
-        with mock.patch.object(logging_config.os.path, "isjunction", isjunction):
-            self.assertEqual(self._kinds()["prompt_manager.log.4"], "link")
-            self.manager.delete_rotated(self._rotated_rows())
-            self.manager.truncate_logs()
-        self.assertIn("prompt_manager.log.4", self._names())
-        self.assertNotIn("prompt_manager.log.1", self._names())
-
-    @unittest.skipUnless(os.name == "nt", "junctions exist only on Windows")
-    def test_junction_is_never_deleted_on_windows(self):  # pragma: no cover
-        import _winapi
-
-        target = os.path.join(self.outside, "kept")
-        os.makedirs(target)
-        with open(os.path.join(target, "inside.txt"), "wb") as handle:
-            handle.write(b"keep me")
-        _winapi.CreateJunction(target, self._path("prompt_manager.log.4"))
-        self._write("prompt_manager.log.1")
-        self.assertEqual(self._kinds()["prompt_manager.log.4"], "link")
-        self.manager.delete_rotated(self._rotated_rows())
-        self.manager.truncate_logs()
-        self.assertIn("prompt_manager.log.4", self._names())
-        self.assertTrue(os.path.exists(os.path.join(target, "inside.txt")))
-        with self.assertRaises(FileNotFoundError):
-            self.manager.log_file_entry("prompt_manager.log.4")
-        os.rmdir(self._path("prompt_manager.log.4"))  # removes the junction only
-
-    def test_delete_rotated_removes_exactly_the_listed_files(self):
-        for n in (1, 2, 3):
-            self._write(f"prompt_manager.log.{n}", b"r" * n)
-        self._write("prompt_manager.log.bak")
-        os.makedirs(self._path("prompt_manager.log.7"))
-        target = self._symlink("prompt_manager.log.4")
-        listed = [
-            r for r in self._rotated_rows() if r["name"] != "prompt_manager.log.3"
-        ]
-        result = self.manager.delete_rotated(listed)
-        self.assertEqual(
-            result,
-            {"removed": ["prompt_manager.log.1", "prompt_manager.log.2"], "failed": []},
-        )
-        expected = [
-            "prompt_manager.log",
-            "prompt_manager.log.3",
-            "prompt_manager.log.7",
-            "prompt_manager.log.bak",
-        ]
-        if target is not None:
-            expected.append("prompt_manager.log.4")
-            self.assertTrue(os.path.exists(target))
-        self.assertEqual(self._names(), sorted(expected))
-
-    def test_delete_rotated_refuses_all_when_one_changed(self):
-        def change_size(path):
-            with open(path, "ab") as handle:
-                handle.write(b"more")
-
-        def change_mtime(path):
-            stat = os.lstat(path)
-            os.utime(path, ns=(stat.st_atime_ns, stat.st_mtime_ns + 5_000_000_000))
-
-        def change_inode(path):
-            stat = os.lstat(path)
-            with open(path, "rb") as handle:
-                data = handle.read()
-            other = path + ".new"
-            with open(other, "wb") as handle:
-                handle.write(data)
-            os.utime(other, ns=(stat.st_atime_ns, stat.st_mtime_ns))
-            os.replace(other, path)
-            if os.lstat(path).st_ino in (0, stat.st_ino):  # pragma: no cover
-                self.skipTest("this filesystem reports no inode numbers")
-
-        def remove(path):
-            os.unlink(path)
-
-        def replace_by_link(path):
-            os.unlink(path)
-            target = os.path.join(self.outside, "elsewhere.txt")
-            with open(target, "wb") as handle:
-                handle.write(b"rotated\n")
-            try:
-                os.symlink(target, path)
-            except (OSError, NotImplementedError):  # pragma: no cover
-                self.skipTest("this account cannot create symlinks")
-
-        changes = {
-            "size": change_size,
-            "mtime": change_mtime,
-            "inode": change_inode,
-            "missing": remove,
-            "link": replace_by_link,
-        }
-        for label, change in changes.items():
-            with self.subTest(change=label):
-                for n in (1, 2, 3):
-                    self._write(f"prompt_manager.log.{n}", b"rotated\n")
-                reviewed = self._rotated_rows()
-                change(self._path("prompt_manager.log.2"))
-                before = self._names()
-                with self.assertRaises(RotatedChanged):
-                    self.manager.delete_rotated(reviewed)
-                self.assertEqual(self._names(), before)
-                self.assertIn("prompt_manager.log.1", before)
-                self.assertIn("prompt_manager.log.3", before)
-                for name in self._names():
-                    if name.startswith("prompt_manager.log."):
-                        os.unlink(self._path(name))
-
-    def test_rollover_waits_while_cleanup_holds_the_handler_lock(self):
-        # The file is already over its limit: the next record rolls it over,
-        # renaming .1 to .2 and the active log to .1.
-        self.manager.update_config({"max_file_size": 64, "backup_count": 3})
-        self.logger.info("x" * 100)
-        self._write("prompt_manager.log.1", b"first copy\n")
-        self._write("prompt_manager.log.2", b"second copy\n")
-        reviewed = self._rotated_rows()
-        holding = threading.Event()
-        release = threading.Event()
-        logged = threading.Event()
-        real_unlink = os.unlink
-        self.allowed_thread_names.add("pm-test-rollover")
-
-        def log_from_another_thread():
-            self.logger.info("rolls the log over")
-            logged.set()
-
-        worker = threading.Thread(
-            target=log_from_another_thread, name="pm-test-rollover", daemon=True
-        )
-
-        def slow_unlink(path, *args, **kwargs):
-            if not holding.is_set():
-                worker.start()  # its record must wait for the cleanup's lock
-                holding.set()
-                if not release.wait(10):
-                    raise RuntimeError("the test never released the cleanup")
-            return real_unlink(path, *args, **kwargs)
-
-        result = {}
-
-        def cleanup():
-            result.update(self.manager.delete_rotated(reviewed))
-
-        with mock.patch.object(logging_config.os, "unlink", slow_unlink):
-            cleaner = threading.Thread(target=cleanup, daemon=True)
-            cleaner.start()
-            self.assertTrue(holding.wait(10), "the cleanup never started deleting")
-            # The record waits on the handler lock the cleanup holds.
-            self.assertFalse(logged.wait(0.3), "a record was written mid-cleanup")
-            release.set()
-            cleaner.join(10)
-            worker.join(10)
-        self.assertFalse(cleaner.is_alive())
-        self.assertTrue(logged.is_set())
-        self.assertEqual(
-            result,
-            {"removed": ["prompt_manager.log.1", "prompt_manager.log.2"], "failed": []},
-        )
-        # The rollover ran after the cleanup: only the old active log moved.
-        self.assertEqual(self._names(), ["prompt_manager.log", "prompt_manager.log.1"])
-        with open(self._path("prompt_manager.log.1"), "rb") as handle:
-            self.assertIn(b"x" * 100, handle.read())
-
-    def test_open_rotated_copy_is_reported_not_deleted(self):
-        for n in (1, 2, 3):
-            self._write(f"prompt_manager.log.{n}")
-        real_unlink = os.unlink
-        held = self._path("prompt_manager.log.2")
-
-        def unlink(path, *args, **kwargs):
-            if os.fspath(path) == held:
-                error = PermissionError(
-                    13,
-                    "The process cannot access the file because it is being "
-                    "used by another process",
-                    held,
-                )
-                error.winerror = 32
-                raise error
-            return real_unlink(path, *args, **kwargs)
-
-        with mock.patch.object(logging_config.os, "unlink", unlink):
-            result = self.manager.delete_rotated(self._rotated_rows())
-        self.assertEqual(
-            result["removed"], ["prompt_manager.log.1", "prompt_manager.log.3"]
-        )
-        [(name, error)] = result["failed"]
-        self.assertEqual(name, "prompt_manager.log.2")
-        self.assertIsInstance(error, PermissionError)
-        self.assertIn("prompt_manager.log.2", self._names())
-
-    @unittest.skipUnless(os.name == "nt", "only Windows refuses to unlink an open file")
-    def test_open_rotated_copy_is_reported_not_deleted_on_windows(
-        self,
-    ):  # pragma: no cover
-        for n in (1, 2, 3):
-            self._write(f"prompt_manager.log.{n}")
-        reviewed = self._rotated_rows()
-        handle = open(self._path("prompt_manager.log.2"), "rb")
-        try:
-            result = self.manager.delete_rotated(reviewed)
-        finally:
-            handle.close()
-        self.assertEqual(
-            result["removed"], ["prompt_manager.log.1", "prompt_manager.log.3"]
-        )
-        [(name, error)] = result["failed"]
-        self.assertEqual(name, "prompt_manager.log.2")
-        self.assertIsInstance(error, PermissionError)
-        self.assertIn("prompt_manager.log.2", self._names())
-
-    def test_cleanup_never_logs_while_holding_the_handler_lock(self):
-        for n in (1, 2):
-            self._write(f"prompt_manager.log.{n}")
-        handler = self._file_handler()
-        depth = 0
-        calls = []
-        real_acquire, real_release = handler.acquire, handler.release
-
-        def acquire():
-            nonlocal depth
-            real_acquire()
-            depth += 1
-
-        def release():
-            nonlocal depth
-            depth -= 1
-            real_release()
-
-        real_call_handlers = logging.Logger.callHandlers
-
-        def call_handlers(logger_self, record):
-            calls.append((record.getMessage(), depth))
-            return real_call_handlers(logger_self, record)
-
-        with (
-            mock.patch.object(handler, "acquire", acquire),
-            mock.patch.object(handler, "release", release),
-            mock.patch.object(logging.Logger, "callHandlers", call_handlers),
-        ):
-            self.manager.delete_rotated(self._rotated_rows())
-            self.assertEqual(depth, 0)
-            self._write("prompt_manager.log.1")
-            self.manager.truncate_logs()
-            self.assertEqual(depth, 0)
-        self.assertTrue(calls, "the cleanup logged no summary")
-        self.assertEqual([c for c in calls if c[1]], [])
-
-    def test_truncate_keeps_other_files_and_links(self):
-        # Corrected (#329): the legacy glob deleted every prompt_manager.log*.
-        self._rotate()
-        self._write("prompt_manager.log.bak", b"mine")
-        self._write("prompt_manager.log.1.gz", b"zip")
-        target = self._symlink("prompt_manager.log.4")
-        result = self.manager.truncate_logs()
-        self.assertEqual(result["errors"], [])
-        self.assertEqual(
-            sorted(result["truncated"]),
-            ["prompt_manager.log", "prompt_manager.log.1", "prompt_manager.log.2"],
-        )
-        names = self._names()
-        self.assertIn("prompt_manager.log.bak", names)
-        self.assertIn("prompt_manager.log.1.gz", names)
-        self.assertNotIn("prompt_manager.log.1", names)
-        if target is not None:
-            self.assertIn("prompt_manager.log.4", names)
-            self.assertTrue(os.path.islink(self._path("prompt_manager.log.4")))
-            with open(target, "rb") as handle:
-                self.assertEqual(handle.read(), b"secret " * 1000)
-
-    @unittest.skipIf(os.name == "nt", "Windows cannot rename a log that is open")
-    def test_truncate_never_empties_a_renamed_log_the_handler_still_writes(self):
-        # The user renamed the active log to keep it; the handler still has it
-        # open. Clear must empty the new prompt_manager.log, not the kept copy.
-        self.logger.info("worth keeping")
-        kept = os.path.join(self.log_dir, "saved_copy.txt")
-        os.rename(self._path("prompt_manager.log"), kept)
-        with open(kept, "rb") as handle:
-            before = handle.read()
-        self._write("prompt_manager.log", b"fresh active log\n")
-        result = self.manager.truncate_logs()
-        self.assertEqual(result["errors"], [])
-        with open(kept, "rb") as handle:
-            self.assertTrue(handle.read().startswith(before))
-        with open(self._path("prompt_manager.log"), "rb") as handle:
-            self.assertEqual(handle.read(), b"")
-
-    def test_name_surrogate_reparse_points_are_links_and_placeholders_are_not(self):
-        regular = stat.S_IFREG | 0o644
-        path = self._write("prompt_manager.log.3")
-        for tag, is_link in (
-            (0xA000001D, True),  # WSL symlink
-            (0xA0000003, True),  # mount point (junction)
-            (0x9000001A, False),  # OneDrive cloud placeholder: a regular file
-            (0, False),
-        ):
-            with self.subTest(tag=hex(tag)):
-                st = mock.Mock(st_mode=regular, st_reparse_tag=tag)
-                self.assertIs(logging_config._is_link(path, st), is_link)
-
-    def test_truncate_with_file_logging_off_never_creates_the_active_log(self):
-        self.manager.update_config({"file_logging": False})
-        os.unlink(self._path("prompt_manager.log"))
-        self._write("prompt_manager.log.1")
-        result = self.manager.truncate_logs()
-        self.assertEqual(result, {"truncated": ["prompt_manager.log.1"], "errors": []})
-        self.assertEqual(self._names(), [])
-
-    def test_truncate_never_empties_a_linked_active_log(self):
-        self.manager.update_config({"file_logging": False})
-        os.unlink(self._path("prompt_manager.log"))
-        target = self._require_symlink("prompt_manager.log", data=b"keep")
-        self.manager.truncate_logs()
-        with open(target, "rb") as handle:
-            self.assertEqual(handle.read(), b"keep")
-
-    def test_log_files_mark_kind_and_lstat_links(self):
-        self._write("prompt_manager.log.1", b"r" * 10)
-        self._write("prompt_manager.log.bak", b"b")
-        target = self._require_symlink("prompt_manager.log.4")
-        rows = {row["filename"]: row for row in self.manager.get_log_files()}
-        self.assertEqual(rows["prompt_manager.log"]["kind"], "active")
-        self.assertTrue(rows["prompt_manager.log"]["is_main"])
-        self.assertEqual(rows["prompt_manager.log.1"]["kind"], "rotated")
-        self.assertEqual(rows["prompt_manager.log.bak"]["kind"], "other")
-        link = rows["prompt_manager.log.4"]
-        self.assertEqual(link["kind"], "link")
-        self.assertEqual(
-            link["size"], os.lstat(self._path("prompt_manager.log.4")).st_size
-        )
-        self.assertNotEqual(link["size"], os.path.getsize(target))
-        for row in rows.values():
-            self.assertEqual(
-                set(row), {"filename", "path", "size", "modified", "is_main", "kind"}
-            )
-
-    def test_an_unreadable_timestamp_does_not_break_the_scan(self):
-        self._write("prompt_manager.log.1")
-        real = logging_config.datetime
-
-        class Clock:
-            @staticmethod
-            def fromtimestamp(value):
-                raise OSError(22, "Invalid argument")
-
-        with mock.patch.object(logging_config, "datetime", Clock):
-            rows = {r["name"]: r for r in self.manager.scan_log_folder()}
-        self.assertIs(logging_config.datetime, real)
-        self.assertEqual(rows["prompt_manager.log.1"]["kind"], "rotated")
-        self.assertEqual(rows["prompt_manager.log.1"]["modified"], "")
-
-    def test_stats_exclude_links(self):
-        self._write("prompt_manager.log.1", b"r" * 10)
-        before = self.manager.get_log_stats()
-        self._require_symlink("prompt_manager.log.4")
-        after = self.manager.get_log_stats()
-        self.assertEqual(after["log_files_count"], before["log_files_count"])
-        self.assertEqual(after["total_log_size"], before["total_log_size"])
-
-    def test_log_file_entry_accepts_only_listed_regular_files(self):
-        self._write("prompt_manager.log.1")
-        self._write("prompt_manager.log.bak")
-        os.makedirs(self._path("folder.log"))
-        self._symlink("prompt_manager.log.4")
-        self.assertEqual(
-            os.path.normcase(str(self.manager.log_file_entry("prompt_manager.log.1"))),
-            os.path.normcase(self._path("prompt_manager.log.1")),
-        )
-        self.manager.log_file_entry("prompt_manager.log")
-        self.manager.log_file_entry("prompt_manager.log.bak")
-        for name in (
-            "prompt_manager.log.4",
-            "folder.log",
-            "missing.log",
-            "",
-            ".",
-            "..",
-            "../outside/secret.txt",
-            "..\\outside\\secret.txt",
-            "prompt_manager.log:stream",
-            "prompt_manager.log\x00",
-        ):
-            with self.subTest(name=name):
-                with self.assertRaises(FileNotFoundError):
-                    self.manager.log_file_entry(name)
 
 
 class TestConfiguration(IsolatedLoggerTestCase):

tests/unknown_node_graphs.py

@@ -1,321 +0,0 @@
-"""Synthetic graphs with unknown nodes between the prompt and the sampler (#381).
-
-``any_switch_graph`` reproduces the shape of the maintainer's krea2 run
-(PromptManagerPair -> Any Switch (rgthree) -> KSampler, a LoraManager loader
-with its own lora ``text``, custom latent, filename and saver nodes) with
-neutral texts. ``shapes()`` names one graph per pass-through rule; the resolver
-tests and the browser-port parity vectors share them. No user file is involved.
-"""
-
-import json
-
-POSITIVE = "a lighthouse on a cliff, golden hour"
-OTHER = "a red bicycle in the rain"
-NEGATIVE = "blurry, lowres"
-
-
-def encode(text):
-    return {"class_type": "CLIPTextEncode", "inputs": {"text": text, "clip": ["7", 0]}}
-
-
-def pair(text=POSITIVE, negative=""):
-    return {
-        "class_type": "PromptManagerPair",
-        "inputs": {
-            "text": text,
-            "negative_text": negative,
-            "category": "",
-            "tags": "",
-            "search_text": "",
-            "prepend_text": "",
-            "append_text": "",
-            "clip": ["9", 1],
-        },
-    }
-
-
-def any_switch_graph(**switch_inputs):
-    """The shape of #381: PromptManagerPair -> Any Switch (rgthree) -> KSampler.
-
-    Classes and links reproduce the maintainer's krea2 run (a LoraManager
-    loader with its own lora ``text``, a project-path filename node, a custom
-    latent and saver); the texts are neutral.
-    """
-    inputs = switch_inputs or {"any_02": ["10", 0]}
-    return {
-        "3": {"class_type": "SeedHistory", "inputs": {"seed": 1538595059}},
-        "5": {
-            "class_type": "KikoProjectFilePath",
-            "inputs": {"project_name": "demo", "filename": "final"},
-        },
-        "6": {"class_type": "UNETLoader", "inputs": {"unet_name": "model.safetensors"}},
-        "7": {"class_type": "CLIPLoader", "inputs": {"clip_name": "clip.safetensors"}},
-        "8": {"class_type": "VAELoader", "inputs": {"vae_name": "vae.safetensors"}},
-        "9": {
-            "class_type": "Lora Loader (LoraManager)",
-            "inputs": {
-                "text": "<lora:style-demo:1>",
-                "loras": [{"name": "style-demo", "strength": 1, "active": True}],
-                "model": ["6", 0],
-                "clip": ["7", 0],
-            },
-        },
-        "10": pair(),
-        "15": {"class_type": "Any Switch (rgthree)", "inputs": inputs},
-        "16": {
-            "class_type": "EmptyLatentBatch",
-            "inputs": {"width": 1024, "height": 1536, "batch_size": 1},
-        },
-        "17": {
-            "class_type": "KSampler",
-            "inputs": {
-                "seed": ["3", 0],
-                "steps": 8,
-                "cfg": 1.0,
-                "sampler_name": "er_sde",
-                "scheduler": "beta",
-                "denoise": 1.0,
-                "model": ["9", 0],
-                "positive": ["15", 0],
-                "negative": ["10", 1],
-                "latent_image": ["16", 0],
-            },
-        },
-        "18": {
-            "class_type": "VAEDecode",
-            "inputs": {"samples": ["17", 0], "vae": ["8", 0]},
-        },
-        "19": {
-            "class_type": "KikoSaveImage",
-            "inputs": {"filename_prefix": ["5", 0], "images": ["18", 0]},
-        },
-    }
-
-
-def with_nodes(graph, **nodes):
-    return {**graph, **nodes}
-
-
-GENERATED = "a generated caption of a lighthouse"
-
-
-def generated_text_graph():
-    """PromptManagerPair whose ``text`` is a language model's output.
-
-    The generator (``sampling_mode.seed``, ``prompt``, ``system_prompt``)
-    writes new text at run time: its inputs are not the prompt.
-    """
-    graph = any_switch_graph()
-    graph["10"]["inputs"]["text"] = ["30", 0]
-    graph["30"] = {
-        "class_type": "VendorTextGenerate",
-        "inputs": {
-            "prompt": ["31", 0],
-            "system_prompt": ["32", 0],
-            "sampling_mode.seed": 0,
-            "clip": ["7", 0],
-        },
-    }
-    graph["31"] = {"class_type": "PrimitiveStringMultiline", "inputs": {"value": OTHER}}
-    graph["32"] = {"class_type": "PrimitiveStringMultiline", "inputs": {"value": "You"}}
-    return graph
-
-
-def transformed_text_graph():
-    """PromptManagerPair whose ``text`` passes an unknown string transform."""
-    graph = any_switch_graph()
-    graph["10"]["inputs"]["text"] = ["30", 0]
-    graph["30"] = {
-        "class_type": "VendorRegexReplace",
-        "inputs": {"text": OTHER, "pattern": "rain", "replace": "snow"},
-    }
-    return graph
-
-
-def execution(node_id, text):
-    """A ``comfyassets_prompt_pairs`` record of what the pair node ran."""
-    record = {
-        "text": text,
-        "negative_text": "",
-        "positive_text": text,
-        "negative_effective_text": "",
-        "prepend_text": "",
-        "append_text": "",
-    }
-    return json.dumps({"version": 1, "nodes": {node_id: {"records": [record]}}})
-
-
-def recorded_shapes():
-    """Record sets whose PromptManager node recorded the text it ran."""
-    return {
-        "generated-recorded": {
-            "prompt": json.dumps(generated_text_graph()),
-            "comfyassets_prompt_pairs": execution("10", GENERATED),
-        },
-        "transformed-recorded": {
-            "prompt": json.dumps(transformed_text_graph()),
-            "comfyassets_prompt_pairs": execution("10", GENERATED),
-        },
-    }
-
-
-def _sampler_inputs(graph, positive, negative):
-    graph["17"]["inputs"]["positive"] = positive
-    graph["17"]["inputs"]["negative"] = negative
-    return graph
-
-
-def shapes():
-    """One named graph per rule (resolved, candidates, PromptManager, refusals)."""
-    vendor_encode = {
-        "class_type": "VendorPromptEncode",
-        "inputs": {"prompt": ["21", 0], "clip": ["22", 1]},
-    }
-    control = {
-        "class_type": "VendorControlApply",
-        "inputs": {
-            "positive": ["21", 0],
-            "negative": ["22", 0],
-            "control_net": ["8", 0],
-            "image": ["8", 0],
-        },
-    }
-    return {
-        "any-switch-pair": any_switch_graph(),
-        "any-switch-same-pair": any_switch_graph(any_01=["10", 0], any_02=["10", 0]),
-        "any-switch-equal-texts": with_nodes(
-            any_switch_graph(any_01=["20", 0], any_02=["21", 0]),
-            **{"20": encode(OTHER), "21": encode(OTHER)},
-        ),
-        "any-switch-candidates": with_nodes(
-            any_switch_graph(any_01=["20", 0], any_02=["21", 0]),
-            **{"20": encode(POSITIVE), "21": encode(OTHER)},
-        ),
-        "any-switch-prompt-manager-wins": with_nodes(
-            any_switch_graph(any_01=["20", 0], any_02=["10", 0]),
-            **{"20": encode(OTHER)},
-        ),
-        "any-switch-runtime-blocks": with_nodes(
-            any_switch_graph(any_01=["20", 0], any_02=["22", 0]),
-            **{
-                "20": {
-                    "class_type": "CLIPTextEncode",
-                    "inputs": {"text": ["21", 0], "clip": ["7", 0]},
-                },
-                "21": {"class_type": "PromptSearchList", "inputs": {"search": "x"}},
-                "22": encode(OTHER),
-            },
-        ),
-        "any-switch-no-text": any_switch_graph(any_01=["7", 0]),
-        "unknown-chain": with_nodes(
-            any_switch_graph(any_01=["20", 0]),
-            **{
-                "20": {
-                    "class_type": "Router Node (vendor)",
-                    "inputs": {"in": ["10", 0]},
-                }
-            },
-        ),
-        "unknown-text-input": with_nodes(
-            any_switch_graph(any_01=["20", 0]),
-            **{
-                "20": {
-                    "class_type": "VendorTextEncode",
-                    "inputs": {"text": OTHER, "clip": ["9", 1]},
-                }
-            },
-        ),
-        "unknown-role-inputs": _sampler_inputs(
-            with_nodes(
-                any_switch_graph(),
-                **{"20": control, "21": encode(POSITIVE), "22": encode(NEGATIVE)},
-            ),
-            ["20", 0],
-            ["20", 1],
-        ),
-        "unknown-conditioning-input": with_nodes(
-            any_switch_graph(any_01=["20", 0]),
-            **{
-                "20": {
-                    "class_type": "VendorStyleApply",
-                    "inputs": {"conditioning": ["10", 0], "style": ["21", 0]},
-                },
-                "21": encode(OTHER),
-            },
-        ),
-        "generated-text-runtime": generated_text_graph(),
-        "transformed-text": transformed_text_graph(),
-        "unknown-skips-clip": with_nodes(
-            any_switch_graph(any_01=["20", 0]),
-            **{
-                "20": vendor_encode,
-                "21": {"class_type": "PrimitiveString", "inputs": {"value": OTHER}},
-                "22": {
-                    "class_type": "VendorLoraLoader",
-                    "inputs": {"text": "<lora:x:1>", "clip": ["7", 0]},
-                },
-            },
-        ),
-    }
-
-
-def review_shapes():
-    """Record sets for the review findings on the first #381 commit."""
-
-    def recorded(source):
-        graph = any_switch_graph()
-        graph["10"]["inputs"]["text"] = ["30", 0]
-        graph.update(source)
-        return {
-            "prompt": json.dumps(graph),
-            "comfyassets_prompt_pairs": execution("10", GENERATED),
-        }
-
-    seeded = with_nodes(
-        any_switch_graph(any_01=["20", 0]),
-        **{
-            "20": {"class_type": "XNoise", "inputs": {"conditioning": ["21", 0]}},
-            "21": {
-                "class_type": "XSeedEncode",
-                "inputs": {"clip": ["7", 0], "text": OTHER, "seed": 3},
-            },
-        },
-    )
-    unlinked = any_switch_graph()
-    unlinked["20"] = {
-        "class_type": "XApply",
-        "inputs": {"positive": ["21", 0], "negative_opt": ""},
-    }
-    unlinked["21"] = encode(POSITIVE)
-    unlinked["17"]["inputs"]["positive"] = ["20", 0]
-    unlinked["17"]["inputs"]["negative"] = ["20", 1]
-    twice = with_nodes(
-        any_switch_graph(any_01=["20", 0], any_02=["23", 0]),
-        **{
-            "20": {"class_type": "XB", "inputs": {"p": ["21", 0], "q": ["22", 0]}},
-            "21": encode(POSITIVE),
-            "22": encode(OTHER),
-            "23": encode(POSITIVE),
-        },
-    )
-    return {
-        "recorded-missing": recorded(
-            {"30": {"class_type": "XLLM", "inputs": {"src": ["99", 0]}}}
-        ),
-        "recorded-several": recorded(
-            {
-                "30": {
-                    "class_type": "XLLM",
-                    "inputs": {"a": ["31", 0], "b": ["32", 0]},
-                },
-                "31": {"class_type": "PrimitiveString", "inputs": {"value": POSITIVE}},
-                "32": {"class_type": "PrimitiveString", "inputs": {"value": OTHER}},
-            }
-        ),
-        "recorded-list-text": recorded(
-            {"30": {"class_type": "XLLM", "inputs": {"text": [1, 2, 3]}}}
-        ),
-        "seeded-encoder-behind-noise": {"prompt": json.dumps(seeded)},
-        "unlinked-role-input": {"prompt": json.dumps(unlinked)},
-        "one-text-twice": {"prompt": json.dumps(twice)},
-    }

tests/vendor/browser-image.test.mjs

@@ -28,24 +28,3 @@ for (const name of ['frontend-coverage', 'browser-workflows']) {
         assert.match(body, /node --version \| grep -q '\^v24\\\.'/, 'the image Node is the Node 24 the project requires');
     });
 }
-
-// The real-host job drives Chromium against a managed ComfyUI. `playwright install --with-deps` pulled the browser's
-// system packages from Ubuntu's apt mirror on every run, and three runs (#349, #378, #382) crawled at ~26 kB/s until
-// the job hit its limit after every test had passed. The pinned image ships Chromium and its libraries, so the job runs
-// there; the image Python must be the reviewed host Python from tools/vendor/comfyui-runtime.json.
-test('real ComfyUI compatibility runs in the pinned Playwright image on the reviewed host Python', () => {
-    const testWorkflow = readFileSync(new URL('../../.github/workflows/test.yml', import.meta.url), 'utf8');
-    const runtime = JSON.parse(readFileSync(new URL('../../tools/vendor/comfyui-runtime.json', import.meta.url), 'utf8'));
-    const match = testWorkflow.match(/^ {2}comfyui:\n([\s\S]*?)(?=^ {2}[a-z][a-z-]*:\n|(?![\s\S]))/m);
-    assert.ok(match, 'comfyui job exists');
-    const body = match[1];
-    assert.match(body, new RegExp(`^    container:\\n      image: mcr\\.microsoft\\.com/playwright:v${version.replaceAll('.', '\\.')}-noble$`, 'm'));
-    assert.doesNotMatch(body, /playwright install/, 'Chromium and its system libraries come from the image, not apt');
-    assert.doesNotMatch(body, /apt-get|actions\/setup-(python|node)@/);
-    assert.match(body, /python3 -m venv --without-pip /, 'a user-space venv on the image Python');
-    assert.match(body, /sha256sum -c/, 'the pip wheel that bootstraps the venv is checksum-pinned');
-    assert.match(body, /node --version \| grep -q '\^v24\\\.'/, 'the image Node is Node 24');
-    // The image Python is checked against the pin at run time, so a pin or image bump that disagrees fails loudly.
-    assert.match(body, /steps\.runtime\.outputs\.pythonVersion/, 'the job compares the image Python with the reviewed pin');
-    assert.match(runtime.pythonVersion, /^3\.12$/, 'the reviewed host Python is the image Python (3.12 on noble)');
-});