Commit Graph
2 Commits
Author SHA1 Message Date
Alby96andClaude Opus 5.5 e8ea858021 fix: phase 5a fix round 3, desktop: newer copies, readable discard, working-state conflicts, edits kept aside
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>
2026-11-03 12:55:13 +01:00
Alby96andClaude Opus 5.5 43b092bd5d fix(workspace): newer-format editor stays usable; media learn the home's photo names
A pull onto a newer Chronos's settings made the editor throw: ProjectHistory.Replace
rebased every undo and redo snapshot through ProjectMerge, which refuses to merge a
newer format when both sides changed, so any non-empty undo stack broke the reload
after a sync that had succeeded. Replace now drops the steps instead when either side
(or a step) is of a newer format: the project is shown read-only and undo never brings
back values from before the newer settings.

The media learnt the home's hashes and conversion aliases only inside a replay, so a
status or Save version before that compared a SHA-named base with photo-named media
and read a false Modified or saved a version that only re-keyed photos. Now:
- ProjectContent.SameChoices also compares the texts as placed on the frames, hashed
  or not (Bound), so status and commit without a home agree with the base;
- a status asked of the home teaches the media its names (written under the lease, or
  when the lease is free), and so does a checkout of a project already here;
- WorkspaceStatus.MediaOutdated reports frames moved at the home, or names the media
  could not learn yet, and the project menu offers Update media for it (tooltip text
  updated in en and it).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-03 11:19:21 +01:00