gitnexus 1.6.5-rc.15 → 1.6.5-rc.16

package/dist/core/lbug/lbug-adapter.js

@@ -167,6 +167,65 @@ const runWithSessionLock = async (operation) => {
     }
 };
 const normalizeCopyPath = (filePath) => filePath.replace(/\\/g, '/');
+const closeQueryResult = async (result) => {
+    try {
+        await result.close();
+    }
+    catch {
+        // Best-effort cleanup only.
+    }
+};
+const drainQueryResult = async (queryResult) => {
+    const results = Array.isArray(queryResult) ? queryResult : [queryResult];
+    let firstError;
+    let hasError = false;
+    for (const result of results) {
+        try {
+            await result.getAll();
+        }
+        catch (err) {
+            if (!hasError) {
+                firstError = err;
+                hasError = true;
+            }
+        }
+        finally {
+            await closeQueryResult(result);
+        }
+    }
+    if (hasError)
+        throw firstError;
+};
+const readQueryRows = async (queryResult) => {
+    const results = Array.isArray(queryResult) ? queryResult : [queryResult];
+    let rows = [];
+    let firstError;
+    let hasError = false;
+    for (let i = 0; i < results.length; i++) {
+        const result = results[i];
+        try {
+            const resultRows = await result.getAll();
+            if (i === 0)
+                rows = resultRows;
+        }
+        catch (err) {
+            if (!hasError) {
+                firstError = err;
+                hasError = true;
+            }
+        }
+        finally {
+            await closeQueryResult(result);
+        }
+    }
+    if (hasError)
+        throw firstError;
+    return rows;
+};
+const queryAndDrain = async (targetConn, cypher) => {
+    const queryResult = await targetConn.query(cypher);
+    await drainQueryResult(queryResult);
+};
 export const initLbug = async (dbPath) => {
     return runWithSessionLock(() => ensureLbugInitialized(dbPath));
 };
@@ -262,7 +321,7 @@ const doInitLbug = async (dbPath) => {
     conn = opened.conn;
     for (const schemaQuery of SCHEMA_QUERIES) {
         try {
-            await conn.query(schemaQuery);
+            await queryAndDrain(conn, schemaQuery);
         }
         catch (err) {
             const msg = err instanceof Error ? err.message : String(err);
@@ -312,12 +371,12 @@ export const loadGraphToLbug = async (graph, repoPath, storagePath, onProgress)
         const normalizedPath = normalizeCopyPath(csvPath);
         const copyQuery = getCopyQuery(table, normalizedPath);
         try {
-            await conn.query(copyQuery);
+            await queryAndDrain(conn, copyQuery);
         }
         catch (err) {
             try {
                 const retryQuery = copyQuery.replace('auto_detect=false)', 'auto_detect=false, IGNORE_ERRORS=true)');
-                await conn.query(retryQuery);
+                await queryAndDrain(conn, retryQuery);
             }
             catch (retryErr) {
                 const retryMsg = retryErr instanceof Error ? retryErr.message : String(retryErr);
@@ -350,12 +409,12 @@ export const loadGraphToLbug = async (graph, repoPath, storagePath, onProgress)
                 log(`Loading edges: ${pairIdx}/${relsByPairMeta.size} types (${fromLabel} -> ${toLabel})`);
             }
             try {
-                await conn.query(copyQuery);
+                await queryAndDrain(conn, copyQuery);
             }
             catch (err) {
                 try {
                     const retryQuery = copyQuery.replace('auto_detect=false)', 'auto_detect=false, IGNORE_ERRORS=true)');
-                    await conn.query(retryQuery);
+                    await queryAndDrain(conn, retryQuery);
                 }
                 catch (retryErr) {
                     const retryMsg = retryErr instanceof Error ? retryErr.message : String(retryErr);
@@ -475,7 +534,7 @@ const fallbackRelationshipInserts = async (validRelLines, validTables, getNodeLa
             const confidence = parseFloat(confidenceStr) || 1.0;
             const step = parseInt(stepStr) || 0;
             const esc = (s) => s.replace(/'/g, "''").replace(/\\/g, '\\\\').replace(/\n/g, '\\n').replace(/\r/g, '\\r');
-            await conn.query(`
+            await queryAndDrain(conn, `
         MATCH (a:${escapeLabel(fromLabel)} {id: '${esc(fromId)}' }),
               (b:${escapeLabel(toLabel)} {id: '${esc(toId)}' })
         CREATE (a)-[:${REL_TABLE_NAME} {type: '${esc(relType)}', confidence: ${confidence}, reason: '${esc(reason)}', step: ${step}}]->(b)
@@ -589,7 +648,7 @@ export const insertNodeToLbug = async (label, properties, dbPath) => {
         if (targetDbPath) {
             const tempHandle = await openLbugConnection(lbug, targetDbPath);
             try {
-                await tempHandle.conn.query(query);
+                await queryAndDrain(tempHandle.conn, query);
                 return true;
             }
             finally {
@@ -598,7 +657,7 @@ export const insertNodeToLbug = async (label, properties, dbPath) => {
         }
         else if (conn) {
             // Use existing persistent connection (when called from analyze)
-            await conn.query(query);
+            await queryAndDrain(conn, query);
             return true;
         }
         return false;
@@ -667,7 +726,7 @@ export const batchInsertNodesToLbug = async (nodes, dbPath) => {
                         : '';
                     query = `MERGE (n:${t} {id: ${escapeValue(properties.id)}}) SET n.name = ${escapeValue(properties.name)}, n.filePath = ${escapeValue(properties.filePath)}, n.startLine = ${properties.startLine || 0}, n.endLine = ${properties.endLine || 0}, n.content = ${escapeValue(properties.content || '')}${descPart}`;
                 }
-                await tempConn.query(query);
+                await queryAndDrain(tempConn, query);
                 inserted++;
             }
             catch (e) {
@@ -686,19 +745,17 @@ export const executeQuery = async (cypher) => {
         throw new Error('LadybugDB not initialized. Call initLbug first.');
     }
     const queryResult = await conn.query(cypher);
-    // LadybugDB uses getAll() instead of hasNext()/getNext()
-    // Query returns QueryResult for single queries, QueryResult[] for multi-statement
-    const result = Array.isArray(queryResult) ? queryResult[0] : queryResult;
-    const rows = await result.getAll();
-    return rows;
+    return await readQueryRows(queryResult);
 };
 export const streamQuery = async (cypher, onRow) => {
     if (!conn) {
         throw new Error('LadybugDB not initialized. Call initLbug first.');
     }
     const queryResult = await conn.query(cypher);
-    const result = Array.isArray(queryResult) ? queryResult[0] : queryResult;
+    const results = Array.isArray(queryResult) ? queryResult : [queryResult];
+    const result = results[0];
     let rowCount = 0;
+    let streamError;
     try {
         while (await result.hasNext()) {
             const row = await result.getNext();
@@ -707,12 +764,17 @@ export const streamQuery = async (cypher, onRow) => {
         }
         return rowCount;
     }
+    catch (err) {
+        streamError = err;
+        throw err;
+    }
     finally {
         try {
-            await result.close();
+            await drainQueryResult(results);
         }
-        catch {
-            // Best-effort cleanup only.
+        catch (err) {
+            if (streamError === undefined)
+                throw err;
         }
     }
 };
@@ -730,8 +792,7 @@ export const executePrepared = async (cypher, params) => {
         throw new Error(`Prepare failed: ${errMsg}`);
     }
     const queryResult = await conn.execute(stmt, params);
-    const result = Array.isArray(queryResult) ? queryResult[0] : queryResult;
-    return await result.getAll();
+    return await readQueryRows(queryResult);
 };
 export const executeWithReusedStatement = async (cypher, paramsList) => {
     if (!conn) {
@@ -749,7 +810,7 @@ export const executeWithReusedStatement = async (cypher, paramsList) => {
         }
         try {
             for (const params of subBatch) {
-                await conn.execute(stmt, params);
+                await drainQueryResult(await conn.execute(stmt, params));
             }
         }
         catch (e) {
@@ -767,8 +828,7 @@ export const getLbugStats = async () => {
     for (const tableName of NODE_TABLES) {
         try {
             const queryResult = await conn.query(`MATCH (n:${escapeTableName(tableName)}) RETURN count(n) AS cnt`);
-            const nodeResult = Array.isArray(queryResult) ? queryResult[0] : queryResult;
-            const nodeRows = await nodeResult.getAll();
+            const nodeRows = await readQueryRows(queryResult);
             if (nodeRows.length > 0) {
                 totalNodes += Number(nodeRows[0]?.cnt ?? nodeRows[0]?.[0] ?? 0);
             }
@@ -780,8 +840,7 @@ export const getLbugStats = async () => {
     let totalEdges = 0;
     try {
         const queryResult = await conn.query(`MATCH ()-[r:${REL_TABLE_NAME}]->() RETURN count(r) AS cnt`);
-        const edgeResult = Array.isArray(queryResult) ? queryResult[0] : queryResult;
-        const edgeRows = await edgeResult.getAll();
+        const edgeRows = await readQueryRows(queryResult);
         if (edgeRows.length > 0) {
             totalEdges = Number(edgeRows[0]?.cnt ?? edgeRows[0]?.[0] ?? 0);
         }
@@ -810,8 +869,7 @@ export const loadCachedEmbeddings = async () => {
         // If the query fails (column missing), we return empty cache to force a full rebuild.
         try {
             const check = await conn.query(`MATCH (e:${EMBEDDING_TABLE_NAME}) RETURN e.nodeId AS nodeId, e.chunkIndex AS chunkIndex LIMIT 1`);
-            const checkResult = Array.isArray(check) ? check[0] : check;
-            await checkResult.getAll();
+            await readQueryRows(check);
         }
         catch {
             return { embeddingNodeIds: new Set(), embeddings: [] };
@@ -833,8 +891,7 @@ export const loadCachedEmbeddings = async () => {
                 throw err;
             }
         }
-        const result = Array.isArray(rows) ? rows[0] : rows;
-        for (const row of await result.getAll()) {
+        for (const row of await readQueryRows(rows)) {
             const nodeId = String(row.nodeId ?? row[0] ?? '');
             if (!nodeId)
                 continue;
@@ -938,7 +995,8 @@ export const flushWAL = async () => {
     if (!conn)
         return;
     try {
-        await conn.query('CHECKPOINT');
+        const checkpointResult = await conn.query('CHECKPOINT');
+        await drainQueryResult(checkpointResult);
     }
     catch {
         /* ignore — older LadybugDB or schemaless DB may not accept it */
@@ -1036,12 +1094,11 @@ export const deleteNodesForFile = async (filePath, dbPath) => {
                 // First count how many we'll delete
                 const tn = escapeTableName(tableName);
                 const countResult = await targetConn.query(`MATCH (n:${tn}) WHERE n.filePath = '${escapedPath}' RETURN count(n) AS cnt`);
-                const result = Array.isArray(countResult) ? countResult[0] : countResult;
-                const rows = await result.getAll();
+                const rows = await readQueryRows(countResult);
                 const count = Number(rows[0]?.cnt ?? rows[0]?.[0] ?? 0);
                 if (count > 0) {
                     // Delete nodes (and implicitly their relationships via DETACH)
-                    await targetConn.query(`MATCH (n:${tn}) WHERE n.filePath = '${escapedPath}' DETACH DELETE n`);
+                    await queryAndDrain(targetConn, `MATCH (n:${tn}) WHERE n.filePath = '${escapedPath}' DETACH DELETE n`);
                     deletedNodes += count;
                 }
             }
@@ -1051,7 +1108,7 @@ export const deleteNodesForFile = async (filePath, dbPath) => {
         }
         // Also delete any embeddings for nodes in this file
         try {
-            await targetConn.query(`MATCH (e:${EMBEDDING_TABLE_NAME}) WHERE e.nodeId STARTS WITH '${escapedPath}' DELETE e`);
+            await queryAndDrain(targetConn, `MATCH (e:${EMBEDDING_TABLE_NAME}) WHERE e.nodeId STARTS WITH '${escapedPath}' DELETE e`);
         }
         catch {
             // Embedding table may not exist or nodeId format may differ
@@ -1158,7 +1215,7 @@ export const loadFTSExtension = async (targetConn, opts = {}) => {
     if (!c) {
         throw new Error('LadybugDB not initialized. Call initLbug first.');
     }
-    const loaded = await extensionManager.ensure((sql) => c.query(sql), 'fts', 'FTS', opts);
+    const loaded = await extensionManager.ensure((sql) => queryAndDrain(c, sql), 'fts', 'FTS', opts);
     if (loaded && useModuleState)
         ftsLoaded = true;
     return loaded;
@@ -1186,7 +1243,7 @@ export const loadVectorExtension = async (targetConn, opts = {}) => {
     if (!c) {
         throw new Error('LadybugDB not initialized. Call initLbug first.');
     }
-    const loaded = await extensionManager.ensure((sql) => c.query(sql), 'VECTOR', 'VECTOR', opts);
+    const loaded = await extensionManager.ensure((sql) => queryAndDrain(c, sql), 'VECTOR', 'VECTOR', opts);
     if (loaded && useModuleState)
         vectorExtensionLoaded = true;
     return loaded;
@@ -1211,7 +1268,7 @@ export const createFTSIndex = async (tableName, indexName, properties, stemmer =
     const propList = properties.map((p) => `'${p}'`).join(', ');
     const query = `CALL CREATE_FTS_INDEX('${tableName}', '${indexName}', [${propList}], stemmer := '${stemmer}')`;
     try {
-        await conn.query(query);
+        await queryAndDrain(conn, query);
         ensuredFTSIndexes.add(key);
     }
     catch (e) {
@@ -1280,8 +1337,7 @@ export const queryFTS = async (tableName, indexName, query, limit = 20, conjunct
   `;
     try {
         const queryResult = await conn.query(cypher);
-        const result = Array.isArray(queryResult) ? queryResult[0] : queryResult;
-        const rows = await result.getAll();
+        const rows = await readQueryRows(queryResult);
         return rows.map((row) => {
             const node = row.node || row[0] || {};
             const score = row.score ?? row[1] ?? 0;
@@ -1310,7 +1366,7 @@ export const dropFTSIndex = async (tableName, indexName) => {
         throw new Error('LadybugDB not initialized. Call initLbug first.');
     }
     try {
-        await conn.query(`CALL DROP_FTS_INDEX('${tableName}', '${indexName}')`);
+        await queryAndDrain(conn, `CALL DROP_FTS_INDEX('${tableName}', '${indexName}')`);
     }
     catch {
         // Index may not exist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitnexus",
-  "version": "1.6.5-rc.15",
+  "version": "1.6.5-rc.16",
   "description": "Graph-powered code intelligence for AI agents. Index any codebase, query via MCP or CLI.",
   "author": "Abhigyan Patwari",
   "license": "PolyForm-Noncommercial-1.0.0",