fork sync conflict with block/buzz main (2026-09-01)

[yjc801]

Automatic sync could not merge block/buzz main (e17a0d4) into fork main (da40996).

Conflicting files:

desktop/src-tauri/Info.plist
desktop/src-tauri/src/commands/agents_deploy.rs

Resolve in any clone: git fetch upstream && git merge upstream/main, fix, push, close this issue.

Filed by the buzz-fork-sync launchd routine.

[yjc801]

Resolved in #111 (branch fork-sync/2026-09-01c), which merges upstream e17a0d44c into fork main.

The Info.plist conflict was a branding collision (upstream block#6978 added voice notes to NSMicrophoneUsageDescription); the agents_deploy.rs conflict this run's script reported was already resolved by #109, which landed while this was in flight.

One silent break that the merge did not mark: upstream block#7143's new scripts/test-desktop-instance-detection.sh hardcodes xyz.block.buzz.app.dev, which this fork renamed to xyz.waggle.app.dev — fixed in the same PR.