gitnexus 1.6.6-rc.100 → 1.6.6-rc.102

package/dist/core/ingestion/export-detection.js

@@ -62,11 +62,6 @@ const CSHARP_DECL_TYPES = new Set([
     'struct_declaration',
     'enum_declaration',
     'record_declaration',
-    // tree-sitter-c-sharp absorbs 'record struct' and 'record class' into
-    // record_declaration — these two node types are listed defensively but
-    // never emitted by the grammar in practice (verified against ^0.23.1).
-    'record_struct_declaration',
-    'record_class_declaration',
     'delegate_declaration',
     'property_declaration',
     'field_declaration',

package/dist/core/ingestion/field-extractors/configs/dart.js

@@ -42,10 +42,7 @@ export const dartConfig = {
         // declaration > type_identifier (first named child usually)
         for (let i = 0; i < node.namedChildCount; i++) {
             const child = node.namedChild(i);
-            if (child &&
-                (child.type === 'type_identifier' ||
-                    child.type === 'generic_type' ||
-                    child.type === 'function_type')) {
+            if (child && (child.type === 'type_identifier' || child.type === 'function_type')) {
                 return extractSimpleTypeName(child) ?? child.text?.trim();
             }
         }

package/dist/core/ingestion/field-extractors/configs/php.js

@@ -46,8 +46,7 @@ export const phpConfig = {
                 child.type === 'named_type' ||
                 child.type === 'optional_type' ||
                 child.type === 'primitive_type' ||
-                child.type === 'intersection_type' ||
-                child.type === 'nullable_type') {
+                child.type === 'intersection_type') {
                 return extractSimpleTypeName(child) ?? child.text?.trim();
             }
         }

package/dist/core/ingestion/field-extractors/configs/swift.js

@@ -17,7 +17,7 @@ const SWIFT_VIS = new Set([
  */
 export const swiftConfig = {
     language: SupportedLanguages.Swift,
-    typeDeclarationNodes: ['class_declaration', 'struct_declaration', 'protocol_declaration'],
+    typeDeclarationNodes: ['class_declaration', 'protocol_declaration'],
     fieldNodeTypes: ['property_declaration'],
     bodyNodeTypes: ['class_body', 'protocol_body'],
     defaultVisibility: 'internal',

package/dist/core/ingestion/field-extractors/typescript.js

@@ -70,17 +70,6 @@ export class TypeScriptFieldExtractor extends BaseFieldExtractor {
                 }
             }
         }
-        // Check for modifier node (tree-sitter typescript may group these)
-        const modifiers = node.childForFieldName('modifiers');
-        if (modifiers) {
-            for (let i = 0; i < modifiers.childCount; i++) {
-                const modifier = modifiers.child(i);
-                const modText = modifier?.text.trim();
-                if (modText && TypeScriptFieldExtractor.VISIBILITY_MODIFIERS.has(modText)) {
-                    return modText;
-                }
-            }
-        }
         // TypeScript class members are public by default
         return 'public';
     }
@@ -94,15 +83,6 @@ export class TypeScriptFieldExtractor extends BaseFieldExtractor {
                 return true;
             }
         }
-        const modifiers = node.childForFieldName('modifiers');
-        if (modifiers) {
-            for (let i = 0; i < modifiers.childCount; i++) {
-                const modifier = modifiers.child(i);
-                if (modifier && modifier.text === 'static') {
-                    return true;
-                }
-            }
-        }
         return false;
     }
     /**
@@ -115,15 +95,6 @@ export class TypeScriptFieldExtractor extends BaseFieldExtractor {
                 return true;
             }
         }
-        const modifiers = node.childForFieldName('modifiers');
-        if (modifiers) {
-            for (let i = 0; i < modifiers.childCount; i++) {
-                const modifier = modifiers.child(i);
-                if (modifier && modifier.text === 'readonly') {
-                    return true;
-                }
-            }
-        }
         return false;
     }
     /**

package/dist/core/ingestion/import-resolvers/python.d.ts

@@ -19,4 +19,4 @@
  *
  * Returns null to let the caller fall through to suffixResolve.
  */
-export declare function resolvePythonImportInternal(currentFile: string, importPath: string, allFiles: Set<string>): string | null;
+export declare function resolvePythonImportInternal(currentFile: string, importPath: string, allFiles: ReadonlySet<string>): string | null;

package/dist/core/ingestion/import-resolvers/utils.d.ts

@@ -8,7 +8,7 @@ export declare const EXTENSIONS: string[];
  * Try to match a path (with extensions) against the known file set.
  * Returns the matched file path or null.
  */
-export declare function tryResolveWithExtensions(basePath: string, allFiles: Set<string>): string | null;
+export declare function tryResolveWithExtensions(basePath: string, allFiles: ReadonlySet<string>): string | null;
 /**
  * Build a suffix index for O(1) endsWith lookups.
  * Maps every possible path suffix to its original file path.

package/dist/core/ingestion/languages/cpp/arity-metadata.js

@@ -23,7 +23,6 @@ export function computeCppDeclarationArity(node) {
             continue;
         if (child.type === 'parameter_declaration' ||
             child.type === 'optional_parameter_declaration' ||
-            child.type === 'variadic_parameter' ||
             child.type === 'variadic_parameter_declaration') {
             params.push(child);
         }
@@ -47,8 +46,7 @@ export function computeCppDeclarationArity(node) {
     // token in tree-sitter-cpp, detected via `hasEllipsis` above.
     // C++ parameter packs: `template<typename... Ts> void foo(Ts... args)` —
     // detected as `variadic_parameter_declaration`.
-    const isVariadic = hasEllipsis ||
-        params.some((p) => p.type === 'variadic_parameter' || p.type === 'variadic_parameter_declaration');
+    const isVariadic = hasEllipsis || params.some((p) => p.type === 'variadic_parameter_declaration');
     const optionalCount = params.filter((p) => p.type === 'optional_parameter_declaration').length;
     const requiredCount = params.filter((p) => p.type === 'parameter_declaration' ||
         // variadic_parameter_declaration with a name is a parameter pack — counts as one
@@ -57,11 +55,7 @@ export function computeCppDeclarationArity(node) {
     const types = [];
     const typeClasses = [];
     for (const p of params) {
-        if (p.type === 'variadic_parameter') {
-            types.push('...');
-            typeClasses.push(unknownTypeClass('...'));
-        }
-        else if (p.type === 'variadic_parameter_declaration') {
+        if (p.type === 'variadic_parameter_declaration') {
             // Parameter pack: treated as variadic
             types.push('...');
             typeClasses.push(unknownTypeClass('...'));

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

@@ -1251,7 +1251,7 @@ function lookupAdlIdentifierType(identNode) {
                 inner = next;
                 continue;
             }
-            if (inner.type === 'reference_declarator' || inner.type === 'rvalue_reference_declarator') {
+            if (inner.type === 'reference_declarator') {
                 // reference_declarator has a single child (the inner declarator).
                 let next = null;
                 for (let j = 0; j < inner.namedChildCount; j++) {

package/dist/core/ingestion/languages/csharp/captures.js

@@ -15,7 +15,7 @@
  *
  * Pure given the input source text. No I/O, no globals consulted.
  */
-import { findNodeAtRange, nodeToCapture, syntheticCapture } from '../../utils/ast-helpers.js';
+import { nodeIfType, nodeToCapture, syntheticCapture } from '../../utils/ast-helpers.js';
 import { splitUsingDirective } from './import-decomposer.js';
 import { computeCsharpArityMetadata } from './arity-metadata.js';
 import { synthesizeCsharpReceiverBinding } from './receiver-binding.js';
@@ -91,9 +91,16 @@ export function emitCsharpScopeCaptures(sourceText, _filePath, cachedTree) {
         // `@`; we put it back so the central extractor's prefix lookups
         // (`@scope.`, `@declaration.`, …) work.
         const grouped = {};
+        // Parallel tag -> captured SyntaxNode map: the query hands us each matched
+        // node as c.node, so anchors resolve via a type-guarded lookup (nodeIfType)
+        // instead of re-deriving them with findNodeAtRange(tree.rootNode, ...) per
+        // match — the O(matches x rootChildren) root-walk fixed for go #1915 /
+        // python #1918, mirrored here.
+        const nodeMap = {};
         for (const c of m.captures) {
             const tag = '@' + c.name;
             grouped[tag] = nodeToCapture(tag, c.node);
+            nodeMap[tag] = c.node;
         }
         if (Object.keys(grouped).length === 0)
             continue;
@@ -101,8 +108,7 @@ export function emitCsharpScopeCaptures(sourceText, _filePath, cachedTree) {
         // the kind/source/name/alias markers it consumes. Raw query match
         // only carries the @import.statement anchor.
         if (grouped['@import.statement'] !== undefined) {
-            const stmtCapture = grouped['@import.statement'];
-            const stmtNode = findNodeAtRange(tree.rootNode, stmtCapture.range, 'using_directive');
+            const stmtNode = nodeIfType(nodeMap['@import.statement'], 'using_directive');
             if (stmtNode !== null) {
                 const decomposed = splitUsingDirective(stmtNode);
                 if (decomposed !== null) {
@@ -116,8 +122,7 @@ export function emitCsharpScopeCaptures(sourceText, _filePath, cachedTree) {
             continue;
         }
         if (grouped['@reference.read.member'] !== undefined) {
-            const anchor = grouped['@reference.read.member'];
-            const memberNode = findNodeAtRange(tree.rootNode, anchor.range, 'member_access_expression');
+            const memberNode = nodeIfType(nodeMap['@reference.read.member'], 'member_access_expression');
             if (memberNode === null || !shouldEmitReadMember(memberNode)) {
                 continue;
             }
@@ -130,8 +135,7 @@ export function emitCsharpScopeCaptures(sourceText, _filePath, cachedTree) {
         // `@scope.function` matches.
         if (grouped['@scope.function'] !== undefined) {
             out.push(grouped);
-            const anchor = grouped['@scope.function'];
-            const fnNode = findFunctionNode(tree.rootNode, anchor.range);
+            const fnNode = nodeIfType(nodeMap['@scope.function'], ...FUNCTION_NODE_TYPES);
             if (fnNode !== null) {
                 for (const synth of synthesizeCsharpReceiverBinding(fnNode)) {
                     out.push(synth);
@@ -145,8 +149,7 @@ export function emitCsharpScopeCaptures(sourceText, _filePath, cachedTree) {
         // the first tag that matches.
         const declTag = FUNCTION_DECL_TAGS.find((t) => grouped[t] !== undefined);
         if (declTag !== undefined) {
-            const anchor = grouped[declTag];
-            const fnNode = findFunctionNode(tree.rootNode, anchor.range);
+            const fnNode = nodeIfType(nodeMap[declTag], ...FUNCTION_NODE_TYPES);
             if (fnNode !== null) {
                 const arity = computeCsharpArityMetadata(fnNode);
                 if (arity.parameterCount !== undefined) {
@@ -168,9 +171,7 @@ export function emitCsharpScopeCaptures(sourceText, _filePath, cachedTree) {
         // resolution.
         const callTag = ['@reference.call.free', '@reference.call.member', '@reference.call.constructor'].find((t) => grouped[t] !== undefined);
         if (callTag !== undefined && grouped['@reference.arity'] === undefined) {
-            const anchor = grouped[callTag];
-            const callNode = findNodeAtRange(tree.rootNode, anchor.range, 'invocation_expression') ??
-                findNodeAtRange(tree.rootNode, anchor.range, 'object_creation_expression');
+            const callNode = nodeIfType(nodeMap[callTag], 'invocation_expression', 'object_creation_expression');
             if (callNode !== null) {
                 const argList = callNode.childForFieldName('arguments');
                 const args = argList === null
@@ -195,9 +196,7 @@ export function emitCsharpScopeCaptures(sourceText, _filePath, cachedTree) {
         // `new User(...)` resolves to a Constructor def in memberByOwner.
         if (grouped['@declaration.class'] !== undefined ||
             grouped['@declaration.record'] !== undefined) {
-            const anchor = grouped['@declaration.class'] ?? grouped['@declaration.record'];
-            const typeNode = findNodeAtRange(tree.rootNode, anchor.range, 'class_declaration') ??
-                findNodeAtRange(tree.rootNode, anchor.range, 'record_declaration');
+            const typeNode = nodeIfType(nodeMap['@declaration.class'] ?? nodeMap['@declaration.record'], 'class_declaration', 'record_declaration');
             if (typeNode !== null) {
                 const synth = synthesizePrimaryConstructor(typeNode);
                 if (synth !== null)
@@ -243,7 +242,9 @@ function terminalTypeNameNode(node) {
         case 'qualified_name':
             return node.lastNamedChild;
         case 'generic_name':
-            return node.childForFieldName('name') ?? node.firstNamedChild;
+            // generic_name has no `name` field (verified by real parse, #1920); the
+            // base identifier is the first named child.
+            return node.firstNamedChild;
         default:
             return null;
     }
@@ -333,14 +334,3 @@ function inferArgType(argNode) {
             return '';
     }
 }
-/** Find the first C# function-like node at the given range. The
- *  declaration anchor range covers the whole method/constructor/etc.
- *  node, but the tag alone doesn't tell us which node type. */
-function findFunctionNode(rootNode, range) {
-    for (const nodeType of FUNCTION_NODE_TYPES) {
-        const n = findNodeAtRange(rootNode, range, nodeType);
-        if (n !== null)
-            return n;
-    }
-    return null;
-}

package/dist/core/ingestion/languages/java/captures.js

@@ -132,9 +132,12 @@ export function emitJavaScopeCaptures(sourceText, _filePath, cachedTree) {
                 findNodeAtRange(tree.rootNode, anchor.range, 'object_creation_expression');
             if (callNode !== null) {
                 const argList = callNode.childForFieldName('arguments');
+                // Exclude interleaved comments — tree-sitter-java emits `block_comment` /
+                // `line_comment` as named children of argument_list, which would inflate
+                // arity (and arity feeds call-processor symbol-ID generation). #1920
                 const args = argList === null
                     ? []
-                    : argList.namedChildren.filter((c) => c !== null && c.type !== 'comment');
+                    : argList.namedChildren.filter((c) => c !== null && c.type !== 'block_comment' && c.type !== 'line_comment');
                 grouped['@reference.arity'] = syntheticCapture('@reference.arity', callNode, String(args.length));
                 const argTypes = args.map((arg) => inferArgType(arg));
                 grouped['@reference.parameter-types'] = syntheticCapture('@reference.parameter-types', callNode, JSON.stringify(argTypes));

package/dist/core/ingestion/languages/php/captures.js

@@ -30,7 +30,7 @@
  *
  * Pure given the input source text. No I/O, no globals consulted.
  */
-import { findNodeAtRange, nodeToCapture, syntheticCapture } from '../../utils/ast-helpers.js';
+import { nodeIfType, nodeToCapture, syntheticCapture } from '../../utils/ast-helpers.js';
 import { splitNamespaceUseDeclaration } from './import-decomposer.js';
 import { computePhpArityMetadata } from './arity-metadata.js';
 import { synthesizePhpReceiverBinding } from './receiver-binding.js';
@@ -89,9 +89,16 @@ export function emitPhpScopeCaptures(sourceText, _filePath, cachedTree) {
         // Group captures by their tag name. Tree-sitter strips the leading
         // `@`; we put it back so the central extractor's prefix lookups work.
         const grouped = {};
+        // Parallel tag -> captured SyntaxNode map: the query hands us each matched
+        // node as c.node, so anchors resolve via a type-guarded lookup (nodeIfType)
+        // instead of re-deriving them with findNodeAtRange(tree.rootNode, ...) per
+        // match — the O(matches x rootChildren) root-walk fixed for go #1915 /
+        // python #1918, mirrored here.
+        const nodeMap = {};
         for (const c of m.captures) {
             const tag = '@' + c.name;
             grouped[tag] = nodeToCapture(tag, c.node);
+            nodeMap[tag] = c.node;
         }
         if (Object.keys(grouped).length === 0)
             continue;
@@ -157,8 +164,7 @@ export function emitPhpScopeCaptures(sourceText, _filePath, cachedTree) {
         // Decompose each `namespace_use_declaration` so `interpretPhpImport`
         // sees the kind/source/name/alias markers it consumes.
         if (grouped['@import.statement'] !== undefined) {
-            const stmtCapture = grouped['@import.statement'];
-            const stmtNode = findNodeAtRange(tree.rootNode, stmtCapture.range, 'namespace_use_declaration');
+            const stmtNode = nodeIfType(nodeMap['@import.statement'], 'namespace_use_declaration');
             if (stmtNode !== null) {
                 const decomposed = splitNamespaceUseDeclaration(stmtNode);
                 if (decomposed.length > 0) {
@@ -175,8 +181,7 @@ export function emitPhpScopeCaptures(sourceText, _filePath, cachedTree) {
         // non-static method-like. Mirrors C#'s `this` / `base` synthesis.
         if (grouped['@scope.function'] !== undefined) {
             out.push(grouped);
-            const anchor = grouped['@scope.function'];
-            const fnNode = findFunctionNode(tree.rootNode, anchor.range);
+            const fnNode = nodeIfType(nodeMap['@scope.function'], ...FUNCTION_NODE_TYPES);
             if (fnNode !== null) {
                 for (const synth of synthesizePhpReceiverBinding(fnNode)) {
                     out.push(synth);
@@ -196,8 +201,7 @@ export function emitPhpScopeCaptures(sourceText, _filePath, cachedTree) {
         // registry can narrow overloads.
         const declTag = FUNCTION_DECL_TAGS.find((t) => grouped[t] !== undefined);
         if (declTag !== undefined) {
-            const anchor = grouped[declTag];
-            const fnNode = findFunctionNode(tree.rootNode, anchor.range);
+            const fnNode = nodeIfType(nodeMap[declTag], ...FUNCTION_NODE_TYPES);
             if (fnNode !== null) {
                 const arity = computePhpArityMetadata(fnNode);
                 if (arity.parameterCount !== undefined) {
@@ -217,12 +221,7 @@ export function emitPhpScopeCaptures(sourceText, _filePath, cachedTree) {
         // lines 149-186). PHP needs this for arity-based dispatch (Cluster H).
         const callTag = ['@reference.call.free', '@reference.call.member', '@reference.call.constructor'].find((t) => grouped[t] !== undefined);
         if (callTag !== undefined && grouped['@reference.arity'] === undefined) {
-            const anchor = grouped[callTag];
-            const callNode = findNodeAtRange(tree.rootNode, anchor.range, 'function_call_expression') ??
-                findNodeAtRange(tree.rootNode, anchor.range, 'member_call_expression') ??
-                findNodeAtRange(tree.rootNode, anchor.range, 'nullsafe_member_call_expression') ??
-                findNodeAtRange(tree.rootNode, anchor.range, 'scoped_call_expression') ??
-                findNodeAtRange(tree.rootNode, anchor.range, 'object_creation_expression');
+            const callNode = nodeIfType(nodeMap[callTag], 'function_call_expression', 'member_call_expression', 'nullsafe_member_call_expression', 'scoped_call_expression', 'object_creation_expression');
             if (callNode !== null) {
                 const argList = callNode.childForFieldName('arguments');
                 const args = [];
@@ -244,15 +243,6 @@ export function emitPhpScopeCaptures(sourceText, _filePath, cachedTree) {
     }
     return out;
 }
-/** Find the first PHP function-like node at the given range. */
-function findFunctionNode(rootNode, range) {
-    for (const nodeType of FUNCTION_NODE_TYPES) {
-        const n = findNodeAtRange(rootNode, range, nodeType);
-        if (n !== null)
-            return n;
-    }
-    return null;
-}
 // ─── PHP receiver normalization ──────────────────────────────────────────────
 /**
  * Normalize a PHP receiver expression so the language-agnostic

package/dist/core/ingestion/languages/php/import-decomposer.js

@@ -97,23 +97,7 @@ function parseUseClause(clause, qualifier) {
     const source = qualName.text.trim();
     if (source === '')
         return null;
-    // Strategy 1: explicit alias_clause wrapper (older grammar versions).
-    const aliasClause = findNamedChild(clause, 'alias_clause');
-    if (aliasClause !== null) {
-        // alias_clause: "as" name
-        const aliasName = findNamedChild(aliasClause, 'name') ?? aliasClause.firstNamedChild;
-        const alias = aliasName?.text.trim() ?? '';
-        if (alias === '')
-            return null;
-        return {
-            kind: 'alias',
-            source,
-            name: alias,
-            alias,
-            atNode: clause,
-        };
-    }
-    // Strategy 2: bare sibling `name` node after the qualified_name.
+    // Strategy: bare sibling `name` node after the qualified_name.
     // tree-sitter-php (≥ 0.22) emits `use Foo\Bar as Baz` as:
     //   namespace_use_clause
     //     qualified_name "Foo\Bar"
@@ -197,22 +181,7 @@ function parseInnerClause(clause, prefix, qualifier) {
     if (innerPath === '')
         return null;
     const source = prefix !== '' ? `${prefix}\\${innerPath}` : innerPath;
-    // Strategy 1: explicit alias_clause wrapper (older grammar versions).
-    const aliasClause = findNamedChild(clause, 'alias_clause');
-    if (aliasClause !== null) {
-        const aliasName = findNamedChild(aliasClause, 'name') ?? aliasClause.firstNamedChild;
-        const alias = aliasName?.text.trim() ?? '';
-        if (alias === '')
-            return null;
-        return {
-            kind: 'alias',
-            source,
-            name: alias,
-            alias,
-            atNode: clause,
-        };
-    }
-    // Strategy 2: bare sibling `name` node after the qualified_name (tree-sitter-php ≥ 0.22).
+    // Strategy: bare sibling `name` node after the qualified_name (tree-sitter-php ≥ 0.22).
     if (clause.namedChildCount >= 2) {
         const lastChild = clause.namedChild(clause.namedChildCount - 1);
         if (lastChild !== null && lastChild !== qualName && lastChild.type === 'name') {

package/dist/core/ingestion/languages/php/receiver-binding.js

@@ -24,6 +24,11 @@ const TYPE_DECL_NODE_TYPES = new Set([
     'interface_declaration',
     'trait_declaration',
     'enum_declaration',
+    // tree-sitter-php node for `new class {...}` (real node is `anonymous_class`,
+    // not `anonymous_class_declaration`). Included so the enclosing-type walk
+    // stops AT the anon class and the guard below skips it (otherwise a method in
+    // an anon class nested in a named class would mis-bind $this to the outer class).
+    'anonymous_class',
 ]);
 const FUNCTION_NODE_TYPES = new Set([
     'method_declaration',
@@ -94,7 +99,7 @@ export function synthesizePhpReceiverBinding(fnNode) {
     if (enclosingType === null)
         return [];
     // Anonymous class — skip (no stable name).
-    if (enclosingType.type === 'anonymous_class_declaration')
+    if (enclosingType.type === 'anonymous_class')
         return [];
     const enclosingName = typeName(enclosingType);
     if (enclosingName === null)
@@ -102,9 +107,8 @@ export function synthesizePhpReceiverBinding(fnNode) {
     // Anchor the synthesized captures to the method body (compound_statement)
     // so they land inside the function scope, not at the class scope.
     // For interface/abstract methods that have no body, skip.
-    const bodyNode = fnNode.childForFieldName('body') ??
-        // arrow_function: body is the expression after `=>`
-        fnNode.childForFieldName('return_value');
+    // tree-sitter-php arrow_function also exposes its expression via the `body` field.
+    const bodyNode = fnNode.childForFieldName('body');
     if (bodyNode === null)
         return [];
     const out = [];

package/dist/core/ingestion/languages/python/captures.js

@@ -15,7 +15,7 @@
  *
  * Pure given the input source text. No I/O, no globals consulted.
  */
-import { findNodeAtRange, nodeToCapture, syntheticCapture } from '../../utils/ast-helpers.js';
+import { nodeToCapture, syntheticCapture } from '../../utils/ast-helpers.js';
 import { splitImportStatement } from './import-decomposer.js';
 import { getPythonParser, getPythonScopeQuery } from './query.js';
 import { synthesizeReceiverTypeBinding } from './receiver-binding.js';
@@ -59,20 +59,30 @@ export function emitPythonScopeCaptures(sourceText, _filePath, cachedTree) {
         // `@`; we put it back so the central extractor's prefix lookups
         // (`@scope.`, `@declaration.`, …) work.
         const grouped = {};
+        // Parallel tag -> captured SyntaxNode map. The tree-sitter query already
+        // hands us each matched node as `c.node`, so anchor nodes can be used
+        // directly (or via a bounded LOCAL walk) instead of re-deriving them with
+        // `findNodeAtRange(tree.rootNode, ...)`, which scanned all of root's named
+        // children on every match -> O(matches x rootChildren). That was the #1848
+        // hotpath in Go (fixed in eaf0a305); the same shape lived here in Python.
+        const nodeMap = {};
         for (const c of m.captures) {
             const tag = '@' + c.name;
             grouped[tag] = nodeToCapture(tag, c.node);
+            nodeMap[tag] = c.node;
         }
         if (Object.keys(grouped).length === 0)
             continue;
         if (grouped['@import.statement'] !== undefined) {
-            // Decompose multi-name imports. Both `import_statement` and
-            // `import_from_statement` share the matched range, so we try the
-            // `from` form first and fall back to plain.
-            const stmtCapture = grouped['@import.statement'];
-            const stmtNode = findNodeAtRange(tree.rootNode, stmtCapture.range, 'import_from_statement') ??
-                findNodeAtRange(tree.rootNode, stmtCapture.range, 'import_statement');
-            if (stmtNode !== null) {
+            // `@import.statement` is captured directly ON the `import_statement` /
+            // `import_from_statement` node (query: `(import_statement) @import.statement`
+            // and `(import_from_statement) @import.statement`), so the captured node IS
+            // the one the old findNodeAtRange re-derived. `splitImportStatement`
+            // dispatches on those two types; a captured node of any other type would
+            // have made the old range+type lookup return null -> the defensive raw
+            // fallback, which the type guard below reproduces exactly.
+            const stmtNode = nodeMap['@import.statement'];
+            if (stmtNode.type === 'import_from_statement' || stmtNode.type === 'import_statement') {
                 for (const piece of splitImportStatement(stmtNode))
                     out.push(piece);
             }
@@ -84,7 +94,11 @@ export function emitPythonScopeCaptures(sourceText, _filePath, cachedTree) {
         }
         if (grouped['@scope.function'] !== undefined) {
             out.push(grouped);
-            const fnNode = findNodeAtRange(tree.rootNode, grouped['@scope.function'].range, 'function_definition');
+            // `@scope.function` is captured directly on the `function_definition`
+            // node (query: `(function_definition) @scope.function`), so it IS the
+            // node the old findNodeAtRange re-derived at that range.
+            const scopeNode = nodeMap['@scope.function'];
+            const fnNode = scopeNode.type === 'function_definition' ? scopeNode : null;
             if (fnNode !== null) {
                 const synth = synthesizeReceiverTypeBinding(fnNode);
                 if (synth !== null)
@@ -100,7 +114,11 @@ export function emitPythonScopeCaptures(sourceText, _filePath, cachedTree) {
             // The anchor range is the function_definition itself — we resolve
             // the node and pipe it through the arity helper.
             const anchorCap = grouped['@declaration.function'];
-            const fnNode = findNodeAtRange(tree.rootNode, anchorCap.range, 'function_definition');
+            // `@declaration.function` is captured directly on the `function_definition`
+            // node (query: `(function_definition name: (identifier) @declaration.name)
+            // @declaration.function`), so use the captured node, not a root re-walk.
+            const anchorNode = nodeMap['@declaration.function'];
+            const fnNode = anchorNode.type === 'function_definition' ? anchorNode : null;
             if (fnNode !== null) {
                 if (pythonFunctionDefinitionLabel(fnNode, 'Function') === 'Method') {
                     delete grouped['@declaration.function'];

package/dist/core/ingestion/languages/python/depends-references.js

@@ -27,7 +27,7 @@ export function synthesizeDependsReferences(fnNode) {
         if (param.type !== 'typed_default_parameter' && param.type !== 'default_parameter') {
             continue;
         }
-        const defaultValue = param.childForFieldName('value') ?? param.childForFieldName('default');
+        const defaultValue = param.childForFieldName('value');
         if (defaultValue === null)
             continue;
         const callNode = defaultValue.type === 'call' ? defaultValue : null;

package/dist/core/ingestion/languages/python/import-target.d.ts

@@ -12,10 +12,9 @@
 import type { ParsedImport, WorkspaceIndex } from '../../../../_shared/index.js';
 export interface PythonResolveContext {
     readonly fromFile: string;
-    /** Mutable `Set` because the legacy `resolvePythonImportInternal`
-     *  chain downstream is typed to accept `Set<string>`. Callers that
-     *  only hold a `ReadonlySet` should copy via `new Set(...)` at the
-     *  adapter boundary. */
-    readonly allFilePaths: Set<string>;
+    /** `ReadonlySet` so the orchestrator's stable run-level set flows straight
+     *  through to `getPythonFileIndex`'s `WeakMap` key (built once per run, not
+     *  copied per import). The whole resolver chain only reads the set. */
+    readonly allFilePaths: ReadonlySet<string>;
 }
 export declare function resolvePythonImportTarget(parsedImport: ParsedImport, workspaceIndex: WorkspaceIndex): string | null;