Repository navigation

fix(workspace): refusals and the edit's conflict note say what a sync takes from disk, a deletion included - #466

Merged

nissa-seru merged 5 commits into

anima-research:mainfrom

nissa-seru:fix/workspace-deleted-on-disk-advice

Oct 18, 2026

Merged

fix(workspace): refusals and the edit's conflict note say what a sync takes from disk, a deletion included#466
nissa-seru merged 5 commits into
anima-research:mainfrom
nissa-seru:fix/workspace-deleted-on-disk-advice

Commits on Oct 17, 2026
- fix(workspace): where disk has deleted a file the workspace holds, its ways out say a sync takes the deletion and a forced push writes the copy back
  Phoebe-2419
  committed
  c5a60ba
- fix(workspace): where disk has deleted a file, an unreadable intent's sync says it takes the deletion
  Phoebe-2419
  committed
  af5f218
- fix(workspace): the edit's conflict note says a sync keeps disk's copy and gives up the workspace's; tests pin an interrupted conflict and a named forced push over a deleted file
  Phoebe-2419
  committed
  ca4dc39
- Merge main (b96e918b) into fix/workspace-deleted-on-disk-advice
  Phoebe-2419
  committed
  141e95c
- test(workspace): a draft against a disk copy past maxFileSize gets the same note and sync as a binary one, and the listing shows it disk-only
  Phoebe-2419
  committed
  8273514