OXYGENHUB

Backlog: P1d done 7f64236d2829

Author
Andy McCall @andymccall <[email protected]>
When
· 2026-09-29 05:18 UTC
Signature
✔ signed by Andy McCall
Hash
7f64236d2829d258b19a8044fcc34c83303da3ded6ade95084c6e7ba2a35221a
Depends on
0cded3d844e4 49e9da11c6e3 75036530b621
Depended on by
1d27d0a2b3c1
In bookmarks
agents-in-readme bare-hashes carried-not-removed carry-identical doctor-trust identical-sides keyless-tags main merge-remote-bookmark only-help-103 paths-for-resolutions-and-amend push-notes show-stat subrepo-pin-state switch-says
In tags
v0.1.0 v0.10.0 v0.11.0 v0.2.0 v0.3.0 v0.3.1 v0.4.0 v0.4.1 v0.4.2 v0.4.3 v0.4.4 v0.4.5 v0.4.6 v0.5.0 v0.5.1 v0.6.0 v0.7.0 v0.8.0 v0.9.0
Edits
3 atoms, 0 tree operations, 1 file

Browse the tree at this change

hide whitespace changes
modified docs/backlog-overnight-2.md +7 −1
… 
84 unchanged lines
85 85 
- [x] M10 Hub: say "signed by an unlinked key" on changes and in `/api/v1/user`, pointing at Settings (feedback 14).
86 86 
- [x] P1a Text conflicts resolved region by region on OxygenHub (first part of P1, below).
87 87 
- [x] P1c Name conflicts on the resolver: keep one candidate, which takes the name as a move.
88 - 
- [ ] P1d "Resolve in VS Code": the resolver hands a conflict to oxygen-vscode (a vscode:// URI the extension handles: clone or open, switch to the bookmark, open the file).
88 + 
- [x] P1d "Resolve in VS Code": the resolver hands a conflict to oxygen-vscode (a vscode:// URI the extension handles: clone or open, switch to the bookmark, open the file).
89 89 
- [ ] P1e Replace conflicts of binary files: oxy-core cannot yet resolve one by keeping an existing candidate (writing a candidate's bytes counts as no change); make that a resolution, then offer it on the resolver.
90 90 
- [ ] P1 **Conflict resolution on OxygenHub** (Andy's list, item 1). A resolver page for a conflicted state:
91 91 
  - Per conflict region: pick a side, several sides, or none; edit freely; tree conflicts too (keep a candidate).
… 
549 unchanged lines
641 641 
  - Directory and link name conflicts stay with clients.
642 642 
  - Deployed; hub run green.
643 643 
  - **Added:** P1d (resolve in VS Code) and P1e (binary replace conflicts need a core change first: writing a candidate's bytes counts as no change today).
644 + 
- 2026-09-29 **P1d done** (oxygenhub#32; oxygen-vscode 0.11.0).
645 + 
  - The resolver pages link to `vscode://oxygen.oxygen-vscode/resolve?url=…&bookmark=…&path=…` (encoded).
646 + 
  - The extension finds the open checkout with that remote, or offers to clone it, asks before switching bookmark, pulls, and opens the file with its conflict lenses. Bad URLs, bookmarks and paths are refused.
647 + 
  - Parsing and matching are in `src/handoff.ts`, with tests; `npm run check` passes (`ℹ fail 0`).
648 + 
  - Installed in both profiles; hub deployed; both runs green.
649 + 
  - **Fixed on the way:** P1c's name-conflict test found the kept candidate by the first occurrence of a word anywhere on the page, which failed now and then. It now reads the candidates' previews; six passes in a row.