gitnexus 1.4.7 → 1.4.9

package/dist/core/ingestion/type-env.js

@@ -1,8 +1,12 @@
-import { FUNCTION_NODE_TYPES, extractFunctionName, CLASS_CONTAINER_TYPES, isBuiltInOrNoise } from './utils.js';
-import { typeConfigs, TYPED_PARAMETER_TYPES } from './type-extractors/index.js';
+import { FUNCTION_NODE_TYPES, extractFunctionName, CLASS_CONTAINER_TYPES } from './utils/ast-helpers.js';
+import { CALL_EXPRESSION_TYPES } from './utils/call-analysis.js';
+import { TYPED_PARAMETER_TYPES } from './type-extractors/shared.js';
+import { getProvider } from './languages/index.js';
 import { extractSimpleTypeName, extractVarName, stripNullable, extractReturnTypeName } from './type-extractors/shared.js';
 /** File-level scope key */
 const FILE_SCOPE = '';
+/** Shared empty map for files with no file-scope bindings. */
+const EMPTY_FILE_SCOPE = new Map();
 /** Fallback for languages where class names aren't in a 'name' field (e.g. Kotlin uses type_identifier). */
 const findTypeIdentifierChild = (node) => {
     for (let i = 0; i < node.childCount; i++) {
@@ -12,16 +16,21 @@ const findTypeIdentifierChild = (node) => {
     }
     return null;
 };
-/** AST node types that represent mutually exclusive branch containers for pattern bindings. */
-const PATTERN_BRANCH_TYPES = new Set([
+/** AST node types that represent mutually exclusive branch containers for pattern bindings.
+ *  Includes both multi-arm pattern-match branches AND if-statement bodies for null-check narrowing. */
+const NARROWING_BRANCH_TYPES = new Set([
     'when_entry', // Kotlin when
     'switch_block_label', // Java switch (enhanced)
+    'if_statement', // TS/JS, Java, C/C++
+    'if_expression', // Kotlin (if is an expression)
+    'statement_block', // TS/JS: { ... } body of if
+    'control_structure_body', // Kotlin: body of if
 ]);
 /** Walk up the AST from a pattern node to find the enclosing branch container. */
-const findPatternBranchScope = (node) => {
+const findNarrowingBranchScope = (node) => {
     let current = node.parent;
     while (current) {
-        if (PATTERN_BRANCH_TYPES.has(current.type))
+        if (NARROWING_BRANCH_TYPES.has(current.type))
             return current;
         if (FUNCTION_NODE_TYPES.has(current.type))
             return undefined;
@@ -44,7 +53,7 @@ const fastStripNullable = (typeName) => {
         : stripNullable(typeName);
 };
 /** Implementation of the lookup logic — shared between TypeEnvironment and the legacy export. */
-const lookupInEnv = (env, varName, callNode, patternOverrides) => {
+const lookupInEnv = (env, varName, callNode, patternOverrides, enclosingFunctionFinder) => {
     // Self/this receiver: resolve to enclosing class name via AST walk
     if (varName === 'self' || varName === 'this' || varName === '$this') {
         return findEnclosingClassName(callNode);
@@ -55,7 +64,7 @@ const lookupInEnv = (env, varName, callNode, patternOverrides) => {
         return findEnclosingParentClassName(callNode);
     }
     // Determine the enclosing function scope for the call
-    const scopeKey = findEnclosingScopeKey(callNode);
+    const scopeKey = findEnclosingScopeKey(callNode, enclosingFunctionFinder);
     // Check position-indexed pattern overrides first (e.g., Kotlin when/is smart casts).
     // These take priority over flat scopeEnv because they represent per-branch narrowing.
     if (scopeKey && patternOverrides) {
@@ -83,23 +92,51 @@ const lookupInEnv = (env, varName, callNode, patternOverrides) => {
     const raw = fileEnv?.get(varName);
     return raw ? fastStripNullable(raw) : undefined;
 };
+/** Per-file memoization caches for expensive parent-walk functions.
+ *  Cleared at the start of each buildTypeEnv call (one call per file). */
+const enclosingClassNameCache = new Map();
+const enclosingParentClassNameCache = new Map();
 /**
  * Walk up the AST from a node to find the enclosing class/module name.
  * Used to resolve `self`/`this` receivers to their containing type.
+ * Memoized per-file: cache is cleared at buildTypeEnv entry.
  */
 const findEnclosingClassName = (node) => {
+    if (enclosingClassNameCache.has(node))
+        return enclosingClassNameCache.get(node);
     let current = node.parent;
     while (current) {
         if (CLASS_CONTAINER_TYPES.has(current.type)) {
             const nameNode = current.childForFieldName('name')
                 ?? findTypeIdentifierChild(current);
-            if (nameNode)
+            if (nameNode) {
+                enclosingClassNameCache.set(node, nameNode.text);
                 return nameNode.text;
+            }
         }
         current = current.parent;
     }
+    enclosingClassNameCache.set(node, undefined);
     return undefined;
 };
+/** Keywords that refer to the current instance across languages. */
+const THIS_RECEIVERS = new Set(['this', 'self', '$this', 'Me']);
+/**
+ * If a pending assignment's receiver is this/self/$this/Me, substitute the
+ * enclosing class name. Returns the item unchanged for non-receiver kinds
+ * or when the receiver is not a this-keyword. Properties are readonly in the
+ * discriminated union, so a new object is returned when substitution occurs.
+ */
+const substituteThisReceiver = (item, node) => {
+    if (item.kind !== 'fieldAccess' && item.kind !== 'methodCallResult')
+        return item;
+    if (!THIS_RECEIVERS.has(item.receiver))
+        return item;
+    const className = findEnclosingClassName(node);
+    if (!className)
+        return item;
+    return { ...item, receiver: className };
+};
 /**
  * Walk up the AST to find the enclosing class, then extract its parent class name
  * from the heritage/superclass AST node. Used to resolve `super`/`base`/`parent`.
@@ -115,13 +152,18 @@ const findEnclosingClassName = (node) => {
  * - Swift: unnamed `inheritance_specifier` child → user_type → type_identifier
  */
 const findEnclosingParentClassName = (node) => {
+    if (enclosingParentClassNameCache.has(node))
+        return enclosingParentClassNameCache.get(node);
     let current = node.parent;
     while (current) {
         if (CLASS_CONTAINER_TYPES.has(current.type)) {
-            return extractParentClassFromNode(current);
+            const result = extractParentClassFromNode(current);
+            enclosingParentClassNameCache.set(node, result);
+            return result;
         }
         current = current.parent;
     }
+    enclosingParentClassNameCache.set(node, undefined);
     return undefined;
 };
 /** Extract the parent/superclass name from a class declaration AST node. */
@@ -228,8 +270,12 @@ const extractParentClassFromNode = (classNode) => {
     }
     return undefined;
 };
-/** Find the enclosing function name for scope lookup. */
-const findEnclosingScopeKey = (node) => {
+/** Find the enclosing function name for scope lookup.
+ *  When an `enclosingFunctionFinder` hook is provided (from the language provider),
+ *  it is consulted for each ancestor before the default FUNCTION_NODE_TYPES check.
+ *  This handles languages like Dart where the function body is a sibling of the
+ *  signature instead of a child. */
+const findEnclosingScopeKey = (node, enclosingFunctionFinder) => {
     let current = node.parent;
     while (current) {
         if (FUNCTION_NODE_TYPES.has(current.type)) {
@@ -237,6 +283,15 @@ const findEnclosingScopeKey = (node) => {
             if (funcName)
                 return `${funcName}@${current.startIndex}`;
         }
+        // Language-specific hook (e.g., Dart function_body → sibling function_signature)
+        if (enclosingFunctionFinder) {
+            const result = enclosingFunctionFinder(current);
+            if (result) {
+                const sigNode = current.previousSibling;
+                const startIdx = sigNode?.startIndex ?? current.startIndex;
+                return `${result.funcName}@${startIdx}`;
+            }
+        }
         current = current.parent;
     }
     return undefined;
@@ -297,78 +352,321 @@ const SKIP_SUBTREE_TYPES = new Set([
     'regex', 'regex_pattern',
 ]);
 const CLASS_LIKE_TYPES = new Set(['Class', 'Struct', 'Interface']);
+/** Memoize class definition lookups during fixpoint iteration.
+ *  SymbolTable is immutable during type resolution, so results never change.
+ *  Eliminates redundant array allocations + filter scans across iterations. */
+const createClassDefCache = (symbolTable) => {
+    const cache = new Map();
+    return (typeName) => {
+        let result = cache.get(typeName);
+        if (result === undefined) {
+            result = symbolTable
+                ? symbolTable.lookupFuzzy(typeName).filter(d => CLASS_LIKE_TYPES.has(d.type))
+                : [];
+            cache.set(typeName, result);
+        }
+        return result;
+    };
+};
+/** AST node types representing constructor expressions across languages.
+ *  Note: C# also has `implicit_object_creation_expression` (`new()` with type
+ *  inference) which is NOT captured — the type is inferred, not explicit.
+ *  Kotlin constructors use `call_expression` (no `new` keyword) — not detected. */
+const CONSTRUCTOR_EXPR_TYPES = new Set([
+    'new_expression', // TS/JS/C++: new Dog()
+    'object_creation_expression', // Java/C#: new Dog()
+]);
+/** Extract the constructor class name from a declaration node's initializer.
+ *  Searches for new_expression / object_creation_expression in the node's subtree.
+ *  Returns the class name or undefined if no constructor is found.
+ *  Depth-limited to 5 to avoid expensive traversals. */
+const extractConstructorTypeName = (node, depth = 0) => {
+    if (depth > 5)
+        return undefined;
+    if (CONSTRUCTOR_EXPR_TYPES.has(node.type)) {
+        // Java/C#: object_creation_expression has 'type' field
+        const typeField = node.childForFieldName('type');
+        if (typeField)
+            return extractSimpleTypeName(typeField);
+        // TS/JS: new_expression has 'constructor' field (but tree-sitter often just has identifier child)
+        const ctorField = node.childForFieldName('constructor');
+        if (ctorField)
+            return extractSimpleTypeName(ctorField);
+        // Fallback: first named child is often the class identifier
+        if (node.firstNamedChild)
+            return extractSimpleTypeName(node.firstNamedChild);
+    }
+    for (let i = 0; i < node.namedChildCount; i++) {
+        const child = node.namedChild(i);
+        if (!child)
+            continue;
+        // Don't descend into nested functions/classes or call expressions (prevents
+        // finding constructor args inside method calls, e.g. processAll(new Dog()))
+        if (FUNCTION_NODE_TYPES.has(child.type) || CLASS_CONTAINER_TYPES.has(child.type)
+            || CALL_EXPRESSION_TYPES.has(child.type))
+            continue;
+        const result = extractConstructorTypeName(child, depth + 1);
+        if (result)
+            return result;
+    }
+    return undefined;
+};
+/** Max depth for MRO parent chain walking. Real-world inheritance rarely exceeds 3-4 levels. */
+const MAX_MRO_DEPTH = 5;
+/** Check if `child` is a subclass of `parent` using the parentMap.
+ *  BFS up from child, depth-limited (5), cycle-safe. */
+export const isSubclassOf = (child, parent, parentMap) => {
+    if (!parentMap || child === parent)
+        return false;
+    const visited = new Set([child]);
+    let current = [child];
+    for (let depth = 0; depth < MAX_MRO_DEPTH && current.length > 0; depth++) {
+        const next = [];
+        for (const cls of current) {
+            const parents = parentMap.get(cls);
+            if (!parents)
+                continue;
+            for (const p of parents) {
+                if (p === parent)
+                    return true;
+                if (!visited.has(p)) {
+                    visited.add(p);
+                    next.push(p);
+                }
+            }
+        }
+        current = next;
+    }
+    return false;
+};
+/** Walk up the parent class chain to find a field or method on an ancestor.
+ *  BFS-like traversal with depth limit and cycle detection. First match wins.
+ *  Used by resolveFieldType and resolveMethodReturnType when direct lookup fails. */
+const walkParentChain = (typeName, parentMap, getClassDefs, lookupOnClass) => {
+    if (!parentMap)
+        return undefined;
+    const visited = new Set([typeName]);
+    let current = [typeName];
+    for (let depth = 0; depth < MAX_MRO_DEPTH && current.length > 0; depth++) {
+        const next = [];
+        for (const cls of current) {
+            const parents = parentMap.get(cls);
+            if (!parents)
+                continue;
+            for (const parent of parents) {
+                if (visited.has(parent))
+                    continue;
+                visited.add(parent);
+                const parentDefs = getClassDefs(parent);
+                if (parentDefs.length === 1) {
+                    const result = lookupOnClass(parentDefs[0].nodeId);
+                    if (result !== undefined)
+                        return result;
+                }
+                next.push(parent);
+            }
+        }
+        current = next;
+    }
+    return undefined;
+};
 /** Resolve a field's declared type given a receiver variable and field name.
  *  Uses SymbolTable to find the class nodeId for the receiver's type, then
- *  looks up the field via the eagerly-populated fieldByOwner index. */
-const resolveFieldType = (receiver, field, scopeEnv, symbolTable) => {
+ *  looks up the field via the eagerly-populated fieldByOwner index.
+ *  Falls back to MRO parent chain walking if direct lookup fails (Phase 11A). */
+const resolveFieldType = (receiver, field, scopeEnv, symbolTable, getClassDefs, parentMap) => {
     if (!symbolTable)
         return undefined;
     const receiverType = scopeEnv.get(receiver);
     if (!receiverType)
         return undefined;
-    const classDefs = symbolTable.lookupFuzzy(receiverType)
-        .filter(d => CLASS_LIKE_TYPES.has(d.type));
+    const lookup = getClassDefs
+        ?? ((name) => symbolTable.lookupFuzzy(name).filter(d => CLASS_LIKE_TYPES.has(d.type)));
+    const classDefs = lookup(receiverType);
     if (classDefs.length !== 1)
         return undefined;
+    // Direct lookup first
     const fieldDef = symbolTable.lookupFieldByOwner(classDefs[0].nodeId, field);
-    if (!fieldDef?.declaredType)
-        return undefined;
-    return extractReturnTypeName(fieldDef.declaredType);
+    if (fieldDef?.declaredType)
+        return extractReturnTypeName(fieldDef.declaredType);
+    // MRO parent chain walking on miss
+    const inherited = walkParentChain(receiverType, parentMap, lookup, (nodeId) => {
+        const f = symbolTable.lookupFieldByOwner(nodeId, field);
+        return f?.declaredType ? extractReturnTypeName(f.declaredType) : undefined;
+    });
+    return inherited;
 };
 /** Resolve a method's return type given a receiver variable and method name.
  *  Uses SymbolTable to find class nodeIds for the receiver's type, then
- *  looks up the method via lookupFuzzyCallable filtered by ownerId. */
-const resolveMethodReturnType = (receiver, method, scopeEnv, symbolTable) => {
+ *  looks up the method via lookupFuzzyCallable filtered by ownerId.
+ *  Falls back to MRO parent chain walking if direct lookup fails (Phase 11A). */
+const resolveMethodReturnType = (receiver, method, scopeEnv, symbolTable, getClassDefs, parentMap) => {
     if (!symbolTable)
         return undefined;
     const receiverType = scopeEnv.get(receiver);
     if (!receiverType)
         return undefined;
-    const classDefs = symbolTable.lookupFuzzy(receiverType)
-        .filter(d => CLASS_LIKE_TYPES.has(d.type));
+    const lookup = getClassDefs
+        ?? ((name) => symbolTable.lookupFuzzy(name).filter(d => CLASS_LIKE_TYPES.has(d.type)));
+    const classDefs = lookup(receiverType);
     if (classDefs.length === 0)
         return undefined;
+    // Direct lookup first
     const classNodeIds = new Set(classDefs.map(d => d.nodeId));
     const methods = symbolTable.lookupFuzzyCallable(method)
         .filter(d => d.ownerId && classNodeIds.has(d.ownerId));
-    if (methods.length !== 1)
-        return undefined;
-    if (!methods[0].returnType)
-        return undefined;
-    return extractReturnTypeName(methods[0].returnType);
+    if (methods.length === 1 && methods[0].returnType) {
+        return extractReturnTypeName(methods[0].returnType);
+    }
+    // MRO parent chain walking on miss
+    if (methods.length === 0) {
+        const inherited = walkParentChain(receiverType, parentMap, lookup, (nodeId) => {
+            const parentMethods = symbolTable.lookupFuzzyCallable(method)
+                .filter(d => d.ownerId === nodeId);
+            if (parentMethods.length !== 1 || !parentMethods[0].returnType)
+                return undefined;
+            return extractReturnTypeName(parentMethods[0].returnType);
+        });
+        return inherited;
+    }
+    return undefined;
 };
-export const buildTypeEnv = (tree, language, symbolTable) => {
+/**
+ * Unified fixpoint propagation: iterate over ALL pending items (copy, callResult,
+ * fieldAccess, methodCallResult) until no new bindings are produced.
+ * Handles arbitrary-depth mixed chains:
+ *   const user = getUser();      // callResult → User
+ *   const addr = user.address;   // fieldAccess → Address (depends on user)
+ *   const city = addr.getCity(); // methodCallResult → City (depends on addr)
+ *   const alias = city;          // copy → City (depends on city)
+ * Data flow: SymbolTable (immutable) + scopeEnv → resolve → scopeEnv.
+ * Termination: finite entries, each bound at most once (first-writer-wins), max 10 iterations.
+ */
+const MAX_FIXPOINT_ITERATIONS = 10;
+const resolveFixpointBindings = (pendingItems, env, returnTypeLookup, symbolTable, parentMap) => {
+    if (pendingItems.length === 0)
+        return;
+    const getClassDefs = createClassDefCache(symbolTable);
+    const resolved = new Set();
+    for (let iter = 0; iter < MAX_FIXPOINT_ITERATIONS; iter++) {
+        let changed = false;
+        for (let i = 0; i < pendingItems.length; i++) {
+            if (resolved.has(i))
+                continue;
+            const item = pendingItems[i];
+            const scopeEnv = env.get(item.scope);
+            if (!scopeEnv || scopeEnv.has(item.lhs)) {
+                resolved.add(i);
+                continue;
+            }
+            let typeName;
+            switch (item.kind) {
+                case 'callResult':
+                    // Phase 9: Prefer FQN lookup when available for higher precision
+                    typeName = item.calleeFqn
+                        ? returnTypeLookup.lookupReturnType(item.calleeFqn)
+                        : returnTypeLookup.lookupReturnType(item.callee);
+                    break;
+                case 'copy':
+                    typeName = scopeEnv.get(item.rhs) ?? env.get(FILE_SCOPE)?.get(item.rhs);
+                    break;
+                case 'fieldAccess':
+                    typeName = resolveFieldType(item.receiver, item.field, scopeEnv, symbolTable, getClassDefs, parentMap);
+                    break;
+                case 'methodCallResult':
+                    typeName = resolveMethodReturnType(item.receiver, item.method, scopeEnv, symbolTable, getClassDefs, parentMap);
+                    break;
+                default: {
+                    // Exhaustive check: TypeScript will error here if a new PendingAssignment
+                    // kind is added without handling it in the switch.
+                    const _exhaustive = item;
+                    break;
+                }
+            }
+            if (typeName) {
+                scopeEnv.set(item.lhs, typeName);
+                resolved.add(i);
+                changed = true;
+            }
+        }
+        if (!changed)
+            break;
+        if (iter === MAX_FIXPOINT_ITERATIONS - 1 && process.env.GITNEXUS_DEBUG) {
+            const unresolved = pendingItems.length - resolved.size;
+            if (unresolved > 0) {
+                console.warn(`[type-env] fixpoint hit iteration cap (${MAX_FIXPOINT_ITERATIONS}), ${unresolved} items unresolved`);
+            }
+        }
+    }
+};
+/** Seed cross-file type bindings into the file scope.
+ *  MUST be called AFTER walk() completes so that local declarations
+ *  (Tier 0/1) always take precedence over imported bindings (first-writer-wins). */
+function seedImportedBindings(env, importedBindings) {
+    let fileEnv = env.get(FILE_SCOPE);
+    if (!fileEnv) {
+        fileEnv = new Map();
+        env.set(FILE_SCOPE, fileEnv);
+    }
+    for (const [name, type] of importedBindings) {
+        if (!fileEnv.has(name)) {
+            fileEnv.set(name, type);
+        }
+    }
+}
+export const buildTypeEnv = (tree, language, options) => {
+    // Clear per-file memoization caches from the previous file.
+    enclosingClassNameCache.clear();
+    enclosingParentClassNameCache.clear();
+    const symbolTable = options?.symbolTable;
+    const parentMap = options?.parentMap;
     const env = new Map();
     const patternOverrides = new Map();
+    // Phase P: maps `scope\0varName` → constructor type when a declaration has BOTH
+    // a base type annotation AND a more specific constructor initializer.
+    // e.g., `Animal a = new Dog()` → constructorTypeMap.set('func@42\0a', 'Dog')
+    const constructorTypeMap = new Map();
     const localClassNames = new Set();
     const classNames = createClassNameLookup(localClassNames, symbolTable);
-    const config = typeConfigs[language];
+    const provider = getProvider(language);
+    const config = provider.typeConfig;
     const bindings = [];
-    // Build ReturnTypeLookup from optional SymbolTable.
-    // Conservative: returns undefined when callee is ambiguous (0 or 2+ matches).
+    // Build ReturnTypeLookup: SymbolTable is authoritative when it has an unambiguous match.
+    // Cross-file importedReturnTypes are consulted ONLY when SymbolTable has 0 matches.
+    // Ambiguous (2+) → undefined, no cross-file fallback (conservative, local-first principle).
     const returnTypeLookup = {
         lookupReturnType(callee) {
-            if (!symbolTable)
-                return undefined;
-            if (isBuiltInOrNoise(callee))
-                return undefined;
-            const callables = symbolTable.lookupFuzzyCallable(callee);
-            if (callables.length !== 1)
-                return undefined;
-            const rawReturn = callables[0].returnType;
-            if (!rawReturn)
-                return undefined;
-            return extractReturnTypeName(rawReturn);
+            // SymbolTable is authoritative when it has an unambiguous match
+            if (symbolTable) {
+                if (provider.isBuiltInName(callee))
+                    return undefined;
+                const callables = symbolTable.lookupFuzzyCallable(callee);
+                if (callables.length === 1) {
+                    const rawReturn = callables[0].returnType;
+                    if (rawReturn)
+                        return extractReturnTypeName(rawReturn);
+                }
+                // Ambiguous (2+) → return undefined (conservative, no cross-file fallback)
+                if (callables.length > 1)
+                    return undefined;
+            }
+            // No match (0 results or no symbolTable) → fall back to cross-file
+            return options?.importedReturnTypes?.get(callee);
         },
         lookupRawReturnType(callee) {
-            if (!symbolTable)
-                return undefined;
-            if (isBuiltInOrNoise(callee))
-                return undefined;
-            const callables = symbolTable.lookupFuzzyCallable(callee);
-            if (callables.length !== 1)
-                return undefined;
-            return callables[0].returnType;
+            if (symbolTable) {
+                if (provider.isBuiltInName(callee))
+                    return undefined;
+                const callables = symbolTable.lookupFuzzyCallable(callee);
+                if (callables.length === 1)
+                    return callables[0].returnType;
+                // Ambiguous (2+) → return undefined (conservative, no cross-file fallback)
+                if (callables.length > 1)
+                    return undefined;
+            }
+            // Cross-file fallback uses importedRawReturnTypes (raw declared types, e.g., 'User[]')
+            // NOT importedReturnTypes (which contains processed/simple types via extractReturnTypeName)
+            return options?.importedRawReturnTypes?.get(callee);
         }
     };
     // Pre-compute combined set of node types that need extractTypeBinding.
@@ -381,6 +679,9 @@ export const buildTypeEnv = (tree, language, symbolTable) => {
     // methodCallResult items during walk(), then iterates until no new bindings are produced.
     // Handles arbitrary-depth mixed chains: callResult → fieldAccess → methodCallResult → copy.
     const pendingItems = [];
+    // For-loop nodes whose iterable was unresolved at walk-time. Replayed after the fixpoint
+    // resolves the iterable's type, bridging the walk-time/fixpoint gap (Phase 10 / ex-9B).
+    const pendingForLoops = [];
     // Maps `scope\0varName` → the type annotation AST node from the original declaration.
     // Allows pattern extractors to navigate back to the declaration's generic type arguments
     // (e.g., to extract T from Result<T, E> for `if let Ok(x) = res`).
@@ -432,7 +733,8 @@ export const buildTypeEnv = (tree, language, symbolTable) => {
                         fallbackName = child;
                     }
                     if (!fallbackType && (child.type === 'user_type' || child.type === 'type_identifier'
-                        || child.type === 'generic_type' || child.type === 'parameterized_type')) {
+                        || child.type === 'generic_type' || child.type === 'parameterized_type'
+                        || child.type === 'nullable_type')) {
                         fallbackType = child;
                     }
                 }
@@ -450,8 +752,14 @@ export const buildTypeEnv = (tree, language, symbolTable) => {
         // Checked before declarationNodeTypes — loop variables are not declarations.
         if (config.forLoopNodeTypes?.has(node.type)) {
             if (config.extractForLoopBinding) {
+                const sizeBefore = scopeEnv.size;
                 const forLoopCtx = { scopeEnv, declarationTypeNodes, scope, returnTypeLookup };
                 config.extractForLoopBinding(node, forLoopCtx);
+                // If no new binding was produced, the iterable's type may not yet be resolved.
+                // Store for post-fixpoint replay (Phase 10 / ex-9B loop-fixpoint bridge).
+                if (scopeEnv.size === sizeBefore) {
+                    pendingForLoops.push({ node, scope });
+                }
             }
             return;
         }
@@ -477,8 +785,32 @@ export const buildTypeEnv = (tree, language, symbolTable) => {
                         }
                     }
                 }
-                if (wrapped)
+                if (wrapped) {
                     typeNode = wrapped.childForFieldName('type');
+                    // Kotlin: variable_declaration stores the type as user_type / nullable_type
+                    // child rather than a named 'type' field.
+                    if (!typeNode) {
+                        for (let i = 0; i < wrapped.namedChildCount; i++) {
+                            const c = wrapped.namedChild(i);
+                            if (c && (c.type === 'user_type' || c.type === 'nullable_type')) {
+                                typeNode = c;
+                                break;
+                            }
+                        }
+                    }
+                }
+                // Swift: property_declaration has type_annotation as a direct child (not a 'type' field).
+                // Extract the inner type node (array_type, user_type, etc.) for declarationTypeNodes.
+                if (!typeNode) {
+                    for (let i = 0; i < node.namedChildCount; i++) {
+                        const c = node.namedChild(i);
+                        if (c?.type === 'type_annotation') {
+                            // Use the inner type (array_type, user_type) rather than the annotation wrapper
+                            typeNode = c.firstNamedChild ?? c;
+                            break;
+                        }
+                    }
+                }
             }
             if (typeNode) {
                 const nameNode = node.childForFieldName('name')
@@ -492,13 +824,20 @@ export const buildTypeEnv = (tree, language, symbolTable) => {
                 }
             }
             // Run the language-specific declaration extractor (may or may not add to scopeEnv).
-            const keysBefore = typeNode ? new Set(scopeEnv.keys()) : undefined;
+            const sizeBefore = typeNode ? scopeEnv.size : -1;
             config.extractDeclaration(node, scopeEnv);
             // Fallback: for multi-declarator languages (TS, C#, Java) where the type field
-            // is on variable_declarator children, capture via keysBefore/keysAfter diff.
-            if (typeNode && keysBefore) {
+            // is on variable_declarator children, capture newly-added keys.
+            // Map preserves insertion order, so new keys are always at the end —
+            // skip the first sizeBefore entries to find only newly-added variables.
+            if (sizeBefore >= 0 && scopeEnv.size > sizeBefore) {
+                let skip = sizeBefore;
                 for (const varName of scopeEnv.keys()) {
-                    if (!keysBefore.has(varName) && !declarationTypeNodes.has(`${scope}\0${varName}`)) {
+                    if (skip > 0) {
+                        skip--;
+                        continue;
+                    }
+                    if (!declarationTypeNodes.has(`${scope}\0${varName}`)) {
                         declarationTypeNodes.set(`${scope}\0${varName}`, typeNode);
                     }
                 }
@@ -510,6 +849,35 @@ export const buildTypeEnv = (tree, language, symbolTable) => {
             if (config.extractInitializer) {
                 config.extractInitializer(node, scopeEnv, classNames);
             }
+            // Phase P: detect constructor-visible virtual dispatch.
+            // When a declaration has BOTH a type annotation AND a constructor initializer,
+            // record the constructor type for receiver override at call resolution time.
+            // e.g., `Animal a = new Dog()` → constructorTypeMap.set('scope\0a', 'Dog')
+            if (sizeBefore >= 0 && scopeEnv.size > sizeBefore) {
+                let ctorSkip = sizeBefore;
+                for (const varName of scopeEnv.keys()) {
+                    if (ctorSkip > 0) {
+                        ctorSkip--;
+                        continue;
+                    }
+                    const declaredType = scopeEnv.get(varName);
+                    if (!declaredType)
+                        continue;
+                    const ctorType = extractConstructorTypeName(node)
+                        ?? config.detectConstructorType?.(node, classNames);
+                    if (!ctorType || ctorType === declaredType)
+                        continue;
+                    // Unwrap wrapper types (e.g., C++ shared_ptr<Animal> → Animal) for an
+                    // accurate isSubclassOf comparison. Language-specific via config hook.
+                    const declTypeNode = declarationTypeNodes.get(`${scope}\0${varName}`);
+                    const effectiveDeclaredType = (declTypeNode && config.unwrapDeclaredType)
+                        ? (config.unwrapDeclaredType(declaredType, declTypeNode) ?? declaredType)
+                        : declaredType;
+                    if (ctorType !== effectiveDeclaredType) {
+                        constructorTypeMap.set(`${scope}\0${varName}`, ctorType);
+                    }
+                }
+            }
         }
     };
     const walk = (node, currentScope) => {
@@ -542,7 +910,8 @@ export const buildTypeEnv = (tree, language, symbolTable) => {
             extractTypeBinding(node, scopeEnv, scope);
         }
         // Pattern binding extraction: handles constructs that introduce NEW typed variables
-        // via pattern matching (e.g. `if let Some(x) = opt`, `x instanceof T t`).
+        // via pattern matching (e.g. `if let Some(x) = opt`, `x instanceof T t`)
+        // or narrow existing variables within a branch (null-check narrowing).
         // Runs after Tier 0/1 so scopeEnv already contains the source variable's type.
         // Conservative: extractor returns undefined when source type is unknown.
         if (config.extractPatternBinding && (!config.patternBindingNodeTypes || config.patternBindingNodeTypes.has(node.type))) {
@@ -552,11 +921,25 @@ export const buildTypeEnv = (tree, language, symbolTable) => {
             const scopeEnv = env.get(scope);
             const patternBinding = config.extractPatternBinding(node, scopeEnv, declarationTypeNodes, scope);
             if (patternBinding) {
-                if (config.allowPatternBindingOverwrite) {
+                if (patternBinding.narrowingRange) {
+                    // Explicit narrowing range (null-check narrowing): always store in patternOverrides
+                    // using the extractor-provided range (typically the if-body block).
+                    if (!patternOverrides.has(scope))
+                        patternOverrides.set(scope, new Map());
+                    const varMap = patternOverrides.get(scope);
+                    if (!varMap.has(patternBinding.varName))
+                        varMap.set(patternBinding.varName, []);
+                    varMap.get(patternBinding.varName).push({
+                        rangeStart: patternBinding.narrowingRange.startIndex,
+                        rangeEnd: patternBinding.narrowingRange.endIndex,
+                        typeName: patternBinding.typeName,
+                    });
+                }
+                else if (config.allowPatternBindingOverwrite) {
                     // Position-indexed: store per-branch binding for smart-cast narrowing.
                     // Each when arm / switch case gets its own type for the variable,
                     // preventing cross-arm contamination (e.g., Kotlin when/is).
-                    const branchNode = findPatternBranchScope(node);
+                    const branchNode = findNarrowingBranchScope(node);
                     if (branchNode) {
                         if (!patternOverrides.has(scope))
                             patternOverrides.set(scope, new Map());
@@ -583,6 +966,7 @@ export const buildTypeEnv = (tree, language, symbolTable) => {
         // Delegates to per-language extractPendingAssignment — AST shapes differ widely
         // (JS uses variable_declarator/name/value, Rust uses let_declaration/pattern/value,
         // Python uses assignment/left/right, Go uses short_var_declaration/expression_list).
+        // May return a single item or an array (for destructuring: N fieldAccess items).
         if (config.extractPendingAssignment && config.declarationNodeTypes.has(node.type)) {
             // scopeEnv is guaranteed to exist here because declarationNodeTypes is a subset
             // of interestingNodeTypes, so extractTypeBinding already created the scope map above.
@@ -590,7 +974,12 @@ export const buildTypeEnv = (tree, language, symbolTable) => {
             if (scopeEnv) {
                 const pending = config.extractPendingAssignment(node, scopeEnv);
                 if (pending) {
-                    pendingItems.push({ scope, ...pending });
+                    const items = Array.isArray(pending) ? pending : [pending];
+                    for (const item of items) {
+                        // Substitute this/self/$this/Me receivers with enclosing class name
+                        const resolved = substituteThisReceiver(item, node);
+                        pendingItems.push({ scope, ...resolved });
+                    }
                 }
             }
         }
@@ -613,55 +1002,41 @@ export const buildTypeEnv = (tree, language, symbolTable) => {
         }
     };
     walk(tree.rootNode, FILE_SCOPE);
-    // Unified fixpoint propagation: iterate over ALL pending items (copy, callResult,
-    // fieldAccess, methodCallResult) until no new bindings are produced.
-    // Handles arbitrary-depth mixed chains:
-    //   const user = getUser();      // callResult → User
-    //   const addr = user.address;   // fieldAccess → Address (depends on user)
-    //   const city = addr.getCity(); // methodCallResult → City (depends on addr)
-    //   const alias = city;          // copy → City (depends on city)
-    // Data flow: SymbolTable (immutable) + scopeEnv → resolve → scopeEnv.
-    // Termination: finite entries, each bound at most once (first-writer-wins), max 10 iterations.
-    const MAX_FIXPOINT_ITERATIONS = 10;
-    const resolved = new Set();
-    for (let iter = 0; iter < MAX_FIXPOINT_ITERATIONS; iter++) {
-        let changed = false;
-        for (let i = 0; i < pendingItems.length; i++) {
-            if (resolved.has(i))
-                continue;
-            const item = pendingItems[i];
+    // Phase 14: Seed cross-file bindings from upstream files AFTER walk
+    // (local declarations from walk() take precedence — first-writer-wins)
+    if (options?.importedBindings && options.importedBindings.size > 0) {
+        seedImportedBindings(env, options.importedBindings);
+    }
+    resolveFixpointBindings(pendingItems, env, returnTypeLookup, symbolTable, parentMap);
+    // Post-fixpoint for-loop replay (Phase 10 / ex-9B loop-fixpoint bridge):
+    // For-loop nodes whose iterables were unresolved at walk-time may now be
+    // resolvable because the fixpoint bound the iterable's type.
+    // Example: `const users = getUsers(); for (const u of users) { u.save(); }`
+    //   - walk-time: users untyped → u unresolved
+    //   - fixpoint: users → User[]
+    //   - replay: users now typed → u → User
+    if (pendingForLoops.length > 0 && config.extractForLoopBinding) {
+        for (const { node, scope } of pendingForLoops) {
+            if (!env.has(scope))
+                env.set(scope, new Map());
+            const scopeEnv = env.get(scope);
+            config.extractForLoopBinding(node, { scopeEnv, declarationTypeNodes, scope, returnTypeLookup });
+        }
+        // Re-run the main fixpoint to resolve items that depended on loop variables.
+        // Only needed if replay actually produced new bindings.
+        const unresolvedBefore = pendingItems.filter((item) => {
             const scopeEnv = env.get(item.scope);
-            if (!scopeEnv || scopeEnv.has(item.lhs)) {
-                resolved.add(i);
-                continue;
-            }
-            let typeName;
-            switch (item.kind) {
-                case 'callResult':
-                    typeName = returnTypeLookup.lookupReturnType(item.callee);
-                    break;
-                case 'copy':
-                    typeName = scopeEnv.get(item.rhs) ?? env.get(FILE_SCOPE)?.get(item.rhs);
-                    break;
-                case 'fieldAccess':
-                    typeName = resolveFieldType(item.receiver, item.field, scopeEnv, symbolTable);
-                    break;
-                case 'methodCallResult':
-                    typeName = resolveMethodReturnType(item.receiver, item.method, scopeEnv, symbolTable);
-                    break;
-            }
-            if (typeName) {
-                scopeEnv.set(item.lhs, typeName);
-                resolved.add(i);
-                changed = true;
-            }
+            return scopeEnv && !scopeEnv.has(item.lhs);
+        });
+        if (unresolvedBefore.length > 0) {
+            resolveFixpointBindings(unresolvedBefore, env, returnTypeLookup, symbolTable);
         }
-        if (!changed)
-            break;
     }
     return {
-        lookup: (varName, callNode) => lookupInEnv(env, varName, callNode, patternOverrides),
+        lookup: (varName, callNode) => lookupInEnv(env, varName, callNode, patternOverrides, options?.enclosingFunctionFinder),
         constructorBindings: bindings,
-        env,
+        fileScope: () => env.get(FILE_SCOPE) ?? EMPTY_FILE_SCOPE,
+        allScopes: () => env,
+        constructorTypeMap,
     };
 };