gitnexus 1.6.5-rc.34 → 1.6.5-rc.35

package/dist/_shared/scope-resolution/symbol-definition.d.ts

@@ -28,6 +28,8 @@ export interface SymbolDefinition {
     returnType?: string;
     /** Declared type for non-callable symbols — fields/properties (e.g. 'Address', 'List<User>') */
     declaredType?: string;
+    /** Generic/template specialization arguments for class-like symbols (e.g. ['User'], ['T*']). */
+    templateArguments?: string[];
     /** Links Method/Constructor/Property to owning Class/Struct/Trait nodeId */
     ownerId?: string;
 }

package/dist/_shared/scope-resolution/symbol-definition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"symbol-definition.d.ts","sourceRoot":"","sources":["../../src/scope-resolution/symbol-definition.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEnD,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,SAAS,CAAC;IAChB;;+FAE2F;IAC3F,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;iHAC6G;IAC7G,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC;uFACmF;IACnF,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,6EAA6E;IAC7E,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gGAAgG;IAChG,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,4EAA4E;IAC5E,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB"}
+{"version":3,"file":"symbol-definition.d.ts","sourceRoot":"","sources":["../../src/scope-resolution/symbol-definition.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEnD,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,SAAS,CAAC;IAChB;;+FAE2F;IAC3F,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;iHAC6G;IAC7G,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC;uFACmF;IACnF,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,6EAA6E;IAC7E,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gGAAgG;IAChG,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gGAAgG;IAChG,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,4EAA4E;IAC5E,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB"}

package/dist/core/ingestion/class-extractors/configs/c-cpp.js

@@ -1,5 +1,27 @@
 // gitnexus/src/core/ingestion/class-extractors/configs/c-cpp.ts
 import { SupportedLanguages } from '../../../../_shared/index.js';
+import { extractTemplateArguments, stripTemplateArguments, } from '../../utils/template-arguments.js';
+function shouldSkipCppTemplateDuplicateCapture(captureMap, definitionName, capturedName) {
+    if (captureMap['template-arguments'] !== undefined)
+        return false;
+    if (!definitionName)
+        return false;
+    const argsFromDefinitionName = extractTemplateArguments(definitionName);
+    if (argsFromDefinitionName === undefined)
+        return false;
+    const argsFromCaptureName = capturedName ? extractTemplateArguments(capturedName) : undefined;
+    // Generic class capture emits only `List`, while the specialization-aware
+    // capture emits `List` + `@declaration.template-arguments`. Skip the former
+    // when the declaration name itself is templated to avoid duplicate class defs.
+    return argsFromCaptureName === undefined;
+}
+function extractCppTemplateArgumentsWithFallback(captureMap, definitionName, capturedName) {
+    return ((captureMap['template-arguments']
+        ? extractTemplateArguments(captureMap['template-arguments'].text)
+        : undefined) ??
+        (definitionName ? extractTemplateArguments(definitionName) : undefined) ??
+        (capturedName ? extractTemplateArguments(capturedName) : undefined));
+}
 export const cClassConfig = {
     language: SupportedLanguages.C,
     typeDeclarationNodes: ['struct_specifier', 'enum_specifier'],
@@ -8,4 +30,20 @@ export const cppClassConfig = {
     language: SupportedLanguages.CPlusPlus,
     typeDeclarationNodes: ['class_specifier', 'struct_specifier', 'enum_specifier'],
     ancestorScopeNodeTypes: ['namespace_definition', 'class_specifier', 'struct_specifier'],
+    extractName: (node) => {
+        const nameNode = node.childForFieldName?.('name');
+        if (!nameNode)
+            return undefined;
+        if (nameNode.type !== 'template_type')
+            return undefined;
+        return stripTemplateArguments(nameNode.text);
+    },
+    extractTemplateArguments: (node) => {
+        const nameNode = node.childForFieldName?.('name');
+        if (!nameNode || nameNode.type !== 'template_type')
+            return undefined;
+        return extractTemplateArguments(nameNode.text);
+    },
+    shouldSkipClassCapture: ({ captureMap, definitionNode, nameNode }) => shouldSkipCppTemplateDuplicateCapture(captureMap, definitionNode?.childForFieldName?.('name')?.text, nameNode?.text),
+    extractTemplateArgumentsFromCapture: ({ captureMap, definitionNode, nameNode }) => extractCppTemplateArgumentsWithFallback(captureMap, definitionNode?.childForFieldName?.('name')?.text, nameNode?.text),
 };

package/dist/core/ingestion/class-extractors/generic.js

@@ -116,10 +116,12 @@ export function createClassExtractor(config) {
             (isClassLikeLabel(fallback?.type) ? fallback.type : undefined);
         if (!name || !type)
             return null;
+        const templateArguments = config.extractTemplateArguments?.(node);
         return {
             name,
             type,
             qualifiedName: buildQualifiedName(node, name) || name,
+            ...(templateArguments !== undefined ? { templateArguments } : {}),
         };
     };
     return {
@@ -131,5 +133,11 @@ export function createClassExtractor(config) {
         extractQualifiedName(node, simpleName) {
             return extract(node, { name: simpleName })?.qualifiedName ?? null;
         },
+        shouldSkipClassCapture(context) {
+            return config.shouldSkipClassCapture?.(context) ?? false;
+        },
+        extractTemplateArgumentsFromCapture(context) {
+            return config.extractTemplateArgumentsFromCapture?.(context);
+        },
     };
 }

package/dist/core/ingestion/class-types.d.ts

@@ -5,6 +5,12 @@ export interface ExtractedClassSymbol {
     name: string;
     type: ClassLikeNodeLabel;
     qualifiedName: string;
+    templateArguments?: string[];
+}
+export interface ClassCaptureContext {
+    captureMap: Record<string, SyntaxNode>;
+    definitionNode: SyntaxNode | null;
+    nameNode: SyntaxNode | undefined;
 }
 /**
  * Cross-language qualified type names are normalized to dot-separated scope
@@ -21,6 +27,10 @@ export interface ClassExtractor {
         type?: NodeLabel | null;
     }): ExtractedClassSymbol | null;
     extractQualifiedName(node: SyntaxNode, simpleName: string): string | null;
+    shouldSkipClassCapture?(context: ClassCaptureContext & {
+        nodeLabel: ClassLikeNodeLabel;
+    }): boolean;
+    extractTemplateArgumentsFromCapture?(context: ClassCaptureContext): string[] | undefined;
 }
 export interface ClassExtractionConfig {
     language: SupportedLanguages;
@@ -31,4 +41,9 @@ export interface ClassExtractionConfig {
     extractName?: (node: SyntaxNode) => string | undefined;
     extractType?: (node: SyntaxNode) => ClassLikeNodeLabel | undefined;
     extractScopeSegments?: (node: SyntaxNode) => string[] | null | undefined;
+    extractTemplateArguments?: (node: SyntaxNode) => string[] | undefined;
+    shouldSkipClassCapture?(context: ClassCaptureContext & {
+        nodeLabel: ClassLikeNodeLabel;
+    }): boolean;
+    extractTemplateArgumentsFromCapture?(context: ClassCaptureContext): string[] | undefined;
 }

package/dist/core/ingestion/languages/cpp/interpret.d.ts

@@ -25,6 +25,11 @@ export declare function interpretCppImport(captures: CaptureMatch): ParsedImport
 export declare function interpretCppTypeBinding(captures: CaptureMatch): ParsedTypeBinding | null;
 /**
  * Normalize a C++ type name: strip pointer/array/reference syntax,
- * qualifiers, and template parameters (V1: generic-ignored).
+ * qualifiers, while preserving template arguments for specialization-aware
+ * receiver binding (`List<User>` vs `List<Order>`).
+ *
+ * Keeping template arguments here allows receiver-bound fallback to match
+ * specialization-specific class defs first; non-template behavior is preserved
+ * by base-name fallback in resolveClassBindingForName.
  */
 export declare function normalizeCppTypeName(text: string): string;

package/dist/core/ingestion/languages/cpp/interpret.js

@@ -82,7 +82,12 @@ export function interpretCppTypeBinding(captures) {
 }
 /**
  * Normalize a C++ type name: strip pointer/array/reference syntax,
- * qualifiers, and template parameters (V1: generic-ignored).
+ * qualifiers, while preserving template arguments for specialization-aware
+ * receiver binding (`List<User>` vs `List<Order>`).
+ *
+ * Keeping template arguments here allows receiver-bound fallback to match
+ * specialization-specific class defs first; non-template behavior is preserved
+ * by base-name fallback in resolveClassBindingForName.
  */
 export function normalizeCppTypeName(text) {
     let t = text.trim();
@@ -90,14 +95,6 @@ export function normalizeCppTypeName(text) {
     t = t
         .replace(/\b(const|volatile|restrict|static|extern|inline|mutable|constexpr|consteval)\b/g, '')
         .trim();
-    // Strip template parameters (loop handles nested: Map<List<int>> → Map)
-    while (t.includes('<')) {
-        const stripped = t.replace(/<[^<>]*>/g, '');
-        if (stripped === t)
-            break; // avoid infinite loop on malformed input
-        t = stripped;
-    }
-    t = t.trim();
     // Strip pointer stars
     while (t.endsWith('*'))
         t = t.slice(0, -1).trim();

package/dist/core/ingestion/languages/cpp/query.js

@@ -31,21 +31,47 @@ const CPP_SCOPE_QUERY = `
   name: (type_identifier) @declaration.name
   body: (field_declaration_list)) @declaration.class
 
+(class_specifier
+  name: (template_type
+    (type_identifier) @declaration.name
+    (template_argument_list) @declaration.template-arguments)
+  body: (field_declaration_list)) @declaration.class
+
 (struct_specifier
   name: (type_identifier) @declaration.name
   body: (field_declaration_list)) @declaration.struct
 
+(struct_specifier
+  name: (template_type
+    (type_identifier) @declaration.name
+    (template_argument_list) @declaration.template-arguments)
+  body: (field_declaration_list)) @declaration.struct
+
 ;; ─── Declarations — class / struct inside template_declaration ───────
 (template_declaration
   (class_specifier
     name: (type_identifier) @declaration.name
     body: (field_declaration_list)) @declaration.class)
 
+(template_declaration
+  (class_specifier
+    name: (template_type
+      (type_identifier) @declaration.name
+      (template_argument_list) @declaration.template-arguments)
+    body: (field_declaration_list)) @declaration.class)
+
 (template_declaration
   (struct_specifier
     name: (type_identifier) @declaration.name
     body: (field_declaration_list)) @declaration.struct)
 
+(template_declaration
+  (struct_specifier
+    name: (template_type
+      (type_identifier) @declaration.name
+      (template_argument_list) @declaration.template-arguments)
+    body: (field_declaration_list)) @declaration.struct)
+
 ;; ─── Declarations — enum ─────────────────────────────────────────────
 (enum_specifier
   name: (type_identifier) @declaration.name) @declaration.enum
@@ -222,6 +248,11 @@ const CPP_SCOPE_QUERY = `
   type: (type_identifier) @type-binding.type
   declarator: (identifier) @type-binding.name) @type-binding.annotation
 
+;; Covers: List<User> users;
+(declaration
+  type: (template_type) @type-binding.type
+  declarator: (identifier) @type-binding.name) @type-binding.annotation
+
 ;; ─── Type bindings — pointer variable declaration ───────────────────
 ;; Covers: User* ptr = new User()
 (declaration

package/dist/core/ingestion/model/symbol-table.d.ts

@@ -99,6 +99,7 @@ export interface AddMetadata {
     parameterTypes?: string[];
     returnType?: string;
     declaredType?: string;
+    templateArguments?: string[];
     ownerId?: string;
     qualifiedName?: string;
 }

package/dist/core/ingestion/model/symbol-table.js

@@ -130,6 +130,9 @@ export const createSymbolTable = () => {
                 : {}),
             ...(metadata?.returnType !== undefined ? { returnType: metadata.returnType } : {}),
             ...(metadata?.declaredType !== undefined ? { declaredType: metadata.declaredType } : {}),
+            ...(metadata?.templateArguments !== undefined
+                ? { templateArguments: metadata.templateArguments }
+                : {}),
             ...(metadata?.ownerId !== undefined ? { ownerId: metadata.ownerId } : {}),
         };
         // A. File Index — unconditional.

package/dist/core/ingestion/parsing-processor.js

@@ -11,6 +11,7 @@ import { getDefinitionNodeFromCaptures, findEnclosingClassInfo, getLabelFromCapt
 import { detectFrameworkFromAST } from './framework-detection.js';
 import { buildTypeEnv } from './type-env.js';
 import { buildMethodProps, arityForIdFromInfo, typeTagForId, constTagForId, buildCollisionGroups, } from './utils/method-props.js';
+import { extractTemplateArguments, templateArgumentsIdTag } from './utils/template-arguments.js';
 import { logger } from '../logger.js';
 import { getTreeSitterBufferSize, getTreeSitterContentByteLength, TREE_SITTER_MAX_BUFFER, } from './constants.js';
 // ============================================================================
@@ -58,6 +59,7 @@ export const mergeChunkResults = (graph, symbolTable, chunkResults) => {
                 parameterTypes: sym.parameterTypes,
                 returnType: sym.returnType,
                 declaredType: sym.declaredType,
+                templateArguments: sym.templateArguments,
                 ownerId: sym.ownerId,
                 qualifiedName: sym.qualifiedName,
             });
@@ -365,6 +367,20 @@ const processParsingSequential = async (graph, files, symbolTable, astCache, sco
                 })
                 : null;
             const nodeLabel = extractedClassSymbol?.type ?? defaultNodeLabel;
+            const isClassLikeLabel = nodeLabel === 'Class' ||
+                nodeLabel === 'Struct' ||
+                nodeLabel === 'Interface' ||
+                nodeLabel === 'Enum' ||
+                nodeLabel === 'Record';
+            if (isClassLikeLabel &&
+                provider.classExtractor?.shouldSkipClassCapture?.({
+                    captureMap,
+                    definitionNode,
+                    nameNode,
+                    nodeLabel,
+                }) === true) {
+                return;
+            }
             // Synthesize name for constructors without explicit @name capture (e.g. Swift init)
             if (!nameNode && nodeLabel !== 'Constructor' && !extractedClassSymbol)
                 return;
@@ -464,7 +480,26 @@ const processParsingSequential = async (graph, files, symbolTable, astCache, sco
                 arityTag += typeTagForId(cached.map, nodeName, arityForId, seqDefMethodInfo, language, cached.groups);
                 arityTag += constTagForId(cached.map, nodeName, arityForId, seqDefMethodInfo, cached.groups);
             }
-            const nodeId = generateId(nodeLabel, `${file.path}:${qualifiedName}${arityTag}`);
+            const classTemplateArguments = extractedClassSymbol?.templateArguments ??
+                provider.classExtractor?.extractTemplateArgumentsFromCapture?.({
+                    captureMap,
+                    definitionNode,
+                    nameNode,
+                }) ??
+                (captureMap['template-arguments']
+                    ? extractTemplateArguments(captureMap['template-arguments'].text)
+                    : undefined) ??
+                (nameNode && nameNode.text ? extractTemplateArguments(nameNode.text) : undefined);
+            const classTemplateTag = (nodeLabel === 'Class' ||
+                nodeLabel === 'Struct' ||
+                nodeLabel === 'Interface' ||
+                nodeLabel === 'Enum' ||
+                nodeLabel === 'Record') &&
+                classTemplateArguments !== undefined &&
+                classTemplateArguments.length > 0
+                ? templateArgumentsIdTag(classTemplateArguments)
+                : '';
+            const nodeId = generateId(nodeLabel, `${file.path}:${qualifiedName}${classTemplateTag}${arityTag}`);
             const classNodeForSymbol = definitionNodeForRange || definitionNode || nameNode;
             const qualifiedTypeName = extractedClassSymbol?.qualifiedName ??
                 (classNodeForSymbol && provider.classExtractor?.isTypeDeclaration(classNodeForSymbol)
@@ -490,6 +525,9 @@ const processParsingSequential = async (graph, files, symbolTable, astCache, sco
                         ? isVueSetupTopLevel(nameNode || definitionNodeForRange)
                         : cachedExportCheck(provider.exportChecker, nameNode || definitionNodeForRange, nodeName),
                     ...(qualifiedTypeName !== undefined ? { qualifiedName: qualifiedTypeName } : {}),
+                    ...(classTemplateArguments !== undefined && classTemplateArguments.length > 0
+                        ? { templateArguments: classTemplateArguments }
+                        : {}),
                     ...(frameworkHint
                         ? {
                             astFrameworkMultiplier: frameworkHint.entryPointMultiplier,
@@ -543,6 +581,7 @@ const processParsingSequential = async (graph, files, symbolTable, astCache, sco
                 parameterTypes: methodProps.parameterTypes,
                 returnType: methodProps.returnType,
                 declaredType,
+                templateArguments: classTemplateArguments,
                 ownerId: enclosingClassId ?? undefined,
                 qualifiedName: qualifiedTypeName,
             });

package/dist/core/ingestion/scope-extractor.js

@@ -59,6 +59,7 @@
  *   - `ParsedFile.referenceSites` — pre-resolution usage facts.
  */
 import { buildPositionIndex, buildScopeTree, canParentScope, makeScopeId } from '../../_shared/index.js';
+import { extractTemplateArguments } from './utils/template-arguments.js';
 // ─── Public entry point ─────────────────────────────────────────────────────
 /**
  * Drive the five extraction passes and return a `ParsedFile`.
@@ -362,6 +363,8 @@ function buildDefFromDeclarationMatch(match, anchor, filePath) {
         return undefined;
     const qualifiedCap = match['@declaration.qualified_name'];
     const qualifiedName = qualifiedCap?.text;
+    const templateArguments = extractTemplateArguments(match['@declaration.template-arguments']?.text ?? '') ??
+        extractTemplateArguments(qualifiedName ?? nameCap.text);
     // Optional arity metadata — producers (e.g. Python emit-captures)
     // synthesize these on function/method declarations. Their absence is
     // the normal case for other producers; readers treat undefined as
@@ -381,6 +384,7 @@ function buildDefFromDeclarationMatch(match, anchor, filePath) {
         ...(parameterTypes !== undefined ? { parameterTypes } : {}),
         ...(declaredType !== undefined ? { declaredType } : {}),
         ...(returnType !== undefined ? { returnType } : {}),
+        ...(templateArguments !== undefined ? { templateArguments } : {}),
     };
 }
 function parseIntCapture(cap) {

package/dist/core/ingestion/scope-resolution/graph-bridge/ids.d.ts

@@ -40,6 +40,7 @@ export declare function resolveDefGraphId(filePath: string, def: {
     qualifiedName?: string;
     type?: NodeLabel;
     parameterTypes?: readonly string[];
+    templateArguments?: readonly string[];
 }, nodeLookup: GraphNodeLookup): string | undefined;
 /** Derive the simple (unqualified) name of a def from its `qualifiedName`. */
 export declare function simpleQualifiedName(def: SymbolDefinition): string | undefined;

package/dist/core/ingestion/scope-resolution/graph-bridge/ids.js

@@ -79,6 +79,18 @@ export function resolveDefGraphId(filePath, def, nodeLookup) {
             if (pHit !== undefined)
                 return pHit;
         }
+        if ((def.type === 'Class' ||
+            def.type === 'Struct' ||
+            def.type === 'Interface' ||
+            def.type === 'Enum' ||
+            def.type === 'Record') &&
+            def.templateArguments !== undefined &&
+            def.templateArguments.length > 0) {
+            const tKey = qualifiedKey(filePath, def.type, `${qn}~${def.templateArguments.join(',')}`);
+            const tHit = nodeLookup.get(tKey);
+            if (tHit !== undefined)
+                return tHit;
+        }
         const qualifiedHit = nodeLookup.get(qualifiedKey(filePath, def.type, qn));
         if (qualifiedHit !== undefined)
             return qualifiedHit;

package/dist/core/ingestion/scope-resolution/graph-bridge/node-lookup.js

@@ -86,6 +86,17 @@ export function buildGraphNodeLookup(graph) {
                 // Each overload is unique — set unconditionally.
                 lookup.set(pKey, node.id);
             }
+            if ((node.label === 'Class' ||
+                node.label === 'Struct' ||
+                node.label === 'Interface' ||
+                node.label === 'Enum' ||
+                node.label === 'Record') &&
+                props.templateArguments !== undefined &&
+                props.templateArguments.length > 0) {
+                const tKey = qualifiedKey(props.filePath, node.label, `${qualified}~${props.templateArguments.join(',')}`);
+                if (!lookup.has(tKey))
+                    lookup.set(tKey, node.id);
+            }
         }
         // Fallback key: simple name. First-wins within a file — used when
         // the caller doesn't know the qualifier (unqualified free-call

package/dist/core/ingestion/scope-resolution/passes/receiver-bound-calls.js

@@ -37,6 +37,48 @@ import { tryEmitEdge } from '../graph-bridge/edges.js';
 import { resolveCompoundReceiverClass } from '../passes/compound-receiver.js';
 import { resolveDefGraphId } from '../graph-bridge/ids.js';
 import { narrowOverloadCandidates, isOverloadAmbiguousAfterNormalization, } from './overload-narrowing.js';
+import { extractTemplateArguments, stripTemplateArguments, } from '../../utils/template-arguments.js';
+function normalizeTemplateArgToken(value) {
+    return value.replace(/\s+/g, '');
+}
+function resolveClassBindingForName(scopeId, rawClassName, scopes) {
+    const direct = findClassBindingInScope(scopeId, rawClassName, scopes);
+    if (direct !== undefined)
+        return direct;
+    if (!rawClassName.includes('<'))
+        return undefined;
+    const baseName = stripTemplateArguments(rawClassName).replace(/\s+/g, '');
+    if (baseName.length === 0)
+        return undefined;
+    const wantedArgs = extractTemplateArguments(rawClassName)?.map(normalizeTemplateArgToken);
+    if (wantedArgs !== undefined && wantedArgs.length > 0) {
+        // qualifiedNames is a Map and may not contain the stripped base name at all
+        // (e.g., unresolved type binding or only template-qualified entries), so
+        // default to [] before checking `.length`.
+        const qnameIds = scopes.qualifiedNames.get(baseName) ?? [];
+        if (qnameIds.length === 0) {
+            return findClassBindingInScope(scopeId, baseName, scopes);
+        }
+        const matches = [];
+        for (const id of qnameIds) {
+            const def = scopes.defs.get(id);
+            if (def === undefined || !isClassLike(def.type))
+                continue;
+            const defArgs = def.templateArguments?.map(normalizeTemplateArgToken);
+            if (defArgs !== undefined &&
+                defArgs.length === wantedArgs.length &&
+                defArgs.every((value, i) => value === wantedArgs[i])) {
+                matches.push(def);
+            }
+        }
+        if (matches.length === 1)
+            return matches[0];
+        // Scope extractor only records class definitions with bodies in C++, so
+        // forward declarations are not expected here. Keep fallback behavior for
+        // safety in non-ODR or mixed-language edge cases.
+    }
+    return findClassBindingInScope(scopeId, baseName, scopes);
+}
 export function emitReceiverBoundCalls(graph, scopes, parsedFiles, nodeLookup, handledSites, provider, index, model) {
     let emitted = 0;
     // Per-pass dedup so the multiple cases don't double-emit if two of
@@ -322,7 +364,7 @@ export function emitReceiverBoundCalls(graph, scopes, parsedFiles, nodeLookup, h
             }
             // ── Case 4: simple typeBinding (`u: U`) ──────────────────────
             if (typeRef !== undefined && !typeRef.rawName.includes('.')) {
-                let ownerDef = findClassBindingInScope(site.inScope, typeRef.rawName, scopes);
+                let ownerDef = resolveClassBindingForName(site.inScope, typeRef.rawName, scopes);
                 // `findClassBindingInScope(..., typeRef.rawName)` only works when
                 // rawName is itself a class symbol reachable through scope bindings.
                 // For languages with namespace-style imports (Go), imported types

package/dist/core/ingestion/tree-sitter-queries.d.ts

@@ -4,7 +4,7 @@ export declare const PYTHON_QUERIES = "\n(class_definition\n  name: (identifier)
 export declare const JAVA_QUERIES = "\n; Classes, Interfaces, Enums, Annotations\n(class_declaration name: (identifier) @name) @definition.class\n(interface_declaration name: (identifier) @name) @definition.interface\n(enum_declaration name: (identifier) @name) @definition.enum\n(annotation_type_declaration name: (identifier) @name) @definition.annotation\n\n; Methods & Constructors\n(method_declaration name: (identifier) @name) @definition.method\n(constructor_declaration name: (identifier) @name) @definition.constructor\n\n; Fields \u2014 typed field declarations inside class bodies\n(field_declaration\n  declarator: (variable_declarator\n    name: (identifier) @name)) @definition.property\n\n; Imports - capture any import declaration child as source\n(import_declaration (_) @import.source) @import\n\n; Calls\n(method_invocation name: (identifier) @call.name) @call\n(method_invocation object: (_) name: (identifier) @call.name) @call\n(method_reference) @call\n\n; Constructor calls: new Foo()\n(object_creation_expression type: (type_identifier) @call.name) @call\n\n; Local variable declarations inside method bodies\n(local_variable_declaration\n  declarator: (variable_declarator\n    name: (identifier) @name)) @definition.variable\n\n; Heritage - extends class\n(class_declaration name: (identifier) @heritage.class\n  (superclass (type_identifier) @heritage.extends)) @heritage\n\n; Heritage - implements interfaces\n(class_declaration name: (identifier) @heritage.class\n  (super_interfaces (type_list (type_identifier) @heritage.implements))) @heritage.impl\n\n; Write access: obj.field = value\n(assignment_expression\n  left: (field_access\n    object: (_) @assignment.receiver\n    field: (identifier) @assignment.property)\n  right: (_)) @assignment\n";
 export declare const C_QUERIES = "\n; Functions (direct declarator)\n(function_definition declarator: (function_declarator declarator: (identifier) @name)) @definition.function\n(declaration declarator: (function_declarator declarator: (identifier) @name)) @definition.function\n\n; Functions returning pointers (pointer_declarator wraps function_declarator)\n(function_definition declarator: (pointer_declarator declarator: (function_declarator declarator: (identifier) @name))) @definition.function\n(declaration declarator: (pointer_declarator declarator: (function_declarator declarator: (identifier) @name))) @definition.function\n\n; Functions returning double pointers (nested pointer_declarator)\n(function_definition declarator: (pointer_declarator declarator: (pointer_declarator declarator: (function_declarator declarator: (identifier) @name)))) @definition.function\n\n; Structs, Unions, Enums, Typedefs\n(struct_specifier name: (type_identifier) @name) @definition.struct\n(union_specifier name: (type_identifier) @name) @definition.union\n(enum_specifier name: (type_identifier) @name) @definition.enum\n(type_definition declarator: (type_identifier) @name) @definition.typedef\n\n; Macros\n(preproc_function_def name: (identifier) @name) @definition.macro\n(preproc_def name: (identifier) @name) @definition.macro\n\n; Includes\n(preproc_include path: (_) @import.source) @import\n\n; Calls\n(call_expression function: (identifier) @call.name) @call\n(call_expression function: (field_expression field: (field_identifier) @call.name)) @call\n\n; Variable declarations: int x = 5; or int x;\n(declaration\n  declarator: (init_declarator\n    declarator: (identifier) @name)) @definition.variable\n";
 export declare const GO_QUERIES = "\n; Functions & Methods\n(function_declaration name: (identifier) @name) @definition.function\n(method_declaration name: (field_identifier) @name) @definition.method\n\n; Types\n(type_declaration (type_spec name: (type_identifier) @name type: (struct_type))) @definition.struct\n(type_declaration (type_spec name: (type_identifier) @name type: (interface_type))) @definition.interface\n\n; Imports\n(import_declaration (import_spec path: (interpreted_string_literal) @import.source)) @import\n(import_declaration (import_spec_list (import_spec path: (interpreted_string_literal) @import.source))) @import\n\n; Struct fields \u2014 named field declarations inside struct types\n(field_declaration_list\n  (field_declaration\n    name: (field_identifier) @name) @definition.property)\n\n; Struct embedding (anonymous fields = inheritance)\n(type_declaration\n  (type_spec\n    name: (type_identifier) @heritage.class\n    type: (struct_type\n      (field_declaration_list\n        (field_declaration\n          type: (type_identifier) @heritage.extends))))) @definition.struct\n\n; Calls\n(call_expression function: (identifier) @call.name) @call\n(call_expression function: (selector_expression field: (field_identifier) @call.name)) @call\n\n; Const/var declarations\n(const_declaration (const_spec name: (identifier) @name)) @definition.const\n(var_declaration (var_spec name: (identifier) @name)) @definition.variable\n\n; Short variable declaration: x := 5\n(short_var_declaration left: (expression_list (identifier) @name)) @definition.variable\n\n; Struct literal construction: User{Name: \"Alice\"}\n(composite_literal type: (type_identifier) @call.name) @call\n\n; Write access: obj.field = value\n(assignment_statement\n  left: (expression_list\n    (selector_expression\n      operand: (_) @assignment.receiver\n      field: (field_identifier) @assignment.property))\n  right: (_)) @assignment\n\n; Write access: obj.field++ / obj.field--\n(inc_statement\n  (selector_expression\n    operand: (_) @assignment.receiver\n    field: (field_identifier) @assignment.property)) @assignment\n(dec_statement\n  (selector_expression\n    operand: (_) @assignment.receiver\n    field: (field_identifier) @assignment.property)) @assignment\n";
-export declare const CPP_QUERIES = "\n; Classes, Structs, Namespaces\n(class_specifier name: (type_identifier) @name) @definition.class\n(struct_specifier name: (type_identifier) @name) @definition.struct\n(namespace_definition name: (namespace_identifier) @name) @definition.namespace\n(enum_specifier name: (type_identifier) @name) @definition.enum\n\n; Typedefs and unions (common in C-style headers and mixed C/C++ code)\n(type_definition declarator: (type_identifier) @name) @definition.typedef\n(union_specifier name: (type_identifier) @name) @definition.union\n\n; Macros\n(preproc_function_def name: (identifier) @name) @definition.macro\n(preproc_def name: (identifier) @name) @definition.macro\n\n; Functions & Methods (direct declarator)\n(function_definition declarator: (function_declarator declarator: (identifier) @name)) @definition.function\n(function_definition declarator: (function_declarator declarator: (qualified_identifier name: (identifier) @name))) @definition.method\n\n; Functions/methods returning pointers (pointer_declarator wraps function_declarator)\n(function_definition declarator: (pointer_declarator declarator: (function_declarator declarator: (identifier) @name))) @definition.function\n(function_definition declarator: (pointer_declarator declarator: (function_declarator declarator: (qualified_identifier name: (identifier) @name)))) @definition.method\n\n; Functions/methods returning double pointers (nested pointer_declarator)\n(function_definition declarator: (pointer_declarator declarator: (pointer_declarator declarator: (function_declarator declarator: (identifier) @name)))) @definition.function\n(function_definition declarator: (pointer_declarator declarator: (pointer_declarator declarator: (function_declarator declarator: (qualified_identifier name: (identifier) @name))))) @definition.method\n\n; Functions/methods returning references (reference_declarator wraps function_declarator)\n(function_definition declarator: (reference_declarator (function_declarator declarator: (identifier) @name))) @definition.function\n(function_definition declarator: (reference_declarator (function_declarator declarator: (qualified_identifier name: (identifier) @name)))) @definition.method\n\n; Destructors (destructor_name is distinct from identifier in tree-sitter-cpp)\n(function_definition declarator: (function_declarator declarator: (qualified_identifier name: (destructor_name) @name))) @definition.method\n\n; Function declarations / prototypes (common in headers)\n(declaration declarator: (function_declarator declarator: (identifier) @name)) @definition.function\n(declaration declarator: (pointer_declarator declarator: (function_declarator declarator: (identifier) @name))) @definition.function\n\n; Class/struct data member fields (Address address; int count;)\n; Uses field_identifier to exclude method declarations (which use function_declarator)\n(field_declaration\n  declarator: (field_identifier) @name) @definition.property\n\n; Pointer member fields (Address* address;)\n(field_declaration\n  declarator: (pointer_declarator\n    declarator: (field_identifier) @name)) @definition.property\n\n; Reference member fields (Address& address;)\n(field_declaration\n  declarator: (reference_declarator\n    (field_identifier) @name)) @definition.property\n\n; Inline class method declarations (inside class body, no body: void save();)\n; tree-sitter-cpp uses field_identifier (not identifier) for names inside class bodies\n(field_declaration declarator: (function_declarator declarator: [(field_identifier) (identifier)] @name)) @definition.method\n\n; Inline class method declarations returning a pointer (User* lookup();)\n(field_declaration declarator: (pointer_declarator declarator: (function_declarator declarator: [(field_identifier) (identifier)] @name))) @definition.method\n\n; Inline class method declarations returning a reference (User& lookup();)\n(field_declaration declarator: (reference_declarator (function_declarator declarator: [(field_identifier) (identifier)] @name))) @definition.method\n\n; Inline class method definitions (inside class body, with body: void Foo() { ... })\n(field_declaration_list\n  (function_definition\n    declarator: (function_declarator\n      declarator: [(field_identifier) (identifier) (operator_name) (destructor_name)] @name)) @definition.method)\n\n; Inline class methods returning a pointer type (User* lookup(int id) { ... })\n(field_declaration_list\n  (function_definition\n    declarator: (pointer_declarator\n      declarator: (function_declarator\n        declarator: [(field_identifier) (identifier) (operator_name)] @name))) @definition.method)\n\n; Inline class methods returning a reference type (User& lookup(int id) { ... })\n(field_declaration_list\n  (function_definition\n    declarator: (reference_declarator\n      (function_declarator\n        declarator: [(field_identifier) (identifier) (operator_name)] @name))) @definition.method)\n\n; Templates\n(template_declaration (class_specifier name: (type_identifier) @name)) @definition.template\n(template_declaration (function_definition declarator: (function_declarator declarator: (identifier) @name))) @definition.template\n\n; Includes\n(preproc_include path: (_) @import.source) @import\n\n; Calls\n(call_expression function: (identifier) @call.name) @call\n(call_expression function: (field_expression field: (field_identifier) @call.name)) @call\n(call_expression function: (qualified_identifier name: (identifier) @call.name)) @call\n(call_expression function: (template_function name: (identifier) @call.name)) @call\n\n; Constructor calls: new User()\n(new_expression type: (type_identifier) @call.name) @call\n\n; Variable declarations: int x = 5; or auto x = 5;\n(declaration\n  declarator: (init_declarator\n    declarator: (identifier) @name)) @definition.variable\n\n; Heritage\n(class_specifier name: (type_identifier) @heritage.class\n  (base_class_clause (type_identifier) @heritage.extends)) @heritage\n(class_specifier name: (type_identifier) @heritage.class\n  (base_class_clause (access_specifier) (type_identifier) @heritage.extends)) @heritage\n\n; Write access: obj.field = value\n(assignment_expression\n  left: (field_expression\n    argument: (_) @assignment.receiver\n    field: (field_identifier) @assignment.property)\n  right: (_)) @assignment\n\n";
+export declare const CPP_QUERIES = "\n; Classes, Structs, Namespaces\n(class_specifier name: (type_identifier) @name) @definition.class\n(class_specifier\n  name: (template_type\n    (type_identifier) @name\n    (template_argument_list) @template-arguments)) @definition.class\n(struct_specifier name: (type_identifier) @name) @definition.struct\n(struct_specifier\n  name: (template_type\n    (type_identifier) @name\n    (template_argument_list) @template-arguments)) @definition.struct\n(namespace_definition name: (namespace_identifier) @name) @definition.namespace\n(enum_specifier name: (type_identifier) @name) @definition.enum\n\n; Typedefs and unions (common in C-style headers and mixed C/C++ code)\n(type_definition declarator: (type_identifier) @name) @definition.typedef\n(union_specifier name: (type_identifier) @name) @definition.union\n\n; Macros\n(preproc_function_def name: (identifier) @name) @definition.macro\n(preproc_def name: (identifier) @name) @definition.macro\n\n; Functions & Methods (direct declarator)\n(function_definition declarator: (function_declarator declarator: (identifier) @name)) @definition.function\n(function_definition declarator: (function_declarator declarator: (qualified_identifier name: (identifier) @name))) @definition.method\n\n; Functions/methods returning pointers (pointer_declarator wraps function_declarator)\n(function_definition declarator: (pointer_declarator declarator: (function_declarator declarator: (identifier) @name))) @definition.function\n(function_definition declarator: (pointer_declarator declarator: (function_declarator declarator: (qualified_identifier name: (identifier) @name)))) @definition.method\n\n; Functions/methods returning double pointers (nested pointer_declarator)\n(function_definition declarator: (pointer_declarator declarator: (pointer_declarator declarator: (function_declarator declarator: (identifier) @name)))) @definition.function\n(function_definition declarator: (pointer_declarator declarator: (pointer_declarator declarator: (function_declarator declarator: (qualified_identifier name: (identifier) @name))))) @definition.method\n\n; Functions/methods returning references (reference_declarator wraps function_declarator)\n(function_definition declarator: (reference_declarator (function_declarator declarator: (identifier) @name))) @definition.function\n(function_definition declarator: (reference_declarator (function_declarator declarator: (qualified_identifier name: (identifier) @name)))) @definition.method\n\n; Destructors (destructor_name is distinct from identifier in tree-sitter-cpp)\n(function_definition declarator: (function_declarator declarator: (qualified_identifier name: (destructor_name) @name))) @definition.method\n\n; Function declarations / prototypes (common in headers)\n(declaration declarator: (function_declarator declarator: (identifier) @name)) @definition.function\n(declaration declarator: (pointer_declarator declarator: (function_declarator declarator: (identifier) @name))) @definition.function\n\n; Class/struct data member fields (Address address; int count;)\n; Uses field_identifier to exclude method declarations (which use function_declarator)\n(field_declaration\n  declarator: (field_identifier) @name) @definition.property\n\n; Pointer member fields (Address* address;)\n(field_declaration\n  declarator: (pointer_declarator\n    declarator: (field_identifier) @name)) @definition.property\n\n; Reference member fields (Address& address;)\n(field_declaration\n  declarator: (reference_declarator\n    (field_identifier) @name)) @definition.property\n\n; Inline class method declarations (inside class body, no body: void save();)\n; tree-sitter-cpp uses field_identifier (not identifier) for names inside class bodies\n(field_declaration declarator: (function_declarator declarator: [(field_identifier) (identifier)] @name)) @definition.method\n\n; Inline class method declarations returning a pointer (User* lookup();)\n(field_declaration declarator: (pointer_declarator declarator: (function_declarator declarator: [(field_identifier) (identifier)] @name))) @definition.method\n\n; Inline class method declarations returning a reference (User& lookup();)\n(field_declaration declarator: (reference_declarator (function_declarator declarator: [(field_identifier) (identifier)] @name))) @definition.method\n\n; Inline class method definitions (inside class body, with body: void Foo() { ... })\n(field_declaration_list\n  (function_definition\n    declarator: (function_declarator\n      declarator: [(field_identifier) (identifier) (operator_name) (destructor_name)] @name)) @definition.method)\n\n; Inline class methods returning a pointer type (User* lookup(int id) { ... })\n(field_declaration_list\n  (function_definition\n    declarator: (pointer_declarator\n      declarator: (function_declarator\n        declarator: [(field_identifier) (identifier) (operator_name)] @name))) @definition.method)\n\n; Inline class methods returning a reference type (User& lookup(int id) { ... })\n(field_declaration_list\n  (function_definition\n    declarator: (reference_declarator\n      (function_declarator\n        declarator: [(field_identifier) (identifier) (operator_name)] @name))) @definition.method)\n\n; Templates\n(template_declaration (class_specifier name: (type_identifier) @name)) @definition.template\n(template_declaration\n  (class_specifier\n    name: (template_type\n      (type_identifier) @name\n      (template_argument_list) @template-arguments))) @definition.template\n(template_declaration (function_definition declarator: (function_declarator declarator: (identifier) @name))) @definition.template\n\n; Includes\n(preproc_include path: (_) @import.source) @import\n\n; Calls\n(call_expression function: (identifier) @call.name) @call\n(call_expression function: (field_expression field: (field_identifier) @call.name)) @call\n(call_expression function: (qualified_identifier name: (identifier) @call.name)) @call\n(call_expression function: (template_function name: (identifier) @call.name)) @call\n\n; Constructor calls: new User()\n(new_expression type: (type_identifier) @call.name) @call\n\n; Variable declarations: int x = 5; or auto x = 5;\n(declaration\n  declarator: (init_declarator\n    declarator: (identifier) @name)) @definition.variable\n\n; Heritage\n(class_specifier name: (type_identifier) @heritage.class\n  (base_class_clause (type_identifier) @heritage.extends)) @heritage\n(class_specifier name: (type_identifier) @heritage.class\n  (base_class_clause (access_specifier) (type_identifier) @heritage.extends)) @heritage\n\n; Write access: obj.field = value\n(assignment_expression\n  left: (field_expression\n    argument: (_) @assignment.receiver\n    field: (field_identifier) @assignment.property)\n  right: (_)) @assignment\n\n";
 export declare const CSHARP_QUERIES = "\n; Types\n(class_declaration name: (identifier) @name) @definition.class\n(interface_declaration name: (identifier) @name) @definition.interface\n(struct_declaration name: (identifier) @name) @definition.struct\n(enum_declaration name: (identifier) @name) @definition.enum\n(record_declaration name: (identifier) @name) @definition.record\n(delegate_declaration name: (identifier) @name) @definition.delegate\n\n; Namespaces (block form and C# 10+ file-scoped form)\n(namespace_declaration name: (identifier) @name) @definition.namespace\n(namespace_declaration name: (qualified_name) @name) @definition.namespace\n(file_scoped_namespace_declaration name: (identifier) @name) @definition.namespace\n(file_scoped_namespace_declaration name: (qualified_name) @name) @definition.namespace\n\n; Methods & Properties\n(method_declaration name: (identifier) @name) @definition.method\n(local_function_statement name: (identifier) @name) @definition.function\n(constructor_declaration name: (identifier) @name) @definition.constructor\n(property_declaration name: (identifier) @name) @definition.property\n\n; Primary constructors (C# 12): class User(string name, int age) { }\n(class_declaration name: (identifier) @name (parameter_list) @definition.constructor)\n(record_declaration name: (identifier) @name (parameter_list) @definition.constructor)\n\n; Using\n(using_directive (qualified_name) @import.source) @import\n(using_directive (identifier) @import.source) @import\n\n; Calls\n(invocation_expression function: (identifier) @call.name) @call\n(invocation_expression function: (member_access_expression name: (identifier) @call.name)) @call\n\n; Null-conditional method calls: user?.Save()\n; Parses as: invocation_expression \u2192 conditional_access_expression \u2192 member_binding_expression \u2192 identifier\n(invocation_expression\n  function: (conditional_access_expression\n    (member_binding_expression\n      (identifier) @call.name))) @call\n\n; Constructor calls: new Foo() and new Foo { Props }\n(object_creation_expression type: (identifier) @call.name) @call\n\n; Target-typed new (C# 9): User u = new(\"x\", 5)\n(variable_declaration type: (identifier) @call.name (variable_declarator (implicit_object_creation_expression) @call))\n\n; Local variable declarations\n(local_declaration_statement\n  (variable_declaration\n    (variable_declarator\n      (identifier) @name))) @definition.variable\n\n; Heritage\n(class_declaration name: (identifier) @heritage.class\n  (base_list (identifier) @heritage.extends)) @heritage\n(class_declaration name: (identifier) @heritage.class\n  (base_list (generic_name (identifier) @heritage.extends))) @heritage\n\n; Interface inheritance: interface IFoo : IBar / interface IFoo : IBar, IBaz\n; Without these patterns, interface-to-interface relationships are never\n; captured, so transitive \"class X implements IBar\" chains are broken.\n(interface_declaration name: (identifier) @heritage.class\n  (base_list (identifier) @heritage.extends)) @heritage\n(interface_declaration name: (identifier) @heritage.class\n  (base_list (generic_name (identifier) @heritage.extends))) @heritage\n\n; Write access: obj.field = value\n(assignment_expression\n  left: (member_access_expression\n    expression: (_) @assignment.receiver\n    name: (identifier) @assignment.property)\n  right: (_)) @assignment\n";
 export declare const RUST_QUERIES = "\n; Functions & Items\n(function_item name: (identifier) @name) @definition.function\n(function_signature_item name: (identifier) @name) @definition.function\n(struct_item name: (type_identifier) @name) @definition.struct\n(enum_item name: (type_identifier) @name) @definition.enum\n(trait_item name: (type_identifier) @name) @definition.trait\n(impl_item type: (type_identifier) @name !trait) @definition.impl\n(impl_item type: (generic_type type: (type_identifier) @name) !trait) @definition.impl\n(mod_item name: (identifier) @name) @definition.module\n\n; Type aliases, const, static, macros\n(type_item name: (type_identifier) @name) @definition.type\n(const_item name: (identifier) @name) @definition.const\n(static_item name: (identifier) @name) @definition.static\n(macro_definition name: (identifier) @name) @definition.macro\n\n; Use statements\n(use_declaration argument: (_) @import.source) @import\n\n; Calls\n(call_expression function: (identifier) @call.name) @call\n(call_expression function: (field_expression field: (field_identifier) @call.name)) @call\n(call_expression function: (scoped_identifier name: (identifier) @call.name)) @call\n(call_expression function: (generic_function function: (identifier) @call.name)) @call\n\n; Struct literal construction: User { name: value }\n(struct_expression name: (type_identifier) @call.name) @call\n\n; Struct fields \u2014 named field declarations inside struct bodies\n(field_declaration_list\n  (field_declaration\n    name: (field_identifier) @name) @definition.property)\n\n; Heritage (trait implementation) \u2014 all combinations of concrete/generic trait \u00D7 concrete/generic type\n(impl_item trait: (type_identifier) @heritage.trait type: (type_identifier) @heritage.class) @heritage\n(impl_item trait: (generic_type type: (type_identifier) @heritage.trait) type: (type_identifier) @heritage.class) @heritage\n(impl_item trait: (type_identifier) @heritage.trait type: (generic_type type: (type_identifier) @heritage.class)) @heritage\n(impl_item trait: (generic_type type: (type_identifier) @heritage.trait) type: (generic_type type: (type_identifier) @heritage.class)) @heritage\n\n; Write access: obj.field = value\n(assignment_expression\n  left: (field_expression\n    value: (_) @assignment.receiver\n    field: (field_identifier) @assignment.property)\n  right: (_)) @assignment\n\n; Write access: obj.field += value (compound assignment)\n(compound_assignment_expr\n  left: (field_expression\n    value: (_) @assignment.receiver\n    field: (field_identifier) @assignment.property)\n  right: (_)) @assignment\n";
 export declare const PHP_QUERIES = "\n; \u2500\u2500 Namespace \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n(namespace_definition\n  name: (namespace_name) @name) @definition.namespace\n\n; \u2500\u2500 Classes \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n(class_declaration\n  name: (name) @name) @definition.class\n\n; \u2500\u2500 Interfaces \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n(interface_declaration\n  name: (name) @name) @definition.interface\n\n; \u2500\u2500 Traits \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n(trait_declaration\n  name: (name) @name) @definition.trait\n\n; \u2500\u2500 Enums (PHP 8.1) \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n(enum_declaration\n  name: (name) @name) @definition.enum\n\n; \u2500\u2500 Top-level functions \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n(function_definition\n  name: (name) @name) @definition.function\n\n; \u2500\u2500 Methods (including constructors) \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n(method_declaration\n  name: (name) @name) @definition.method\n\n; \u2500\u2500 Class properties (including Eloquent $fillable, $casts, etc.) \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n(property_declaration\n  (property_element\n    (variable_name\n      (name) @name))) @definition.property\n\n; Constructor property promotion (PHP 8.0+: public Address $address in __construct)\n(method_declaration\n  parameters: (formal_parameters\n    (property_promotion_parameter\n      name: (variable_name\n        (name) @name)))) @definition.property\n\n; \u2500\u2500 Imports: use statements \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n; Simple: use App\\Models\\User;\n(namespace_use_declaration\n  (namespace_use_clause\n    (qualified_name) @import.source)) @import\n\n; \u2500\u2500 Function/method calls \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n; Regular function call: foo()\n(function_call_expression\n  function: (name) @call.name) @call\n\n; Method call: $obj->method()\n(member_call_expression\n  name: (name) @call.name) @call\n\n; Nullsafe method call: $obj?->method()\n(nullsafe_member_call_expression\n  name: (name) @call.name) @call\n\n; Static call: Foo::bar() (php_only uses scoped_call_expression)\n(scoped_call_expression\n  name: (name) @call.name) @call\n\n; Constructor call: new User()\n(object_creation_expression (name) @call.name) @call\n\n; Const declarations at class scope\n(const_declaration\n  (const_element\n    (name) @name)) @definition.const\n\n; \u2500\u2500 Heritage: extends \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n(class_declaration\n  name: (name) @heritage.class\n  (base_clause\n    [(name) (qualified_name)] @heritage.extends)) @heritage\n\n; \u2500\u2500 Heritage: implements \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n(class_declaration\n  name: (name) @heritage.class\n  (class_interface_clause\n    [(name) (qualified_name)] @heritage.implements)) @heritage.impl\n\n; \u2500\u2500 Heritage: use trait (must capture enclosing class name) \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n(class_declaration\n  name: (name) @heritage.class\n  body: (declaration_list\n    (use_declaration\n      [(name) (qualified_name)] @heritage.trait))) @heritage\n\n; \u2500\u2500 Heritage: trait uses another trait (transitive trait composition) \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n; PHP allows a trait body to contain \"use OtherTrait;\". The trait-uses-trait\n; IMPLEMENTS edge is required by buildPhpMro to compute the full transitive\n; trait closure (depth 3+ chains).\n(trait_declaration\n  name: (name) @heritage.class\n  body: (declaration_list\n    (use_declaration\n      [(name) (qualified_name)] @heritage.trait))) @heritage\n\n; PHP HTTP consumers: file_get_contents('/path'), curl_init('/path')\n(function_call_expression\n  function: (name) @_php_http (#match? @_php_http \"^(file_get_contents|curl_init)$\")\n  arguments: (arguments\n    (argument (string (string_content) @http_client.url)))) @http_client\n\n; Write access: $obj->field = value\n(assignment_expression\n  left: (member_access_expression\n    object: (_) @assignment.receiver\n    name: (name) @assignment.property)\n  right: (_)) @assignment\n\n; Write access: ClassName::$field = value (static property)\n(assignment_expression\n  left: (scoped_property_access_expression\n    scope: (_) @assignment.receiver\n    name: (variable_name (name) @assignment.property))\n  right: (_)) @assignment\n";

package/dist/core/ingestion/tree-sitter-queries.js

@@ -673,7 +673,15 @@ export const GO_QUERIES = `
 export const CPP_QUERIES = `
 ; Classes, Structs, Namespaces
 (class_specifier name: (type_identifier) @name) @definition.class
+(class_specifier
+  name: (template_type
+    (type_identifier) @name
+    (template_argument_list) @template-arguments)) @definition.class
 (struct_specifier name: (type_identifier) @name) @definition.struct
+(struct_specifier
+  name: (template_type
+    (type_identifier) @name
+    (template_argument_list) @template-arguments)) @definition.struct
 (namespace_definition name: (namespace_identifier) @name) @definition.namespace
 (enum_specifier name: (type_identifier) @name) @definition.enum
 
@@ -755,6 +763,11 @@ export const CPP_QUERIES = `
 
 ; Templates
 (template_declaration (class_specifier name: (type_identifier) @name)) @definition.template
+(template_declaration
+  (class_specifier
+    name: (template_type
+      (type_identifier) @name
+      (template_argument_list) @template-arguments))) @definition.template
 (template_declaration (function_definition declarator: (function_declarator declarator: (identifier) @name))) @definition.template
 
 ; Includes

package/dist/core/ingestion/utils/ast-helpers.js

@@ -1,4 +1,5 @@
 import { generateId } from '../../../lib/utils.js';
+import { extractTemplateArguments, stripTemplateArguments, templateArgumentsIdTag, } from './template-arguments.js';
 /**
  * Ordered list of definition capture keys for tree-sitter query matches.
  * Used to extract the definition node from a capture map.
@@ -370,8 +371,12 @@ export const findEnclosingClassInfo = (node, filePath, resolveEnclosingOwner) =>
                     current.children?.some((c) => c.type === 'interface')) {
                     label = 'Interface';
                 }
+                const templateArguments = extractTemplateArguments(nameNode.text);
+                const classIdName = templateArguments !== undefined
+                    ? `${stripTemplateArguments(nameNode.text)}${templateArgumentsIdTag(templateArguments)}`
+                    : nameNode.text;
                 return {
-                    classId: generateId(label, `${filePath}:${nameNode.text}`),
+                    classId: generateId(label, `${filePath}:${classIdName}`),
                     className: nameNode.text,
                 };
             }

package/dist/core/ingestion/utils/template-arguments.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Parse top-level generic/template arguments from a type-like string.
+ *
+ * Examples:
+ * - `List<int>` -> ['int']
+ * - `Map<string, vector<int>>` -> ['string', 'vector<int>']
+ * - `List<T*>` -> ['T*']
+ */
+export declare function extractTemplateArguments(text: string): string[] | undefined;
+export declare function stripTemplateArguments(text: string): string;
+export declare function templateArgumentsIdTag(templateArguments?: readonly string[]): string;

package/dist/core/ingestion/utils/template-arguments.js

@@ -0,0 +1,65 @@
+/**
+ * Parse top-level generic/template arguments from a type-like string.
+ *
+ * Examples:
+ * - `List<int>` -> ['int']
+ * - `Map<string, vector<int>>` -> ['string', 'vector<int>']
+ * - `List<T*>` -> ['T*']
+ */
+export function extractTemplateArguments(text) {
+    const start = text.indexOf('<');
+    if (start === -1)
+        return undefined;
+    let depth = 0;
+    let end = -1;
+    for (let i = start; i < text.length; i += 1) {
+        const ch = text[i];
+        if (ch === '<')
+            depth += 1;
+        else if (ch === '>') {
+            depth -= 1;
+            if (depth === 0) {
+                end = i;
+                break;
+            }
+            if (depth < 0)
+                return undefined;
+        }
+    }
+    if (end === -1)
+        return undefined;
+    const inner = text.slice(start + 1, end);
+    if (inner.trim().length === 0)
+        return undefined;
+    const args = [];
+    let tokenStart = 0;
+    let nested = 0;
+    for (let i = 0; i < inner.length; i += 1) {
+        const ch = inner[i];
+        if (ch === '<')
+            nested += 1;
+        else if (ch === '>')
+            nested -= 1;
+        else if (ch === ',' && nested === 0) {
+            const token = inner.slice(tokenStart, i).replace(/\s+/g, '');
+            if (token.length > 0)
+                args.push(token);
+            tokenStart = i + 1;
+        }
+    }
+    const last = inner.slice(tokenStart).replace(/\s+/g, '');
+    if (last.length > 0)
+        args.push(last);
+    return args.length > 0 ? args : undefined;
+}
+export function stripTemplateArguments(text) {
+    const start = text.indexOf('<');
+    if (start === -1)
+        return text;
+    return text.slice(0, start);
+}
+export function templateArgumentsIdTag(templateArguments) {
+    if (templateArguments === undefined || templateArguments.length === 0)
+        return '';
+    return `~${templateArguments.join(',')}`;
+}

package/dist/core/ingestion/workers/parse-worker.d.ts

@@ -40,6 +40,7 @@ interface ParsedSymbol {
     parameterTypes?: string[];
     returnType?: string;
     declaredType?: string;
+    templateArguments?: string[];
     ownerId?: string;
     visibility?: string;
     isStatic?: boolean;

package/dist/core/ingestion/workers/parse-worker.js

@@ -45,6 +45,7 @@ import { generateId } from '../../../lib/utils.js';
 import { preprocessImportPath } from '../import-processor.js';
 import { extractVueScript, extractTemplateComponents, isVueSetupTopLevel, } from '../vue-sfc-extractor.js';
 import { buildMethodProps, arityForIdFromInfo, typeTagForId, constTagForId, buildCollisionGroups, } from '../utils/method-props.js';
+import { extractTemplateArguments, templateArgumentsIdTag } from '../utils/template-arguments.js';
 import { extractParsedFile } from '../scope-extractor-bridge.js';
 import { logger } from '../../logger.js';
 // ============================================================================
@@ -1545,6 +1546,20 @@ const processFileGroup = (files, language, queryString, result, onFileProcessed)
                 })
                 : null;
             const nodeLabel = extractedClassSymbol?.type ?? defaultNodeLabel;
+            const isClassLikeLabel = nodeLabel === 'Class' ||
+                nodeLabel === 'Struct' ||
+                nodeLabel === 'Interface' ||
+                nodeLabel === 'Enum' ||
+                nodeLabel === 'Record';
+            if (isClassLikeLabel &&
+                provider.classExtractor?.shouldSkipClassCapture?.({
+                    captureMap,
+                    definitionNode,
+                    nameNode,
+                    nodeLabel,
+                }) === true) {
+                continue;
+            }
             // Dedup: variable captures (Const/Static/Variable) may overlap with higher-priority
             // captures (e.g. `const fn = () => {}` matches both @definition.function and @definition.const).
             // Skip variable captures whose definition node was already processed.
@@ -1634,7 +1649,26 @@ const processFileGroup = (files, language, queryString, result, onFileProcessed)
                 arityTag += typeTagForId(defMethodMap, nodeName, arityForId, defMethodInfo, language, groups);
                 arityTag += constTagForId(defMethodMap, nodeName, arityForId, defMethodInfo, groups);
             }
-            const nodeId = generateId(nodeLabel, `${file.path}:${qualifiedName}${arityTag}`);
+            const classTemplateArguments = extractedClassSymbol?.templateArguments ??
+                provider.classExtractor?.extractTemplateArgumentsFromCapture?.({
+                    captureMap,
+                    definitionNode,
+                    nameNode,
+                }) ??
+                (captureMap['template-arguments']
+                    ? extractTemplateArguments(captureMap['template-arguments'].text)
+                    : undefined) ??
+                (nameNode && nameNode.text ? extractTemplateArguments(nameNode.text) : undefined);
+            const classTemplateTag = (nodeLabel === 'Class' ||
+                nodeLabel === 'Struct' ||
+                nodeLabel === 'Interface' ||
+                nodeLabel === 'Enum' ||
+                nodeLabel === 'Record') &&
+                classTemplateArguments !== undefined &&
+                classTemplateArguments.length > 0
+                ? templateArgumentsIdTag(classTemplateArguments)
+                : '';
+            const nodeId = generateId(nodeLabel, `${file.path}:${qualifiedName}${classTemplateTag}${arityTag}`);
             const classNodeForSymbol = definitionNode || nameNode;
             const qualifiedTypeName = extractedClassSymbol?.qualifiedName ??
                 (classNodeForSymbol && provider.classExtractor?.isTypeDeclaration(classNodeForSymbol)
@@ -1743,6 +1777,9 @@ const processFileGroup = (files, language, queryString, result, onFileProcessed)
                         ? isVueSetupTopLevel(nameNode || definitionNode)
                         : cachedExportCheck(provider.exportChecker, nameNode || definitionNode, nodeName),
                     ...(qualifiedTypeName !== undefined ? { qualifiedName: qualifiedTypeName } : {}),
+                    ...(classTemplateArguments !== undefined && classTemplateArguments.length > 0
+                        ? { templateArguments: classTemplateArguments }
+                        : {}),
                     ...(frameworkHint
                         ? {
                             astFrameworkMultiplier: frameworkHint.entryPointMultiplier,
@@ -1766,6 +1803,9 @@ const processFileGroup = (files, language, queryString, result, onFileProcessed)
                 parameterTypes: methodProps.parameterTypes,
                 returnType: methodProps.returnType,
                 ...(declaredType !== undefined ? { declaredType } : {}),
+                ...(classTemplateArguments !== undefined && classTemplateArguments.length > 0
+                    ? { templateArguments: classTemplateArguments }
+                    : {}),
                 ...(enclosingClassId ? { ownerId: enclosingClassId } : {}),
                 visibility: methodProps.visibility,
                 isStatic: methodProps.isStatic,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitnexus",
-  "version": "1.6.5-rc.34",
+  "version": "1.6.5-rc.35",
   "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",