gitnexus 1.4.9 → 1.5.0

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

@@ -12,7 +12,7 @@ import Rust from 'tree-sitter-rust';
 import PHP from 'tree-sitter-php';
 import Ruby from 'tree-sitter-ruby';
 import { createRequire } from 'node:module';
-import { SupportedLanguages } from '../../../config/supported-languages.js';
+import { SupportedLanguages } from 'gitnexus-shared';
 import { getProvider } from '../languages/index.js';
 import { getTreeSitterBufferSize, TREE_SITTER_MAX_BUFFER } from '../constants.js';
 // tree-sitter-swift is an optionalDependency — may not be installed
@@ -34,9 +34,10 @@ try {
     Kotlin = _require('tree-sitter-kotlin');
 }
 catch { }
-import { getLanguageFromFilename } from '../utils/language-detection.js';
+import { getLanguageFromFilename } from 'gitnexus-shared';
 import { FUNCTION_NODE_TYPES, extractFunctionName, getDefinitionNodeFromCaptures, findEnclosingClassId, getLabelFromCaptures, extractMethodSignature, findDescendant, extractStringContent, } from '../utils/ast-helpers.js';
-import { countCallArguments, inferCallForm, extractReceiverName, extractReceiverNode, extractMixedChain, } from '../utils/call-analysis.js';
+import { countCallArguments, inferCallForm, extractReceiverName, extractReceiverNode, extractMixedChain, extractCallArgTypes, } from '../utils/call-analysis.js';
+import { extractParsedCallSite } from '../call-sites/extract-language-call-site.js';
 import { buildTypeEnv } from '../type-env.js';
 import { detectFrameworkFromAST } from '../framework-detection.js';
 import { generateId } from '../../../lib/utils.js';
@@ -93,7 +94,13 @@ const setLanguage = (language, filePath) => {
 const classIdCache = new Map();
 const functionIdCache = new Map();
 const exportCache = new Map();
-const clearCaches = () => { classIdCache.clear(); functionIdCache.clear(); exportCache.clear(); fieldInfoCache.clear(); };
+const clearCaches = () => {
+    classIdCache.clear();
+    functionIdCache.clear();
+    exportCache.clear();
+    fieldInfoCache.clear();
+    methodInfoCache.clear();
+};
 // ============================================================================
 // FieldExtractor cache — extract field metadata once per class, reuse for each property.
 // Keyed by class node startIndex (unique per AST node within a file).
@@ -145,6 +152,34 @@ function getFieldInfo(classNode, provider, context) {
     fieldInfoCache.set(cacheKey, cached);
     return cached;
 }
+// ============================================================================
+// MethodExtractor cache — extract method metadata once per class, reuse for each method.
+// Keyed by class node startIndex (unique per AST node within a file).
+// ============================================================================
+const methodInfoCache = new Map();
+/**
+ * Get (or extract and cache) method info for a class node.
+ * Returns a "name:line" → MethodInfo map, or undefined if the provider has no method extractor
+ * or the class yielded no methods.
+ * Keyed by name:line (not name alone) to support overloaded methods in Java/Kotlin.
+ */
+function getMethodInfo(classNode, provider, context) {
+    if (!provider.methodExtractor)
+        return undefined;
+    const cacheKey = classNode.startIndex;
+    let cached = methodInfoCache.get(cacheKey);
+    if (cached)
+        return cached;
+    const result = provider.methodExtractor.extract(classNode, context);
+    if (!result?.methods?.length)
+        return undefined;
+    cached = new Map();
+    for (const method of result.methods) {
+        cached.set(`${method.name}:${method.line}`, method);
+    }
+    methodInfoCache.set(cacheKey, cached);
+    return cached;
+}
 /** Walk up AST to find enclosing function, return its generateId or null for top-level.
  *  Applies provider.labelOverride so the label matches the definition phase (single source of truth). */
 const findEnclosingFunctionId = (node, filePath, provider) => {
@@ -248,13 +283,15 @@ const processBatch = (files, onProgress) => {
     let totalProcessed = 0;
     let lastReported = 0;
     const PROGRESS_INTERVAL = 100; // report every 100 files
-    const onFileProcessed = onProgress ? () => {
-        totalProcessed++;
-        if (totalProcessed - lastReported >= PROGRESS_INTERVAL) {
-            lastReported = totalProcessed;
-            onProgress(totalProcessed);
+    const onFileProcessed = onProgress
+        ? () => {
+            totalProcessed++;
+            if (totalProcessed - lastReported >= PROGRESS_INTERVAL) {
+                lastReported = totalProcessed;
+                onProgress(totalProcessed);
+            }
         }
-    } : undefined;
+        : undefined;
     for (const [language, langFiles] of byLanguage) {
         const provider = getProvider(language);
         const queryString = provider.treeSitterQueries;
@@ -288,7 +325,8 @@ const processBatch = (files, onProgress) => {
                 }
             }
             else {
-                result.skippedLanguages[language] = (result.skippedLanguages[language] || 0) + regularFiles.length;
+                result.skippedLanguages[language] =
+                    (result.skippedLanguages[language] || 0) + regularFiles.length;
             }
         }
         // Process tsx files separately (different grammar)
@@ -303,18 +341,35 @@ const processBatch = (files, onProgress) => {
                 }
             }
             else {
-                result.skippedLanguages[language] = (result.skippedLanguages[language] || 0) + tsxFiles.length;
+                result.skippedLanguages[language] =
+                    (result.skippedLanguages[language] || 0) + tsxFiles.length;
             }
         }
     }
     return result;
 };
 const ROUTE_HTTP_METHODS = new Set([
-    'get', 'post', 'put', 'patch', 'delete', 'options', 'any', 'match',
+    'get',
+    'post',
+    'put',
+    'patch',
+    'delete',
+    'options',
+    'any',
+    'match',
 ]);
 const ROUTE_RESOURCE_METHODS = new Set(['resource', 'apiResource']);
 // Express/Hono method names that register routes
-const EXPRESS_ROUTE_METHODS = new Set(['get', 'post', 'put', 'delete', 'patch', 'all', 'use', 'route']);
+const EXPRESS_ROUTE_METHODS = new Set([
+    'get',
+    'post',
+    'put',
+    'delete',
+    'patch',
+    'all',
+    'use',
+    'route',
+]);
 // HTTP client methods that are ONLY used by clients, not Express route registration.
 // Methods like get/post/put/delete/patch overlap with Express — those are captured by
 // the express_route handler as route definitions, not consumers. The fetch() global
@@ -322,9 +377,23 @@ const EXPRESS_ROUTE_METHODS = new Set(['get', 'post', 'put', 'delete', 'patch',
 const HTTP_CLIENT_ONLY_METHODS = new Set(['head', 'options', 'request', 'ajax']);
 // Decorator names that indicate HTTP route handlers (NestJS, Flask, FastAPI, Spring)
 const ROUTE_DECORATOR_NAMES = new Set([
-    'Get', 'Post', 'Put', 'Delete', 'Patch', 'Route',
-    'get', 'post', 'put', 'delete', 'patch', 'route',
-    'RequestMapping', 'GetMapping', 'PostMapping', 'PutMapping', 'DeleteMapping',
+    'Get',
+    'Post',
+    'Put',
+    'Delete',
+    'Patch',
+    'Route',
+    'get',
+    'post',
+    'put',
+    'delete',
+    'patch',
+    'route',
+    'RequestMapping',
+    'GetMapping',
+    'PostMapping',
+    'PutMapping',
+    'DeleteMapping',
 ]);
 const RESOURCE_ACTIONS = ['index', 'create', 'store', 'show', 'edit', 'update', 'destroy'];
 const API_RESOURCE_ACTIONS = ['index', 'store', 'show', 'update', 'destroy'];
@@ -337,8 +406,7 @@ function isRouteStaticCall(node) {
 }
 /** Get the method name from a scoped_call_expression or member_call_expression */
 function getCallMethodName(node) {
-    const nameNode = node.childForFieldName?.('name') ??
-        node.children?.find((c) => c.type === 'name');
+    const nameNode = node.childForFieldName?.('name') ?? node.children?.find((c) => c.type === 'name');
     return nameNode?.text ?? null;
 }
 /** Get the arguments node from a call expression */
@@ -352,17 +420,17 @@ function findClosureBody(argsNode) {
     for (const child of argsNode.children ?? []) {
         if (child.type === 'argument') {
             for (const inner of child.children ?? []) {
-                if (inner.type === 'anonymous_function' ||
-                    inner.type === 'arrow_function') {
-                    return inner.childForFieldName?.('body') ??
-                        inner.children?.find((c) => c.type === 'compound_statement');
+                if (inner.type === 'anonymous_function' || inner.type === 'arrow_function') {
+                    return (inner.childForFieldName?.('body') ??
+                        inner.children?.find((c) => c.type === 'compound_statement') ??
+                        null);
                 }
             }
         }
-        if (child.type === 'anonymous_function' ||
-            child.type === 'arrow_function') {
-            return child.childForFieldName?.('body') ??
-                child.children?.find((c) => c.type === 'compound_statement');
+        if (child.type === 'anonymous_function' || child.type === 'arrow_function') {
+            return (child.childForFieldName?.('body') ??
+                child.children?.find((c) => c.type === 'compound_statement') ??
+                null);
         }
     }
     return null;
@@ -591,7 +659,9 @@ function extractLaravelRoutes(tree, filePath) {
             const actions = httpMethod === 'apiResource' ? API_RESOURCE_ACTIONS : RESOURCE_ACTIONS;
             for (const action of actions) {
                 routes.push({
-                    filePath, httpMethod, routePath,
+                    filePath,
+                    httpMethod,
+                    routePath,
                     controllerName: target.controller ?? effective.controller,
                     methodName: action,
                     middleware: [...effective.middleware],
@@ -603,7 +673,9 @@ function extractLaravelRoutes(tree, filePath) {
         else {
             const target = extractControllerTarget(argsNode);
             routes.push({
-                filePath, httpMethod, routePath,
+                filePath,
+                httpMethod,
+                routePath,
                 controllerName: target.controller ?? effective.controller,
                 methodName: target.method,
                 middleware: [...effective.middleware],
@@ -653,7 +725,8 @@ function extractLaravelRoutes(tree, filePath) {
                 }
                 return;
             }
-            if (ROUTE_HTTP_METHODS.has(chain.terminalMethod) || ROUTE_RESOURCE_METHODS.has(chain.terminalMethod)) {
+            if (ROUTE_HTTP_METHODS.has(chain.terminalMethod) ||
+                ROUTE_RESOURCE_METHODS.has(chain.terminalMethod)) {
                 emitRoute(chain.terminalMethod, chain.terminalArgs, node.startPosition.row, groupStack, chain.attributes);
                 return;
             }
@@ -736,7 +809,9 @@ const processFileGroup = (files, language, queryString, result, onFileProcessed)
         clearCaches(); // Reset memoization before each new file
         let tree;
         try {
-            tree = parser.parse(file.content, undefined, { bufferSize: getTreeSitterBufferSize(file.content.length) });
+            tree = parser.parse(file.content, undefined, {
+                bufferSize: getTreeSitterBufferSize(file.content.length),
+            });
         }
         catch (err) {
             console.warn(`Failed to parse file ${file.path}: ${err instanceof Error ? err.message : String(err)}`);
@@ -783,10 +858,16 @@ const processFileGroup = (files, language, queryString, result, onFileProcessed)
         // Constructor bindings are verified against the SymbolTable in processCallsFromExtracted.
         const parentMap = fileParentMap;
         const provider = getProvider(language);
-        const typeEnv = buildTypeEnv(tree, language, { parentMap, enclosingFunctionFinder: provider?.enclosingFunctionFinder });
+        const typeEnv = buildTypeEnv(tree, language, {
+            parentMap,
+            enclosingFunctionFinder: provider?.enclosingFunctionFinder,
+        });
         const callRouter = provider.callRouter;
         if (typeEnv.constructorBindings.length > 0) {
-            result.constructorBindings.push({ filePath: file.path, bindings: [...typeEnv.constructorBindings] });
+            result.constructorBindings.push({
+                filePath: file.path,
+                bindings: [...typeEnv.constructorBindings],
+            });
         }
         // Extract file-scope bindings for ExportedTypeMap (closes worker/sequential quality gap).
         // Sequential path uses collectExportedBindings(typeEnv) directly; worker path serializes
@@ -821,12 +902,14 @@ const processFileGroup = (files, language, queryString, result, onFileProcessed)
                 continue;
             }
             // Extract assignment sites (field write access)
-            if (captureMap['assignment'] && captureMap['assignment.receiver'] && captureMap['assignment.property']) {
+            if (captureMap['assignment'] &&
+                captureMap['assignment.receiver'] &&
+                captureMap['assignment.property']) {
                 const receiverText = captureMap['assignment.receiver'].text;
                 const propertyName = captureMap['assignment.property'].text;
                 if (receiverText && propertyName) {
-                    const srcId = findEnclosingFunctionId(captureMap['assignment'], file.path, provider)
-                        || generateId('File', file.path);
+                    const srcId = findEnclosingFunctionId(captureMap['assignment'], file.path, provider) ||
+                        generateId('File', file.path);
                     let receiverTypeName;
                     if (typeEnv) {
                         receiverTypeName = typeEnv.lookup(receiverText, captureMap['assignment']) ?? undefined;
@@ -848,11 +931,16 @@ const processFileGroup = (files, language, queryString, result, onFileProcessed)
                 const decoratorArg = captureMap['decorator.arg']?.text;
                 const decoratorNode = captureMap['decorator'];
                 // Store by the decorator's end line — the definition follows immediately after
-                fileDecorators.set(decoratorNode.endPosition.row, { name: decoratorName, arg: decoratorArg });
+                fileDecorators.set(decoratorNode.endPosition.row, {
+                    name: decoratorName,
+                    arg: decoratorArg,
+                });
                 if (ROUTE_DECORATOR_NAMES.has(decoratorName)) {
                     const routePath = decoratorArg || '';
                     const method = decoratorName.replace('Mapping', '').toUpperCase();
-                    const httpMethod = ['GET', 'POST', 'PUT', 'DELETE', 'PATCH'].includes(method) ? method : 'GET';
+                    const httpMethod = ['GET', 'POST', 'PUT', 'DELETE', 'PATCH'].includes(method)
+                        ? method
+                        : 'GET';
                     result.decoratorRoutes.push({
                         filePath: file.path,
                         routePath,
@@ -864,7 +952,11 @@ const processFileGroup = (files, language, queryString, result, onFileProcessed)
                 // MCP/RPC tool detection: @mcp.tool(), @app.tool(), @server.tool()
                 if (decoratorName === 'tool') {
                     // Re-store with isTool flag for the definition handler
-                    fileDecorators.set(decoratorNode.endPosition.row, { name: decoratorName, arg: decoratorArg, isTool: true });
+                    fileDecorators.set(decoratorNode.endPosition.row, {
+                        name: decoratorName,
+                        arg: decoratorArg,
+                        isTool: true,
+                    });
                 }
                 continue;
             }
@@ -896,11 +988,15 @@ const processFileGroup = (files, language, queryString, result, onFileProcessed)
                 continue;
             }
             // Express/Hono route registration: app.get('/path', handler)
-            if (captureMap['express_route'] && captureMap['express_route.method'] && captureMap['express_route.path']) {
+            if (captureMap['express_route'] &&
+                captureMap['express_route.method'] &&
+                captureMap['express_route.path']) {
                 const method = captureMap['express_route.method'].text;
                 const routePath = captureMap['express_route.path'].text;
                 if (EXPRESS_ROUTE_METHODS.has(method) && routePath.startsWith('/')) {
-                    const httpMethod = method === 'all' || method === 'use' || method === 'route' ? 'GET' : method.toUpperCase();
+                    const httpMethod = method === 'all' || method === 'use' || method === 'route'
+                        ? 'GET'
+                        : method.toUpperCase();
                     result.decoratorRoutes.push({
                         filePath: file.path,
                         routePath,
@@ -913,6 +1009,38 @@ const processFileGroup = (files, language, queryString, result, onFileProcessed)
             }
             // Extract call sites
             if (captureMap['call']) {
+                const callNode0 = captureMap['call'];
+                const languageSeed = extractParsedCallSite(language, callNode0);
+                if (languageSeed) {
+                    if (!provider.isBuiltInName(languageSeed.calledName)) {
+                        const sourceId = findEnclosingFunctionId(callNode0, file.path, provider) ||
+                            generateId('File', file.path);
+                        const receiverName = languageSeed.callForm === 'member' ? languageSeed.receiverName : undefined;
+                        let receiverTypeName = receiverName
+                            ? typeEnv.lookup(receiverName, callNode0)
+                            : undefined;
+                        // Type-as-receiver (e.g. Java `User::getName`): no TypeEnv binding for the class name
+                        if (receiverName !== undefined &&
+                            receiverTypeName === undefined &&
+                            languageSeed.callForm === 'member' &&
+                            (language === SupportedLanguages.Java ||
+                                language === SupportedLanguages.CSharp ||
+                                language === SupportedLanguages.Kotlin)) {
+                            const c0 = receiverName.charCodeAt(0);
+                            if (c0 >= 65 && c0 <= 90)
+                                receiverTypeName = receiverName;
+                        }
+                        result.calls.push({
+                            filePath: file.path,
+                            calledName: languageSeed.calledName,
+                            sourceId,
+                            callForm: languageSeed.callForm,
+                            ...(receiverName !== undefined ? { receiverName } : {}),
+                            ...(receiverTypeName !== undefined ? { receiverTypeName } : {}),
+                        });
+                    }
+                    continue;
+                }
                 const callNameNode = captureMap['call.name'];
                 if (callNameNode) {
                     const calledName = callNameNode.text;
@@ -948,7 +1076,10 @@ const processFileGroup = (files, language, queryString, result, onFileProcessed)
                                 const classNode = findEnclosingClassNode(captureMap['call']);
                                 if (classNode) {
                                     routedFieldMap = getFieldInfo(classNode, provider, {
-                                        typeEnv, symbolTable: NOOP_SYMBOL_TABLE, filePath: file.path, language,
+                                        typeEnv,
+                                        symbolTable: NOOP_SYMBOL_TABLE,
+                                        filePath: file.path,
+                                        language,
                                     });
                                 }
                             }
@@ -966,10 +1097,20 @@ const processFileGroup = (files, language, queryString, result, onFileProcessed)
                                         language,
                                         isExported: true,
                                         description: item.accessorType,
-                                        ...(item.declaredType ? { declaredType: item.declaredType } : routedFieldInfo?.type ? { declaredType: routedFieldInfo.type } : {}),
-                                        ...(routedFieldInfo?.visibility !== undefined ? { visibility: routedFieldInfo.visibility } : {}),
-                                        ...(routedFieldInfo?.isStatic !== undefined ? { isStatic: routedFieldInfo.isStatic } : {}),
-                                        ...(routedFieldInfo?.isReadonly !== undefined ? { isReadonly: routedFieldInfo.isReadonly } : {}),
+                                        ...(item.declaredType
+                                            ? { declaredType: item.declaredType }
+                                            : routedFieldInfo?.type
+                                                ? { declaredType: routedFieldInfo.type }
+                                                : {}),
+                                        ...(routedFieldInfo?.visibility !== undefined
+                                            ? { visibility: routedFieldInfo.visibility }
+                                            : {}),
+                                        ...(routedFieldInfo?.isStatic !== undefined
+                                            ? { isStatic: routedFieldInfo.isStatic }
+                                            : {}),
+                                        ...(routedFieldInfo?.isReadonly !== undefined
+                                            ? { isReadonly: routedFieldInfo.isReadonly }
+                                            : {}),
                                     },
                                 });
                                 result.symbols.push({
@@ -978,10 +1119,20 @@ const processFileGroup = (files, language, queryString, result, onFileProcessed)
                                     nodeId,
                                     type: 'Property',
                                     ...(propEnclosingClassId ? { ownerId: propEnclosingClassId } : {}),
-                                    ...(item.declaredType ? { declaredType: item.declaredType } : routedFieldInfo?.type ? { declaredType: routedFieldInfo.type } : {}),
-                                    ...(routedFieldInfo?.visibility !== undefined ? { visibility: routedFieldInfo.visibility } : {}),
-                                    ...(routedFieldInfo?.isStatic !== undefined ? { isStatic: routedFieldInfo.isStatic } : {}),
-                                    ...(routedFieldInfo?.isReadonly !== undefined ? { isReadonly: routedFieldInfo.isReadonly } : {}),
+                                    ...(item.declaredType
+                                        ? { declaredType: item.declaredType }
+                                        : routedFieldInfo?.type
+                                            ? { declaredType: routedFieldInfo.type }
+                                            : {}),
+                                    ...(routedFieldInfo?.visibility !== undefined
+                                        ? { visibility: routedFieldInfo.visibility }
+                                        : {}),
+                                    ...(routedFieldInfo?.isStatic !== undefined
+                                        ? { isStatic: routedFieldInfo.isStatic }
+                                        : {}),
+                                    ...(routedFieldInfo?.isReadonly !== undefined
+                                        ? { isReadonly: routedFieldInfo.isReadonly }
+                                        : {}),
                                 });
                                 const fileId = generateId('File', file.path);
                                 const relId = generateId('DEFINES', `${fileId}->${nodeId}`);
@@ -1010,11 +1161,13 @@ const processFileGroup = (files, language, queryString, result, onFileProcessed)
                     }
                     if (!provider.isBuiltInName(calledName)) {
                         const callNode = captureMap['call'];
-                        const sourceId = findEnclosingFunctionId(callNode, file.path, provider)
-                            || generateId('File', file.path);
+                        const sourceId = findEnclosingFunctionId(callNode, file.path, provider) ||
+                            generateId('File', file.path);
                         const callForm = inferCallForm(callNode, callNameNode);
                         let receiverName = callForm === 'member' ? extractReceiverName(callNameNode) : undefined;
-                        let receiverTypeName = receiverName ? typeEnv.lookup(receiverName, callNode) : undefined;
+                        let receiverTypeName = receiverName
+                            ? typeEnv.lookup(receiverName, callNode)
+                            : undefined;
                         let receiverMixedChain;
                         // When the receiver is a complex expression (call chain, field chain, or mixed),
                         // extractReceiverName returns undefined. Walk the receiver node to build a unified
@@ -1034,6 +1187,14 @@ const processFileGroup = (files, language, queryString, result, onFileProcessed)
                                 }
                             }
                         }
+                        const inferLiteralType = provider.typeConfig?.inferLiteralType;
+                        const argCountForOverloadHints = countCallArguments(callNode);
+                        // Skip when no arg list / zero args: nothing to infer for overload typing; saves AST walks + payload size.
+                        const argTypes = inferLiteralType &&
+                            argCountForOverloadHints !== undefined &&
+                            argCountForOverloadHints > 0
+                            ? extractCallArgTypes(callNode, inferLiteralType, (varName, cn) => typeEnv.lookup(varName, cn))
+                            : undefined;
                         result.calls.push({
                             filePath: file.path,
                             calledName,
@@ -1043,6 +1204,7 @@ const processFileGroup = (files, language, queryString, result, onFileProcessed)
                             ...(receiverName !== undefined ? { receiverName } : {}),
                             ...(receiverTypeName !== undefined ? { receiverTypeName } : {}),
                             ...(receiverMixedChain !== undefined ? { receiverMixedChain } : {}),
+                            ...(argTypes !== undefined ? { argTypes } : {}),
                         });
                     }
                 }
@@ -1056,8 +1218,7 @@ const processFileGroup = (files, language, queryString, result, onFileProcessed)
                     // Named fields like `Breed string` also match — skip them.
                     const extendsNode = captureMap['heritage.extends'];
                     const fieldDecl = extendsNode.parent;
-                    const isNamedField = fieldDecl?.type === 'field_declaration'
-                        && fieldDecl.childForFieldName('name');
+                    const isNamedField = fieldDecl?.type === 'field_declaration' && fieldDecl.childForFieldName('name');
                     if (!isNamedField) {
                         result.heritage.push({
                             filePath: file.path,
@@ -1083,7 +1244,9 @@ const processFileGroup = (files, language, queryString, result, onFileProcessed)
                         kind: 'trait-impl',
                     });
                 }
-                if (captureMap['heritage.extends'] || captureMap['heritage.implements'] || captureMap['heritage.trait']) {
+                if (captureMap['heritage.extends'] ||
+                    captureMap['heritage.implements'] ||
+                    captureMap['heritage.trait']) {
                     continue;
                 }
             }
@@ -1096,7 +1259,11 @@ const processFileGroup = (files, language, queryString, result, onFileProcessed)
                 continue;
             const nodeName = nameNode ? nameNode.text : 'init';
             const definitionNode = getDefinitionNodeFromCaptures(captureMap);
-            const startLine = definitionNode ? definitionNode.startPosition.row : (nameNode ? nameNode.startPosition.row : 0);
+            const startLine = definitionNode
+                ? definitionNode.startPosition.row
+                : nameNode
+                    ? nameNode.startPosition.row
+                    : 0;
             const nodeId = generateId(nodeLabel, `${file.path}:${nodeName}`);
             const description = provider.descriptionExtractor?.(nodeLabel, nodeName, captureMap);
             let frameworkHint = definitionNode
@@ -1139,15 +1306,70 @@ const processFileGroup = (files, language, queryString, result, onFileProcessed)
             let visibility;
             let isStatic;
             let isReadonly;
+            let isAbstract;
+            let isFinal;
+            let isVirtual;
+            let isOverride;
+            let isAsync;
+            let isPartial;
+            let annotations;
             if (nodeLabel === 'Function' || nodeLabel === 'Method' || nodeLabel === 'Constructor') {
-                const sig = extractMethodSignature(definitionNode);
-                parameterCount = sig.parameterCount;
-                requiredParameterCount = sig.requiredParameterCount;
-                parameterTypes = sig.parameterTypes;
-                returnType = sig.returnType;
+                // Try MethodExtractor first — it provides everything extractMethodSignature does, plus
+                // isAbstract/isFinal/annotations. Only fall back to extractMethodSignature when no
+                // MethodExtractor is available or the method isn't inside a class body.
+                let enrichedByMethodExtractor = false;
+                if (provider.methodExtractor && definitionNode) {
+                    const classNode = findEnclosingClassNode(definitionNode);
+                    if (classNode) {
+                        const methodMap = getMethodInfo(classNode, provider, {
+                            filePath: file.path,
+                            language,
+                        });
+                        const defLine = definitionNode.startPosition.row + 1;
+                        const info = methodMap?.get(`${nodeName}:${defLine}`);
+                        if (info) {
+                            enrichedByMethodExtractor = true;
+                            parameterCount = info.parameters.length;
+                            const types = [];
+                            let optionalCount = 0;
+                            for (const p of info.parameters) {
+                                if (p.type !== null)
+                                    types.push(p.type);
+                                if (p.isOptional)
+                                    optionalCount++;
+                            }
+                            parameterTypes = types.length > 0 ? types : undefined;
+                            requiredParameterCount =
+                                optionalCount > 0 ? parameterCount - optionalCount : undefined;
+                            returnType = info.returnType ?? undefined;
+                            visibility = info.visibility;
+                            isStatic = info.isStatic;
+                            isAbstract = info.isAbstract;
+                            isFinal = info.isFinal;
+                            if (info.isVirtual)
+                                isVirtual = info.isVirtual;
+                            if (info.isOverride)
+                                isOverride = info.isOverride;
+                            if (info.isAsync)
+                                isAsync = info.isAsync;
+                            if (info.isPartial)
+                                isPartial = info.isPartial;
+                            if (info.annotations.length > 0)
+                                annotations = info.annotations;
+                        }
+                    }
+                }
+                if (!enrichedByMethodExtractor) {
+                    const sig = extractMethodSignature(definitionNode);
+                    parameterCount = sig.parameterCount;
+                    requiredParameterCount = sig.requiredParameterCount;
+                    parameterTypes = sig.parameterTypes;
+                    returnType = sig.returnType;
+                }
                 // Language-specific return type fallback (e.g. Ruby YARD @return [Type])
                 // Also upgrades uninformative AST types like PHP `array` with PHPDoc `@return User[]`
-                if ((!returnType || returnType === 'array' || returnType === 'iterable') && definitionNode) {
+                if ((!returnType || returnType === 'array' || returnType === 'iterable') &&
+                    definitionNode) {
                     const tc = provider.typeConfig;
                     if (tc?.extractReturnType) {
                         const docReturn = tc.extractReturnType(definitionNode);
@@ -1162,7 +1384,10 @@ const processFileGroup = (files, language, queryString, result, onFileProcessed)
                     const classNode = findEnclosingClassNode(definitionNode);
                     if (classNode) {
                         const fieldMap = getFieldInfo(classNode, provider, {
-                            typeEnv, symbolTable: NOOP_SYMBOL_TABLE, filePath: file.path, language,
+                            typeEnv,
+                            symbolTable: NOOP_SYMBOL_TABLE,
+                            filePath: file.path,
+                            language,
                         });
                         const info = fieldMap?.get(nodeName);
                         if (info) {
@@ -1184,10 +1409,12 @@ const processFileGroup = (files, language, queryString, result, onFileProcessed)
                     endLine: definitionNode ? definitionNode.endPosition.row : startLine,
                     language: language,
                     isExported: cachedExportCheck(provider.exportChecker, nameNode || definitionNode, nodeName),
-                    ...(frameworkHint ? {
-                        astFrameworkMultiplier: frameworkHint.entryPointMultiplier,
-                        astFrameworkReason: frameworkHint.reason,
-                    } : {}),
+                    ...(frameworkHint
+                        ? {
+                            astFrameworkMultiplier: frameworkHint.entryPointMultiplier,
+                            astFrameworkReason: frameworkHint.reason,
+                        }
+                        : {}),
                     ...(description !== undefined ? { description } : {}),
                     ...(parameterCount !== undefined ? { parameterCount } : {}),
                     ...(requiredParameterCount !== undefined ? { requiredParameterCount } : {}),
@@ -1197,12 +1424,24 @@ const processFileGroup = (files, language, queryString, result, onFileProcessed)
                     ...(visibility !== undefined ? { visibility } : {}),
                     ...(isStatic !== undefined ? { isStatic } : {}),
                     ...(isReadonly !== undefined ? { isReadonly } : {}),
+                    ...(isAbstract !== undefined ? { isAbstract } : {}),
+                    ...(isFinal !== undefined ? { isFinal } : {}),
+                    ...(isVirtual !== undefined ? { isVirtual } : {}),
+                    ...(isOverride !== undefined ? { isOverride } : {}),
+                    ...(isAsync !== undefined ? { isAsync } : {}),
+                    ...(isPartial !== undefined ? { isPartial } : {}),
+                    ...(annotations !== undefined ? { annotations } : {}),
                 },
             });
             // Compute enclosing class for Method/Constructor/Property/Function — used for both ownerId and HAS_METHOD
             // Function is included because Kotlin/Rust/Python capture class methods as Function nodes
-            const needsOwner = nodeLabel === 'Method' || nodeLabel === 'Constructor' || nodeLabel === 'Property' || nodeLabel === 'Function';
-            const enclosingClassId = needsOwner ? cachedFindEnclosingClassId(nameNode || definitionNode, file.path) : null;
+            const needsOwner = nodeLabel === 'Method' ||
+                nodeLabel === 'Constructor' ||
+                nodeLabel === 'Property' ||
+                nodeLabel === 'Function';
+            const enclosingClassId = needsOwner
+                ? cachedFindEnclosingClassId(nameNode || definitionNode, file.path)
+                : null;
             result.symbols.push({
                 filePath: file.path,
                 name: nodeName,
@@ -1217,6 +1456,13 @@ const processFileGroup = (files, language, queryString, result, onFileProcessed)
                 ...(visibility !== undefined ? { visibility } : {}),
                 ...(isStatic !== undefined ? { isStatic } : {}),
                 ...(isReadonly !== undefined ? { isReadonly } : {}),
+                ...(isAbstract !== undefined ? { isAbstract } : {}),
+                ...(isFinal !== undefined ? { isFinal } : {}),
+                ...(isVirtual !== undefined ? { isVirtual } : {}),
+                ...(isOverride !== undefined ? { isOverride } : {}),
+                ...(isAsync !== undefined ? { isAsync } : {}),
+                ...(isPartial !== undefined ? { isPartial } : {}),
+                ...(annotations !== undefined ? { annotations } : {}),
             });
             const fileId = generateId('File', file.path);
             const relId = generateId('DEFINES', `${fileId}->${nodeId}`);
@@ -1255,8 +1501,22 @@ const processFileGroup = (files, language, queryString, result, onFileProcessed)
 // ============================================================================
 /** Accumulated result across sub-batches */
 let accumulated = {
-    nodes: [], relationships: [], symbols: [],
-    imports: [], calls: [], assignments: [], heritage: [], routes: [], fetchCalls: [], decoratorRoutes: [], toolDefs: [], ormQueries: [], constructorBindings: [], typeEnvBindings: [], skippedLanguages: {}, fileCount: 0,
+    nodes: [],
+    relationships: [],
+    symbols: [],
+    imports: [],
+    calls: [],
+    assignments: [],
+    heritage: [],
+    routes: [],
+    fetchCalls: [],
+    decoratorRoutes: [],
+    toolDefs: [],
+    ormQueries: [],
+    constructorBindings: [],
+    typeEnvBindings: [],
+    skippedLanguages: {},
+    fileCount: 0,
 };
 let cumulativeProcessed = 0;
 const mergeResult = (target, src) => {
@@ -1281,10 +1541,21 @@ const mergeResult = (target, src) => {
 };
 parentPort.on('message', (msg) => {
     try {
+        // Legacy single-message mode (backward compat): array of files
+        if (Array.isArray(msg)) {
+            const result = processBatch(msg, (filesProcessed) => {
+                parentPort.postMessage({ type: 'progress', filesProcessed });
+            });
+            parentPort.postMessage({ type: 'result', data: result });
+            return;
+        }
         // Sub-batch mode: { type: 'sub-batch', files: [...] }
-        if (msg && msg.type === 'sub-batch') {
+        if (msg.type === 'sub-batch') {
             const result = processBatch(msg.files, (filesProcessed) => {
-                parentPort.postMessage({ type: 'progress', filesProcessed: cumulativeProcessed + filesProcessed });
+                parentPort.postMessage({
+                    type: 'progress',
+                    filesProcessed: cumulativeProcessed + filesProcessed,
+                });
             });
             cumulativeProcessed += result.fileCount;
             mergeResult(accumulated, result);
@@ -1293,21 +1564,30 @@ parentPort.on('message', (msg) => {
             return;
         }
         // Flush: send accumulated results
-        if (msg && msg.type === 'flush') {
+        if (msg.type === 'flush') {
             parentPort.postMessage({ type: 'result', data: accumulated });
             // Reset for potential reuse
-            accumulated = { nodes: [], relationships: [], symbols: [], imports: [], calls: [], assignments: [], heritage: [], routes: [], fetchCalls: [], decoratorRoutes: [], toolDefs: [], ormQueries: [], constructorBindings: [], typeEnvBindings: [], skippedLanguages: {}, fileCount: 0 };
+            accumulated = {
+                nodes: [],
+                relationships: [],
+                symbols: [],
+                imports: [],
+                calls: [],
+                assignments: [],
+                heritage: [],
+                routes: [],
+                fetchCalls: [],
+                decoratorRoutes: [],
+                toolDefs: [],
+                ormQueries: [],
+                constructorBindings: [],
+                typeEnvBindings: [],
+                skippedLanguages: {},
+                fileCount: 0,
+            };
             cumulativeProcessed = 0;
             return;
         }
-        // Legacy single-message mode (backward compat): array of files
-        if (Array.isArray(msg)) {
-            const result = processBatch(msg, (filesProcessed) => {
-                parentPort.postMessage({ type: 'progress', filesProcessed });
-            });
-            parentPort.postMessage({ type: 'result', data: result });
-            return;
-        }
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);