@optave/codegraph 3.11.1 → 3.12.0

package/dist/domain/graph/builder/stages/build-edges.js

@@ -7,11 +7,19 @@
 import path from 'node:path';
 import { performance } from 'node:perf_hooks';
 import { getNodeId } from '../../../../db/index.js';
+import { setTypeMapEntry } from '../../../../extractors/helpers.js';
+import { PROPAGATION_HOP_PENALTY } from '../../../../extractors/javascript.js';
 import { debug } from '../../../../infrastructure/logger.js';
 import { loadNative } from '../../../../infrastructure/native.js';
 import { computeConfidence } from '../../resolve.js';
-import { BUILTIN_RECEIVERS, batchInsertEdges } from '../helpers.js';
-import { getResolved, isBarrelFile, resolveBarrelExport } from './resolve-imports.js';
+import { buildPointsToMap, resolveViaPointsTo } from '../../resolver/points-to.js';
+import { enrichTypeMapWithTsc } from '../../resolver/ts-resolver.js';
+import { findCaller, isModuleScopedLanguage, resolveCallTargets, resolveReceiverEdge, } from '../call-resolver.js';
+import { buildChaContext, resolveChaTargets, resolveThisDispatch } from '../cha.js';
+import { BUILTIN_RECEIVERS, batchInsertEdges, runChaPostPass } from '../helpers.js';
+import { getResolved, isBarrelFile, resolveBarrelExportCached } from './resolve-imports.js';
+/** Phase 8.5: confidence penalty applied to CHA-dispatch edges. */
+export const CHA_DISPATCH_PENALTY = 0.1;
 // ── Node lookup setup ───────────────────────────────────────────────────
 function makeGetNodeIdStmt(db) {
     return {
@@ -58,13 +66,13 @@ function emitTypeOnlySymbolEdges(ctx, imp, resolvedPath, fileNodeId, allEdgeRows
         const cleanName = name.replace(/^\*\s+as\s+/, '');
         let targetFile = resolvedPath;
         if (isBarrelFile(ctx, resolvedPath)) {
-            const actual = resolveBarrelExport(ctx, resolvedPath, cleanName);
+            const actual = resolveBarrelExportCached(ctx, resolvedPath, cleanName);
             if (actual)
                 targetFile = actual;
         }
         const candidates = ctx.nodesByNameAndFile.get(`${cleanName}|${targetFile}`);
         if (candidates && candidates.length > 0) {
-            allEdgeRows.push([fileNodeId, candidates[0].id, 'imports-type', 1.0, 0]);
+            allEdgeRows.push([fileNodeId, candidates[0].id, 'imports-type', 1.0, 0, null]);
         }
     }
 }
@@ -78,7 +86,7 @@ function emitEdgesForImport(ctx, imp, fileNodeId, relPath, getNodeIdStmt, allEdg
     if (!targetRow)
         return;
     const edgeKind = importEdgeKind(imp);
-    allEdgeRows.push([fileNodeId, targetRow.id, edgeKind, 1.0, 0]);
+    allEdgeRows.push([fileNodeId, targetRow.id, edgeKind, 1.0, 0, null]);
     if (imp.typeOnly) {
         emitTypeOnlySymbolEdges(ctx, imp, resolvedPath, fileNodeId, allEdgeRows);
     }
@@ -106,7 +114,7 @@ function buildBarrelEdges(ctx, imp, resolvedPath, fileNodeId, edgeKind, getNodeI
     const resolvedSources = new Set();
     for (const name of imp.names) {
         const cleanName = name.replace(/^\*\s+as\s+/, '');
-        const actualSource = resolveBarrelExport(ctx, resolvedPath, cleanName);
+        const actualSource = resolveBarrelExportCached(ctx, resolvedPath, cleanName);
         if (actualSource && actualSource !== resolvedPath && !resolvedSources.has(actualSource)) {
             resolvedSources.add(actualSource);
             const actualRow = getNodeIdStmt.get(actualSource, 'file', actualSource, 0);
@@ -116,7 +124,7 @@ function buildBarrelEdges(ctx, imp, resolvedPath, fileNodeId, edgeKind, getNodeI
                     : edgeKind === 'dynamic-imports'
                         ? 'dynamic-imports'
                         : 'imports';
-                edgeRows.push([fileNodeId, actualRow.id, kind, 0.9, 0]);
+                edgeRows.push([fileNodeId, actualRow.id, kind, 0.9, 0, null]);
             }
         }
     }
@@ -231,7 +239,66 @@ function buildImportEdgesNative(ctx, getNodeIdStmt, allEdgeRows, native) {
     const symbolNodes = collectSymbolNodes(ctx);
     const nativeEdges = native.buildImportEdges(files, resolvedImports, fileReexports, registry.ids, barrelFiles, ctx.rootDir, symbolNodes);
     for (const e of nativeEdges) {
-        allEdgeRows.push([e.sourceId, e.targetId, e.kind, e.confidence, e.dynamic]);
+        allEdgeRows.push([e.sourceId, e.targetId, e.kind, e.confidence, e.dynamic, null]);
+    }
+}
+// ── Phase 8.2: Cross-file return-type propagation ───────────────────────
+/**
+ * Augment each file's typeMap with return types from imported functions.
+ *
+ * The per-file extractor already resolves same-file call assignments (intra-file
+ * propagation). This function handles the cross-file case: when a file imports a
+ * function from another file and assigns its return value to a variable, we look up
+ * the callee's return type in the source file's returnTypeMap and inject it.
+ *
+ * Called once before call-edge building so both the native and JS paths benefit.
+ */
+function propagateReturnTypesAcrossFiles(fileSymbols, ctx, rootDir) {
+    // Index: filePath → per-file return-type map
+    const returnTypeIndex = new Map();
+    for (const [relPath, symbols] of fileSymbols) {
+        if (symbols.returnTypeMap?.size)
+            returnTypeIndex.set(relPath, symbols.returnTypeMap);
+    }
+    if (returnTypeIndex.size === 0)
+        return;
+    // Flat global map for qualified method lookups (TypeName.methodName → entry).
+    // Conflicts resolved by keeping the highest-confidence entry.
+    const globalReturnTypeMap = new Map();
+    for (const rtm of returnTypeIndex.values()) {
+        for (const [name, entry] of rtm) {
+            const existing = globalReturnTypeMap.get(name);
+            if (!existing || entry.confidence > existing.confidence)
+                globalReturnTypeMap.set(name, entry);
+        }
+    }
+    for (const [relPath, symbols] of fileSymbols) {
+        if (!symbols.callAssignments?.length)
+            continue;
+        // Phase 8.4 side-effect: buildImportedNamesMap now traces through barrel
+        // files (traceBarrel), so `importedFrom` resolves to the leaf definition
+        // file rather than the barrel. This means returnTypeIndex.get(importedFrom)
+        // now finds entries it previously missed, improving cross-file return-type
+        // propagation through re-export chains (Phase 8.2 improvement).
+        const importedNamesMap = buildImportedNamesMap(ctx, relPath, symbols, rootDir);
+        for (const ca of symbols.callAssignments) {
+            if (symbols.typeMap.has(ca.varName))
+                continue; // already resolved locally
+            let returnEntry;
+            if (ca.receiverTypeName) {
+                returnEntry = globalReturnTypeMap.get(`${ca.receiverTypeName}.${ca.calleeName}`);
+            }
+            else {
+                const importedFrom = importedNamesMap.get(ca.calleeName);
+                if (importedFrom)
+                    returnEntry = returnTypeIndex.get(importedFrom)?.get(ca.calleeName);
+            }
+            if (returnEntry) {
+                const propagatedConf = returnEntry.confidence - PROPAGATION_HOP_PENALTY;
+                if (propagatedConf > 0)
+                    setTypeMapEntry(symbols.typeMap, ca.varName, returnEntry.type, propagatedConf);
+            }
+        }
     }
 }
 // ── Call edges (native engine) ──────────────────────────────────────────
@@ -280,13 +347,432 @@ function buildCallEdgesNative(ctx, getNodeIdStmt, allEdgeRows, allNodes, native)
             importedNames,
             classes: symbols.classes,
             typeMap,
+            fnRefBindings: symbols.fnRefBindings?.length ? symbols.fnRefBindings : undefined,
         });
     }
     const nativeEdges = native.buildCallEdges(nativeFiles, allNodes, [
         ...BUILTIN_RECEIVERS,
     ]);
     for (const e of nativeEdges) {
-        allEdgeRows.push([e.sourceId, e.targetId, e.kind, e.confidence, e.dynamic]);
+        allEdgeRows.push([
+            e.sourceId,
+            e.targetId,
+            e.kind,
+            e.confidence,
+            e.dynamic,
+            e.kind === 'calls' ? 'ts-native' : null,
+        ]);
+    }
+}
+/**
+ * Phase 8.3c pts post-pass for the native call-edge path.
+ *
+ * The native Rust engine builds call edges without knowledge of paramBindings,
+ * so `fn()` calls inside higher-order functions are not resolved to their
+ * concrete targets. This JS post-pass runs after the native edge pass and adds
+ * only the parameter-flow pts edges that the native engine missed.
+ *
+ * To avoid duplicating edges already emitted by the native engine, the current
+ * allEdgeRows snapshot is used to seed a seenByPair set before processing each
+ * file.
+ */
+function buildParamFlowPtsPostPass(ctx, getNodeIdStmt, allEdgeRows, sharedLookup) {
+    // Only process files that actually have paramBindings (avoid useless work).
+    const filesWithParams = [...ctx.fileSymbols].filter(([, symbols]) => symbols.paramBindings && symbols.paramBindings.length > 0);
+    if (filesWithParams.length === 0)
+        return;
+    // Seed seenByPair from the existing rows so we don't duplicate native edges.
+    // This is O(|allEdgeRows|) once per post-pass, which is acceptable.
+    const seenByPair = new Set();
+    for (const [srcId, tgtId] of allEdgeRows) {
+        seenByPair.add(`${srcId}|${tgtId}`);
+    }
+    const { barrelOnlyFiles, rootDir } = ctx;
+    const lookup = sharedLookup ?? makeContextLookup(ctx, getNodeIdStmt);
+    for (const [relPath, symbols] of filesWithParams) {
+        if (barrelOnlyFiles.has(relPath))
+            continue;
+        const fileNodeRow = getNodeIdStmt.get(relPath, 'file', relPath, 0);
+        if (!fileNodeRow)
+            continue;
+        const importedNames = buildImportedNamesMap(ctx, relPath, symbols, rootDir);
+        const typeMap = symbols.typeMap || new Map();
+        const ptsMap = buildPointsToMapForFile(symbols, importedNames);
+        if (!ptsMap)
+            continue;
+        for (const call of symbols.calls) {
+            if (call.receiver || call.dynamic)
+                continue; // pts post-pass handles only param-flow (non-dynamic)
+            const caller = findCaller(lookup, call, symbols.definitions, relPath, fileNodeRow);
+            const scopedKey = caller.callerName != null ? `${caller.callerName}::${call.name}` : null;
+            if (!scopedKey || !ptsMap.has(scopedKey))
+                continue;
+            // Only resolve calls that had no direct targets (same guard as buildFileCallEdges).
+            const { targets } = resolveCallTargets(lookup, call, relPath, importedNames, typeMap);
+            if (targets.length > 0)
+                continue;
+            for (const alias of resolveViaPointsTo(scopedKey, ptsMap)) {
+                const { targets: aliasTargets, importedFrom: aliasFrom } = resolveCallTargets(lookup, { name: alias }, relPath, importedNames, typeMap);
+                for (const t of aliasTargets) {
+                    const edgeKey = `${caller.id}|${t.id}`;
+                    if (t.id !== caller.id && !seenByPair.has(edgeKey)) {
+                        const conf = computeConfidence(relPath, t.file, aliasFrom ?? null) - PROPAGATION_HOP_PENALTY;
+                        if (conf > 0) {
+                            seenByPair.add(edgeKey);
+                            allEdgeRows.push([caller.id, t.id, 'calls', conf, 0, 'points-to']);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+/**
+ * bind/alias pts post-pass for the native call-edge path.
+ *
+ * The native Rust engine has no knowledge of JS-layer fnRefBindings (e.g.
+ * `const f = fn.bind(ctx)`), so calls to bind-created aliases are not resolved
+ * to their original function on the native path. This JS post-pass runs after
+ * the native edge pass and adds only the fnRefBindings-seeded pts edges that the
+ * native engine missed.
+ *
+ * Uses the same seenByPair dedup guard as buildParamFlowPtsPostPass to avoid
+ * duplicating edges already emitted by the native engine.
+ */
+function buildFnRefBindingsPtsPostPass(ctx, getNodeIdStmt, allEdgeRows, sharedLookup) {
+    // Only process files that actually have fnRefBindings.
+    const filesWithBindings = [...ctx.fileSymbols].filter(([, symbols]) => symbols.fnRefBindings && symbols.fnRefBindings.length > 0);
+    if (filesWithBindings.length === 0)
+        return;
+    // Seed seenByPair from the existing rows so we don't duplicate native edges.
+    const seenByPair = new Set();
+    for (const [srcId, tgtId] of allEdgeRows) {
+        seenByPair.add(`${srcId}|${tgtId}`);
+    }
+    const { barrelOnlyFiles, rootDir } = ctx;
+    const lookup = sharedLookup ?? makeContextLookup(ctx, getNodeIdStmt);
+    for (const [relPath, symbols] of filesWithBindings) {
+        if (barrelOnlyFiles.has(relPath))
+            continue;
+        const fileNodeRow = getNodeIdStmt.get(relPath, 'file', relPath, 0);
+        if (!fileNodeRow)
+            continue;
+        const importedNames = buildImportedNamesMap(ctx, relPath, symbols, rootDir);
+        const typeMap = symbols.typeMap || new Map();
+        const ptsMap = buildPointsToMapForFile(symbols, importedNames);
+        if (!ptsMap)
+            continue;
+        // Only resolve calls whose name is an lhs in fnRefBindings — the same
+        // narrowed guard used in buildFileCallEdges case (c).
+        const fnRefBindingLhs = new Set(symbols.fnRefBindings.map((b) => b.lhs));
+        for (const call of symbols.calls) {
+            if (call.receiver || call.dynamic)
+                continue; // bind aliases are flat-keyed, never dynamic
+            if (!fnRefBindingLhs.has(call.name))
+                continue;
+            if (!ptsMap.has(call.name))
+                continue;
+            const caller = findCaller(lookup, call, symbols.definitions, relPath, fileNodeRow);
+            // Only resolve calls that had no direct targets (same guard as buildFileCallEdges).
+            const { targets } = resolveCallTargets(lookup, call, relPath, importedNames, typeMap);
+            if (targets.length > 0)
+                continue;
+            for (const alias of resolveViaPointsTo(call.name, ptsMap)) {
+                const { targets: aliasTargets, importedFrom: aliasFrom } = resolveCallTargets(lookup, { name: alias }, relPath, importedNames, typeMap);
+                for (const t of aliasTargets) {
+                    const edgeKey = `${caller.id}|${t.id}`;
+                    if (t.id !== caller.id && !seenByPair.has(edgeKey)) {
+                        const conf = computeConfidence(relPath, t.file, aliasFrom ?? null) - PROPAGATION_HOP_PENALTY;
+                        if (conf > 0) {
+                            seenByPair.add(edgeKey);
+                            allEdgeRows.push([caller.id, t.id, 'calls', conf, 0, 'points-to']);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+/**
+ * this-rebinding post-pass for the native call-edge path.
+ *
+ * When `fn.call(namedCtx, ...)` or `fn.apply(namedCtx, ...)` is extracted by the
+ * WASM layer, `thisCallBindings` records `{ callee: 'fn', thisArg: 'namedCtx' }`.
+ * The native Rust engine has no knowledge of these bindings, so `this()` calls
+ * inside `fn` remain unresolved. This JS post-pass adds the missing edges by
+ * resolving `this()` calls inside each `fn` that has a thisCallBinding.
+ */
+function buildThisCallBindingsPtsPostPass(ctx, getNodeIdStmt, allEdgeRows, sharedLookup) {
+    const filesWithBindings = [...ctx.fileSymbols].filter(([, symbols]) => symbols.thisCallBindings && symbols.thisCallBindings.length > 0);
+    if (filesWithBindings.length === 0)
+        return;
+    const seenByPair = new Set();
+    for (const [srcId, tgtId] of allEdgeRows) {
+        seenByPair.add(`${srcId}|${tgtId}`);
+    }
+    const { barrelOnlyFiles, rootDir } = ctx;
+    const lookup = sharedLookup ?? makeContextLookup(ctx, getNodeIdStmt);
+    for (const [relPath, symbols] of filesWithBindings) {
+        if (barrelOnlyFiles.has(relPath))
+            continue;
+        const fileNodeRow = getNodeIdStmt.get(relPath, 'file', relPath, 0);
+        if (!fileNodeRow)
+            continue;
+        const importedNames = buildImportedNamesMap(ctx, relPath, symbols, rootDir);
+        const typeMap = symbols.typeMap || new Map();
+        const ptsMap = buildPointsToMapForFile(symbols, importedNames);
+        if (!ptsMap)
+            continue;
+        // Only process calls named 'this' (callee-not-receiver usage)
+        for (const call of symbols.calls) {
+            if (call.name !== 'this' || call.receiver)
+                continue;
+            const caller = findCaller(lookup, call, symbols.definitions, relPath, fileNodeRow);
+            if (caller.callerName == null)
+                continue;
+            const scopedKey = `${caller.callerName}::this`;
+            if (!ptsMap.has(scopedKey))
+                continue;
+            for (const alias of resolveViaPointsTo(scopedKey, ptsMap)) {
+                const { targets: aliasTargets, importedFrom: aliasFrom } = resolveCallTargets(lookup, { name: alias }, relPath, importedNames, typeMap);
+                for (const t of aliasTargets) {
+                    const edgeKey = `${caller.id}|${t.id}`;
+                    if (t.id !== caller.id && !seenByPair.has(edgeKey)) {
+                        const conf = computeConfidence(relPath, t.file, aliasFrom ?? null) - PROPAGATION_HOP_PENALTY;
+                        if (conf > 0) {
+                            seenByPair.add(edgeKey);
+                            allEdgeRows.push([caller.id, t.id, 'calls', conf, 0, 'points-to']);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+/**
+ * Phase 8.3f post-pass for the native call-edge path.
+ *
+ * The native Rust engine builds call edges without knowledge of
+ * objectRestParamBindings, so `rest.method()` calls inside functions with
+ * object-destructuring rest parameters are not resolved via the typeMap chain.
+ * The Rust engine already resolves same-file and directly-imported callees
+ * (via steps 1–2 of its resolution logic), so this post-pass only adds edges
+ * that require the typeMap-chain path:
+ *   typeMap[restName] → argName → typeMap[argName.method] → target
+ *
+ * Mirrors the seeding in buildCallEdgesJS (Phase 8.3f) to ensure both engine
+ * paths produce identical results for receiver-typed rest-param calls.
+ */
+function buildObjectRestParamPostPass(ctx, getNodeIdStmt, allEdgeRows, sharedLookup) {
+    const filesWithRestBindings = [...ctx.fileSymbols].filter(([, symbols]) => symbols.objectRestParamBindings &&
+        symbols.objectRestParamBindings.length > 0 &&
+        symbols.paramBindings &&
+        symbols.paramBindings.length > 0);
+    if (filesWithRestBindings.length === 0)
+        return;
+    const seenByPair = new Set();
+    for (const [srcId, tgtId] of allEdgeRows) {
+        seenByPair.add(`${srcId}|${tgtId}`);
+    }
+    const { barrelOnlyFiles, rootDir } = ctx;
+    const lookup = sharedLookup ?? makeContextLookup(ctx, getNodeIdStmt);
+    for (const [relPath, symbols] of filesWithRestBindings) {
+        if (barrelOnlyFiles.has(relPath))
+            continue;
+        const fileNodeRow = getNodeIdStmt.get(relPath, 'file', relPath, 0);
+        if (!fileNodeRow)
+            continue;
+        const importedNames = buildImportedNamesMap(ctx, relPath, symbols, rootDir);
+        const typeMap = new Map(symbols.typeMap instanceof Map ? symbols.typeMap : []);
+        // Seed typeMap[callee::restName] = { type: argName } for each matching pair.
+        // Mirrors the seeding in buildCallEdgesJS Phase 8.3f. Keys are scoped by
+        // callee so two functions with the same rest-param name (e.g. `...rest`) in
+        // the same file don't collide (#1358).
+        // When only one callee uses a given rest name, also seed the unscoped key
+        // as a null-callerName fallback so edges aren't silently dropped if
+        // findCaller can't identify the enclosing function (#1358).
+        const restNameCallees = new Map();
+        for (const orpb of symbols.objectRestParamBindings) {
+            if (!restNameCallees.has(orpb.restName))
+                restNameCallees.set(orpb.restName, new Set());
+            restNameCallees.get(orpb.restName).add(orpb.callee);
+        }
+        const restNames = new Set();
+        for (const orpb of symbols.objectRestParamBindings) {
+            for (const pb of symbols.paramBindings) {
+                if (pb.callee === orpb.callee && pb.argIndex === orpb.argIndex) {
+                    const scopedKey = `${orpb.callee}::${orpb.restName}`;
+                    if (!typeMap.has(scopedKey)) {
+                        typeMap.set(scopedKey, { type: pb.argName, confidence: 0.65 });
+                        if (restNameCallees.get(orpb.restName).size === 1 && !typeMap.has(orpb.restName)) {
+                            typeMap.set(orpb.restName, { type: pb.argName, confidence: 0.65 });
+                        }
+                    }
+                    // restNames tracks every rest-parameter name found, regardless of whether the
+                    // scoped key was already in typeMap.  This ensures the post-pass (below) processes
+                    // all calls whose receiver matches a known rest binding — not just those whose
+                    // typeMap entry was seeded in this iteration.
+                    restNames.add(orpb.restName);
+                }
+            }
+        }
+        if (restNames.size === 0)
+            continue;
+        for (const call of symbols.calls) {
+            // Only process calls whose receiver is a known rest-binding name.
+            if (!call.receiver || !restNames.has(call.receiver))
+                continue;
+            const caller = findCaller(lookup, call, symbols.definitions, relPath, fileNodeRow);
+            // Resolve with the enriched typeMap. callerName is passed so
+            // resolveByMethodOrGlobal can look up the scoped key callee::restName (#1358).
+            // seenByPair deduplicates edges the native engine already emitted.
+            const { targets, importedFrom } = resolveCallTargets(lookup, call, relPath, importedNames, typeMap, caller.callerName);
+            for (const t of targets) {
+                const edgeKey = `${caller.id}|${t.id}`;
+                if (t.id !== caller.id && !seenByPair.has(edgeKey)) {
+                    const conf = computeConfidence(relPath, t.file, importedFrom ?? null) - PROPAGATION_HOP_PENALTY;
+                    if (conf > 0) {
+                        seenByPair.add(edgeKey);
+                        allEdgeRows.push([caller.id, t.id, 'calls', conf, 0, 'points-to']);
+                    }
+                }
+            }
+        }
+    }
+}
+/**
+ * Object.defineProperty accessor post-pass for the native call-edge path.
+ *
+ * When a function is registered as a getter/setter via
+ * `Object.defineProperty(obj, "bar", { get: getter })`, calls to `this.X()`
+ * inside `getter` need to resolve against `obj` (because `this === obj` when
+ * the accessor is invoked). The native Rust engine has no knowledge of
+ * `definePropertyReceivers`, so this JS post-pass adds the missing edges.
+ */
+function buildDefinePropertyPostPass(ctx, getNodeIdStmt, allEdgeRows, sharedLookup) {
+    const filesWithReceivers = [...ctx.fileSymbols].filter(([, symbols]) => symbols.definePropertyReceivers && symbols.definePropertyReceivers.size > 0);
+    if (filesWithReceivers.length === 0)
+        return;
+    const seenByPair = new Set();
+    for (const [srcId, tgtId] of allEdgeRows) {
+        seenByPair.add(`${srcId}|${tgtId}`);
+    }
+    const { barrelOnlyFiles, rootDir } = ctx;
+    const lookup = sharedLookup ?? makeContextLookup(ctx, getNodeIdStmt);
+    for (const [relPath, symbols] of filesWithReceivers) {
+        if (barrelOnlyFiles.has(relPath))
+            continue;
+        const fileNodeRow = getNodeIdStmt.get(relPath, 'file', relPath, 0);
+        if (!fileNodeRow)
+            continue;
+        const importedNames = buildImportedNamesMap(ctx, relPath, symbols, rootDir);
+        const typeMap = symbols.typeMap || new Map();
+        const definePropertyReceivers = symbols.definePropertyReceivers;
+        for (const call of symbols.calls) {
+            if (call.receiver !== 'this')
+                continue;
+            const caller = findCaller(lookup, call, symbols.definitions, relPath, fileNodeRow);
+            if (!caller.callerName)
+                continue;
+            const receiverVarName = definePropertyReceivers.get(caller.callerName);
+            if (!receiverVarName)
+                continue;
+            // Only add edges the native engine missed (no direct target already).
+            const { targets: directTargets } = resolveCallTargets(lookup, call, relPath, importedNames, typeMap, caller.callerName);
+            if (directTargets.length > 0)
+                continue;
+            // Resolve via receiver type
+            let targets = [];
+            const typeEntry = typeMap.get(receiverVarName);
+            const typeName = typeEntry
+                ? typeof typeEntry === 'string'
+                    ? typeEntry
+                    : typeEntry.type
+                : null;
+            if (typeName) {
+                const qualifiedName = `${typeName}.${call.name}`;
+                targets = lookup.byNameAndFile(qualifiedName, relPath);
+            }
+            // Same-file fallback for plain object-literal methods
+            if (targets.length === 0) {
+                targets = lookup.byNameAndFile(call.name, relPath);
+            }
+            for (const t of targets) {
+                const edgeKey = `${caller.id}|${t.id}`;
+                if (t.id !== caller.id && !seenByPair.has(edgeKey)) {
+                    const conf = computeConfidence(relPath, t.file, null);
+                    if (conf > 0) {
+                        seenByPair.add(edgeKey);
+                        allEdgeRows.push([caller.id, t.id, 'calls', conf, 0, 'ts-native']);
+                    }
+                }
+            }
+        }
+    }
+}
+/**
+ * Phase 8.5: CHA + RTA post-pass for the native call-edge path.
+ *
+ * The native Rust engine has no knowledge of the CHA context, so `this.method()`
+ * calls and interface method dispatches are not expanded to their concrete
+ * implementations.  This JS post-pass runs after the native edges (and the pts
+ * post-pass) and adds only the CHA-resolved edges that the native engine missed.
+ *
+ * Like buildParamFlowPtsPostPass, it seeds seenByPair from the current allEdgeRows
+ * snapshot to avoid duplicating edges the native engine already produced.
+ */
+function buildChaPostPass(ctx, getNodeIdStmt, allEdgeRows, chaCtx) {
+    // Fast-exit when the CHA context is empty (no class hierarchy in the project)
+    if (chaCtx.implementors.size === 0 && chaCtx.parents.size === 0)
+        return;
+    // Seed only from 'calls' edges — import/extends/implements edges share (src,tgt) pairs
+    // with real call edges at the file-node level and would cause false dedup if included.
+    const seenByPair = new Set();
+    for (const row of allEdgeRows) {
+        if (row[2] === 'calls')
+            seenByPair.add(`${row[0]}|${row[1]}`);
+    }
+    const { fileSymbols, barrelOnlyFiles } = ctx;
+    const lookup = makeContextLookup(ctx, getNodeIdStmt);
+    for (const [relPath, symbols] of fileSymbols) {
+        if (barrelOnlyFiles.has(relPath))
+            continue;
+        const fileNodeRow = getNodeIdStmt.get(relPath, 'file', relPath, 0);
+        if (!fileNodeRow)
+            continue;
+        const typeMap = symbols.typeMap || new Map();
+        for (const call of symbols.calls) {
+            if (!call.receiver)
+                continue;
+            if (BUILTIN_RECEIVERS.has(call.receiver))
+                continue;
+            const caller = findCaller(lookup, call, symbols.definitions, relPath, fileNodeRow);
+            let chaTargets = [];
+            if (call.receiver === 'this' || call.receiver === 'self' || call.receiver === 'super') {
+                chaTargets = resolveThisDispatch(call.name, caller.callerName, call.receiver, chaCtx, lookup);
+            }
+            else {
+                const typeEntry = typeMap.get(call.receiver);
+                const typeName = typeEntry
+                    ? typeof typeEntry === 'string'
+                        ? typeEntry
+                        : typeEntry.type
+                    : null;
+                if (typeName) {
+                    chaTargets = resolveChaTargets(typeName, call.name, chaCtx, lookup);
+                }
+            }
+            for (const t of chaTargets) {
+                const edgeKey = `${caller.id}|${t.id}`;
+                if (t.id !== caller.id && !seenByPair.has(edgeKey)) {
+                    const conf = computeConfidence(relPath, t.file, null) - CHA_DISPATCH_PENALTY;
+                    if (conf > 0) {
+                        seenByPair.add(edgeKey);
+                        allEdgeRows.push([caller.id, t.id, 'calls', conf, 0, 'cha']);
+                    }
+                }
+            }
+        }
     }
 }
 function buildImportedNamesForNative(ctx, relPath, symbols, rootDir) {
@@ -300,7 +786,7 @@ function buildImportedNamesForNative(ctx, relPath, symbols, rootDir) {
             const cleanName = name.replace(/^\*\s+as\s+/, '');
             let targetFile = resolvedPath;
             if (isBarrelFile(ctx, resolvedPath)) {
-                const actual = resolveBarrelExport(ctx, resolvedPath, cleanName);
+                const actual = resolveBarrelExportCached(ctx, resolvedPath, cleanName);
                 if (actual)
                     targetFile = actual;
             }
@@ -318,8 +804,9 @@ function buildImportedNamesForNative(ctx, relPath, symbols, rootDir) {
     return importedNames;
 }
 // ── Call edges (JS fallback) ────────────────────────────────────────────
-function buildCallEdgesJS(ctx, getNodeIdStmt, allEdgeRows) {
+function buildCallEdgesJS(ctx, getNodeIdStmt, allEdgeRows, chaCtx) {
     const { fileSymbols, barrelOnlyFiles, rootDir } = ctx;
+    const lookup = makeContextLookup(ctx, getNodeIdStmt);
     for (const [relPath, symbols] of fileSymbols) {
         if (barrelOnlyFiles.has(relPath))
             continue;
@@ -327,9 +814,36 @@ function buildCallEdgesJS(ctx, getNodeIdStmt, allEdgeRows) {
         if (!fileNodeRow)
             continue;
         const importedNames = buildImportedNamesMap(ctx, relPath, symbols, rootDir);
-        const typeMap = symbols.typeMap || new Map();
+        const typeMap = new Map(symbols.typeMap instanceof Map ? symbols.typeMap : []);
+        // Phase 8.3f: seed typeMap[callee::restName] = { type: argName } for each
+        // object-destructuring rest parameter binding × call-site argument binding.
+        // Keys are scoped so two functions with the same rest-param name in the same
+        // file don't collide (#1358). When only one callee uses a given rest name,
+        // also seed the unscoped key as a null-callerName fallback.
+        if (symbols.objectRestParamBindings?.length && symbols.paramBindings?.length) {
+            const restNameCallees = new Map();
+            for (const orpb of symbols.objectRestParamBindings) {
+                if (!restNameCallees.has(orpb.restName))
+                    restNameCallees.set(orpb.restName, new Set());
+                restNameCallees.get(orpb.restName).add(orpb.callee);
+            }
+            for (const orpb of symbols.objectRestParamBindings) {
+                for (const pb of symbols.paramBindings) {
+                    if (pb.callee === orpb.callee && pb.argIndex === orpb.argIndex) {
+                        const scopedKey = `${orpb.callee}::${orpb.restName}`;
+                        if (!typeMap.has(scopedKey)) {
+                            typeMap.set(scopedKey, { type: pb.argName, confidence: 0.65 });
+                            if (restNameCallees.get(orpb.restName).size === 1 && !typeMap.has(orpb.restName)) {
+                                typeMap.set(orpb.restName, { type: pb.argName, confidence: 0.65 });
+                            }
+                        }
+                    }
+                }
+            }
+        }
         const seenCallEdges = new Set();
-        buildFileCallEdges(ctx, relPath, symbols, fileNodeRow, importedNames, seenCallEdges, getNodeIdStmt, allEdgeRows, typeMap);
+        const ptsMap = buildPointsToMapForFile(symbols, importedNames);
+        buildFileCallEdges(relPath, symbols, fileNodeRow, importedNames, seenCallEdges, lookup, allEdgeRows, typeMap, ptsMap, chaCtx);
         buildClassHierarchyEdges(ctx, relPath, symbols, allEdgeRows);
     }
 }
@@ -339,12 +853,23 @@ function buildImportedNamesMap(ctx, relPath, symbols, rootDir) {
     // (higher priority). Static imports represent direct bindings while dynamic
     // imports often use aliased destructuring (`{ foo: bar } = await import(…)`).
     // When both contribute the same name, the static binding is authoritative.
+    //
+    // Phase 8.4: trace through barrel files so that symbol names map to their
+    // actual definition file, not the re-exporting barrel. Mirrors the tracing
+    // already done in buildImportedNamesForNative (the native path).
+    const traceBarrel = (resolvedPath, cleanName) => {
+        if (!isBarrelFile(ctx, resolvedPath))
+            return resolvedPath;
+        const actual = resolveBarrelExportCached(ctx, resolvedPath, cleanName);
+        return actual ?? resolvedPath;
+    };
     for (const imp of symbols.imports) {
         if (!imp.dynamicImport)
             continue;
         const resolvedPath = getResolved(ctx, path.join(rootDir, relPath), imp.source);
         for (const name of imp.names) {
-            importedNames.set(name.replace(/^\*\s+as\s+/, ''), resolvedPath);
+            const cleanName = name.replace(/^\*\s+as\s+/, '');
+            importedNames.set(cleanName, traceBarrel(resolvedPath, cleanName));
         }
     }
     for (const imp of symbols.imports) {
@@ -353,124 +878,333 @@ function buildImportedNamesMap(ctx, relPath, symbols, rootDir) {
         const resolvedPath = getResolved(ctx, path.join(rootDir, relPath), imp.source);
         for (const name of imp.names) {
             const cleanName = name.replace(/^\*\s+as\s+/, '');
-            importedNames.set(cleanName, resolvedPath);
+            importedNames.set(cleanName, traceBarrel(resolvedPath, cleanName));
         }
     }
     return importedNames;
 }
-function findCaller(call, definitions, relPath, getNodeIdStmt, fileNodeRow) {
-    let caller = null;
-    let callerSpan = Infinity;
-    for (const def of definitions) {
-        if (def.line <= call.line) {
-            const end = def.endLine || Infinity;
-            if (call.line <= end) {
-                const span = end - def.line;
-                if (span < callerSpan) {
-                    const row = getNodeIdStmt.get(def.name, def.kind, relPath, def.line);
-                    if (row) {
-                        caller = row;
-                        callerSpan = span;
-                    }
-                }
-            }
-        }
-    }
-    return caller || fileNodeRow;
+function makeContextLookup(ctx, getNodeIdStmt) {
+    return {
+        byNameAndFile: (name, file) => ctx.nodesByNameAndFile.get(`${name}|${file}`) ?? [],
+        byName: (name) => ctx.nodesByName.get(name) ?? [],
+        isBarrel: (file) => isBarrelFile(ctx, file),
+        resolveBarrel: (barrelFile, symbolName) => resolveBarrelExportCached(ctx, barrelFile, symbolName),
+        nodeId: (name, kind, file, line) => getNodeIdStmt.get(name, kind, file, line),
+    };
 }
-function resolveCallTargets(ctx, call, relPath, importedNames, typeMap) {
-    const importedFrom = importedNames.get(call.name);
-    let targets;
-    if (importedFrom) {
-        targets = ctx.nodesByNameAndFile.get(`${call.name}|${importedFrom}`) || [];
-        if (targets.length === 0 && isBarrelFile(ctx, importedFrom)) {
-            const actualSource = resolveBarrelExport(ctx, importedFrom, call.name);
-            if (actualSource) {
-                targets = ctx.nodesByNameAndFile.get(`${call.name}|${actualSource}`) || [];
-            }
-        }
-    }
-    if (!targets || targets.length === 0) {
-        targets = ctx.nodesByNameAndFile.get(`${call.name}|${relPath}`) || [];
-        if (targets.length === 0) {
-            targets = resolveByMethodOrGlobal(ctx, call, relPath, typeMap);
-        }
-    }
-    if (targets.length > 1) {
-        targets.sort((a, b) => {
-            const confA = computeConfidence(relPath, a.file, importedFrom ?? null);
-            const confB = computeConfidence(relPath, b.file, importedFrom ?? null);
-            return confB - confA;
-        });
+/**
+ * Build a per-file points-to map for Phase 8.3 alias resolution.
+ * Returns null fast when the file has no function-reference bindings.
+ *
+ * Only callable definitions (function/method) are seeded as concrete targets.
+ * Class and interface names are intentionally excluded — aliasing a constructor
+ * (`const Svc = MyService`) is an uncommon pattern that would require tracking
+ * `new`-expression flows separately from the alias chain. That is left to Phase
+ * 8.2 call-assignment propagation, which already handles constructor assignments.
+ */
+function buildPointsToMapForFile(symbols, importedNames) {
+    const hasThisCallBindings = !!symbols.thisCallBindings?.length;
+    if (!symbols.fnRefBindings?.length &&
+        !symbols.paramBindings?.length &&
+        !symbols.arrayElemBindings?.length &&
+        !symbols.spreadArgBindings?.length &&
+        !symbols.forOfBindings?.length &&
+        !symbols.arrayCallbackBindings?.length &&
+        !symbols.objectRestParamBindings?.length &&
+        !symbols.objectPropBindings?.length &&
+        !hasThisCallBindings)
+        return null;
+    const defNames = new Set(symbols.definitions
+        .filter((d) => d.kind === 'function' || d.kind === 'method')
+        .map((d) => d.name));
+    const definitionParams = buildDefinitionParamsMap(symbols.definitions);
+    // Convert thisCallBindings into scoped fnRefBindings: `fn::this → namedCtx`.
+    // The scoped key `fn::this` is looked up when `this()` calls are resolved inside
+    // function `fn` — caller.callerName='fn', call.name='this' → scopedPtsKey='fn::this'.
+    let allFnRefBindings = symbols.fnRefBindings ?? [];
+    if (hasThisCallBindings) {
+        const extra = (symbols.thisCallBindings ?? []).map((b) => ({
+            lhs: `${b.callee}::this`,
+            rhs: b.thisArg,
+        }));
+        allFnRefBindings = [...allFnRefBindings, ...extra];
     }
-    return { targets, importedFrom };
+    return buildPointsToMap(allFnRefBindings, defNames, importedNames, symbols.paramBindings, definitionParams, symbols.arrayElemBindings, symbols.spreadArgBindings, symbols.forOfBindings, symbols.arrayCallbackBindings, symbols.objectRestParamBindings, symbols.objectPropBindings);
 }
-function resolveByMethodOrGlobal(ctx, call, relPath, typeMap) {
-    // Type-aware resolution: translate variable receiver to its declared type
-    if (call.receiver && typeMap) {
-        const typeEntry = typeMap.get(call.receiver);
-        const typeName = typeEntry
-            ? typeof typeEntry === 'string'
-                ? typeEntry
-                : typeEntry.type
-            : null;
-        if (typeName) {
-            const qualifiedName = `${typeName}.${call.name}`;
-            const typed = (ctx.nodesByName.get(qualifiedName) || []).filter((n) => n.kind === 'method');
-            if (typed.length > 0)
-                return typed;
+function buildDefinitionParamsMap(definitions) {
+    const map = new Map();
+    for (const def of definitions) {
+        if ((def.kind === 'function' || def.kind === 'method') && def.children) {
+            const params = def.children.filter((c) => c.kind === 'parameter').map((c) => c.name);
+            if (params.length > 0) {
+                if (map.has(def.name)) {
+                    // Two definitions share the same name (e.g. overloads, same-named method and
+                    // function, or conditional redeclaration). Keep the first entry — using the
+                    // wrong parameter list would map argIndex to the wrong parameter name.
+                    debug(`buildDefinitionParamsMap: duplicate def name "${def.name}" (kind=${def.kind}, line=${def.line}) — skipping; first entry kept`);
+                }
+                else {
+                    map.set(def.name, params);
+                }
+            }
         }
     }
-    if (!call.receiver ||
-        call.receiver === 'this' ||
-        call.receiver === 'self' ||
-        call.receiver === 'super') {
-        return (ctx.nodesByName.get(call.name) || []).filter((n) => computeConfidence(relPath, n.file, null) >= 0.5);
-    }
-    return [];
+    return map;
 }
-function buildFileCallEdges(ctx, relPath, symbols, fileNodeRow, importedNames, seenCallEdges, getNodeIdStmt, allEdgeRows, typeMap) {
+function buildFileCallEdges(relPath, symbols, fileNodeRow, importedNames, seenCallEdges, lookup, allEdgeRows, typeMap, ptsMap, chaCtx) {
+    // Tracks edges that were inserted by the pts fallback (edgeKey → allEdgeRows index).
+    // Kept separate from seenCallEdges so that a subsequent direct-call edge for the same
+    // caller→target pair can upgrade the confidence in-place rather than being silently
+    // dropped by the dedup guard. Once upgraded, the key moves to seenCallEdges and is
+    // no longer tracked here.
+    const ptsEdgeRows = new Map();
+    // Pre-compute the set of names that appear as lhs in fnRefBindings so that
+    // case (c) of the pts gate below only fires for names that are genuine
+    // bind/alias entries, not for every locally-defined function or import that
+    // buildPointsToMap seeds with a self-pointing entry.
+    const fnRefBindingLhs = new Set(symbols.fnRefBindings?.map((b) => b.lhs) ?? []);
     for (const call of symbols.calls) {
         if (call.receiver && BUILTIN_RECEIVERS.has(call.receiver))
             continue;
-        const caller = findCaller(call, symbols.definitions, relPath, getNodeIdStmt, fileNodeRow);
+        const caller = findCaller(lookup, call, symbols.definitions, relPath, fileNodeRow);
         const isDynamic = call.dynamic ? 1 : 0;
-        const { targets, importedFrom } = resolveCallTargets(ctx, call, relPath, importedNames, typeMap);
+        let { targets, importedFrom } = resolveCallTargets(lookup, call, relPath, importedNames, typeMap, caller.callerName);
+        // Same-class `this.method()` fallback: when the call receiver is `this` and
+        // resolveCallTargets found nothing, derive the enclosing class name from the
+        // caller (e.g. `Logger.info` → class prefix `Logger`) and retry with the
+        // qualified method name `Logger._write`. This mirrors what the native Rust
+        // engine does implicitly via its class-scoped symbol table.
+        // NOTE: restricted to `this` only — `super.method()` targets a parent class,
+        // not the enclosing class, so qualifying with the child class name would
+        // produce a false edge when the child also defines a same-named method.
+        if (targets.length === 0 && call.receiver === 'this' && caller.callerName != null) {
+            const lastDot = caller.callerName.lastIndexOf('.');
+            if (lastDot > 0) {
+                const prevDot = caller.callerName.lastIndexOf('.', lastDot - 1);
+                const className = caller.callerName.slice(prevDot + 1, lastDot);
+                const qualifiedName = `${className}.${call.name}`;
+                const qualified = lookup
+                    .byNameAndFile(qualifiedName, relPath)
+                    .filter((n) => n.kind === 'method');
+                if (qualified.length > 0) {
+                    targets = qualified;
+                }
+            }
+        }
+        // Same-class bare-call fallback: when a no-receiver call can't be resolved
+        // globally, try the caller's own class as a qualifier. Handles C# static
+        // sibling calls: `IsValidEmail()` inside `Validators.ValidateUser` resolves
+        // to `Validators.IsValidEmail`. Skipped for JS/TS where bare calls are
+        // module-scoped, not class-scoped.
+        if (targets.length === 0 &&
+            !call.receiver &&
+            caller.callerName != null &&
+            !isModuleScopedLanguage(relPath)) {
+            const lastDot = caller.callerName.lastIndexOf('.');
+            if (lastDot > 0) {
+                const prevDot = caller.callerName.lastIndexOf('.', lastDot - 1);
+                const className = caller.callerName.slice(prevDot + 1, lastDot);
+                const qualifiedName = `${className}.${call.name}`;
+                const qualified = lookup
+                    .byNameAndFile(qualifiedName, relPath)
+                    .filter((n) => n.kind === 'method');
+                if (qualified.length > 0) {
+                    targets = qualified;
+                }
+            }
+        }
+        // Object.defineProperty accessor fallback: when a function is registered as
+        // a getter/setter via `Object.defineProperty(obj, "bar", { get: getter })`,
+        // calls to `this.X()` inside `getter` resolve against `obj` (this === obj
+        // when the accessor is invoked). If the same-class fallback above found
+        // nothing, try treating `obj` as the receiver and look up `obj.X` in the
+        // typeMap, or fall back to a same-file lookup of any definition named X
+        // that belongs to the object literal or its type.
+        if (targets.length === 0 &&
+            call.receiver === 'this' &&
+            caller.callerName != null &&
+            symbols.definePropertyReceivers) {
+            const receiverVarName = symbols.definePropertyReceivers.get(caller.callerName);
+            if (receiverVarName) {
+                // Try typeMap lookup for receiver.methodName
+                const typeEntry = typeMap.get(receiverVarName);
+                const typeName = typeEntry
+                    ? typeof typeEntry === 'string'
+                        ? typeEntry
+                        : typeEntry.type
+                    : null;
+                if (typeName) {
+                    const qualifiedName = `${typeName}.${call.name}`;
+                    const qualified = lookup.byNameAndFile(qualifiedName, relPath);
+                    if (qualified.length > 0) {
+                        targets = [...qualified];
+                    }
+                }
+                // If still no targets, search for any definition named `call.name` in
+                // the same file — handles plain object literals where the method isn't
+                // qualified (e.g. `const obj = { baz() {} }` defines `baz` directly).
+                // Note: this is intentionally broad — it matches any same-file definition
+                // with the called name, not just members of the receiver object. This is
+                // the same behaviour used by the native post-pass path (buildDefinePropertyPostPass).
+                if (targets.length === 0) {
+                    const sameFile = lookup.byNameAndFile(call.name, relPath);
+                    if (sameFile.length > 0) {
+                        targets = [...sameFile];
+                    }
+                }
+            }
+        }
         for (const t of targets) {
             const edgeKey = `${caller.id}|${t.id}`;
-            if (t.id !== caller.id && !seenCallEdges.has(edgeKey)) {
-                seenCallEdges.add(edgeKey);
+            if (t.id !== caller.id) {
                 const confidence = computeConfidence(relPath, t.file, importedFrom ?? null);
-                allEdgeRows.push([caller.id, t.id, 'calls', confidence, isDynamic]);
+                if (seenCallEdges.has(edgeKey))
+                    continue;
+                const ptsIdx = ptsEdgeRows.get(edgeKey);
+                if (ptsIdx !== undefined) {
+                    // A pts-resolved edge already exists for this caller→target pair with a
+                    // penalised confidence. Upgrade it to the direct-call confidence in-place,
+                    // then promote to seenCallEdges so no further processing is needed.
+                    const ptsRow = allEdgeRows[ptsIdx];
+                    if (ptsRow) {
+                        ptsRow[3] = confidence;
+                        ptsRow[4] = isDynamic; // upgrade is_dynamic: direct call overrides the pts-alias dynamic flag
+                        ptsRow[5] = 'ts-native'; // promoted from pts to direct-call resolution
+                    }
+                    ptsEdgeRows.delete(edgeKey);
+                    seenCallEdges.add(edgeKey);
+                }
+                else {
+                    seenCallEdges.add(edgeKey);
+                    allEdgeRows.push([caller.id, t.id, 'calls', confidence, isDynamic, 'ts-native']);
+                }
+            }
+        }
+        // Phase 8.3 / 8.3c / bind: points-to fallback for unresolved calls.
+        // Fires for three cases:
+        //   (a) dynamic=true: alias calls emitted by extractCallbackReferenceCalls.
+        //       Looks up `call.name` directly (alias entries are flat-keyed).
+        //   (b) non-dynamic: parameter variable calls (fn() where fn is a param).
+        //       Looks up the scoped key `callerName::call.name` to avoid spurious
+        //       edges from same-named parameters across different functions.
+        //   (c) non-dynamic: module-level alias bindings — `f = fn.bind(ctx)` or
+        //       `const f = handler` — where pts('f') was seeded by fnRefBindings.
+        //       Checked against fnRefBindingLhs (the pre-computed set of lhs names from
+        //       fnRefBindings) rather than the full ptsMap, so case (c) only fires for
+        //       genuine bind/alias entries and never for self-seeded local definitions.
+        // Confidence is penalised by one hop to reflect the extra indirection.
+        //
+        // Note: pts edges are added to ptsEdgeRows (not seenCallEdges) so that a later
+        // direct call to the same target in the same function body can upgrade confidence
+        // rather than being silently dropped by the dedup guard.
+        const scopedPtsKey = caller.callerName != null ? `${caller.callerName}::${call.name}` : null;
+        // Module-level calls (callerName === null) use the '<module>' sentinel emitted by
+        // extractSpreadForOfWalk for top-level for-of loops. Look it up as a fallback so
+        // that `for (const f of arr) { f(); }` at module scope resolves correctly.
+        const modulePtsKey = caller.callerName === null && ptsMap?.has(`<module>::${call.name}`)
+            ? `<module>::${call.name}`
+            : null;
+        const flatPtsKey = !call.dynamic && fnRefBindingLhs.has(call.name) && ptsMap?.has(call.name) ? call.name : null;
+        if (targets.length === 0 &&
+            !call.receiver &&
+            ptsMap &&
+            (call.dynamic ||
+                (scopedPtsKey != null && ptsMap.has(scopedPtsKey)) ||
+                modulePtsKey != null ||
+                flatPtsKey != null)) {
+            const ptsLookupName = call.dynamic
+                ? call.name
+                : scopedPtsKey != null && ptsMap.has(scopedPtsKey)
+                    ? scopedPtsKey
+                    : modulePtsKey != null
+                        ? modulePtsKey
+                        : // flatPtsKey != null is guaranteed by the outer if condition: if neither
+                            // call.dynamic nor scopedPtsKey nor modulePtsKey matched, flatPtsKey must be non-null.
+                            flatPtsKey;
+            for (const alias of resolveViaPointsTo(ptsLookupName, ptsMap)) {
+                // Resolve the concrete alias target. Only `name` is needed here — receiver
+                // and line are not relevant for alias resolution (we are looking up the
+                // aliased function by name, not dispatching a method call).
+                const { targets: aliasTargets, importedFrom: aliasFrom } = resolveCallTargets(lookup, { name: alias }, relPath, importedNames, typeMap);
+                for (const t of aliasTargets) {
+                    const edgeKey = `${caller.id}|${t.id}`;
+                    if (t.id !== caller.id && !seenCallEdges.has(edgeKey) && !ptsEdgeRows.has(edgeKey)) {
+                        const conf = computeConfidence(relPath, t.file, aliasFrom ?? null) - PROPAGATION_HOP_PENALTY;
+                        if (conf > 0) {
+                            ptsEdgeRows.set(edgeKey, allEdgeRows.length);
+                            allEdgeRows.push([caller.id, t.id, 'calls', conf, isDynamic, 'points-to']);
+                        }
+                    }
+                }
+            }
+        }
+        // Phase 8.3f: pts fallback for receiver calls via object-rest param bindings.
+        // Fires when `rest.prop()` is encountered and `rest` was seeded as `pts["rest.prop"]`
+        // by the object-rest dispatch chain (ObjectRestParamBinding + paramBinding + ObjectPropBinding).
+        if (targets.length === 0 &&
+            call.receiver &&
+            !BUILTIN_RECEIVERS.has(call.receiver) &&
+            call.receiver !== 'this' &&
+            call.receiver !== 'self' &&
+            call.receiver !== 'super' &&
+            ptsMap) {
+            const receiverKey = `${call.receiver}.${call.name}`;
+            if (ptsMap.has(receiverKey)) {
+                for (const alias of resolveViaPointsTo(receiverKey, ptsMap)) {
+                    const { targets: aliasTargets, importedFrom: aliasFrom } = resolveCallTargets(lookup, { name: alias }, relPath, importedNames, typeMap);
+                    for (const t of aliasTargets) {
+                        const edgeKey = `${caller.id}|${t.id}`;
+                        if (t.id !== caller.id && !seenCallEdges.has(edgeKey) && !ptsEdgeRows.has(edgeKey)) {
+                            const conf = computeConfidence(relPath, t.file, aliasFrom ?? null) - PROPAGATION_HOP_PENALTY;
+                            if (conf > 0) {
+                                ptsEdgeRows.set(edgeKey, allEdgeRows.length);
+                                allEdgeRows.push([caller.id, t.id, 'calls', conf, isDynamic, 'points-to']);
+                            }
+                        }
+                    }
+                }
             }
         }
-        // Receiver edge
         if (call.receiver &&
             !BUILTIN_RECEIVERS.has(call.receiver) &&
             call.receiver !== 'this' &&
             call.receiver !== 'self' &&
             call.receiver !== 'super') {
-            buildReceiverEdge(ctx, call, caller, relPath, seenCallEdges, allEdgeRows, typeMap);
+            const recv = resolveReceiverEdge(lookup, { name: call.name, receiver: call.receiver }, caller, relPath, typeMap, seenCallEdges);
+            if (recv) {
+                allEdgeRows.push([recv.callerId, recv.receiverId, 'receiver', recv.confidence, 0, null]);
+            }
         }
-    }
-}
-function buildReceiverEdge(ctx, call, caller, relPath, seenCallEdges, allEdgeRows, typeMap) {
-    const receiverKinds = new Set(['class', 'struct', 'interface', 'type', 'module']);
-    const typeEntry = typeMap?.get(call.receiver);
-    const typeName = typeEntry ? (typeof typeEntry === 'string' ? typeEntry : typeEntry.type) : null;
-    const typeConfidence = typeEntry && typeof typeEntry === 'object' ? typeEntry.confidence : null;
-    const effectiveReceiver = typeName || call.receiver;
-    const samefile = ctx.nodesByNameAndFile.get(`${effectiveReceiver}|${relPath}`) || [];
-    const candidates = samefile.length > 0 ? samefile : ctx.nodesByName.get(effectiveReceiver) || [];
-    const receiverNodes = candidates.filter((n) => receiverKinds.has(n.kind));
-    if (receiverNodes.length > 0 && caller) {
-        const recvTarget = receiverNodes[0];
-        const recvKey = `recv|${caller.id}|${recvTarget.id}`;
-        if (!seenCallEdges.has(recvKey)) {
-            seenCallEdges.add(recvKey);
-            // Use type source confidence when available, otherwise 0.7 for untyped receiver
-            const confidence = typeConfidence ?? (typeName ? 0.9 : 0.7);
-            allEdgeRows.push([caller.id, recvTarget.id, 'receiver', confidence, 0]);
+        // Phase 8.5: CHA + RTA dispatch expansion.
+        // For `this`/`self`/`super` calls: resolve through the class hierarchy instead
+        // of relying solely on global name matching.
+        // For typed receiver calls: expand to all instantiated concrete implementations.
+        if (chaCtx && call.receiver) {
+            let chaTargets = [];
+            if (call.receiver === 'this' || call.receiver === 'self' || call.receiver === 'super') {
+                chaTargets = resolveThisDispatch(call.name, caller.callerName, call.receiver, chaCtx, lookup);
+            }
+            else if (!BUILTIN_RECEIVERS.has(call.receiver)) {
+                const typeEntry = typeMap.get(call.receiver);
+                const typeName = typeEntry
+                    ? typeof typeEntry === 'string'
+                        ? typeEntry
+                        : typeEntry.type
+                    : null;
+                if (typeName) {
+                    chaTargets = resolveChaTargets(typeName, call.name, chaCtx, lookup);
+                }
+            }
+            for (const t of chaTargets) {
+                const edgeKey = `${caller.id}|${t.id}`;
+                if (t.id !== caller.id && !seenCallEdges.has(edgeKey) && !ptsEdgeRows.has(edgeKey)) {
+                    const conf = computeConfidence(relPath, t.file, null) - CHA_DISPATCH_PENALTY;
+                    if (conf > 0) {
+                        seenCallEdges.add(edgeKey);
+                        allEdgeRows.push([caller.id, t.id, 'calls', conf, 0, 'cha']);
+                    }
+                }
+            }
         }
     }
 }
@@ -485,7 +1219,7 @@ function buildClassHierarchyEdges(ctx, relPath, symbols, allEdgeRows) {
             const targetRows = (ctx.nodesByName.get(cls.extends) || []).filter((n) => EXTENDS_TARGET_KINDS.has(n.kind));
             if (sourceRow) {
                 for (const t of targetRows) {
-                    allEdgeRows.push([sourceRow.id, t.id, 'extends', 1.0, 0]);
+                    allEdgeRows.push([sourceRow.id, t.id, 'extends', 1.0, 0, null]);
                 }
             }
         }
@@ -494,12 +1228,46 @@ function buildClassHierarchyEdges(ctx, relPath, symbols, allEdgeRows) {
             const targetRows = (ctx.nodesByName.get(cls.implements) || []).filter((n) => IMPLEMENTS_TARGET_KINDS.has(n.kind));
             if (sourceRow) {
                 for (const t of targetRows) {
-                    allEdgeRows.push([sourceRow.id, t.id, 'implements', 1.0, 0]);
+                    allEdgeRows.push([sourceRow.id, t.id, 'implements', 1.0, 0, null]);
                 }
             }
         }
     }
 }
+// ── Native bulk-insert technique back-fill ──────────────────────────────
+/**
+ * After native bulkInsertEdges (which does not write the technique column),
+ * apply technique values from the in-memory row array back to the DB.
+ *
+ * Rows with an explicit technique get a targeted UPDATE by (source_id, target_id).
+ * The catch-all 'ts-native' tag is scoped to only the source_ids present in this
+ * batch — this prevents mis-tagging pre-migration NULL-technique edges from
+ * unchanged files that were never purged and re-inserted.
+ */
+function applyEdgeTechniquesAfterNativeInsert(db, rows) {
+    const callRows = rows.filter((r) => r[2] === 'calls');
+    if (callRows.length === 0)
+        return;
+    const taggedRows = callRows.filter((r) => r[5] != null);
+    // Collect distinct source IDs for this batch so the catch-all UPDATE is scoped
+    // to edges inserted in the current run, not the entire table.
+    const sourceIds = [...new Set(callRows.map((r) => r[0]))];
+    // Chunk to stay within SQLite's SQLITE_LIMIT_VARIABLE_NUMBER (999 on older builds).
+    const CHUNK_SIZE = 500;
+    const tx = db.transaction(() => {
+        if (taggedRows.length > 0) {
+            const stmt = db.prepare("UPDATE edges SET technique = ? WHERE kind = 'calls' AND source_id = ? AND target_id = ? AND technique IS NULL");
+            for (const r of taggedRows)
+                stmt.run(r[5], r[0], r[1]);
+        }
+        for (let i = 0; i < sourceIds.length; i += CHUNK_SIZE) {
+            const chunk = sourceIds.slice(i, i + CHUNK_SIZE);
+            const placeholders = chunk.map(() => '?').join(',');
+            db.prepare(`UPDATE edges SET technique = 'ts-native' WHERE kind = 'calls' AND technique IS NULL AND source_id IN (${placeholders})`).run(...chunk);
+        }
+    });
+    tx();
+}
 // ── Reverse-dep edge reconnection (#932, #933) ─────────────────────────
 /**
  * Reconnect edges that were saved before changed-file purge.
@@ -523,6 +1291,7 @@ function reconnectReverseDepEdges(ctx) {
                 saved.edgeKind,
                 saved.confidence,
                 saved.dynamic,
+                saved.technique,
             ]);
         }
         else {
@@ -543,6 +1312,9 @@ function reconnectReverseDepEdges(ctx) {
             if (!ok) {
                 batchInsertEdges(db, reconnectedRows);
             }
+            else {
+                applyEdgeTechniquesAfterNativeInsert(db, reconnectedRows);
+            }
         }
         else {
             batchInsertEdges(db, reconnectedRows);
@@ -624,7 +1396,21 @@ export async function buildEdges(ctx) {
     setupNodeLookups(ctx, allNodesBefore);
     addLazyFallback(ctx, scopedLoad);
     const t0 = performance.now();
+    // Enrich typeMap for .ts/.tsx files using the TypeScript compiler API.
+    // Runs before call-edge construction so the accurate types are available
+    // for method-call resolution. Gated on config so users can opt out.
+    if (ctx.config.build.typescriptResolver) {
+        await enrichTypeMapWithTsc(ctx.rootDir, ctx.fileSymbols);
+    }
     const native = engineName === 'native' ? loadNative() : null;
+    // Phase 8.2: Augment typeMaps with cross-file return-type propagation before
+    // the transaction opens. This is pure in-memory mutation (no DB I/O) and must
+    // run outside the transaction to avoid leaving ctx.fileSymbols in a partial
+    // state if the transaction rolls back unexpectedly.
+    propagateReturnTypesAcrossFiles(ctx.fileSymbols, ctx, ctx.rootDir);
+    // Phase 8.5: Build CHA context after propagation so typeMap confidence values
+    // (used for RTA seeding) reflect any cross-file propagated types.
+    const chaCtx = buildChaContext(ctx.fileSymbols);
     // Phase 1: Compute edges inside a better-sqlite3 transaction.
     // Barrel-edge deletion lives here so that the JS path (which also inserts
     // edges in this transaction) keeps deletion + insertion atomic.
@@ -668,9 +1454,36 @@ export async function buildEdges(ctx) {
             (ctx.isFullBuild || ctx.fileSymbols.size > ctx.config.build.smallFilesThreshold);
         if (useNativeCallEdges) {
             buildCallEdgesNative(ctx, getNodeIdStmt, allEdgeRows, allNodesBefore, native);
+            // Build the shared lookup once — both pts post-passes use it, avoiding
+            // redundant construction of the same context closure.
+            const sharedLookup = makeContextLookup(ctx, getNodeIdStmt);
+            // Phase 8.3c post-pass: augment native call edges with parameter-flow pts
+            // edges. The native Rust engine has no knowledge of paramBindings, so any
+            // `fn()` call inside a higher-order function would be missed. This JS pass
+            // runs on top of the native edges and adds only the pts-resolved edges that
+            // the native engine could not produce.
+            buildParamFlowPtsPostPass(ctx, getNodeIdStmt, allEdgeRows, sharedLookup);
+            // bind/alias post-pass: augment native call edges with fnRefBindings-seeded
+            // pts edges. The native Rust engine has no knowledge of JS fnRefBindings
+            // (e.g. `const f = fn.bind(ctx)`), so calls to bind-created aliases are
+            // not resolved to their original function on the native path.
+            buildFnRefBindingsPtsPostPass(ctx, getNodeIdStmt, allEdgeRows, sharedLookup);
+            // this-rebinding post-pass: resolve `this()` calls inside functions that
+            // were invoked via `.call(namedCtx, ...)` / `.apply(namedCtx, ...)`.
+            buildThisCallBindingsPtsPostPass(ctx, getNodeIdStmt, allEdgeRows, sharedLookup);
+            // Phase 8.3f post-pass: augment native call edges with object rest-param
+            // receiver resolution — typeMap[restName] → argName → typeMap[argName.method].
+            buildObjectRestParamPostPass(ctx, getNodeIdStmt, allEdgeRows, sharedLookup);
+            // Object.defineProperty accessor post-pass: resolve this-dispatch inside
+            // getter/setter functions registered via Object.defineProperty.
+            buildDefinePropertyPostPass(ctx, getNodeIdStmt, allEdgeRows, sharedLookup);
+            // Phase 8.5 post-pass: augment native call edges with CHA-resolved dispatch.
+            // The native Rust engine has no knowledge of the CHA context, so this/self
+            // calls and interface dispatch are not expanded to concrete implementations.
+            buildChaPostPass(ctx, getNodeIdStmt, allEdgeRows, chaCtx);
         }
         else {
-            buildCallEdgesJS(ctx, getNodeIdStmt, allEdgeRows);
+            buildCallEdgesJS(ctx, getNodeIdStmt, allEdgeRows, chaCtx);
         }
         // When using native edge insert, skip JS insert here — do it after tx commits.
         // Otherwise insert edges within this transaction for atomicity.
@@ -696,6 +1509,9 @@ export async function buildEdges(ctx) {
             debug('Native bulkInsertEdges failed — falling back to JS batchInsertEdges');
             batchInsertEdges(ctx.db, allEdgeRows);
         }
+        else {
+            applyEdgeTechniquesAfterNativeInsert(ctx.db, allEdgeRows);
+        }
     }
     // Phase 3: Reconnect saved reverse-dep edges (#932, #933).
     // When the WASM/JS path purged changed files, edges FROM reverse-dep files TO
@@ -705,6 +1521,12 @@ export async function buildEdges(ctx) {
     if (ctx.savedReverseDepEdges.length > 0) {
         reconnectReverseDepEdges(ctx);
     }
+    // Phase 4: CHA post-pass — expand virtual-dispatch edges for class hierarchies
+    // and interface implementations. Runs after all call + hierarchy edges are
+    // committed so the DB is consistent.
+    // Note: the native orchestrator success path runs this independently in
+    // tryNativeOrchestrator; this phase covers the WASM and native-fallback paths.
+    runChaPostPass(db);
     ctx.timing.edgesMs = performance.now() - t0;
 }
 //# sourceMappingURL=build-edges.js.map