- A take of the library's values cut past its commit point settles its conflict
(replay journal marks Settles); a later stale choice finds nothing to settle,
and one cut before it keeps the conflict so the next choice is applied.
- A local version that changes nothing once replayed on the head is not sent
nor written as a Merge; its file stays in versions/.replaced.
- Save both journals its intent (name, base, time) before the home is asked,
so a cut after the copy was made reuses that copy on retry.
- A project deleted at the home reads as Gone from pull, push, resolve and
save both, logged once, without retry loops; versions and working state stay.
- Save both keeps the restore recorded in sync.json.
- The copy job writes a photo's new bytes under a name of its own while the
editor's media still name the old file, switching at the commit; a cancelled
first copy removes its own half media under the lease (VM hook removed).
- Status reads the version files once, re-reads the home's frames only when
its stamp moved, reports damage only when confirmed under the lease, and
waits once for a busy lease before calling the media outdated.
- versions/.replaced is pruned after a sync that ended well (30 days, newest
20 kept, never a file a journal names).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Taking the server's values no longer saves the working state as a
version first (the desktop fix), so a take refused by a home that
holds no versions after the base leaves the local versions as they
were. The recovery test that relied on that pre-commit now saves the
unsaved stack change itself before pushing it.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
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>
A Save both, a recorded conflict and a damaged version file could each leave
a local version out of the chain or a copy half-made at the home. This round
makes every one of these end with nothing lost and nothing half done.
- Save both retry: a journaled copy somebody else sent a version to (or one
deleted since) is left as it is, and a new copy takes every local version.
A divergence met at the copy while sending also makes a new copy, once.
- Keep mine, Take server, or a pull that settles a conflict after a Save both
was cut short first send the rest of the journaled versions to that copy,
if it is still this workspace's. The journal is cleared at the commit point.
- A conflict of format met past local versions the home already stored
(their answer lost) now moves the base onto them, like any other conflict.
The conflict, the base and the chain then name one version. A save-both
journal follows the base when it moves.
- A conflict recorded before stays while the home holds no version after
the base. A base that has reached the conflict's head clears it.
- Take server no longer replays or sends the version it saves first when,
replayed, that version holds only the server's values. It stays in
versions/.replaced for the undo. The test checks the exact history again.
- Version files after the base that cannot be read, or that do not follow
from it, are listed (WorkspaceProject.UnreadableVersions). The new state
WorkspaceState.Damaged shows them. Commit, push, pull and resolve refuse to
go past them. A damaged file whose version the home holds takes the home's
copy at the next sync, and the damaged file is kept aside. Remove local
copy counts these files as unsent.
- PushOutcome.TooLarge raises its own WorkspaceSyncException message. The
desktop says Errors.Workspace.VersionTooLarge for it and for
ProjectVersionTooLargeException when a local commit is too large.
- The editor maps LeaseUnavailableException from opening a busy project to
Errors.Workspace.Busy.
- The copy job no longer deletes, during the pass, a proxy that the editor's
current media name. RemoveStale removes it after the commit. A resumed run
does not keep such a file as a frame whose photo changed.
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>
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>