Owner review 6 (#73, milestone v1.2.0), request and answers in docs/requests/2026-11-16-owner-review-6.md.
What it does. The same time-lapse on a server and on this PC under different ids, or twice on this PC, is now recognised, compared and settled as the owner asked:
Detection: matches are found after each sync refresh, using the server's new photos/lookup, and after jobs that change photos. Migration 0012 adds the tables. The Link matches setting defaults to Ask always.
Server › Matches: offers Keep apart (remembered), Link only, Unlink, Upload again, and the Compare dialog with Photos, Details line by line, Projects and Plan tabs.
Integrate (job 25):
completes both sides; photos default to Union, and the alternatives are Choose each or One side wins;
details are settled line by line;
projects are copied across, renamed <name> (<PC>);
a losing version goes to the trash only after a hash check and the last-copy checks;
afterwards, new photos move by themselves both ways and pause on a metered connection; deletions wait for the user.
Merge of two local sequences (job 26): every photo of the other sequence is verified before that sequence goes to its archive's trash. The photos it keeps in two versions are listed with Drop….
Folders and Upload all local: a local-sequences folder is added with Adopt folder… as an archive. Upload all local skips suspected matches and flags them.
Server additions:photo-lookup and upload-into capabilities. A 1.1 server keeps working, without Integrate.
Verification
Review: one three-lens review, a gap round and twelve verification rounds. Rounds 7–13 looked at the data engines only, and each finding needed 2 of 3 independent checks to count. Rounds 11–13 looked only at the latest fixes, until a round found nothing. Every confirmed finding is fixed, with a regression test that fails on the old code.
Local suites:
Suite
Result
Core
1563 passed
Data
1247 passed (the PostgreSQL variants are skipped locally)
Server
392 passed
App
1017 passed
Checks and screens: i18n check is 0/0 across 38 cultures; xaml-lint, package-guard and format are clean; the 227 screenshot baselines are within tolerance.
CI:
run 375 on aad8ae46 is green, including PostgreSQL 16 and 17;
run 376 on e002c583 failed only JobContextProgressTests.ADroppedReportAllocatesNothing on PostgreSQL 17. It is a known allocation-timing flake, and PostgreSQL 16 passed on the same commit.
Follow-ups are kept out of 1.2.0 and listed in the request file.
Owner review 6 (#73, milestone v1.2.0), request and answers in `docs/requests/2026-11-16-owner-review-6.md`.
**What it does.** The same time-lapse on a server and on this PC under different ids, or twice on this PC, is now recognised, compared and settled as the owner asked:
- **Detection:** matches are found after each sync refresh, using the server's new `photos/lookup`, and after jobs that change photos. Migration 0012 adds the tables. The *Link matches* setting defaults to *Ask always*.
- **Server › Matches:** offers Keep apart (remembered), Link only, Unlink, Upload again, and the Compare dialog with Photos, Details line by line, Projects and Plan tabs.
- **Integrate** (job 25):
- completes both sides; photos default to Union, and the alternatives are Choose each or One side wins;
- details are settled line by line;
- projects are copied across, renamed `<name> (<PC>)`;
- a losing version goes to the trash only after a hash check and the last-copy checks;
- afterwards, new photos move by themselves both ways and pause on a metered connection; deletions wait for the user.
- **Merge of two local sequences** (job 26): every photo of the other sequence is verified before that sequence goes to its archive's trash. The photos it keeps in two versions are listed with *Drop…*.
- **Folders and Upload all local:** a local-sequences folder is added with *Adopt folder…* as an archive. *Upload all local* skips suspected matches and flags them.
- **Server additions:** `photo-lookup` and `upload-into` capabilities. A 1.1 server keeps working, without Integrate.
**Verification**
- **Review:** one three-lens review, a gap round and twelve verification rounds. Rounds 7–13 looked at the data engines only, and each finding needed 2 of 3 independent checks to count. Rounds 11–13 looked only at the latest fixes, until a round found nothing. Every confirmed finding is fixed, with a regression test that fails on the old code.
- **Local suites:**
| Suite | Result |
|---|---|
| Core | 1563 passed |
| Data | 1247 passed (the PostgreSQL variants are skipped locally) |
| Server | 392 passed |
| App | 1017 passed |
- **Checks and screens:** i18n check is 0/0 across 38 cultures; xaml-lint, package-guard and format are clean; the 227 screenshot baselines are within tolerance.
- **CI:**
- run 375 on `aad8ae46` is green, including PostgreSQL 16 and 17;
- run 376 on `e002c583` failed only `JobContextProgressTests.ADroppedReportAllocatesNothing` on PostgreSQL 17. It is a known allocation-timing flake, and PostgreSQL 16 passed on the same commit.
**Follow-ups** are kept out of 1.2.0 and listed in the request file.
Refs #73
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Alby96
added this to the v1.2.0 milestone 2026-11-18 14:39:17 +01:00
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>
Clients must recognise the same time-lapse filed under another id on the server, and an
integrated pair must get a photo into the server sequence even when another sequence there
already holds it. The server now answers both, authorised and scoped by itself.
- POST /api/v1/photos/lookup (Read right): per probe, the sequences of the served archive
that hold its hashes in a frame, tombstoned them (deleted or replaced by a conversion),
match its unhashed photos by size and capture millisecond, or carry its session key; only
ids and counts, batched raw SQL, 413 too_many beyond 200 probes or 20,000 items, a 4 MB
body limit so a full request fits.
- Uploads with IntoTarget: sequenceId required, never with Restore, the target must be the
served archive's and the caller its owner, an admin or an editor. Only a copy in the target
stands in; a tombstone keeps the photo deleted. Otherwise the server copies an intact file
of another sequence of the served archive (never another archive of the index) into the
target: quota and room checked, verified copy, hash compared (a damaged source falls back
to a normal upload), committed refusing removed photos, used bytes charged only for a new
frame, frames event published, answered copied.
- server/info announces photo-lookup and upload-into (the desktop's hosted share too).
Refs #73
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Detection, Integrate and Merge need one comparison of two copies of a time-lapse, so
this adds it: CopyComparer classifies every photo (same, converted, same unhashed,
deleted here/there, differs, two versions, only here/there) with strict Differs and
Versions rules so whole-second capture times and bursts never pair, unusable frames
held as nothing and marked for repair, and the score of design 3.2.
CopyRules ports 1.1's same-originals gate exactly for "Link when half shared" and
holds the Decide table, ask-again thresholds, fingerprints, hints and the probe
sample. CopyPayload compares details in portable form (same photo at another index is
no line) and merges the chosen sides into one payload that must parse as a project.
CopySides reads both sides from the index and a server and answers the last-copy
check across every archive. SyncTombstones gains FromDtos for local pairs.
Refs #73
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Server > Matches shows the pairs the copy engine found (same sequence on the
server and this PC, or twice here), attention first, with the design 8.1
actions; Keep apart and Unlink toast with Undo. The in-window Compare dialog
walks photos, details, projects and the plan, blocks until details are
chosen, and confirms only what replaces or merges (typed count for a merge).
Sync rows of an unanswered pair read "match found" and offer Compare first;
Upload all local skips suspected copies and says why. Settings > Server gains
Link matches, Integrate photos and Integrate projects. Library cards carry the
match status with Compare..., the sequence picker marks twins, and Jobs opens
Integrate and Merge targets. The sample engine and capture scenes render every
state; tests cover the text rules and the screens.
Refs #73
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Brings in the owner review 6 parcel P1a: CopyComparison, CopyRules,
CopyPayload and CopySides with their Data tests.
Refs #73
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Brings in the owner review 6 parcel P2: the photo lookup endpoint and
the copy path for uploads into an existing sequence, with Server tests.
Refs #73
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Brings in the owner review 6 parcel P6: Server Matches list, compare
dialog, copy settings rows, library and picker twin surfaces. The three
parcels merge without conflicts; build, tests, i18n and xaml-lint pass.
Refs #73
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
SequenceMerger plans the merge of a local pair (kept sequence, photos
copied by policy, last copies, renders, details, projects, session keys,
links, blocks and a fingerprint) and queues the MergeSequences job.
MergeJobHandler applies the confirmed plan through a journal, so every
stage resumes: copy and file the other's photos, move renders, hash-verify
every original of the other in the kept one (or list it as a last copy),
trash the kept one's losing versions, write the details
(SequencePayloadWriter), copy projects, move keys and links, then move the
other to its archive's trash only at the verified frames version. A cancel
drops the journal and returns the pair to its previous state.
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>
Brings in the owner review 6 parcel P1b: CopyFinder detection of local
and server copies, CopyReviewBuilder for the compare dialog, and the
SyncService reconcile, re-ask, sweep and agreed-apply integration.
Merges without conflicts.
Refs #73
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Brings in the owner review 6 parcel P4: SequenceMerger plan and
fingerprint, the journaled merge job (copy, verify, move, trash) and
the sequence payload writer. Merges without conflicts on top of P1b;
build has no warnings, Core, Data and Server suites, the copy-related
App tests, i18n check, xaml-lint and package-guard pass.
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>
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>
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>
Photos not sent: automatic photos of an integrated pair that failed three
times in a row are now told with an error toast that shows the row, and the
row reads "not sent" with the last reason. The matches-found and linked toasts
of background detections run from their Windows notification too.
Maintenance now clears a merge's or an integration's journal whose job is done,
cancelled, or deleted without a cancel and untouched for the history's days.
Tests pin the matches jobs in the priority queue, the owner's defaults (ask
always, union, copy across), the dialog starting from the settings, Choose
each preselecting nothing, no automatic photos for a pair whose server copy
is gone, the repair of a corrupt local frame by an Integrate, and the owner's
whole scenario end to end against a real in-process server.
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>
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 on a server
and on this PC, show the differences and let the user keep the two apart
or integrate and sync them. The request file keeps the owner's words, the
reading R1-R8, the eight answers and the delivery plan; the brief now
describes matches, the Compare dialog, Integrate, the merge of two local
sequences, the automatic photos of integrated pairs, the photo lookup and
uploads into a target, and amends 14.5 so other projects cross only through
Integrate or a merge. DECISIONS records the design choices and those taken
while building it; the changelog, status, architecture and design notes
follow, and the version moves to 1.2.0.
Refs #73
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Translate the match, integrate and merge strings of owner review 6 into
the 36 other cultures, with the extra plural forms each language needs,
so i18n check reports no untranslated strings.
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>
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>
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>
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 docs commit 59235e7c predates the third to sixth verification rounds.
The brief now says how Integrate decides who may trash a server photo (per
sequence, owner or admin with Delete; otherwise the server's version stays
out of its Main), that the Details stage stops on a server change, how a
merge re-plans, keeps its links undoable and names its classes, the
Two versions... list of owner Q3, the three-button rows and twins with a
sibling only, with an amendment row per round. DESIGN, ARCHITECTURE,
DECISIONS, CHANGELOG, STATUS 8.7 and the request doc follow; the Windows
captures are no longer listed as open.
The glossaries gain the match terms in every language, read from the
shipped strings. Hindi merging reads मर्ज, apart from मिलान (match);
Croatian names the matching sequence podudarna sekvenca; Finnish no
longer puts kohteen right after a count.
Refs #73
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The merge confirmation now names the number to type ({1}) before the sequence; all 36 cultures follow that order instead of showing the number in brackets after the title. The session-keys tooltip already matched its shortened English text and is re-imported unchanged; the import tool also normalises key order in the touched files.
Refs #73
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The setup tests running in parallel shared HKCU\Software\Chronos.Tests and each
removed it once it looked empty; one test's cleanup could race another's key
creation and fail ReplacingTheLegacyUploaderMovesItsSignInEntryAndKeepsItTurnedOff
in a whole-suite run. ScratchRegistry now creates each scratch key and removes
the parent under one lock.
The Plan and Blocked compare captures now count both server projects coming
to this PC (Vertical and Slow pan, as the Projects part lists them); the old
baselines still showed one.
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'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 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 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'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's Verify stage journals a second version before filing it. When
the copy then failed or read other bytes (the file rewritten by an
editor or a sync tool, a drive dropping out before an edit), every retry
read new bytes for that journalled frame and stopped with changed,
keeping the journal, so the merge failed the same way until cancelled.
- When the kept sequence does not hold the journalled bytes, nothing was
filed: the frame leaves SecondVersions and VersionShas and is verified
as on a first visit, which files the photo as it is now.
- When it holds them (filed, then the exclusion failed), they are left
out of Main and the merge stops and drops its journal, so the next run
plans again instead of a cancel leaving them in Main for good.
Refs #73
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The changelog section becomes [1.2.0] dated 2026-11-18, and STATUS 8.7 and the request file say the
work is released, with the review rounds that ended it and CI green on PostgreSQL 16 and 17.
Refs #73
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Alby96
merged commit f33bcac32e into main2026-11-18 15:20:41 +01:00
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.
Owner review 6 (#73, milestone v1.2.0), request and answers in
docs/requests/2026-11-16-owner-review-6.md.What it does. The same time-lapse on a server and on this PC under different ids, or twice on this PC, is now recognised, compared and settled as the owner asked:
photos/lookup, and after jobs that change photos. Migration 0012 adds the tables. The Link matches setting defaults to Ask always.<name> (<PC>);photo-lookupandupload-intocapabilities. A 1.1 server keeps working, without Integrate.Verification
Review: one three-lens review, a gap round and twelve verification rounds. Rounds 7–13 looked at the data engines only, and each finding needed 2 of 3 independent checks to count. Rounds 11–13 looked only at the latest fixes, until a round found nothing. Every confirmed finding is fixed, with a regression test that fails on the old code.
Local suites:
Checks and screens: i18n check is 0/0 across 38 cultures; xaml-lint, package-guard and format are clean; the 227 screenshot baselines are within tolerance.
CI:
aad8ae46is green, including PostgreSQL 16 and 17;e002c583failed onlyJobContextProgressTests.ADroppedReportAllocatesNothingon PostgreSQL 17. It is a known allocation-timing flake, and PostgreSQL 16 passed on the same commit.Follow-ups are kept out of 1.2.0 and listed in the request file.
Refs #73
🤖 Generated with Claude Code
The merge confirmation now names the number to type ({1}) before the sequence; all 36 cultures follow that order instead of showing the number in brackets after the title. The session-keys tooltip already matched its shortened English text and is re-imported unchanged; the import tool also normalises key order in the touched files. Refs #73 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>