- A merge's Verify stage journals a second version, with the hash it is
filed as, before it files it. A run that stops between filing it and
leaving it out of Main (a drive dropping out, project.json held, the
app closing) now leaves it out on resume, instead of reading it as the
kept sequence's own photo and keeping both versions in Main for good.
- Upload all local ignores a Kept apart pair whose server sequence is
confirmed deleted only when the answer came before the first 404. A
Keep here, answered after the deletion was shown, skips the sequence
again instead of uploading it and erasing the answer.
- An upload's checkpoint records whether the job joined a server
sequence this PC already knew. A resumed or retried upload no longer
takes such a sequence for one it made and overwrites its details.
Refs #73
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
- 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's Renders stage never deletes what sits at a journaled render
target: a file or folder it did not copy there (a render of the kept
sequence made after a failed run), or a path another render of the kept
sequence names, makes the copy take a new free name instead.
- A merge's Verify stage records the hash it read for each kept frame the
index had none for, the Details stage leaves the versions the verify filed
out of Main, and Two versions also lists a whole-second instant holding two
frames of one size and other content (owner Q3).
- The Integrate journal keeps the losers the plan listed as last copies; a
loser that became the only copy while the job ran is never trashed: the
journal goes and the job fails as a stale plan.
- Download originals of a server sequence whose earlier download was
unlinked or kept apart makes a new local sequence under a key of the job,
instead of filling the old one, re-linking it and overwriting its details.
- An upload never links again from its checkpoint a server sequence the user
kept apart since the attempt that made it.
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>
Upload again now deletes the gone pair row once the new sequence is linked, so
the pair stops reading "deleted on server" or "kept here". A linked upload the
server refuses into its sequence (403 for an account without Edit that does not
own it) falls back to ordinary uploads instead of failing; an Integrate that
would add photos to such a sequence is blocked in its plan (NoAddRight).
Automatic photo transfers pause on a metered connection whatever the option
says. Integrate trashes server photos only against the manifest version that
checked the winner, and a merge is blocked while the other sequence holds a
damaged photo nothing else holds (DamagedPhotos), so nothing unverified reaches
the trash.
The plan and the confirmations now say what really happens: replaced versions
are no longer counted as kept, a merge lists the kept sequence's replaced
photos, plan lines use the text colour, an integrated pair that left photos out
says new photos move by hand, and a merging pair reads "merging" with its
progress. The Compare dialog gets per-side tooltips, class sizes for both
sides, policy-aware class tooltips, column headings and readable file names;
the sync table shows "deleted there" with Review and warns on skipped rows; the
Edit picker names the server, the Library card shows the match status second,
a deleted server sequence is named instead of "0 photos", and the match
tooltips stop calling a sequence a copy. The capture scenes use the server
name, the link names and consistent sample sizes.
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 local sequence and its server twin can now be integrated into one linked
pair by a resumable job instead of by hand. The planner runs the dry run of
design 5c: photo steps per policy (the wins policies decide only the Different
class; Only here and Only there always move), left out and AutoPhotos, last
copies, the one portable payload, projects copied across under free names,
space, rights and every block, and a fingerprint the job checks again.
The Integrate job keeps an atomic journal and resumes at each stage: link,
photos both ways through filtered transfers that never create or retarget a
server sequence (a 404 marks the pair remote gone), trash only once the winner
is present (locally through the photo trash inside the job, on the server at
the version its dry run read), the agreed details, then projects through
ProjectTransplant. Refusals are kept and reported; a failure or a cancel sets
the pair back to Linked or its previous state.
Linked uploads now file into their target when the server announces
upload-into. The plan context travels with the job so rights and names give
the same plan on the job side.
Refs #73
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>