gitnexus 1.6.9-rc.30 → 1.6.9-rc.32

package/dist/core/group/extractors/http-route-extractor.d.ts

@@ -24,6 +24,8 @@ import type { ExtractedContract, RepoHandle } from '../types.js';
  * widen `HTTP_SCAN_GLOB` if needed.
  */
 export declare const HANDLES_ROUTE_QUERY = "\nMATCH (handlerFile:File)-[r:CodeRelation {type: 'HANDLES_ROUTE'}]->(route:Route)\nRETURN handlerFile.id AS fileId, handlerFile.filePath AS filePath,\n       route.name AS routePath, route.id AS routeId,\n       route.method AS routeMethod,\n       route.handlerSymbolId AS handlerSymbolId,\n       route.responseKeys AS responseKeys,\n       r.reason AS routeSource";
+export declare const RESOLVE_BY_NAME_QUERY = "\nMATCH (n) WHERE labels(n) IN ['Function','Method','CodeElement']\n  AND n.name = $name AND n.filePath <> ''\nRETURN n.id AS uid, n.name AS name, n.filePath AS filePath\nLIMIT 2";
+export declare const RESOLVE_IN_MODULE_QUERY = "\nMATCH (n) WHERE labels(n) IN ['Function','Method','CodeElement']\n  AND n.name = $name AND (n.filePath STARTS WITH $fileDot OR n.filePath STARTS WITH $fileSlash)\nRETURN n.id AS uid, n.name AS name, n.filePath AS filePath\nLIMIT 2";
 /**
  * Canonicalize a provider-side HTTP path for contract-id generation:
  *   - strip query string

package/dist/core/group/extractors/http-route-extractor.js

@@ -67,10 +67,21 @@ MATCH (sym:CodeElement)
 WHERE sym.filePath = $filePath AND sym.startLine IS NOT NULL AND sym.endLine IS NOT NULL
 RETURN sym.id AS uid, sym.name AS name, sym.filePath AS filePath,
        sym.startLine AS startLine, sym.endLine AS endLine, labels(sym) AS labels`;
-// Repo-wide lookup of a symbol by exact name (label-union, as in
-// manifest-extractor.ts). Used to resolve a provider's named handler when it is
-// defined in a file OTHER than its route registration — and only honored when
-// the result is unique (see resolveSymbolByNameUnique).
+// Repo-wide lookup of a symbol by exact name. Used to resolve a provider's
+// named handler when it is defined in a file OTHER than its route registration —
+// and only honored when the result is unique (see resolveSymbolByNameUnique).
+//
+// Label filtering uses `labels(n) IN [...]` rather than the openCypher
+// disjunction `MATCH (n:A|B|C)`. NOTE: this 3-label set (Function/Method/
+// CodeElement) actually PARSES — LadybugDB only rejects a disjunction that
+// names a reserved keyword (e.g. `Macro`, `Union`) or a missing node table,
+// neither of which applies here. So this query was NOT broken by #2325; it
+// uses the `labels(n) IN` form for consistency with the manifest custom-branch
+// fix (which WAS broken) and to stay immune if a reserved-keyword label is
+// added later. `labels(n)` returns the node's single label as a string here, so
+// `IN [...]` is an exact allowlist. (Exported so integration tests can run the
+// exact production query against a real LadybugDB — the bug shipped because no
+// test ran these strings against the real parser.)
 //
 // `n.filePath <> ''` excludes synthetic non-source `CodeElement` nodes that
 // carry no real file — ORM model/table nodes (orm.ts emits `filePath: ''`) and
@@ -78,9 +89,9 @@ RETURN sym.id AS uid, sym.name AS name, sym.filePath AS filePath,
 // degenerate edge-less node NOR inflates the uniqueness count and masks the real
 // handler. `LIMIT 2` bounds materialization: distinguishing unique (1) from
 // ambiguous (>=2) never needs more than two rows (the count guard stays exact).
-const RESOLVE_BY_NAME_QUERY = `
-MATCH (n:Function|Method|CodeElement)
-WHERE n.name = $name AND n.filePath <> ''
+export const RESOLVE_BY_NAME_QUERY = `
+MATCH (n) WHERE labels(n) IN ['Function','Method','CodeElement']
+  AND n.name = $name AND n.filePath <> ''
 RETURN n.id AS uid, n.name AS name, n.filePath AS filePath
 LIMIT 2`;
 // Resolve an IMPORTED handler by pinning it to the import's target module: the
@@ -89,9 +100,9 @@ LIMIT 2`;
 // the precise rung — it survives aliases and local same-name collisions that a
 // repo-wide name lookup cannot, and only resolves on a unique match within that
 // module. `LIMIT 2` keeps the uniqueness count exact (see RESOLVE_BY_NAME_QUERY).
-const RESOLVE_IN_MODULE_QUERY = `
-MATCH (n:Function|Method|CodeElement)
-WHERE n.name = $name AND (n.filePath STARTS WITH $fileDot OR n.filePath STARTS WITH $fileSlash)
+export const RESOLVE_IN_MODULE_QUERY = `
+MATCH (n) WHERE labels(n) IN ['Function','Method','CodeElement']
+  AND n.name = $name AND (n.filePath STARTS WITH $fileDot OR n.filePath STARTS WITH $fileSlash)
 RETURN n.id AS uid, n.name AS name, n.filePath AS filePath
 LIMIT 2`;
 // Source-file extensions an import specifier may resolve to (stripped before

package/dist/core/group/extractors/manifest-extractor.d.ts

@@ -4,6 +4,7 @@ export interface ManifestExtractResult {
     contracts: StoredContract[];
     crossLinks: CrossLink[];
 }
+export declare const CUSTOM_CONTRACT_RESOLVE_QUERY = "MATCH (n)\n   WHERE labels(n) IN ['Function','Method','Class','Interface','Struct','Enum','Trait','Constructor','TypeAlias','Impl','Macro','Union','Typedef','Property','Record','Delegate','Annotation','Template','Const','Static','CodeElement']\n     AND n.name = $symbolName\n   RETURN n.id AS uid, n.name AS name, n.filePath AS filePath\n   ORDER BY n.filePath ASC\n   LIMIT 1";
 /**
  * Stable synthetic symbolUid for a manifest-declared contract whose target
  * symbol could not be resolved against the per-repo graph (resolveSymbol

package/dist/core/group/extractors/manifest-extractor.js

@@ -1,4 +1,18 @@
 import { logger } from '../../logger.js';
+// Repo-wide symbol lookup for `custom` workspace contracts. Exported so the
+// #2325 integration test can run the EXACT production query against a real
+// LadybugDB — a hand-copied query string in the test would silently drift
+// from this allowlist. Uses the `labels(n) IN [...]` allowlist form rather
+// than a `MATCH (n:A|B)` disjunction: this 21-label list contains the
+// reserved-keyword labels `Macro` and `Union`, and LadybugDB's parser rejects
+// a disjunction that names a reserved keyword (#2325) — which the resolver's
+// try/catch then swallowed. `labels(n) IN` has no such collision.
+export const CUSTOM_CONTRACT_RESOLVE_QUERY = `MATCH (n)
+   WHERE labels(n) IN ['Function','Method','Class','Interface','Struct','Enum','Trait','Constructor','TypeAlias','Impl','Macro','Union','Typedef','Property','Record','Delegate','Annotation','Template','Const','Static','CodeElement']
+     AND n.name = $symbolName
+   RETURN n.id AS uid, n.name AS name, n.filePath AS filePath
+   ORDER BY n.filePath ASC
+   LIMIT 1`;
 /**
  * Canonicalize an HTTP path for matching against Route.name in the graph.
  * Mirrors core/ingestion/pipeline.ts ensureSlash semantics:
@@ -148,6 +162,18 @@ export class ManifestExtractor {
         // Cross-impact still works: the bridge query joins on the synthetic
         // uid, and the local impact engine derives the same uid for the
         // unresolved symbol — name-based hints are the additional safety net.
+        //
+        // Label filtering uses `MATCH (n) WHERE labels(n) IN [...]`, NOT the
+        // openCypher disjunction `MATCH (n:A|B|C)`. LadybugDB's parser rejects a
+        // disjunction that names a reserved keyword (`Macro` and `Union` both are)
+        // OR a label with no node table (e.g. the old `lib` branch's `Package`).
+        // The `custom` branch (reserved keywords in its list) and `lib` branch
+        // (missing `Package` table) genuinely threw (#2325) and the whole try/catch
+        // below swallowed it; the other branches parsed but use the same form for
+        // consistency and future-proofing. `labels(n)` returns the node's single
+        // label as a string here, so `IN [...]` is an exact allowlist that includes
+        // listed labels and excludes everything else — and is immune to both
+        // failure modes (no keyword collision; an unknown label is just a non-match).
         try {
             let rows;
             if (link.type === 'http') {
@@ -178,7 +204,7 @@ export class ManifestExtractor {
                 // listeners, publishers). Restrict to symbol-like labels to
                 // avoid cross-matching Files/Variables/Imports that happen to
                 // share the topic name.
-                rows = await executor(`MATCH (n:Function|Method|Class|Interface) WHERE n.name = $contract
+                rows = await executor(`MATCH (n) WHERE labels(n) IN ['Function','Method','Class','Interface'] AND n.name = $contract
            RETURN n.id AS uid, n.name AS name, n.filePath AS filePath
            ORDER BY n.filePath ASC
            LIMIT 1`, { contract: link.contract });
@@ -199,13 +225,13 @@ export class ManifestExtractor {
                 const serviceName = link.type === 'thrift' ? (rawServiceName.split('.').pop() ?? '') : rawServiceName;
                 const methodName = parts[1]?.trim() ?? '';
                 if (methodName) {
-                    rows = await executor(`MATCH (n:Function|Method) WHERE n.name = $methodName
+                    rows = await executor(`MATCH (n) WHERE labels(n) IN ['Function','Method'] AND n.name = $methodName
              RETURN n.id AS uid, n.name AS name, n.filePath AS filePath
              ORDER BY n.filePath ASC
              LIMIT 1`, { methodName });
                 }
                 else if (serviceName) {
-                    rows = await executor(`MATCH (n:Class|Interface) WHERE n.name = $serviceName
+                    rows = await executor(`MATCH (n) WHERE labels(n) IN ['Class','Interface'] AND n.name = $serviceName
              RETURN n.id AS uid, n.name AS name, n.filePath AS filePath
              ORDER BY n.filePath ASC
              LIMIT 1`, { serviceName });
@@ -217,10 +243,11 @@ export class ManifestExtractor {
             else if (link.type === 'lib') {
                 // Only exact match on the symbol's name. Previous fallback to
                 // CONTAINS on n.filePath would promote "react" to "react-native"
-                // or "@types/react" — silent wrong attribution. Restrict to
-                // package-level labels so we don't return arbitrary symbols
-                // named after a library.
-                rows = await executor(`MATCH (n:Package|Module) WHERE n.name = $contract
+                // or "@types/react" — silent wrong attribution. Restrict to the
+                // package-level `Module` label so we don't return arbitrary symbols
+                // named after a library. (There is no `Package` node table — see
+                // NODE_TABLES — so a `Package` entry only ever matched nothing.)
+                rows = await executor(`MATCH (n) WHERE labels(n) IN ['Module'] AND n.name = $contract
            RETURN n.id AS uid, n.name AS name, n.filePath AS filePath
            ORDER BY n.filePath ASC
            LIMIT 1`, { contract: link.contract });
@@ -238,11 +265,7 @@ export class ManifestExtractor {
                 const symbolName = link.contract.includes('::')
                     ? link.contract.split('::').pop()
                     : link.contract;
-                rows = await executor(`MATCH (n:Function|Method|Class|Interface|Struct|Enum|Trait|Constructor|TypeAlias|Impl|Macro|Union|Typedef|Property|Record|Delegate|Annotation|Template|Const|Static|CodeElement)
-           WHERE n.name = $symbolName
-           RETURN n.id AS uid, n.name AS name, n.filePath AS filePath
-           ORDER BY n.filePath ASC
-           LIMIT 1`, { symbolName });
+                rows = await executor(CUSTOM_CONTRACT_RESOLVE_QUERY, { symbolName });
             }
             else {
                 return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitnexus",
-  "version": "1.6.9-rc.30",
+  "version": "1.6.9-rc.32",
   "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",
@@ -61,7 +61,7 @@
     "@scarf/scarf": "^1.4.0",
     "busboy": "^1.6.0",
     "cli-progress": "^3.12.0",
-    "commander": "^14.0.3",
+    "commander": "^15.0.0",
     "cors": "^2.8.5",
     "express": "^5.2.1",
     "express-rate-limit": "^8.4.1",