Owner review 2, phase 5a, fix round 5.
- A cancelled workspace copy clears its partial media only under the project's
lease, after checking again that the job is still cancelled, that no other
copy of the same root and project is queued, running or paused, and that no
copy in this process is writing. The engine now waits for a paused job's run
to end before calling the cancel handler, so the clean-up is never skipped.
- The clean-up never recreates a project folder that was removed meanwhile
(the lease no longer creates the folder). The next list removes a project
folder that holds only lease files nobody holds, older than the lease.
- A Main this Chronos cannot read (newer or damaged) refuses the open at once
only when nothing else can be offered. Otherwise Open in workspace lists it
disabled, with the reason as its tooltip. The refusal's action tooltip is
now Remove copy.
- The removal plan counts a conflict the same way the sync status does: a
conflict that a settling replay took past its commit point is not work
left.
- A healed record is stamped after both the record's time and the index's, so
the next rename made elsewhere is taken.
- A trash folder holds back the rebuild of a lost record only when it is this
sequence's deletion: its record names this sequence or cannot be read, or it
has no record, is within a one-day grace and holds no version of another
project. What was seen of folders that are gone or have a record again is
forgotten.
- When a deletion wins, version files pushed into the live folder before the
deletion arrived are moved beside the deleted record in the trash, never
deleted.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Owner review 2, phase 5a (R8), fix round 4.
A project the library no longer has now reads as Gone with no conflict to
answer. The conflict stays recorded in sync.json, so Save both on a deleted
project says Gone once and offers its copy. It no longer reopens the conflict
dialog. Keep mine and Take the library's first check that the home still has
the project. Neither is merged onto the last version a deleted project had,
so the working state and the unsent versions stay as they were.
Old files in versions/.replaced are pruned only after a push that ended well,
never after one that stopped at a conflict. A file an earlier build set aside
kept the time its version was written. It now counts as set aside no earlier
than when this build first knew the folder (versions/.replaced.since), so an
upgrade does not prune it by an old mtime. The Merge mark goes on the replayed
version whose own change met a setting the conflict listed. A version that
only rides along with a working-state conflict stays a commit.
A first copy cancelled while paused or failed, which no handler runs, now has
its partial media removed under the project's lease, as a running one does
(ICancelledJobHandler). The space estimate counts a proxy held under its
<id>-<sha16>.jpg name. The frames stamp carries a weighted SQL checksum of
the hashes, so a hash replaced in place (a Verify) makes the workspace read
the frames again.
Desktop: a removal that cannot move a file puts back what it moved, so the
copy stays whole and listed, and the failure is said. The Removed toast names
a damaged copy as it is known, never by its folder id. One copy that cannot
be listed no longer hides the others. A Main this Chronos cannot read (newer
or damaged) is refused at once with the reason, and a damaged one offers
Remove local copy. Save version is off on a Gone project, and Send/Delete
there say the project was deleted in the library.
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>
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>
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>
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)