fix(workspace): finish or keep every choice, copy and sync a cut or a deleted project leaves

- A take of the library's values cut past its commit point settles its conflict
  (replay journal marks Settles); a later stale choice finds nothing to settle,
  and one cut before it keeps the conflict so the next choice is applied.
- A local version that changes nothing once replayed on the head is not sent
  nor written as a Merge; its file stays in versions/.replaced.
- Save both journals its intent (name, base, time) before the home is asked,
  so a cut after the copy was made reuses that copy on retry.
- A project deleted at the home reads as Gone from pull, push, resolve and
  save both, logged once, without retry loops; versions and working state stay.
- Save both keeps the restore recorded in sync.json.
- The copy job writes a photo's new bytes under a name of its own while the
  editor's media still name the old file, switching at the commit; a cancelled
  first copy removes its own half media under the lease (VM hook removed).
- Status reads the version files once, re-reads the home's frames only when
  its stamp moved, reports damage only when confirmed under the lease, and
  waits once for a busy lease before calling the media outdated.
- versions/.replaced is pruned after a sync that ended well (30 days, newest
  20 kept, never a file a journal names).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Alby96andClaude Opus 5.5 committed 2026-11-03 13:06:19 +01:00
1 parent 488b588ad9
commit 5eeb64b680
14 files changed
+1183 -216

No files matched your search

@@ -188,6 +188,30 @@ public abstract class WorkspaceMergeTests(TestContext context) : DatabaseTest(co
Assert.SequenceEqual([2], (await sync.OpenAsync(id, fx.Ct)).Working.ExcludedFrames);
}
[Test]
public async Task AProjectHeldForAMomentStillLetsTheMediaLearnTheHomesNames()
{
var fx = await FixtureAsync();
await UnhashAsync(fx, 2);
var (_, sync) = fx.Workspace();
var project = await fx.CheckoutAsync(sync);
var id = project.ProjectId;
await VerifyAsync(fx);
var hashed = (await fx.Db.Frames.ListBySequenceAsync(fx.Sequence.Id))[2].Sha256!;
// Another read of the state holds the project for a moment as this one asks: it waits for it, once.
var lease = await project.LockAsync(TimeSpan.FromSeconds(TestTiming.Budget(10)), fx.Ct);
var release = Task.Run(async () =>
{
await Task.Delay(150, fx.Ct);
lease.Dispose();
}, fx.Ct);
var status = await sync.StatusAsync(id, fx.Home, fx.Ct);
await release;
Assert.False(status.MediaOutdated);
Assert.Equal(hashed, project.ReadMedia()!.Frames[2].Sha256);
}
[Test]
public async Task APhotoConvertedAtTheHomeIsOutdatedMediaAndTheMediaLearnItsEncodings()
{