9 files changed, 597 insertions, 61 deletions

diff --git a/src/lib/cli_interactor.rs b/src/lib/cli_interactor.rs
index 8fca81d..e944bf9 100644
--- a/src/lib/cli_interactor.rs
+++ b/src/lib/cli_interactor.rs
@@ -1,5 +1,8 @@
 use anyhow::{Context, Result};
-use dialoguer::{Confirm, Input, Password, theme::ColorfulTheme};
+use dialoguer::{
+    Confirm, Input, Password,
+    theme::{ColorfulTheme, Theme},
+};
 use indicatif::TermLike;
 #[cfg(test)]
 use mockall::*;
@@ -236,6 +239,106 @@ impl PromptMultiChoiceParms {
     }
 }
 
+pub fn multi_select_with_custom_value<F>(
+    prompt: &str,
+    custom_choice_prompt: &str,
+    mut choices: Vec<String>,
+    mut defaults: Vec<bool>,
+    validate_choice: F,
+) -> Result<Vec<String>>
+where
+    F: Fn(&str) -> Result<String>,
+{
+    let mut selected_choices = vec![];
+
+    // Loop to allow users to add more choices
+    loop {
+        // Add 'add another' option at the end of the choices
+        let mut current_choices = choices.clone();
+        current_choices.push(if current_choices.is_empty() {
+            "add".to_string()
+        } else {
+            "add another".to_string()
+        });
+
+        // Create default selections based on the provided defaults
+        let mut current_defaults = defaults.clone();
+        current_defaults.push(current_choices.len() == 1); // 'add another' should not be selected by default
+
+        // Prompt for selections
+        let selected_indices: Vec<usize> = Interactor::default().multi_choice(
+            PromptMultiChoiceParms::default()
+                .with_prompt(prompt)
+                .dont_report()
+                .with_choices(current_choices.clone())
+                .with_defaults(current_defaults),
+        )?;
+
+        // Collect selected choices
+        selected_choices.clear(); // Clear previous selections to update
+        for &index in &selected_indices {
+            if index < choices.len() {
+                // Exclude 'add another' option
+                selected_choices.push(choices[index].clone());
+            }
+        }
+
+        // Check if 'add another' was selected
+        if selected_indices.contains(&(choices.len())) {
+            // Last index is 'add another'
+            let mut new_choice: String;
+            loop {
+                new_choice = Interactor::default().input(
+                    PromptInputParms::default()
+                        .with_prompt(custom_choice_prompt)
+                        .dont_report()
+                        .optional(),
+                )?;
+
+                if new_choice.is_empty() {
+                    break;
+                }
+                // Validate the new choice
+                match validate_choice(&new_choice) {
+                    Ok(valid_choice) => {
+                        new_choice = valid_choice; // Use the fixed version of the input
+                        break; // Valid choice, exit the loop
+                    }
+                    Err(err) => {
+                        // Inform the user about the validation error
+                        println!("Error: {err}");
+                    }
+                }
+            }
+
+            // Add the new choice to the choices vector
+            if !new_choice.is_empty() {
+                choices.push(new_choice.clone()); // Add new choice to the end of the list
+                selected_choices.push(new_choice); // Automatically select the new choice
+                defaults.push(true); // Set the new choice as selected by default
+            }
+        } else {
+            // Exit the loop if 'add another' was not selected
+            break;
+        }
+    }
+
+    Ok(selected_choices)
+}
+
+pub fn show_multi_input_prompt_success(label: &str, values: &[String]) {
+    let values_str: Vec<&str> = values.iter().map(std::string::String::as_str).collect();
+    eprintln!("{}", {
+        let mut s = String::new();
+        let _ = ColorfulTheme::default().format_multi_select_prompt_selection(
+            &mut s,
+            label,
+            &values_str,
+        );
+        s
+    });
+}
+
 #[derive(Debug, Default)]
 pub struct Printer {
     printed_lines: Vec<String>,
diff --git a/src/lib/client.rs b/src/lib/client.rs
index 3fcfba4..0984b19 100644
--- a/src/lib/client.rs
+++ b/src/lib/client.rs
@@ -53,7 +53,7 @@ use crate::{
     get_dirs,
     git::{Repo, RepoActions, get_git_config_item},
     git_events::{
-        KIND_PULL_REQUEST, KIND_PULL_REQUEST_UPDATE, event_is_cover_letter,
+        KIND_PULL_REQUEST, KIND_PULL_REQUEST_UPDATE, KIND_USER_GRASP_LIST, event_is_cover_letter,
         event_is_patch_set_root, event_is_revision_root, event_is_valid_pr_or_pr_update,
         status_kinds,
     },
@@ -241,7 +241,7 @@ impl Connect for Client {
         if let Some(git_repo_path) = git_repo_path {
             save_event_in_local_cache(git_repo_path, &event).await?;
         }
-        if event.kind.eq(&Kind::GitRepoAnnouncement) {
+        if [Kind::GitRepoAnnouncement, KIND_USER_GRASP_LIST].contains(&event.kind) {
             save_event_in_global_cache(git_repo_path, &event).await?;
         }
         Ok(event.id)
@@ -1308,17 +1308,21 @@ async fn create_relays_request(
                 user_profiles.insert(current_user);
             }
         }
-        let mut map: HashMap<PublicKey, (Timestamp, Timestamp)> = HashMap::new();
+        let mut map: HashMap<PublicKey, (Timestamp, Timestamp, Timestamp)> = HashMap::new();
         for public_key in &user_profiles {
             if let Ok(user_ref) = get_user_ref_from_cache(git_repo_path, public_key).await {
                 map.insert(
                     public_key.to_owned(),
-                    (user_ref.metadata.created_at, user_ref.relays.created_at),
+                    (
+                        user_ref.metadata.created_at,
+                        user_ref.relays.created_at,
+                        user_ref.grasp_list.created_at,
+                    ),
                 );
             } else {
                 map.insert(
                     public_key.to_owned(),
-                    (Timestamp::from(0), Timestamp::from(0)),
+                    (Timestamp::from(0), Timestamp::from(0), Timestamp::from(0)),
                 );
             }
         }
@@ -1545,16 +1549,22 @@ async fn process_fetched_events(
                 {
                     fresh_profiles.insert(event.pubkey);
                 }
-            } else if [Kind::RelayList, Kind::Metadata].contains(&event.kind) {
+            } else if [Kind::RelayList, Kind::Metadata, KIND_USER_GRASP_LIST].contains(&event.kind)
+            {
                 if request.missing_contributor_profiles.contains(&event.pubkey) {
                     report.contributor_profiles.insert(event.pubkey);
-                } else if let Some((_, (metadata_timestamp, relay_list_timestamp))) = request
+                } else if let Some((
+                    _,
+                    (metadata_timestamp, relay_list_timestamp, grasp_list_timestamp),
+                )) = request
                     .profiles_to_fetch_from_user_relays
                     .get_key_value(&event.pubkey)
                 {
                     if (Kind::Metadata.eq(&event.kind) && event.created_at.gt(metadata_timestamp))
                         || (Kind::RelayList.eq(&event.kind)
                             && event.created_at.gt(relay_list_timestamp))
+                        || (KIND_USER_GRASP_LIST.eq(&event.kind)
+                            && event.created_at.gt(grasp_list_timestamp))
                     {
                         report.profile_updates.insert(event.pubkey);
                     }
@@ -1716,35 +1726,21 @@ pub fn get_filter_repo_events(repo_coordinates: &HashSet<Nip19Coordinate>) -> no
                 .map(|c| c.identifier.clone())
                 .collect::<Vec<String>>(),
         )
-        .authors(
-            repo_coordinates
-                .iter()
-                .map(|c| c.public_key)
-                .collect::<Vec<PublicKey>>(),
-        )
 }
 
 pub static STATE_KIND: nostr::Kind = Kind::Custom(30618);
 pub fn get_filter_state_events(repo_coordinates: &HashSet<Nip19Coordinate>) -> nostr::Filter {
-    nostr::Filter::default()
-        .kind(STATE_KIND)
-        .identifiers(
-            repo_coordinates
-                .iter()
-                .map(|c| c.identifier.clone())
-                .collect::<Vec<String>>(),
-        )
-        .authors(
-            repo_coordinates
-                .iter()
-                .map(|c| c.public_key)
-                .collect::<Vec<PublicKey>>(),
-        )
+    nostr::Filter::default().kind(STATE_KIND).identifiers(
+        repo_coordinates
+            .iter()
+            .map(|c| c.identifier.clone())
+            .collect::<Vec<String>>(),
+    )
 }
 
 pub fn get_filter_contributor_profiles(contributors: HashSet<PublicKey>) -> nostr::Filter {
     nostr::Filter::default()
-        .kinds(vec![Kind::Metadata, Kind::RelayList])
+        .kinds(vec![Kind::Metadata, Kind::RelayList, KIND_USER_GRASP_LIST])
         .authors(contributors)
 }
 
@@ -1848,7 +1844,7 @@ pub struct FetchRequest {
     contributors: HashSet<PublicKey>,
     missing_contributor_profiles: HashSet<PublicKey>,
     existing_events: HashSet<EventId>,
-    profiles_to_fetch_from_user_relays: HashMap<PublicKey, (Timestamp, Timestamp)>,
+    profiles_to_fetch_from_user_relays: HashMap<PublicKey, (Timestamp, Timestamp, Timestamp)>,
     user_relays_for_profiles: HashSet<RelayUrl>,
 }
 
diff --git a/src/lib/git/mod.rs b/src/lib/git/mod.rs
index b275b49..3d5297f 100644
--- a/src/lib/git/mod.rs
+++ b/src/lib/git/mod.rs
@@ -75,6 +75,7 @@ pub trait RepoActions {
         commit: &Sha1Hash,
         series_count: &Option<(u64, u64)>,
     ) -> Result<String>;
+    fn are_commits_too_big_for_patches(&self, commits: &[Sha1Hash]) -> bool;
     fn extract_commit_pgp_signature(&self, commit: &Sha1Hash) -> Result<String>;
     fn checkout(&self, ref_name: &str) -> Result<Sha1Hash>;
     fn create_branch_at_commit(&self, branch_name: &str, commit: &str) -> Result<()>;
@@ -380,6 +381,19 @@ impl RepoActions for Repo {
             .to_owned())
     }
 
+    fn are_commits_too_big_for_patches(&self, commits: &[Sha1Hash]) -> bool {
+        commits.iter().any(|commit| {
+            if let Ok(patch) = self.make_patch_from_commit(commit, &None) {
+                patch.len()
+                    > ((65 // max recomended patch event size specified in nip34 in kb
+                // allownace for nostr event wrapper (id, pubkey, tags, sig)
+                - 1) * 1024)
+            } else {
+                true
+            }
+        })
+    }
+
     fn extract_commit_pgp_signature(&self, commit: &Sha1Hash) -> Result<String> {
         let oid = Oid::from_bytes(commit.as_byte_array()).context(format!(
             "failed to convert commit_id format for {}",
diff --git a/src/lib/git_events.rs b/src/lib/git_events.rs
index 8ba5419..5ea630a 100644
--- a/src/lib/git_events.rs
+++ b/src/lib/git_events.rs
@@ -63,6 +63,7 @@ pub fn status_kinds() -> Vec<Kind> {
 
 pub const KIND_PULL_REQUEST: Kind = Kind::Custom(1618);
 pub const KIND_PULL_REQUEST_UPDATE: Kind = Kind::Custom(1619);
+pub const KIND_USER_GRASP_LIST: Kind = Kind::Custom(10317);
 
 pub fn event_is_patch_set_root(event: &Event) -> bool {
     event.kind.eq(&Kind::GitPatch)
@@ -376,11 +377,13 @@ pub fn event_tag_from_nip19_or_hex(
     }
 }
 
+#[allow(clippy::too_many_arguments)]
 pub fn generate_unsigned_pr_or_update_event(
     git_repo: &Repo,
     repo_ref: &RepoRef,
     signing_public_key: &PublicKey,
     root_proposal: Option<&Event>,
+    title_description_overide: &Option<(String, String)>,
     commit: &Sha1Hash,
     clone_url_hint: &[&str],
     mentions: &[nostr::Tag],
@@ -395,13 +398,17 @@ pub fn generate_unsigned_pr_or_update_event(
         None
     };
 
-    let title = if let Some(cl) = &root_patch_cover_letter {
+    let title = if let Some((title, _)) = &title_description_overide {
+        title.clone()
+    } else if let Some(cl) = &root_patch_cover_letter {
         cl.title.clone()
     } else {
         git_repo.get_commit_message_summary(commit)?
     };
 
-    let description = if let Some(cl) = &root_patch_cover_letter {
+    let description = if let Some((_, description)) = &title_description_overide {
+        description.clone()
+    } else if let Some(cl) = &root_patch_cover_letter {
         cl.description.clone()
     } else {
         let mut description = git_repo.get_commit_message(commit)?.trim().to_string();
diff --git a/src/lib/list.rs b/src/lib/list.rs
index b940546..b867858 100644
--- a/src/lib/list.rs
+++ b/src/lib/list.rs
@@ -9,7 +9,7 @@ use crate::{
         Repo, RepoActions,
         nostr_url::{CloneUrl, NostrUrlDecoded, ServerProtocol},
     },
-    repo_ref::is_grasp_server,
+    repo_ref::is_grasp_server_in_list,
     utils::{Direction, get_read_protocols_to_try, join_with_and, set_protocol_preference},
 };
 
@@ -23,7 +23,7 @@ pub fn list_from_remotes(
     let mut remote_states = HashMap::new();
     let mut errors = HashMap::new();
     for url in git_servers {
-        let is_grasp_server = is_grasp_server(url, grasp_servers);
+        let is_grasp_server = is_grasp_server_in_list(url, grasp_servers);
         match list_from_remote(term, git_repo, url, decoded_nostr_url, is_grasp_server) {
             Err(error) => {
                 errors.insert(url, error);
diff --git a/src/lib/login/user.rs b/src/lib/login/user.rs
index 071cb25..0b702ef 100644
--- a/src/lib/login/user.rs
+++ b/src/lib/login/user.rs
@@ -1,7 +1,7 @@
-use std::{collections::HashSet, path::Path};
+use std::{collections::HashSet, path::Path, sync::Arc};
 
 use anyhow::{Context, Result, bail};
-use nostr::PublicKey;
+use nostr::{PublicKey, Url, event::Tag, signer::NostrSigner};
 use nostr_sdk::{Alphabet, JsonUtil, Kind, SingleLetterTag, Timestamp, ToBech32};
 use serde::{self, Deserialize, Serialize};
 
@@ -9,13 +9,17 @@ use serde::{self, Deserialize, Serialize};
 use crate::client::Client;
 #[cfg(test)]
 use crate::client::MockConnect;
-use crate::client::{Connect, get_event_from_global_cache};
+use crate::{
+    client::{Connect, get_event_from_global_cache, sign_event},
+    git_events::KIND_USER_GRASP_LIST,
+};
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq)]
 pub struct UserRef {
     pub public_key: PublicKey,
     pub metadata: UserMetadata,
     pub relays: UserRelays,
+    pub grasp_list: UserGraspList,
 }
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq)]
@@ -49,6 +53,35 @@ impl UserRelays {
 }
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq)]
+pub struct UserGraspList {
+    pub urls: Vec<Url>,
+    pub created_at: Timestamp,
+}
+
+impl UserGraspList {
+    pub async fn to_event(&mut self, signer: &Arc<dyn NostrSigner>) -> Result<nostr::Event> {
+        let event = sign_event(
+            nostr_sdk::EventBuilder::new(KIND_USER_GRASP_LIST, "").tags(
+                self.urls
+                    .iter()
+                    .map(|url| {
+                        Tag::custom(
+                            nostr::TagKind::Custom(std::borrow::Cow::Borrowed("g")),
+                            vec![url.to_string()],
+                        )
+                    })
+                    .collect::<Vec<_>>(),
+            ),
+            signer,
+            "user grasp list".to_string(),
+        )
+        .await?;
+        self.created_at = event.created_at;
+        Ok(event)
+    }
+}
+
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq)]
 pub struct UserRelayRef {
     pub url: String,
     pub read: bool,
@@ -84,6 +117,7 @@ pub async fn get_user_details(
             public_key: public_key.to_owned(),
             metadata: extract_user_metadata(public_key, &[])?,
             relays: extract_user_relays(public_key, &[]),
+            grasp_list: extract_user_grasp_list(public_key, &[]),
         };
         if cache_only {
             Ok(empty)
@@ -117,6 +151,9 @@ pub async fn get_user_ref_from_cache(
         nostr::Filter::default()
             .author(*public_key)
             .kind(Kind::RelayList),
+        nostr::Filter::default()
+            .author(*public_key)
+            .kind(KIND_USER_GRASP_LIST),
     ];
 
     let events = get_event_from_global_cache(git_repo_path, filters.clone()).await?;
@@ -128,6 +165,7 @@ pub async fn get_user_ref_from_cache(
         public_key: public_key.to_owned(),
         metadata: extract_user_metadata(public_key, &events)?,
         relays: extract_user_relays(public_key, &events),
+        grasp_list: extract_user_grasp_list(public_key, &events),
     })
 }
 
@@ -215,3 +253,36 @@ pub fn extract_user_relays(public_key: &nostr::PublicKey, events: &[nostr::Event
         },
     }
 }
+
+pub fn extract_user_grasp_list(
+    public_key: &nostr::PublicKey,
+    events: &[nostr::Event],
+) -> UserGraspList {
+    let event = events
+        .iter()
+        .filter(|e| e.kind.eq(&KIND_USER_GRASP_LIST) && e.pubkey.eq(public_key))
+        .max_by_key(|e| e.created_at);
+
+    UserGraspList {
+        urls: if let Some(event) = event {
+            event
+                .tags
+                .iter()
+                .filter_map(|t| {
+                    if t.as_slice().len() > 1 && t.as_slice()[0] == "g" {
+                        Url::parse(&t.as_slice()[1]).ok()
+                    } else {
+                        None
+                    }
+                })
+                .collect()
+        } else {
+            vec![]
+        },
+        created_at: if let Some(event) = event {
+            event.created_at
+        } else {
+            Timestamp::from(0)
+        },
+    }
+}
diff --git a/src/lib/push.rs b/src/lib/push.rs
index 0d0ec93..8cb0212 100644
--- a/src/lib/push.rs
+++ b/src/lib/push.rs
@@ -1,25 +1,38 @@
 use std::{
+    collections::{HashMap, HashSet},
     sync::{Arc, Mutex},
     time::Instant,
 };
 
-use anyhow::{Result, anyhow};
+use anyhow::{Context, Result, anyhow};
 use auth_git2::GitAuthenticator;
 use console::Term;
+use nostr::{
+    event::{Event, EventBuilder, Kind, Tag, TagStandard, UnsignedEvent},
+    hashes::sha1::Hash as Sha1Hash,
+    key::PublicKey,
+    nips::nip10::Marker,
+    signer::NostrSigner,
+};
 
 use crate::{
     cli_interactor::count_lines_per_msg_vec,
+    client::{sign_draft_event, sign_event},
     git::{
-        Repo,
+        Repo, RepoActions,
         nostr_url::{CloneUrl, NostrUrlDecoded},
         oid_to_shorthand_string,
     },
+    git_events::generate_unsigned_pr_or_update_event,
+    login::user::UserRef,
+    repo_ref::{RepoRef, is_grasp_server_clone_url, normalize_grasp_server_url},
     utils::{
         Direction, get_short_git_server_name, get_write_protocols_to_try, join_with_and,
         set_protocol_preference,
     },
 };
 
+// returns a HashMap of refs responded to and any related cancellation reasons
 pub fn push_to_remote(
     git_repo: &Repo,
     git_server_url: &str,
@@ -27,35 +40,65 @@ pub fn push_to_remote(
     remote_refspecs: &[String],
     term: &Term,
     is_grasp_server: bool,
-) -> Result<()> {
+) -> Result<HashMap<String, Option<String>>> {
     let server_url = git_server_url.parse::<CloneUrl>()?;
     let protocols_to_attempt =
         get_write_protocols_to_try(git_repo, &server_url, decoded_nostr_url, is_grasp_server);
 
     let mut failed_protocols = vec![];
     let mut success = false;
+    let mut ref_updates = HashMap::new();
 
     for protocol in &protocols_to_attempt {
         term.write_line(format!("push: {} over {protocol}...", server_url.short_name(),).as_str())?;
 
         let formatted_url = server_url.format_as(protocol, &decoded_nostr_url.user)?;
 
-        if let Err(error) = push_to_remote_url(git_repo, &formatted_url, remote_refspecs, term) {
-            term.write_line(
-                format!("push: {formatted_url} failed over {protocol}: {error}").as_str(),
-            )?;
-            failed_protocols.push(protocol);
-        } else {
-            success = true;
-            if !failed_protocols.is_empty() {
-                term.write_line(format!("push: succeeded over {protocol}").as_str())?;
-                let _ = set_protocol_preference(git_repo, protocol, &server_url, &Direction::Push);
+        match push_to_remote_url(git_repo, &formatted_url, remote_refspecs, term) {
+            Err(error) => {
+                term.write_line(
+                    format!("push: {formatted_url} failed over {protocol}: {error}").as_str(),
+                )?;
+                failed_protocols.push(protocol);
+            }
+            Ok(ref_updates_on_protocol) => {
+                success = true;
+                if ref_updates_on_protocol
+                    .values()
+                    .all(|error| error.is_none())
+                {
+                    if !failed_protocols.is_empty() {
+                        term.write_line(format!("push: succeeded over {protocol}").as_str())?;
+                        let _ = set_protocol_preference(
+                            git_repo,
+                            protocol,
+                            &server_url,
+                            &Direction::Push,
+                        );
+                    }
+                    break;
+                } else {
+                    term.write_line(
+                        format!(
+                            "push: {formatted_url} with {protocol} complete but {}ref{} not accepted:", 
+                            if remote_refspecs.len() != failed_protocols.len() { "some " } else {""},
+                            if remote_refspecs.len() == 1 { "s"} else {""},
+                        ).as_str(),
+                    )?;
+                    for (git_ref, error) in &ref_updates_on_protocol {
+                        if let Some(error) = error {
+                            term.write_line(format!("push:    - {git_ref}: {error}").as_str())?;
+                        }
+                    }
+                    // TODO do we want to report on the refs that weren't responded to?
+                    ref_updates = ref_updates_on_protocol;
+                }
+                break;
             }
-            break;
         }
     }
     if success {
-        Ok(())
+        Ok(ref_updates)
     } else {
         let error = anyhow!(
             "{} failed over {}{}",
@@ -72,12 +115,13 @@ pub fn push_to_remote(
     }
 }
 
+// returns HashMaps of refspecs responded to and any failure message
 pub fn push_to_remote_url(
     git_repo: &Repo,
     git_server_url: &str,
     remote_refspecs: &[String],
     term: &Term,
-) -> Result<()> {
+) -> Result<HashMap<String, Option<String>>> {
     let git_config = git_repo.git_repo.config()?;
     let mut git_server_remote = git_repo.git_repo.remote_anonymous(git_server_url)?;
     let auth = GitAuthenticator::default();
@@ -91,6 +135,9 @@ pub fn push_to_remote_url(
         let push_reporter = Arc::clone(&push_reporter);
         move |name, error| {
             let mut reporter = push_reporter.lock().unwrap();
+            reporter
+                .ref_updates
+                .insert(name.to_string(), error.map(|s| s.to_string()));
             if let Some(error) = error {
                 let existing_lines = reporter.count_all_existing_lines();
                 reporter.update_reference_errors.push(format!(
@@ -115,7 +162,11 @@ pub fn push_to_remote_url(
                     .unwrap_or("")
                     .replace("refs/heads/", "")
                     .replace("refs/tags/", "tags/");
-                let msg = if update.dst().is_zero() {
+                let msg = if let Some(Some(_)) =
+                    reporter.ref_updates.get(update.dst_refname().unwrap_or(""))
+                {
+                    format!("push: - [failed]          {dst_refname}")
+                } else if update.dst().is_zero() {
                     format!("push: - [delete]          {dst_refname}")
                 } else if update.src().is_zero() {
                     if update.dst_refname().unwrap_or("").contains("refs/tags") {
@@ -174,7 +225,8 @@ pub fn push_to_remote_url(
     push_options.remote_callbacks(remote_callbacks);
     git_server_remote.push(remote_refspecs, Some(&mut push_options))?;
     let _ = git_server_remote.disconnect();
-    Ok(())
+    let reporter = push_reporter.lock().unwrap();
+    Ok(reporter.ref_updates.clone())
 }
 
 #[allow(clippy::cast_precision_loss)]
@@ -223,6 +275,7 @@ pub struct PushReporter<'a> {
     negotiation: Vec<String>,
     transfer_progress_msgs: Vec<String>,
     update_reference_errors: Vec<String>,
+    ref_updates: HashMap<String, Option<String>>,
     term: &'a console::Term,
     start_time: Option<Instant>,
     end_time: Option<Instant>,
@@ -234,6 +287,7 @@ impl<'a> PushReporter<'a> {
             negotiation: vec![],
             transfer_progress_msgs: vec![],
             update_reference_errors: vec![],
+            ref_updates: HashMap::new(),
             term,
             start_time: None,
             end_time: None,
@@ -308,3 +362,183 @@ impl<'a> PushReporter<'a> {
         }
     }
 }
+
+#[allow(clippy::too_many_arguments)]
+pub async fn push_refs_and_generate_pr_or_pr_update_event(
+    git_repo: &Repo,
+    repo_ref: &RepoRef,
+    tip: &Sha1Hash,
+    user_ref: &UserRef,
+    root_proposal: Option<&Event>,
+    title_description_overide: &Option<(String, String)>,
+    servers: &[String],
+    git_ref: Option<String>,
+    signer: &Arc<dyn NostrSigner>,
+    term: &Term,
+) -> Result<(Option<Vec<Event>>, Vec<(String, Result<()>)>)> {
+    let mut responses: Vec<(String, Result<()>)> = vec![];
+
+    let mut unsigned_pr_event: Option<UnsignedEvent> = None;
+    for clone_url in servers {
+        let mut draft_pr_event = if let Some(ref unsigned_pr_event) = unsigned_pr_event {
+            unsigned_pr_event.clone()
+        } else {
+            generate_unsigned_pr_or_update_event(
+                git_repo,
+                repo_ref,
+                &user_ref.public_key,
+                root_proposal,
+                title_description_overide,
+                tip,
+                &[clone_url],
+                &[],
+            )?
+        };
+
+        let git_ref_used = git_ref
+            .clone()
+            .unwrap_or("refs/nostr/<event-id>".to_string())
+            .replace("<event-id>", &draft_pr_event.id().to_string());
+
+        let refspec = format!("{tip}:{git_ref_used}");
+
+        let res = if is_grasp_server_clone_url(clone_url) {
+            push_to_remote_url(git_repo, clone_url, &[refspec], term)
+        } else {
+            // anticipated only when pushing to user's own repo or a personal-fork with
+            // non-grasp git servers. this is used to extract prefered protocols / ssh
+            // details from nostr url
+            let decoded_nostr_url = {
+                if let Ok(Some((_, decoded_nostr_url))) = git_repo
+                .get_first_nostr_remote_when_in_ngit_binary()
+                .await.context("failed to list git remotes")
+                .context("no `nostr://` remote detected. `ngit sync` must be run from a repo with a nostr remote") {
+                    decoded_nostr_url
+                } else {
+                    repo_ref.to_nostr_git_url(&Some(git_repo))
+                }
+            };
+            push_to_remote(
+                git_repo,
+                clone_url,
+                &decoded_nostr_url,
+                &[refspec],
+                term,
+                false,
+            )
+        };
+
+        match res {
+            Err(error) => {
+                let normalized_url = normalize_grasp_server_url(clone_url)?;
+                term.write_line(&format!(
+                    "push: error sending commit data to {normalized_url}: {error}"
+                ))?;
+                responses.push((clone_url.clone(), Err(anyhow!(error))));
+            }
+            Ok(ref_updates) => {
+                let normalized_url = normalize_grasp_server_url(clone_url)?;
+                if let Some((_, Some(error))) = ref_updates.iter().next() {
+                    term.write_line(&format!(
+                        "push: error sending commit data to {normalized_url}: {error}"
+                    ))?;
+                    responses.push((clone_url.clone(), Err(anyhow!(error.clone()))));
+                } else {
+                    responses.push((clone_url.clone(), Ok(())));
+                    term.write_line(&format!("push: commit data sent to {normalized_url}"))?;
+                    unsigned_pr_event = Some(draft_pr_event);
+                }
+            }
+        }
+    }
+    if let Some(unsigned_pr_event) = unsigned_pr_event {
+        let pr_event = sign_draft_event(
+            unsigned_pr_event,
+            signer,
+            if root_proposal.is_some_and(|proposal| proposal.kind.eq(&Kind::GitPatch)) {
+                "Pull Request Replacing Original Patch"
+            } else if root_proposal.is_some() {
+                "Pull Request Update"
+            } else {
+                "Pull Request"
+            }
+            .to_string(),
+        )
+        .await?;
+        if root_proposal.is_some_and(|proposal| proposal.kind.eq(&Kind::GitPatch)) {
+            Ok((
+                Some(vec![
+                    pr_event,
+                    create_close_status_for_original_patch(
+                        signer,
+                        repo_ref,
+                        root_proposal.unwrap(),
+                    )
+                    .await?,
+                ]),
+                responses,
+            ))
+        } else {
+            Ok((Some(vec![pr_event]), responses))
+        }
+    } else {
+        Ok((None, responses))
+    }
+}
+
+async fn create_close_status_for_original_patch(
+    signer: &Arc<dyn NostrSigner>,
+    repo_ref: &RepoRef,
+    proposal: &Event,
+) -> Result<Event> {
+    let mut public_keys = repo_ref
+        .maintainers
+        .iter()
+        .copied()
+        .collect::<HashSet<PublicKey>>();
+    public_keys.insert(proposal.pubkey);
+
+    sign_event(
+        EventBuilder::new(nostr::event::Kind::GitStatusClosed, String::new()).tags(
+            [
+                vec![
+                    Tag::custom(
+                        nostr::TagKind::Custom(std::borrow::Cow::Borrowed("alt")),
+                        vec![
+                            "Git patch closed as forthcoming update is too large. Replacing with Pull Request"
+                                .to_string(),
+                        ],
+                    ),
+                    Tag::from_standardized(nostr::TagStandard::Event {
+                        event_id: proposal.id,
+                        relay_url: repo_ref.relays.first().cloned(),
+                        marker: Some(Marker::Root),
+                        public_key: None,
+                        uppercase: false,
+                    }),
+                ],
+                public_keys.iter().map(|pk| Tag::public_key(*pk)).collect(),
+                repo_ref
+                    .coordinates()
+                    .iter()
+                    .map(|c| {
+                        Tag::from_standardized(TagStandard::Coordinate {
+                            coordinate: c.coordinate.clone(),
+                            relay_url: c.relays.first().cloned(),
+                            uppercase: false,
+                        })
+                    })
+                    .collect::<Vec<Tag>>(),
+                vec![
+                    Tag::from_standardized(nostr::TagStandard::Reference(
+                        repo_ref.root_commit.to_string(),
+                    )),
+                ],
+            ]
+            .concat(),
+        ),
+        signer,
+        "close status for original patch".to_string(),
+    )
+    .await
+}
diff --git a/src/lib/repo_ref.rs b/src/lib/repo_ref.rs
index bca4a3b..b2bd381 100644
--- a/src/lib/repo_ref.rs
+++ b/src/lib/repo_ref.rs
@@ -40,6 +40,7 @@ pub struct RepoRef {
     pub web: Vec<String>,
     pub relays: Vec<RelayUrl>,
     pub blossoms: Vec<Url>,
+    pub hashtags: Vec<String>,
     pub maintainers: Vec<PublicKey>,
     pub trusted_maintainer: PublicKey,
     // set to None if not known
@@ -71,6 +72,7 @@ impl TryFrom<(nostr::Event, Option<PublicKey>)> for RepoRef {
             web: Vec::new(),
             relays: Vec::new(),
             blossoms: Vec::new(),
+            hashtags: Vec::new(),
             maintainers: Vec::new(),
             trusted_maintainer: trusted_maintainer.unwrap_or(event.pubkey),
             maintainers_without_annoucnement: None,
@@ -118,6 +120,7 @@ impl TryFrom<(nostr::Event, Option<PublicKey>)> for RepoRef {
                         }
                     }
                 }
+                [t, hashtag, ..] if t == "t" => r.hashtags.push(hashtag.clone()),
                 [t, blossoms @ ..] if t == "blossoms" => {
                     for b in blossoms {
                         if let Ok(b) = Url::parse(b) {
@@ -217,6 +220,15 @@ impl RepoRef {
                             vec![format!("git repository: {}", self.name.clone())],
                         ),
                     ],
+                    self.hashtags
+                        .iter()
+                        .map(|h| {
+                            Tag::custom(
+                                nostr::TagKind::Custom(std::borrow::Cow::Borrowed("t")),
+                                vec![h.clone()],
+                            )
+                        })
+                        .collect(),
                     if self.blossoms.is_empty() {
                         vec![]
                     } else {
@@ -311,6 +323,29 @@ impl RepoRef {
     pub fn grasp_servers(&self) -> Vec<String> {
         detect_existing_grasp_servers(Some(self), &[], &[], &self.identifier)
     }
+
+    // returns false if already present so didn't need adding
+    pub fn add_grasp_server(&mut self, clone_url: &str) -> Result<bool> {
+        if !is_grasp_server_clone_url(clone_url) {
+            bail!("invalid grasp server clone url. does not end with .git");
+        }
+
+        let relay_url = RelayUrl::parse(
+            &format_grasp_server_url_as_relay_url(clone_url)
+                .context("invalid grasp server clone url")?,
+        )
+        .context("invalid grasp server clone url")?;
+
+        if !self.relays.contains(&relay_url) {
+            self.relays.push(relay_url);
+        }
+        if !self.git_server.contains(&clone_url.to_string()) {
+            self.git_server.push(clone_url.to_string());
+            Ok(true)
+        } else {
+            Ok(false)
+        }
+    }
 }
 
 pub async fn get_repo_coordinates_when_remote_unknown(
@@ -448,7 +483,7 @@ async fn get_repo_coordinate_from_user_prompt(
     println!(
         "{}",
         dim.apply_to(
-            "hint: https://gitworkshop.dev/repos lists repositories and their nostr address"
+            "hint: https://gitworkshop.dev/search lists repositories and their nostr address"
         ),
     );
     let git_repo_path = git_repo.get_path()?;
@@ -699,13 +734,54 @@ pub fn extract_npub(s: &str) -> Result<&str> {
     }
 }
 
-pub fn is_grasp_server(url: &str, grasp_servers: &[String]) -> bool {
+pub fn is_grasp_server_in_list(url: &str, grasp_servers: &[String]) -> bool {
     if !grasp_servers.is_empty() {
-        if let Ok(n) = normalize_grasp_server_url(url) {
-            return grasp_servers.contains(&n);
+        if let Ok(url) = normalize_grasp_server_url(url) {
+            grasp_servers.iter().any(|s| {
+                if let Ok(s) = normalize_grasp_server_url(s) {
+                    s == url
+                } else {
+                    false
+                }
+            })
+        } else {
+            false
         }
+    } else {
+        false
+    }
+}
+
+pub fn is_grasp_server_clone_url(url: &str) -> bool {
+    extract_npub(url).is_ok()
+        && (url.ends_with(".git") || url.ends_with(".git/"))
+        && url.starts_with("http")
+}
+
+pub fn format_grasp_server_url_as_relay_url(url: &str) -> Result<String> {
+    let grasp_server_url = normalize_grasp_server_url(url)?;
+    if grasp_server_url.contains("http://") {
+        return Ok(grasp_server_url.replace("http://", "ws://"));
     }
-    false
+    Ok(format!("wss://{grasp_server_url}"))
+}
+
+pub fn format_grasp_server_url_as_clone_url(
+    grasp_server: &str,
+    public_key: &PublicKey,
+    identifier: &str,
+) -> Result<String> {
+    let grasp_server_url = normalize_grasp_server_url(grasp_server)?;
+
+    let prefix = if grasp_server_url.contains("http://") {
+        ""
+    } else {
+        "https://"
+    };
+    Ok(format!(
+        "{prefix}{grasp_server_url}/{}/{identifier}.git",
+        public_key.to_bech32()?
+    ))
 }
 
 #[cfg(test)]
@@ -730,6 +806,7 @@ mod tests {
                 RelayUrl::parse("ws://relay2.io").unwrap(),
             ],
             blossoms: vec![],
+            hashtags: vec![],
             trusted_maintainer: TEST_KEY_1_KEYS.public_key(),
             maintainers_without_annoucnement: None,
             maintainers: vec![TEST_KEY_1_KEYS.public_key(), TEST_KEY_2_KEYS.public_key()],
diff --git a/src/lib/utils.rs b/src/lib/utils.rs
index 431757f..431a14f 100644
--- a/src/lib/utils.rs
+++ b/src/lib/utils.rs
@@ -3,11 +3,13 @@ use std::{
     collections::HashMap,
     fmt,
     io::{self, Stdin},
+    path::Path,
     str::FromStr,
 };
 
 use anyhow::{Context, Result, bail};
 use git2::Repository;
+use nostr::nips::nip19::ToBech32;
 use nostr_sdk::{Event, EventId, Kind, PublicKey, Url};
 
 use crate::{
@@ -20,7 +22,8 @@ use crate::{
         nostr_url::{CloneUrl, NostrUrlDecoded, ServerProtocol},
     },
     git_events::{
-        event_is_revision_root, get_pr_tip_event_or_most_recent_patch_with_ancestors, get_status,
+        KIND_PULL_REQUEST, KIND_PULL_REQUEST_UPDATE, event_is_revision_root,
+        get_pr_tip_event_or_most_recent_patch_with_ancestors, get_status,
         is_event_proposal_root_for_branch, status_kinds,
     },
     repo_ref::RepoRef,
@@ -187,6 +190,37 @@ pub async fn get_all_proposals(
     Ok(all_proposals)
 }
 
+pub async fn proposal_tip_is_pr_or_pr_update(
+    git_repo_path: &Path,
+    repo_ref: &RepoRef,
+    proposal_id: &EventId,
+) -> Result<bool> {
+    let commits_events =
+        get_all_proposal_patch_pr_pr_update_events_from_cache(git_repo_path, repo_ref, proposal_id)
+            .await
+            .context(format!(
+                "cannot get existing proposal events for {}",
+                proposal_id.to_bech32()?
+            ))?;
+    let most_recent_proposal_patch_chain = get_pr_tip_event_or_most_recent_patch_with_ancestors(
+        commits_events.clone(),
+    )
+    .context(format!(
+        "cannot find tip from proposal events for {}",
+        proposal_id.to_bech32()?,
+    ))?;
+
+    Ok([KIND_PULL_REQUEST, KIND_PULL_REQUEST_UPDATE].contains(
+        &most_recent_proposal_patch_chain
+            .first()
+            .context(format!(
+                "cannot find any proposal events for {}",
+                proposal_id.to_bech32()?
+            ))?
+            .kind,
+    ))
+}
+
 pub fn find_proposal_and_patches_by_branch_name<'a>(
     refstr: &'a str,
     proposals: &'a HashMap<EventId, (Event, Vec<Event>)>,