3 files changed, 411 insertions, 91 deletions

diff --git a/src/bin/ngit/sub_commands/send.rs b/src/bin/ngit/sub_commands/send.rs
index 6ae0cda..325ad89 100644
--- a/src/bin/ngit/sub_commands/send.rs
+++ b/src/bin/ngit/sub_commands/send.rs
@@ -15,6 +15,7 @@ use crate::{
     cli::{Cli, extract_signer_cli_arguments},
     cli_interactor::{
         Interactor, InteractorPrompt, PromptConfirmParms, PromptInputParms, PromptMultiChoiceParms,
+        cli_error,
     },
     client::{
         Client, Connect, fetching_with_report, get_events_from_local_cache, get_repo_ref_from_cache,
@@ -38,9 +39,9 @@ pub struct SubCommandArgs {
     #[arg(long, action)]
     pub(crate) no_cover_letter: bool,
     /// optional cover letter title
-    #[clap(short, long)]
+    #[clap(long)]
     pub(crate) title: Option<String>,
-    #[clap(short, long)]
+    #[clap(long)]
     /// optional cover letter description
     pub(crate) description: Option<String>,
     /// publish as Pull Request even if each commit is < 60kb
@@ -51,6 +52,83 @@ pub struct SubCommandArgs {
     pub(crate) force_patch: bool,
 }
 
+/// Validates send command arguments for non-interactive mode.
+///
+/// Returns Ok(()) if:
+/// - Interactive mode is enabled (all validation happens interactively)
+/// - Updating an existing proposal (`in_reply_to` is non-empty)
+/// - Using defaults mode (--defaults will fill in gaps)
+/// - Both title and description are provided
+///
+/// Returns an error if:
+/// - Description provided without title
+/// - Title provided without description
+/// - Missing required arguments in non-interactive mode
+fn validate_send_args(cli: &Cli, args: &SubCommandArgs) -> Result<()> {
+    // Interactive mode handles all validation interactively
+    if cli.interactive {
+        return Ok(());
+    }
+
+    // Description requires title
+    if args.description.is_some() && args.title.is_none() {
+        let message = "ngit send requires --title when --description is provided";
+        let details = vec![("--title <T>", "cover letter title")];
+        let suggestions = vec![
+            "ngit send HEAD~2 --title \"My Feature\" --description \"Details\"",
+            "ngit send --interactive",
+        ];
+        return Err(cli_error(message, &details, &suggestions));
+    }
+
+    // Title requires description
+    if args.title.is_some() && args.description.is_none() {
+        let message = "ngit send requires --description when --title is provided";
+        let details = vec![("--description <D>", "cover letter description")];
+        let suggestions = vec![
+            "ngit send HEAD~2 --title \"My Feature\" --description \"Details\"",
+            "ngit send --interactive",
+        ];
+        return Err(cli_error(message, &details, &suggestions));
+    }
+
+    // Updating existing proposal - no additional validation needed
+    if !args.in_reply_to.is_empty() {
+        return Ok(());
+    }
+
+    // Defaults mode will fill in gaps
+    if cli.defaults {
+        return Ok(());
+    }
+
+    // Both title and description provided - all good
+    if args.title.is_some() && args.description.is_some() {
+        return Ok(());
+    }
+
+    // --no-cover-letter with a range is valid (patches without cover letter)
+    if args.no_cover_letter && !args.since_or_range.is_empty() {
+        return Ok(());
+    }
+
+    // Missing required arguments for non-interactive mode
+    let message = "ngit send requires additional arguments";
+    let mut details = vec![];
+    if args.since_or_range.is_empty() {
+        details.push(("<SINCE_OR_RANGE>", "commits to send (eg. HEAD~2)"));
+    }
+    details.push(("--title <T> --description <D>", "cover letter details"));
+    details.push(("-d, --defaults", "use sensible defaults"));
+    details.push(("--interactive", "prompt for values"));
+    let suggestions = vec![
+        "ngit send HEAD~2 --title \"My Feature\" --description \"Details\"",
+        "ngit send --defaults",
+        "ngit send --interactive",
+    ];
+    Err(cli_error(message, &details, &suggestions))
+}
+
 #[allow(clippy::too_many_lines)]
 pub async fn launch(cli_args: &Cli, args: &SubCommandArgs, no_fetch: bool) -> Result<()> {
     let git_repo = Repo::discover().context("failed to find a git repository")?;
@@ -60,6 +138,9 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs, no_fetch: bool) -> Re
         .get_main_or_master_branch()
         .context("the default branches (main or master) do not exist")?;
 
+    // Validate arguments early, before any network calls
+    validate_send_args(cli_args, args)?;
+
     let mut client = Client::new(Params::with_git_config_relay_defaults(&Some(&git_repo)));
 
     let repo_coordinates = get_repo_coordinates_when_remote_unknown(&git_repo, &client).await?;
@@ -82,14 +163,32 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs, no_fetch: bool) -> Re
 
     let mut commits: Vec<Sha1Hash> = {
         if args.since_or_range.is_empty() {
-            let branch_name = git_repo.get_checked_out_branch_name()?;
-            let proposed_commits = if branch_name.eq(main_branch_name) {
-                vec![main_tip]
+            if cli_args.interactive {
+                let branch_name = git_repo.get_checked_out_branch_name()?;
+                let proposed_commits = if branch_name.eq(main_branch_name) {
+                    vec![main_tip]
+                } else {
+                    let (_, _, ahead, _) = identify_ahead_behind(&git_repo, &None, &None)?;
+                    ahead
+                };
+                choose_commits(&git_repo, proposed_commits)?
             } else {
-                let (_, _, ahead, _) = identify_ahead_behind(&git_repo, &None, &None)?;
-                ahead
-            };
-            choose_commits(&git_repo, proposed_commits)?
+                // --defaults was validated above, so we know it's set
+                let branch_name = git_repo.get_checked_out_branch_name()?;
+                let proposed_commits = if branch_name.eq(main_branch_name) {
+                    vec![main_tip]
+                } else {
+                    let (_, _, ahead, _) = identify_ahead_behind(&git_repo, &None, &None)?;
+                    ahead
+                };
+                if proposed_commits.len() > 10 && !cli_args.force {
+                    bail!(
+                        "too many commits ({}). use --force to proceed or specify a range",
+                        proposed_commits.len()
+                    );
+                }
+                proposed_commits
+            }
         } else {
             git_repo
                 .parse_starting_commits(&args.since_or_range)
@@ -97,6 +196,14 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs, no_fetch: bool) -> Re
         }
     };
 
+    // Check for too many commits with explicit range
+    if commits.len() > 10 && !cli_args.force && !cli_args.interactive {
+        bail!(
+            "too many commits ({}). use --force to proceed or specify a smaller range",
+            commits.len()
+        );
+    }
+
     if commits.is_empty() {
         bail!("no commits selected");
     }
@@ -115,6 +222,7 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs, no_fetch: bool) -> Re
         git_repo.get_commits_ahead_behind(&main_tip, commits.last().context("no commits")?)?;
 
     check_commits_are_suitable_for_proposal(
+        cli_args,
         &first_commit_ahead,
         &commits,
         &behind,
@@ -138,57 +246,92 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs, no_fetch: bool) -> Re
         should_be_pr
     };
 
-    let title = if as_pr {
-        match &args.title {
-            Some(t) => Some(t.clone()),
-            None => {
-                if root_proposal.is_none() {
-                    Some(
-                        Interactor::default()
-                            .input(PromptInputParms::default().with_prompt("title"))?
-                            .clone(),
-                    )
-                } else {
-                    None
+    let cover_letter_title_description = if cli_args.interactive {
+        // Interactive flow: prompt for cover letter confirm, title, description
+        let title = if as_pr {
+            match &args.title {
+                Some(t) => Some(t.clone()),
+                None => {
+                    if root_proposal.is_none() {
+                        Some(
+                            Interactor::default()
+                                .input(PromptInputParms::default().with_prompt("title"))?
+                                .clone(),
+                        )
+                    } else {
+                        None
+                    }
                 }
             }
-        }
-    } else if args.no_cover_letter {
-        None
-    } else {
-        match &args.title {
-            Some(t) => Some(t.clone()),
-            None => {
-                if Interactor::default().confirm(
-                    PromptConfirmParms::default()
-                        .with_default(false)
-                        .with_prompt("include cover letter?"),
-                )? {
-                    Some(
-                        Interactor::default()
-                            .input(PromptInputParms::default().with_prompt("title"))?
-                            .clone(),
-                    )
-                } else {
-                    None
+        } else if args.no_cover_letter {
+            None
+        } else {
+            match &args.title {
+                Some(t) => Some(t.clone()),
+                None => {
+                    if Interactor::default().confirm(
+                        PromptConfirmParms::default()
+                            .with_default(false)
+                            .with_prompt("include cover letter?"),
+                    )? {
+                        Some(
+                            Interactor::default()
+                                .input(PromptInputParms::default().with_prompt("title"))?
+                                .clone(),
+                        )
+                    } else {
+                        None
+                    }
                 }
             }
-        }
-    };
+        };
 
-    let cover_letter_title_description = if let Some(title) = title {
-        Some((
-            title,
-            if let Some(t) = &args.description {
-                t.clone()
-            } else {
-                Interactor::default()
-                    .input(PromptInputParms::default().with_prompt("description"))?
-                    .clone()
-            },
-        ))
+        if let Some(title) = title {
+            Some((
+                title,
+                if let Some(t) = &args.description {
+                    t.clone()
+                } else {
+                    Interactor::default()
+                        .input(PromptInputParms::default().with_prompt("description"))?
+                        .clone()
+                },
+            ))
+        } else {
+            None
+        }
+    } else if as_pr {
+        // PR always needs cover letter
+        let title = match &args.title {
+            Some(t) => t.clone(),
+            None if cli_args.defaults => {
+                git_repo.get_commit_message_summary(commits.first().context("no commits")?)?
+            }
+            None => bail!("PR requires --title and --description (or use --defaults)"),
+        };
+        let description = match &args.description {
+            Some(d) => d.clone(),
+            None if cli_args.defaults => {
+                let commit = commits.first().context("no commits")?;
+                let full_message = git_repo.get_commit_message(commit)?;
+                let summary = git_repo.get_commit_message_summary(commit)?;
+                full_message
+                    .strip_prefix(&summary)
+                    .unwrap_or(&full_message)
+                    .trim()
+                    .to_string()
+            }
+            None => bail!("PR requires --title and --description (or use --defaults)"),
+        };
+        Some((title, description))
     } else {
-        None
+        // Patch mode
+        match (&args.title, &args.description) {
+            (Some(t), Some(d)) => Some((t.clone(), d.clone())),
+            (Some(_), None) => bail!("--title requires --description"),
+            (None, Some(_)) => bail!("--description requires --title"),
+            (None, None) => None, // no cover letter
+        }
     };
 
     let (signer, mut user_ref, _) = login::login_or_signup(
@@ -303,6 +446,7 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs, no_fetch: bool) -> Re
 }
 
 fn check_commits_are_suitable_for_proposal(
+    cli: &Cli,
     first_commit_ahead: &[Sha1Hash],
     commits: &[Sha1Hash],
     behind: &[Sha1Hash],
@@ -310,37 +454,63 @@ fn check_commits_are_suitable_for_proposal(
     main_tip: &Sha1Hash,
 ) -> Result<()> {
     // check proposal ahead of origin/main
-    if first_commit_ahead.len().gt(&1) && !Interactor::default().confirm(
-            PromptConfirmParms::default()
-                .with_prompt(
-                    format!("proposal builds on a commit {} ahead of '{main_branch_name}' - do you want to continue?", first_commit_ahead.len() - 1)
-                )
-                .with_default(false)
-        ).context("failed to get confirmation response from interactor confirm")? {
-        bail!("aborting because selected commits were ahead of origin/master");
+    if first_commit_ahead.len().gt(&1) {
+        if cli.interactive {
+            if !Interactor::default().confirm(
+                PromptConfirmParms::default()
+                    .with_prompt(
+                        format!("proposal builds on a commit {} ahead of '{main_branch_name}' - do you want to continue?", first_commit_ahead.len() - 1)
+                    )
+                    .with_default(false)
+            ).context("failed to get confirmation response from interactor confirm")? {
+                bail!("aborting ...");
+            }
+        } else if !cli.force {
+            bail!(
+                "proposal builds on a commit {} ahead of '{}'. use --force to proceed",
+                first_commit_ahead.len() - 1,
+                main_branch_name
+            );
+        }
     }
 
     // check if a selected commit is already in origin
     if commits.iter().any(|c| c.eq(main_tip)) {
-        if !Interactor::default().confirm(
-            PromptConfirmParms::default()
-                .with_prompt(
-                    format!("proposal contains commit(s) already in  '{main_branch_name}'. proceed anyway?")
-                )
-                .with_default(false)
-        ).context("failed to get confirmation response from interactor confirm")? {
-            bail!("aborting as proposal contains commit(s) already in '{main_branch_name}'");
+        if cli.interactive {
+            if !Interactor::default().confirm(
+                PromptConfirmParms::default()
+                    .with_prompt(
+                        format!("proposal contains commit(s) already in  '{main_branch_name}'. proceed anyway?")
+                    )
+                    .with_default(false)
+            ).context("failed to get confirmation response from interactor confirm")? {
+                bail!("aborting ...");
+            }
+        } else if !cli.force {
+            bail!(
+                "proposal contains commit(s) already in '{main_branch_name}'. use --force to proceed"
+            );
         }
     }
     // check proposal isn't behind origin/main
-    else if !behind.is_empty() && !Interactor::default().confirm(
-            PromptConfirmParms::default()
-                .with_prompt(
-                    format!("proposal is {} behind '{main_branch_name}'. consider rebasing before submission. proceed anyway?", behind.len())
-                )
-                .with_default(false)
-        ).context("failed to get confirmation response from interactor confirm")? {
-        bail!("aborting so commits can be rebased");
+    else if !behind.is_empty() {
+        if cli.interactive {
+            if !Interactor::default().confirm(
+                PromptConfirmParms::default()
+                    .with_prompt(
+                        format!("proposal is {} behind '{main_branch_name}'. consider rebasing before submission. proceed anyway?", behind.len())
+                    )
+                    .with_default(false)
+            ).context("failed to get confirmation response from interactor confirm")? {
+                bail!("aborting so commits can be rebased");
+            }
+        } else if !cli.force {
+            bail!(
+                "proposal is {} behind '{}'. rebase first or use --force to proceed",
+                behind.len(),
+                main_branch_name
+            );
+        }
     }
     Ok(())
 }
diff --git a/tests/ngit_login.rs b/tests/ngit_login.rs
index 31c6edf..0d397ae 100644
--- a/tests/ngit_login.rs
+++ b/tests/ngit_login.rs
@@ -38,7 +38,7 @@ fn first_time_login_choices_succeeds_with_nsec(p: &mut CliTester, nsec: &str) ->
 
 fn standard_first_time_login_with_nsec() -> Result<CliTester> {
     let test_repo = GitTestRepo::default();
-    let mut p = CliTester::new_from_dir(&test_repo.dir, ["account", "login", "--offline"]);
+    let mut p = CliTester::new_from_dir(&test_repo.dir, ["-i", "account", "login", "--offline"]);
 
     first_time_login_choices_succeeds_with_nsec(&mut p, TEST_KEY_1_NSEC)?;
 
@@ -77,7 +77,8 @@ mod with_relays {
 
                     let cli_tester_handle = std::thread::spawn(move || -> Result<()> {
                         let test_repo = GitTestRepo::default();
-                        let mut p = CliTester::new_from_dir(&test_repo.dir, ["account", "login"]);
+                        let mut p =
+                            CliTester::new_from_dir(&test_repo.dir, ["-i", "account", "login"]);
 
                         first_time_login_choices_succeeds_with_nsec(&mut p, TEST_KEY_1_NSEC)?;
 
@@ -108,7 +109,8 @@ mod with_relays {
 
                     let cli_tester_handle = std::thread::spawn(move || -> Result<()> {
                         let test_repo = GitTestRepo::default();
-                        let mut p = CliTester::new_from_dir(&test_repo.dir, ["account", "login"]);
+                        let mut p =
+                            CliTester::new_from_dir(&test_repo.dir, ["-i", "account", "login"]);
 
                         first_time_login_choices_succeeds_with_nsec(&mut p, TEST_KEY_1_NSEC)?;
 
@@ -456,7 +458,8 @@ mod with_relays {
 
                     let cli_tester_handle = std::thread::spawn(move || -> Result<()> {
                         let test_repo = GitTestRepo::default();
-                        let mut p = CliTester::new_from_dir(&test_repo.dir, ["account", "login"]);
+                        let mut p =
+                            CliTester::new_from_dir(&test_repo.dir, ["-i", "account", "login"]);
 
                         first_time_login_choices_succeeds_with_nsec(&mut p, TEST_KEY_1_NSEC)?;
 
@@ -510,7 +513,8 @@ mod with_relays {
 
                     let cli_tester_handle = std::thread::spawn(move || -> Result<()> {
                         let test_repo = GitTestRepo::default();
-                        let mut p = CliTester::new_from_dir(&test_repo.dir, ["account", "login"]);
+                        let mut p =
+                            CliTester::new_from_dir(&test_repo.dir, ["-i", "account", "login"]);
 
                         first_time_login_choices_succeeds_with_nsec(&mut p, TEST_KEY_1_NSEC)?;
 
@@ -551,7 +555,7 @@ mod with_relays {
 
                 let cli_tester_handle = std::thread::spawn(move || -> Result<()> {
                     let test_repo = GitTestRepo::default();
-                    let mut p = CliTester::new_from_dir(&test_repo.dir, ["account", "login"]);
+                    let mut p = CliTester::new_from_dir(&test_repo.dir, ["-i", "account", "login"]);
 
                     first_time_login_choices_succeeds_with_nsec(&mut p, TEST_KEY_1_NSEC)?;
 
@@ -626,7 +630,8 @@ mod with_offline_flag {
         #[test]
         fn succeeds_with_text_logged_in_as_npub() -> Result<()> {
             let test_repo = GitTestRepo::default();
-            let mut p = CliTester::new_from_dir(&test_repo.dir, ["account", "login", "--offline"]);
+            let mut p =
+                CliTester::new_from_dir(&test_repo.dir, ["-i", "account", "login", "--offline"]);
 
             show_first_time_login_choices(&mut p)?.succeeds_with(0, false, Some(0))?;
 
@@ -641,7 +646,8 @@ mod with_offline_flag {
         #[test]
         fn succeeds_with_hex_secret_key_in_place_of_nsec() -> Result<()> {
             let test_repo = GitTestRepo::default();
-            let mut p = CliTester::new_from_dir(&test_repo.dir, ["account", "login", "--offline"]);
+            let mut p =
+                CliTester::new_from_dir(&test_repo.dir, ["-i", "account", "login", "--offline"]);
 
             show_first_time_login_choices(&mut p)?.succeeds_with(0, false, Some(0))?;
 
@@ -659,8 +665,10 @@ mod with_offline_flag {
             #[test]
             fn prompts_for_nsec_until_valid() -> Result<()> {
                 let test_repo = GitTestRepo::default();
-                let mut p =
-                    CliTester::new_from_dir(&test_repo.dir, ["account", "login", "--offline"]);
+                let mut p = CliTester::new_from_dir(
+                    &test_repo.dir,
+                    ["-i", "account", "login", "--offline"],
+                );
 
                 show_first_time_login_choices(&mut p)?.succeeds_with(0, false, Some(0))?;
 
diff --git a/tests/ngit_send.rs b/tests/ngit_send.rs
index 2ae858a..7946aef 100644
--- a/tests/ngit_send.rs
+++ b/tests/ngit_send.rs
@@ -75,7 +75,7 @@ mod when_commits_behind_ask_to_proceed {
         let mut r51 = create_relay_51()?;
         // // check relay had the right number of events
         let cli_tester_handle = std::thread::spawn(move || -> Result<()> {
-            let mut p = CliTester::new_from_dir(&test_repo.dir, ["send", "HEAD~2"]);
+            let mut p = CliTester::new_from_dir(&test_repo.dir, ["-i", "send", "HEAD~2"]);
             expect_confirm_prompt(&mut p)?;
             p.exit()?;
             relay::shutdown_relay(8051)?;
@@ -94,7 +94,7 @@ mod when_commits_behind_ask_to_proceed {
         let test_repo = prep_test_repo()?;
         let mut r51 = create_relay_51()?;
         let cli_tester_handle = std::thread::spawn(move || -> Result<()> {
-            let mut p = CliTester::new_from_dir(&test_repo.dir, ["send", "HEAD~2"]);
+            let mut p = CliTester::new_from_dir(&test_repo.dir, ["-i", "send", "HEAD~2"]);
             expect_confirm_prompt(&mut p)?.succeeds_with(Some(false))?;
             p.expect_end_with("Error: aborting so commits can be rebased\r\n")?;
             relay::shutdown_relay(8051)?;
@@ -113,7 +113,7 @@ mod when_commits_behind_ask_to_proceed {
         let test_repo = prep_test_repo()?;
         let mut r51 = create_relay_51()?;
         let cli_tester_handle = std::thread::spawn(move || -> Result<()> {
-            let mut p = CliTester::new_from_dir(&test_repo.dir, ["send", "HEAD~2"]);
+            let mut p = CliTester::new_from_dir(&test_repo.dir, ["-i", "send", "HEAD~2"]);
             expect_confirm_prompt(&mut p)?.succeeds_with(Some(true))?;
             p.expect("? include cover letter")?;
             p.exit()?;
@@ -1235,6 +1235,7 @@ mod when_range_ommited_prompts_for_selection_defaulting_ahead_of_main {
 
     fn cli_tester_create_proposal(git_repo: &GitTestRepo) -> CliTester {
         let args = vec![
+            "-i",
             "--nsec",
             TEST_KEY_1_NSEC,
             "--password",
@@ -1943,3 +1944,144 @@ mod in_reply_to_mentions_npub_and_nprofile_which_get_mentioned_in_proposal_root
         Ok(())
     }
 }
+
+mod non_interactive_validation {
+    use super::*;
+
+    #[test]
+    fn bare_send_errors_with_helpful_message() -> Result<()> {
+        let test_repo = prep_git_repo()?;
+        let mut p = CliTester::new_from_dir(&test_repo.dir, ["send"]);
+        let output = p.expect_end_eventually()?;
+        assert!(output.contains("ngit send requires additional arguments"));
+        assert!(output.contains("<SINCE_OR_RANGE>"));
+        assert!(output.contains("--title"));
+        assert!(output.contains("--description"));
+        assert!(output.contains("--defaults"));
+        assert!(output.contains("--interactive"));
+        Ok(())
+    }
+
+    #[test]
+    fn send_with_range_only_errors() -> Result<()> {
+        let test_repo = prep_git_repo()?;
+        let mut p = CliTester::new_from_dir(&test_repo.dir, ["send", "HEAD~2"]);
+        let output = p.expect_end_eventually()?;
+        assert!(output.contains("ngit send requires additional arguments"));
+        assert!(output.contains("--title"));
+        assert!(output.contains("--description"));
+        assert!(output.contains("--defaults"));
+        Ok(())
+    }
+
+    #[test]
+    fn send_force_pr_without_title_errors() -> Result<()> {
+        let test_repo = prep_git_repo()?;
+        let mut p = CliTester::new_from_dir(&test_repo.dir, ["send", "--force-pr", "HEAD~2"]);
+        let output = p.expect_end_eventually()?;
+        assert!(output.contains("ngit send requires additional arguments"));
+        assert!(output.contains("--title"));
+        assert!(output.contains("--description"));
+        assert!(output.contains("--defaults"));
+        Ok(())
+    }
+
+    #[test]
+    fn send_description_without_title_errors() -> Result<()> {
+        let test_repo = prep_git_repo()?;
+        let mut p =
+            CliTester::new_from_dir(&test_repo.dir, ["send", "--description", "Y", "HEAD~2"]);
+        let output = p.expect_end_eventually()?;
+        assert!(output.contains("ngit send requires --title when --description is provided"));
+        assert!(output.contains("--title"));
+        Ok(())
+    }
+
+    #[test]
+    fn send_title_without_description_errors() -> Result<()> {
+        let test_repo = prep_git_repo()?;
+        let mut p = CliTester::new_from_dir(&test_repo.dir, ["send", "--title", "X", "HEAD~2"]);
+        let output = p.expect_end_eventually()?;
+        assert!(output.contains("ngit send requires --description when --title is provided"));
+        assert!(output.contains("--description"));
+        Ok(())
+    }
+
+    #[tokio::test]
+    #[serial]
+    async fn send_defaults_sends_patches_without_cover_letter() -> Result<()> {
+        let git_repo = prep_git_repo()?;
+
+        let (mut r51, mut r52, mut r53, mut r55, mut r56) = (
+            Relay::new(
+                8051,
+                None,
+                Some(&|relay, client_id, subscription_id, _| -> Result<()> {
+                    relay.respond_events(
+                        client_id,
+                        &subscription_id,
+                        &vec![
+                            generate_test_key_1_metadata_event("fred"),
+                            generate_test_key_1_relay_list_event(),
+                        ],
+                    )?;
+                    Ok(())
+                }),
+            ),
+            Relay::new(8052, None, None),
+            Relay::new(8053, None, None),
+            Relay::new(
+                8055,
+                None,
+                Some(&|relay, client_id, subscription_id, _| -> Result<()> {
+                    relay.respond_events(
+                        client_id,
+                        &subscription_id,
+                        &vec![generate_repo_ref_event()],
+                    )?;
+                    Ok(())
+                }),
+            ),
+            Relay::new(8056, None, None),
+        );
+
+        let cli_tester_handle = std::thread::spawn(move || -> Result<()> {
+            let mut p = CliTester::new_from_dir(
+                &git_repo.dir,
+                [
+                    "--nsec",
+                    TEST_KEY_1_NSEC,
+                    "--password",
+                    TEST_PASSWORD,
+                    "--disable-cli-spinners",
+                    "--defaults",
+                    "send",
+                ],
+            );
+            p.expect_end_eventually()?;
+            for p in [51, 52, 53, 55, 56] {
+                relay::shutdown_relay(8000 + p)?;
+            }
+            Ok(())
+        });
+
+        let _ = join!(
+            r51.listen_until_close(),
+            r52.listen_until_close(),
+            r53.listen_until_close(),
+            r55.listen_until_close(),
+            r56.listen_until_close(),
+        );
+        cli_tester_handle.join().unwrap()?;
+
+        // verify patches sent without cover letter
+        for relay in [&r53, &r55, &r56] {
+            assert_eq!(
+                relay.events.iter().filter(|e| is_cover_letter(e)).count(),
+                0,
+            );
+            assert_eq!(relay.events.iter().filter(|e| is_patch(e)).count(), 2);
+        }
+        Ok(())
+    }
+}