homegraph 0.9.10 → 1.1.1

package/dist/db/queries.js

@@ -57,6 +57,7 @@ function rowToNode(row) {
         isAbstract: row.is_abstract === 1,
         decorators: row.decorators ? (0, utils_1.safeJsonParse)(row.decorators, undefined) : undefined,
         typeParameters: row.type_parameters ? (0, utils_1.safeJsonParse)(row.type_parameters, undefined) : undefined,
+        returnType: row.return_type ?? undefined,
         updatedAt: row.updated_at,
     };
 }
@@ -94,6 +95,11 @@ function rowToFileRecord(row) {
  */
 class QueryBuilder {
     db;
+    // Project-name tokens (go.mod / package.json / repo dir), normalized. A query
+    // word matching one is dropped from path-relevance scoring — it names the
+    // whole project, not a symbol, so it carries no discriminative signal (#720).
+    // Set once by the HomeGraph instance; empty by default (no down-weighting).
+    projectNameTokens = new Set();
     // Node cache for frequently accessed nodes (LRU-style, max 1000 entries)
     nodeCache = new Map();
     maxCacheSize = 1000;
@@ -102,6 +108,15 @@ class QueryBuilder {
     constructor(db) {
         this.db = db;
     }
+    /** Set the normalized project-name tokens used to down-weight non-discriminative
+     * query words in path scoring (#720). Called once when the project opens. */
+    setProjectNameTokens(tokens) {
+        this.projectNameTokens = tokens;
+    }
+    /** The normalized project-name tokens (#720); empty if none were derived. */
+    getProjectNameTokens() {
+        return this.projectNameTokens;
+    }
     // ===========================================================================
     // Node Operations
     // ===========================================================================
@@ -110,25 +125,25 @@ class QueryBuilder {
      */
     insertNode(node) {
         if (!this.stmts.insertNode) {
-            this.stmts.insertNode = this.db.prepare(`
-        INSERT OR REPLACE INTO nodes (
-          id, kind, name, qualified_name, file_path, language,
-          start_line, end_line, start_column, end_column,
-          docstring, signature, visibility,
-          is_exported, is_async, is_static, is_abstract,
-          decorators, type_parameters, updated_at
-        ) VALUES (
-          @id, @kind, @name, @qualifiedName, @filePath, @language,
-          @startLine, @endLine, @startColumn, @endColumn,
-          @docstring, @signature, @visibility,
-          @isExported, @isAsync, @isStatic, @isAbstract,
-          @decorators, @typeParameters, @updatedAt
-        )
+            this.stmts.insertNode = this.db.prepare(`
+        INSERT OR REPLACE INTO nodes (
+          id, kind, name, qualified_name, file_path, language,
+          start_line, end_line, start_column, end_column,
+          docstring, signature, visibility,
+          is_exported, is_async, is_static, is_abstract,
+          decorators, type_parameters, return_type, updated_at
+        ) VALUES (
+          @id, @kind, @name, @qualifiedName, @filePath, @language,
+          @startLine, @endLine, @startColumn, @endColumn,
+          @docstring, @signature, @visibility,
+          @isExported, @isAsync, @isStatic, @isAbstract,
+          @decorators, @typeParameters, @returnType, @updatedAt
+        )
       `);
         }
         // Validate required fields to prevent SQLite bind errors
         if (!node.id || !node.kind || !node.name || !node.filePath || !node.language) {
-            console.error('[CodeGraph] Skipping node with missing required fields:', {
+            console.error('[HomeGraph] Skipping node with missing required fields:', {
                 id: node.id,
                 kind: node.kind,
                 name: node.name,
@@ -162,6 +177,7 @@ class QueryBuilder {
             isAbstract: node.isAbstract ? 1 : 0,
             decorators: node.decorators ? JSON.stringify(node.decorators) : null,
             typeParameters: node.typeParameters ? JSON.stringify(node.typeParameters) : null,
+            returnType: node.returnType ?? null,
             updatedAt: node.updatedAt ?? Date.now(),
         });
     }
@@ -180,35 +196,36 @@ class QueryBuilder {
      */
     updateNode(node) {
         if (!this.stmts.updateNode) {
-            this.stmts.updateNode = this.db.prepare(`
-        UPDATE nodes SET
-          kind = @kind,
-          name = @name,
-          qualified_name = @qualifiedName,
-          file_path = @filePath,
-          language = @language,
-          start_line = @startLine,
-          end_line = @endLine,
-          start_column = @startColumn,
-          end_column = @endColumn,
-          docstring = @docstring,
-          signature = @signature,
-          visibility = @visibility,
-          is_exported = @isExported,
-          is_async = @isAsync,
-          is_static = @isStatic,
-          is_abstract = @isAbstract,
-          decorators = @decorators,
-          type_parameters = @typeParameters,
-          updated_at = @updatedAt
-        WHERE id = @id
+            this.stmts.updateNode = this.db.prepare(`
+        UPDATE nodes SET
+          kind = @kind,
+          name = @name,
+          qualified_name = @qualifiedName,
+          file_path = @filePath,
+          language = @language,
+          start_line = @startLine,
+          end_line = @endLine,
+          start_column = @startColumn,
+          end_column = @endColumn,
+          docstring = @docstring,
+          signature = @signature,
+          visibility = @visibility,
+          is_exported = @isExported,
+          is_async = @isAsync,
+          is_static = @isStatic,
+          is_abstract = @isAbstract,
+          decorators = @decorators,
+          type_parameters = @typeParameters,
+          return_type = @returnType,
+          updated_at = @updatedAt
+        WHERE id = @id
       `);
         }
         // Invalidate cache before update
         this.nodeCache.delete(node.id);
         // Validate required fields
         if (!node.id || !node.kind || !node.name || !node.filePath || !node.language) {
-            console.error('[CodeGraph] Skipping node update with missing required fields:', node.id);
+            console.error('[HomeGraph] Skipping node update with missing required fields:', node.id);
             return;
         }
         this.stmts.updateNode.run({
@@ -231,6 +248,7 @@ class QueryBuilder {
             isAbstract: node.isAbstract ? 1 : 0,
             decorators: node.decorators ? JSON.stringify(node.decorators) : null,
             typeParameters: node.typeParameters ? JSON.stringify(node.typeParameters) : null,
+            returnType: node.returnType ?? null,
             updatedAt: node.updatedAt ?? Date.now(),
         });
     }
@@ -408,15 +426,15 @@ class QueryBuilder {
             // protobuf stub) outranks the real `server/etcdserver/server.go`
             // (470 edges) by 4×, and the boost would push the agent toward
             // generated code.
-            this.stmts.getDominantFile = this.db.prepare(`
-        SELECT n.file_path AS file_path, COUNT(*) AS edge_count
-        FROM edges e
-        JOIN nodes n ON e.source = n.id
-        JOIN nodes m ON e.target = m.id
-        WHERE n.file_path = m.file_path
-        GROUP BY n.file_path
-        ORDER BY edge_count DESC
-        LIMIT 20
+            this.stmts.getDominantFile = this.db.prepare(`
+        SELECT n.file_path AS file_path, COUNT(*) AS edge_count
+        FROM edges e
+        JOIN nodes n ON e.source = n.id
+        JOIN nodes m ON e.target = m.id
+        WHERE n.file_path = m.file_path
+        GROUP BY n.file_path
+        ORDER BY edge_count DESC
+        LIMIT 20
       `);
         }
         const rows = this.stmts.getDominantFile.all();
@@ -434,7 +452,7 @@ class QueryBuilder {
      * `route` nodes (framework-emitted: Express/Gin/Flask/Rails/Drupal/etc.).
      * Used by handleContext on small repos to inline the project's routing
      * config when the agent's query is about request flow — eliminating the
-     * "Glob + Read routes.rb" pattern that beats codegraph on tiny realworld
+     * "Glob + Read routes.rb" pattern that beats homegraph on tiny realworld
      * template repos.
      *
      * Excludes test/generated files from candidacy. Returns null if there
@@ -443,13 +461,13 @@ class QueryBuilder {
      */
     getTopRouteFile() {
         if (!this.stmts.getTopRouteFile) {
-            this.stmts.getTopRouteFile = this.db.prepare(`
-        SELECT file_path, COUNT(*) AS cnt
-        FROM nodes
-        WHERE kind = 'route'
-        GROUP BY file_path
-        ORDER BY cnt DESC
-        LIMIT 20
+            this.stmts.getTopRouteFile = this.db.prepare(`
+        SELECT file_path, COUNT(*) AS cnt
+        FROM nodes
+        WHERE kind = 'route'
+        GROUP BY file_path
+        ORDER BY cnt DESC
+        LIMIT 20
       `);
         }
         const rows = this.stmts.getTopRouteFile.all();
@@ -480,21 +498,21 @@ class QueryBuilder {
             // Edge kind varies across framework resolvers: Spring/Rails/
             // Laravel/Drupal emit `references`, Express emits `calls`. Accept
             // both — the semantic is the same (route → its handler).
-            this.stmts.getRoutingManifest = this.db.prepare(`
-        SELECT
-          r.name AS url,
-          h.name AS handler,
-          h.file_path AS handler_file,
-          h.start_line AS handler_line,
-          h.kind AS handler_kind
-        FROM nodes r
-        JOIN edges e ON e.source = r.id
-        JOIN nodes h ON e.target = h.id
-        WHERE r.kind = 'route'
-          AND e.kind IN ('references', 'calls')
-          AND h.kind IN ('function', 'method', 'class')
-        ORDER BY r.file_path, r.start_line
-        LIMIT ?
+            this.stmts.getRoutingManifest = this.db.prepare(`
+        SELECT
+          r.name AS url,
+          h.name AS handler,
+          h.file_path AS handler_file,
+          h.start_line AS handler_line,
+          h.kind AS handler_kind
+        FROM nodes r
+        JOIN edges e ON e.source = r.id
+        JOIN nodes h ON e.target = h.id
+        WHERE r.kind = 'route'
+          AND e.kind IN ('references', 'calls')
+          AND h.kind IN ('function', 'method', 'class')
+        ORDER BY r.file_path, r.start_line
+        LIMIT ?
       `);
         }
         const rows = this.stmts.getRoutingManifest.all(limit);
@@ -677,7 +695,7 @@ class QueryBuilder {
                 ...r,
                 score: r.score
                     + (0, query_utils_1.kindBonus)(r.node.kind)
-                    + (0, query_utils_1.scorePathRelevance)(r.node.filePath, scoringQuery)
+                    + (0, query_utils_1.scorePathRelevance)(r.node.filePath, scoringQuery, this.projectNameTokens)
                     + (0, query_utils_1.nameMatchBonus)(r.node.name, scoringQuery),
             }));
             results.sort((a, b) => b.score - a.score);
@@ -820,11 +838,11 @@ class QueryBuilder {
         // Fetch 5x requested limit so post-hoc rescoring (kindBonus, pathRelevance,
         // nameMatchBonus) can promote results that BM25 alone undervalues.
         const ftsLimit = Math.max(limit * 5, 100);
-        let sql = `
-      SELECT nodes.*, bm25(nodes_fts, 0, 20, 5, 1, 2) as score
-      FROM nodes_fts
-      JOIN nodes ON nodes_fts.id = nodes.id
-      WHERE nodes_fts MATCH ?
+        let sql = `
+      SELECT nodes.*, bm25(nodes_fts, 0, 20, 5, 1, 2) as score
+      FROM nodes_fts
+      JOIN nodes ON nodes_fts.id = nodes.id
+      WHERE nodes_fts MATCH ?
     `;
         const params = [ftsQuery];
         if (kinds && kinds.length > 0) {
@@ -855,21 +873,21 @@ class QueryBuilder {
      */
     searchNodesLike(query, options) {
         const { kinds, languages, limit = 100, offset = 0 } = options;
-        let sql = `
-      SELECT nodes.*,
-        CASE
-          WHEN name = ? THEN 1.0
-          WHEN name LIKE ? THEN 0.9
-          WHEN name LIKE ? THEN 0.8
-          WHEN qualified_name LIKE ? THEN 0.7
-          ELSE 0.5
-        END as score
-      FROM nodes
-      WHERE (
-        name LIKE ? OR
-        qualified_name LIKE ? OR
-        name LIKE ?
-      )
+        let sql = `
+      SELECT nodes.*,
+        CASE
+          WHEN name = ? THEN 1.0
+          WHEN name LIKE ? THEN 0.9
+          WHEN name LIKE ? THEN 0.8
+          WHEN qualified_name LIKE ? THEN 0.7
+          ELSE 0.5
+        END as score
+      FROM nodes
+      WHERE (
+        name LIKE ? OR
+        qualified_name LIKE ? OR
+        name LIKE ?
+      )
     `;
         // Pattern variants for better matching
         const exactMatch = query;
@@ -943,10 +961,10 @@ class QueryBuilder {
         const allResults = [];
         const seenIds = new Set();
         for (const name of names) {
-            let sql = `
-        SELECT nodes.*, 1.0 as score
-        FROM nodes
-        WHERE name COLLATE NOCASE = ?
+            let sql = `
+        SELECT nodes.*, 1.0 as score
+        FROM nodes
+        WHERE name COLLATE NOCASE = ?
       `;
             const params = [name];
             if (kinds && kinds.length > 0) {
@@ -990,10 +1008,10 @@ class QueryBuilder {
      */
     findNodesByNameSubstring(substring, options = {}) {
         const { kinds, languages, limit = 30, excludePrefix } = options;
-        let sql = `
-      SELECT nodes.*, 1.0 as score
-      FROM nodes
-      WHERE name LIKE ?
+        let sql = `
+      SELECT nodes.*, 1.0 as score
+      FROM nodes
+      WHERE name LIKE ?
     `;
         const params = [`%${substring}%`];
         // Exclude prefix matches (handled by FTS-based prefix search in Step 2b)
@@ -1025,9 +1043,9 @@ class QueryBuilder {
      */
     insertEdge(edge) {
         if (!this.stmts.insertEdge) {
-            this.stmts.insertEdge = this.db.prepare(`
-        INSERT OR IGNORE INTO edges (source, target, kind, metadata, line, col, provenance)
-        VALUES (@source, @target, @kind, @metadata, @line, @col, @provenance)
+            this.stmts.insertEdge = this.db.prepare(`
+        INSERT OR IGNORE INTO edges (source, target, kind, metadata, line, col, provenance)
+        VALUES (@source, @target, @kind, @metadata, @line, @col, @provenance)
       `);
         }
         this.stmts.insertEdge.run({
@@ -1143,12 +1161,12 @@ class QueryBuilder {
      * it. One indexed query (idx_nodes_file_path + idx_edges_target_kind).
      */
     getDependentFilePaths(filePath) {
-        const sql = `SELECT DISTINCT src.file_path AS fp
-      FROM edges e
-      JOIN nodes tgt ON tgt.id = e.target
-      JOIN nodes src ON src.id = e.source
-      WHERE tgt.file_path = ?
-        AND e.kind != 'contains'
+        const sql = `SELECT DISTINCT src.file_path AS fp
+      FROM edges e
+      JOIN nodes tgt ON tgt.id = e.target
+      JOIN nodes src ON src.id = e.source
+      WHERE tgt.file_path = ?
+        AND e.kind != 'contains'
         AND src.file_path != ?`;
         const rows = this.db.prepare(sql).all(filePath, filePath);
         return rows.map((r) => r.fp);
@@ -1160,26 +1178,51 @@ class QueryBuilder {
      * (all kinds except `contains`); same reason imports-only is insufficient.
      */
     getDependencyFilePaths(filePath) {
-        const sql = `SELECT DISTINCT tgt.file_path AS fp
-      FROM edges e
-      JOIN nodes src ON src.id = e.source
-      JOIN nodes tgt ON tgt.id = e.target
-      WHERE src.file_path = ?
-        AND e.kind != 'contains'
+        const sql = `SELECT DISTINCT tgt.file_path AS fp
+      FROM edges e
+      JOIN nodes src ON src.id = e.source
+      JOIN nodes tgt ON tgt.id = e.target
+      WHERE src.file_path = ?
+        AND e.kind != 'contains'
         AND tgt.file_path != ?`;
         const rows = this.db.prepare(sql).all(filePath, filePath);
         return rows.map((r) => r.fp);
     }
+    /**
+     * Cross-file edges whose TARGET is a node in `filePath` and whose SOURCE is a
+     * node in a *different* file, paired with the target node's (name, kind) so a
+     * caller can re-resolve the edge to the re-indexed target's new ID (node IDs
+     * are `sha256(filePath:kind:name:line)`, so any line shift in the callee file
+     * changes target IDs and a naive re-insert by old ID silently drops them).
+     * Used by `storeExtractionResult` to preserve incoming edges across a file
+     * re-index (issue #899). Same edge-kind rules as
+     * {@link getDependentFilePaths}: all kinds except `contains`.
+     */
+    getCrossFileIncomingEdgesWithTarget(filePath) {
+        const sql = `SELECT e.*, tgt.name AS target_name, tgt.kind AS target_kind
+      FROM edges e
+      JOIN nodes tgt ON tgt.id = e.target
+      JOIN nodes src ON src.id = e.source
+      WHERE tgt.file_path = ?
+        AND e.kind != 'contains'
+        AND src.file_path != ?`;
+        const rows = this.db.prepare(sql).all(filePath, filePath);
+        return rows.map(row => ({
+            ...rowToEdge(row),
+            targetName: row.target_name,
+            targetKind: row.target_kind,
+        }));
+    }
     /**
      * Remove ArkTS RTA call edges persisted at batch scope (cross-file).
      * Per-file edges are removed by {@link deleteFile} during re-index.
      */
     deleteArkTSCrossFileCallEdges() {
         const result = this.db
-            .prepare(`DELETE FROM edges
-         WHERE kind = 'calls'
-           AND provenance = 'heuristic'
-           AND metadata LIKE '%"synthesizedBy":"arkanalyzer"%'
+            .prepare(`DELETE FROM edges
+         WHERE kind = 'calls'
+           AND provenance = 'heuristic'
+           AND metadata LIKE '%"synthesizedBy":"arkanalyzer"%'
            AND metadata LIKE '%"sourceFile"%'`)
             .run();
         return result.changes;
@@ -1192,17 +1235,17 @@ class QueryBuilder {
      */
     upsertFile(file) {
         if (!this.stmts.upsertFile) {
-            this.stmts.upsertFile = this.db.prepare(`
-        INSERT INTO files (path, content_hash, language, size, modified_at, indexed_at, node_count, errors)
-        VALUES (@path, @contentHash, @language, @size, @modifiedAt, @indexedAt, @nodeCount, @errors)
-        ON CONFLICT(path) DO UPDATE SET
-          content_hash = @contentHash,
-          language = @language,
-          size = @size,
-          modified_at = @modifiedAt,
-          indexed_at = @indexedAt,
-          node_count = @nodeCount,
-          errors = @errors
+            this.stmts.upsertFile = this.db.prepare(`
+        INSERT INTO files (path, content_hash, language, size, modified_at, indexed_at, node_count, errors)
+        VALUES (@path, @contentHash, @language, @size, @modifiedAt, @indexedAt, @nodeCount, @errors)
+        ON CONFLICT(path) DO UPDATE SET
+          content_hash = @contentHash,
+          language = @language,
+          size = @size,
+          modified_at = @modifiedAt,
+          indexed_at = @indexedAt,
+          node_count = @nodeCount,
+          errors = @errors
       `);
         }
         this.stmts.upsertFile.run({
@@ -1276,9 +1319,9 @@ class QueryBuilder {
      */
     insertUnresolvedRef(ref) {
         if (!this.stmts.insertUnresolved) {
-            this.stmts.insertUnresolved = this.db.prepare(`
-        INSERT INTO unresolved_refs (from_node_id, reference_name, reference_kind, line, col, candidates, file_path, language)
-        VALUES (@fromNodeId, @referenceName, @referenceKind, @line, @col, @candidates, @filePath, @language)
+            this.stmts.insertUnresolved = this.db.prepare(`
+        INSERT INTO unresolved_refs (from_node_id, reference_name, reference_kind, line, col, candidates, file_path, language)
+        VALUES (@fromNodeId, @referenceName, @referenceKind, @line, @col, @candidates, @filePath, @language)
       `);
         }
         this.stmts.insertUnresolved.run({
@@ -1480,11 +1523,11 @@ class QueryBuilder {
      */
     getStats() {
         // Single query for all three aggregate counts
-        const counts = this.db.prepare(`
-      SELECT
-        (SELECT COUNT(*) FROM nodes) AS node_count,
-        (SELECT COUNT(*) FROM edges) AS edge_count,
-        (SELECT COUNT(*) FROM files) AS file_count
+        const counts = this.db.prepare(`
+      SELECT
+        (SELECT COUNT(*) FROM nodes) AS node_count,
+        (SELECT COUNT(*) FROM edges) AS edge_count,
+        (SELECT COUNT(*) FROM files) AS file_count
     `).get();
         const nodesByKind = {};
         const nodeKindRows = this.db