## Intent Merge Buzz huddle **agent prompt invariants** (spoken pickup, override no-bare-ack for voice). **Upstream PR:** #5863 ## Conflict matrix | Area | Risk | Crew files | Resolution | |------|------|------------|------------| | `base_prompt.md` | **High** | Crew office rules + machine-check assertions in `lib.rs` | Re-place Crew section after Communication Patterns per UPSTREAM-SYNC.md | | Prompt tests | **High** | `crates/buzz-acp` prompt assertion tests | Merge upstream huddle block + retain Crew evidence/completion rules | | Gate C / no-bare-ack | **Med** | agent harness behavior | Document voice exception in `AGENT-WORKING-AGREEMENT.md` if needed | ## TDD plan ### Phase 1 — RED - `cargo test -p buzz-acp` prompt contract tests: add upstream cases for huddle pickup-first-tool-call - **Expected fail** until prompt merged ### Phase 2 — GREEN - Merge `base_prompt.md` hunks manually; run full `buzz-acp --lib` (661+ tests) - Verify Crew-specific assertions (evidence, CoS, Gate C) still pass ### Phase 3 — Verify - No change to text-channel no-bare-ack behavior (regression test) - Optional: live huddle spike if founder uses voice ## Parent #275 (huddle perf) — can land after or with perf fixes. ## Unresolved - Whether Crew CoS intake template needs huddle exception callout
Activity
upstream(sync): huddle agent prompt — spoken pickup rules (block#5863)
upstream(sync): Tier 2 messaging — inbox delete, compact links, MCP t…