## Intent Merge Buzz **#6340** (simplify agent guidance) **without** dropping Crew office rules, evidence, CoS, or Gate C prompt contracts. **Upstream PR:** #6340 **Conflict:** **HIGH** — `crates/buzz-acp/src/base_prompt.md` + machine-check assertions in `lib.rs` ## Conflict matrix | File | Crew delta | Rule | |------|------------|------| | `base_prompt.md` | Office rules, evidence-on-completion, CoS intake, no-bare-ack | Re-place Crew sections after upstream Communication Patterns (UPSTREAM-SYNC.md) | | `lib.rs` | Prompt assertion tests | Merge upstream structure; all Crew assertion tests must stay green | | Overlap #276 | Huddle spoken pickup (#5863) | Land #6340 first or together; avoid double-edit | ## TDD plan ### Phase 1 — RED - `cargo test -p buzz-acp --lib` prompt contract tests — capture failing set if upstream structure applied blindly - List Crew-only prompt sections that must survive (grep `crew-evidence`, `Gate C`, `CoS`, `call-by-name`) ### Phase 2 — GREEN (manual compose) - Three-way merge `base_prompt.md`: upstream skeleton + Crew fenced blocks - Run full `buzz-acp` lib suite (661+ tests) - Desktop: agent receives CoS + evidence rules in fresh channel session (#116) ### Phase 3 — Verify - No regression: agents still publish evidence with `--evidence` - No bare-ack in text channels; huddle exception deferred to #276 if not in same PR ## Parent Buzz `0.5.18` sync — meta #285. Related: #276 (huddle prompt), #282 (harness). ## Unresolved - Whether to upstream-propose Crew evidence block later (D-020 draft only)
Activity
upstream(sync): Tier 2 messaging — inbox delete, compact links, MCP t…