mirror of
https://github.com/block/buzz.git
synced 2026-11-01 23:11:58 +00:00
ffe3d8d50a
Resolve two conflicts: 1. crates/buzz-acp/src/config.rs: PermissionMode::BypassPermissions removed by main (#4609, security fix). Branch added PermissionMode::Auto and effort_level. Resolution: keep Auto and effort_level additions; drop BypassPermissions (aligns with #4609's intent that the variant cannot be restored by configuration). One test assertion for BypassPermissions.is_default() removed accordingly. 2. desktop/src-tauri/src/commands/agents_deploy.rs: branch added claude B2/I-4 tests (ANTHROPIC_MODEL routing, BUZZ_ACP_EFFORT_LEVEL); main added OpenClaw parallelism-cap tests via #4019. Resolution: keep both test sets; fix trailing blank line introduced by merge tool. Also: desktop/src-tauri/src/managed_agents/parallelism.rs (new in main via #4019) constructs ManagedAgentRecord in tests without the effort_level field added by this branch. Added effort_level: None to the test helper to satisfy the struct initializer. Co-authored-by: Will Pfleger <pfleger.will@gmail.com> Signed-off-by: Will Pfleger <pfleger.will@gmail.com>