- A merge verify that finds a hashed photo the plan did not copy (held by
a third sequence when planned) held by nothing now drops its journal and
fails as a stale plan, so the retry plans again and lists the photo as a
last copy instead of failing with "did not match after copying" forever.
- A comparison settles no details of a pair being integrated, and the
Integrate's Details stage refuses a line decided as the server's whose
server value is now this PC's own, so a background push or pull no longer
reverses the user's line-by-line choice (owner Q4).
- A 404 for a server sequence no local copy is linked to deletes only its
Candidate pairs; a Kept apart answer counts the hit as a linked pair does
(two 404s GoneRecheck apart), so a moment's 404 neither re-asks nor
auto-links a pair the user kept separate (owner Q1). Upload all local
sends the local sequence once the deletion is confirmed.
- Download originals into a local copy the server key names and that is
paired with the server sequence links it first and fills it as a linked
copy: its tombstones hold and its details are compared, not overwritten.
- An upload of a sequence with a Candidate pair goes under a key of the
job, and one that joins a server sequence this PC already knows compares
its details instead of sending them all over the server's.
Refs #73
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
- A merge leaves each second version out of Main as it files it (Copy
stage keep-both and SameUnhashed versions, Verify stage versions), so a
merge abandoned before its Details stage (details changed meanwhile, a
stale stage, a cancel) no longer leaves both versions in Main for good,
which a new plan could not undo (owner Q3).
- A merge plan whose kept sequence has tombstones hashes the other's
unhashed frames matched by size and time, so content the kept sequence
deleted is listed as a last copy; a verify that still finds such content
drops the journal and fails as a stale plan instead of failing on every
retry.
- Download originals uses a key of the job only when the holder of the
server sequence's key is kept apart from it or linked elsewhere: a link
a 404 forgot (pair Candidate) refills and re-links the local copy
instead of duplicating every photo into a new sequence.
- A 404 for a server sequence no local copy is linked to deletes its
Candidate and Kept apart pairs, so Upload all local sends the local
sequence again instead of skipping the only copy as a suspected one
(owner Q8).
Refs #73
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
- A merge plan hashes the kept sequence's unhashed frames that match a hashed
photo of the other by size and time: the same content is no longer a false
last copy, and another content is copied in as a second version instead of
going to the trash with the other sequence.
- The Replace stage trashes a losing version of the kept sequence only while
another sequence still holds it or the plan listed it as a last copy;
otherwise the journal goes and the job fails as a stale plan.
- A details conflict at the merge's or the Integrate's Details stage drops
the journal, so a retry plans again instead of failing the same way.
- The Integrate's Projects stage keeps a project for good only for a
permanent refusal; a server out of reach fails the job with the journal
kept, and the retry finishes the same copy.
- A pair read as deleted on the server is cleared when the server lists it
again or a link to that sequence is made.
- An upload of a sequence kept apart from a server sequence goes under a
session key of the job, making a new server sequence; a link made over a
kept-apart pair moves it to Linked.
Refs #73
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
A merge that finds the other changed drops its journal so the retry plans
again. Unlink and Keep apart name the local side and leave a link that now
joins another sequence alone; Link only and the Integrate job refuse to
touch a link or a pair another integration holds. A sweep of 404s asks the
server once. To trash... trashes from the kept sequence after a swap and
every trash re-checks for new last copies. The Compare dialog and Settings
choices fit in every language, Details segments say which value they take,
twins need their sibling at the other home, and a linked row keeps three
buttons. Captures updated for the dialog and Settings scenes.
Refs #73
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
A merge could still trash photos it never verified, resume against a
pair the user had answered meanwhile, and take different unhashed
photos for copies; the dialog and the lists worded several facts
wrongly or lost them on refresh.
- Merge: a retry resumes only while the pair is still the job's;
Verify requires the other archive online and its folder in place,
stops on an unreadable photo, files a differing unhashed photo as a
second version and must cover every frame before Trash; the plan
hashes unmatched unhashed photos first, lists "Deleted in the other"
and names the relinked servers; second versions stay discoverable
(CopySides.VersionsAsync).
- Integrate: a retry after a failure before the journal runs again.
- Sync: a sequence back after a 404 stays Linked while its link holds;
a local cull no longer asks for attention.
- Block lines of both planners name the right sequence, archive,
server and space through one formatter.
- Compare dialog: one Details row per setting with worded values,
Projects headings, Choose focuses the kept-sequence radios, the
photo selection reaches rows outside the viewport, the Replace
confirmation lists the losers per side, plan lines read as queued.
- Matches and Library: counts first and grouped, integrating shown as
a share, local matches name the other archive, the Library keeps its
match and "deleted on server" statuses across a refresh.
Refs #73
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The review of the found-copies work showed pairs that could stick, jobs that
could act on a pair the user had answered otherwise, and detection gaps:
- forgetting a link on an address-keyed server deletes the pair and Candidate
rows of that remote and resets the probe, so the sequence is found again
when it is back; a Linked/Integrated row with no link is asked again
- 404s count only on id-keyed servers, at most once per recheck interval
- probes store the server's newest update time (copy_probes.server_newest,
migration 0012) instead of comparing with this PC's clock; the lookup
sample carries hashed photos by size and capture time too, for servers
that have not hashed their copy
- the older-server gate no longer re-compares unchanged manifests
- a failed Integrate keeps its job id so a retry resumes only an untouched
pair; cancel and stale plans release the pair (ReleaseAsync)
- automatic photo transfers never create or retarget a sequence
- a first upload files photos the server holds elsewhere into the new
sequence
- Unlink re-compares before keeping apart; Trash here names only true last
copies; Drop... trashes one version on both sides after re-checking the
other
- a merge keeping the pair's other sequence swaps the dialog's columns and
re-keys Different choices; Upload all reads every pair
Each fix has a regression test where it makes sense.
Refs #73
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
A refresh no longer links copies by content behind the user's back. After the
gate is released, CopyFinder looks for copies whose ids differ: the server's
photo lookup (or 1.1's gate and the hints on an older server), session keys,
and an exact comparison by manifest, bounded per refresh and remembered in
copy_probes so nothing is compared twice while neither side moves. What a pair
becomes is the Link matches setting's call: asked by default, linked by itself
only as the setting allows, through a compare-and-set that a Keep apart wins.
Local detection finds copies inside this PC's archives and never links them.
SyncService gives every link its pair, adds Unlink (kept apart, observation
kept), marks pairs whose server sequence answers 404 (once per refresh, twice
reads deleted, never on an address key or in a 404 sweep), keeps deletion
counts current at each comparison, writes an Integrate's agreed details to both
sides by content (ApplyAgreedAsync) and queues uploads at a given priority.
CopyReviewBuilder assembles what the Compare dialog shows.
Refs #73
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>