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
A folder the server adopted and never verified lists no SHA-256. A
download of such a sequence failed ("did not arrive intact") because
every unhashed frame collapsed into one wanted entry and the empty hash
was refused, and desktops never sent the proxies the server asked for
those frames (V-9).
- Each unhashed server original is fetched by frame id into staging,
accepted on its size (two attempts, resumed with Range) and hashed
here; the archive ingest files it by that hash like any other.
- Server frames without a hash are matched to this PC's originals by
size and capture time: they are not downloaded twice, not uploaded
again, counted right in the comparison (each frame on its own), and
their wanted proxies are counted and sent from the matching original.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012iLMBNwBE2GnphAsu4cjaC
Wanted proxies were matched to this PC's originals by SHA-256 only, and
frames adopted from a folder stay unhashed until verified. A desktop that
uploaded an adopted HEIC folder counted none of the proxies the server asked
for, showed the link in sync and sent none of them. The upload now keeps the
hash it computes for each original the index has none for and makes the
proxies from those too; the comparison counts a wanted frame no hash matched
against an unhashed original this PC reads by size (the server names its copy
by its own template, so not by name).
The wanted count was recomputed only when frame or render counters moved, so
proxies a render node sent left the row "Local ahead" with an upload that
sent nothing, and proxies the server started asking for later were never
counted. A link whose copy may make proxies for the server now keeps the
server's update time of the last comparison (sync_links.diff_remote_updated_at,
migration 0006) and is compared again when it moved.
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