@codeyam/codeyam-cli 0.1.0-staging.d0ad4ae → 0.1.0-staging.d3e886e

package/analyzer-template/packages/analyze/src/lib/files/scenarios/generateChangesScenarios.ts

@@ -6,14 +6,10 @@ import {
   DEFAULT_SCENARIO_NAME,
 } from '~codeyam/types';
 import measureAndReportExecutionTime from '../../utils/measureAndReportExecutionTime';
-import {
-  AI,
-  generateChangesEntityScenarios,
-  generateChangesEntityKeyAttributes,
-  gatherRelevantDependentKeyAttributes,
-} from '~codeyam/ai';
+import { AI, generateChangesEntityScenarios } from '~codeyam/ai';
 import { awsLog } from '~codeyam/utils';
 import detectChangedDataStructureFields from './detectChangedDataStructureFields';
+import generateExecutionFlows from './generateExecutionFlows';
 
 export interface GenerateChangesScenariosArgs {
   previousAnalysis: Analysis;
@@ -40,8 +36,8 @@ export default async function generateChangesScenarios({
 
   const existingScenarios = (previousAnalysis.scenarios ?? []).filter(
     (s) =>
-      (error ? s.metadata.error : !s.metadata.error) &&
-      !s.metadata.sameAsDefault,
+      (error ? s.metadata?.error : !s.metadata?.error) &&
+      !s.metadata?.sameAsDefault,
   );
   const commitDiff = commit.files.find(
     (f) => f.fileName === entity.filePath,
@@ -87,8 +83,7 @@ export default async function generateChangesScenarios({
           name: DEFAULT_SCENARIO_NAME,
           description: 'The only external state the component can be in.',
           metadata: {
-            dataMapping: {},
-            keyAttributeInstructions: {},
+            coveredFlows: [],
           },
         },
       ];
@@ -96,178 +91,20 @@ export default async function generateChangesScenarios({
     return;
   }
 
-  // if (!analysis.metadata.keyAttributes) {
-  const existingKeyAttributes = (
-    previousAnalysis.metadata?.keyAttributes ?? []
-  ).filter(
-    (keyAttribute, index, self) =>
-      self.findIndex((ka) => ka.internalPath === keyAttribute.internalPath) ===
-      index,
-  );
-
-  const {
-    result: { keyAttributes, llmCall: keyAttributesLLMCall },
-  } = await measureAndReportExecutionTime(
-    () =>
-      generateChangesEntityKeyAttributes({
-        entity,
-        existingKeyAttributes,
-        analysis,
-        commitDiff,
-        model,
-      }),
-    `Generating changes entity key attributes`,
-    updateProgress,
-  );
-
-  // Merge in dependent key attributes (same as initial flow)
-  // This ensures dependent entity key attributes aren't incorrectly seen as "removed"
-  const relevantDependentKeyAttributes = gatherRelevantDependentKeyAttributes(
-    entity,
-    analysis.metadata.mergedDataStructure,
-    dependentAnalyses,
-  );
-
-  // Log dependent key attributes gathered
-  awsLog(`CodeYam: Dependent key attributes gathered for ${entity.name}`, {
-    dependentKeyAttributeCount: relevantDependentKeyAttributes.length,
-    dependentKeyAttributes: relevantDependentKeyAttributes.map((ka) => ({
-      internalPath: ka.internalPath,
-      externalPath: ka.externalPath,
-      dependentEntityName: (ka as any).dependentEntityName,
-      originalEntityName: (ka as any).originalEntityName,
-      filePath: (ka as any).filePath,
-    })),
-    dependentAnalysesEntities: Object.entries(dependentAnalyses).flatMap(
-      ([path, entities]) =>
-        Object.keys(entities).map((name) => ({ path, name })),
-    ),
-  });
-
-  analysis.metadata.keyAttributes = [
-    ...keyAttributes,
-    ...relevantDependentKeyAttributes.map((ka) => ({
-      ...ka,
-      // Spread to convert readonly arrays to mutable arrays (with fallback for undefined)
-      validValueOptions: [...(ka.validValueOptions ?? [])],
-      errorValueOptions: [...(ka.errorValueOptions ?? [])],
-      // Convert readonly dependencies array to mutable if present
-      ...(ka.dependencies && {
-        dependencies: ka.dependencies.map((dep) => ({ ...dep })),
-      }),
-      // Convert readonly sourceLocations array to mutable if present
-      ...(ka.sourceLocations && {
-        sourceLocations: ka.sourceLocations.map((loc) => ({ ...loc })),
-      }),
-      // Convert readonly compoundConditionalIds array to mutable if present
-      ...(ka.compoundConditionalIds && {
-        compoundConditionalIds: [...ka.compoundConditionalIds],
-      }),
-    })),
-  ].filter(
-    (ka, index, self) =>
-      self.findIndex((k) => k.internalPath === ka.internalPath) === index,
-  );
-
-  if (keyAttributesLLMCall) {
-    analysis.metadata.llmCalls ||= [];
-    analysis.metadata.llmCalls.push({
-      name: `generateChangesEntityKeyAttributes`,
-      id: keyAttributesLLMCall.id,
+  // Generate execution flows if not already present
+  if (!analysis.metadata.executionFlows) {
+    await generateExecutionFlows({
+      entity,
+      analysis,
+      model,
+      updateProgress,
+      dependentAnalyses,
     });
   }
-  // }
-
-  const addedKeyAttributes = analysis.metadata.keyAttributes?.filter(
-    (ka) =>
-      !previousAnalysis.metadata.keyAttributes?.find(
-        (ka2) => ka.internalPath === ka2.internalPath,
-      ),
-  );
-  const removedKeyAttributes = previousAnalysis.metadata.keyAttributes?.filter(
-    (ka) =>
-      !analysis.metadata.keyAttributes.find(
-        (ka2) => ka.internalPath === ka2.internalPath,
-      ),
-  );
-
-  // Log key attribute changes for debugging
-  awsLog(`CodeYam: Key attribute comparison for ${entity.name}`, {
-    previousKeyAttributePaths: previousAnalysis.metadata.keyAttributes?.map(
-      (ka) => ({
-        internalPath: ka.internalPath,
-        isDependentAttr: !!(ka as any).dependentEntityName,
-        dependentEntityName: (ka as any).dependentEntityName,
-      }),
-    ),
-    currentKeyAttributePaths: analysis.metadata.keyAttributes?.map((ka) => ({
-      internalPath: ka.internalPath,
-      isDependentAttr: !!(ka as any).dependentEntityName,
-      dependentEntityName: (ka as any).dependentEntityName,
-    })),
-    addedKeyAttributePaths: addedKeyAttributes?.map((ka) => ({
-      internalPath: ka.internalPath,
-      isDependentAttr: !!(ka as any).dependentEntityName,
-      dependentEntityName: (ka as any).dependentEntityName,
-      filePath: (ka as any).filePath,
-    })),
-    removedKeyAttributePaths: removedKeyAttributes?.map((ka) => ({
-      internalPath: ka.internalPath,
-      isDependentAttr: !!(ka as any).dependentEntityName,
-      dependentEntityName: (ka as any).dependentEntityName,
-      filePath: (ka as any).filePath,
-    })),
-  });
-
-  // Detect key attributes with NEW source locations (usages)
-  // These are existing attributes that gained new conditional usages in the code
-  const modifiedKeyAttributes = analysis.metadata.keyAttributes
-    ?.filter((ka) => {
-      // Only consider attributes that existed before (not newly added)
-      const previousAttr = previousAnalysis.metadata.keyAttributes?.find(
-        (ka2) => ka.internalPath === ka2.internalPath,
-      );
-      if (!previousAttr) return false;
-
-      // Check if there are new source locations
-      const previousSnippets = new Set(
-        previousAttr.sourceLocations?.map((loc) => loc.codeSnippet) ?? [],
-      );
-      const newSourceLocations = ka.sourceLocations?.filter(
-        (loc) => !previousSnippets.has(loc.codeSnippet),
-      );
-
-      return newSourceLocations && newSourceLocations.length > 0;
-    })
-    .map((ka) => {
-      const previousAttr = previousAnalysis.metadata.keyAttributes?.find(
-        (ka2) => ka.internalPath === ka2.internalPath,
-      );
-      const previousSnippets = new Set(
-        previousAttr?.sourceLocations?.map((loc) => loc.codeSnippet) ?? [],
-      );
-      const newSourceLocations = ka.sourceLocations?.filter(
-        (loc) => !previousSnippets.has(loc.codeSnippet),
-      );
-
-      return {
-        keyAttribute: ka,
-        newSourceLocations,
-      };
-    });
 
-  // Log modified key attributes
-  if (modifiedKeyAttributes && modifiedKeyAttributes.length > 0) {
-    awsLog(`CodeYam: Modified key attributes for ${entity.name}`, {
-      modifiedKeyAttributePaths: modifiedKeyAttributes.map((mod) => ({
-        internalPath: mod.keyAttribute.internalPath,
-        isDependentAttr: !!(mod.keyAttribute as any).dependentEntityName,
-        dependentEntityName: (mod.keyAttribute as any).dependentEntityName,
-        newUsageCount: mod.newSourceLocations?.length ?? 0,
-        newUsages: mod.newSourceLocations?.map((loc) => loc.codeSnippet),
-      })),
-    });
-  }
+  // Get previous execution flows for comparison
+  const previousExecutionFlows =
+    previousAnalysis.metadata?.executionFlows ?? [];
 
   // Detect which specific data structure fields changed
   const changedDataStructureFields = detectChangedDataStructureFields(
@@ -281,11 +118,8 @@ export default async function generateChangesScenarios({
     () =>
       generateChangesEntityScenarios({
         entity,
-        keyAttributes: analysis.metadata.keyAttributes,
-        addedKeyAttributes,
-        removedKeyAttributes,
-        modifiedKeyAttributes,
-        dependentAnalyses,
+        executionFlows: analysis.metadata.executionFlows,
+        previousExecutionFlows,
         existingScenarios,
         commitDiff,
         analysis,
@@ -301,10 +135,13 @@ export default async function generateChangesScenarios({
   for (const scenario of scenarios) {
     if (
       scenario.previousVersionId &&
-      !scenario.metadata.revisedFromPreviousVersion
+      !scenario.metadata?.revisedFromPreviousVersion
     ) {
       if (dataStructureChanged) {
-        scenario.metadata.revisedFromPreviousVersion = true;
+        scenario.metadata = {
+          ...scenario.metadata,
+          revisedFromPreviousVersion: true,
+        };
         continue;
       }
 
@@ -312,7 +149,10 @@ export default async function generateChangesScenarios({
         (s) => s.name === scenario.name,
       );
       if (!existingScenarioStatus || existingScenarioStatus.error) {
-        scenario.metadata.revisedFromPreviousVersion = true;
+        scenario.metadata = {
+          ...scenario.metadata,
+          revisedFromPreviousVersion: true,
+        };
       }
     }
   }
@@ -336,7 +176,7 @@ export default async function generateChangesScenarios({
 
     if (analysis.scenarios) {
       for (const existingScenario of analysis.scenarios.filter((s) =>
-        error ? !!s.metadata.error : !s.metadata.error,
+        error ? !!s.metadata?.error : !s.metadata?.error,
       )) {
         const scenarioIndex = scenarios.findIndex(
           (s) => s.name === existingScenario.name,

package/analyzer-template/packages/analyze/src/lib/files/scenarios/generateDataStructure.ts

@@ -16,7 +16,8 @@ import { awsLog } from '~codeyam/utils';
 import gatherDataForMocks from './gatherDataForMocks';
 import enrichArrayTypesFromChildSignatures from './enrichArrayTypesFromChildSignatures';
 import enrichUnknownTypesFromSourceEquivalencies from './enrichUnknownTypesFromSourceEquivalencies';
-
+import { transformationTracer } from './TransformationTracer';
+// import propagateArrayItemSchemas from './propagateArrayItemSchemas';
 export interface GenerateDataStructureArgs {
   entity: Entity;
   dependentAnalyses: ReadonlyAnalysisMap;
@@ -29,7 +30,9 @@ export default function generateDataStructure({
   analysis,
 }: GenerateDataStructureArgs) {
   try {
-    if (!['visual', 'library'].includes(entity.entityType)) return analysis;
+    if (!['visual', 'library'].includes(entity.entityType)) {
+      return analysis;
+    }
 
     awsLog('CodeYam: Generating data structure for', {
       filePath: entity.filePath,
@@ -161,6 +164,25 @@ export default function generateDataStructure({
         return acc;
       }, {} as ReadonlyAnalysisMap);
 
+    // Include same-file child components in nonMockedDependentAnalyses.
+    // Same-file components (e.g., AgentCard defined in the same file as AgentTranscriptsPage)
+    // are NOT in importedExports, so the reduce above never includes them.
+    // But they ARE in dependentAnalyses and their full signatureSchema (with all prop fields)
+    // needs to be merged into the parent's dependencySchemas for array enrichment to work.
+
+    const sameFileAnalyses = dependentAnalyses[entity.filePath];
+    if (sameFileAnalyses) {
+      for (const name in sameFileAnalyses) {
+        if (name === entity.name) continue;
+        if (nonMockedDependentAnalyses[entity.filePath]?.[name]) continue;
+        const childAnalysis = sameFileAnalyses[name];
+        if (childAnalysis?.entityType === 'visual') {
+          nonMockedDependentAnalyses[entity.filePath] ||= {};
+          nonMockedDependentAnalyses[entity.filePath][name] = childAnalysis;
+        }
+      }
+    }
+
     // For non-mocked child components (like visual components), include their mocked
     // dependencies in allImportedExports. This ensures that when a parent component
     // renders a child that uses the same hook with different destructure patterns,
@@ -254,8 +276,10 @@ export default function generateDataStructure({
           );
 
           if (existingImport) {
-            // Merge callVariableNames if the same dependency exists with different patterns
-            if (imported.callVariableNames && imported.calls) {
+            // Merge calls from child into existing import
+            // Note: Check length > 0 because empty array [] is truthy but has no variable names
+            if (imported.callVariableNames?.length && imported.calls) {
+              // Case 1: Both calls and callVariableNames are set - merge as pairs
               existingImport.calls = existingImport.calls || [];
               existingImport.callVariableNames =
                 existingImport.callVariableNames || [];
@@ -272,6 +296,18 @@ export default function generateDataStructure({
                   existingImport.callVariableNames.push(varName);
                 }
               }
+            } else if (imported.calls) {
+              // Case 2: Only calls are set (no callVariableNames) - common with tRPC
+              // where destructuring like `const { data, isLoading } = trpc.xxx.useQuery()`
+              // doesn't create a variable name for the hook call itself
+              existingImport.calls = existingImport.calls || [];
+
+              // Add each call that doesn't already exist
+              for (const call of imported.calls) {
+                if (!existingImport.calls.includes(call)) {
+                  existingImport.calls.push(call);
+                }
+              }
             }
           } else {
             // Add new import
@@ -425,6 +461,18 @@ export default function generateDataStructure({
 
     const { isolatedDataStructure } = entity.metadata;
 
+    // Transformation tracing: start entity and capture isolated data structure
+    transformationTracer.startEntity({
+      name: entity.name,
+      entityType: entity.entityType,
+      filePath: entity.filePath,
+    });
+    transformationTracer.snapshot(entity.name, 'isolated', {
+      signatureSchema: isolatedDataStructure.signatureSchema,
+      returnValueSchema: isolatedDataStructure.returnValueSchema,
+      dependencySchemas: isolatedDataStructure.dependencySchemas,
+    });
+
     const mergedDataStructure = mergeInDependentDataStructure({
       importedExports: allImportedExports,
       dependentAnalyses: nonMockedDependentAnalyses,
@@ -442,6 +490,13 @@ export default function generateDataStructure({
     mergedDataStructure.environmentVariables =
       isolatedDataStructure.environmentVariables || [];
 
+    // Transformation tracing: capture merged data structure
+    transformationTracer.snapshot(entity.name, 'merged', {
+      signatureSchema: mergedDataStructure.signatureSchema,
+      returnValueSchema: mergedDataStructure.returnValueSchema,
+      dependencySchemas: mergedDataStructure.dependencySchemas,
+    });
+
     // Merge collected child dependency schemas into mergedDataStructure.
     // This ensures that when gatherDataForMocks looks up schemas for child imports,
     // the child's schemas are available.
@@ -454,11 +509,34 @@ export default function generateDataStructure({
 
         if (existingSchema) {
           // Merge schemas - child schemas add to parent schemas
+          // But prefer more specific types (without | undefined) when both exist
+          const mergedSignatureSchema = { ...existingSchema.signatureSchema };
+          for (const path in childSchema.signatureSchema) {
+            const existingType = mergedSignatureSchema[path];
+            const childType = childSchema.signatureSchema[path];
+            if (!existingType) {
+              mergedSignatureSchema[path] = childType;
+            } else {
+              // Prefer the more specific (narrower) type
+              const existingIsOptional =
+                existingType.includes('| undefined') ||
+                existingType.includes('| null');
+              const childIsOptional =
+                childType.includes('| undefined') ||
+                childType.includes('| null');
+              if (childIsOptional && !existingIsOptional) {
+                // Keep existing - it's more specific
+              } else if (!childIsOptional && existingIsOptional) {
+                // Use child - it's more specific
+                mergedSignatureSchema[path] = childType;
+              } else {
+                // Same specificity - use child (original behavior)
+                mergedSignatureSchema[path] = childType;
+              }
+            }
+          }
           mergedDataStructure.dependencySchemas[schemaFilePath][schemaName] = {
-            signatureSchema: {
-              ...existingSchema.signatureSchema,
-              ...childSchema.signatureSchema,
-            },
+            signatureSchema: mergedSignatureSchema,
             returnValueSchema: mergeJsonTypeDefinitions(
               existingSchema.returnValueSchema as Record<string, unknown>,
               childSchema.returnValueSchema as Record<string, unknown>,
@@ -472,6 +550,13 @@ export default function generateDataStructure({
       }
     }
 
+    // Transformation tracing: capture after child schemas merged
+    transformationTracer.snapshot(entity.name, 'childSchemasMerged', {
+      signatureSchema: mergedDataStructure.signatureSchema,
+      returnValueSchema: mergedDataStructure.returnValueSchema,
+      dependencySchemas: mergedDataStructure.dependencySchemas,
+    });
+
     // console.info(
     //   'CODEYAM DEBUG: end merge',
     //   JSON.stringify(
@@ -494,65 +579,223 @@ export default function generateDataStructure({
 
     // Deduplicate function schemas in the merged data structure
     // The merge process might introduce duplicates even if individual schemas were clean
+    // Trace deduplication of signatureSchema
+    const sigBefore = { ...mergedDataStructure.signatureSchema };
     mergedDataStructure.signatureSchema = deduplicateFunctionSchemas(
       mergedDataStructure.signatureSchema,
     );
+    transformationTracer.traceSchemaTransformResult(
+      entity.name,
+      'deduplicateFunctionSchemas',
+      sigBefore,
+      mergedDataStructure.signatureSchema,
+      { schemaType: 'signature' },
+    );
+
+    // Trace deduplication of returnValueSchema
+    const rvBefore = { ...mergedDataStructure.returnValueSchema };
     mergedDataStructure.returnValueSchema = deduplicateFunctionSchemas(
       mergedDataStructure.returnValueSchema,
     );
+    transformationTracer.traceSchemaTransformResult(
+      entity.name,
+      'deduplicateFunctionSchemas',
+      rvBefore,
+      mergedDataStructure.returnValueSchema,
+      { schemaType: 'returnValue' },
+    );
 
-    // Also deduplicate dependency schemas
+    // Also deduplicate dependency schemas and clear known attributes
     for (const filePath in mergedDataStructure.dependencySchemas) {
-      for (const entityName in mergedDataStructure.dependencySchemas[
+      for (const depEntityName in mergedDataStructure.dependencySchemas[
         filePath
       ]) {
         const depSchema =
-          mergedDataStructure.dependencySchemas[filePath][entityName];
+          mergedDataStructure.dependencySchemas[filePath][depEntityName];
+
+        // Trace deduplication of dependency signatureSchema
+        const depSigBefore = { ...depSchema.signatureSchema };
         depSchema.signatureSchema = deduplicateFunctionSchemas(
           depSchema.signatureSchema,
         );
+        transformationTracer.traceSchemaTransformResult(
+          entity.name,
+          'deduplicateFunctionSchemas',
+          depSigBefore,
+          depSchema.signatureSchema,
+          { filePath, dependencyName: depEntityName, schemaType: 'signature' },
+        );
+
+        // Trace deduplication of dependency returnValueSchema
+        const depRvBefore = { ...depSchema.returnValueSchema };
         depSchema.returnValueSchema = deduplicateFunctionSchemas(
           depSchema.returnValueSchema,
         );
+        transformationTracer.traceSchemaTransformResult(
+          entity.name,
+          'deduplicateFunctionSchemas',
+          depRvBefore,
+          depSchema.returnValueSchema,
+          {
+            filePath,
+            dependencyName: depEntityName,
+            schemaType: 'returnValue',
+          },
+        );
+
+        // Fill in type gaps BEFORE clearing attributes, so evidence like .includes()
+        // is used for type inference before being deleted
+
+        depSchema.signatureSchema = fillInDirectSchemaGapsAndUnknowns({
+          schema: depSchema.signatureSchema,
+        });
+
+        depSchema.returnValueSchema = fillInDirectSchemaGapsAndUnknowns({
+          schema: depSchema.returnValueSchema,
+        });
+
+        // Trace clearAttributesFromMapping on dependency schemas
+        transformationTracer.traceSchemaTransform(
+          entity.name,
+          'clearAttributesFromMapping',
+          depSchema.signatureSchema,
+          clearAttributesFromMapping,
+          { filePath, dependencyName: depEntityName, schemaType: 'signature' },
+        );
 
-        clearAttributesFromMapping(depSchema.signatureSchema);
-        clearAttributesFromMapping(depSchema.returnValueSchema);
+        transformationTracer.traceSchemaTransform(
+          entity.name,
+          'clearAttributesFromMapping',
+          depSchema.returnValueSchema,
+          clearAttributesFromMapping,
+          {
+            filePath,
+            dependencyName: depEntityName,
+            schemaType: 'returnValue',
+          },
+        );
       }
     }
 
+    // Transformation tracing: capture after deduplication
+    transformationTracer.snapshot(entity.name, 'deduplicated', {
+      signatureSchema: mergedDataStructure.signatureSchema,
+      returnValueSchema: mergedDataStructure.returnValueSchema,
+      dependencySchemas: mergedDataStructure.dependencySchemas,
+    });
+
     analysis.metadata ||= {};
     analysis.metadata.mergedDataStructure = mergedDataStructure;
 
     // Enrich mocked dependency array types with fields from child component signatures
     // This ensures that when getSurveysAction returns { data: array }, and SurveyCard
-    // expects survey.updatedAt, the array element type includes updatedAt
-    enrichArrayTypesFromChildSignatures(
-      allImportedExports,
+    // expects survey.updatedAt, the array element type includes updatedAt.
+    // Uses usageEquivalencies to trace data flow and only enrich arrays with fields
+    // from children that actually receive elements from that specific array.
+    transformationTracer.traceDependencySchemaChanges(
+      entity.name,
+      'enrichArrayTypesFromChildSignatures',
       mergedDataStructure.dependencySchemas,
+      () =>
+        enrichArrayTypesFromChildSignatures(
+          allImportedExports,
+          mergedDataStructure.dependencySchemas,
+          mergedDataStructure.usageEquivalencies,
+        ),
     );
 
+    // Transformation tracing: capture after array types enriched
+    transformationTracer.snapshot(entity.name, 'arrayTypesEnriched', {
+      signatureSchema: mergedDataStructure.signatureSchema,
+      returnValueSchema: mergedDataStructure.returnValueSchema,
+      dependencySchemas: mergedDataStructure.dependencySchemas,
+    });
+
     // Enrich mocked dependency unknown types using sourceEquivalencies
     // When a mocked dependency returns unknown, but that data flows to a child component
     // with a known type, propagate the type back to the mocked dependency.
     // This prevents fillInDirectSchemaGapsAndUnknowns from guessing incorrectly
     // (e.g., 'data' becoming 'number' because pluralize thinks it's plural)
-    enrichUnknownTypesFromSourceEquivalencies(
-      isolatedDataStructure.dependencySchemas || {},
+    transformationTracer.traceDependencySchemaChanges(
+      entity.name,
+      'enrichUnknownTypesFromSourceEquivalencies',
       mergedDataStructure.dependencySchemas,
-      allImportedExports,
+      () =>
+        enrichUnknownTypesFromSourceEquivalencies(
+          isolatedDataStructure.dependencySchemas || {},
+          mergedDataStructure.dependencySchemas,
+          allImportedExports,
+        ),
     );
 
-    const dataForMocks = gatherDataForMocks(
+    // Transformation tracing: capture after unknown types enriched
+    transformationTracer.snapshot(entity.name, 'unknownTypesEnriched', {
+      signatureSchema: mergedDataStructure.signatureSchema,
+      returnValueSchema: mergedDataStructure.returnValueSchema,
+      dependencySchemas: mergedDataStructure.dependencySchemas,
+    });
+
+    // DISABLED: Testing if ternary fix eliminates the need for this heuristic
+    // Propagate array item schemas between arrays that likely have the same type.
+    // When one array (e.g., entities) has item schema traced but another similar array
+    // (e.g., currentEntities) doesn't (because it's only used in an OR expression fallback),
+    // copy the item schema from the rich array to the empty one.
+    // propagateArrayItemSchemas(mergedDataStructure.dependencySchemas);
+
+    let dataForMocks = gatherDataForMocks(
       allImportedExports,
       mergedDataStructure.dependencySchemas,
       { entityName: entity.name },
     );
 
-    const finalizedArgumentsSchema = fillInDirectSchemaGapsAndUnknowns({
-      schema: { ...mergedDataStructure.signatureSchema },
+    // Transformation tracing: capture after dataForMocks gathered
+    transformationTracer.snapshot(entity.name, 'dataForMocksGathered', {
+      signatureSchema: mergedDataStructure.signatureSchema,
+      returnValueSchema: mergedDataStructure.returnValueSchema,
+      dependencySchemas: mergedDataStructure.dependencySchemas,
+      dataForMocks,
     });
 
-    clearAttributesFromMapping(finalizedArgumentsSchema);
+    // Merge dataForMocks from non-mocked child analyses to include transitive dependency data.
+    // This handles cases where grandchild trpc calls aren't in allImportedExports because
+    // the grandchild's analysis wasn't in dependentAnalyses.
+    //
+    // Issue 19 fix: The child's dataForMocks already contains merged data from its
+    // dependencies (including grandchildren). By merging the child's dataForMocks,
+    // we transitively include all nested dependency data.
+    for (const filePath in nonMockedDependentAnalyses) {
+      for (const name in nonMockedDependentAnalyses[filePath]) {
+        const childAnalysis = nonMockedDependentAnalyses[filePath][name];
+        const childDataForMocks =
+          childAnalysis?.metadata?.scenariosDataStructure?.dataForMocks;
+        if (childDataForMocks && Object.keys(childDataForMocks).length > 0) {
+          dataForMocks = mergeJsonTypeDefinitions(
+            dataForMocks as Record<string, unknown>,
+            childDataForMocks as Record<string, unknown>,
+          ) as { [importAlias: string]: JsonTypeDefinition };
+        }
+      }
+    }
+
+    const finalizedArgumentsSchema = { ...mergedDataStructure.signatureSchema };
+
+    // Trace fillInDirectSchemaGapsAndUnknowns
+    transformationTracer.traceSchemaTransform(
+      entity.name,
+      'fillInDirectSchemaGapsAndUnknowns',
+      finalizedArgumentsSchema,
+      (schema) => fillInDirectSchemaGapsAndUnknowns({ schema }),
+      { stage: 'finalization' },
+    );
+
+    // Trace clearAttributesFromMapping
+    transformationTracer.traceSchemaTransform(
+      entity.name,
+      'clearAttributesFromMapping',
+      finalizedArgumentsSchema,
+      clearAttributesFromMapping,
+      { stage: 'finalization' },
+    );
 
     const argumentsSchema = convertDotNotation(finalizedArgumentsSchema)
       .signature as JsonTypeDefinition[];
@@ -562,6 +805,12 @@ export default function generateDataStructure({
       dataForMocks,
     };
 
+    // Transformation tracing: capture final scenariosDataStructure
+    transformationTracer.snapshot(entity.name, 'finalized', {
+      signatureSchema: finalizedArgumentsSchema,
+      dataForMocks,
+    });
+
     return analysis;
   } catch (e) {
     awsLog('CodeYam Error: Error generating data structure', {