Conflict in WorkspaceFallbackTests: keeps desktop's new newer-copy test
and drops ACancelledFirstCopyLeavesNoHalfMedia, which the sync branch
removed along with WorkspaceHost.RemovePartialMediaAsync (the cancelled
first copy's clean-up now runs in the copy job, tested in Data).
ReplayAsync auto-merged with both intents: desktop's working-state
conflicts and silent paths, and sync's skip of no-change versions,
Settles journal flag and PruneReplaced.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
- 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>
Owner review 2, R8. Round 2's checkers left five desktop problems:
- A workspace copy whose project.chronos a newer Chronos wrote (a format
this one does not know) was listed as damaged and offered for Discard.
It is now listed as "Newer Chronos" with its own tooltip, named from
what of its file still reads. It never opens, is never checked out
over, and Remove local copy refuses it with a sentence that says why.
- Discard of any copy moved only the files Chronos knows. It now moves
every file and folder of the copy aside (only the media are deleted)
and removes the folder only when nothing else came into it.
- Discarding a damaged copy asked to type its folder's GUID. It now asks
for the name the copy is still known by (its file, else the library's
index; the project's name, else the sequence's title), else for the
number of its files. The heading never shows the id.
- A conflict at a path where the working state had gone back to the base
value listed the local version's value. The conflict now lists the
working state's value in every case. Where the working state already
holds the library's value there is nothing to ask: that path takes the
library's value in the replayed versions too, so they agree.
- EditorSession.ReloadAsync, ResolveConflict and TakeOverAsync threw
NewerSettingsException on every reload when an edit was not stored
yet and the stored project became a newer Chronos's. The edit is now
kept in versions/.replaced (outside the chain, never sent), a toast
says so, the pending save is dropped and the newer settings are shown
read-only. When the edit cannot be kept aside, the editor stays as it
is and nothing is dropped.
The SequenceViewModel wiring now has a view-model test: the copy's facts
in Open in workspace, the refused-folder toast and its Choose folder
action, and the picker for a newer copy and a damaged one.
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>