diff --git a/crates/buzz-acp/src/queue.rs b/crates/buzz-acp/src/queue.rs index 11902836b6..029bf86dbf 100644 --- a/crates/buzz-acp/src/queue.rs +++ b/crates/buzz-acp/src/queue.rs @@ -1151,8 +1151,8 @@ fn append_reply_instruction(s: &mut String, event_id: &str) { "\nIMPORTANT: For ordinary replies in this turn, use `--reply-to {event_id}` \ on `buzz messages send` so the conversation stays threaded. \ If the human explicitly asks for a channel-root, top-level, \ - or broadcast post, send that message with `--top-level` instead of \ - `--reply-to`. If the requested destination is ambiguous, ask before sending." + or broadcast post, send that message without `--reply-to`. \ + If the requested destination is ambiguous, ask before sending." )); } @@ -1167,8 +1167,7 @@ fn append_new_thread_reply_instruction(s: &mut String, event_id: &str) { this turn, use `--reply-to {event_id}` on `buzz messages send` — the \ triggering message is the thread root. Do NOT reply into any other \ (older) thread. If the human explicitly asks for a channel-root, \ - top-level, or broadcast post, send that message with `--top-level` \ - instead of `--reply-to`." + top-level, or broadcast post, send that message without `--reply-to`." )); } @@ -3895,8 +3894,8 @@ mod tests { "channel thread reply should describe reply-to as the default" ); assert!( - prompt.contains("send that message with `--top-level`"), - "channel thread reply should teach the automatic-context opt-out" + prompt.contains("send that message without `--reply-to`"), + "channel thread reply should allow explicit channel-root/top-level requests" ); assert!( !prompt.contains("Do not broadcast to the channel"), @@ -3970,10 +3969,6 @@ mod tests { prompt.contains("new top-level message"), "top-level human message should use the new-thread instruction" ); - assert!( - prompt.contains("send that message with `--top-level`"), - "new-thread instruction should teach the automatic-context opt-out" - ); } #[test] diff --git a/crates/buzz-cli/src/lib.rs b/crates/buzz-cli/src/lib.rs index 06ab6c4e78..0b46734584 100644 --- a/crates/buzz-cli/src/lib.rs +++ b/crates/buzz-cli/src/lib.rs @@ -361,11 +361,8 @@ pub enum MessagesCmd { #[arg(long)] kind: Option, /// Event ID to reply to (creates a thread) - #[arg(long, conflicts_with = "top_level")] + #[arg(long)] reply_to: Option, - /// Send at channel root, ignoring automatic reply context - #[arg(long, default_value_t = false, conflicts_with = "reply_to")] - top_level: bool, /// Also publish to the Nostr network #[arg(long, default_value_t = false)] broadcast: bool, @@ -1843,45 +1840,6 @@ mod tests { assert!(Cli::try_parse_from(["buzz", "users", "set-status", "--clear"]).is_ok()); } - #[test] - fn message_send_top_level_is_explicit_and_conflicts_with_reply_to() { - let cli = Cli::try_parse_from([ - "buzz", - "messages", - "send", - "--channel", - "00000000-0000-0000-0000-000000000000", - "--content", - "announcement", - "--top-level", - ]) - .expect("--top-level should parse"); - let Cmd::Messages(MessagesCmd::Send { - top_level, - reply_to, - .. - }) = cli.command - else { - panic!("expected messages send"); - }; - assert!(top_level); - assert!(reply_to.is_none()); - - let conflict = Cli::try_parse_from([ - "buzz", - "messages", - "send", - "--channel", - "00000000-0000-0000-0000-000000000000", - "--content", - "announcement", - "--top-level", - "--reply-to", - "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", - ]); - assert!(conflict.is_err(), "explicit destinations must not conflict"); - } - #[test] fn command_inventory_is_stable() { let expected_groups: Vec<&str> = vec![