Phase 5a fix round 4, projects engine.
- The reconcile reads the projects' trash before the live folders, so a
deletion wins over what a sync tool has left of the live folder. A lost
record is never written again while the trash holds a folder of that
project; a trashed record that cannot be read holds the project back.
- A lost record is written again from the index only once the folder has
looked the same, file by file, on two reconciles two minutes apart, so a
record a sync tool is still bringing (a rename, a newer head) wins.
- IndexAsync's "behind" is the rule the heal uses: the record's head must
be a version the index holds below its head. A record on another chain
keeps its name.
- A record written before what the index knows (its Updated time is
older, e.g. a backup made before a rename) never gives its name, and the
heal writes the index's name back. A record's Updated time never goes
back, so a newer rename from a PC whose clock is behind is still taken.
- A mirror never writes project.json over settings written there since
this index last knew what it held (another PC, an older client): they
are merged first (theirs win where both changed) or kept as an external
version, then the result is mirrored.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The catch-up merge of a push whose mirror a crash cut short with settings
written meanwhile was two appends (External, then Merge), resumed by a purely
structural test that also fired on ordinary histories (two outside edits in
a row, a second index with an older mirror) and reverted the latest edit.
It is now one Merge version on the head in which the settings written
meanwhile (the settings in force, which older clients wrote) win where both
changed; the head's values stay in its version. A merge that adds nothing to
the head makes no version, so a cut before its mirror is finished next time
by the same index or a rebuilt one without any marker. The structural resume
is gone. An index meeting Main with a lagging record merges project.json the
same way, so a newer outside edit is no longer reverted by an older push.
Versions the catch-up records as mirrored are named in Main's record too
when project.json holds them, so records no longer lag behind externals.
Duplicate Main claimants (an index that met the sequence before Main's
record arrived) are settled from the records: the oldest claimant with a
version is Main in every index, the others are ordinary projects, and their
records say so when the archive takes writes.
A live project folder whose record is missing while the index holds the
project gets its record (and missing version files) written again from the
index instead of being held back forever. A record behind the index no
longer gives the index its old name. MirrorAsync reads the version leniently
and skips a newer one, as the other branches do.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The sidecars stay the truth of a sequence's projects in the cases round 1's
checkers found still open, and no version or setting is lost on the way:
- An index-only Main meeting a Main another index made is written back as
another project, and Main passes to theirs in one transaction through a
free temporary name, so ux_projects_name and ux_projects_main never fail
(the SqliteException used to escape ListAsync and leave the index and the
sidecars disagreeing). A refusal is logged; the next reconcile settles it.
- The reconcile takes Main from the records, in step with the index, when
another index passed it on: exactly one Main per sequence, names from the
records where free.
- A project folder with versions and no record, of a project no index row
names (a creation cut before its record), no longer holds the sequence
back forever: it is left as it is and indexed once its record arrives.
- A record behind the index (a projects folder put back from an older
backup) is made whole from the index: its missing versions and the record
are written again, at every catch-up and before any append, rename or
delete. Only a record ahead of the index or naming another version is
refused, with a message that says so.
- An index meeting Main walks the chain down to the version the record names
as mirrored (a bound, since that record write may lag project.json), so a
lagging record never makes an External that reverts a newer push. When the
record names a mirrored ancestor, settings written since merge with the
unmirrored versions, as for an index that knows its mirror.
- The catch-up merge's External + Merge pair is resumable: an External head
whose parent is a push no mirror wrote is finished into its Merge version
next time, by this index or one rebuilt from the sidecars.
- A project deleted at the home has no head there, so a workspace copy of it
reads Gone, never In sync; Remove local copy without discard says the
project was deleted in the library.
- DatabaseExceptions are contained per sequence in the archive scan's project
reconcile and in ProjectService reads.
Tests: SQLite (PostgreSQL-ready) for each scenario, including a cut between
the two catch-up versions, a 40,000-exclusion version through save, push and
rebuild, and the App's Remove local copy of a project deleted at home.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
A workspace copied before the home hashed or converted a photo named it
differently from the versions the home made since, so a pull merged the
same photo as two: frame edits were silently undone and Keep mine placed
the library's value. Before replaying, the workspace media now learn the
home's hashes (same frame id, size and capture time) and conversion
aliases, so every side names each photo alike. Rebind also gives a
renamed entry the occurrence a placement looks for, so positions on
burst photos keep applying once hashed, and folds entries of one photo
(in Rebind and in the merge's keyed form) instead of keeping one.
Settings of a newer Chronos are no longer merged member by member with
this one's: ProjectMerge refuses when both sides changed. A workspace
pull keeps its local versions and working state untouched and records a
conflict of format that only Save both settles (into a new project of
this format); with nothing local it takes the newer head read-only.
Main's catch-up leaves a newer head and settings written meanwhile as
they are.
When Main's catch-up merge overrides values another writer stored, that
writer's settings are kept as an External version before the Merge one,
so nothing is lost from the history.
Unknown members inside Auto values, camera keyframes and curve points,
and on pending entries once placed, are kept like ProjectSettings' Extra.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>