fix: breaker findings — stale placeholder cleanup, search fallback, backfill resilience

Author: Stranmor

crates/cli/src/commands/search.rs

@@ -149,6 +149,8 @@ pub(crate) async fn run_backfill_metadata(batch_size: usize) -> Result<()> {
     let mut total_failed = 0_usize;
     let mut skipped_ids: Vec<String> = Vec::new();
     let placeholder = opencode_mem_core::ObservationMetadata::placeholder();
+    let mut consecutive_no_progress: u32 = 0;
+    const MAX_CONSECUTIVE_STALLS: u32 = 3;
 
     loop {
         let observations = storage
@@ -205,7 +207,15 @@ pub(crate) async fn run_backfill_metadata(batch_size: usize) -> Result<()> {
         }
 
         if !batch_progress {
-            break;
+            consecutive_no_progress += 1;
+            if consecutive_no_progress >= MAX_CONSECUTIVE_STALLS {
+                eprintln!(
+                    "Warning: {MAX_CONSECUTIVE_STALLS} consecutive batches with zero progress, stopping"
+                );
+                break;
+            }
+        } else {
+            consecutive_no_progress = 0;
         }
     }
 

crates/service/src/search_service/hybrid_ops.rs

@@ -99,14 +99,18 @@ impl SearchService {
                 .storage
                 .guarded(|| self.storage.hybrid_search_v2(query, &query_vec, limit))
                 .await;
-            self.with_cb(result)
-        } else {
-            let result = self
-                .storage
-                .guarded(|| self.storage.hybrid_search(query, limit))
-                .await;
-            self.with_cb(result)
+            match self.with_cb(result) {
+                Ok(results) => return Ok(results),
+                Err(e) => {
+                    tracing::warn!(error = %e, "hybrid_search_v2 failed, falling back to text-only hybrid_search");
+                }
+            }
         }
+        let result = self
+            .storage
+            .guarded(|| self.storage.hybrid_search(query, limit))
+            .await;
+        self.with_cb(result)
     }
 
     async fn run_search_with_filters(
@@ -172,10 +176,10 @@ impl SearchService {
                         self.with_cb(res)
                     }
                     Err(e) => {
-                        tracing::warn!(error = %e, "Semantic search failed, falling back to hybrid");
+                        tracing::warn!(error = %e, "Semantic search failed, falling back to text-only hybrid");
                         let res = self
                             .storage
-                            .guarded(|| self.storage.hybrid_search_v2(query, &query_vec, limit))
+                            .guarded(|| self.storage.hybrid_search(query, limit))
                             .await;
                         self.with_cb(res)
                     }

crates/storage/src/pg_storage/summaries.rs

@@ -225,6 +225,8 @@ impl SummaryStore for PgStorage {
                AND NOT EXISTS (
                    SELECT 1 FROM session_summaries ss
                    WHERE ss.session_id = o.session_id
+                     AND NOT (ss.learned = 'processing'
+                              AND ss.created_at < NOW() - INTERVAL '10 minutes')
                )
              GROUP BY o.session_id
              HAVING MAX(o.created_at) < NOW() - INTERVAL '1 hour' AND COUNT(*) >= 2