- 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>
Integrate trashes a server photo only for the sequence's owner or an admin, a
Details stage stops instead of overwriting a server change the user had kept
this PC's value against, a merge retried after a stop plans again when work
reached the other sequence, detection keeps pairs answered while it ran, and a
sync row whose match the server deleted offers Keep here, Upload again and To
trash. The Integrate and merge logs say in the UI language why a version was
kept.
The edit-picker-twins capture scene showed no Twin chip, since a capture has no
workspace: it now lists sample workspace projects of the sample matches. The
screenshot baselines gain the 38 Matches screens and take the Matches chip,
the three Settings > Server rows, the longer priority list and 1.2.0.
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>
Owner review 6 asks Chronos to recognise the same time-lapse held under different ids on the
server and on this PC, compare the copies, and keep them apart or integrate and sync them. This
lays the shared foundation the later parcels build on, without any UI or detection yet.
- Migration 0012 adds found_copies (local-server and local-local pairs with evidence, scores,
answer, policy and the 404 record) and copy_probes; every existing link with a local sequence
becomes a Linked pair, so a server deletion and the per-link policy have a place.
- FoundCopyStore keeps the pairs: upserts that never touch the answer, a compare-and-set of the
state with an Integrating backstop (a failed or cancelled job reads as the previous state),
link promotion and demotion, the once-per-refresh 404 count, the merge's links stage
(session keys, links reset, pairs moved, refused when both are linked on one server), the
local overlap queries and the probes. SyncLinkStore.RekeyAsync moves pairs and probes with
the links in the same transaction.
- Contracts for detection, review, plans, the Integrate and MergeSequences jobs (kinds 25/26,
High level, new detail steps) and the Upload all rule that keeps suspected, kept-apart,
deleted, busy and server-born sequences here.
- Wire: POST photos/lookup, uploads into a target (IntoTarget/Copied, trailing and optional),
frames/delete on the client, capabilities photo-lookup and upload-into, cached per remote.
- The trash plans and deletes accept the job that holds the sequence (its own hold is not
Busy) and a frames version checked under the lease; a Background job never interrupts a
running one.
- Settings for linking, the photo policy and projects; the en and it keys of design section 9.
Refs #73
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>