gitnexus 1.4.6 → 1.4.8

package/dist/core/ingestion/type-extractors/python.js

@@ -61,6 +61,10 @@ const extractParameter = (node, env) => {
     else {
         nameNode = node.childForFieldName('name') ?? node.childForFieldName('pattern');
         typeNode = node.childForFieldName('type');
+        // Python typed_parameter: name is a positional child (identifier), not a named field
+        if (!nameNode && node.type === 'typed_parameter') {
+            nameNode = node.firstNamedChild?.type === 'identifier' ? node.firstNamedChild : null;
+        }
     }
     if (!nameNode || !typeNode)
         return;
@@ -229,6 +233,38 @@ const findPyParamElementType = (iterableName, startNode, pos = 'last') => {
     }
     return undefined;
 };
+/**
+ * Extracts iterableName and methodName from a call expression like `data.items()`.
+ * Returns undefined if the call doesn't match the expected pattern.
+ */
+const extractMethodCall = (callNode) => {
+    const fn = callNode.childForFieldName('function');
+    if (fn?.type !== 'attribute')
+        return undefined;
+    const obj = fn.firstNamedChild;
+    if (obj?.type !== 'identifier')
+        return undefined;
+    const method = fn.lastNamedChild;
+    const methodName = (method?.type === 'identifier' && method !== obj) ? method.text : undefined;
+    return { iterableName: obj.text, methodName };
+};
+/**
+ * Collects all identifier nodes from a pattern, descending into nested tuple_patterns.
+ * For `i, (k, v)` returns [i, k, v]. For `key, value` returns [key, value].
+ */
+const collectPatternIdentifiers = (pattern) => {
+    const vars = [];
+    for (let i = 0; i < pattern.namedChildCount; i++) {
+        const child = pattern.namedChild(i);
+        if (child?.type === 'identifier') {
+            vars.push(child);
+        }
+        else if (child?.type === 'tuple_pattern') {
+            vars.push(...collectPatternIdentifiers(child));
+        }
+    }
+    return vars;
+};
 /**
  * Python: for user in users: where users has a known container type annotation.
  *
@@ -238,15 +274,19 @@ const findPyParamElementType = (iterableName, startNode, pos = 'last') => {
  *   1. declarationTypeNodes — raw type annotation AST node (covers stored container types)
  *   2. scopeEnv string — extractElementTypeFromString on the stored type
  *   3. AST walk — walks up to the enclosing function's parameters to read List[User] directly
+ *
+ * Also handles `enumerate(iterable)` — unwraps the outer call and skips the integer
+ * index variable so the value variable still resolves to the element type.
  */
 const extractForLoopBinding = (node, { scopeEnv, declarationTypeNodes, scope, returnTypeLookup }) => {
     if (node.type !== 'for_statement')
         return;
-    // The iterable is the `right` field — may be identifier, attribute, or call.
     const rightNode = node.childForFieldName('right');
     let iterableName;
     let methodName;
     let callExprElementType;
+    let isEnumerate = false;
+    // Extract iterable info from the `right` field — may be identifier, attribute, or call.
     if (rightNode?.type === 'identifier') {
         iterableName = rightNode.text;
     }
@@ -256,20 +296,28 @@ const extractForLoopBinding = (node, { scopeEnv, declarationTypeNodes, scope, re
             iterableName = prop.text;
     }
     else if (rightNode?.type === 'call') {
-        // data.items() → call > function: attribute > identifier('data') + identifier('items')
-        // get_users() → call > function: identifier (Phase 7.3 — return-type path)
         const fn = rightNode.childForFieldName('function');
-        if (fn?.type === 'attribute') {
-            const obj = fn.firstNamedChild;
-            if (obj?.type === 'identifier')
-                iterableName = obj.text;
-            // Extract method name: items, keys, values
-            const method = fn.lastNamedChild;
-            if (method?.type === 'identifier' && method !== obj)
-                methodName = method.text;
+        if (fn?.type === 'identifier' && fn.text === 'enumerate') {
+            // enumerate(iterable) or enumerate(d.items()) — unwrap to inner iterable.
+            isEnumerate = true;
+            const innerArg = rightNode.childForFieldName('arguments')?.firstNamedChild;
+            if (innerArg?.type === 'identifier') {
+                iterableName = innerArg.text;
+            }
+            else if (innerArg?.type === 'call') {
+                const extracted = extractMethodCall(innerArg);
+                if (extracted)
+                    ({ iterableName, methodName } = extracted);
+            }
+        }
+        else if (fn?.type === 'attribute') {
+            // data.items() → call > function: attribute > identifier('data') + identifier('items')
+            const extracted = extractMethodCall(rightNode);
+            if (extracted)
+                ({ iterableName, methodName } = extracted);
         }
         else if (fn?.type === 'identifier') {
-            // Direct function call: for user in get_users()
+            // Direct function call: for user in get_users() (Phase 7.3 — return-type path)
             const rawReturn = returnTypeLookup.lookupRawReturnType(fn.text);
             if (rawReturn)
                 callExprElementType = extractElementTypeFromString(rawReturn);
@@ -292,11 +340,12 @@ const extractForLoopBinding = (node, { scopeEnv, declarationTypeNodes, scope, re
     const leftNode = node.childForFieldName('left');
     if (!leftNode)
         return;
-    // Handle tuple unpacking: for key, value in data.items()
-    if (leftNode.type === 'pattern_list') {
-        const lastChild = leftNode.lastNamedChild;
-        if (lastChild?.type === 'identifier') {
-            scopeEnv.set(lastChild.text, elementType);
+    if (leftNode.type === 'pattern_list' || leftNode.type === 'tuple_pattern') {
+        // Tuple unpacking: `key, value` or `i, (k, v)` or `(k, v)` — bind the last identifier to element type.
+        // With enumerate, skip binding if there's only one var (just the index, no value to bind).
+        const vars = collectPatternIdentifiers(leftNode);
+        if (vars.length > 0 && (!isEnumerate || vars.length > 1)) {
+            scopeEnv.set(vars[vars.length - 1].text, elementType);
         }
         return;
     }
@@ -327,6 +376,29 @@ const extractPendingAssignment = (node, scopeEnv) => {
         return undefined;
     if (right.type === 'identifier')
         return { kind: 'copy', lhs, rhs: right.text };
+    // attribute RHS → fieldAccess (a.field)
+    if (right.type === 'attribute') {
+        const obj = right.firstNamedChild;
+        const field = right.lastNamedChild;
+        if (obj?.type === 'identifier' && field?.type === 'identifier' && obj !== field) {
+            return { kind: 'fieldAccess', lhs, receiver: obj.text, field: field.text };
+        }
+    }
+    // call RHS
+    if (right.type === 'call') {
+        const funcNode = right.childForFieldName('function');
+        if (funcNode?.type === 'identifier') {
+            return { kind: 'callResult', lhs, callee: funcNode.text };
+        }
+        // method call with receiver: call → function: attribute
+        if (funcNode?.type === 'attribute') {
+            const obj = funcNode.firstNamedChild;
+            const method = funcNode.lastNamedChild;
+            if (obj?.type === 'identifier' && method?.type === 'identifier' && obj !== method) {
+                return { kind: 'methodCallResult', lhs, receiver: obj.text, method: method.text };
+            }
+        }
+    }
     return undefined;
 };
 /**

package/dist/core/ingestion/type-extractors/ruby.js

@@ -372,9 +372,24 @@ const extractPendingAssignment = (node, scopeEnv) => {
     if (scopeEnv.has(varName))
         return undefined;
     const rhsNode = node.childForFieldName('right');
-    if (!rhsNode || rhsNode.type !== 'identifier')
+    if (!rhsNode)
         return undefined;
-    return { kind: 'copy', lhs: varName, rhs: rhsNode.text };
+    if (rhsNode.type === 'identifier')
+        return { kind: 'copy', lhs: varName, rhs: rhsNode.text };
+    // call/method_call RHS — Ruby uses method calls for both field access and method calls
+    if (rhsNode.type === 'call' || rhsNode.type === 'method_call') {
+        const methodNode = rhsNode.childForFieldName('method');
+        const receiverNode = rhsNode.childForFieldName('receiver');
+        if (!receiverNode && methodNode?.type === 'identifier') {
+            // No receiver → callResult (bare function call)
+            return { kind: 'callResult', lhs: varName, callee: methodNode.text };
+        }
+        if (receiverNode?.type === 'identifier' && methodNode?.type === 'identifier') {
+            // With receiver → methodCallResult (a.method)
+            return { kind: 'methodCallResult', lhs: varName, receiver: receiverNode.text, method: methodNode.text };
+        }
+    }
+    return undefined;
 };
 export const typeConfig = {
     declarationNodeTypes: DECLARATION_NODE_TYPES,

package/dist/core/ingestion/type-extractors/rust.js

@@ -95,7 +95,7 @@ const extractDeclaration = (node, env) => {
         env.set(varName, typeName);
 };
 /** Rust: let x = User::new(), let x = User::default(), or let x = User { ... } */
-const extractInitializer = (node, env, _classNames) => {
+const extractInitializer = (node, env, classNames) => {
     // Skip if there's an explicit type annotation — Tier 0 already handled it
     if (node.childForFieldName('type') !== null)
         return;
@@ -119,6 +119,13 @@ const extractInitializer = (node, env, _classNames) => {
             env.set(varName, typeName);
         return;
     }
+    // Unit struct instantiation: let svc = UserService; (bare identifier, no braces or call)
+    if (value.type === 'identifier' && classNames.has(value.text)) {
+        const varName = extractVarName(pattern);
+        if (varName)
+            env.set(varName, value.text);
+        return;
+    }
     if (value.type !== 'call_expression')
         return;
     const func = value.childForFieldName('function');
@@ -198,7 +205,8 @@ const scanConstructorBinding = (node) => {
         return undefined;
     return { varName: patternNode.text, calleeName };
 };
-/** Rust: let alias = u; → let_declaration with pattern + value fields */
+/** Rust: let alias = u; → let_declaration with pattern + value fields.
+ *  Also handles struct destructuring: `let Point { x, y } = p` → N fieldAccess items. */
 const extractPendingAssignment = (node, scopeEnv) => {
     if (node.type !== 'let_declaration')
         return undefined;
@@ -206,11 +214,71 @@ const extractPendingAssignment = (node, scopeEnv) => {
     const value = node.childForFieldName('value');
     if (!pattern || !value)
         return undefined;
+    // Struct pattern destructuring: `let Point { x, y } = receiver`
+    // struct_pattern has a type child (struct name) and field_pattern children
+    if (pattern.type === 'struct_pattern' && value.type === 'identifier') {
+        const receiver = value.text;
+        const items = [];
+        for (let j = 0; j < pattern.namedChildCount; j++) {
+            const field = pattern.namedChild(j);
+            if (!field)
+                continue;
+            if (field.type === 'field_pattern') {
+                // `Point { x: local_x }` → field_pattern with name + pattern children
+                const nameNode = field.childForFieldName('name');
+                const patNode = field.childForFieldName('pattern');
+                if (nameNode && patNode) {
+                    const fieldName = nameNode.text;
+                    const varName = extractVarName(patNode);
+                    if (varName && !scopeEnv.has(varName)) {
+                        items.push({ kind: 'fieldAccess', lhs: varName, receiver, field: fieldName });
+                    }
+                }
+                else if (nameNode) {
+                    // Shorthand: `Point { x }` → field_pattern with only name (varName = fieldName)
+                    const varName = nameNode.text;
+                    if (!scopeEnv.has(varName)) {
+                        items.push({ kind: 'fieldAccess', lhs: varName, receiver, field: varName });
+                    }
+                }
+            }
+        }
+        if (items.length > 0)
+            return items;
+        return undefined;
+    }
     const lhs = extractVarName(pattern);
     if (!lhs || scopeEnv.has(lhs))
         return undefined;
-    if (value.type === 'identifier')
-        return { kind: 'copy', lhs, rhs: value.text };
+    // Unwrap Rust .await: `let user = get_user().await` → call_expression
+    const unwrapped = unwrapAwait(value) ?? value;
+    if (unwrapped.type === 'identifier')
+        return { kind: 'copy', lhs, rhs: unwrapped.text };
+    // field_expression RHS → fieldAccess (a.field)
+    if (unwrapped.type === 'field_expression') {
+        const obj = unwrapped.firstNamedChild;
+        const field = unwrapped.lastNamedChild;
+        if (obj?.type === 'identifier' && field?.type === 'field_identifier') {
+            return { kind: 'fieldAccess', lhs, receiver: obj.text, field: field.text };
+        }
+    }
+    // call_expression RHS → callResult (simple calls only)
+    if (unwrapped.type === 'call_expression') {
+        const funcNode = unwrapped.childForFieldName('function');
+        if (funcNode?.type === 'identifier') {
+            return { kind: 'callResult', lhs, callee: funcNode.text };
+        }
+    }
+    // method_call_expression RHS → methodCallResult (receiver.method())
+    if (unwrapped.type === 'method_call_expression') {
+        const obj = unwrapped.firstNamedChild;
+        if (obj?.type === 'identifier') {
+            const methodNode = unwrapped.childForFieldName('name') ?? unwrapped.namedChild(1);
+            if (methodNode?.type === 'field_identifier') {
+                return { kind: 'methodCallResult', lhs, receiver: obj.text, method: methodNode.text };
+            }
+        }
+    }
     return undefined;
 };
 /**

package/dist/core/ingestion/type-extractors/shared.d.ts

@@ -108,8 +108,6 @@ export declare const unwrapAwait: (node: SyntaxNode | null) => SyntaxNode | null
  * Navigates to the 'function' field (or first named child) and extracts a simple type name.
  */
 export declare const extractCalleeName: (callNode: SyntaxNode) => string | undefined;
-/** Find the first named child with the given node type */
-export declare const findChildByType: (node: SyntaxNode, type: string) => SyntaxNode | null;
 /**
  * Extract element type from a container type string.
  * Uses bracket-balanced parsing (no regex) for generic argument extraction.
@@ -130,4 +128,16 @@ export declare const findChildByType: (node: SyntaxNode, type: string) => Syntax
  */
 export declare function extractElementTypeFromString(typeStr: string, pos?: TypeArgPosition): string | undefined;
 export declare const extractReturnTypeName: (raw: string, depth?: number) => string | undefined;
+/**
+ * Extract the declared type of a property/field from its AST definition node.
+ * Handles cross-language patterns:
+ * - TypeScript: `name: Type` → type_annotation child
+ * - Java: `Type name` → type child on field_declaration
+ * - C#: `Type Name { get; set; }` → type child on property_declaration
+ * - Go: `Name Type` → type child on field_declaration
+ * - Kotlin: `var name: Type` → variable_declaration child with type field
+ *
+ * Returns the normalized type name, or undefined if no type can be extracted.
+ */
+export declare const extractPropertyDeclaredType: (definitionNode: SyntaxNode | null) => string | undefined;
 export {};

package/dist/core/ingestion/type-extractors/shared.js

@@ -226,13 +226,22 @@ export const extractSimpleTypeName = (typeNode, depth = 0) => {
     }
     // Pointer/reference types (C++, Rust): User*, &User, &mut User
     if (typeNode.type === 'pointer_type' || typeNode.type === 'reference_type') {
-        const inner = typeNode.firstNamedChild;
-        if (inner)
-            return extractSimpleTypeName(inner, depth + 1);
+        // Skip mutable_specifier for Rust &mut references — firstNamedChild would be
+        // `mutable_specifier` not the actual type. Walk named children to find the type.
+        for (let i = 0; i < typeNode.namedChildCount; i++) {
+            const child = typeNode.namedChild(i);
+            if (child && child.type !== 'mutable_specifier') {
+                return extractSimpleTypeName(child, depth + 1);
+            }
+        }
     }
     // Primitive/predefined types: string, int, float, bool, number, unknown, any
     // PHP: primitive_type; TS/JS: predefined_type
-    if (typeNode.type === 'primitive_type' || typeNode.type === 'predefined_type') {
+    // Java: integral_type (int/long/short/byte), floating_point_type (float/double),
+    //       boolean_type (boolean), void_type (void)
+    if (typeNode.type === 'primitive_type' || typeNode.type === 'predefined_type'
+        || typeNode.type === 'integral_type' || typeNode.type === 'floating_point_type'
+        || typeNode.type === 'boolean_type' || typeNode.type === 'void_type') {
         return typeNode.text;
     }
     // PHP named_type / optional_type
@@ -449,15 +458,6 @@ export const extractCalleeName = (callNode) => {
         return undefined;
     return extractSimpleTypeName(func);
 };
-/** Find the first named child with the given node type */
-export const findChildByType = (node, type) => {
-    for (let i = 0; i < node.namedChildCount; i++) {
-        const child = node.namedChild(i);
-        if (child?.type === type)
-            return child;
-    }
-    return null;
-};
 // Internal helper: extract the first comma-separated argument from a string,
 // respecting nested angle-bracket and square-bracket depth.
 function extractFirstArg(args) {
@@ -701,3 +701,105 @@ export const extractReturnTypeName = (raw, depth = 0) => {
         return undefined;
     return text;
 };
+// ── Property declared-type extraction ────────────────────────────────────
+// Shared between parse-worker (worker path) and parsing-processor (sequential path).
+/**
+ * Extract the declared type of a property/field from its AST definition node.
+ * Handles cross-language patterns:
+ * - TypeScript: `name: Type` → type_annotation child
+ * - Java: `Type name` → type child on field_declaration
+ * - C#: `Type Name { get; set; }` → type child on property_declaration
+ * - Go: `Name Type` → type child on field_declaration
+ * - Kotlin: `var name: Type` → variable_declaration child with type field
+ *
+ * Returns the normalized type name, or undefined if no type can be extracted.
+ */
+export const extractPropertyDeclaredType = (definitionNode) => {
+    if (!definitionNode)
+        return undefined;
+    // Strategy 1: Look for a `type` or `type_annotation` named field
+    const typeNode = definitionNode.childForFieldName?.('type');
+    if (typeNode) {
+        const typeName = extractSimpleTypeName(typeNode);
+        if (typeName)
+            return typeName;
+        // Fallback: use the raw text (for complex types like User[] or List<User>)
+        const text = typeNode.text?.trim();
+        if (text && text.length < 100)
+            return text;
+    }
+    // Strategy 2: Walk children looking for type_annotation (TypeScript pattern)
+    for (let i = 0; i < definitionNode.childCount; i++) {
+        const child = definitionNode.child(i);
+        if (!child)
+            continue;
+        if (child.type === 'type_annotation') {
+            // Type annotation has the actual type as a child
+            for (let j = 0; j < child.childCount; j++) {
+                const typeChild = child.child(j);
+                if (typeChild && typeChild.type !== ':') {
+                    const typeName = extractSimpleTypeName(typeChild);
+                    if (typeName)
+                        return typeName;
+                    const text = typeChild.text?.trim();
+                    if (text && text.length < 100)
+                        return text;
+                }
+            }
+        }
+    }
+    // Strategy 3: For Java field_declaration, the type is a sibling of variable_declarator
+    // AST: (field_declaration type: (type_identifier) declarator: (variable_declarator ...))
+    const parentDecl = definitionNode.parent;
+    if (parentDecl) {
+        const parentType = parentDecl.childForFieldName?.('type');
+        if (parentType) {
+            const typeName = extractSimpleTypeName(parentType);
+            if (typeName)
+                return typeName;
+        }
+    }
+    // Strategy 4: Kotlin property_declaration — type is nested inside variable_declaration child
+    // AST: (property_declaration (variable_declaration (simple_identifier) ":" (user_type (type_identifier))))
+    // Kotlin's variable_declaration has NO named 'type' field — children are all positional.
+    for (let i = 0; i < definitionNode.childCount; i++) {
+        const child = definitionNode.child(i);
+        if (child?.type === 'variable_declaration') {
+            // Try named field first (works for other languages sharing this strategy)
+            const varType = child.childForFieldName?.('type');
+            if (varType) {
+                const typeName = extractSimpleTypeName(varType);
+                if (typeName)
+                    return typeName;
+                const text = varType.text?.trim();
+                if (text && text.length < 100)
+                    return text;
+            }
+            // Fallback: walk unnamed children for user_type / type_identifier (Kotlin)
+            for (let j = 0; j < child.namedChildCount; j++) {
+                const varChild = child.namedChild(j);
+                if (varChild && (varChild.type === 'user_type' || varChild.type === 'type_identifier'
+                    || varChild.type === 'nullable_type' || varChild.type === 'generic_type')) {
+                    const typeName = extractSimpleTypeName(varChild);
+                    if (typeName)
+                        return typeName;
+                }
+            }
+        }
+    }
+    // Strategy 5: PHP @var PHPDoc — look for preceding comment with @var Type
+    // Handles pre-PHP-7.4 code: /** @var Address */ public $address;
+    const prevSibling = definitionNode.previousNamedSibling ?? definitionNode.parent?.previousNamedSibling;
+    if (prevSibling?.type === 'comment') {
+        const commentText = prevSibling.text;
+        const varMatch = commentText?.match(/@var\s+([A-Z][\w\\]*)/);
+        if (varMatch) {
+            // Strip namespace prefix: \App\Models\User → User
+            const raw = varMatch[1];
+            const base = raw.includes('\\') ? raw.split('\\').pop() : raw;
+            if (base && /^[A-Z]\w*$/.test(base))
+                return base;
+        }
+    }
+    return undefined;
+};

package/dist/core/ingestion/type-extractors/swift.js

@@ -1,4 +1,5 @@
-import { extractSimpleTypeName, extractVarName, findChildByType, hasTypeAnnotation } from './shared.js';
+import { extractSimpleTypeName, extractVarName, hasTypeAnnotation } from './shared.js';
+import { findChild } from '../resolvers/utils.js';
 const DECLARATION_NODE_TYPES = new Set([
     'property_declaration',
 ]);
@@ -6,9 +7,9 @@ const DECLARATION_NODE_TYPES = new Set([
 const extractDeclaration = (node, env) => {
     // Swift property_declaration has pattern and type_annotation
     const pattern = node.childForFieldName('pattern')
-        ?? findChildByType(node, 'pattern');
+        ?? findChild(node, 'pattern');
     const typeAnnotation = node.childForFieldName('type')
-        ?? findChildByType(node, 'type_annotation');
+        ?? findChild(node, 'type_annotation');
     if (!pattern || !typeAnnotation)
         return;
     const varName = extractVarName(pattern) ?? pattern.text;
@@ -43,17 +44,17 @@ const extractInitializer = (node, env, classNames) => {
     if (node.type !== 'property_declaration')
         return;
     // Skip if has type annotation — extractDeclaration handled it
-    if (node.childForFieldName('type') || findChildByType(node, 'type_annotation'))
+    if (node.childForFieldName('type') || findChild(node, 'type_annotation'))
         return;
     // Find pattern (variable name)
-    const pattern = node.childForFieldName('pattern') ?? findChildByType(node, 'pattern');
+    const pattern = node.childForFieldName('pattern') ?? findChild(node, 'pattern');
     if (!pattern)
         return;
     const varName = extractVarName(pattern) ?? pattern.text;
     if (!varName || env.has(varName))
         return;
     // Find call_expression in the value
-    const callExpr = findChildByType(node, 'call_expression');
+    const callExpr = findChild(node, 'call_expression');
     if (!callExpr)
         return;
     const callee = callExpr.firstNamedChild;

package/dist/core/ingestion/type-extractors/types.d.ts

@@ -23,6 +23,20 @@ export type ConstructorBindingScanner = (node: SyntaxNode) => {
  *  Used for languages where return types are expressed in comments (e.g. YARD @return [Type])
  *  rather than in AST fields. Returns undefined if no return type can be determined. */
 export type ReturnTypeExtractor = (node: SyntaxNode) => string | undefined;
+/** Infer the type name of a literal AST node for overload disambiguation.
+ *  Returns the canonical type name (e.g. 'int', 'String', 'boolean') or undefined
+ *  for non-literal nodes. Only used when resolveCallTarget has multiple candidates
+ *  with parameterTypes — ~1-3% of call sites. */
+export type LiteralTypeInferrer = (node: SyntaxNode) => string | undefined;
+/** Detect constructor-style call expressions that don't use `new` keyword.
+ *  Returns the constructor class name if the node's initializer is a constructor call,
+ *  or undefined otherwise. Used for virtual dispatch in languages like Kotlin
+ *  where constructors are syntactically identical to function calls, and C++
+ *  where smart pointer factory functions (make_shared/make_unique) wrap constructors. */
+export type ConstructorTypeDetector = (node: SyntaxNode, classNames: ClassNameLookup) => string | undefined;
+/** Unwrap a declared type name to its inner type for virtual dispatch comparison.
+ *  E.g., C++ shared_ptr<Animal> → Animal. Returns undefined if no unwrapping applies. */
+export type DeclaredTypeUnwrapper = (declaredType: string, typeNode: SyntaxNode) => string | undefined;
 /** Narrow lookup interface for resolving a callee name → return type name.
  *  Backed by SymbolTable.lookupFuzzyCallable; passed via ForLoopExtractorContext.
  *  Conservative: returns undefined when the callee is ambiguous (0 or 2+ matches). */
@@ -49,8 +63,10 @@ export interface ForLoopExtractorContext {
 /** Extracts loop variable type binding from a for-each statement. */
 export type ForLoopExtractor = (node: SyntaxNode, ctx: ForLoopExtractorContext) => void;
 /** Discriminated union for pending Tier-2 propagation items.
- *  - `copy`       — `const b = a` (identifier alias, propagate a's type to b)
- *  - `callResult` — `const b = foo()` (bind b to foo's declared return type) */
+ *  - `copy`             — `const b = a` (identifier alias, propagate a's type to b)
+ *  - `callResult`       — `const b = foo()` (bind b to foo's declared return type)
+ *  - `fieldAccess`      — `const b = a.field` (bind b to field's declaredType on a's type)
+ *  - `methodCallResult` — `const b = a.method()` (bind b to method's returnType on a's type) */
 export type PendingAssignment = {
     kind: 'copy';
     lhs: string;
@@ -59,15 +75,42 @@ export type PendingAssignment = {
     kind: 'callResult';
     lhs: string;
     callee: string;
+} | {
+    kind: 'fieldAccess';
+    lhs: string;
+    receiver: string;
+    field: string;
+} | {
+    kind: 'methodCallResult';
+    lhs: string;
+    receiver: string;
+    method: string;
 };
 /** Extracts a pending assignment for Tier 2 propagation.
- *  Returns a PendingAssignment when the RHS is a bare identifier (`copy`) or a
- *  call expression (`callResult`) and the LHS has no resolved type yet.
+ *  Returns a PendingAssignment when the RHS is a bare identifier (`copy`), a
+ *  call expression (`callResult`), a field access (`fieldAccess`), or a
+ *  method call with receiver (`methodCallResult`) and the LHS has no resolved type yet.
+ *  May return an array of PendingAssignment items for destructuring patterns
+ *  (e.g., `const { a, b } = obj` emits N fieldAccess items).
  *  Returns undefined if the node is not a matching assignment. */
-export type PendingAssignmentExtractor = (node: SyntaxNode, scopeEnv: ReadonlyMap<string, string>) => PendingAssignment | undefined;
+export type PendingAssignmentExtractor = (node: SyntaxNode, scopeEnv: ReadonlyMap<string, string>) => PendingAssignment | PendingAssignment[] | undefined;
+/** Result of a pattern binding extraction. */
+export interface PatternBindingResult {
+    varName: string;
+    typeName: string;
+    /** Optional: AST node whose position range should be used for the patternOverride.
+     *  When present, the override uses this node's range instead of the auto-detected
+     *  branch scope. Used by null-check narrowing to target the if-body specifically. */
+    narrowingRange?: {
+        startIndex: number;
+        endIndex: number;
+    };
+}
 /** Extracts a typed variable binding from a pattern-matching construct.
- *  Returns { varName, typeName } for patterns that introduce NEW variables.
- *  Examples: `if let Some(user) = opt` (Rust), `x instanceof User user` (Java).
+ *  Returns { varName, typeName } for patterns that introduce NEW variables
+ *  or narrow existing variables (null-check narrowing).
+ *  Examples: `if let Some(user) = opt` (Rust), `x instanceof User user` (Java),
+ *  `if (x != null)` (null-check narrowing in TS/Kotlin/C#).
  *  Conservative: returns undefined when the source variable's type is unknown.
  *
  *  @param scopeEnv   Read-only view of already-resolved type bindings in the current scope.
@@ -75,10 +118,7 @@ export type PendingAssignmentExtractor = (node: SyntaxNode, scopeEnv: ReadonlyMa
  *    annotation AST node. Allows extracting generic type arguments (e.g., T from Result<T,E>)
  *    that are stripped during normal TypeEnv extraction.
  *  @param scope  Current scope key (e.g. `"process@42"`) for declarationTypeNodes lookups. */
-export type PatternBindingExtractor = (node: SyntaxNode, scopeEnv: ReadonlyMap<string, string>, declarationTypeNodes: ReadonlyMap<string, SyntaxNode>, scope: string) => {
-    varName: string;
-    typeName: string;
-} | undefined;
+export type PatternBindingExtractor = (node: SyntaxNode, scopeEnv: ReadonlyMap<string, string>, declarationTypeNodes: ReadonlyMap<string, SyntaxNode>, scope: string) => PatternBindingResult | undefined;
 /** Per-language type extraction configuration */
 export interface LanguageTypeConfig {
     /** Allow pattern binding to overwrite existing scopeEnv entries.
@@ -124,4 +164,7 @@ export interface LanguageTypeConfig {
      *  The extractor receives the current scope's resolved bindings (read-only) to look up the
      *  source variable's type. Returns undefined for non-matching nodes or unknown source types. */
     extractPatternBinding?: PatternBindingExtractor;
+    inferLiteralType?: LiteralTypeInferrer;
+    detectConstructorType?: ConstructorTypeDetector;
+    unwrapDeclaredType?: DeclaredTypeUnwrapper;
 }