fix: resolve merge conflicts with feat/prototype-resolver-1317 (round 2)

Author: carlos-alm

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

@@ -805,7 +805,6 @@ function serializeExtractorOutput(
     dataflow: symbols.dataflow,
     astNodes,
     ...(symbols.fnRefBindings?.length ? { fnRefBindings: symbols.fnRefBindings } : {}),
-    ...(symbols.paramBindings?.length ? { paramBindings: symbols.paramBindings } : {}),
     ...(symbols.arrayElemBindings?.length ? { arrayElemBindings: symbols.arrayElemBindings } : {}),
     ...(symbols.spreadArgBindings?.length ? { spreadArgBindings: symbols.spreadArgBindings } : {}),
     ...(symbols.forOfBindings?.length ? { forOfBindings: symbols.forOfBindings } : {}),

src/domain/wasm-worker-entry.ts

@@ -107,7 +107,6 @@ function deserializeResult(ser: SerializedExtractorOutput | null): ExtractorOutp
   // visitor output is cast the same way.
   if (ser.astNodes !== undefined) out.astNodes = ser.astNodes as unknown as ASTNodeRow[];
   if (ser.fnRefBindings?.length) out.fnRefBindings = ser.fnRefBindings;
-  if (ser.paramBindings?.length) out.paramBindings = ser.paramBindings;
   if (ser.arrayElemBindings?.length) out.arrayElemBindings = ser.arrayElemBindings;
   if (ser.spreadArgBindings?.length) out.spreadArgBindings = ser.spreadArgBindings;
   if (ser.forOfBindings?.length) out.forOfBindings = ser.forOfBindings;

src/domain/wasm-worker-pool.ts

@@ -19,7 +19,6 @@ import type {
   Export,
   Import,
   LanguageId,
-  ParamBinding,
   TypeMapEntry,
 } from '../types.js';
 
@@ -65,7 +64,6 @@ export interface SerializedExtractorOutput {
     receiver?: string;
   }>;
   fnRefBindings?: import('../types.js').FnRefBinding[];
-  paramBindings?: ParamBinding[];
   arrayElemBindings?: import('../types.js').ArrayElemBinding[];
   spreadArgBindings?: import('../types.js').SpreadArgBinding[];
   forOfBindings?: import('../types.js').ForOfBinding[];

src/domain/wasm-worker-protocol.ts

@@ -1240,6 +1240,8 @@ export interface BuildResult {
     edgesMs: number;
     structureMs: number;
     rolesMs: number;
+    /** Wall-clock time for the this/super dispatch WASM post-pass (native path only). */
+    thisDispatchMs?: number;
     astMs: number;
     complexityMs: number;
     cfgMs: number;

src/types.ts

@@ -119,53 +119,34 @@ describe.each(ENGINES)('Phase 8.5 CHA dispatch (%s)', (engine) => {
   });
 
   // ── this-dispatch ──────────────────────────────────────────────────────
-  // The WASM path resolves `this.prepare()` through the class hierarchy via
-  // the inline CHA dispatch in buildFileCallEdges.
-  //
-  // The native orchestrator path does not persist raw call sites (with receiver
-  // info) to the DB after the Rust pipeline runs, so this-dispatch and
-  // super-dispatch cannot be resolved via runPostNativeCha.
-  // Tracked as a native accuracy gap in issue #1326.
 
-  if (engine === 'native') {
-    it.todo(
-      'this-dispatch: emits ConcreteWorker.doWork → ConcreteWorker.prepare (native gap #1326)',
+  it('this-dispatch: emits ConcreteWorker.doWork → ConcreteWorker.prepare', () => {
+    const edge = callEdges.find(
+      (e) =>
+        e.caller_name === 'ConcreteWorker.doWork' &&
+        e.callee_name === 'ConcreteWorker.prepare' &&
+        e.callee_file === 'ConcreteWorker.ts',
     );
-  } else {
-    it('this-dispatch: emits ConcreteWorker.doWork → ConcreteWorker.prepare', () => {
-      const edge = callEdges.find(
-        (e) =>
-          e.caller_name === 'ConcreteWorker.doWork' &&
-          e.callee_name === 'ConcreteWorker.prepare' &&
-          e.callee_file === 'ConcreteWorker.ts',
-      );
-      expect(
-        edge,
-        `Expected ConcreteWorker.doWork → ConcreteWorker.prepare edge (this-dispatch).\nActual edges:\n${JSON.stringify(callEdges, null, 2)}`,
-      ).toBeDefined();
-    });
-  }
+    expect(
+      edge,
+      `Expected ConcreteWorker.doWork → ConcreteWorker.prepare edge (this-dispatch).\nActual edges:\n${JSON.stringify(callEdges, null, 2)}`,
+    ).toBeDefined();
+  });
 
   // ── super-dispatch ─────────────────────────────────────────────────────
-  // Same native gap: super.speak() requires raw call-site receiver info not
-  // persisted to the DB by the Rust pipeline. See issue #1326.
 
-  if (engine === 'native') {
-    it.todo('super-dispatch: emits Lion.speak → Animal.speak (native gap #1326)');
-  } else {
-    it('super-dispatch: emits Lion.speak → Animal.speak', () => {
-      const edge = callEdges.find(
-        (e) =>
-          e.caller_name === 'Lion.speak' &&
-          e.callee_name === 'Animal.speak' &&
-          e.callee_file === 'Animal.ts',
-      );
-      expect(
-        edge,
-        `Expected Lion.speak → Animal.speak edge (super-dispatch via class hierarchy).\nActual edges:\n${JSON.stringify(callEdges, null, 2)}`,
-      ).toBeDefined();
-    });
-  }
+  it('super-dispatch: emits Lion.speak → Animal.speak', () => {
+    const edge = callEdges.find(
+      (e) =>
+        e.caller_name === 'Lion.speak' &&
+        e.callee_name === 'Animal.speak' &&
+        e.callee_file === 'Animal.ts',
+    );
+    expect(
+      edge,
+      `Expected Lion.speak → Animal.speak edge (super-dispatch via class hierarchy).\nActual edges:\n${JSON.stringify(callEdges, null, 2)}`,
+    ).toBeDefined();
+  });
 
   // ── transitive multi-level CHA (issue #1311) ───────────────────────────
   // Hierarchy: IJob → AbstractJob (non-instantiated) → PrintJob / ScanJob

tests/integration/phase-8.5-cha-dispatch.test.ts

@@ -908,4 +908,29 @@ describe('JavaScript parser', () => {
       );
     });
   });
+
+  describe('Phase 8.3e: extractSpreadForOfWalk — exported arrow function funcStack (#1354)', () => {
+    it('tracks plain const arrow function on funcStack for for-of loop', () => {
+      const symbols = parseJS(`const f = (arr) => { for (const x of arr) x(); };`);
+      expect(symbols.forOfBindings).toContainEqual(expect.objectContaining({ enclosingFunc: 'f' }));
+    });
+
+    it('tracks exported const arrow function on funcStack for for-of loop', () => {
+      const symbols = parseJS(`export const f = (arr) => { for (const x of arr) x(); };`);
+      expect(symbols.forOfBindings).toContainEqual(expect.objectContaining({ enclosingFunc: 'f' }));
+    });
+
+    it('records correct varName and sourceName for exported arrow for-of', () => {
+      const symbols = parseJS(
+        `export const handleItems = (items) => { for (const cb of items) cb(); };`,
+      );
+      expect(symbols.forOfBindings).toContainEqual(
+        expect.objectContaining({
+          varName: 'cb',
+          sourceName: 'items',
+          enclosingFunc: 'handleItems',
+        }),
+      );
+    });
+  });
 });