4 files changed, 36 insertions, 7 deletions

diff --git a/src/lib/accept_maintainership.rs b/src/lib/accept_maintainership.rs
index 086b858..3375ca3 100644
--- a/src/lib/accept_maintainership.rs
+++ b/src/lib/accept_maintainership.rs
@@ -149,7 +149,7 @@ pub async fn accept_maintainership_with_defaults(
 
     client.set_signer(signer.clone()).await;
 
-    send_events(
+    let _ = send_events(
         client,
         Some(git_repo.get_path()?),
         vec![repo_event],
diff --git a/src/lib/client.rs b/src/lib/client.rs
index 2a4e081..c5c38cf 100644
--- a/src/lib/client.rs
+++ b/src/lib/client.rs
@@ -2447,7 +2447,7 @@ pub async fn send_events(
     repo_read_relays: Vec<RelayUrl>,
     animate: bool,
     silent: bool,
-) -> Result<()> {
+) -> Result<Vec<(String, bool)>> {
     // Only include default relays as fallback when there are no repo relays
     // (bootstrapping case, e.g. new account signup). When repo relays exist,
     // trust the repo and user relay configuration.
@@ -2614,7 +2614,7 @@ pub async fn send_events(
     })?;
 
     #[allow(clippy::borrow_deref_ref)]
-    join_all(relays.iter().map(|&relay| {
+    let relay_results: Vec<(String, bool)> = join_all(relays.iter().map(|&relay| {
         let reveal_state_clone = reveal_state.clone();
         let my_write_relays = my_write_relays.clone();
         let repo_read_relays = repo_read_relays.clone();
@@ -2691,6 +2691,7 @@ pub async fn send_events(
                 pb.set_style(pb_after_style_succeeded.clone());
                 finish_bar(&pb, String::new(), &reveal_state_clone);
             }
+            (relay_clean.to_string(), !failed)
         }
     }))
     .await;
@@ -2700,12 +2701,40 @@ pub async fn send_events(
     if let Some(handle) = timer_handle {
         handle.abort();
     }
+
+    let succeeded_count = relay_results.iter().filter(|(_, ok)| *ok).count();
+    let total_count = relay_results.len();
+    let failed_relays: Vec<&str> = relay_results
+        .iter()
+        .filter(|(_, ok)| !*ok)
+        .map(|(url, _)| {
+            url.strip_prefix("wss://")
+                .or_else(|| url.strip_prefix("ws://"))
+                .unwrap_or(url)
+                .trim_end_matches('/')
+        })
+        .collect();
+
+    let finish_message = if succeeded_count == total_count {
+        format!("Published {events_description} to {total_count} relays")
+    } else if succeeded_count > 0 {
+        format!(
+            "Published {events_description} to {succeeded_count}/{total_count} relays (failed: {})",
+            failed_relays.join(" ")
+        )
+    } else {
+        format!(
+            "failed to publish {events_description} to any relay (failed: {})",
+            failed_relays.join(" ")
+        )
+    };
+
     if let Some((_, spinner)) = &spinner_multi {
         spinner.set_style(ProgressStyle::with_template("{msg}").unwrap());
-        spinner.finish_with_message(format!("Published {events_description} to nostr relays"));
+        spinner.finish_with_message(finish_message);
     }
 
-    Ok(())
+    Ok(relay_results)
 }
 
 /// Builds a human-readable description of what is being published, e.g.
diff --git a/src/lib/login/fresh.rs b/src/lib/login/fresh.rs
index 2f6becf..e81b74a 100644
--- a/src/lib/login/fresh.rs
+++ b/src/lib/login/fresh.rs
@@ -810,7 +810,7 @@ pub async fn signup_non_interactive(
         save_event_in_global_cache(git_repo_path, &relay_list).await?;
 
         if publish {
-            send_events(
+            let _ = send_events(
                 client,
                 git_repo_path,
                 vec![profile, relay_list],
diff --git a/src/lib/push.rs b/src/lib/push.rs
index 5544066..7374fb0 100644
--- a/src/lib/push.rs
+++ b/src/lib/push.rs
@@ -665,7 +665,7 @@ pub async fn select_servers_push_refs_and_generate_pr_or_pr_update_event(
         };
         // pubish event to my-relays and my-fork-relays
         new_grasp_server_events.push(updated_user_repo_ref.to_event(signer).await?);
-        send_events(
+        let _ = send_events(
             client,
             Some(git_repo_path),
             new_grasp_server_events,