Files
buzz/desktop/src-tauri
Duncan 25f4a5514a chore: merge origin/main (59328d5ae) into duncan/phase1-merged-agent-edit
Resolve conflicts in personaDialogState.ts, personaDialogState.test.mjs,
and types.ts by taking origin/main's version (our branch made no changes to
those files). sharing.rs and update.rs auto-merged cleanly — our P1-2
lock scope and P2 retain-result changes combined with main's #7126
description field additions without conflict.

Co-authored-by: Will Pfleger <pfleger.will@gmail.com>
Signed-off-by: Will Pfleger <pfleger.will@gmail.com>
2026-09-01 10:40:30 -04:00
..