Integrating owner review 2 phase 4a (R7) onto the reviewed phase 3 code.
- RenamePlanner: a sequence already at its expanded folder, or at the " (n)" of it that
filing or an earlier Reorganize gave it, keeps that folder (in the template's case, unless
another sequence holds that exact name). The planner seeded its claimed folders with the
sequence's own, so "2026-09-28 (2)" was planned to "(3)" and back to "(2)" by the next
run; a second Reorganize with the same templates now plans nothing.
- MassRenamer: each step settles what a crash or a busy trash entry left in its sequences
(SequenceWriter.ReadLocked) and waits, as a sequence deletion does, while a restore from
the trash is not settled (FrameTrash.EnsureSettled), before its folder or any file name
changes: that restore's journal names files by the names they had. Trash records keep
restoring after a Reorganize: into the sequence where it is now, under the record's own
name made free (_2) with its companion following.
- Jobs.Kind.Move and Admin.Job.Kind.Move now mean "Reorganize": their old "Move archive"
translations are removed from the 36 other cultures so they are translated again.
- Tests: a second run plans nothing (planner and archive), companions found alike by the
trash and Reorganize whatever their case, a photo deleted before a Reorganize comes back
beside the new names, a Reorganize waits for a busy restore and settles it first.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>