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 project record that could not be read once, or a missing .chronos/projects, marked
projects deleted for good and made a second Main; an index meeting Main with no mirror
state took its own stale settings column as an outside change and reverted the pushed
head; a newer-format or unreadable head made every project call fail or rewrote the
record's head over the real history. Now:
- Deletion is never inferred from absence or a read failure: an unreadable record holds
its project back (listed as indexed, nothing written for it, no second Main), a row
marked deleted is revived when its live record says so, and projects the archive has
no folder for are written back from the index.
- Appends re-read the record under the lease and refuse when its head is not the
index's; Main is only made when the sequence has none anywhere.
- An index with no mirror state decides from project.json and the record's new
mirrored member (older records: the head's ancestry), never from its own column.
- A newer-format Main head is listed and pulled but never mirrored, merged or built on;
pushes must parse strictly and fit the one 64 MB version limit (TooLarge otherwise).
- Duplicate version numbers and name/Main clashes are contained per project, so a scan
or rebuild never stops.
- Delete moves the folder first, then writes the deleted record in the trash.
- The home's read-back for workspace pruning and Remove local copy reads the version
files (IProjectHome.HoldsAsync), not the index.
- A read-only archive is read without writing: its projects open from the sidecars and
a sequence with no Main gets one in the index only, written back once writable.
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>
Phase 5a was written on an early phase 4a state. On top of phase 4b it now
keeps the rules every writer of a sequence's folder follows, and keeps
project versions intact through Reorganize and conversions:
- ProjectService writes project sidecars, project.json and the settings
only under the sequence's lease and only in a folder that holds the
sequence (SequenceFolders.Holds). A folder another index moved away, or
one another sequence was moved into, is refused with
SequenceFolderMovedException: reads answer from the index, so no
project is taken for gone, nothing is written into the other sequence's
folder and the old folder is never created again. The home reports it
as out of reach. Full scans and rebuilds reconcile projects the same
way, and a failure there is logged instead of failing the scan.
- Stored versions park positions by photo and now follow the encodings a
Replace conversion (or its undo) joined through the sequence's Replaced
tombstones (PhotoAlias, HomePhotos): Main's mirror, renders of a
version and workspace media place them on the converted frames.
ProjectContent.Rebind/SameChoices name parked photos as the frames hold
them now, so a conversion or a hash since is no "external" Main version
and no spurious "Modified" in a workspace, and merges see one photo.
- The workspace copy job only reads the archive: it no longer runs the
archive's proxy pass, makes missing proxies in the workspace, reads
only a folder that holds the sequence, starts again when the folder
moved or files were renamed during the copy, resumes from a checkpoint
of its frames version, and refuses a workspace folder inside any
library before it writes anything (Errors.Workspace.InsideLibrary).
The working state keeps its positions by frame where frames stay.
- ArchiveProjectHome looks for a project or version the index does not
know yet in the sequence's sidecars first (an index taken back from a
backup, a sequence back from the trash), instead of calling it gone.
Tests cover the moved and taken folder, conversions in the archive and in
the workspace, the copy refusing a workspace in a library, resuming on
other frames, the alias lookup and the rebinding.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Owner review 2, phase 5a (R8): editing moves out of the library into a workspace on a fast disk, and a
sequence gets several projects, each with a linear version history pushed and pulled like git.
- Core: ProjectSettings keeps members a newer Chronos wrote (Extra) and reads a newer settings format
read-only; ProjectContent is the portable form of a version (every frame position parked by photo,
canonical text, SHA-256 content hash); ProjectBundle format 2 adds the workspace section, and a file
without it is still written as format 1. JobKind.WorkspaceCopy = 20 (19 kept for Convert).
- Data: migration 0009 (projects, project_versions, the render's project columns); ProjectService on
ArchiveService.Projects keeps projects as sidecars first (.chronos/projects/<id>/), then the index,
under the sequence lease: create, rename, delete into the projects' trash, history, push with
fast-forward, idempotent repeat, divergence and hash checks. Main is made from the sequence's settings
and mirrored both ways, so every older code path keeps working; outside writes become "external"
versions, a mirror a crash cut short is completed or merged. Full scans and rebuilds take the projects
back from their sidecars.
- ProjectMerge moves from the App to Data/Projects, merges pending frames photo by photo and replays
unpushed commits on a moved head.
- Workspaces: WorkspaceStore, WorkspaceSync (checkout, save, commit, push, pull with replay and merge,
conflicts settled by keep mine / take server / save both, restore, status) and the WorkspaceCopy job
(proxies copied hash-verified and resumable; originals refused until phase 5c).
- Renders of a project version place its positions on the frames and record the project and version.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
(cherry picked from commit c4c1802884e403db8759ed0501f770a67a047f20)