fix: resolve merge conflicts with main

Author: carlos-alm

.claude/skills/resolve/SKILL.md

@@ -672,9 +672,9 @@ fn is_top_level_binding_kind(kind: &str) -> bool {
 /// Two-pass strategy (mirrors the updated `findCaller` in call-resolver.ts):
 ///   Pass 1 — narrowest enclosing function/method.  Local variable declarations
 ///             inside a function body must not shadow the enclosing function.
-///   Pass 2 — narrowest enclosing variable/constant binding.  Used as fallback
-///             when no function/method encloses the call (e.g. Haskell top-level
-///             `main = do …` is a `bind` node with kind `variable`).
+///   Pass 2 — widest (outermost) enclosing variable/constant binding.  Used as
+///             fallback when no function/method encloses the call (e.g. Haskell
+///             top-level `main = do …` is a `bind` node with kind `variable`).
 ///
 /// Returns `(caller_id, caller_name)` — `caller_name` is `""` when the call
 /// falls back to file scope.
@@ -765,20 +765,21 @@ fn resolve_call_targets<'a>(
         // Phase 8.3f: callee-scoped rest-param key (`callee::restName`) avoids
         // same-name rest-binding collisions across functions in the same file (#1358).
         let rest_param_key = format!("{}::{}", caller_name, effective_receiver);
-        // Class-scoped key (`ClassName.prop`) seeded by `this.prop = new Ctor()`
-        // property writes — prevents false edges when multiple classes define the
-        // same property name (issue #1323). Only consulted for `this.` receivers.
+        // Class-scoped key (`ClassName.prop`) seeded by `this.prop = new Ctor()` and
+        // field annotations — prevents false edges when multiple classes define the same
+        // property name (issues #1323, #1458). Consulted first for `this.` receivers so
+        // bare fallback keys (confidence 0.6) don't shadow the correct per-class entry.
         let class_scoped_key = if receiver.starts_with("this.") && !caller_name.is_empty() {
             caller_name
                 .rfind('.')
                 .map(|dot| format!("{}.{}", &caller_name[..dot], effective_receiver))
         } else {
             None
         };
-        let type_lookup = type_map.get(effective_receiver)
+        let type_lookup = class_scoped_key.as_deref().and_then(|k| type_map.get(k))
+            .or_else(|| type_map.get(effective_receiver))
             .or_else(|| type_map.get(receiver.as_str()))
-            .or_else(|| if caller_name.is_empty() { None } else { type_map.get(rest_param_key.as_str()) })
-            .or_else(|| class_scoped_key.as_deref().and_then(|k| type_map.get(k)));
+            .or_else(|| if caller_name.is_empty() { None } else { type_map.get(rest_param_key.as_str()) });
         // Inline new-expression receiver: `(new Foo).bar()` — extract the constructor name
         // when no typeMap entry exists for the complex receiver expression.
         // Mirrors the regex `/^\(?\s*new\s+([A-Z_$][A-Za-z0-9_$]*)/` in call-resolver.ts.

crates/codegraph-core/src/domain/graph/builder/stages/build_edges.rs

@@ -398,6 +398,10 @@ fn infer_address_of_composite(
     type_map: &mut Vec<TypeMapEntry>,
 ) -> bool {
     if rhs.kind() != "unary_expression" { return false; }
+    // Verify the operator is `&` — guards against any other unary operator
+    // applied to a composite literal on a raw AST.
+    let Some(op_node) = rhs.child(0) else { return false };
+    if node_text(&op_node, source) != "&" { return false; }
     // The operand of `&` is a composite_literal.
     let Some(operand) = rhs.child_by_field_name("operand") else { return false };
     if operand.kind() != "composite_literal" { return false; }

crates/codegraph-core/src/extractors/go.rs

@@ -2975,6 +2975,15 @@ mod tests {
         JsExtractor.extract(&tree, code.as_bytes(), "test.js")
     }
 
+    fn parse_ts(code: &str) -> FileSymbols {
+        let mut parser = Parser::new();
+        parser
+            .set_language(&tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into())
+            .unwrap();
+        let tree = parser.parse(code.as_bytes(), None).unwrap();
+        JsExtractor.extract(&tree, code.as_bytes(), "test.ts")
+    }
+
     #[test]
     fn finds_function_declaration() {
         let s = parse_js("function greet(name) { return name; }");
@@ -3598,6 +3607,38 @@ mod tests {
         assert_eq!(tm.unwrap().type_name, "HttpClient");
     }
 
+    /// Issue #1458: two classes with identically-named field annotations must
+    /// produce separate class-scoped typeMap keys, not overwrite each other.
+    /// Mirrors the TS `prevents cross-class collision` test.
+    #[test]
+    fn field_annotation_multi_class_seeds_separate_scoped_keys() {
+        let s = parse_ts(
+            "class OrderService {\n\
+               private repo: OrderRepository;\n\
+             }\n\
+             class UserService {\n\
+               private repo: UserRepository;\n\
+             }",
+        );
+        let order_entry = s.type_map.iter().find(|t| t.name == "OrderService.repo");
+        assert!(
+            order_entry.is_some(),
+            "type_map should contain 'OrderService.repo'; got: {:?}",
+            s.type_map.iter().map(|e| &e.name).collect::<Vec<_>>()
+        );
+        assert_eq!(order_entry.unwrap().type_name, "OrderRepository");
+        assert_eq!(order_entry.unwrap().confidence, 0.9);
+
+        let user_entry = s.type_map.iter().find(|t| t.name == "UserService.repo");
+        assert!(
+            user_entry.is_some(),
+            "type_map should contain 'UserService.repo'; got: {:?}",
+            s.type_map.iter().map(|e| &e.name).collect::<Vec<_>>()
+        );
+        assert_eq!(user_entry.unwrap().type_name, "UserRepository");
+        assert_eq!(user_entry.unwrap().confidence, 0.9);
+    }
+
     /// Issue #1453 (edge 4): `const f = fn.bind(ctx)` must record a
     /// fnRefBinding f → fn so later `f()` calls resolve through pts.
     #[test]

crates/codegraph-core/src/extractors/javascript.rs

@@ -147,22 +147,25 @@ export function resolveByMethodOrGlobal(
     const effectiveReceiver = call.receiver.startsWith('this.')
       ? call.receiver.slice('this.'.length)
       : call.receiver;
-    // For this.prop receivers, also try the class-scoped key (ClassName.prop) seeded by
-    // handlePropWriteTypeMap — prevents false edges when multiple classes define the same
-    // property name (issue #1323).
-    let typeEntry =
-      typeMap.get(effectiveReceiver) ??
-      typeMap.get(call.receiver) ??
-      // Phase 8.3f: callee-scoped rest-param key (`callee::restName`) to avoid
-      // same-name rest-binding collision across functions in the same file (#1358).
-      (callerName ? typeMap.get(`${callerName}::${effectiveReceiver}`) : undefined);
-    if (!typeEntry && call.receiver.startsWith('this.') && callerName) {
+    // For this.prop receivers, prefer the class-scoped key (ClassName.prop) seeded by
+    // handlePropWriteTypeMap / handleFieldDefTypeMap — prevents false edges when multiple
+    // classes define the same property name (issues #1323, #1458).
+    // Class-scoped lookup runs first so bare fallback keys (confidence 0.6) don't shadow
+    // the correct per-class entry when callerName is available.
+    let typeEntry: unknown;
+    if (call.receiver.startsWith('this.') && callerName) {
       const dotIdx = callerName.lastIndexOf('.');
       if (dotIdx > -1) {
         const callerClass = callerName.slice(0, dotIdx);
         typeEntry = typeMap.get(`${callerClass}.${effectiveReceiver}`);
       }
     }
+    typeEntry ??=
+      typeMap.get(effectiveReceiver) ??
+      typeMap.get(call.receiver) ??
+      // Phase 8.3f: callee-scoped rest-param key (`callee::restName`) to avoid
+      // same-name rest-binding collision across functions in the same file (#1358).
+      (callerName ? typeMap.get(`${callerName}::${effectiveReceiver}`) : undefined);
     let typeName = typeEntry
       ? typeof typeEntry === 'string'
         ? typeEntry

src/domain/graph/builder/call-resolver.ts

@@ -48,6 +48,13 @@ export const BUILTIN_RECEIVERS: Set<string> = new Set([
   'require',
 ]);
 
+/** Phase 8.5: confidence penalty applied to CHA-dispatch edges. */
+export const CHA_DISPATCH_PENALTY = 0.1;
+/** Phase 8.5: fixed confidence for typed-receiver (interface/CHA) dispatch edges.
+ *  File proximity is not meaningful for virtual dispatch — all three engine paths
+ *  (WASM inline, WASM post-pass, native post-pass) must agree on this value. */
+export const CHA_TYPED_DISPATCH_CONFIDENCE = 0.8;
+
 /** Check if a directory entry should be skipped (ignored dirs, dotfiles). */
 function shouldSkipEntry(entry: fs.Dirent, extraIgnore: Set<string> | null): boolean {
   if (entry.name.startsWith('.') && entry.name !== '.') {
@@ -361,6 +368,9 @@ export function batchInsertEdges(db: BetterSqlite3Database, rows: unknown[][]):
   }
 }
 
+/** Confidence assigned to CHA-expanded interface/abstract dispatch edges. */
+export const CHA_DISPATCH_CONFIDENCE = 0.8;
+
 /**
  * CHA (Class Hierarchy Analysis) post-pass.
  *
@@ -514,7 +524,14 @@ export function runChaPostPass(db: BetterSqlite3Database): number {
             const key = `${source_id}|${methodNode.id}`;
             if (seen.has(key)) continue;
             seen.add(key);
-            newEdges.push([source_id, methodNode.id, 'calls', 0.8, 0, 'cha']);
+            newEdges.push([
+              source_id,
+              methodNode.id,
+              'calls',
+              CHA_TYPED_DISPATCH_CONFIDENCE,
+              0,
+              'cha',
+            ]);
           }
         }
 

src/domain/graph/builder/helpers.ts

@@ -45,7 +45,13 @@ 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 ──────────────────────────────────────────────────────────
@@ -101,9 +107,6 @@ interface NativeEdge {
   dynamic: number;
 }
 
-/** 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 {
@@ -735,13 +738,12 @@ function buildChaPostPass(
       for (const t of chaTargets) {
         const edgeKey = `${caller.id}|${t.id}`;
         if (t.id !== caller.id && !seenByPair.has(edgeKey)) {
-          // Typed-receiver (interface/CHA) dispatch: use the same hardcoded 0.8 that
-          // runChaPostPass (helpers.ts) and runPostNativeCha (native-orchestrator.ts)
-          // use — file proximity is not meaningful for virtual dispatch confidence.
+          // 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
-            ? 0.8
+            ? CHA_TYPED_DISPATCH_CONFIDENCE
             : computeConfidence(relPath, t.file, null) - CHA_DISPATCH_PENALTY;
           if (conf > 0) {
             seenByPair.add(edgeKey);
@@ -1327,13 +1329,12 @@ function buildFileCallEdges(
       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 the same hardcoded 0.8 that
-          // runChaPostPass (helpers.ts) and runPostNativeCha (native-orchestrator.ts)
-          // use — file proximity is not meaningful for virtual dispatch confidence.
+          // 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 line 906).
+          // match runPostNativeThisDispatch (native-orchestrator.ts).
           const conf = isTypedReceiverDispatch
-            ? 0.8
+            ? CHA_TYPED_DISPATCH_CONFIDENCE
             : computeConfidence(relPath, t.file, null) - CHA_DISPATCH_PENALTY;
           if (conf > 0) {
             seenCallEdges.add(edgeKey);

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

@@ -49,13 +49,14 @@ import type { PipelineContext } from '../context.js';
 import {
   batchInsertEdges,
   batchInsertNodes,
+  CHA_DISPATCH_PENALTY,
+  CHA_TYPED_DISPATCH_CONFIDENCE,
   collectFiles as collectFilesUtil,
   fileHash,
   fileStat,
   readFileSafe,
 } from '../helpers.js';
 import { NativeDbProxy } from '../native-db-proxy.js';
-import { CHA_DISPATCH_PENALTY } from './build-edges.js';
 import { closeNativeDb } from './native-db-lifecycle.js';
 
 // ── Native orchestrator types ──────────────────────────────────────────
@@ -570,8 +571,8 @@ function runPostNativeCha(
   }
 
   // Find existing call edges targeting qualified methods (e.g., 'IWorker.doWork').
-  // Include the caller node's file so confidence can be computed file-pair-aware,
-  // matching the WASM path's computeConfidence(callerFile, targetFile, null) - CHA_DISPATCH_PENALTY formula.
+  // Include caller_file and method_file so affectedFiles can be populated for
+  // incremental role reclassification; confidence uses CHA_TYPED_DISPATCH_CONFIDENCE matching runChaPostPass.
   // When scopeToChangedFiles is true, restrict to call sites in the changed files
   // (safe because no hierarchy or RTA evidence changed outside those files).
   let callToMethods: Array<{ source_id: number; method_name: string; caller_file: string | null }>;
@@ -667,10 +668,7 @@ function runPostNativeCha(
             const key = `${source_id}|${methodNode.id}`;
             if (seen.has(key)) continue;
             seen.add(key);
-            // Use the same hardcoded 0.8 that runChaPostPass (helpers.ts) uses for
-            // DB-level CHA dispatch edges. This aligns the native orchestrator path
-            // with the WASM and hybrid paths, which both go through runChaPostPass.
-            const conf = 0.8;
+            const conf = CHA_TYPED_DISPATCH_CONFIDENCE;
             newEdges.push([source_id, methodNode.id, 'calls', conf, 0, 'cha']);
             newEdgeCount++;
             if (caller_file) affectedFiles.add(caller_file);

src/domain/graph/builder/stages/native-orchestrator.ts

@@ -229,6 +229,10 @@ function handleCppDeclaration(node: TreeSitterNode, ctx: ExtractorOutput): void
     } else if (kind === 'identifier') {
       nameNode = child;
     }
+    // Note: pointer_declarator / reference_declarator children (e.g. `UserService *svc;`)
+    // are intentionally skipped here — they are also skipped by the native Rust
+    // match_c_family_type_map helper, which only handles 'init_declarator' and
+    // 'identifier' children. Both engines have the same scope for this case.
     if (!nameNode) continue;
     const varName = unwrapCppDeclaratorName(nameNode);
     if (varName) {

src/extractors/cpp.ts

@@ -229,6 +229,10 @@ function handleCudaDeclaration(node: TreeSitterNode, ctx: ExtractorOutput): void
     } else if (kind === 'identifier') {
       nameNode = child;
     }
+    // Note: pointer_declarator / reference_declarator children (e.g. `UserService *svc;`)
+    // are intentionally skipped here — they are also skipped by the native Rust
+    // match_c_family_type_map helper, which only handles 'init_declarator' and
+    // 'identifier' children. Both engines have the same scope for this case.
     if (!nameNode) continue;
     const varName = extractCudaFieldName(nameNode);
     if (varName) {