5 files changed, 147 insertions, 3 deletions

diff --git a/src/main.rs b/src/main.rs
index ab6ede7..ebe05a3 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -132,6 +132,13 @@ async fn main() -> Result<()> {
         // Get a reference to the rejected events index for shutdown persistence
         let shutdown_rejected_index = sync_manager.rejected_events_index();
 
+        // Wire repo_sync_index into write policy so user-submitted purgatory announcements
+        // get registered for state event sync immediately (Fix 3).
+        let repo_sync_index = sync_manager.repo_sync_index();
+        relay_with_db
+            .write_policy
+            .set_repo_sync_index(repo_sync_index);
+
         tokio::spawn(async move {
             sync_manager.run().await;
         });
diff --git a/src/nostr/builder.rs b/src/nostr/builder.rs
index aff12a6..8d1e461 100644
--- a/src/nostr/builder.rs
+++ b/src/nostr/builder.rs
@@ -17,6 +17,7 @@ use crate::nostr::policy::{
     AnnouncementPolicy, AnnouncementResult, PolicyContext, PrEventPolicy, ReferenceResult,
     RelatedEventPolicy, StatePolicy, StateResult,
 };
+use crate::sync::{RepoSyncIndex, RepoSyncNeeds, SyncLevel};
 
 /// Type alias for the shared database used by the relay
 pub type SharedDatabase = Arc<dyn NostrDatabase>;
@@ -98,6 +99,14 @@ impl Nip34WritePolicy {
         self.ctx.set_local_relay(relay);
     }
 
+    /// Set the repo sync index so that user-submitted purgatory announcements can
+    /// be registered for state event sync immediately.
+    ///
+    /// This must be called after SyncManager is created.
+    pub fn set_repo_sync_index(&self, index: RepoSyncIndex) {
+        self.ctx.set_repo_sync_index(index);
+    }
+
     /// Handle repository announcement event
     async fn handle_announcement(&self, event: &Event) -> WritePolicyResult {
         let event_id_str = event.id.to_bech32().unwrap_or_else(|_| event.id.to_hex());
@@ -146,6 +155,51 @@ impl Nip34WritePolicy {
                             "Accepted announcement to purgatory: {} (waiting for git data)",
                             event_id_str
                         );
+
+                        // Register repo in repo_sync_index with StateOnly level so that
+                        // state event sync starts promptly via the next batch EOSE recompute.
+                        // This handles user-submitted purgatory announcements - the SelfSubscriber
+                        // only sees DB events, so it won't pick these up automatically.
+                        if let Some(repo_sync_index) = self.ctx.get_repo_sync_index() {
+                            if let Ok(announcement) =
+                                RepositoryAnnouncement::from_event(event.clone())
+                            {
+                                use std::collections::HashSet;
+                                let repo_id = format!(
+                                    "30617:{}:{}",
+                                    event.pubkey,
+                                    announcement.identifier
+                                );
+
+                                // Extract relay URLs from the announcement event tags
+                                let relays: HashSet<String> = event
+                                    .tags
+                                    .iter()
+                                    .flat_map(|tag| {
+                                        let tag_vec = tag.as_slice();
+                                        if !tag_vec.is_empty() && tag_vec[0] == "relays" {
+                                            tag_vec[1..].iter().map(|s| s.to_string()).collect::<Vec<_>>()
+                                        } else {
+                                            vec![]
+                                        }
+                                    })
+                                    .collect();
+
+                                let mut index = repo_sync_index.write().await;
+                                index.entry(repo_id.clone()).or_insert_with(|| RepoSyncNeeds {
+                                    relays,
+                                    root_events: HashSet::new(),
+                                    sync_level: SyncLevel::StateOnly,
+                                });
+                                drop(index);
+
+                                tracing::debug!(
+                                    repo_id = %repo_id,
+                                    "Registered purgatory announcement in repo_sync_index as StateOnly"
+                                );
+                            }
+                        }
+
                         WritePolicyResult::Reject {
                             status: true, // Client sees OK
                             message: "purgatory: won't be served until git data arrives".into(),
diff --git a/src/nostr/policy/mod.rs b/src/nostr/policy/mod.rs
index 1566b6c..c958586 100644
--- a/src/nostr/policy/mod.rs
+++ b/src/nostr/policy/mod.rs
@@ -20,6 +20,7 @@ pub use crate::git::sync::AlignmentResult;
 
 use super::SharedDatabase;
 use crate::purgatory::Purgatory;
+use crate::sync::RepoSyncIndex;
 use nostr_relay_builder::LocalRelay;
 use std::sync::Arc;
 
@@ -34,6 +35,8 @@ pub struct PolicyContext {
     pub local_relay: Arc<std::sync::RwLock<Option<LocalRelay>>>,
     /// Configuration reference for policy settings (includes blacklists)
     pub config: crate::config::Config,
+    /// Repo sync index for registering purgatory announcements (set after SyncManager creation)
+    pub repo_sync_index: Arc<std::sync::RwLock<Option<RepoSyncIndex>>>,
 }
 
 impl PolicyContext {
@@ -51,6 +54,7 @@ impl PolicyContext {
             purgatory,
             local_relay: Arc::new(std::sync::RwLock::new(None)),
             config,
+            repo_sync_index: Arc::new(std::sync::RwLock::new(None)),
         }
     }
 
@@ -68,4 +72,19 @@ impl PolicyContext {
         let guard = self.local_relay.read().unwrap();
         guard.clone()
     }
+
+    /// Set the repo sync index after SyncManager has been created.
+    ///
+    /// This allows purgatory announcements submitted by users to be registered
+    /// in the sync index so state event sync starts promptly.
+    pub fn set_repo_sync_index(&self, index: RepoSyncIndex) {
+        let mut guard = self.repo_sync_index.write().unwrap();
+        *guard = Some(index);
+    }
+
+    /// Get a clone of the repo sync index if it has been set.
+    pub fn get_repo_sync_index(&self) -> Option<RepoSyncIndex> {
+        let guard = self.repo_sync_index.read().unwrap();
+        guard.clone()
+    }
 }
diff --git a/src/sync/mod.rs b/src/sync/mod.rs
index 519017b..916e2b0 100644
--- a/src/sync/mod.rs
+++ b/src/sync/mod.rs
@@ -700,6 +700,14 @@ impl SyncManager {
         self.rejected_events_index.save_to_disk(path)
     }
 
+    /// Get a clone of the repo sync index Arc.
+    ///
+    /// This allows the write policy to register user-submitted purgatory announcements
+    /// in the sync index so that state event sync starts promptly.
+    pub fn repo_sync_index(&self) -> RepoSyncIndex {
+        self.repo_sync_index.clone()
+    }
+
     /// Handle EOSE (End Of Stored Events) for a subscription
     ///
     /// This method:
@@ -951,9 +959,29 @@ impl SyncManager {
 
                         // Create REQ+EOSE subscriptions using original semantic filters
                         // This queries by kind/author/tags instead of by ID, which may
-                        // succeed even when ID-based queries fail
-                        let fallback_filters = filters::build_layer2_and_layer3_filters(
-                            &batch_repos,
+                        // succeed even when ID-based queries fail.
+                        // Split batch_repos by SyncLevel to avoid sending Layer 2 filters
+                        // (#a/#A/#q) for StateOnly (purgatory) repos - those PRs would be
+                        // rejected as orphan and then silently dropped by nostr-sdk deduplication.
+                        let (full_repos, state_only_repos) = {
+                            let repo_index = self.repo_sync_index.read().await;
+                            let mut full = HashSet::new();
+                            let mut state_only = HashSet::new();
+                            for repo_ref in &batch_repos {
+                                match repo_index.get(repo_ref).map(|n| n.sync_level) {
+                                    Some(SyncLevel::StateOnly) => {
+                                        state_only.insert(repo_ref.clone());
+                                    }
+                                    _ => {
+                                        full.insert(repo_ref.clone());
+                                    }
+                                }
+                            }
+                            (full, state_only)
+                        };
+                        let fallback_filters = filters::build_sync_level_aware_filters(
+                            &full_repos,
+                            &state_only_repos,
                             &batch_root_events,
                             None,
                         );
@@ -1033,12 +1061,24 @@ impl SyncManager {
                                 {
                                     let mut completed_batch = batches.remove(idx);
                                     completed_batch.failed = true; // Mark as failed
+                                    let is_generic =
+                                        completed_batch.items.repos.is_empty()
+                                            && completed_batch.items.root_events.is_empty();
                                     if batches.is_empty() {
                                         pending.remove(&relay_url_for_fallback);
                                     }
                                     drop(pending);
                                     self.confirm_batch(&relay_url_for_fallback, completed_batch)
                                         .await;
+                                    // For generic filter (announcement) batches, recompute filters
+                                    // so any purgatory repos registered during this batch get
+                                    // state-only subscriptions triggered.
+                                    if is_generic {
+                                        self.recompute_new_sync_filters_for_relay(
+                                            &relay_url_for_fallback,
+                                        )
+                                        .await;
+                                    }
                                 }
                             }
                             return;
@@ -1132,12 +1172,24 @@ impl SyncManager {
                         if let Some(batches) = pending.get_mut(&relay_url_for_retry) {
                             if let Some(idx) = batches.iter().position(|b| b.batch_id == batch_id) {
                                 let completed_batch = batches.remove(idx);
+                                let is_generic =
+                                    completed_batch.items.repos.is_empty()
+                                        && completed_batch.items.root_events.is_empty();
                                 if batches.is_empty() {
                                     pending.remove(&relay_url_for_retry);
                                 }
                                 drop(pending);
                                 self.confirm_batch(&relay_url_for_retry, completed_batch)
                                     .await;
+                                // For generic filter (announcement) batches, recompute filters
+                                // so any purgatory repos registered during this batch get
+                                // state-only subscriptions triggered.
+                                if is_generic {
+                                    self.recompute_new_sync_filters_for_relay(
+                                        &relay_url_for_retry,
+                                    )
+                                    .await;
+                                }
                             }
                         }
                         return;
@@ -1148,6 +1200,8 @@ impl SyncManager {
 
         // 3. Batch complete - extract and remove
         let completed_batch = batches.remove(batch_idx);
+        let is_generic = completed_batch.items.repos.is_empty()
+            && completed_batch.items.root_events.is_empty();
 
         // Clean up empty relay entry
         if batches.is_empty() {
@@ -1159,6 +1213,12 @@ impl SyncManager {
 
         // 4. Confirm the batch (moves items to RelayState)
         self.confirm_batch(relay_url, completed_batch).await;
+
+        // 5. For generic filter (announcement) batches, recompute sync filters so any
+        // purgatory repos registered during this batch get state-only subscriptions triggered.
+        if is_generic {
+            self.recompute_new_sync_filters_for_relay(relay_url).await;
+        }
     }
 
     /// Confirm a completed batch by moving items to RelayState
diff --git a/src/sync/self_subscriber.rs b/src/sync/self_subscriber.rs
index db16c62..70c3dbf 100644
--- a/src/sync/self_subscriber.rs
+++ b/src/sync/self_subscriber.rs
@@ -478,6 +478,10 @@ impl SelfSubscriber {
                     root_events: HashSet::new(),
                     sync_level: SyncLevel::Full,
                 });
+            // Upgrade sync_level to Full - this handles the case where the entry
+            // already exists as StateOnly (purgatory announcement) and is now being
+            // promoted (git data arrived and the event was broadcast via notify_event).
+            entry.sync_level = SyncLevel::Full;
             entry.relays.extend(needs.relays);
             entry.root_events.extend(needs.root_events);