Skip to content

upstream(sync): Tier 1 ACP prompt compose — Buzz agent guidance (#6340) #283

Closed

Description

@oscarlehuu

Intent

Merge Buzz block#6340 (simplify agent guidance) without dropping Crew office rules, evidence, CoS, or Gate C prompt contracts.

Upstream PR: block#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 (block#5863) Land block#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)

Phase 3 — Verify

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)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    enhancementNew feature or request

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions