Phase 5a fix round 2 of owner review 2 (desktop):
- Take library's no longer commits the working state first, so a take that
leaves only the library's values sends no empty version; the working state
it replaces is kept aside in versions/.replaced, outside the chain.
- Conflicts list this side's value as the working state holds it, so one
answer settles them instead of asking again for the newer value.
- A conflict of format (library saved by a newer Chronos) offers only Save
both and Later, says why in its tooltip and shows no raw format numbers.
- Conflict lines count the photos a setting differs on ("Excluded frames
(3)") instead of dropping the duplicates.
- A read-only library is named as such, not as offline; checkouts from it
stay editable and their versions wait in the workspace.
- A workspace folder refused inside a library offers Choose folder, and
Settings > Workspace gets Change...: a plan (projects left, projects found)
is confirmed before the folder changes; nothing is moved.
- Open in workspace shows the copy's size and the drive's free space, and
warns when the copy would not fit with its 0.5 GB reserve.
- A cancelled first copy removes the half media it wrote.
- A copy whose project.chronos cannot be read is listed as damaged instead of
hidden, and goes only through Remove local copy > Discard, after a plan.
- Pruning keeps a version whose archive file is damaged (test added).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Taking the server's values now saves unsaved changes as a version first
(desktop fix), while a conflict of format refuses that choice (merge fix):
the save is skipped for a conflict of format, so a refused choice leaves
the local versions as they were. A project that moves onto a newer
Chronos's head with nothing of its own now adopts the home's copies of
the local versions the home already held, as a replay does, since the
replay no longer writes over unsent files before the base moves
(workspace fix). The recovery test of a conflict met past a held version
checks the versions before the one Take the server's saves first.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Review 2, phase 5a, fix round 1 (desktop and the engine side of Resolve and Restore).
- Resolve applies Keep mine / Take the library's only to the conflict the dialog listed:
when the head or what differs moved since, the new conflict is recorded and asked again;
Sync re-works a pending conflict instead of re-showing a stale list. Take the library's
first saves uncommitted changes as a version, and the editor takes it as one undo step
(toast Undo, Ctrl+Z) that brings back only the settings both changed.
- Restore saves unsaved changes as a version also while a conflict waits; a restore that
changed nothing, or was undone, no longer marks the next version as a Restore.
- The editor's saves and merges of a workspace project merge positions photo by photo
(portable form) and ask where both sides changed a setting, never deciding for ours.
- Read-only after a pull is signalled, and no save that can never be stored is left behind.
- The chip is read again after edits; a background conflict waits for the open dialog;
Send first and Delete show the conflict they met; Discard changes needs the typed name.
- Open project... reaches the library's other projects (Save both's sibling, also from
its toast); copies whose project or sequence is gone read Not in library and can be
removed from the picker's Workspace rows; a delete whose local copy stays says so.
- A workspace folder inside a library is refused before anything is written.
- Conflict and Compare lines name heroes, exclusions and keyframes; History shows the PC
name alone, never the program's prefixes.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
A push now moves the base before its local file reads as sent; a replay
journals itself in sync.json, writes the replayed versions, then the base
(the commit point), and only then sets the old ones aside and adopts the
local commits the home already held; a conflict met past such commits moves
the base onto them first. A save-both journals its copy and the ids it sends
under, so a retry completes the same copy instead of making another. The
next push, pull or resolve finishes or undoes whatever a cut left, so no
version is orphaned and no false conflict appears.
The editor reads the working state and the media index under the project
lease; workspace.json is written whole and moved into place (an empty one is
made again); project files may hold 64 MiB and one that would be larger is
refused before it is written, so large projects check out. The workspace copy
checks the drive's free space before and during the copy, keeps the folder in
its checkpoint and stores a reset when a pass starts again, and runs at High
level in the priority queue. Renders record a version only when the index
holds it with the settings rendered; an unsent version renders as the project.
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)