The review of owner review 2 phase 3 found that the photo trash could destroy or
strand originals outside the Empty job and let deleted photos come back.
- A restore into a new sequence stages each original inside its own entry
(<entry>/.restoring), never in a staging folder other restores share or
maintenance sweeps; any failure moves it back, the commit runs to its end once
the file has left, a cancel stops between photos with the record kept true,
and the next restore of the entry puts back what a crash left staged. Nothing
erases a staging folder any more.
- A restore into an existing sequence writes .chronos/restore.pending.json before
its first move; SequenceWriter.ReadLocked settles it (files back into the entry
before the sidecar was written, record rewritten after), cancellation is
checked once before the journal, and a companion that cannot follow puts its
photo back whole. Only an intact frame keeps a trashed copy out.
- A deletion's record keeps a .pending name until its sidecar is written, so the
trash neither lists, restores nor empties half an entry; a failed sidecar
write undoes the moves, and scans settle any of the three journals.
- Photos never hashed are hashed as they go and get their tombstone; a photo
with neither hash nor original blocks the plan (FrameDeleteBlock.Unhashable).
Sidecars rebuilt from the photos, and sequences restored without one, keep
their tombstones; the index drops a tombstone whose content a frame holds.
- Emptying re-reads and re-measures each entry under its lease before erasing.
- Once the sidecar is written a deletion or restore stands when the index cannot
follow (logged; the next scan resyncs it).
- XMP companions are listed once per directory, case-insensitively; a restore
into a new sequence picks a name its companions can follow, and one that still
cannot is kept in the record as a leftover.
- thumbs.pack is re-keyed with the frames on delete and restore, so the queued
pass reuses the thumbnails; the server checks the fingerprint of thumbnails of
frames never hashed too.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
(cherry picked from commit 0bb631dd83d082e2569b98d127d827adc2e7f899)