Positions crossing copies could still land on other photos in three
windows:
- A push translated a row snapshot's settings against local frames
listed later, after a manifest round trip: an import of earlier photos
meanwhile moved the row's positions, and the server stored shifted
exclusions, hero and keyframes. SyncPositions now reads this copy's
row with its frames as one state (frames listed between two reads of
the row at the same frames version) and translates that row's
settings, at the settings version being pushed. The conflict
comparison and ApplyLocallyAsync compare against that same row. When
the copy was edited since, or its frames keep changing, nothing is
sent or applied and the next comparison translates again (Keep mine
reports a changed conflict; PushAll sends an edit saved meanwhile).
- The manifest read the sequence row, then paged its frames: an upload
committed in between paired settings of one frames version with
frames of the next. The server now lists them again while the frames
version moved during the listing, then inside a transaction holding
the row (on SQLite, on that transaction's connection, so no second
pooled connection waits behind the write lock). The client also
refuses to translate against a manifest whose frames are not each
listed once at 0..n-1.
- Server capture times were fetched only when something was unhashed,
so the same parked photo was written with or without capturedAt. They
are now fetched whenever the two frame lists differ; an equal project
then compares equal, and an entry can be placed on a photo that
arrives unhashed.
CompareOriginals counted unhashed server frames one-to-one against this
PC's photos, so two copies of one photo in a folder the server adopted
left Download on offer forever while the download fetched nothing. A
photo on either side is now there when any photo of the other side
matches it, as downloads and uploads find them. Paged frame listings
keep each frame once (an insertion between pages lists one again).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012iLMBNwBE2GnphAsu4cjaC
Settings synced between a PC and its server sequence were stored as they
came, in the other copy's frame order. When the inserted photos arrived
later (a download, an upload), the index moved those already-correct
positions a second time, so exclusions, the hero and camera keyframes
landed on other photos (V-21, CD-2).
- Settings are translated by photo (SHA-256, else size and capture time)
to the frames of the copy they go to: the server's before they are
compared or applied here, this PC's to the server's frames as its
manifest lists them before a push (SyncPositions).
- A position on a photo the receiving copy lacks waits in project.json as
a pending frame and takes its place when the photo arrives, on an
insertion or an append in step with the index; the Library's hero
frame follows. A hero chosen meanwhile wins, and advice does not fill
a hero while one waits. Old projects without the member are unchanged.
- Pushes send expectedFramesVersion; PATCH /api/v1/sequences/{id} answers
409 frames_conflict when the frames changed since, and the next
comparison translates again.
- A pulled payload equal to the local copy is settled without the
archive: an offline or read-only archive no longer fails the
comparison (V-10).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012iLMBNwBE2GnphAsu4cjaC
A download whose .part already held the whole original (the job stopped while
hashing it) or more asked the server to resume past the end, got 416 and
failed on every retry; such a part is now hashed again, and one the server
cannot resume starts over (CD-1).
Auto-sync pulled the server's settings with the copy of the sequence read when
the comparison began, so an edit saved on this PC meanwhile was overwritten
unseen. The payload is now applied in one step under the sequence lease and
only while the local settings version is the one read; otherwise nothing is
written and the change is settled as a conflict (CD-3).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012iLMBNwBE2GnphAsu4cjaC
- Conflicts are settled against the versions the user was shown; a later change on
either side refuses the choice and compares again. Title, tags, rating and notes
changed differently on both sides are a conflict too (no silent tag union).
- Links are written under the engine's gate and forgotten only after a 404; linked
local copies are read by id; unlinked copies with the same originals are linked
by content.
- A failure on one sequence is recorded on its link; the others are still compared.
- Downloads hash unverified local copies first and restore originals missing here.
- Background proxy downloads give way to the user's requests; "Keep proxies offline"
refreshes the caches of sequences opened with proxies, checks free space and backs
off after a failure.
- Renders travel on request: Send exports (chunked, hash-verified upload keeping the
render id; new POST /sequences/{id}/renders endpoints) and Get exports.
- Server screen: stable row buttons, mockup column grid, Tab through rows, conflict
rows first on the card colour, localised conflict detail, Save both confirmation,
Pause metered uploads, culture switch, Library one-word sync glyphs.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012iLMBNwBE2GnphAsu4cjaC
The first original of an upload now creates the server sequence through its
session key (the archive ingest files API-created empty sequences nowhere), and
settings sent after an upload are retried when the server's own analysis edits
the new sequence meanwhile.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012iLMBNwBE2GnphAsu4cjaC