- 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 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>
The metered hold now records the jobs it paused in the index and forgets
any job the user pauses, resumes, retries or cancels, so it never resumes
a pause of the user's and still resumes its own after a restart.
Drop... reports why its dry run is blocked instead of asking first, and
dropping the version Main uses lets Main use the version that stays,
with its hero and keyframes. That version reads "In Main".
Merges:
- A re-plan no longer hashes the other's photos again.
- A resumed merge verifies photos flagged damaged while it waited.
- A merge is blocked while the other's folder holds photos the index
has not read; this is checked again under the lease before the trash.
- Choose each offers Keep both, Kept and Other, and blocks until every
differing photo is chosen.
- Classes are named by role.
The Compare dialog:
- Its headings stay over their columns.
- The Projects part scrolls.
- Every confirmation line carries its own prefix, and a merge's facts
carry none.
- A server card in a match offers Compare... alone.
The Italian strings follow the glossary.
Finding 9 (a local drop counting 0 photos) is not reproduced; a test now
keeps the count at 2.
Refs #73
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The fourth verification round of the matches work found 18 defects in
the merge, Integrate and Matches surfaces. This commit fixes them:
- An Integrate job now carries the planning account's id, so its re-plan
decides ownership the way the dialog did.
- A merge skips only a project the kept sequence holds a real copy of
(name, offset head and history content) and re-points its renders to
that copy.
- A merge runs its trash checks before the Links stage and records an
undo, so an abandoned merge gives the other sequence back its link,
session keys and pairs.
- The metered hold adopts automatic transfers that were paused before a
restart.
- Apply in the Compare dialog re-plans when the plan is pending or stale.
- The Library's Two versions... lists the second versions a Union merge
leaves, each with Drop... (dry run, confirmation, verified partner).
A merge job's Open shows that list.
- The merge's typed confirmation is the invariant count, and the prompt
names it in all 38 languages.
- Italian text uses Principale and Gemello. The Main project is named
through WorkspaceText in the Projects part and in the twin tooltip.
- The session keys tooltip is split into two keys, and To trash... and
Delete on server... say why they are disabled.
- The capture restores the editor account before the Matches scenes.
- Upload again follows SyncHost.CanSendSync (Upload with Edit).
- Matches rows trim archive names in the middle on a rebalanced grid;
the Projects part rows trim, with the full text in the tooltip.
- The sample project targets use ProjectTransplant.FreeName.
DECISIONS, CHANGELOG, STATUS 8.7, the request doc and the 16 changed
capture baselines are updated.
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>
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>
CopyEngine puts the planners together behind ICopyEngine so the App can find,
compare, integrate, merge, link, unlink and keep pairs apart. It also moves
photos that one side deleted to the other side's trash. Each trash step
re-reads both sides when applied, and nothing moves if any photo was restored
since the dry run. The sync agent now queues the new photos of pairs that were
integrated with automatic photos, both ways, at background priority. Failures
back off, and three in a row are reported so the pair can show "not sent". On
a metered connection, integrations are held like other server transfers.
AppServices builds the engine and registers the Integrate and Merge handlers.
A CopyWatch looks for local copies after start and after jobs that change
photos. Merges wait for workspace work that has not been sent home.
Refs #73
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>