2 files changed, 36 insertions, 2 deletions

diff --git a/src/bin/git_remote_nostr/push.rs b/src/bin/git_remote_nostr/push.rs
index 870f22d..ed0f7df 100644
--- a/src/bin/git_remote_nostr/push.rs
+++ b/src/bin/git_remote_nostr/push.rs
@@ -925,6 +925,37 @@ fn generate_updated_state(
 ) -> Result<HashMap<String, String>> {
     let mut new_state = existing_state.clone();
 
+    // Backfill missing ^{} peeled refs for any annotated tags already in the
+    // state.  State events published before this fix only stored the tag object
+    // OID; without the corresponding ^{} entry git cannot resolve the tag to a
+    // commit and treats it as missing (git fetch --prune deletes it).  We fix
+    // this opportunistically on every push so affected repos self-heal without
+    // requiring manual intervention.
+    let tag_refs: Vec<(String, String)> = new_state
+        .iter()
+        .filter(|(k, _)| k.starts_with("refs/tags/") && !k.ends_with("^{}"))
+        .map(|(k, v)| (k.clone(), v.clone()))
+        .collect();
+    for (ref_name, tag_oid) in tag_refs {
+        let peeled_key = format!("{ref_name}^{{}}");
+        if new_state.contains_key(&peeled_key) {
+            continue;
+        }
+        // check if the stored OID is a tag object (annotated tag)
+        if let Ok(oid) = git2::Oid::from_str(&tag_oid) {
+            if git_repo
+                .git_repo
+                .find_object(oid, Some(git2::ObjectType::Tag))
+                .is_ok()
+            {
+                // peel to the commit the annotated tag points to
+                if let Ok(commit_oid) = git_repo.get_commit_or_tip_of_reference(&ref_name) {
+                    new_state.insert(peeled_key, commit_oid.to_string());
+                }
+            }
+        }
+    }
+
     for refspec in refspecs {
         let (from, to) = refspec_to_from_to(refspec)?;
         if from.is_empty() {
diff --git a/src/lib/repo_state.rs b/src/lib/repo_state.rs
index 345f05c..223fe56 100644
--- a/src/lib/repo_state.rs
+++ b/src/lib/repo_state.rs
@@ -22,11 +22,14 @@ impl RepoState {
         let mut state = HashMap::new();
         for tag in event.tags.iter() {
             if let Some(name) = tag.as_slice().first() {
+                // include ^{} peeled refs for annotated tags: git requires
+                // both "<tag-oid> refs/tags/v1.0.0" and
+                // "<commit-oid> refs/tags/v1.0.0^{}" in the list output so
+                // it can resolve the tag to a commit. without the ^{} line
+                // git fetch --prune deletes the tag as unresolvable.
                 if ["refs/heads/", "refs/tags", "HEAD"]
                     .iter()
                     .any(|s| name.starts_with(*s))
-                    // dont include dereferenced tags
-                    && !name.ends_with("^{}")
                 {
                     if let Some(value) = tag.as_slice().get(1) {
                         if Oid::from_str(value).is_ok() || value.contains("ref: refs/") {