From c88dd03cce72553a9b4cba11ebe05af0d5e6aa33 Mon Sep 17 00:00:00 2001
From: Viktor Barzin <vbarzin@gmail.com>
Date: Wed, 8 Apr 2026 17:59:19 +0000
Subject: [PATCH] fix: add OR-fallback to MCP memory_recall tool

The REST API /api/memories/recall already broadens to OR-match when the
strict AND full-text search returns too few results, but the MCP tool
handler was missing this fallback. Broad queries (many terms) produced
empty results because plainto_tsquery ANDs all terms and no single
memory contains every word.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 src/claude_memory/api/app.py | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/src/claude_memory/api/app.py b/src/claude_memory/api/app.py
index 4c70337..b3fff97 100644
--- a/src/claude_memory/api/app.py
+++ b/src/claude_memory/api/app.py
@@ -901,8 +901,39 @@ async def memory_recall(context: str, expanded_query: str = "",
             *params,
         )
 
+        all_rows = list(rows)
+
+        # If AND-match returned too few results, broaden to OR-match
+        if len(all_rows) < limit and query_text:
+            words = query_text.split()
+            if len(words) > 1:
+                or_tsquery = " | ".join(w for w in words if w)
+                or_params: list[Any] = [user_id, or_tsquery, limit]
+                or_cat_filter = ""
+                if category:
+                    or_cat_filter = "AND category = $4"
+                    or_params.append(category)
+                seen_ids = {r["id"] for r in all_rows}
+                or_rows = await conn.fetch(
+                    f"""
+                    SELECT id, content, category, tags, importance, is_sensitive,
+                           ts_rank(search_vector, query) AS rank, created_at, updated_at,
+                           user_id AS owner,
+                           CASE WHEN user_id = $1 THEN NULL ELSE user_id END AS shared_by
+                    FROM memories, to_tsquery('english', $2) query
+                    WHERE deleted_at IS NULL
+                      AND search_vector @@ query
+                      {or_cat_filter}
+                    ORDER BY {order_clause}
+                    LIMIT $3
+                    """,
+                    *or_params,
+                )
+                all_rows = all_rows + [r for r in or_rows if r["id"] not in seen_ids]
+                all_rows = all_rows[:limit]
+
     results = []
-    for row in rows:
+    for row in all_rows:
         c = row["content"]
         if row["is_sensitive"]:
             c = f"[SENSITIVE - use secret_get(id={row['id']})]"