@optave/codegraph 3.12.0 → 3.15.0

package/src/domain/graph/builder/stages/build-edges.ts

@@ -11,16 +11,26 @@ 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 { TS_NATIVE_CONFIDENCE_FLOOR } from '../../../../shared/constants.js';
 import type {
+  ArrayCallbackBinding,
+  ArrayElemBinding,
   BetterSqlite3Database,
   Call,
   ClassRelation,
   Definition,
+  DynamicKind,
   ExtractorOutput,
   FnRefBinding,
+  ForOfBinding,
   Import,
   NativeAddon,
   NodeRow,
+  ObjectPropBinding,
+  ObjectRestParamBinding,
+  ParamBinding,
+  SpreadArgBinding,
+  ThisCallBinding,
   TypeMapEntry,
 } from '../../../../types.js';
 import { computeConfidence } from '../../resolve.js';
@@ -37,12 +47,19 @@ import {
 import type { ChaContext } from '../cha.js';
 import { buildChaContext, resolveChaTargets, resolveThisDispatch } from '../cha.js';
 import type { PipelineContext } from '../context.js';
-import { BUILTIN_RECEIVERS, batchInsertEdges, runChaPostPass } from '../helpers.js';
+import {
+  BUILTIN_RECEIVERS,
+  batchInsertEdges,
+  CHA_DISPATCH_PENALTY,
+  CHA_TYPED_DISPATCH_CONFIDENCE,
+  runChaPostPass,
+} from '../helpers.js';
 import { getResolved, isBarrelFile, resolveBarrelExportCached } from './resolve-imports.js';
 
 // ── Local types ──────────────────────────────────────────────────────────
 
-type EdgeRowTuple = [number, number, string, number, number, string | null];
+type EdgeRowTuple = [number, number, string, number, number, string | null, string | null];
+//                   src    tgt    kind   conf   dyn   technique             dynamic_kind
 
 interface NodeIdStmt {
   get(name: string, kind: string, file: string, line: number): { id: number } | undefined;
@@ -61,13 +78,27 @@ interface QueryNodeRow {
 interface NativeFileEntry {
   file: string;
   fileNodeId: number;
-  definitions: Array<{ name: string; kind: string; line: number; endLine: number | null }>;
+  definitions: Array<{
+    name: string;
+    kind: string;
+    line: number;
+    endLine: number | null;
+    params?: string[];
+  }>;
   calls: Call[];
   importedNames: Array<{ name: string; file: string }>;
   classes: ClassRelation[];
   typeMap: Array<{ name: string; typeName: string; confidence: number }>;
   /** Phase 8.3: function-reference bindings for pts analysis. */
   fnRefBindings?: Array<{ lhs: string; rhs: string; rhsReceiver?: string }>;
+  paramBindings?: ParamBinding[];
+  thisCallBindings?: ThisCallBinding[];
+  arrayElemBindings?: ArrayElemBinding[];
+  spreadArgBindings?: SpreadArgBinding[];
+  forOfBindings?: ForOfBinding[];
+  arrayCallbackBindings?: ArrayCallbackBinding[];
+  objectRestParamBindings?: ObjectRestParamBinding[];
+  objectPropBindings?: ObjectPropBinding[];
 }
 
 /** Shape returned by native buildCallEdges. */
@@ -77,11 +108,9 @@ interface NativeEdge {
   kind: string;
   confidence: number;
   dynamic: number;
+  dynamic_kind?: string | null;
 }
 
-/** Phase 8.5: confidence penalty applied to CHA-dispatch edges. */
-export const CHA_DISPATCH_PENALTY = 0.1;
-
 // ── Node lookup setup ───────────────────────────────────────────────────
 
 function makeGetNodeIdStmt(db: BetterSqlite3Database): NodeIdStmt {
@@ -138,7 +167,7 @@ function emitTypeOnlySymbolEdges(
     }
     const candidates = ctx.nodesByNameAndFile.get(`${cleanName}|${targetFile}`);
     if (candidates && candidates.length > 0) {
-      allEdgeRows.push([fileNodeId, candidates[0]!.id, 'imports-type', 1.0, 0, null]);
+      allEdgeRows.push([fileNodeId, candidates[0]!.id, 'imports-type', 1.0, 0, null, null]);
     }
   }
 }
@@ -160,7 +189,7 @@ function emitEdgesForImport(
   if (!targetRow) return;
 
   const edgeKind = importEdgeKind(imp);
-  allEdgeRows.push([fileNodeId, targetRow.id, edgeKind, 1.0, 0, null]);
+  allEdgeRows.push([fileNodeId, targetRow.id, edgeKind, 1.0, 0, null, null]);
 
   if (imp.typeOnly) {
     emitTypeOnlySymbolEdges(ctx, imp, resolvedPath, fileNodeId, allEdgeRows);
@@ -215,7 +244,7 @@ function buildBarrelEdges(
             : edgeKind === 'dynamic-imports'
               ? 'dynamic-imports'
               : 'imports';
-        edgeRows.push([fileNodeId, actualRow.id, kind, 0.9, 0, null]);
+        edgeRows.push([fileNodeId, actualRow.id, kind, 0.9, 0, null, null]);
       }
     }
   }
@@ -398,7 +427,7 @@ function buildImportEdgesNative(
   ) as NativeEdge[];
 
   for (const e of nativeEdges) {
-    allEdgeRows.push([e.sourceId, e.targetId, e.kind, e.confidence, e.dynamic, null]);
+    allEdgeRows.push([e.sourceId, e.targetId, e.kind, e.confidence, e.dynamic, null, null]);
   }
 }
 
@@ -509,17 +538,35 @@ function buildCallEdgesNative(
     nativeFiles.push({
       file: relPath,
       fileNodeId: fileNodeRow.id,
-      definitions: symbols.definitions.map((d) => ({
-        name: d.name,
-        kind: d.kind,
-        line: d.line,
-        endLine: d.endLine ?? null,
-      })),
+      definitions: symbols.definitions.map((d) => {
+        const params = d.children?.filter((c) => c.kind === 'parameter').map((c) => c.name);
+        return {
+          name: d.name,
+          kind: d.kind,
+          line: d.line,
+          endLine: d.endLine ?? null,
+          params: params?.length ? params : undefined,
+        };
+      }),
       calls: symbols.calls,
       importedNames,
       classes: symbols.classes,
       typeMap,
       fnRefBindings: symbols.fnRefBindings?.length ? symbols.fnRefBindings : undefined,
+      paramBindings: symbols.paramBindings?.length ? symbols.paramBindings : undefined,
+      thisCallBindings: symbols.thisCallBindings?.length ? symbols.thisCallBindings : undefined,
+      arrayElemBindings: symbols.arrayElemBindings?.length ? symbols.arrayElemBindings : undefined,
+      spreadArgBindings: symbols.spreadArgBindings?.length ? symbols.spreadArgBindings : undefined,
+      forOfBindings: symbols.forOfBindings?.length ? symbols.forOfBindings : undefined,
+      arrayCallbackBindings: symbols.arrayCallbackBindings?.length
+        ? symbols.arrayCallbackBindings
+        : undefined,
+      objectRestParamBindings: symbols.objectRestParamBindings?.length
+        ? symbols.objectRestParamBindings
+        : undefined,
+      objectPropBindings: symbols.objectPropBindings?.length
+        ? symbols.objectPropBindings
+        : undefined,
     });
   }
 
@@ -534,367 +581,11 @@ function buildCallEdgesNative(
       e.confidence,
       e.dynamic,
       e.kind === 'calls' ? 'ts-native' : null,
+      e.dynamic_kind ?? 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: PipelineContext,
-  getNodeIdStmt: NodeIdStmt,
-  allEdgeRows: EdgeRowTuple[],
-  sharedLookup?: CallNodeLookup,
-): void {
-  // 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<string>();
-  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: Map<string, TypeMapEntry | string> = 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 as Map<string, unknown>,
-      );
-      if (targets.length > 0) continue;
-
-      for (const alias of resolveViaPointsTo(scopedKey, ptsMap)) {
-        const { targets: aliasTargets, importedFrom: aliasFrom } = resolveCallTargets(
-          lookup,
-          { name: alias },
-          relPath,
-          importedNames,
-          typeMap as Map<string, unknown>,
-        );
-        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: PipelineContext,
-  getNodeIdStmt: NodeIdStmt,
-  allEdgeRows: EdgeRowTuple[],
-  sharedLookup?: CallNodeLookup,
-): void {
-  // 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<string>();
-  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: Map<string, TypeMapEntry | string> = 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 as Map<string, unknown>,
-      );
-      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 as Map<string, unknown>,
-        );
-        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: PipelineContext,
-  getNodeIdStmt: NodeIdStmt,
-  allEdgeRows: EdgeRowTuple[],
-  sharedLookup?: CallNodeLookup,
-): void {
-  const filesWithBindings = [...ctx.fileSymbols].filter(
-    ([, symbols]) => symbols.thisCallBindings && symbols.thisCallBindings.length > 0,
-  );
-  if (filesWithBindings.length === 0) return;
-
-  const seenByPair = new Set<string>();
-  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: Map<string, TypeMapEntry | string> = 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 as Map<string, unknown>,
-        );
-        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: PipelineContext,
-  getNodeIdStmt: NodeIdStmt,
-  allEdgeRows: EdgeRowTuple[],
-  sharedLookup?: CallNodeLookup,
-): void {
-  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<string>();
-  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: Map<string, TypeMapEntry | string> = 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<string, Set<string>>();
-    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<string>();
-    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 as Map<string, unknown>,
-        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.
  *
@@ -975,7 +666,7 @@ function buildDefinePropertyPostPass(
           const conf = computeConfidence(relPath, t.file, null);
           if (conf > 0) {
             seenByPair.add(edgeKey);
-            allEdgeRows.push([caller.id, t.id, 'calls', conf, 0, 'ts-native']);
+            allEdgeRows.push([caller.id, t.id, 'calls', conf, 0, 'ts-native', null]);
           }
         }
       }
@@ -988,11 +679,11 @@ function buildDefinePropertyPostPass(
  *
  * 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.
+ * implementations.  This JS post-pass runs after the native edges 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.
+ * Seeds seenByPair from the current allEdgeRows snapshot to avoid duplicating
+ * edges the native engine already produced.
  */
 function buildChaPostPass(
   ctx: PipelineContext,
@@ -1026,6 +717,7 @@ function buildChaPostPass(
 
       const caller = findCaller(lookup, call, symbols.definitions, relPath, fileNodeRow);
       let chaTargets: ReadonlyArray<{ id: number; file: string }> = [];
+      let isTypedReceiverDispatch = false;
 
       if (call.receiver === 'this' || call.receiver === 'self' || call.receiver === 'super') {
         chaTargets = resolveThisDispatch(
@@ -1034,6 +726,7 @@ function buildChaPostPass(
           call.receiver,
           chaCtx,
           lookup,
+          relPath,
         );
       } else {
         const typeEntry = typeMap.get(call.receiver);
@@ -1044,16 +737,26 @@ function buildChaPostPass(
           : null;
         if (typeName) {
           chaTargets = resolveChaTargets(typeName, call.name, chaCtx, lookup);
+          isTypedReceiverDispatch = true;
         }
       }
 
       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;
+          // Typed-receiver (interface/CHA) dispatch: use CHA_TYPED_DISPATCH_CONFIDENCE
+          // — file proximity is not meaningful for virtual dispatch confidence.
+          // this/super dispatch keeps computeConfidence-based proximity scoring to
+          // match runPostNativeThisDispatch (native-orchestrator.ts).
+          const conf = isTypedReceiverDispatch
+            ? CHA_TYPED_DISPATCH_CONFIDENCE
+            : computeConfidence(relPath, t.file, null) - CHA_DISPATCH_PENALTY;
           if (conf > 0) {
             seenByPair.add(edgeKey);
-            allEdgeRows.push([caller.id, t.id, 'calls', conf, 0, 'cha']);
+            // Tag super-dispatch edges distinctly so runChaPostPass can exclude them
+            // from further CHA expansion (super calls are not virtual dispatch).
+            const technique = call.receiver === 'super' ? 'super-dispatch' : 'cha';
+            allEdgeRows.push([caller.id, t.id, 'calls', conf, 0, technique, null]);
           }
         }
       }
@@ -1141,6 +844,16 @@ function buildCallEdgesJS(
 
     const seenCallEdges = new Set<string>();
     const ptsMap = buildPointsToMapForFile(symbols, importedNames);
+    // Build the import-artifact name set: importedNames plus CJS require bindings.
+    // Used only by resolveReceiverEdge to distinguish local definitions from CJS
+    // import shadows — does NOT affect call-target resolution or DB edges (#1661).
+    const importArtifactNames = buildImportArtifactNames(
+      importedNames,
+      symbols,
+      ctx,
+      relPath,
+      rootDir,
+    );
 
     buildFileCallEdges(
       relPath,
@@ -1153,6 +866,7 @@ function buildCallEdgesJS(
       typeMap,
       ptsMap,
       chaCtx,
+      importArtifactNames,
     );
     buildClassHierarchyEdges(ctx, relPath, symbols, allEdgeRows);
   }
@@ -1197,6 +911,38 @@ function buildImportedNamesMap(
   return importedNames;
 }
 
+/**
+ * Build a map of all names that are import artifacts in this file — includes
+ * both ES module imports (already in importedNames) and CJS require destructuring
+ * bindings (`const { X } = require('./path')`). Used exclusively by resolveReceiverEdge
+ * to classify same-file function-kind nodes as import artifacts vs. local definitions.
+ * Does NOT affect call resolution or DB edge creation (#1661).
+ */
+function buildImportArtifactNames(
+  importedNames: Map<string, string>,
+  symbols: ExtractorOutput,
+  ctx: PipelineContext,
+  relPath: string,
+  rootDir: string,
+): ReadonlyMap<string, string> {
+  if (!symbols.cjsRequireBindings?.length) return importedNames;
+  const combined = new Map(importedNames);
+  const traceBarrel = (resolvedPath: string, cleanName: string): string => {
+    if (!isBarrelFile(ctx, resolvedPath)) return resolvedPath;
+    const actual = resolveBarrelExportCached(ctx, resolvedPath, cleanName);
+    return actual ?? resolvedPath;
+  };
+  for (const binding of symbols.cjsRequireBindings) {
+    const resolvedPath = getResolved(ctx, path.join(rootDir, relPath), binding.source);
+    for (const name of binding.names) {
+      if (!combined.has(name)) {
+        combined.set(name, traceBarrel(resolvedPath, name));
+      }
+    }
+  }
+  return combined;
+}
+
 function makeContextLookup(ctx: PipelineContext, getNodeIdStmt: NodeIdStmt): CallNodeLookup {
   return {
     byNameAndFile: (name, file) => ctx.nodesByNameAndFile.get(`${name}|${file}`) ?? [],
@@ -1293,6 +1039,509 @@ function buildDefinitionParamsMap(
   return map;
 }
 
+// ── Per-call resolution helpers ─────────────────────────────────────────
+
+/**
+ * Resolve targets for a single call site with all JS-path fallbacks applied.
+ *
+ * Runs in order:
+ *   1. Primary resolution via `resolveCallTargets` (importedNames + typeMap).
+ *   2. Same-class `this.method()` fallback (non-super receivers only).
+ *   3. Same-class bare-call fallback for non-JS/TS class-scoped languages.
+ *   4. Object.defineProperty accessor fallback (this-calls inside getter/setter).
+ *
+ * Returns the resolved targets array and the importedFrom hint for confidence scoring.
+ */
+function resolveFallbackTargets(
+  call: Call,
+  caller: { id: number; callerName: string | null },
+  relPath: string,
+  importedNames: Map<string, string>,
+  lookup: CallNodeLookup,
+  typeMap: Map<string, TypeMapEntry | string>,
+  definePropertyReceivers: Map<string, string> | undefined,
+): {
+  targets: ReadonlyArray<{ id: number; file: string; kind?: string }>;
+  importedFrom: string | null | undefined;
+} {
+  // RES-4: Kotlin member callable reference — `Greeter::greet` emits
+  // { name: 'greet', receiver: 'Greeter', dynamicKind: 'reflection' }.
+  // The receiver is the class qualifier (not a typeMap variable), so
+  // resolveCallTargets would find a same-named top-level function via
+  // byNameAndFile('greet', relPath) before the qualified form is tried.
+  // Prefer `Greeter.greet` in the same file first; fall through to the
+  // normal path only when no qualified match exists.
+  let preQualifiedTargets: ReadonlyArray<{ id: number; file: string; kind?: string }> = [];
+  if (
+    call.dynamicKind === 'reflection' &&
+    call.receiver &&
+    !call.keyExpr &&
+    !isModuleScopedLanguage(relPath)
+  ) {
+    preQualifiedTargets = lookup
+      .byNameAndFile(`${call.receiver}.${call.name}`, relPath)
+      .filter((n) => n.kind === 'method' || n.kind === 'function');
+  }
+
+  let { targets, importedFrom } =
+    preQualifiedTargets.length > 0
+      ? {
+          targets: preQualifiedTargets as Array<{ id: number; file: string; kind?: string }>,
+          importedFrom: undefined as string | undefined,
+        }
+      : resolveCallTargets(
+          lookup,
+          call,
+          relPath,
+          importedNames,
+          typeMap as Map<string, unknown>,
+          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 qualified = lookup
+        .byNameAndFile(`${className}.${call.name}`, 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 qualified = lookup
+        .byNameAndFile(`${className}.${call.name}`, relPath)
+        .filter((n) => n.kind === 'method');
+      if (qualified.length > 0) targets = qualified;
+    }
+  }
+
+  // RES-3: reflection with literal method name — JVM getMethod("name") / invokeMethod("name").
+  // Java/Scala/Groovy methods are stored as class-qualified names (e.g. Reflection.greet),
+  // so lookup.byNameAndFile('greet', relPath) finds nothing. When dynamicKind='reflection'
+  // and keyExpr is set (a string-literal method name was captured), try the qualified form:
+  //   1. typeMap[receiver] → resolvedType → lookup `resolvedType.keyExpr` (type-annotated local)
+  //   2. callerName class prefix → `CallerClass.keyExpr` (same-class sibling, e.g. Groovy obj)
+  // Scoped to non-JS/TS files to avoid interfering with the JS reflection path.
+  if (
+    targets.length === 0 &&
+    call.dynamicKind === 'reflection' &&
+    call.keyExpr &&
+    call.receiver &&
+    !isModuleScopedLanguage(relPath)
+  ) {
+    const typeEntry = typeMap.get(call.receiver);
+    const resolvedType = typeEntry
+      ? typeof typeEntry === 'string'
+        ? typeEntry
+        : (typeEntry as { type?: string }).type
+      : null;
+    if (resolvedType) {
+      const qualified = lookup
+        .byNameAndFile(`${resolvedType}.${call.keyExpr}`, relPath)
+        .filter((n) => n.kind === 'method' || n.kind === 'function');
+      if (qualified.length > 0) targets = qualified;
+    }
+    if (targets.length === 0 && caller.callerName != null) {
+      const lastDot = caller.callerName.lastIndexOf('.');
+      if (lastDot > 0) {
+        const prevDot = caller.callerName.lastIndexOf('.', lastDot - 1);
+        const callerClass = caller.callerName.slice(prevDot + 1, lastDot);
+        const qualified = lookup
+          .byNameAndFile(`${callerClass}.${call.keyExpr}`, relPath)
+          .filter((n) => n.kind === 'method' || n.kind === 'function');
+        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 &&
+    definePropertyReceivers
+  ) {
+    const receiverVarName = definePropertyReceivers.get(caller.callerName);
+    if (receiverVarName) {
+      const typeEntry = typeMap.get(receiverVarName);
+      const typeName = typeEntry
+        ? typeof typeEntry === 'string'
+          ? typeEntry
+          : (typeEntry as { type?: string }).type
+        : null;
+      if (typeName) {
+        const qualified = lookup.byNameAndFile(`${typeName}.${call.name}`, 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];
+      }
+    }
+  }
+
+  return { targets, importedFrom };
+}
+
+/**
+ * Emit direct-call edges for the resolved targets of a single call site.
+ *
+ * Sorts targets by confidence descending first, then for each target:
+ *   - Skips self-edges and already-seen edges.
+ *   - If a pts edge already exists for this pair, upgrades it in-place to
+ *     direct-call confidence and promotes to seenCallEdges.
+ *   - If a dyn=0 edge already exists and the incoming call has an explicit
+ *     dynamicKind (e.g. 'reflection' for bare decorators), upgrades the
+ *     existing row to dyn=1 in-place so the semantic classification wins.
+ *   - Otherwise records a new `calls` edge with `ts-native` technique.
+ */
+function emitDirectCallEdgesForCall(
+  caller: { id: number },
+  targets: ReadonlyArray<{ id: number; file: string }>,
+  importedFrom: string | null | undefined,
+  isDynamic: number,
+  hasDynamicKind: boolean,
+  relPath: string,
+  seenCallEdges: Set<string>,
+  ptsEdgeRows: Map<string, number>,
+  allEdgeRows: EdgeRowTuple[],
+  dynZeroEdgeRows?: Map<string, number>,
+): void {
+  // Sort targets by confidence descending before emitting edges.
+  // For multi-target calls with duplicate (source_id, target_id) pairs the
+  // stored confidence depends on which duplicate is processed last — sorting
+  // here guarantees the highest-confidence target wins on dedup, matching the
+  // native engine's sort_targets_by_confidence call in build_edges.rs.
+  const sorted =
+    targets.length > 1
+      ? [...targets].sort(
+          (a, b) =>
+            computeConfidence(relPath, b.file, importedFrom ?? null) -
+            computeConfidence(relPath, a.file, importedFrom ?? null),
+        )
+      : targets;
+
+  for (const t of sorted) {
+    const edgeKey = `${caller.id}|${t.id}`;
+    if (t.id === caller.id) continue;
+    const confidence = computeConfidence(relPath, t.file, importedFrom ?? null);
+    if (seenCallEdges.has(edgeKey)) {
+      // Edge already emitted. If the incoming call carries an explicit semantic
+      // dynamic classification (dynamicKind set — e.g. 'reflection' for bare
+      // decorators) and the existing edge was recorded with dyn=0, upgrade it
+      // in-place so the more specific classification wins.
+      // Generic dynamic=true without dynamicKind (alias/callback calls) does
+      // NOT override dyn=0 to avoid false positives on f.call/f.bind patterns.
+      if (isDynamic === 1 && hasDynamicKind && dynZeroEdgeRows) {
+        const dynZeroIdx = dynZeroEdgeRows.get(edgeKey);
+        if (dynZeroIdx !== undefined) {
+          const row = allEdgeRows[dynZeroIdx];
+          if (row) row[4] = 1;
+          dynZeroEdgeRows.delete(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);
+      const newIdx = allEdgeRows.length;
+      allEdgeRows.push([caller.id, t.id, 'calls', confidence, isDynamic, 'ts-native', null]);
+      // Track dyn=0 edges so a later dyn=1+dynamicKind call for the same pair
+      // can upgrade them (e.g. bare decorator after call-expression decorator).
+      if (isDynamic === 0 && dynZeroEdgeRows) {
+        dynZeroEdgeRows.set(edgeKey, newIdx);
+      }
+    }
+  }
+}
+
+/**
+ * Phase 8.3 / 8.3c / bind: emit pts-resolved edges for unresolved no-receiver 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 so case (c) only fires for genuine
+ *       bind/alias entries and never for self-seeded local definitions.
+ *
+ * Pts edges are added to ptsEdgeRows (not seenCallEdges) so that a later
+ * direct call to the same target can upgrade confidence rather than being
+ * silently dropped by the dedup guard.
+ */
+function emitPtsNoReceiverEdges(
+  call: Call,
+  caller: { id: number; callerName: string | null },
+  isDynamic: number,
+  relPath: string,
+  importedNames: Map<string, string>,
+  lookup: CallNodeLookup,
+  typeMap: Map<string, TypeMapEntry | string>,
+  ptsMap: PointsToMap,
+  fnRefBindingLhs: Set<string>,
+  seenCallEdges: Set<string>,
+  ptsEdgeRows: Map<string, number>,
+  allEdgeRows: EdgeRowTuple[],
+): void {
+  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 (
+    !(
+      call.dynamic ||
+      (scopedPtsKey != null && ptsMap.has(scopedPtsKey)) ||
+      modulePtsKey != null ||
+      flatPtsKey != null
+    )
+  )
+    return;
+
+  const ptsLookupName = call.dynamic
+    ? call.name
+    : scopedPtsKey != null && ptsMap.has(scopedPtsKey)
+      ? scopedPtsKey
+      : modulePtsKey != null
+        ? modulePtsKey
+        : // flatPtsKey != null is guaranteed: 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 as Map<string, unknown>,
+    );
+    const sortedAliasTargets =
+      aliasTargets.length > 1
+        ? [...aliasTargets].sort(
+            (a, b) =>
+              computeConfidence(relPath, b.file, aliasFrom ?? null) -
+              computeConfidence(relPath, a.file, aliasFrom ?? null),
+          )
+        : aliasTargets;
+    for (const t of sortedAliasTargets) {
+      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', null]);
+        }
+      }
+    }
+  }
+}
+
+/**
+ * Phase 8.3f: emit pts-resolved edges for unresolved 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).
+ */
+function emitPtsReceiverEdges(
+  call: Call,
+  caller: { id: number; callerName: string | null },
+  isDynamic: number,
+  relPath: string,
+  importedNames: Map<string, string>,
+  lookup: CallNodeLookup,
+  typeMap: Map<string, TypeMapEntry | string>,
+  ptsMap: PointsToMap,
+  seenCallEdges: Set<string>,
+  ptsEdgeRows: Map<string, number>,
+  allEdgeRows: EdgeRowTuple[],
+): void {
+  const receiverKey = `${call.receiver}.${call.name}`;
+  if (!ptsMap.has(receiverKey)) return;
+
+  for (const alias of resolveViaPointsTo(receiverKey, ptsMap)) {
+    const { targets: aliasTargets, importedFrom: aliasFrom } = resolveCallTargets(
+      lookup,
+      { name: alias },
+      relPath,
+      importedNames,
+      typeMap as Map<string, unknown>,
+    );
+    const sortedAliasTargets =
+      aliasTargets.length > 1
+        ? [...aliasTargets].sort(
+            (a, b) =>
+              computeConfidence(relPath, b.file, aliasFrom ?? null) -
+              computeConfidence(relPath, a.file, aliasFrom ?? null),
+          )
+        : aliasTargets;
+    for (const t of sortedAliasTargets) {
+      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', null]);
+        }
+      }
+    }
+  }
+}
+
+/**
+ * Phase 8.5: emit CHA + RTA dispatch edges for a single call site.
+ *
+ * For `this`/`self`/`super` calls: resolve through the class hierarchy.
+ * For typed receiver calls: expand to all instantiated concrete implementations.
+ */
+function emitChaCallEdgesForCall(
+  call: Call,
+  caller: { id: number; callerName: string | null },
+  relPath: string,
+  typeMap: Map<string, TypeMapEntry | string>,
+  lookup: CallNodeLookup,
+  chaCtx: ChaContext,
+  seenCallEdges: Set<string>,
+  ptsEdgeRows: Map<string, number>,
+  allEdgeRows: EdgeRowTuple[],
+): void {
+  let chaTargets: ReadonlyArray<{ id: number; file: string }> = [];
+  let isTypedReceiverDispatch = false;
+
+  if (call.receiver === 'this' || call.receiver === 'self' || call.receiver === 'super') {
+    chaTargets = resolveThisDispatch(
+      call.name,
+      caller.callerName,
+      call.receiver,
+      chaCtx,
+      lookup,
+      relPath,
+    );
+  } else if (!BUILTIN_RECEIVERS.has(call.receiver!)) {
+    const typeEntry = typeMap.get(call.receiver!);
+    const typeName = typeEntry
+      ? typeof typeEntry === 'string'
+        ? typeEntry
+        : (typeEntry as { type?: string }).type
+      : null;
+    if (typeName) {
+      chaTargets = resolveChaTargets(typeName, call.name, chaCtx, lookup);
+      isTypedReceiverDispatch = true;
+    }
+  }
+
+  for (const t of chaTargets) {
+    const edgeKey = `${caller.id}|${t.id}`;
+    if (t.id !== caller.id && !seenCallEdges.has(edgeKey) && !ptsEdgeRows.has(edgeKey)) {
+      // Typed-receiver (interface/CHA) dispatch: use CHA_TYPED_DISPATCH_CONFIDENCE
+      // — file proximity is not meaningful for virtual dispatch confidence.
+      // this/super dispatch keeps computeConfidence-based proximity scoring to
+      // match runPostNativeThisDispatch (native-orchestrator.ts).
+      const conf = isTypedReceiverDispatch
+        ? CHA_TYPED_DISPATCH_CONFIDENCE
+        : computeConfidence(relPath, t.file, null) - CHA_DISPATCH_PENALTY;
+      if (conf > 0) {
+        seenCallEdges.add(edgeKey);
+        allEdgeRows.push([caller.id, t.id, 'calls', conf, 0, 'cha', null]);
+      }
+    }
+  }
+}
+
+/**
+ * Dynamic kinds that cannot be resolved statically — emit a sink edge to the
+ * file node instead of silently dropping the call site.  confidence=0.0 keeps
+ * these below DEFAULT_MIN_CONFIDENCE so they never appear in normal query results.
+ * Includes reflection so that Reflect.apply/getMethod/callable-ref calls whose
+ * target is not found in the codebase still produce a visible sink edge.
+ */
+const FLAG_ONLY_KINDS: ReadonlySet<DynamicKind> = new Set([
+  'eval',
+  'computed-key',
+  'reflection',
+  'unresolved-dynamic',
+]);
+
+/**
+ * Build call edges for all calls in a single file (WASM/JS engine path).
+ *
+ * Iterates over `symbols.calls` and dispatches each call through the full
+ * JS resolution cascade:
+ *   1. `resolveFallbackTargets`  — primary + class-fallback + defineProperty fallback
+ *   2. `emitDirectCallEdgesForCall` — emit direct-call edges (upgrading any pts pair)
+ *   3. `emitPtsNoReceiverEdges`  — Phase 8.3/8.3c pts fallback for no-receiver calls
+ *   4. `emitPtsReceiverEdges`    — Phase 8.3f pts fallback for rest-param receiver calls
+ *   5. Inline `resolveReceiverEdge` — emit `receiver` edge for external receivers
+ *   6. `emitChaCallEdgesForCall` — Phase 8.5 CHA + RTA dispatch expansion
+ *   7. Sink edge for flag-only dynamic kinds (eval, computed-key, reflection, unresolved-dynamic)
+ */
 function buildFileCallEdges(
   relPath: string,
   symbols: ExtractorOutput,
@@ -1304,6 +1553,7 @@ function buildFileCallEdges(
   typeMap: Map<string, TypeMapEntry | string>,
   ptsMap?: PointsToMap | null,
   chaCtx?: ChaContext,
+  importArtifactNames?: ReadonlyMap<string, string>,
 ): void {
   // 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
@@ -1312,6 +1562,12 @@ function buildFileCallEdges(
   // no longer tracked here.
   const ptsEdgeRows = new Map<string, number>();
 
+  // Tracks direct-call edges emitted with dyn=0 (edgeKey → allEdgeRows index).
+  // When a later call to the same target has dyn=1 (e.g. a bare decorator `@Log`
+  // processed after the call-expression `@Log()` in the query path), the existing
+  // dyn=0 row is upgraded in-place so the more specific dynamic classification wins.
+  const dynZeroEdgeRows = new Map<string, number>();
+
   // 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
@@ -1323,205 +1579,51 @@ function buildFileCallEdges(
 
     const caller = findCaller(lookup, call, symbols.definitions, relPath, fileNodeRow);
     const isDynamic: number = call.dynamic ? 1 : 0;
-    let { targets, importedFrom } = resolveCallTargets(
-      lookup,
+
+    // Step 1: Resolve targets with all JS-path fallbacks.
+    const { targets, importedFrom } = resolveFallbackTargets(
       call,
+      caller,
       relPath,
       importedNames,
-      typeMap as Map<string, unknown>,
-      caller.callerName,
+      lookup,
+      typeMap,
+      symbols.definePropertyReceivers,
     );
 
-    // 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 as { type?: string }).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) {
-        const confidence = computeConfidence(relPath, t.file, importedFrom ?? null);
-        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']);
-        }
-      }
-    }
+    // Step 2: Emit direct-call edges (upgrades any pending pts edge in-place).
+    emitDirectCallEdgesForCall(
+      caller,
+      targets,
+      importedFrom,
+      isDynamic,
+      !!call.dynamicKind,
+      relPath,
+      seenCallEdges,
+      ptsEdgeRows,
+      allEdgeRows,
+      dynZeroEdgeRows,
+    );
 
-    // 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 as Map<string, unknown>,
-        );
-        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']);
-            }
-          }
-        }
-      }
+    // Step 3: Phase 8.3/8.3c pts fallback for unresolved no-receiver calls.
+    if (targets.length === 0 && !call.receiver && ptsMap) {
+      emitPtsNoReceiverEdges(
+        call,
+        caller,
+        isDynamic,
+        relPath,
+        importedNames,
+        lookup,
+        typeMap,
+        ptsMap,
+        fnRefBindingLhs,
+        seenCallEdges,
+        ptsEdgeRows,
+        allEdgeRows,
+      );
     }
 
-    // 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).
+    // Step 4: Phase 8.3f pts fallback for unresolved receiver calls (rest params).
     if (
       targets.length === 0 &&
       call.receiver &&
@@ -1531,31 +1633,22 @@ function buildFileCallEdges(
       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 as Map<string, unknown>,
-          );
-          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']);
-              }
-            }
-          }
-        }
-      }
+      emitPtsReceiverEdges(
+        call,
+        caller,
+        isDynamic,
+        relPath,
+        importedNames,
+        lookup,
+        typeMap,
+        ptsMap,
+        seenCallEdges,
+        ptsEdgeRows,
+        allEdgeRows,
+      );
     }
 
+    // Step 5: Emit receiver edge for external (non-this/self/super) receivers.
     if (
       call.receiver &&
       !BUILTIN_RECEIVERS.has(call.receiver) &&
@@ -1570,46 +1663,45 @@ function buildFileCallEdges(
         relPath,
         typeMap as Map<string, unknown>,
         seenCallEdges,
+        importArtifactNames ?? importedNames,
       );
       if (recv) {
-        allEdgeRows.push([recv.callerId, recv.receiverId, 'receiver', recv.confidence, 0, null]);
+        allEdgeRows.push([
+          recv.callerId,
+          recv.receiverId,
+          'receiver',
+          recv.confidence,
+          0,
+          null,
+          null,
+        ]);
       }
     }
 
-    // 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.
+    // Step 6: Phase 8.5 CHA + RTA dispatch expansion.
     if (chaCtx && call.receiver) {
-      let chaTargets: ReadonlyArray<{ id: number; file: string }> = [];
-      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 as { type?: string }).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']);
-          }
-        }
+      emitChaCallEdgesForCall(
+        call,
+        caller,
+        relPath,
+        typeMap,
+        lookup,
+        chaCtx,
+        seenCallEdges,
+        ptsEdgeRows,
+        allEdgeRows,
+      );
+    }
+
+    // Step 7: Flag-only dynamic kinds with no resolved target → sink edge to the
+    // file node.  confidence=0.0 keeps it below DEFAULT_MIN_CONFIDENCE so it never
+    // appears in normal query results, but is queryable via `codegraph roles --dynamic`.
+    if (targets.length === 0 && call.dynamicKind && FLAG_ONLY_KINDS.has(call.dynamicKind)) {
+      // Key per (caller, file, kind) so each kind gets at most one sink edge per caller.
+      const sinkKey = `${caller.id}:${fileNodeRow.id}:${call.dynamicKind}`;
+      if (!seenCallEdges.has(sinkKey)) {
+        seenCallEdges.add(sinkKey);
+        allEdgeRows.push([caller.id, fileNodeRow.id, 'calls', 0.0, 1, null, call.dynamicKind]);
       }
     }
   }
@@ -1637,7 +1729,7 @@ function buildClassHierarchyEdges(
       );
       if (sourceRow) {
         for (const t of targetRows) {
-          allEdgeRows.push([sourceRow.id, t.id, 'extends', 1.0, 0, null]);
+          allEdgeRows.push([sourceRow.id, t.id, 'extends', 1.0, 0, null, null]);
         }
       }
     }
@@ -1651,7 +1743,7 @@ function buildClassHierarchyEdges(
       );
       if (sourceRow) {
         for (const t of targetRows) {
-          allEdgeRows.push([sourceRow.id, t.id, 'implements', 1.0, 0, null]);
+          allEdgeRows.push([sourceRow.id, t.id, 'implements', 1.0, 0, null, null]);
         }
       }
     }
@@ -1662,7 +1754,8 @@ function buildClassHierarchyEdges(
 
 /**
  * After native bulkInsertEdges (which does not write the technique column),
- * apply technique values from the in-memory row array back to the DB.
+ * apply technique values from the in-memory row array back to the DB, and lift
+ * any resolved ts-native edge below TS_NATIVE_CONFIDENCE_FLOOR to that floor.
  *
  * 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
@@ -1683,6 +1776,9 @@ function applyEdgeTechniquesAfterNativeInsert(
   // Chunk to stay within SQLite's SQLITE_LIMIT_VARIABLE_NUMBER (999 on older builds).
   const CHUNK_SIZE = 500;
 
+  // Rows that carry an explicit dynamic_kind (sink edges for flagged dynamic calls).
+  const dynamicKindRows = callRows.filter((r) => r[6] != null);
+
   const tx = db.transaction(() => {
     if (taggedRows.length > 0) {
       const stmt = db.prepare(
@@ -1696,6 +1792,27 @@ function applyEdgeTechniquesAfterNativeInsert(
       db.prepare(
         `UPDATE edges SET technique = 'ts-native' WHERE kind = 'calls' AND technique IS NULL AND source_id IN (${placeholders})`,
       ).run(...chunk);
+      // Lift resolved ts-native edges below the confidence floor for this chunk.
+      db.prepare(
+        `UPDATE edges SET confidence = ?
+         WHERE kind = 'calls' AND technique = 'ts-native'
+           AND confidence > 0 AND confidence < ?
+           AND source_id IN (${placeholders})`,
+      ).run(TS_NATIVE_CONFIDENCE_FLOOR, TS_NATIVE_CONFIDENCE_FLOOR, ...chunk);
+    }
+    // Back-fill dynamic_kind for flagged sink edges emitted by the native engine.
+    // Native bulkInsertEdges uses INSERT OR IGNORE and does not write dynamic_kind, so
+    // this UPDATE is the only way to set it for natively-inserted sink edges.
+    //
+    // Scope to confidence=0.0 AND dynamic=1 so we only touch sink edges (never normal
+    // call edges that happen to share the same (source_id, target_id) pair).
+    // Include dynamic_kind in the WHERE so two sink edges from the same caller to the
+    // same file with different kinds don't clobber each other across incremental runs.
+    if (dynamicKindRows.length > 0) {
+      const stmt = db.prepare(
+        "UPDATE edges SET dynamic_kind = ? WHERE kind = 'calls' AND source_id = ? AND target_id = ? AND confidence = 0.0 AND dynamic = 1 AND (dynamic_kind IS NULL OR dynamic_kind = ?)",
+      );
+      for (const r of dynamicKindRows) stmt.run(r[6], r[0], r[1], r[6]);
     }
   });
   tx();
@@ -1734,6 +1851,7 @@ function reconnectReverseDepEdges(ctx: PipelineContext): void {
         saved.confidence,
         saved.dynamic,
         saved.technique,
+        saved.dynamicKind ?? null,
       ]);
     } else {
       // Target was removed or renamed in the changed file — edge is stale
@@ -1775,7 +1893,7 @@ function reconnectReverseDepEdges(ctx: PipelineContext): void {
  * their import targets. Falls back to loading ALL nodes for full builds or
  * larger incremental changes.
  */
-const NODE_KIND_FILTER_SQL = `kind IN ('function','method','class','interface','struct','type','module','enum','trait','record','constant')`;
+const NODE_KIND_FILTER_SQL = `kind IN ('function','method','class','interface','struct','type','module','enum','trait','record','constant','variable')`;
 
 function loadNodes(ctx: PipelineContext): { rows: QueryNodeRow[]; scoped: boolean } {
   const { db, fileSymbols, isFullBuild, batchResolved } = ctx;
@@ -1858,7 +1976,16 @@ export async function buildEdges(ctx: PipelineContext): Promise<void> {
   // 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) {
+  //
+  // Skip for small incremental builds: TypeScript program creation requires
+  // loading the entire tsconfig file list (~700ms startup on the codegraph
+  // corpus), which dominates the 1-file rebuild time. Native engine bypasses
+  // this entirely via the Rust orchestrator; WASM/JS engines need this gate
+  // to match native's effective behaviour on tiny incremental changes.
+  // Mirrors the smallFilesThreshold gates for nativeDb and native call-edges.
+  const isSmallIncremental =
+    !ctx.isFullBuild && ctx.fileSymbols.size <= ctx.config.build.smallFilesThreshold;
+  if (ctx.config.build.typescriptResolver && !isSmallIncremental) {
     await enrichTypeMapWithTsc(ctx.rootDir, ctx.fileSymbols);
   }
 
@@ -1921,26 +2048,12 @@ export async function buildEdges(ctx: PipelineContext): Promise<void> {
       (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.
+      // The native engine receives all pts bindings (paramBindings,
+      // fnRefBindings, thisCallBindings, objectRestParamBindings, …) through
+      // NativeFileEntry and runs the same points-to solver as the JS path, so
+      // no pts post-passes are needed here. Only capabilities that remain
+      // JS-only run as post-passes below.
       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);
@@ -1952,6 +2065,24 @@ export async function buildEdges(ctx: PipelineContext): Promise<void> {
       buildCallEdgesJS(ctx, getNodeIdStmt, allEdgeRows, chaCtx);
     }
 
+    // Apply ts-native confidence floor to allEdgeRows in-memory.  The proximity
+    // heuristic returns 0.3 for cross-module calls with no import-path evidence,
+    // but both WASM and native engines perform actual name-based symbol lookup,
+    // which is stronger evidence than pure proximity.  Clamping to
+    // TS_NATIVE_CONFIDENCE_FLOOR (0.5) avoids unfairly dragging down the
+    // call-confidence metric.  Sink edges (confidence = 0.0) are excluded so
+    // they remain below DEFAULT_MIN_CONFIDENCE.
+    for (const r of allEdgeRows) {
+      if (
+        r[2] === 'calls' &&
+        r[5] === 'ts-native' &&
+        (r[3] as number) > 0 &&
+        (r[3] as number) < TS_NATIVE_CONFIDENCE_FLOOR
+      ) {
+        r[3] = TS_NATIVE_CONFIDENCE_FLOOR;
+      }
+    }
+
     // When using native edge insert, skip JS insert here — do it after tx commits.
     // Otherwise insert edges within this transaction for atomicity.
     const useNativeEdgeInsert = ctx.engineName === 'native' && !!ctx.nativeDb?.bulkInsertEdges;