@codeyam/codeyam-cli 0.1.0-staging.15d0f46 → 0.1.0-staging.1669d45

package/analyzer-template/packages/analyze/src/lib/files/analyze/analyzeEntities/prepareDataStructures.ts

@@ -4,19 +4,25 @@ import { awsLog, awsLogDebugLevel } from '~codeyam/utils';
 import measureAndReportExecutionTime from '../../../utils/measureAndReportExecutionTime';
 
 import {
+  deduplicateFunctionSchemas,
+  detectWrapperRequirements,
   fillInDirectSchemaGapsAndUnknowns,
   generateEntityDataStructure,
-  deduplicateFunctionSchemas,
+  getConditionalUsages,
   getEquivalentSignatureVariables,
   getFunctionSignature,
   getReturnValue,
   getSourceEquivalencies,
   getUsageEquivalencies,
-  getConditionalUsages,
-  detectWrapperRequirements,
+  getConditionalEffects,
+  getCompoundConditionals,
+  getChildBoundaryGatingConditions,
 } from '~codeyam/ai';
 import type { AnalysisOptions } from '../analyzeEntities';
 
+// Set to true to process entities one at a time for easier debugging.
+const DEBUG_SEQUENTIAL_EXECUTION = false;
+
 // VERSION MARKER: server-only-detection-v2 (2025-12-28)
 // This version includes automatic detection of "use server" and "server-only" files
 // and runs server-only detection even for cached entities
@@ -31,263 +37,249 @@ export default async function prepareEntityDataStructures(
   projectAnalyzer: ProjectAnalyzer,
   options: AnalysisOptions,
 ): Promise<void> {
-  console.log(
-    'CodeYam: prepareEntityDataStructures RUNNING (server-only-detection-v3)',
-  );
-  console.log(
-    `CodeYam: prepareEntityDataStructures processing ${allEntities.size} entities`,
-  );
-
-  // Log all entity names for debugging
-  const entityNames = Array.from(allEntities).map((e) => e.name);
-  console.log(
-    `CodeYam: prepareEntityDataStructures entity names: ${entityNames.join(', ')}`,
-  );
-
-  // Process entities in parallel for speed
-  await Promise.all(
-    Array.from(allEntities).map(async (entity) => {
-      // Check if already has cached data structure (unless force is set)
-      const hasCache = !!entity.metadata?.isolatedDataStructure;
-      const shouldRegenerateDataStructure =
-        !hasCache || options.force || options.forceAll;
-
-      // PHASE 1: Generate data structure (only for non-cached entities or when forced)
-      // Wrapped in its own try-catch so PHASE 2 always runs even if this fails
-      if (shouldRegenerateDataStructure) {
-        try {
-          const fileAnalyzer = projectAnalyzer.getFileAnalyzerByPath(
-            entity.resolvedFilePath ?? entity.filePath,
+  const processEntity = async (entity: Entity) => {
+    // Check if already has cached data structure (unless force is set)
+    const hasCache = !!entity.metadata?.isolatedDataStructure;
+    const shouldRegenerateDataStructure =
+      !hasCache || options.force || options.forceAll;
+
+    // PHASE 1: Generate data structure (only for non-cached entities or when forced)
+    // Wrapped in its own try-catch so PHASE 2 always runs even if this fails
+    if (shouldRegenerateDataStructure) {
+      try {
+        const fileAnalyzer = projectAnalyzer.getFileAnalyzerByPath(
+          entity.resolvedFilePath ?? entity.filePath,
+        );
+        if (!fileAnalyzer) {
+          awsLog(
+            `CodeYam: prepareEntityDataStructures: FileAnalyzer not found`,
+            {
+              entityFilePath: entity.filePath,
+              entityName: entity.name,
+            },
           );
-          if (!fileAnalyzer) {
-            awsLog(
-              `CodeYam: prepareEntityDataStructures: FileAnalyzer not found`,
-              {
-                entityFilePath: entity.filePath,
-                entityName: entity.name,
-              },
-            );
+          // Still continue to PHASE 2 for server-only detection
+        } else {
+          const dataStructureInfo =
+            await getEntityDataStructureAndFunctionCalls({
+              entity,
+              fileAnalyzer,
+            });
+
+          if (!dataStructureInfo?.isolatedDataStructure) {
+            // Data structure generation failed - entity will proceed with empty schemas
+            // This is okay - the entity can still be analyzed, just without detailed type info
+            if (['visual', 'library'].includes(entity.entityType)) {
+              // we'd really expect these to have data structures
+              awsLog(
+                `CodeYam: prepareEntityDataStructures: Failed to generate data structure for ${entity.filePath}:${entity.name}`,
+              );
+            }
             // Still continue to PHASE 2 for server-only detection
           } else {
-            const dataStructureInfo =
-              await getEntityDataStructureAndFunctionCalls({
-                entity,
-                fileAnalyzer,
-              });
-
-            if (!dataStructureInfo?.isolatedDataStructure) {
-              // Data structure generation failed - entity will proceed with empty schemas
-              // This is okay - the entity can still be analyzed, just without detailed type info
-              if (['visual', 'library'].includes(entity.entityType)) {
-                // we'd really expect these to have data structures
-                awsLog(
-                  `CodeYam: prepareEntityDataStructures: Failed to generate data structure for ${entity.filePath}:${entity.name}`,
-                );
+            const { isolatedDataStructure, functionCalls, callVariableNames } =
+              dataStructureInfo;
+
+            // Store data structure in entity metadata
+            entity.metadata ||= {};
+
+            // Deep clone dependencySchemas to avoid shared references
+            // We need to clone because getReturnValue() returns direct references to schema objects
+            // and multiple entities might reference the same dependency
+            const clonedDependencySchemas: typeof isolatedDataStructure.dependencySchemas =
+              {};
+            for (const filePath in isolatedDataStructure.dependencySchemas) {
+              clonedDependencySchemas[filePath] = {};
+              for (const entityName in isolatedDataStructure.dependencySchemas[
+                filePath
+              ]) {
+                const depSchema =
+                  isolatedDataStructure.dependencySchemas[filePath][entityName];
+                clonedDependencySchemas[filePath][entityName] = {
+                  signatureSchema: { ...depSchema.signatureSchema },
+                  returnValueSchema: { ...depSchema.returnValueSchema },
+                  usageEquivalencies: depSchema.usageEquivalencies,
+                  sourceEquivalencies: depSchema.sourceEquivalencies,
+                };
               }
-              // Still continue to PHASE 2 for server-only detection
-            } else {
-              const {
-                isolatedDataStructure,
-                functionCalls,
-                callVariableNames,
-              } = dataStructureInfo;
-
-              // Store data structure in entity metadata
-              entity.metadata ||= {};
-
-              // Deep clone dependencySchemas to avoid shared references
-              // We need to clone because getReturnValue() returns direct references to schema objects
-              // and multiple entities might reference the same dependency
-              const clonedDependencySchemas: typeof isolatedDataStructure.dependencySchemas =
-                {};
-              for (const filePath in isolatedDataStructure.dependencySchemas) {
-                clonedDependencySchemas[filePath] = {};
-                for (const entityName in isolatedDataStructure
-                  .dependencySchemas[filePath]) {
-                  const depSchema =
-                    isolatedDataStructure.dependencySchemas[filePath][
-                      entityName
-                    ];
-                  clonedDependencySchemas[filePath][entityName] = {
-                    signatureSchema: { ...depSchema.signatureSchema },
-                    returnValueSchema: { ...depSchema.returnValueSchema },
-                    usageEquivalencies: depSchema.usageEquivalencies,
-                    sourceEquivalencies: depSchema.sourceEquivalencies,
-                  };
-                }
+            }
+
+            // LOGGING: Track dependencySchemas entity names for debugging :: format issues
+            const allEntityNames: string[] = [];
+            for (const filePath in clonedDependencySchemas) {
+              for (const entityName in clonedDependencySchemas[filePath]) {
+                allEntityNames.push(`${filePath}:${entityName}`);
               }
+            }
+            entity.metadata.isolatedDataStructure = {
+              signatureSchema: deduplicateFunctionSchemas(
+                isolatedDataStructure.signatureSchema,
+              ),
+              returnValueSchema: deduplicateFunctionSchemas(
+                isolatedDataStructure.returnValueSchema,
+              ),
+              equivalentSignatureVariables:
+                isolatedDataStructure.equivalentSignatureVariables,
+              dependencySchemas: clonedDependencySchemas,
+              environmentVariables: isolatedDataStructure.environmentVariables,
+              // Use enriched conditional usages with source tracing from analysis
+              conditionalUsages: isolatedDataStructure.conditionalUsages,
+              // Include conditional effects for execution flow generation
+              conditionalEffects: isolatedDataStructure.conditionalEffects,
+              // Include compound conditionals for complete execution flow generation
+              compoundConditionals: isolatedDataStructure.compoundConditionals,
+              // Include root entity's equivalencies for merge step
+              usageEquivalencies: isolatedDataStructure.usageEquivalencies,
+              sourceEquivalencies: isolatedDataStructure.sourceEquivalencies,
+              // Include child boundary gating conditions for child component flow merging
+              childBoundaryGatingConditions:
+                isolatedDataStructure.childBoundaryGatingConditions,
+            };
+
+            // Detect wrapper requirements (Context providers, etc.)
+            const wrapperRequirements = detectWrapperRequirements({
+              entity,
+              fileAnalyzer,
+            });
+            if (wrapperRequirements.length > 0) {
+              entity.metadata.wrapperRequirements = wrapperRequirements;
+            }
 
-              entity.metadata.isolatedDataStructure = {
-                signatureSchema: deduplicateFunctionSchemas(
-                  isolatedDataStructure.signatureSchema,
-                ),
-                returnValueSchema: deduplicateFunctionSchemas(
-                  isolatedDataStructure.returnValueSchema,
-                ),
-                equivalentSignatureVariables:
-                  isolatedDataStructure.equivalentSignatureVariables,
-                dependencySchemas: clonedDependencySchemas,
-                environmentVariables:
-                  isolatedDataStructure.environmentVariables,
-                // Use enriched conditional usages with source tracing from analysis
-                conditionalUsages: isolatedDataStructure.conditionalUsages,
-              };
-
-              // Detect wrapper requirements (Context providers, etc.)
-              const wrapperRequirements = detectWrapperRequirements({
-                entity,
-                fileAnalyzer,
-              });
-              if (wrapperRequirements.length > 0) {
-                entity.metadata.wrapperRequirements = wrapperRequirements;
+            // Annotate imported exports with function call information
+            const importedExports = entity.metadata.importedExports ?? [];
+            for (const importedExport of importedExports) {
+              const relevantCalls = functionCalls[importedExport.name];
+              if (relevantCalls) {
+                importedExport.calls = relevantCalls;
+              }
+              const relevantVariableNames =
+                callVariableNames[importedExport.name];
+              if (relevantVariableNames) {
+                importedExport.callVariableNames = relevantVariableNames;
               }
+            }
 
-              // Annotate imported exports with function call information
-              const importedExports = entity.metadata.importedExports ?? [];
-              for (const importedExport of importedExports) {
-                const relevantCalls = functionCalls[importedExport.name];
+            // Annotate node module imports with function call information
+            for (const [path, infos] of Object.entries(
+              entity.metadata.nodeModuleImports ?? {},
+            )) {
+              for (const info of infos) {
+                const relevantCalls = functionCalls[info.name];
                 if (relevantCalls) {
-                  importedExport.calls = relevantCalls;
+                  info.calls = relevantCalls;
                 }
-                const relevantVariableNames =
-                  callVariableNames[importedExport.name];
+                const relevantVariableNames = callVariableNames[info.name];
                 if (relevantVariableNames) {
-                  importedExport.callVariableNames = relevantVariableNames;
-                }
-              }
-
-              // Annotate node module imports with function call information
-              for (const [path, infos] of Object.entries(
-                entity.metadata.nodeModuleImports ?? {},
-              )) {
-                for (const info of infos) {
-                  const relevantCalls = functionCalls[info.name];
-                  if (relevantCalls) {
-                    info.calls = relevantCalls;
-                  }
-                  const relevantVariableNames = callVariableNames[info.name];
-                  if (relevantVariableNames) {
-                    info.callVariableNames = relevantVariableNames;
-                  }
+                  info.callVariableNames = relevantVariableNames;
                 }
               }
             }
           }
-        } catch (phase1Error) {
-          console.warn(
-            `CodeYam: prepareEntityDataStructures: PHASE 1 error for ${entity.filePath}:${entity.name}:`,
-            phase1Error,
-          );
-          // Continue to PHASE 2 - server-only detection should still run
         }
-      }
-
-      try {
-        // PHASE 2: Server-only detection and isMocked determination
-        // This runs for ALL entities, even those with cached data structures
-        // because server-only detection may have been added after the entity was cached
-        const importedExports = entity.metadata?.importedExports ?? [];
-        console.log(
-          `CodeYam: [${entity.name}] Processing ${importedExports.length} importedExports for isMocked determination (cached: ${hasCache})`,
+      } catch (phase1Error) {
+        console.warn(
+          `CodeYam: prepareEntityDataStructures: PHASE 1 error for ${entity.filePath}:${entity.name}:`,
+          phase1Error,
         );
+        // Continue to PHASE 2 - server-only detection should still run
+      }
+    }
 
-        const mockedDependencies = determineMockedDependencies(entity);
-        for (const importedExport of importedExports) {
-          // Skip if already has a definitive isMocked value (true or false, not null)
-          // But re-check if isMocked is null or undefined - this handles previously cached entities
-          if (
-            importedExport.isMocked === true ||
-            importedExport.isMocked === false
-          ) {
-            console.log(
-              `CodeYam: [${entity.name}] SKIP ${importedExport.name} - already has isMocked=${importedExport.isMocked}`,
-            );
-            continue;
-          }
-
-          // Never mock visual components - they render UI and should use real implementation
-          if (importedExport.entityType === 'visual') {
-            console.log(
-              `CodeYam: [${entity.name}] SKIP ${importedExport.name} - visual component, setting isMocked=false`,
-            );
-            importedExport.isMocked = false;
-            continue;
-          }
-
-          // Always mock imports from server-only files ("use server" or import "server-only")
-          // These files contain Server Actions or server-only code that cannot run on the client
-          const importedFilePath =
-            importedExport.resolvedFilePath ?? importedExport.filePath;
-          const importedFileAnalyzer =
-            projectAnalyzer.getFileAnalyzerByPath(importedFilePath);
-          // Use sourceFile.getText() which is always available, unlike file.content which is lazy-loaded
-          const importedFileContent =
-            importedFileAnalyzer?.sourceFile?.getText();
-
-          const isServerOnly = importedFileContent
-            ? isServerOnlyFile(importedFileContent)
-            : false;
-          console.log(
-            `CodeYam: [${entity.name}] CHECK ${importedExport.name} from ${importedFilePath}:`,
-            {
-              hasFileAnalyzer: !!importedFileAnalyzer,
-              hasSourceFile: !!importedFileAnalyzer?.sourceFile,
-              hasFileContent: !!importedFileContent,
-              contentFirst50Chars: importedFileContent
-                ?.substring(0, 50)
-                ?.replace(/\n/g, '\\n'),
-              isServerOnly,
-            },
-          );
+    try {
+      // PHASE 2: Server-only detection and isMocked determination
+      // This runs for ALL entities, even those with cached data structures
+      // because server-only detection may have been added after the entity was cached
+      const importedExports = entity.metadata?.importedExports ?? [];
+      const mockedDependencies = determineMockedDependencies(entity);
+      for (const importedExport of importedExports) {
+        // Skip if already has a definitive isMocked value (true or false, not null)
+        // But re-check if isMocked is null or undefined - this handles previously cached entities
+        if (
+          importedExport.isMocked === true ||
+          importedExport.isMocked === false
+        ) {
+          continue;
+        }
 
-          if (importedFileContent && isServerOnly) {
-            console.log(
-              `CodeYam: [${entity.name}] ✓ MARKING ${importedExport.name} as isMocked=true (server-only file detected)`,
-            );
-            importedExport.isMocked = true;
-            continue;
-          }
+        // Never mock visual components - they render UI and should use real implementation
+        if (importedExport.entityType === 'visual') {
+          importedExport.isMocked = false;
+          continue;
+        }
 
-          const matchesMockedDep = mockedDependencies.some(
-            (dep) =>
-              dep.filePath === importedExport.filePath &&
-              dep.entityName === importedExport.name,
-          );
-          importedExport.isMocked = matchesMockedDep;
-          console.log(
-            `CodeYam: [${entity.name}] ${importedExport.name} isMocked=${matchesMockedDep} (from mockedDependencies)`,
-          );
+        // Always mock imports from server-only files ("use server" or import "server-only")
+        // These files contain Server Actions or server-only code that cannot run on the client
+        const importedFilePath =
+          importedExport.resolvedFilePath ?? importedExport.filePath;
+        const importedFileAnalyzer =
+          projectAnalyzer.getFileAnalyzerByPath(importedFilePath);
+        // Use sourceFile.getText() which is always available, unlike file.content which is lazy-loaded
+        const importedFileContent = importedFileAnalyzer?.sourceFile?.getText();
+
+        const isServerOnly = importedFileContent
+          ? isServerOnlyFile(importedFileContent)
+          : false;
+
+        if (importedFileContent && isServerOnly) {
+          importedExport.isMocked = true;
+          continue;
         }
 
-        // Browser globals that should always be mocked (they make network calls)
-        const alwaysMockedBrowserGlobals = ['fetch', 'EventSource'];
-
-        for (const [path, infos] of Object.entries(
-          entity.metadata?.nodeModuleImports ?? {},
-        )) {
-          for (const info of infos) {
-            if (info.isMocked === undefined || info.isMocked === null) {
-              // Browser globals should always be mocked
-              if (alwaysMockedBrowserGlobals.includes(path)) {
-                info.isMocked = true;
-              } else {
-                info.isMocked = mockedDependencies.some(
-                  (dep) =>
-                    dep.filePath === path && dep.entityName === info.name,
-                );
-              }
+        const matchesMockedDep = mockedDependencies.some(
+          (dep) =>
+            dep.filePath === importedExport.filePath &&
+            dep.entityName === importedExport.name,
+        );
+        importedExport.isMocked = matchesMockedDep;
+      }
+
+      // Browser globals that should always be mocked (they make network calls)
+      const alwaysMockedBrowserGlobals = ['fetch', 'EventSource'];
+
+      for (const [path, infos] of Object.entries(
+        entity.metadata?.nodeModuleImports ?? {},
+      )) {
+        for (const info of infos) {
+          if (info.isMocked === undefined || info.isMocked === null) {
+            // Browser globals should always be mocked
+            if (alwaysMockedBrowserGlobals.includes(path)) {
+              info.isMocked = true;
+            } else {
+              // Check if this dependency should be mocked
+              // Match both exact entityName and variable-qualified entityNames
+              // e.g., "useFetcher" matches "useFetcher" OR "useFetcher::userFetcher"
+              info.isMocked = mockedDependencies.some(
+                (dep) =>
+                  dep.filePath === path &&
+                  (dep.entityName === info.name ||
+                    dep.entityName.startsWith(info.name + '::')),
+              );
             }
           }
         }
-      } catch (error) {
-        console.warn(
-          `CodeYam: prepareEntityDataStructures: Error preparing ${entity.filePath}:${entity.name}:`,
-          error,
-        );
-        // Continue with other entities - this one will have empty schemas
       }
-    }),
-  );
+    } catch (error) {
+      console.warn(
+        `CodeYam: prepareEntityDataStructures: Error preparing ${entity.filePath}:${entity.name}:`,
+        error,
+      );
+      // Continue with other entities - this one will have empty schemas
+    }
+  };
+
+  const entities = Array.from(allEntities);
+  const sequential =
+    DEBUG_SEQUENTIAL_EXECUTION || options.sequentialDataStructurePrep;
+
+  if (sequential) {
+    // Sequential execution for debugging - process one entity at a time
+    for (const entity of entities) {
+      await processEntity(entity);
+    }
+  } else {
+    // Parallel execution for speed
+    await Promise.all(entities.map(processEntity));
+  }
 }
 
 /**
@@ -337,19 +329,21 @@ async function getEntityDataStructureAndFunctionCalls({
         functionName: importedExport.name,
       });
 
-      // If no signature found, this function doesn't exist in the analysis
-      if (!signatureSchema) {
-        return acc;
-      }
-
       const returnValueSchema = getReturnValue(dataStructure, {
         functionName: importedExport.name,
       });
 
+      // If neither signature nor return value found, this function doesn't exist in the analysis.
+      // We need to check BOTH because hooks like useParams() have no signature (no arguments)
+      // but DO have a return value that needs to be mocked.
+      if (!signatureSchema && !returnValueSchema) {
+        return acc;
+      }
+
       // Clone schemas before deduplication to avoid mutating shared references
       // getReturnValue() and getFunctionSignature() return direct references, so we need
       // to clone them before passing to deduplicateFunctionSchemas (which may mutate)
-      const clonedSignatureSchema = { ...signatureSchema };
+      const clonedSignatureSchema = { ...(signatureSchema ?? {}) };
       const clonedReturnValueSchema = { ...(returnValueSchema ?? {}) };
 
       acc[importedExport.filePath] ||= {};
@@ -362,6 +356,170 @@ async function getEntityDataStructureAndFunctionCalls({
           getSourceEquivalencies(dataStructure, importedExport.name) ?? {},
       };
 
+      // Also create variable-qualified entries to preserve distinct return type schemas
+      // when the same function is called multiple times with different type parameters
+      // (e.g., useFetcher<UserData>() vs useFetcher<ReportData>()).
+      //
+      // Each parameterized call is a SEPARATE entry in externalFunctionCalls, so we need
+      // to iterate over ALL matching calls (not just the first one).
+      const matchingCalls = dataStructure.externalFunctionCalls.filter(
+        (fc) =>
+          fc.name === importedExport.name ||
+          fc.name.startsWith(importedExport.name + '<'),
+      );
+
+      for (const efc of matchingCalls) {
+        // Check if this call has perVariableSchemas (multiple calls with variable tracking)
+        if (efc?.perVariableSchemas) {
+          // Check if perVariableSchemas has indexed keys (e.g., "fetcher[1]") which indicates
+          // variable reuse with DIFFERENT call signatures (e.g., let fetcher = useFetcher<A>(); fetcher = useFetcher<B>();)
+          // In this case, we need to create SEPARATE entries for each call signature.
+          const perVarKeys = Object.keys(efc.perVariableSchemas);
+          const hasIndexedKeys = perVarKeys.some((key) => /\[\d+\]$/.test(key));
+
+          if (
+            hasIndexedKeys &&
+            efc.callSignatureToVariable &&
+            efc.allCallSignatures
+          ) {
+            // Variable reuse case: create separate entries for each call signature
+            // Map from call signature to its variable key in perVariableSchemas
+            // e.g., useFetcher<ConfigData>() -> 'fetcher', useFetcher<SettingsData>() -> 'fetcher[1]'
+            const varNameCounts: Record<string, number> = {};
+            for (const callSig of efc.allCallSignatures) {
+              const varName = efc.callSignatureToVariable[callSig];
+              if (!varName) continue;
+
+              // Track occurrence count for this variable name
+              const occurrence = varNameCounts[varName] ?? 0;
+              varNameCounts[varName] = occurrence + 1;
+
+              // Get the key in perVariableSchemas (indexed if reused)
+              const perVarKey =
+                occurrence === 0 ? varName : `${varName}[${occurrence}]`;
+              const varSchema = efc.perVariableSchemas[perVarKey];
+
+              if (varSchema && Object.keys(varSchema).length > 0) {
+                // Create entry with this call signature as the key
+                const rewrittenSchema: Record<string, string> = {};
+                rewrittenSchema[`${callSig}.functionCallReturnValue`] =
+                  'object';
+
+                for (const [path, type] of Object.entries(varSchema)) {
+                  const rewrittenPath = path.startsWith(callSig)
+                    ? path
+                    : `${callSig}.${path}`;
+                  rewrittenSchema[rewrittenPath] = type;
+                }
+
+                acc[importedExport.filePath][callSig] = {
+                  signatureSchema: deduplicateFunctionSchemas({
+                    ...signatureSchema,
+                  }),
+                  returnValueSchema:
+                    deduplicateFunctionSchemas(rewrittenSchema),
+                  usageEquivalencies:
+                    getUsageEquivalencies(dataStructure, importedExport.name) ??
+                    {},
+                  sourceEquivalencies:
+                    getSourceEquivalencies(
+                      dataStructure,
+                      importedExport.name,
+                    ) ?? {},
+                };
+              }
+            }
+          } else {
+            // Destructuring case: const { a, b, c } = useLoaderData()
+            // Merge all variable schemas into a single entry with the call signature as key
+            const callSignatureKey = efc.callSignature;
+
+            // Merge all variable schemas by prepending the call signature to each path.
+            // perVariableSchemas paths are like "functionCallReturnValue.entities.sha"
+            // We need to prefix them with the call signature to get:
+            // "useLoaderData<typeof loader>().functionCallReturnValue.entities.sha"
+            const mergedReturnValueSchema: Record<string, string> = {};
+
+            // Set the top-level return value as object since it contains named properties
+            mergedReturnValueSchema[
+              `${callSignatureKey}.functionCallReturnValue`
+            ] = 'object';
+
+            for (const [varName, perVarSchema] of Object.entries(
+              efc.perVariableSchemas,
+            )) {
+              for (const [path, type] of Object.entries(perVarSchema)) {
+                // Only prepend the call signature if the path doesn't already have it.
+                // perVariableSchemas paths may already include the call signature prefix
+                // (e.g., "useCustomSizes(projectSlug).functionCallReturnValue.customSizes")
+                // depending on how they were built. If so, use the path as-is.
+                const rewrittenPath = path.startsWith(callSignatureKey)
+                  ? path
+                  : `${callSignatureKey}.${path}`;
+                mergedReturnValueSchema[rewrittenPath] = type;
+              }
+            }
+
+            acc[importedExport.filePath][callSignatureKey] = {
+              signatureSchema: deduplicateFunctionSchemas({
+                ...signatureSchema,
+              }),
+              returnValueSchema: deduplicateFunctionSchemas(
+                mergedReturnValueSchema,
+              ),
+              usageEquivalencies:
+                getUsageEquivalencies(dataStructure, importedExport.name) ?? {},
+              sourceEquivalencies:
+                getSourceEquivalencies(dataStructure, importedExport.name) ??
+                {},
+            };
+          }
+        } else if (efc?.receivingVariableNames?.length === 1) {
+          // For parameterized calls like useFetcher<UserData>(), each is a separate entry
+          // with a single receivingVariableName. Use the call signature as the key.
+          const varName = efc.receivingVariableNames[0];
+
+          // Use the call signature as the key (e.g., "useFetcher<UserData>()")
+          const callSignatureKey = efc.callSignature;
+
+          // PREFER perVariableSchemas over getReturnValue() when available
+          // perVariableSchemas has the SPECIFIC schema for this parameterized call,
+          // while getReturnValue() may return merged schemas from multiple calls
+          let parameterizedReturnValue: Record<string, string> | null = null;
+
+          if (efc.perVariableSchemas && efc.perVariableSchemas[varName]) {
+            // Use the specific schema from perVariableSchemas
+            parameterizedReturnValue = efc.perVariableSchemas[varName] ?? null;
+          }
+
+          // Fallback to getReturnValue if perCallSignatureSchemas not available
+          if (!parameterizedReturnValue) {
+            parameterizedReturnValue = getReturnValue(dataStructure, {
+              functionName: efc.name, // Use the full parameterized name
+            });
+          }
+
+          if (
+            parameterizedReturnValue &&
+            Object.keys(parameterizedReturnValue).length > 0
+          ) {
+            acc[importedExport.filePath][callSignatureKey] = {
+              signatureSchema: deduplicateFunctionSchemas({
+                ...signatureSchema,
+              }),
+              returnValueSchema: deduplicateFunctionSchemas({
+                ...parameterizedReturnValue,
+              }),
+              usageEquivalencies:
+                getUsageEquivalencies(dataStructure, importedExport.name) ?? {},
+              sourceEquivalencies:
+                getSourceEquivalencies(dataStructure, importedExport.name) ??
+                {},
+            };
+          }
+        }
+      }
+
       return acc;
     },
     {} as {
@@ -394,6 +552,31 @@ async function getEntityDataStructureAndFunctionCalls({
   // Get enriched conditional usages with source tracing
   const conditionalUsages = getConditionalUsages(dataStructure);
 
+  // Get conditional effects (setter calls inside conditionals)
+  const conditionalEffects = getConditionalEffects(dataStructure);
+
+  // Get compound conditionals (grouped conditions that must all be true)
+  const compoundConditionals = getCompoundConditionals(dataStructure);
+
+  console.log(
+    `[ConditionalEffects] prepareDataStructures for ${entity.name}:`,
+    `dataStructure.conditionalEffects=${(dataStructure as any).conditionalEffects?.length ?? 0}`,
+    `getConditionalEffects returned ${conditionalEffects.length} effects`,
+    conditionalEffects
+      .slice(0, 5)
+      .map(
+        (e: any) =>
+          `${e.effect?.setterName}(${e.effect?.value?.slice?.(0, 20) ?? e.effect?.value})`,
+      ),
+  );
+
+  const rawUsageEquivalencies = getUsageEquivalencies(dataStructure);
+  const rawSourceEquivalencies = getSourceEquivalencies(dataStructure);
+
+  // Get child boundary gating conditions for child component flow merging
+  const childBoundaryGatingConditions =
+    getChildBoundaryGatingConditions(dataStructure);
+
   const isolatedDataStructure = {
     signatureSchema: deduplicateFunctionSchemas(clonedRawSignature),
     returnValueSchema: deduplicateFunctionSchemas(clonedRawReturnValue),
@@ -403,6 +586,24 @@ async function getEntityDataStructureAndFunctionCalls({
     environmentVariables: dataStructure.environmentVariables,
     conditionalUsages:
       Object.keys(conditionalUsages).length > 0 ? conditionalUsages : undefined,
+    // Include conditional effects for execution flow generation
+    conditionalEffects:
+      conditionalEffects.length > 0 ? conditionalEffects : undefined,
+    // Include compound conditionals for complete execution flow generation
+    // These capture grouped conditions like (a || b) && !c && !d
+    compoundConditionals:
+      compoundConditionals.length > 0 ? compoundConditionals : undefined,
+    // Include root entity's equivalencies so they can be used during merge.
+    // These show how the parent's data flows to/from child components.
+    // E.g., for SurveysList, usageEquivalencies shows surveys[] → SurveyCard().signature[0].survey
+    usageEquivalencies: rawUsageEquivalencies ?? {},
+    sourceEquivalencies: rawSourceEquivalencies ?? {},
+    // Include child boundary gating conditions for child component flow merging
+    // Maps child component names to the conditions that must be true for them to render
+    childBoundaryGatingConditions:
+      Object.keys(childBoundaryGatingConditions).length > 0
+        ? childBoundaryGatingConditions
+        : undefined,
   };
 
   const functionCalls: Record<string, string[]> = {};
@@ -415,31 +616,6 @@ async function getEntityDataStructureAndFunctionCalls({
         efc.callSignature.startsWith(entityName),
       );
 
-      // DEBUG: Log external function calls info for useFetcher
-      if (entityName === 'useFetcher' || entityName.includes('Fetcher')) {
-        console.log(
-          'CodeYam DEBUG prepareDataStructures:',
-          JSON.stringify(
-            {
-              entityName,
-              filePath,
-              totalExternalFunctionCalls:
-                dataStructure.externalFunctionCalls.length,
-              matchingCallsCount: matchingCalls.length,
-              matchingCalls: matchingCalls.map((efc) => ({
-                name: efc.name,
-                callSignature: efc.callSignature,
-                allCallSignatures: efc.allCallSignatures,
-                receivingVariableNames: efc.receivingVariableNames,
-                callSignatureToVariable: efc.callSignatureToVariable,
-              })),
-            },
-            null,
-            2,
-          ),
-        );
-      }
-
       // Collect all call signatures from all matching efc entries
       // Each efc may have just one callSignature, or allCallSignatures if merged
       const allSignatures: string[] = [];
@@ -485,6 +661,7 @@ async function getEntityDataStructureAndFunctionCalls({
       ) {
         variableNames.push(...aggregatedReceivingVariableNames);
       }
+
       if (variableNames.length > 0) {
         callVariableNames[entityName] = variableNames;
       }
@@ -704,14 +881,28 @@ export function determineMockedDependencies(entity: Entity) {
         entityReturnValueSchema,
       );
 
+      // Check if returnValueSchema is completely empty (no traced calls at all)
+      // This indicates a side-effect function that we couldn't trace
+      const returnValueSchemaEmpty =
+        Object.keys(entityReturnValueSchema ?? {}).length === 0;
+
       const entityShouldBeMocked =
         !onlyHasJsxComponents &&
         (isValidationFn ||
           hasChainedCallsWithNoReturn ||
+          // If entity takes no args AND has return value, it reads from external source
+          // Examples: useParams(), useAuth(), getConfig()
+          (emptySignature && hasReturnValue) ||
+          // If entity takes no args AND returnValueSchema is completely empty,
+          // it's a side-effect function calling external services
+          // Examples: logPageView(), initializeAnalytics(), trackEvent()
+          // NOTE: We don't mock entities that have function markers but no return value
+          // (like React components: FileProvider() has 'function' type but no return data)
+          (emptySignature && returnValueSchemaEmpty) ||
           ((signatureHasFunctions || returnValueHasFunctions) &&
             hasReturnValue &&
-            ((emptySignature && hasReturnValue) ||
-              (!complexSignature && complexReturnValue))));
+            !complexSignature &&
+            complexReturnValue));
 
       if (entityShouldBeMocked) {
         mockedEntities.push({