pi-hermes-memory 0.7.14 → 0.7.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-hermes-memory",
-  "version": "0.7.14",
+  "version": "0.7.15",
   "description": "🧠 Persistent memory + 🔍 session search + 🛡️ secret scanning for Pi. Token-aware policy-only memory by default, SQLite FTS5 search, auto-consolidation, procedural skills. 368 tests. Ported from Hermes agent.",
   "type": "module",
   "main": "src/index.ts",

package/src/store/fts-query.ts

@@ -2,6 +2,23 @@ const FTS5_OPERATOR_PATTERN = /\b(OR|AND|NOT|NEAR)\b/;
 const FTS5_TOKEN_PATTERN = /"([^"]*)"|(\S+)/g;
 const NATURAL_LANGUAGE_CONNECTORS = new Set(['and', 'or', 'not', 'near']);
 
+function collectNaturalLanguageTerms(query: string): string[] {
+  const terms: string[] = [];
+
+  for (const match of query.matchAll(FTS5_TOKEN_PATTERN)) {
+    const phrase = match[1];
+    const term = match[2];
+    if (phrase === undefined && term && NATURAL_LANGUAGE_CONNECTORS.has(term.toLowerCase())) {
+      continue;
+    }
+
+    const rawValue = phrase ?? term ?? '';
+    if (rawValue.length > 0) terms.push(rawValue);
+  }
+
+  return terms;
+}
+
 /**
  * Normalize natural-language search input into an FTS5 query.
  * Plain terms become individually quoted for implicit AND matching.
@@ -16,19 +33,30 @@ export function normalizeFts5Query(query: string): string {
     return trimmed;
   }
 
-  const normalizedTerms: string[] = [];
-  for (const match of trimmed.matchAll(FTS5_TOKEN_PATTERN)) {
-    const phrase = match[1];
-    const term = match[2];
-    if (phrase === undefined && term && NATURAL_LANGUAGE_CONNECTORS.has(term.toLowerCase())) {
-      continue;
-    }
+  return collectNaturalLanguageTerms(trimmed)
+    .map((term) => `"${term.replace(/"/g, '""')}"`)
+    .join(' ');
+}
 
-    const rawValue = phrase ?? term ?? '';
-    normalizedTerms.push(`"${rawValue.replace(/"/g, '""')}"`);
+/**
+ * Build a broader fallback query for natural-language searches.
+ * Returns null for explicit operator queries or when the input is already a
+ * single searchable term.
+ */
+export function buildFallbackFts5Query(query: string): string | null {
+  const trimmed = query.trim();
+  if (trimmed.length === 0 || FTS5_OPERATOR_PATTERN.test(trimmed)) {
+    return null;
+  }
+
+  const terms = collectNaturalLanguageTerms(trimmed);
+  if (terms.length <= 1) {
+    return null;
   }
 
-  return normalizedTerms.join(' ');
+  return terms
+    .map((term) => `"${term.replace(/"/g, '""')}"`)
+    .join(' OR ');
 }
 
 export function isFts5QueryError(err: unknown): boolean {

package/src/store/sqlite-memory-store.ts

@@ -1,5 +1,5 @@
 import { DatabaseManager } from './db.js';
-import { isFts5QueryError, normalizeFts5Query } from './fts-query.js';
+import { buildFallbackFts5Query, isFts5QueryError, normalizeFts5Query } from './fts-query.js';
 import { normalizeMemoryLookupText } from './memory-lookup.js';
 import type { MemoryCategory } from '../types.js';
 
@@ -579,60 +579,77 @@ export function searchMemories(
   if (normalizedQuery.length === 0) {
     return [];
   }
-  conditions.push('m.id IN (SELECT rowid FROM memory_fts WHERE memory_fts MATCH ?)');
-  params.push(normalizedQuery);
 
-  if (project !== undefined) {
-    if (project === null) {
-      conditions.push('m.project IS NULL');
-    } else {
-      conditions.push('m.project = ?');
-      params.push(project);
-    }
-  }
+  const runSearch = (matchQuery: string): SqliteMemoryEntry[] => {
+    const conditions: string[] = [];
+    const params: unknown[] = [];
 
-  if (target) {
-    conditions.push('m.target = ?');
-    params.push(target);
-  }
+    conditions.push('m.id IN (SELECT rowid FROM memory_fts WHERE memory_fts MATCH ?)');
+    params.push(matchQuery);
 
-  if (category) {
-    conditions.push('m.category = ?');
-    params.push(category);
-  }
+    if (project !== undefined) {
+      if (project === null) {
+        conditions.push('m.project IS NULL');
+      } else {
+        conditions.push('m.project = ?');
+        params.push(project);
+      }
+    }
 
-  const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(' AND ')}` : '';
+    if (target) {
+      conditions.push('m.target = ?');
+      params.push(target);
+    }
 
-  const sql = `
-    SELECT ${MEMORY_SELECT_COLUMNS}
-    FROM memories m
-    ${whereClause}
-    ORDER BY m.last_referenced DESC
-    LIMIT ?
-  `;
-  params.push(limit);
-
-  try {
-    const rows = db.prepare(sql).all(...params) as Array<{
-      id: number;
-      project: string | null;
-      target: string;
-      category: string | null;
-      content: string;
-      failure_reason: string | null;
-      tool_state: string | null;
-      corrected_to: string | null;
-      created: string;
-      last_referenced: string;
-    }>;
-
-    return rows.map(mapRow);
-  } catch (err) {
-    if (isFts5QueryError(err)) {
-      return [];
+    if (category) {
+      conditions.push('m.category = ?');
+      params.push(category);
+    }
+
+    const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(' AND ')}` : '';
+
+    const sql = `
+      SELECT ${MEMORY_SELECT_COLUMNS}
+      FROM memories m
+      ${whereClause}
+      ORDER BY m.last_referenced DESC
+      LIMIT ?
+    `;
+
+    try {
+      const rows = db.prepare(sql).all(...params, limit) as Array<{
+        id: number;
+        project: string | null;
+        target: string;
+        category: string | null;
+        content: string;
+        failure_reason: string | null;
+        tool_state: string | null;
+        corrected_to: string | null;
+        created: string;
+        last_referenced: string;
+      }>;
+
+      return rows.map(mapRow);
+    } catch (err) {
+      if (isFts5QueryError(err)) {
+        return [];
+      }
+      throw err;
     }
-    throw err;
+  };
+
+  const exactResults = runSearch(normalizedQuery);
+  if (exactResults.length > 0) {
+    return exactResults;
   }
+
+  const fallbackQuery = buildFallbackFts5Query(query);
+  if (!fallbackQuery || fallbackQuery === normalizedQuery) {
+    return exactResults;
+  }
+
+  return runSearch(fallbackQuery);
 }
 
 /**