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>
Owner review 2, phase 5a (R8), desktop package: editing moves out of the library. A sequence of this PC's archive
now opens in Edit as a project of the workspace (%LOCALAPPDATA%\Chronos\workspace, .\data\workspace when portable),
with this PC's archive as its home; the editor writes the workspace's working state, never the library.
- WorkspaceHost composes WorkspaceStore and WorkspaceSync over Settings > Workspace's folder: checkout and the
WorkspaceCopy job, status, Save version with the sync after it (Sync automatically, on by default), sync (pull,
then push), conflicts, restore, history, new / rename / delete project, and Remove local copy, which refuses
while work is unsent unless the user sends it first or discards it, reads back the home's head and base and
checks their hashes, and keeps discarded work in <workspace>/.trash; versions past Kept versions are pruned only
once the home returns them with the same content.
- WorkspaceSequenceSource: frames and pixels of the media (proxies), the working state saved atomically under the
project's lease and merged against the basis, the home's deep report while its frames are the media's, renders
at the home with the portable settings recording the project and the version.
- Edit: the project opened last for the sequence, else "Open in workspace" (Main made from the sequence's settings,
another project or a new one; proxies) checks out, copies and opens once the copy is done. The picker lists the
workspace's projects with their state above the library. The title's project menu: Save version (Ctrl+S, note),
Sync, History (compare, restore as one undo step), New project, Rename, Delete project, Remove local copy; a
conflict dialog only on real conflicts (keep mine, take the library's, save both, later); Update media when the
library's frames moved. .chronos files: format 2 opens its project, format 1 gives its settings to Main.
- Settings > Workspace: folder (shown, Open), Sync automatically, Kept versions. Strings in English and Italian.
- A capture (sample data without an engine) keeps editing the library.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
(cherry picked from commit da47a580ba9db3ce2a1db2f11c30cf7344c8b394)