@codeyam/codeyam-cli 0.1.0-staging.76566f9 → 0.1.0-staging.790201e

package/packages/analyze/src/lib/files/scenarios/mergeInDependentDataStructure.js

@@ -1,5 +1,6 @@
 import { splitOutsideParenthesesAndArrays, joinParenthesesAndArrays, } from "../../../../../../packages/ai/index.js";
 import { cleanKnownObjectFunctionsFromMapping } from "../../../../../../packages/ai/index.js";
+import { transformationTracer } from "./TransformationTracer.js";
 function cleanFunctionName(functionName) {
     return functionName?.split('<')[0];
 }
@@ -24,6 +25,50 @@ function getTypeParameter(functionName) {
     }
     return null;
 }
+// Primitive types that should not have child paths
+const PRIMITIVE_TYPES = new Set([
+    'number',
+    'string',
+    'boolean',
+    'null',
+    'undefined',
+]);
+// Check if a type string represents a primitive type
+// Handles union types like "string | undefined" or "number | null"
+function isPrimitiveType(typeStr) {
+    if (PRIMITIVE_TYPES.has(typeStr)) {
+        return true;
+    }
+    // Check union types - if ALL parts of the union are primitives, it's primitive
+    // e.g., "string | undefined" -> ["string", "undefined"] -> both are primitive -> true
+    // e.g., "object | null" -> ["object", "null"] -> object is not primitive -> false
+    if (typeStr.includes('|')) {
+        const parts = typeStr.split('|').map((p) => p.trim());
+        return parts.every((part) => PRIMITIVE_TYPES.has(part));
+    }
+    return false;
+}
+// Extract signature index from a path like "signature[0]" or "signature[0].foo"
+// Returns the index number or undefined if not a signature path
+function extractSignatureIndex(path) {
+    const match = path.match(/^signature\[(\d+)\]/);
+    return match ? parseInt(match[1], 10) : undefined;
+}
+// Check if a new schema path would go through a primitive type
+// e.g., if schema has 'entities[].scenarioCount': 'number', then
+// 'entities[].scenarioCount.sha' would go through a primitive and should be rejected
+function wouldGoThroughPrimitive(newPath, schema) {
+    const pathParts = splitOutsideParenthesesAndArrays(newPath);
+    // Check each prefix of the path (excluding the full path itself)
+    for (let i = 1; i < pathParts.length; i++) {
+        const prefixPath = joinParenthesesAndArrays(pathParts.slice(0, i));
+        const prefixType = schema[prefixPath];
+        if (prefixType && isPrimitiveType(prefixType)) {
+            return true;
+        }
+    }
+    return false;
+}
 // Check if schemaPathPart matches or is a function call variant of pathPart
 // e.g., 'isEntityBeingAnalyzed(entity.sha)' matches 'isEntityBeingAnalyzed'
 function pathPartMatches(pathPart, schemaPathPart) {
@@ -39,11 +84,13 @@ function pathPartMatches(pathPart, schemaPathPart) {
 function bestValueFromOptions(options) {
     options = options.filter(Boolean);
     const known = options.find((o) => !o.includes('unknown'));
-    if (known)
+    if (known) {
         return known;
+    }
     const notUnknown = options.find((o) => o !== 'unknown');
-    if (notUnknown)
+    if (notUnknown) {
         return notUnknown;
+    }
     return options[0] ?? 'unknown';
 }
 export default function mergeInDependentDataStructure({ importedExports, dependentAnalyses, rootScopeName, dataStructure, dependencySchemas, }) {
@@ -88,8 +135,32 @@ export default function mergeInDependentDataStructure({ importedExports, depende
         }
     }
     let equivalentSchemaPaths = [];
+    // O(1) index for findOrCreateEquivalentSchemaPathsEntry.
+    // Maps "(rootPath)::(normalizedFuncName)" → the entry containing that root.
+    // This replaces the O(E) linear search that was causing O(E²) gather performance.
+    const espIndex = new Map();
+    const espIndexKey = (path, functionName) => {
+        const normalized = cleanFunctionName(functionName);
+        const funcKey = normalized === rootScopeName ? '__self__' : normalized || '__self__';
+        return `${path}::${funcKey}`;
+    };
+    const updateEspIndex = (entry) => {
+        for (const root of entry.equivalentRoots) {
+            const funcName = root.function?.name ?? rootScopeName;
+            espIndex.set(espIndexKey(root.schemaRootPath, funcName), entry);
+        }
+    };
+    // Pre-build a lookup map from cleaned function name to dependency for O(1) lookups.
+    // This avoids O(n) linear search in findRelevantDependency which was causing O(n²) performance.
+    const dependencyByCleanedName = new Map();
+    for (const dep of importedExports) {
+        const cleanedName = cleanFunctionName(dep.name);
+        if (!dependencyByCleanedName.has(cleanedName)) {
+            dependencyByCleanedName.set(cleanedName, dep);
+        }
+    }
     const findRelevantDependency = (functionName) => {
-        return importedExports.find((d) => cleanFunctionName(d.name) === cleanFunctionName(functionName));
+        return dependencyByCleanedName.get(cleanFunctionName(functionName));
     };
     const findRelevantDependentDataStructure = (functionName) => {
         const dependency = findRelevantDependency(functionName);
@@ -117,8 +188,8 @@ export default function mergeInDependentDataStructure({ importedExports, depende
         });
         return mergedDataStructure.dependencySchemas[filePath][name];
     };
-    const cleanSchema = (schema) => {
-        cleanKnownObjectFunctionsFromMapping(schema);
+    const cleanSchema = (schema, context) => {
+        transformationTracer.traceSchemaTransform(rootScopeName, 'cleanKnownObjectFunctionsFromMapping', schema, cleanKnownObjectFunctionsFromMapping, context);
     };
     const translatePath = (path, dependencyName) => {
         if (path.startsWith(dependencyName)) {
@@ -158,6 +229,41 @@ export default function mergeInDependentDataStructure({ importedExports, depende
     const gatherAllEquivalentSchemaPaths = (functionName, sourceAndUsageEquivalencies, dataStructure) => {
         if (!sourceAndUsageEquivalencies)
             return;
+        const normalizedSchemaCache = new Map();
+        const getSchemaIndex = (schema) => {
+            if (!schema)
+                return { byFirstPart: new Map() };
+            const cached = normalizedSchemaCache.get(schema);
+            if (cached)
+                return cached;
+            const byFirstPart = new Map();
+            for (const path in schema) {
+                let parts = splitOutsideParenthesesAndArrays(path);
+                if (parts[0].startsWith(functionName)) {
+                    const baseName = cleanFunctionName(parts[0]);
+                    if (!functionsWithMultipleTypeParams.has(baseName)) {
+                        parts =
+                            parts[1] === 'functionCallReturnValue'
+                                ? ['returnValue', ...parts.slice(2)]
+                                : parts.slice(1);
+                    }
+                }
+                const entry = { path, parts };
+                // Index by the base of the first part (before any function call args)
+                const firstPart = parts[0] ?? '';
+                const parenIdx = firstPart.indexOf('(');
+                const firstPartBase = parenIdx >= 0 ? firstPart.slice(0, parenIdx) : firstPart;
+                let bucket = byFirstPart.get(firstPartBase);
+                if (!bucket) {
+                    bucket = [];
+                    byFirstPart.set(firstPartBase, bucket);
+                }
+                bucket.push(entry);
+            }
+            const result = { byFirstPart };
+            normalizedSchemaCache.set(schema, result);
+            return result;
+        };
         const findOrCreateEquivalentSchemaPathsEntry = (allPaths) => {
             const equivalentRoots = allPaths
                 .filter((p) => p.functionName === rootScopeName ||
@@ -169,19 +275,93 @@ export default function mergeInDependentDataStructure({ importedExports, depende
                     : findRelevantDependency(p.functionName),
             }));
             let equivalentSchemaPathsEntry;
+            // Collect the signature indices from the new roots we want to add
+            const newRootSignatureIndices = new Set();
+            for (const root of equivalentRoots) {
+                const idx = extractSignatureIndex(root.schemaRootPath);
+                if (idx !== undefined) {
+                    newRootSignatureIndices.add(idx);
+                }
+            }
+            // Use espIndex Map for O(1) lookup instead of O(E) linear search.
+            // Falls back to linear search only when Map hit has a signature index conflict.
             for (const pathInfo of allPaths) {
-                if (!equivalentSchemaPathsEntry) {
-                    equivalentSchemaPathsEntry = equivalentSchemaPaths.find((esp) => esp.equivalentRoots.some((er) => er.schemaRootPath === pathInfo.path &&
-                        (er.function?.name ===
-                            cleanFunctionName(pathInfo.functionName) ||
-                            (!er.function &&
-                                cleanFunctionName(pathInfo.functionName) ===
-                                    rootScopeName))));
+                if (equivalentSchemaPathsEntry)
+                    break;
+                const candidate = espIndex.get(espIndexKey(pathInfo.path, pathInfo.functionName));
+                if (!candidate)
+                    continue;
+                // Verify no signature index conflict with the candidate entry
+                if (newRootSignatureIndices.size > 0) {
+                    const existingIndicesByFunction = new Map();
+                    for (const er of candidate.equivalentRoots) {
+                        const funcKey = er.function
+                            ? `${er.function.name}::${er.function.filePath}`
+                            : '__self__';
+                        const idx = extractSignatureIndex(er.schemaRootPath);
+                        if (idx !== undefined) {
+                            if (!existingIndicesByFunction.has(funcKey)) {
+                                existingIndicesByFunction.set(funcKey, new Set());
+                            }
+                            existingIndicesByFunction.get(funcKey).add(idx);
+                        }
+                    }
+                    let hasConflict = false;
+                    for (const newRoot of equivalentRoots) {
+                        const funcKey = newRoot.function
+                            ? `${newRoot.function.name}::${newRoot.function.filePath}`
+                            : '__self__';
+                        const newIdx = extractSignatureIndex(newRoot.schemaRootPath);
+                        if (newIdx !== undefined) {
+                            const existingIndices = existingIndicesByFunction.get(funcKey);
+                            if (existingIndices && existingIndices.size > 0) {
+                                if (!existingIndices.has(newIdx)) {
+                                    hasConflict = true;
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    if (hasConflict)
+                        continue;
                 }
+                equivalentSchemaPathsEntry = candidate;
             }
             if (!equivalentSchemaPathsEntry) {
+                // Before creating a new entry, filter out roots that have conflicting
+                // signature indices from the same function. An entry should never contain
+                // roots with different signature indices from the same function.
+                // This prevents the bug where signature[1], signature[2], signature[4]
+                // all get merged together due to incorrect sourceEquivalencies.
+                let filteredRoots = equivalentRoots;
+                if (newRootSignatureIndices.size > 1) {
+                    // There are multiple signature indices - we need to filter to keep only
+                    // one consistent set. We'll keep the roots that match the PRIMARY index
+                    // (the first signature index we encounter from self, or the lowest index).
+                    // First, determine the primary index - prefer the self root's index
+                    let primaryIndex;
+                    for (const root of equivalentRoots) {
+                        if (!root.function) {
+                            // This is a self root
+                            const idx = extractSignatureIndex(root.schemaRootPath);
+                            if (idx !== undefined) {
+                                primaryIndex = idx;
+                                break;
+                            }
+                        }
+                    }
+                    // If no self root has a signature index, use the lowest index
+                    if (primaryIndex === undefined) {
+                        primaryIndex = Math.min(...newRootSignatureIndices);
+                    }
+                    // Filter roots: keep if no signature index OR signature index matches primary
+                    filteredRoots = equivalentRoots.filter((root) => {
+                        const idx = extractSignatureIndex(root.schemaRootPath);
+                        return idx === undefined || idx === primaryIndex;
+                    });
+                }
                 equivalentSchemaPathsEntry = {
-                    equivalentRoots,
+                    equivalentRoots: filteredRoots,
                     equivalentPostfixes: {},
                 };
                 equivalentSchemaPaths.push(equivalentSchemaPathsEntry);
@@ -189,25 +369,167 @@ export default function mergeInDependentDataStructure({ importedExports, depende
             else {
                 equivalentSchemaPathsEntry.equivalentRoots.push(...equivalentRoots);
             }
+            // Deduplicate roots using a Set for O(n) instead of O(n²)
+            const seenRoots = new Set();
             equivalentSchemaPathsEntry.equivalentRoots =
-                equivalentSchemaPathsEntry.equivalentRoots.filter((er, index, self) => index ===
-                    self.findIndex((e) => e.schemaRootPath === er.schemaRootPath &&
-                        e.function?.name === er.function?.name));
+                equivalentSchemaPathsEntry.equivalentRoots.filter((er) => {
+                    const key = er.schemaRootPath + '::' + (er.function?.name ?? '');
+                    if (seenRoots.has(key))
+                        return false;
+                    seenRoots.add(key);
+                    return true;
+                });
+            // Keep the espIndex in sync after adding/deduplicating roots
+            updateEspIndex(equivalentSchemaPathsEntry);
             return equivalentSchemaPathsEntry;
         };
-        for (const equivalencies of [
+        // Helper to extract function name from a path that starts with a function call.
+        // e.g., 'ScenarioViewer().signature[0].scenario' -> 'ScenarioViewer'
+        // Returns undefined if the path doesn't start with a function call or the function isn't a dependency.
+        const extractFunctionNameFromPath = (path) => {
+            const parts = splitOutsideParenthesesAndArrays(path);
+            if (parts.length > 0 && parts[0].endsWith(')')) {
+                // Extract the function name without the () suffix and type params
+                const funcCallPart = parts[0];
+                const funcName = cleanFunctionName(funcCallPart.replace(/\(\)$/, ''));
+                // Check if this function is a dependency
+                if (findRelevantDependency(funcName)) {
+                    return funcName;
+                }
+            }
+            return undefined;
+        };
+        const allEquivalencies = [
             sourceAndUsageEquivalencies.usageEquivalencies,
             sourceAndUsageEquivalencies.sourceEquivalencies,
-        ].filter(Boolean)) {
-            for (const [schemaPath, usages] of Object.entries(equivalencies)) {
+        ].filter(Boolean);
+        for (const equivalencies of allEquivalencies) {
+            const schemaPathEntries = Object.entries(equivalencies);
+            for (const [schemaPath, usages] of schemaPathEntries) {
+                // First, check if the raw schemaPath starts with a function call to a dependency.
+                // If so, use that dependency name for translation (so translatePath can strip the prefix).
+                const extractedFuncName = extractFunctionNameFromPath(schemaPath);
+                const effectiveFunctionName = extractedFuncName || functionName;
+                const translatedPath = translatePath(schemaPath, effectiveFunctionName);
                 const allPaths = [
-                    { path: translatePath(schemaPath, functionName), functionName },
+                    { path: translatedPath, functionName: effectiveFunctionName },
                     ...usages.map((u) => ({
                         path: translatePath(u.schemaPath, u.scopeNodeName),
                         functionName: u.scopeNodeName,
                     })),
                 ].filter((pathInfo) => !pathInfo.path.includes('.map('));
+                // Fix 38: Derive base paths from property access paths.
+                // When we have equivalent paths like:
+                //   Parent: signature[0].scenarios[].name
+                //   Child:  signature[0].selectedScenario.name
+                // We want to derive the base paths by finding the common suffix:
+                //   Common suffix: .name
+                //   Parent base: signature[0].scenarios[]
+                //   Child base:  signature[0].selectedScenario
+                // This allows the merge to find nested child schema fields under the base prop.
+                // Find child signature paths (paths from child components)
+                const childPaths = allPaths.filter((p) => p.functionName &&
+                    p.functionName !== rootScopeName &&
+                    p.functionName !== effectiveFunctionName);
+                // Find parent paths (paths from this component)
+                const parentPaths = allPaths.filter((p) => !p.functionName ||
+                    p.functionName === rootScopeName ||
+                    p.functionName === effectiveFunctionName);
+                const derivedBasePaths = [];
+                const allPathSet = new Set(allPaths.map((p) => p.path));
+                const derivedBasePathSet = new Set();
+                // For each child path, find its equivalent parent path and derive bases
+                for (const childPathInfo of childPaths) {
+                    const childParts = splitOutsideParenthesesAndArrays(childPathInfo.path);
+                    // Look for a parent path that shares a common suffix with this child path
+                    for (const parentPathInfo of parentPaths) {
+                        const parentParts = splitOutsideParenthesesAndArrays(parentPathInfo.path);
+                        // Find the common suffix (from the end)
+                        let commonSuffixLength = 0;
+                        const minLen = Math.min(childParts.length, parentParts.length);
+                        for (let i = 1; i <= minLen; i++) {
+                            if (childParts[childParts.length - i] ===
+                                parentParts[parentParts.length - i]) {
+                                commonSuffixLength = i;
+                            }
+                            else {
+                                break;
+                            }
+                        }
+                        // If there's a common suffix and both paths have more parts than the suffix
+                        if (commonSuffixLength > 0 &&
+                            childParts.length > commonSuffixLength &&
+                            parentParts.length > commonSuffixLength) {
+                            const childBaseParts = childParts.slice(0, childParts.length - commonSuffixLength);
+                            const parentBaseParts = parentParts.slice(0, parentParts.length - commonSuffixLength);
+                            // Only derive if BOTH paths look like signature paths.
+                            // This ensures we're handling JSX child-to-parent prop mappings,
+                            // not other complex equivalencies like function call returns.
+                            const isChildSignaturePath = childBaseParts[0]?.startsWith('signature[') ||
+                                (childBaseParts[0]?.endsWith(')') &&
+                                    childBaseParts[1]?.startsWith('signature['));
+                            const isParentSignaturePath = parentBaseParts[0]?.startsWith('signature[');
+                            if (isChildSignaturePath && isParentSignaturePath) {
+                                const childBase = joinParenthesesAndArrays(childBaseParts);
+                                const parentBase = joinParenthesesAndArrays(parentBaseParts);
+                                // Only derive if:
+                                // 1. Parent has array iteration (e.g., scenarios[]) and child does NOT
+                                // 2. Bases are different
+                                // 3. Child base is NOT just "signature[N]" (too generic - every component has this)
+                                //    We only want specific prop paths like "signature[0].selectedScenario"
+                                // This targets array-to-object mappings like scenarios[] -> selectedScenario
+                                const parentHasArrayIterator = parentBase.includes('[]');
+                                const childHasArrayIterator = childBase.includes('[]');
+                                // Skip if child base is just the generic signature marker (e.g., "signature[0]")
+                                const childBaseIsGenericSignature = /^signature\[\d+\]$/.test(childBase);
+                                if (childBase !== parentBase &&
+                                    parentHasArrayIterator &&
+                                    !childHasArrayIterator &&
+                                    !childBaseIsGenericSignature) {
+                                    // Add child base if not already present (O(1) Set lookup)
+                                    if (!allPathSet.has(childBase) &&
+                                        !derivedBasePathSet.has(childBase)) {
+                                        derivedBasePaths.push({
+                                            path: childBase,
+                                            functionName: childPathInfo.functionName,
+                                        });
+                                        derivedBasePathSet.add(childBase);
+                                    }
+                                    // Add parent base if not already present (O(1) Set lookup)
+                                    if (!allPathSet.has(parentBase) &&
+                                        !derivedBasePathSet.has(parentBase)) {
+                                        derivedBasePaths.push({
+                                            path: parentBase,
+                                            functionName: parentPathInfo.functionName,
+                                        });
+                                        derivedBasePathSet.add(parentBase);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                allPaths.push(...derivedBasePaths);
                 const entry = findOrCreateEquivalentSchemaPathsEntry(allPaths);
+                // Trace equivalency gathering - helps debug why paths may not be connected
+                if (allPaths.length > 1) {
+                    transformationTracer.operation(rootScopeName, {
+                        operation: 'gatherEquivalency',
+                        stage: 'gathering',
+                        path: translatedPath,
+                        context: {
+                            sourceFunction: functionName,
+                            equivalentPaths: allPaths.map((p) => ({
+                                path: p.path,
+                                function: p.functionName,
+                            })),
+                            equivalentRoots: entry.equivalentRoots.map((r) => ({
+                                path: r.schemaRootPath,
+                                function: r.function?.name,
+                            })),
+                        },
+                    });
+                }
                 for (const equivalentRoot of entry.equivalentRoots) {
                     const dataStructures = equivalentRoot.function &&
                         equivalentRoot.function.name !== rootScopeName
@@ -216,23 +538,36 @@ export default function mergeInDependentDataStructure({ importedExports, depende
                             findRelevantDependentAnalysisDataStructure(equivalentRoot.function.name),
                         ]
                         : [dataStructure];
-                    const schemas = dataStructures.map((dataStructure) => equivalentRoot.schemaRootPath.startsWith('signature[')
+                    // Determine if this is a signature schema path.
+                    // The path might be 'signature[0]...' directly, or 'FuncName().signature[0]...' if it has a function prefix.
+                    const schemaRootParts = splitOutsideParenthesesAndArrays(equivalentRoot.schemaRootPath);
+                    const isSignaturePath = equivalentRoot.schemaRootPath.startsWith('signature[') ||
+                        (schemaRootParts[0]?.endsWith(')') &&
+                            schemaRootParts[1]?.startsWith('signature['));
+                    const schemas = dataStructures.map((dataStructure) => isSignaturePath
                         ? dataStructure?.signatureSchema
                         : dataStructure?.returnValueSchema);
-                    const pathParts = splitOutsideParenthesesAndArrays(equivalentRoot.schemaRootPath);
+                    let pathParts = splitOutsideParenthesesAndArrays(equivalentRoot.schemaRootPath);
+                    // Fix: When processing a child component's schema, the schemaRootPath has the function
+                    // prefix (e.g., 'ScenarioViewer().signature[0].scenario'), but the child's schema paths
+                    // don't have that prefix (e.g., 'signature[0].scenario.metadata.screenshotPaths').
+                    // Strip the function prefix from pathParts so they can match.
+                    if (equivalentRoot.function &&
+                        pathParts[0].endsWith(')') &&
+                        pathParts[1]?.startsWith('signature[')) {
+                        pathParts = pathParts.slice(1);
+                    }
                     for (const schema of schemas) {
-                        for (const schemaPath in schema) {
-                            let schemaPathParts = splitOutsideParenthesesAndArrays(schemaPath);
-                            if (schemaPathParts[0].startsWith(functionName)) {
-                                // Only normalize if the function doesn't have multiple different type parameters
-                                const baseName = cleanFunctionName(schemaPathParts[0]);
-                                if (!functionsWithMultipleTypeParams.has(baseName)) {
-                                    schemaPathParts =
-                                        schemaPathParts[1] === 'functionCallReturnValue'
-                                            ? ['returnValue', ...schemaPathParts.slice(2)]
-                                            : schemaPathParts.slice(1);
-                                }
-                            }
+                        // Use pre-computed index to only iterate schema entries whose
+                        // normalized first part matches pathParts[0], instead of all entries.
+                        const schemaIndex = getSchemaIndex(schema);
+                        const lookupPart = pathParts[0] ?? '';
+                        const lookupParenIdx = lookupPart.indexOf('(');
+                        const lookupBase = lookupParenIdx >= 0
+                            ? lookupPart.slice(0, lookupParenIdx)
+                            : lookupPart;
+                        const candidates = schemaIndex.byFirstPart.get(lookupBase) || [];
+                        for (const { path: schemaPath, parts: schemaPathParts, } of candidates) {
                             if (schemaPathParts.length < pathParts.length)
                                 continue;
                             // Check if all path parts match (allowing function call variants)
@@ -291,13 +626,27 @@ export default function mergeInDependentDataStructure({ importedExports, depende
                                 else {
                                     // Regular exact match - use the standard postfix logic
                                     const postfix = joinParenthesesAndArrays(schemaPathParts.slice(matchedUpToIndex));
-                                    entry.equivalentPostfixes[postfix] = entry
-                                        .equivalentPostfixes[postfix]
-                                        ? bestValueFromOptions([
-                                            entry.equivalentPostfixes[postfix],
-                                            schema[schemaPath],
-                                        ])
-                                        : schema[schemaPath];
+                                    const previousValue = entry.equivalentPostfixes[postfix];
+                                    const newValue = schema[schemaPath];
+                                    entry.equivalentPostfixes[postfix] = previousValue
+                                        ? bestValueFromOptions([previousValue, newValue])
+                                        : newValue;
+                                    // Trace postfix gathering - shows where type info comes from
+                                    if (entry.equivalentPostfixes[postfix] !== previousValue) {
+                                        transformationTracer.operation(rootScopeName, {
+                                            operation: 'gatherPostfix',
+                                            stage: 'gathering',
+                                            path: postfix || '(root)',
+                                            before: previousValue,
+                                            after: entry.equivalentPostfixes[postfix],
+                                            context: {
+                                                sourceSchemaPath: schemaPath,
+                                                sourceFunction: equivalentRoot.function?.name || rootScopeName,
+                                                equivalentRootPath: equivalentRoot.schemaRootPath,
+                                                rawValue: newValue,
+                                            },
+                                        });
+                                    }
                                 }
                             }
                         }
@@ -329,10 +678,14 @@ export default function mergeInDependentDataStructure({ importedExports, depende
                 const entry = findOrCreateEquivalentSchemaPathsEntry([
                     { path: translatedBasePath, functionName: functionName },
                 ]);
-                entry.equivalentRoots.push({
+                const newRoot = {
                     schemaRootPath: translatedBasePath,
                     function: findRelevantDependency(functionName),
-                });
+                };
+                entry.equivalentRoots.push(newRoot);
+                // Update index for the newly added root
+                const newRootFuncName = newRoot.function?.name ?? rootScopeName;
+                espIndex.set(espIndexKey(newRoot.schemaRootPath, newRootFuncName), entry);
                 const basePathParts = splitOutsideParenthesesAndArrays(basePath);
                 for (const schemaPath in dataStructure.returnValueSchema) {
                     const schemaPathParts = splitOutsideParenthesesAndArrays(schemaPath);
@@ -346,12 +699,13 @@ export default function mergeInDependentDataStructure({ importedExports, depende
                         continue;
                     }
                     const postfix = joinParenthesesAndArrays(schemaPathParts.slice(basePathParts.length));
-                    entry.equivalentPostfixes[postfix] = entry.equivalentPostfixes[postfix]
+                    const newValue = entry.equivalentPostfixes[postfix]
                         ? bestValueFromOptions([
                             entry.equivalentPostfixes[postfix],
                             dataStructure.returnValueSchema[schemaPath],
                         ])
                         : dataStructure.returnValueSchema[schemaPath];
+                    entry.equivalentPostfixes[postfix] = newValue;
                 }
             }
         }
@@ -390,6 +744,8 @@ export default function mergeInDependentDataStructure({ importedExports, depende
         }
         const findEquivalentSchemaPathEntry = (schemaSubPath, equivalentRootFunction) => {
             let postfix;
+            // Get the signature index we're looking for (if any)
+            const lookingForSignatureIndex = extractSignatureIndex(schemaSubPath);
             const equivalentEntry = mergedEquivalentSchemaPaths.find((esp) => esp.equivalentRoots.some((er) => {
                 if ((schemaSubPath.startsWith('returnValue') ||
                     schemaSubPath.startsWith('signature[')) &&
@@ -398,6 +754,26 @@ export default function mergeInDependentDataStructure({ importedExports, depende
                     return false;
                 }
                 if (schemaSubPath === er.schemaRootPath) {
+                    // Additional check: if we're looking for a signature path, make sure
+                    // the entry doesn't already have DIFFERENT signature indices.
+                    // This prevents entries with signature[1], signature[2], signature[4]
+                    // from all being merged together.
+                    if (lookingForSignatureIndex !== undefined) {
+                        const hasConflictingSignatureIndex = esp.equivalentRoots.some((otherRoot) => {
+                            // Only check roots from the same function
+                            if (otherRoot.function?.name !== equivalentRootFunction?.name ||
+                                otherRoot.function?.filePath !==
+                                    equivalentRootFunction?.filePath) {
+                                return false;
+                            }
+                            const otherIndex = extractSignatureIndex(otherRoot.schemaRootPath);
+                            return (otherIndex !== undefined &&
+                                otherIndex !== lookingForSignatureIndex);
+                        });
+                        if (hasConflictingSignatureIndex) {
+                            return false;
+                        }
+                    }
                     postfix = er.postfix;
                     return true;
                 }
@@ -478,13 +854,51 @@ export default function mergeInDependentDataStructure({ importedExports, depende
             if (mockedDependencies.has(`${filePath}::${name}`)) {
                 continue;
             }
-            const mergedDataStructure = dependentAnalyses[filePath][name].metadata?.mergedDataStructure || {};
-            gatherAllEquivalentSchemaPaths(name, mergedDataStructure);
+            const childMergedDataStructure = dependentAnalyses[filePath][name].metadata?.mergedDataStructure || {};
+            gatherAllEquivalentSchemaPaths(name, childMergedDataStructure);
         }
     }
     equivalentSchemaPaths = mergeAllEquivalentSchemaPaths();
+    // Collect schemas that need cleaning — batch the calls for the end instead of
+    // calling cleanSchema inside the inner root loop (which was O(roots * schemaSize)).
+    const schemasToClean = new Set();
     for (const esp of equivalentSchemaPaths) {
-        for (const equivalentRoot of esp.equivalentRoots) {
+        // Pre-compute which postfixes have children to avoid O(n²) lookups in the inner loop.
+        // A postfix "has children" if there are other postfixes that extend it.
+        const postfixesWithChildren = new Set();
+        const postfixKeys = Object.keys(esp.equivalentPostfixes);
+        // Check for empty postfix having children (any other postfixes exist)
+        if (postfixKeys.length > 1 && '' in esp.equivalentPostfixes) {
+            postfixesWithChildren.add('');
+        }
+        // Check for array element postfixes having children using a prefix set.
+        // This avoids O(n²) scans across large postfix lists.
+        // e.g., 'currentEntities[]' has children if a path like 'currentEntities[].sha' exists.
+        const postfixPrefixSet = new Set();
+        for (const postfixPath of postfixKeys) {
+            if (!postfixPath)
+                continue;
+            const parts = splitOutsideParenthesesAndArrays(postfixPath);
+            for (let i = 1; i < parts.length; i++) {
+                postfixPrefixSet.add(joinParenthesesAndArrays(parts.slice(0, i)));
+            }
+        }
+        for (const postfixPath of postfixKeys) {
+            if (postfixPath.endsWith('[]') && postfixPrefixSet.has(postfixPath)) {
+                postfixesWithChildren.add(postfixPath);
+            }
+        }
+        // Deduplicate equivalentRoots that would write to the same schema paths.
+        // Roots with the same (function, schemaRootPath, postfix) are redundant.
+        const seenRootKeys = new Set();
+        const uniqueRoots = esp.equivalentRoots.filter((root) => {
+            const key = `${root.function?.filePath ?? ''}::${root.function?.name ?? ''}::${root.schemaRootPath}::${root.postfix ?? ''}`;
+            if (seenRootKeys.has(key))
+                return false;
+            seenRootKeys.add(key);
+            return true;
+        });
+        for (const equivalentRoot of uniqueRoots) {
             let merged;
             if (equivalentRoot.function) {
                 merged = findOrCreateDependentSchemas(equivalentRoot.function);
@@ -500,9 +914,21 @@ export default function mergeInDependentDataStructure({ importedExports, depende
             for (const [postfixPath, postfixValue] of Object.entries(esp.equivalentPostfixes)) {
                 let relevantPostfix = postfixPath;
                 if (equivalentRoot.postfix) {
+                    // Check if postfixPath starts with equivalentRoot.postfix at a path boundary.
+                    // Must ensure exact path part match - "entityCode" should NOT match "entity" prefix.
+                    // Valid: "entity.foo" starts with "entity" (boundary at '.')
+                    // Valid: "entity[0]" starts with "entity" (boundary at '[')
+                    // Invalid: "entityCode" starts with "entity" (no boundary, different property)
                     if (!postfixPath.startsWith(equivalentRoot.postfix)) {
                         continue;
                     }
+                    // Additional check: ensure the match is at a path boundary
+                    const nextChar = postfixPath[equivalentRoot.postfix.length];
+                    if (nextChar !== undefined && nextChar !== '.' && nextChar !== '[') {
+                        // The postfixPath continues with more characters that aren't a path separator.
+                        // This means "entity" matched "entityCode" which is wrong - they're different properties.
+                        continue;
+                    }
                     const postFixPathParts = splitOutsideParenthesesAndArrays(postfixPath);
                     const equivalentRootPostFixParts = splitOutsideParenthesesAndArrays(equivalentRoot.postfix);
                     relevantPostfix = joinParenthesesAndArrays(postFixPathParts.slice(equivalentRootPostFixParts.length));
@@ -511,11 +937,87 @@ export default function mergeInDependentDataStructure({ importedExports, depende
                     equivalentRoot.schemaRootPath,
                     relevantPostfix,
                 ]);
+                // Skip paths that would go through a primitive type
+                // e.g., if schema has 'entities[].scenarioCount': 'number', skip 'entities[].scenarioCount.sha'
+                if (wouldGoThroughPrimitive(newSchemaPath, schema)) {
+                    transformationTracer.operation(rootScopeName, {
+                        operation: 'skipPrimitivePath',
+                        stage: 'merged',
+                        path: newSchemaPath,
+                        context: {
+                            reason: 'would go through primitive type',
+                            postfixValue,
+                        },
+                    });
+                    continue;
+                }
+                // Skip setting primitive type when there are child postfixes that indicate structure.
+                // This prevents downgrading an object/array element to a primitive type.
+                // Uses pre-computed postfixesWithChildren Set for O(1) lookup instead of O(n) iteration.
+                const hasChildPostfixes = (relevantPostfix === '' || relevantPostfix.endsWith('[]')) &&
+                    postfixesWithChildren.has(postfixPath);
+                if (PRIMITIVE_TYPES.has(postfixValue) && hasChildPostfixes) {
+                    continue;
+                }
+                // Don't overwrite a more specific type with a less specific one
+                // This can happen when nested roots share entries with their parent roots
+                const existingType = schema[newSchemaPath];
+                if (existingType) {
+                    // Don't overwrite a primitive type with 'object' or 'array'
+                    // e.g., if schema has 'entities[].scenarioCount': 'number', don't overwrite with 'object'
+                    if (PRIMITIVE_TYPES.has(existingType) &&
+                        (postfixValue === 'object' || postfixValue === 'array')) {
+                        transformationTracer.operation(rootScopeName, {
+                            operation: 'skipTypeDowngrade',
+                            stage: 'merged',
+                            path: newSchemaPath,
+                            context: {
+                                reason: 'would overwrite primitive with object/array',
+                                existingType,
+                                newType: postfixValue,
+                            },
+                        });
+                        continue;
+                    }
+                    // Don't overwrite a complex/union type with a primitive
+                    // e.g., if schema has 'scenarios[]': 'Scenario | null', don't overwrite with 'string'
+                    if (!PRIMITIVE_TYPES.has(existingType) &&
+                        PRIMITIVE_TYPES.has(postfixValue)) {
+                        transformationTracer.operation(rootScopeName, {
+                            operation: 'skipTypeDowngrade',
+                            stage: 'merged',
+                            path: newSchemaPath,
+                            context: {
+                                reason: 'would overwrite complex type with primitive',
+                                existingType,
+                                newType: postfixValue,
+                            },
+                        });
+                        continue;
+                    }
+                }
+                // Log the successful postfix merge
+                transformationTracer.operation(rootScopeName, {
+                    operation: 'mergePostfix',
+                    stage: 'merged',
+                    path: newSchemaPath,
+                    before: existingType,
+                    after: postfixValue,
+                    context: {
+                        schemaRootPath: equivalentRoot.schemaRootPath,
+                        postfix: relevantPostfix,
+                        dependency: equivalentRoot.function?.name,
+                    },
+                });
                 schema[newSchemaPath] = postfixValue;
             }
-            cleanSchema(schema);
+            schemasToClean.add(schema);
         }
     }
+    // Batch-clean all modified schemas once (instead of once per root per ESP entry)
+    for (const schema of schemasToClean) {
+        cleanSchema(schema, { stage: 'afterMergePostfix' });
+    }
     // Propagate equivalency-derived attributes to generic function call variants.
     // When attributes are traced via equivalencies (e.g., fileComparisons from buildDataMap.signature[2]),
     // they get written to non-generic paths (returnValue.data.x or funcName().functionCallReturnValue.data.x).
@@ -612,6 +1114,14 @@ export default function mergeInDependentDataStructure({ importedExports, depende
                 // e.g., returnValue[].label -> getOptions().functionCallReturnValue[].label
                 normalizedPath = path.replace(/^returnValue/, `${dependency.name}().functionCallReturnValue`);
             }
+            transformationTracer.operation(rootScopeName, {
+                operation: 'normalizeReturnValuePath',
+                stage: 'merged',
+                path: normalizedPath,
+                before: path,
+                after: normalizedPath,
+                context: { dependency: dependency.name, value },
+            });
             depSchema.returnValueSchema[normalizedPath] = value;
         }
         // Now copy paths from the source schema (dependencySchemas)
@@ -678,7 +1188,78 @@ export default function mergeInDependentDataStructure({ importedExports, depende
                 }
             }
         }
-        cleanSchema(depSchema.returnValueSchema);
+        cleanSchema(depSchema.returnValueSchema, {
+            stage: 'afterMockedDependencyMerge',
+            dependency: dependency.name,
+        });
+        // Pull signature requirements from downstream functions into the mocked return value.
+        // When a mocked function's return flows into another function's signature (via usageEquivalencies),
+        // we need to include that function's signature requirements in the mock.
+        //
+        // Example: fromE5() returns a currency object that flows to calculateTotalPrice(price, quantity).
+        // calculateTotalPrice's signatureSchema shows signature[0].multiply() is required.
+        // We need to add multiply() to fromE5's mock return value.
+        const usageEquivalencies = srcSchema.usageEquivalencies ?? {};
+        for (const [returnPath, equivalencies] of Object.entries(usageEquivalencies)) {
+            // Only process return value paths (functionCallReturnValue)
+            if (!returnPath.includes('.functionCallReturnValue'))
+                continue;
+            for (const equiv of equivalencies) {
+                // Check if this equivalency points to a signature path
+                const signatureMatch = equiv.schemaPath.match(/\.signature\[(\d+)\]$/);
+                if (!signatureMatch)
+                    continue;
+                const targetFunctionName = cleanFunctionName(equiv.scopeNodeName);
+                const signatureIndex = signatureMatch[1];
+                // Look up the target function's analysis to get its signature requirements
+                // First try dependentAnalyses, then dependencySchemas
+                let targetSignatureSchema;
+                // Check dependentAnalyses first (has the full merged analysis)
+                for (const depFilePath in dependentAnalyses) {
+                    const analysis = dependentAnalyses[depFilePath]?.[targetFunctionName];
+                    if (analysis?.metadata?.mergedDataStructure?.signatureSchema) {
+                        targetSignatureSchema =
+                            analysis.metadata.mergedDataStructure.signatureSchema;
+                        break;
+                    }
+                }
+                // Fallback to dependencySchemas if not found
+                if (!targetSignatureSchema) {
+                    for (const depFilePath in dependencySchemas) {
+                        const schema = dependencySchemas[depFilePath]?.[targetFunctionName];
+                        if (schema?.signatureSchema) {
+                            targetSignatureSchema = schema.signatureSchema;
+                            break;
+                        }
+                    }
+                }
+                if (!targetSignatureSchema)
+                    continue;
+                // Find all paths in the target's signatureSchema that extend from signature[N]
+                // e.g., signature[0].multiply(quantity) -> .multiply(quantity)
+                const signaturePrefix = `signature[${signatureIndex}]`;
+                for (const [sigPath, sigType] of Object.entries(targetSignatureSchema)) {
+                    if (!sigPath.startsWith(signaturePrefix))
+                        continue;
+                    // Skip the base signature[N] path itself - we only want the method/property extensions
+                    if (sigPath === signaturePrefix)
+                        continue;
+                    // Extract the suffix after signature[N] (e.g., ".multiply(quantity)")
+                    const suffix = sigPath.slice(signaturePrefix.length);
+                    // Build the path for the mocked return value
+                    // e.g., fromE5(priceE5).functionCallReturnValue.multiply(quantity)
+                    const returnValuePath = returnPath + suffix;
+                    // Add to the mocked dependency's return value schema if not already present
+                    if (!(returnValuePath in depSchema.returnValueSchema)) {
+                        depSchema.returnValueSchema[returnValuePath] = sigType;
+                    }
+                }
+            }
+        }
+        cleanSchema(depSchema.returnValueSchema, {
+            stage: 'afterSignatureRequirementsMerge',
+            dependency: dependency.name,
+        });
     }
     // Process the input dependencySchemas FIRST (before child dependentAnalyses).
     // This ensures the parent entity's direct usage of dependencies takes precedence.
@@ -714,7 +1295,38 @@ export default function mergeInDependentDataStructure({ importedExports, depende
                 // from the copied schema. Without this, method call paths on primitives like
                 // "projectSlug.replace(...)" would cause convertDotNotation to create nested
                 // object structures instead of preserving the primitive type.
-                cleanSchema(depSchema.returnValueSchema);
+                cleanSchema(depSchema.returnValueSchema, {
+                    stage: 'afterDependencySchemaCopy',
+                    filePath,
+                    dependency: name,
+                });
+            }
+            // TYPE REFINEMENT: Check if dependentAnalyses has a more specific type for this dependency.
+            // When a parent passes `entity.filePath` (string | undefined) to a child component
+            // that requires `filePath: string`, we should use the child's more specific type.
+            // This prevents mock data from having undefined values for required props.
+            //
+            // This runs REGARDLESS of whether equivalencies already processed the schema,
+            // because equivalencies copy the parent's type (string | undefined), not the child's
+            // required type (string).
+            const depSchema = findOrCreateDependentSchemas({ filePath, name });
+            const childAnalysis = dependentAnalyses[filePath]?.[name];
+            const childSignatureSchema = childAnalysis?.metadata?.mergedDataStructure?.signatureSchema;
+            if (childSignatureSchema) {
+                for (const path in depSchema.signatureSchema) {
+                    const parentType = depSchema.signatureSchema[path];
+                    const childType = childSignatureSchema[path];
+                    if (parentType && childType) {
+                        // Check if parent has optional type and child has required type
+                        const parentIsOptional = parentType.includes('| undefined') ||
+                            parentType.includes('| null');
+                        const childIsOptional = childType.includes('| undefined') || childType.includes('| null');
+                        // If child requires a more specific type (not optional), use it
+                        if (parentIsOptional && !childIsOptional) {
+                            depSchema.signatureSchema[path] = childType;
+                        }
+                    }
+                }
             }
             // For functions with multiple different type parameters, also create separate entries
             // for each type-parameterized variant. This allows gatherDataForMocks to look up
@@ -746,7 +1358,12 @@ export default function mergeInDependentDataStructure({ importedExports, depende
                                 srcSchema.returnValueSchema[path];
                         }
                     }
-                    cleanSchema(variantSchema.returnValueSchema);
+                    cleanSchema(variantSchema.returnValueSchema, {
+                        stage: 'afterTypeVariantCopy',
+                        filePath,
+                        dependency: name,
+                        variant,
+                    });
                 }
             }
         }
@@ -797,8 +1414,8 @@ export default function mergeInDependentDataStructure({ importedExports, depende
                         // Merge in the nested dependency schemas
                         for (const path in nestedDepSchema.returnValueSchema) {
                             if (!(path in targetDepSchema.returnValueSchema)) {
-                                targetDepSchema.returnValueSchema[path] =
-                                    nestedDepSchema.returnValueSchema[path];
+                                const value = nestedDepSchema.returnValueSchema[path];
+                                targetDepSchema.returnValueSchema[path] = value;
                             }
                         }
                         for (const path in nestedDepSchema.signatureSchema) {