gitnexus 1.4.5 → 1.4.7

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

@@ -3,10 +3,20 @@ import { TIER_CONFIDENCE } from './resolution-context.js';
 import { isLanguageAvailable, loadParser, loadLanguage } from '../tree-sitter/parser-loader.js';
 import { LANGUAGE_QUERIES } from './tree-sitter-queries.js';
 import { generateId } from '../../lib/utils.js';
-import { getLanguageFromFilename, isVerboseIngestionEnabled, yieldToEventLoop, FUNCTION_NODE_TYPES, extractFunctionName, isBuiltInOrNoise, countCallArguments, inferCallForm, extractReceiverName, extractReceiverNode, findEnclosingClassId, CALL_EXPRESSION_TYPES, extractCallChain, } from './utils.js';
+import { getLanguageFromFilename, isVerboseIngestionEnabled, yieldToEventLoop, FUNCTION_NODE_TYPES, extractFunctionName, isBuiltInOrNoise, countCallArguments, inferCallForm, extractReceiverName, extractReceiverNode, findEnclosingClassId, extractMixedChain, } from './utils.js';
 import { buildTypeEnv } from './type-env.js';
 import { getTreeSitterBufferSize } from './constants.js';
 import { callRouters } from './call-routing.js';
+import { extractReturnTypeName, stripNullable } from './type-extractors/shared.js';
+// Stdlib methods that preserve the receiver's type identity. When TypeEnv already
+// strips nullable wrappers (Option<User> → User), these chain steps are no-ops
+// for type resolution — the current type passes through unchanged.
+const TYPE_PRESERVING_METHODS = new Set([
+    'unwrap', 'expect', 'unwrap_or', 'unwrap_or_default', 'unwrap_or_else', // Rust Option/Result
+    'clone', 'to_owned', 'as_ref', 'as_mut', 'borrow', 'borrow_mut', // Rust clone/borrow
+    'get', // Kotlin/Java Optional.get()
+    'orElseThrow', // Java Optional
+]);
 /**
  * Walk up the AST from a node to find the enclosing function/method.
  * Returns null if the call is at module/file level (top-level code).
@@ -80,6 +90,7 @@ const verifyConstructorBindings = (bindings, filePath, ctx, graph) => {
 export const processCalls = async (graph, files, astCache, ctx, onProgress) => {
     const parser = await loadParser();
     const collectedHeritage = [];
+    const pendingWrites = [];
     const logSkipped = isVerboseIngestionEnabled();
     const skippedByLang = logSkipped ? new Map() : null;
     for (let i = 0; i < files.length; i++) {
@@ -127,10 +138,47 @@ export const processCalls = async (graph, files, astCache, ctx, onProgress) => {
         const verifiedReceivers = typeEnv && typeEnv.constructorBindings.length > 0
             ? verifyConstructorBindings(typeEnv.constructorBindings, file.path, ctx)
             : new Map();
+        const receiverIndex = buildReceiverTypeIndex(verifiedReceivers);
         ctx.enableCache(file.path);
         matches.forEach(match => {
             const captureMap = {};
             match.captures.forEach(c => captureMap[c.name] = c.node);
+            // ── Write access: emit ACCESSES {reason: 'write'} for assignments to member fields ──
+            if (captureMap['assignment'] && captureMap['assignment.receiver'] && captureMap['assignment.property']) {
+                const receiverNode = captureMap['assignment.receiver'];
+                const propertyName = captureMap['assignment.property'].text;
+                // Resolve receiver type: simple identifier → TypeEnv lookup or class resolution
+                let receiverTypeName;
+                const receiverText = receiverNode.text;
+                if (receiverText && typeEnv) {
+                    receiverTypeName = typeEnv.lookup(receiverText, captureMap['assignment']);
+                }
+                // Fall back to verified constructor bindings (mirrors CALLS resolution tier 2)
+                if (!receiverTypeName && receiverText && receiverIndex.size > 0) {
+                    const enclosing = findEnclosingFunction(captureMap['assignment'], file.path, ctx);
+                    const funcName = enclosing ? extractFuncNameFromSourceId(enclosing) : '';
+                    receiverTypeName = lookupReceiverType(receiverIndex, funcName, receiverText);
+                }
+                if (!receiverTypeName && receiverText) {
+                    const resolved = ctx.resolve(receiverText, file.path);
+                    if (resolved?.candidates.some(d => d.type === 'Class' || d.type === 'Struct' || d.type === 'Interface'
+                        || d.type === 'Enum' || d.type === 'Record' || d.type === 'Impl')) {
+                        receiverTypeName = receiverText;
+                    }
+                }
+                if (receiverTypeName) {
+                    const enclosing = findEnclosingFunction(captureMap['assignment'], file.path, ctx);
+                    const srcId = enclosing || generateId('File', file.path);
+                    // Defer resolution: Ruby attr_accessor properties are registered during
+                    // this same loop, so cross-file lookups fail if the declaring file hasn't
+                    // been processed yet. Collect now, resolve after all files are done.
+                    pendingWrites.push({ receiverTypeName, propertyName, filePath: file.path, srcId });
+                }
+                // Assignment-only capture (no @call sibling): skip the rest of this
+                // forEach iteration — this acts as a `continue` in the match loop.
+                if (!captureMap['call'])
+                    return;
+            }
             if (!captureMap['call'])
                 return;
             const nameNode = captureMap['call.name'];
@@ -168,7 +216,10 @@ export const processCalls = async (graph, files, astCache, ctx, onProgress) => {
                                     description: item.accessorType,
                                 },
                             });
-                            ctx.symbols.add(file.path, item.propName, nodeId, 'Property', propEnclosingClassId ? { ownerId: propEnclosingClassId } : undefined);
+                            ctx.symbols.add(file.path, item.propName, nodeId, 'Property', {
+                                ...(propEnclosingClassId ? { ownerId: propEnclosingClassId } : {}),
+                                ...(item.declaredType ? { declaredType: item.declaredType } : {}),
+                            });
                             const relId = generateId('DEFINES', `${fileId}->${nodeId}`);
                             graph.addRelationship({
                                 id: relId, sourceId: fileId, targetId: nodeId,
@@ -176,9 +227,9 @@ export const processCalls = async (graph, files, astCache, ctx, onProgress) => {
                             });
                             if (propEnclosingClassId) {
                                 graph.addRelationship({
-                                    id: generateId('HAS_METHOD', `${propEnclosingClassId}->${nodeId}`),
+                                    id: generateId('HAS_PROPERTY', `${propEnclosingClassId}->${nodeId}`),
                                     sourceId: propEnclosingClassId, targetId: nodeId,
-                                    type: 'HAS_METHOD', confidence: 1.0, reason: '',
+                                    type: 'HAS_PROPERTY', confidence: 1.0, reason: '',
                                 });
                             }
                         }
@@ -195,10 +246,10 @@ export const processCalls = async (graph, files, astCache, ctx, onProgress) => {
             const receiverName = callForm === 'member' ? extractReceiverName(nameNode) : undefined;
             let receiverTypeName = receiverName && typeEnv ? typeEnv.lookup(receiverName, callNode) : undefined;
             // Fall back to verified constructor bindings for return type inference
-            if (!receiverTypeName && receiverName && verifiedReceivers.size > 0) {
+            if (!receiverTypeName && receiverName && receiverIndex.size > 0) {
                 const enclosingFunc = findEnclosingFunction(callNode, file.path, ctx);
                 const funcName = enclosingFunc ? extractFuncNameFromSourceId(enclosingFunc) : '';
-                receiverTypeName = lookupReceiverType(verifiedReceivers, funcName, receiverName);
+                receiverTypeName = lookupReceiverType(receiverIndex, funcName, receiverName);
             }
             // Fall back to class-as-receiver for static method calls (e.g. UserService.find_user()).
             // When the receiver name is not a variable in TypeEnv but resolves to a Class/Struct/Interface
@@ -209,30 +260,33 @@ export const processCalls = async (graph, files, astCache, ctx, onProgress) => {
                     receiverTypeName = receiverName;
                 }
             }
-            // Fall back to chained call resolution when the receiver is a call expression
-            // (e.g. svc.getUser().save() — receiver of save() is getUser(), not a simple identifier).
+            // Hoist sourceId so it's available for ACCESSES edge emission during chain walk.
+            const enclosingFuncId = findEnclosingFunction(callNode, file.path, ctx);
+            const sourceId = enclosingFuncId || generateId('File', file.path);
+            // Fall back to mixed chain resolution when the receiver is a complex expression
+            // (field chain, call chain, or interleaved — e.g. user.address.city.save() or
+            // svc.getUser().address.save()). Handles all cases with a single unified walk.
             if (callForm === 'member' && !receiverTypeName && !receiverName) {
                 const receiverNode = extractReceiverNode(nameNode);
-                if (receiverNode && CALL_EXPRESSION_TYPES.has(receiverNode.type)) {
-                    const extracted = extractCallChain(receiverNode);
-                    if (extracted) {
-                        // Resolve the base receiver type if possible
-                        let baseType = extracted.baseReceiverName && typeEnv
+                if (receiverNode) {
+                    const extracted = extractMixedChain(receiverNode);
+                    if (extracted && extracted.chain.length > 0) {
+                        let currentType = extracted.baseReceiverName && typeEnv
                             ? typeEnv.lookup(extracted.baseReceiverName, callNode)
                             : undefined;
-                        if (!baseType && extracted.baseReceiverName && verifiedReceivers.size > 0) {
-                            const enclosingFunc = findEnclosingFunction(callNode, file.path, ctx);
-                            const funcName = enclosingFunc ? extractFuncNameFromSourceId(enclosingFunc) : '';
-                            baseType = lookupReceiverType(verifiedReceivers, funcName, extracted.baseReceiverName);
+                        if (!currentType && extracted.baseReceiverName && receiverIndex.size > 0) {
+                            const funcName = enclosingFuncId ? extractFuncNameFromSourceId(enclosingFuncId) : '';
+                            currentType = lookupReceiverType(receiverIndex, funcName, extracted.baseReceiverName);
                         }
-                        // Class-as-receiver for chain base (e.g. UserService.find_user().save())
-                        if (!baseType && extracted.baseReceiverName) {
+                        if (!currentType && extracted.baseReceiverName) {
                             const cr = ctx.resolve(extracted.baseReceiverName, file.path);
                             if (cr?.candidates.some(d => d.type === 'Class' || d.type === 'Interface' || d.type === 'Struct' || d.type === 'Enum')) {
-                                baseType = extracted.baseReceiverName;
+                                currentType = extracted.baseReceiverName;
                             }
                         }
-                        receiverTypeName = resolveChainedReceiver(extracted.chain, baseType, file.path, ctx);
+                        if (currentType) {
+                            receiverTypeName = walkMixedChain(extracted.chain, currentType, file.path, ctx, makeAccessEmitter(graph, sourceId));
+                        }
                     }
                 }
             }
@@ -244,8 +298,6 @@ export const processCalls = async (graph, files, astCache, ctx, onProgress) => {
             }, file.path, ctx);
             if (!resolved)
                 return;
-            const enclosingFuncId = findEnclosingFunction(callNode, file.path, ctx);
-            const sourceId = enclosingFuncId || generateId('File', file.path);
             const relId = generateId('CALLS', `${sourceId}:${calledName}->${resolved.nodeId}`);
             graph.addRelationship({
                 id: relId,
@@ -258,6 +310,21 @@ export const processCalls = async (graph, files, astCache, ctx, onProgress) => {
         });
         ctx.clearCache();
     }
+    // ── Resolve deferred write-access edges ──
+    // All properties (including Ruby attr_accessor) are now registered.
+    for (const pw of pendingWrites) {
+        const fieldOwner = resolveFieldOwnership(pw.receiverTypeName, pw.propertyName, pw.filePath, ctx);
+        if (fieldOwner) {
+            graph.addRelationship({
+                id: generateId('ACCESSES', `${pw.srcId}:${fieldOwner.nodeId}:write`),
+                sourceId: pw.srcId,
+                targetId: fieldOwner.nodeId,
+                type: 'ACCESSES',
+                confidence: 1.0,
+                reason: 'write',
+            });
+        }
+    }
     if (skippedByLang && skippedByLang.size > 0) {
         for (const [lang, count] of skippedByLang.entries()) {
             console.warn(`[ingestion] Skipped ${count} ${lang} file(s) in call processing — ${lang} parser not available.`);
@@ -301,38 +368,8 @@ const toResolveResult = (definition, tier) => ({
     nodeId: definition.nodeId,
     confidence: TIER_CONFIDENCE[tier],
     reason: tier === 'same-file' ? 'same-file' : tier === 'import-scoped' ? 'import-resolved' : 'global',
+    returnType: definition.returnType,
 });
-/**
- * Resolve a chain of intermediate method calls to find the receiver type for a
- * final member call.  Called when the receiver of a call is itself a call
- * expression (e.g. `svc.getUser().save()`).
- *
- * @param chainNames  Ordered list of method names from outermost to innermost
- *                    intermediate call (e.g. ['getUser'] for `svc.getUser().save()`).
- * @param baseReceiverTypeName  The already-resolved type of the base receiver
- *                              (e.g. 'UserService' for `svc`), or undefined.
- * @param currentFile  The file path for resolution context.
- * @param ctx  The resolution context for symbol lookup.
- * @returns The type name of the final intermediate call's return type, or undefined
- *          if resolution fails at any step.
- */
-function resolveChainedReceiver(chainNames, baseReceiverTypeName, currentFile, ctx) {
-    let currentType = baseReceiverTypeName;
-    for (const name of chainNames) {
-        const resolved = resolveCallTarget({ calledName: name, callForm: 'member', receiverTypeName: currentType }, currentFile, ctx);
-        if (!resolved)
-            return undefined;
-        const candidates = ctx.symbols.lookupFuzzy(name);
-        const symDef = candidates.find(c => c.nodeId === resolved.nodeId);
-        if (!symDef?.returnType)
-            return undefined;
-        const returnTypeName = extractReturnTypeName(symDef.returnType);
-        if (!returnTypeName)
-            return undefined;
-        currentType = returnTypeName;
-    }
-    return currentType;
-}
 /**
  * Resolve a function call to its target node ID using priority strategy:
  * A. Narrow candidates by scope tier via ctx.resolve()
@@ -386,138 +423,6 @@ const resolveCallTarget = (call, currentFile, ctx) => {
         return null;
     return toResolveResult(filteredCandidates[0], tiered.tier);
 };
-// ── Return type text helpers ─────────────────────────────────────────────
-// extractSimpleTypeName works on AST nodes; this operates on raw return-type
-// text already stored in SymbolDefinition (e.g. "User", "Promise<User>",
-// "User | null", "*User").  Extracts the base user-defined type name.
-/** Primitive / built-in types that should NOT produce a receiver binding. */
-const PRIMITIVE_TYPES = new Set([
-    'string', 'number', 'boolean', 'void', 'int', 'float', 'double', 'long',
-    'short', 'byte', 'char', 'bool', 'str', 'i8', 'i16', 'i32', 'i64',
-    'u8', 'u16', 'u32', 'u64', 'f32', 'f64', 'usize', 'isize',
-    'undefined', 'null', 'None', 'nil',
-]);
-/**
- * Extract a simple type name from raw return-type text.
- * Handles common patterns:
- *   "User"                → "User"
- *   "Promise<User>"       → "User"   (unwrap wrapper generics)
- *   "Option<User>"        → "User"
- *   "Result<User, Error>" → "User"   (first type arg)
- *   "User | null"         → "User"   (strip nullable union)
- *   "User?"               → "User"   (strip nullable suffix)
- *   "*User"               → "User"   (Go pointer)
- *   "&User"               → "User"   (Rust reference)
- * Returns undefined for complex types or primitives.
- */
-const WRAPPER_GENERICS = new Set([
-    'Promise', 'Observable', 'Future', 'CompletableFuture', 'Task', 'ValueTask', // async wrappers
-    'Option', 'Some', 'Optional', 'Maybe', // nullable wrappers
-    'Result', 'Either', // result wrappers
-    // Rust smart pointers (Deref to inner type)
-    'Rc', 'Arc', 'Weak', // pointer types
-    'MutexGuard', 'RwLockReadGuard', 'RwLockWriteGuard', // guard types
-    'Ref', 'RefMut', // RefCell guards
-    'Cow', // copy-on-write
-    // Containers (List, Array, Vec, Set, etc.) are intentionally excluded —
-    // methods are called on the container, not the element type.
-    // Non-wrapper generics return the base type (e.g., List) via the else branch.
-]);
-/**
- * Extracts the first type argument from a comma-separated generic argument string,
- * respecting nested angle brackets. For example:
- *   "Result<User, Error>"  → "Result<User, Error>"  (no top-level comma)
- *   "User, Error"          → "User"
- *   "Map<K, V>, string"    → "Map<K, V>"
- */
-function extractFirstGenericArg(args) {
-    let depth = 0;
-    for (let i = 0; i < args.length; i++) {
-        if (args[i] === '<')
-            depth++;
-        else if (args[i] === '>')
-            depth--;
-        else if (args[i] === ',' && depth === 0)
-            return args.slice(0, i).trim();
-    }
-    return args.trim();
-}
-/**
- * Extract the first non-lifetime type argument from a generic argument string.
- * Skips Rust lifetime parameters (e.g., `'a`, `'_`) to find the actual type.
- *   "'_, User"       → "User"
- *   "'a, User"       → "User"
- *   "User, Error"    → "User"  (no lifetime — delegates to extractFirstGenericArg)
- */
-function extractFirstTypeArg(args) {
-    let remaining = args;
-    while (remaining) {
-        const first = extractFirstGenericArg(remaining);
-        if (!first.startsWith("'"))
-            return first;
-        // Skip past this lifetime arg + the comma separator
-        const commaIdx = remaining.indexOf(',', first.length);
-        if (commaIdx < 0)
-            return first; // only lifetimes — fall through
-        remaining = remaining.slice(commaIdx + 1).trim();
-    }
-    return args.trim();
-}
-const MAX_RETURN_TYPE_INPUT_LENGTH = 2048;
-const MAX_RETURN_TYPE_LENGTH = 512;
-export const extractReturnTypeName = (raw, depth = 0) => {
-    if (depth > 10)
-        return undefined;
-    if (raw.length > MAX_RETURN_TYPE_INPUT_LENGTH)
-        return undefined;
-    let text = raw.trim();
-    if (!text)
-        return undefined;
-    // Strip pointer/reference prefixes: *User, &User, &mut User
-    text = text.replace(/^[&*]+\s*(mut\s+)?/, '');
-    // Strip nullable suffix: User?
-    text = text.replace(/\?$/, '');
-    // Handle union types: "User | null" → "User"
-    if (text.includes('|')) {
-        const parts = text.split('|').map(p => p.trim()).filter(p => p !== 'null' && p !== 'undefined' && p !== 'void' && p !== 'None' && p !== 'nil');
-        if (parts.length === 1)
-            text = parts[0];
-        else
-            return undefined; // genuine union — too complex
-    }
-    // Handle generics: Promise<User> → unwrap if wrapper, else take base
-    const genericMatch = text.match(/^(\w+)\s*<(.+)>$/);
-    if (genericMatch) {
-        const [, base, args] = genericMatch;
-        if (WRAPPER_GENERICS.has(base)) {
-            // Take the first non-lifetime type argument, using bracket-balanced splitting
-            // so that nested generics like Result<User, Error> are not split at the inner
-            // comma. Lifetime parameters (Rust 'a, '_) are skipped.
-            const firstArg = extractFirstTypeArg(args);
-            return extractReturnTypeName(firstArg, depth + 1);
-        }
-        // Non-wrapper generic: return the base type (e.g., Map<K,V> → Map)
-        return PRIMITIVE_TYPES.has(base.toLowerCase()) ? undefined : base;
-    }
-    // Bare wrapper type without generic argument (e.g. Task, Promise, Option)
-    // should not produce a binding — these are meaningless without a type parameter
-    if (WRAPPER_GENERICS.has(text))
-        return undefined;
-    // Handle qualified names: models.User → User, Models::User → User, \App\Models\User → User
-    if (text.includes('::') || text.includes('.') || text.includes('\\')) {
-        text = text.split(/::|[.\\]/).pop();
-    }
-    // Final check: skip primitives
-    if (PRIMITIVE_TYPES.has(text) || PRIMITIVE_TYPES.has(text.toLowerCase()))
-        return undefined;
-    // Must start with uppercase (class/type convention) or be a valid identifier
-    if (!/^[A-Z_]\w*$/.test(text))
-        return undefined;
-    // If the final extracted type name is too long, reject it
-    if (text.length > MAX_RETURN_TYPE_LENGTH)
-        return undefined;
-    return text;
-};
 // ── Scope key helpers ────────────────────────────────────────────────────
 // Scope keys use the format "funcName@startIndex" (produced by type-env.ts).
 // Source IDs use "Label:filepath:funcName" (produced by parse-worker.ts).
@@ -542,44 +447,159 @@ const extractFuncNameFromSourceId = (sourceId) => {
  */
 const receiverKey = (scope, varName) => `${scope}\0${varName}`;
 /**
- * Look up a receiver type from a verified receiver map.
- * The map is keyed by `scope\0varName` (full scope with @startIndex).
- * Since the lookup side only has `funcName` (no startIndex), we scan for
- * all entries whose key starts with `funcName@` and has the matching varName.
- * If exactly one unique type is found, return it. If multiple distinct types
- * exist (true overload collision), return undefined (refuse to guess).
- * Falls back to the file-level scope key `\0varName` (empty funcName).
+ * Build a two-level secondary index from the verified receiver map.
+ * The verified map is keyed by `scope\0varName` where scope is either
+ * "funcName@startIndex" (inside a function) or "" (file level).
+ * Index structure: Map<funcName, Map<varName, ReceiverTypeEntry>>
+ */
+const buildReceiverTypeIndex = (map) => {
+    const index = new Map();
+    for (const [key, typeName] of map) {
+        const nul = key.indexOf('\0');
+        if (nul < 0)
+            continue;
+        const scope = key.slice(0, nul);
+        const varName = key.slice(nul + 1);
+        if (!varName)
+            continue;
+        if (scope !== '' && !scope.includes('@'))
+            continue;
+        const funcName = scope === '' ? '' : scope.slice(0, scope.indexOf('@'));
+        let varMap = index.get(funcName);
+        if (!varMap) {
+            varMap = new Map();
+            index.set(funcName, varMap);
+        }
+        const existing = varMap.get(varName);
+        if (existing === undefined) {
+            varMap.set(varName, { kind: 'resolved', value: typeName });
+        }
+        else if (existing.kind === 'resolved' && existing.value !== typeName) {
+            varMap.set(varName, { kind: 'ambiguous' });
+        }
+    }
+    return index;
+};
+/**
+ * O(1) receiver type lookup using the pre-built secondary index.
+ * Returns the unique type name if unambiguous. Falls back to file-level scope.
+ */
+const lookupReceiverType = (index, funcName, varName) => {
+    const funcBucket = index.get(funcName);
+    if (funcBucket) {
+        const entry = funcBucket.get(varName);
+        if (entry?.kind === 'resolved')
+            return entry.value;
+        if (entry?.kind === 'ambiguous') {
+            // Ambiguous in this function scope — try file-level fallback
+            const fileEntry = index.get('')?.get(varName);
+            return fileEntry?.kind === 'resolved' ? fileEntry.value : undefined;
+        }
+    }
+    // Fallback: file-level scope (funcName "")
+    if (funcName !== '') {
+        const fileEntry = index.get('')?.get(varName);
+        if (fileEntry?.kind === 'resolved')
+            return fileEntry.value;
+    }
+    return undefined;
+};
+/**
+ * Resolve the type that results from accessing `receiverName.fieldName`.
+ * Requires declaredType on the Property node (needed for chain walking continuation).
  */
-const lookupReceiverType = (map, funcName, varName) => {
-    // Fast path: file-level scope (empty funcName — used as fallback)
-    const fileLevelKey = receiverKey('', varName);
-    const prefix = `${funcName}@`;
-    const suffix = `\0${varName}`;
-    let found;
-    let ambiguous = false;
-    for (const [key, value] of map) {
-        if (key === fileLevelKey)
-            continue; // handled separately below
-        if (key.startsWith(prefix) && key.endsWith(suffix)) {
-            // Verify the key is exactly "funcName@<digits>\0varName" with no extra chars.
-            // The part between prefix and suffix should be the startIndex (digits only),
-            // but we accept any non-empty segment to be forward-compatible.
-            const middle = key.slice(prefix.length, key.length - suffix.length);
-            if (middle.length === 0)
-                continue; // malformed key — skip
-            if (found === undefined) {
-                found = value;
+const resolveFieldAccessType = (receiverName, fieldName, filePath, ctx) => {
+    const fieldDef = resolveFieldOwnership(receiverName, fieldName, filePath, ctx);
+    if (!fieldDef?.declaredType)
+        return undefined;
+    // Use stripNullable (not extractReturnTypeName) — field types like List<User>
+    // should be preserved as-is, not unwrapped to User. Only strip nullable wrappers.
+    return {
+        typeName: stripNullable(fieldDef.declaredType),
+        fieldNodeId: fieldDef.nodeId,
+    };
+};
+/**
+ * Resolve a field's Property node given a receiver type name and field name.
+ * Does NOT require declaredType — used by write-access tracking where only the
+ * fieldNodeId is needed (no chain continuation).
+ */
+const resolveFieldOwnership = (receiverName, fieldName, filePath, ctx) => {
+    const typeResolved = ctx.resolve(receiverName, filePath);
+    if (!typeResolved)
+        return undefined;
+    const classDef = typeResolved.candidates.find(d => d.type === 'Class' || d.type === 'Struct' || d.type === 'Interface'
+        || d.type === 'Enum' || d.type === 'Record' || d.type === 'Impl');
+    if (!classDef)
+        return undefined;
+    return ctx.symbols.lookupFieldByOwner(classDef.nodeId, fieldName) ?? undefined;
+};
+/**
+ * Create a deduplicated ACCESSES edge emitter for a single source node.
+ * Each (sourceId, fieldNodeId) pair is emitted at most once per source.
+ */
+const makeAccessEmitter = (graph, sourceId) => {
+    const emitted = new Set();
+    return (fieldNodeId) => {
+        const key = `${sourceId}\0${fieldNodeId}`;
+        if (emitted.has(key))
+            return;
+        emitted.add(key);
+        graph.addRelationship({
+            id: generateId('ACCESSES', `${sourceId}:${fieldNodeId}:read`),
+            sourceId,
+            targetId: fieldNodeId,
+            type: 'ACCESSES',
+            confidence: 1.0,
+            reason: 'read',
+        });
+    };
+};
+const walkMixedChain = (chain, startType, filePath, ctx, onFieldResolved) => {
+    let currentType = startType;
+    for (const step of chain) {
+        if (!currentType)
+            break;
+        if (step.kind === 'field') {
+            const resolved = resolveFieldAccessType(currentType, step.name, filePath, ctx);
+            if (!resolved) {
+                currentType = undefined;
+                break;
+            }
+            onFieldResolved?.(resolved.fieldNodeId);
+            currentType = resolved.typeName;
+        }
+        else {
+            // Ruby/Python: property access is syntactically identical to method calls.
+            // Try field resolution first — if the name is a known property with declaredType,
+            // use that type directly. Otherwise fall back to method call resolution.
+            const fieldResolved = resolveFieldAccessType(currentType, step.name, filePath, ctx);
+            if (fieldResolved) {
+                onFieldResolved?.(fieldResolved.fieldNodeId);
+                currentType = fieldResolved.typeName;
+                continue;
+            }
+            const resolved = resolveCallTarget({ calledName: step.name, callForm: 'member', receiverTypeName: currentType }, filePath, ctx);
+            if (!resolved) {
+                // Stdlib passthrough: unwrap(), clone(), etc. preserve the receiver type
+                if (TYPE_PRESERVING_METHODS.has(step.name))
+                    continue;
+                currentType = undefined;
+                break;
             }
-            else if (found !== value) {
-                ambiguous = true;
+            if (!resolved.returnType) {
+                currentType = undefined;
                 break;
             }
+            const retType = extractReturnTypeName(resolved.returnType);
+            if (!retType) {
+                currentType = undefined;
+                break;
+            }
+            currentType = retType;
         }
     }
-    if (!ambiguous && found !== undefined)
-        return found;
-    // Fallback: file-level scope (bindings outside any function)
-    return map.get(fileLevelKey);
+    return currentType;
 };
 /**
  * Fast path: resolve pre-extracted call sites from workers.
@@ -594,7 +614,7 @@ export const processCallsFromExtracted = async (graph, extractedCalls, ctx, onPr
         for (const { filePath, bindings } of constructorBindings) {
             const verified = verifyConstructorBindings(bindings, filePath, ctx, graph);
             if (verified.size > 0) {
-                fileReceiverTypes.set(filePath, verified);
+                fileReceiverTypes.set(filePath, buildReceiverTypeIndex(verified));
             }
         }
     }
@@ -634,24 +654,27 @@ export const processCallsFromExtracted = async (graph, extractedCalls, ctx, onPr
                     effectiveCall = { ...effectiveCall, receiverTypeName: effectiveCall.receiverName };
                 }
             }
-            // Step 2: if the call has a receiver call chain (e.g. svc.getUser().save()),
-            // resolve the chain to determine the final receiver type.
-            // This runs whenever receiverCallChain is present — even when Step 1 set a
-            // receiverTypeName, that type is the BASE receiver (e.g. UserService for svc),
-            // and the chain must be walked to produce the FINAL receiver (e.g. User from
-            // getUser() : User).
-            if (effectiveCall.receiverCallChain?.length) {
-                // Step 1 may have resolved the base receiver type (e.g. svc → UserService).
-                // Use it as the starting point for chain resolution.
-                let baseType = effectiveCall.receiverTypeName;
-                // If Step 1 didn't resolve it, try the receiver map directly.
-                if (!baseType && effectiveCall.receiverName && receiverMap) {
+            // Step 1c: mixed chain resolution (field, call, or interleaved — e.g. svc.getUser().address.save()).
+            // Runs whenever receiverMixedChain is present. Steps 1/1b may have resolved the base receiver
+            // type already; that type is used as the chain's starting point.
+            if (effectiveCall.receiverMixedChain?.length) {
+                // Use the already-resolved base type (from Steps 1/1b) or look it up now.
+                let currentType = effectiveCall.receiverTypeName;
+                if (!currentType && effectiveCall.receiverName && receiverMap) {
                     const callFuncName = extractFuncNameFromSourceId(effectiveCall.sourceId);
-                    baseType = lookupReceiverType(receiverMap, callFuncName, effectiveCall.receiverName);
+                    currentType = lookupReceiverType(receiverMap, callFuncName, effectiveCall.receiverName);
                 }
-                const chainedType = resolveChainedReceiver(effectiveCall.receiverCallChain, baseType, effectiveCall.filePath, ctx);
-                if (chainedType) {
-                    effectiveCall = { ...effectiveCall, receiverTypeName: chainedType };
+                if (!currentType && effectiveCall.receiverName) {
+                    const typeResolved = ctx.resolve(effectiveCall.receiverName, effectiveCall.filePath);
+                    if (typeResolved?.candidates.some(d => d.type === 'Class' || d.type === 'Interface' || d.type === 'Struct' || d.type === 'Enum')) {
+                        currentType = effectiveCall.receiverName;
+                    }
+                }
+                if (currentType) {
+                    const walkedType = walkMixedChain(effectiveCall.receiverMixedChain, currentType, effectiveCall.filePath, ctx, makeAccessEmitter(graph, effectiveCall.sourceId));
+                    if (walkedType) {
+                        effectiveCall = { ...effectiveCall, receiverTypeName: walkedType };
+                    }
                 }
             }
             const resolved = resolveCallTarget(effectiveCall, effectiveCall.filePath, ctx);
@@ -671,6 +694,56 @@ export const processCallsFromExtracted = async (graph, extractedCalls, ctx, onPr
     }
     onProgress?.(totalFiles, totalFiles);
 };
+/**
+ * Resolve pre-extracted field write assignments to ACCESSES {reason: 'write'} edges.
+ * Accepts optional constructorBindings for return-type-aware receiver inference,
+ * mirroring processCallsFromExtracted's verified binding lookup.
+ */
+export const processAssignmentsFromExtracted = (graph, assignments, ctx, constructorBindings) => {
+    // Build per-file receiver type indexes from verified constructor bindings
+    const fileReceiverTypes = new Map();
+    if (constructorBindings) {
+        for (const { filePath, bindings } of constructorBindings) {
+            const verified = verifyConstructorBindings(bindings, filePath, ctx, graph);
+            if (verified.size > 0) {
+                fileReceiverTypes.set(filePath, buildReceiverTypeIndex(verified));
+            }
+        }
+    }
+    for (const asn of assignments) {
+        // Resolve the receiver type
+        let receiverTypeName = asn.receiverTypeName;
+        // Tier 2: verified constructor bindings (return-type inference)
+        if (!receiverTypeName && fileReceiverTypes.size > 0) {
+            const receiverMap = fileReceiverTypes.get(asn.filePath);
+            if (receiverMap) {
+                const funcName = extractFuncNameFromSourceId(asn.sourceId);
+                receiverTypeName = lookupReceiverType(receiverMap, funcName, asn.receiverText);
+            }
+        }
+        // Tier 3: static class-as-receiver fallback
+        if (!receiverTypeName) {
+            const resolved = ctx.resolve(asn.receiverText, asn.filePath);
+            if (resolved?.candidates.some(d => d.type === 'Class' || d.type === 'Struct' || d.type === 'Interface'
+                || d.type === 'Enum' || d.type === 'Record' || d.type === 'Impl')) {
+                receiverTypeName = asn.receiverText;
+            }
+        }
+        if (!receiverTypeName)
+            continue;
+        const fieldOwner = resolveFieldOwnership(receiverTypeName, asn.propertyName, asn.filePath, ctx);
+        if (!fieldOwner)
+            continue;
+        graph.addRelationship({
+            id: generateId('ACCESSES', `${asn.sourceId}:${fieldOwner.nodeId}:write`),
+            sourceId: asn.sourceId,
+            targetId: fieldOwner.nodeId,
+            type: 'ACCESSES',
+            confidence: 1.0,
+            reason: 'write',
+        });
+    }
+};
 /**
  * Resolve pre-extracted Laravel routes to CALLS edges from route files to controller methods.
  */