@monoes/monograph 1.4.0 → 1.4.1

package/src/storage/edge-store.ts

@@ -73,10 +73,17 @@ export function getEdgesForTarget(db: Database.Database, targetId: string): Mono
   return rows.map(rowToEdge);
 }
 
+/**
+ * Delete every edge that touches a node belonging to `filePath`, on either end.
+ * Must be called BEFORE the corresponding nodes are deleted (the subselects need
+ * the file's nodes to still exist to identify which edges to remove) — e.g.
+ * `deleteEdgesForFile` then `deleteNodesForFile`, never the reverse.
+ */
 export function deleteEdgesForFile(db: Database.Database, filePath: string): void {
   db.prepare(`
     DELETE FROM edges WHERE source_id IN (SELECT id FROM nodes WHERE file_path = ?)
-  `).run(filePath);
+       OR target_id IN (SELECT id FROM nodes WHERE file_path = ?)
+  `).run(filePath, filePath);
 }
 
 export function countEdges(db: Database.Database): number {

package/src/storage/fts-store.ts

@@ -13,6 +13,20 @@ export interface FtsResult {
   endLine: number | null;
 }
 
+/**
+ * Quote a single FTS5 search term as a string literal when it contains characters
+ * that would otherwise be parsed as FTS5 syntax (quotes, parens, boolean keywords
+ * like AND/OR/NOT, colons, hyphens, etc). Wrapping in double-quotes forces FTS5 to
+ * treat the term as a literal string; any literal `"` inside the term is escaped by
+ * doubling it, per FTS5's own string-literal quoting rules.
+ */
+function quoteFtsTerm(term: string): string {
+  // Bare alphanumeric/underscore terms need no quoting and are the common case.
+  if (/^[A-Za-z0-9_]+$/.test(term)) return term;
+  const escaped = term.replace(/"/g, '""');
+  return `"${escaped}"`;
+}
+
 export function ftsSearch(
   db: Database.Database,
   query: string,
@@ -24,8 +38,13 @@ export function ftsSearch(
   const safeQuery = query.replace(/[*]/g, ' ').trim();
   if (!safeQuery) return [];
 
-  // Trigram handles substring matching natively — no need to append * to each term
-  const ftsQuery = safeQuery.split(/\s+/).join(' ');
+  // Trigram handles substring matching natively — no need to append * to each term.
+  // Quote each term individually so characters like `"`, `(`, `)`, or bare boolean
+  // keywords (AND/OR/NOT) don't get parsed as FTS5 query syntax.
+  const ftsQuery = safeQuery
+    .split(/\s+/)
+    .map(quoteFtsTerm)
+    .join(' ');
 
   let matchSql = `
     SELECT n.id, n.name, n.norm_label, n.file_path, n.label,
@@ -52,16 +71,19 @@ export function ftsSearch(
     // FTS MATCH can throw on malformed queries; fall through to LIKE path
   }
 
-  // For short queries (≤2 chars) trigram requires at least 3 characters to fire, so
-  // supplement with a LIKE fallback to catch single/double-character matches.
-  if (safeQuery.length <= 2) {
-    const escapedQuery = safeQuery.replace(/%/g, '\\%').replace(/_/g, '\\_');
+  // Run the LIKE fallback whenever MATCH threw (malformed/boolean-keyword query) or
+  // returned zero rows — not just for short (≤2 char) queries. Short queries need it
+  // because trigram requires ≥3 characters to fire; longer queries need it whenever
+  // MATCH couldn't handle the syntax, so a query-syntax failure doesn't silently read
+  // as "no results".
+  if (safeQuery.length <= 2 || matchRows.length === 0) {
+    const escapedQuery = safeQuery.replace(/\\/g, '\\\\').replace(/%/g, '\\%').replace(/_/g, '\\_');
     const likePattern = `%${escapedQuery}%`;
     let likeSql = `
       SELECT n.id, n.name, n.norm_label, n.file_path, n.label,
              n.start_line, n.end_line, 0 AS rank
       FROM nodes n
-      WHERE (n.name LIKE ? OR n.norm_label LIKE ? OR n.file_path LIKE ?)
+      WHERE (n.name LIKE ? ESCAPE '\\' OR n.norm_label LIKE ? ESCAPE '\\' OR n.file_path LIKE ? ESCAPE '\\')
     `;
     const likeParams: unknown[] = [likePattern, likePattern, likePattern];
     if (label) {
@@ -186,13 +208,13 @@ export function hybridSearch(
   // ── Strategy 2: LIKE fallback ──────────────────────────────────────────────
   // Always run for short queries (≤3 chars) or when FTS returned nothing.
   if (safeQuery.length <= 3 || ftsRows.length === 0) {
-    const escapedSafeQuery = safeQuery.replace(/%/g, '\\%').replace(/_/g, '\\_');
+    const escapedSafeQuery = safeQuery.replace(/\\/g, '\\\\').replace(/%/g, '\\%').replace(/_/g, '\\_');
     const likePattern = `%${escapedSafeQuery}%`;
     let likeSql = `
       SELECT n.id, n.name, n.norm_label, n.file_path, n.label,
              n.start_line, n.end_line
       FROM nodes n
-      WHERE (n.name LIKE ? OR n.norm_label LIKE ?)
+      WHERE (n.name LIKE ? ESCAPE '\\' OR n.norm_label LIKE ? ESCAPE '\\')
     `;
     const likeParams: unknown[] = [likePattern, likePattern];
     if (label) {

package/src/watch/watcher.ts

@@ -34,8 +34,17 @@ export async function watchAsync(
       do {
         rerun = false;
         opts.onProgress?.({ phase: 'watch', message: `Changed: ${files.slice(0, 3).join(', ')}` });
-        await buildAsync(repoPath, { onProgress: opts.onProgress, force: opts.force, codeOnly: opts.codeOnly, llmMaxSections: opts.llmMaxSections ?? 0 });
-        opts.onProgress?.({ phase: 'watch', message: 'Graph rebuilt.' });
+        try {
+          await buildAsync(repoPath, { onProgress: opts.onProgress, force: opts.force, codeOnly: opts.codeOnly, llmMaxSections: opts.llmMaxSections ?? 0 });
+          opts.onProgress?.({ phase: 'watch', message: 'Graph rebuilt.' });
+        } catch (err) {
+          // A rebuild failure (locked DB past busy_timeout, disk full, transient
+          // I/O error) must not crash the watch process — log it, notify listeners,
+          // and keep watching for the next change instead of letting an unhandled
+          // rejection escape this listener.
+          watcher.emit('monograph:error', err);
+          opts.onProgress?.({ phase: 'watch', message: `Rebuild failed: ${err instanceof Error ? err.message : String(err)}` });
+        }
       } while (rerun);
     } finally {
       building = false;

package/tsconfig.json

@@ -3,7 +3,8 @@
   "compilerOptions": {
     "outDir": "dist",
     "rootDir": ".",
-    "composite": true
+    "composite": true,
+    "types": ["node", "better-sqlite3", "express", "micromatch"]
   },
   "include": ["src/**/*.ts"],
   "exclude": ["node_modules", "dist", "__tests__", "src/**/__tests__/**", "src/**/*.test.ts", "src/**/*.spec.ts"]