[joshuadav86]

Requested by Joshua · project thread

Joshua's Windows PC is the Primary Rig, but its Get Up To Speed showed "Bring over from the Primary Rig" (Reaper: 1 key map, 1 menus and toolbars) with a score of 99.

What changed

Two causes, both fixed (decision #126; renumbered from #123 after the home-network PRs took #123-#125):

1. "Add" from another machine moved the Primary machine. add_to_golden saved the adding machine as the new version's source_machine_id, so adding one plug-in (e.g. MS-20 V from the Mac) made the Mac "the Primary machine" and the PC an ordinary one. It now keeps the previous version's source. Store::golden / golden_history read older "Added … from …" versions (also imported ones) as their parent's Primary machine, so rigs that already have the wrong source are right again without a migration. Only a whole save (Make Primary, Update Primary Rig from this machine) moves it.
2. The Primary machine was offered its own older files. A key map or menu edited on the Primary machine after the version was saved (or placed there by Keep Files in Sync) differs from the Primary Rig's copy, and Bring over offered to overwrite it with the older one. FileToBring.newer_here marks a copy here that is newer (or has an unknown time); bring::split_changed_here sets those apart on the Primary machine, so neither the Bring over card nor Compare's Bring over lines offer them. Instead a Changed here since Primary Rig vN card offers Update Primary Rig (keep_changes_in_golden, which goes through add_to_golden so plug-ins the Primary Rig got from elsewhere stay). Files only the Primary Rig has, or whose Primary Rig copy is newer, are still brought over.

Also: Compare's machine list puts "Primary" first so the narrow line no longer cuts it off ("Windows · this machine · Primary machine" showed as "Windows · t…").

Screenshots (mocked IPC): /mnt/project-files/screenshots/primary-bring-over/ (before/after, dark/light).

How it was tested

• cargo test --workspace, clippy -D warnings, fmt; new tests: adding_from_another_machine_keeps_the_primary_machine (store), the_primary_machine_keeps_what_it_changed_since (bring), Primary machine kept in the existing add-to-golden test
• app/src-tauri: clippy -D warnings + tests (Linux); npm run build
• Windows (CI)
• macOS (CI)

Checklist

• Follows the non-negotiable rules in CLAUDE.md (backups before writes unchanged; nothing new is written to user files)
• Added a line to docs/decisions.md (Release 0.4.6: keep files in sync through the cloud folder #126)
• CLAUDE.md unchanged (no build or convention change)

🤖 Generated with Claude Code

https://claude.ai/code/session_013Se1kg5gSsJs5yj2HeacfG