@codeyam/codeyam-cli 0.1.0-staging.323686 → 0.1.0-staging.4057bd2

package/packages/ai/src/lib/dataStructure/helpers/stripNullableMarkers.js

@@ -0,0 +1,34 @@
+/**
+ * Recursively strips `_nullable` keys from LLM-generated mock data.
+ *
+ * The `_nullable` marker is an internal CodeYam concept used in type definitions
+ * to indicate that a field can be null/undefined. The LLM sometimes includes
+ * these markers in its generated scenario data, which causes runtime errors
+ * when code iterates over object keys (e.g., `Object.keys(importedBy)` picks
+ * up `_nullable` as a key alongside real data).
+ *
+ * This function mutates the input object in-place, consistent with other
+ * post-processing helpers like `convertNullToUndefinedBySchema`.
+ */
+export default function stripNullableMarkers(data) {
+    if (data == null || typeof data !== 'object')
+        return;
+    // Delete _nullable from this level
+    if ('_nullable' in data) {
+        delete data._nullable;
+    }
+    // Recurse into nested objects and arrays
+    for (const value of Object.values(data)) {
+        if (Array.isArray(value)) {
+            for (const item of value) {
+                if (item !== null && typeof item === 'object' && !Array.isArray(item)) {
+                    stripNullableMarkers(item);
+                }
+            }
+        }
+        else if (value !== null && typeof value === 'object') {
+            stripNullableMarkers(value);
+        }
+    }
+}
+//# sourceMappingURL=stripNullableMarkers.js.map

package/packages/ai/src/lib/dataStructure/helpers/stripNullableMarkers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"stripNullableMarkers.js","sourceRoot":"","sources":["../../../../../../../../packages/ai/src/lib/dataStructure/helpers/stripNullableMarkers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAC1C,IAA6B;IAE7B,IAAI,IAAI,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ;QAAE,OAAO;IAErD,mCAAmC;IACnC,IAAI,WAAW,IAAI,IAAI,EAAE,CAAC;QACxB,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED,yCAAyC;IACzC,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QACxC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,IAAI,IAAI,KAAK,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;oBACtE,oBAAoB,CAAC,IAA+B,CAAC,CAAC;gBACxD,CAAC;YACH,CAAC;QACH,CAAC;aAAM,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YACvD,oBAAoB,CAAC,KAAgC,CAAC,CAAC;QACzD,CAAC;IACH,CAAC;AACH,CAAC"}

package/packages/ai/src/lib/dataStructureChunking.js

@@ -1,32 +1,51 @@
-const DEFAULT_MAX_KEYS_PER_CHUNK = 8;
+const DEFAULT_MAX_CHUNK_SIZE = 10000; // ~10K chars per chunk
+const DEFAULT_MAX_KEYS_PER_CHUNK = 20;
 /**
  * Chunk a large data structure into smaller pieces for focused LLM processing.
  *
  * Large schemas overwhelm LLMs, causing them to make mistakes on some keys.
  * By processing smaller chunks, each key gets more focused attention.
  *
+ * Uses cumulative JSON size to decide chunk boundaries rather than a fixed
+ * key count, so a single oversized key gets its own chunk while many small
+ * keys are grouped together efficiently.
+ *
  * @param dataForMocks - The full data structure schema
- * @param options - Chunking options (maxKeysPerChunk defaults to 8)
+ * @param options - Chunking options (maxChunkSize defaults to 10_000)
  * @returns Array of smaller data structure chunks
  */
 export function chunkDataStructure(dataForMocks, options = {}) {
     if (!dataForMocks || typeof dataForMocks !== 'object') {
         return [dataForMocks];
     }
-    const { maxKeysPerChunk = DEFAULT_MAX_KEYS_PER_CHUNK } = options;
+    const { maxChunkSize = DEFAULT_MAX_CHUNK_SIZE, maxKeysPerChunk = DEFAULT_MAX_KEYS_PER_CHUNK, } = options;
     const keys = Object.keys(dataForMocks);
-    // Don't chunk if already small enough
-    if (keys.length <= maxKeysPerChunk) {
+    // Calculate total size to see if chunking is needed
+    const totalSize = JSON.stringify(dataForMocks).length;
+    if (totalSize <= maxChunkSize && keys.length <= maxKeysPerChunk) {
         return [dataForMocks];
     }
+    // Greedily pack keys into chunks by cumulative size and key count
     const chunks = [];
-    for (let i = 0; i < keys.length; i += maxKeysPerChunk) {
-        const chunkKeys = keys.slice(i, i + maxKeysPerChunk);
-        const chunk = {};
-        for (const key of chunkKeys) {
-            chunk[key] = dataForMocks[key];
+    let currentChunk = {};
+    let currentSize = 0;
+    for (const key of keys) {
+        const keySize = JSON.stringify(dataForMocks[key]).length;
+        const currentKeyCount = Object.keys(currentChunk).length;
+        // If adding this key would exceed size or key count limit AND chunk isn't empty, start a new chunk
+        if (currentSize > 0 &&
+            (currentSize + keySize > maxChunkSize ||
+                currentKeyCount >= maxKeysPerChunk)) {
+            chunks.push(currentChunk);
+            currentChunk = {};
+            currentSize = 0;
         }
-        chunks.push(chunk);
+        currentChunk[key] = dataForMocks[key];
+        currentSize += keySize;
+    }
+    // Push the last chunk
+    if (Object.keys(currentChunk).length > 0) {
+        chunks.push(currentChunk);
     }
     return chunks;
 }

package/packages/ai/src/lib/dataStructureChunking.js.map

@@ -1 +1 @@
-{"version":3,"file":"dataStructureChunking.js","sourceRoot":"","sources":["../../../../../../packages/ai/src/lib/dataStructureChunking.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"dataStructureChunking.js","sourceRoot":"","sources":["../../../../../../packages/ai/src/lib/dataStructureChunking.ts"],"names":[],"mappings":"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"}

package/packages/ai/src/lib/generateEntityDataStructure.js

@@ -1,6 +1,7 @@
 import isolateScopes from "./isolateScopes.js";
 import analyzeScope from "./analyzeScope.js";
-import { resetScopeDataStructureMetrics } from "./dataStructure/ScopeDataStructure.js";
+import { transformationTracer } from "../../../../packages/analyze/index.js";
+import { resetScopeDataStructureMetrics, } from "./dataStructure/ScopeDataStructure.js";
 export default async function generateEntityDataStructure({ entity, fileAnalyzer, model, }) {
     // Reset metrics counters to prevent false "infinite loop" detection when
     // processing multiple entities in the same run
@@ -61,8 +62,51 @@ export default async function generateEntityDataStructure({ entity, fileAnalyzer
         return undefined;
     }
     // Inspect the runtime type of dataStructure to see if it must be serialized
+    // Note: When worker threads are used, dataStructure is already serialized (no toSerializable).
+    // Workers are disabled when CODEYAM_TRACE_TRANSFORMS=1 to enable full tracing.
     if ('toSerializable' in entityScope.dataStructure) {
-        return entityScope.dataStructure.toSerializable();
+        const scopeDataStructure = entityScope.dataStructure;
+        // Trace the internal state BEFORE serialization - captures what methods return
+        if (transformationTracer.isEnabled()) {
+            transformationTracer.startEntity({
+                name: entity.name,
+                entityType: entity.entityType ?? 'unknown',
+                filePath: entity.filePath,
+            });
+            // Capture internal state - this is what getReturnValue/getFunctionSignature return
+            transformationTracer.snapshot(entity.name, 'scopeDataStructure', {
+                signatureSchema: scopeDataStructure.getFunctionSignature({
+                    fillInUnknowns: true,
+                }),
+                returnValueSchema: scopeDataStructure.getReturnValue({
+                    fillInUnknowns: true,
+                }),
+            });
+        }
+        const serialized = scopeDataStructure.toSerializable();
+        // Trace AFTER serialization - shows what gets output
+        if (transformationTracer.isEnabled()) {
+            // Build schema from external function calls for comparison
+            const externalSchemas = {};
+            for (const efc of serialized.externalFunctionCalls ?? []) {
+                for (const [path, type] of Object.entries(efc.schema ?? {})) {
+                    externalSchemas[path] = type;
+                }
+            }
+            transformationTracer.snapshot(entity.name, 'serialized', {
+                signatureSchema: serialized.functionResults?.[entity.name]?.signatureWithUnknowns,
+                returnValueSchema: serialized.functionResults?.[entity.name]?.returnValueWithUnknowns,
+                // Include external function schemas to detect serialization gaps
+                dependencySchemas: {
+                    externalFunctions: {
+                        combined: {
+                            returnValueSchema: externalSchemas,
+                        },
+                    },
+                },
+            });
+        }
+        return serialized;
     }
     return entityScope.dataStructure;
 }

package/packages/ai/src/lib/generateEntityDataStructure.js.map

@@ -1 +1 @@
-{"version":3,"file":"generateEntityDataStructure.js","sourceRoot":"","sources":["../../../../../../packages/ai/src/lib/generateEntityDataStructure.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generateEntityDataStructure.js","sourceRoot":"","sources":["../../../../../../packages/ai/src/lib/generateEntityDataStructure.ts"],"names":[],"mappings":"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"}

package/packages/ai/src/lib/generateEntityScenarioData.js

@@ -8,7 +8,11 @@ import validateJson from "./validateJson.js";
 import { awsLog, awsLogDebugLevel } from "../../../../packages/utils/index.js";
 import { parseJsonSafe } from "../../../../packages/ai/index.js";
 import convertNullToUndefinedBySchema from "./dataStructure/helpers/convertNullToUndefinedBySchema.js";
+import convertTypeAnnotationsToValues from "./dataStructure/helpers/convertTypeAnnotationsToValues.js";
 import fixNullIdsBySchema from "./dataStructure/helpers/fixNullIdsBySchema.js";
+import coerceObjectsToPrimitivesBySchema from "./dataStructure/helpers/coerceObjectsToPrimitivesBySchema.js";
+import coercePrimitivesToArraysBySchema from "./dataStructure/helpers/coercePrimitivesToArraysBySchema.js";
+import stripNullableMarkers from "./dataStructure/helpers/stripNullableMarkers.js";
 import { deepMerge } from "../../../../packages/generate/index.js";
 import { chunkDataStructure, getRequiredValuesForChunk, } from "./dataStructureChunking.js";
 /**
@@ -127,6 +131,35 @@ function findKeyPath(targetKey, obj, currentPath = []) {
     }
     return null;
 }
+/**
+ * Strip primitive values from `source` when the `destination` already has an
+ * array or object at the same key. Returns a cleaned copy of source (or null
+ * if nothing remains after stripping).
+ *
+ * This prevents misplaced LLM data (e.g., `{ webapps: true }`) from
+ * overwriting correct complex values (e.g., `{ webapps: [...] }`) during
+ * deep merge in relocateMisplacedNestedKeys.
+ */
+function stripPrimitivesOverwritingComplexValues(destination, source) {
+    if (typeof source !== 'object' || source === null || Array.isArray(source)) {
+        return null;
+    }
+    const result = {};
+    let hasKeys = false;
+    for (const key of Object.keys(source)) {
+        const srcVal = source[key];
+        const dstVal = destination[key];
+        // If destination has an array or object but source has a primitive, skip it
+        if (typeof dstVal === 'object' &&
+            dstVal !== null &&
+            typeof srcVal !== 'object') {
+            continue;
+        }
+        result[key] = srcVal;
+        hasKeys = true;
+    }
+    return hasKeys ? result : null;
+}
 /**
  * Relocate misplaced nested keys in mockData to their correct position
  * based on the dataForMocks structure.
@@ -179,9 +212,16 @@ function relocateMisplacedNestedKeys(mockData, dataForMocks, currentPathForLoggi
             current = current[pathKey];
         }
         // Deep merge the value into the correct location
-        // Use deep merge to preserve existing data at that location
+        // Use deep merge to preserve existing data at that location.
+        // Before merging, strip primitives from the misplaced value that would
+        // overwrite arrays/objects at the destination. The misplaced data is lower
+        // quality — the LLM put it in the wrong place — so primitives like `true`
+        // should not overwrite correct complex values like arrays.
         if (current[key] !== undefined && typeof current[key] === 'object') {
-            current[key] = deepMerge(current[key], value);
+            const safeValue = stripPrimitivesOverwritingComplexValues(current[key], value);
+            if (safeValue !== null) {
+                current[key] = deepMerge(current[key], safeValue);
+            }
         }
         else {
             current[key] = value;
@@ -235,9 +275,14 @@ function generateDefaultForSchemaType(schemaType) {
             return null;
         return schemaType; // Return the type as a string placeholder
     }
-    if (typeof schemaType === 'object' &&
-        schemaType !== null &&
-        !Array.isArray(schemaType)) {
+    if (Array.isArray(schemaType)) {
+        if (schemaType.length === 0)
+            return [];
+        // Generate a single default element based on the first element's schema
+        const elementDefault = generateDefaultForSchemaType(schemaType[0]);
+        return elementDefault !== undefined ? [elementDefault] : [];
+    }
+    if (typeof schemaType === 'object' && schemaType !== null) {
         // Recursively generate defaults for nested objects
         const result = {};
         for (const [key, value] of Object.entries(schemaType)) {
@@ -342,6 +387,8 @@ function fillMissingMockDataKeysWithDefaults(mockData, dataForMocks, pathPrefix
     }
     const missingKeys = [];
     for (const key of Object.keys(dataForMocks)) {
+        if (key === '_nullable')
+            continue; // Internal marker, not a data key
         const fullPath = pathPrefix ? `${pathPrefix}.${key}` : key;
         if (mockData[key] === undefined) {
             missingKeys.push(fullPath);
@@ -367,6 +414,139 @@ function fillMissingMockDataKeysWithDefaults(mockData, dataForMocks, pathPrefix
         awsLog(`CodeYam: Generated default mock data for ${missingKeys.length} missing key(s): ${missingKeys.slice(0, 10).join(', ')}${missingKeys.length > 10 ? '...' : ''}`);
     }
 }
+/**
+ * Enforce execution flow requiredValues by setting falsy paths to null.
+ *
+ * The LLM doesn't reliably generate null for `comparison: 'falsy'` requirements.
+ * For example, a flow like "diffView: falsy" should hide a modal, but the LLM
+ * might generate a truthy object, causing the modal to show in all screenshots.
+ *
+ * This function:
+ * 1. Gets requiredValues from covered flows
+ * 2. For 'falsy' comparisons: sets the value to null
+ * 3. For 'truthy' comparisons with falsy values: generates a default truthy value
+ */
+function enforceRequiredValues(mockData, coveredFlowIds, executionFlows) {
+    if (!coveredFlowIds.length || !executionFlows.length) {
+        return;
+    }
+    // Get all requiredValues from covered flows
+    const coveredFlows = executionFlows.filter((flow) => coveredFlowIds.includes(flow.id));
+    for (const flow of coveredFlows) {
+        if (!flow.requiredValues)
+            continue;
+        for (const rv of flow.requiredValues) {
+            if (!rv.attributePath)
+                continue;
+            // Find the value in mockData - the path could be nested
+            // e.g., attributePath: "diffView" could be at mockData['useDiffModal()'].diffView
+            const result = findAndSetValueInMockData(mockData, rv.attributePath, rv.comparison, rv.valueType);
+            if (result.found) {
+                awsLog(`CodeYam: Enforced ${rv.comparison} for ${rv.attributePath} (set to ${result.newValue === null ? 'null' : typeof result.newValue})`);
+            }
+        }
+    }
+}
+/**
+ * Find a value in mockData by attributePath and enforce the comparison.
+ * The attributePath could be a simple key or a nested path.
+ *
+ * Returns { found: boolean, newValue: unknown }
+ */
+function findAndSetValueInMockData(mockData, attributePath, comparison, valueType) {
+    // Try to find the path at various nesting levels
+    // The attributePath might be "diffView" but the actual location is
+    // mockData['useDiffModal()'].diffView
+    // Strategy 1: Direct path (e.g., mockData[attributePath])
+    if (attributePath in mockData) {
+        const currentValue = mockData[attributePath];
+        const { shouldChange, newValue } = getEnforcedValue(currentValue, comparison, valueType);
+        if (shouldChange) {
+            mockData[attributePath] = newValue;
+            return { found: true, newValue };
+        }
+        return { found: true, newValue: currentValue };
+    }
+    // Strategy 2: Search in nested objects
+    for (const [key, value] of Object.entries(mockData)) {
+        if (value && typeof value === 'object' && !Array.isArray(value)) {
+            const nestedObj = value;
+            // Check if attributePath exists in this nested object
+            if (attributePath in nestedObj) {
+                const currentValue = nestedObj[attributePath];
+                const { shouldChange, newValue } = getEnforcedValue(currentValue, comparison, valueType);
+                if (shouldChange) {
+                    nestedObj[attributePath] = newValue;
+                    return { found: true, newValue };
+                }
+                return { found: true, newValue: currentValue };
+            }
+            // Also check dot-notation paths (e.g., "diffView.type")
+            if (attributePath.includes('.')) {
+                const parts = attributePath.split('.');
+                const firstPart = parts[0];
+                if (firstPart in nestedObj) {
+                    // Recurse with the rest of the path
+                    const result = findAndSetValueInMockData(nestedObj, attributePath, comparison, valueType);
+                    if (result.found)
+                        return result;
+                }
+            }
+            // Recursively search deeper
+            const result = findAndSetValueInMockData(nestedObj, attributePath, comparison, valueType);
+            if (result.found)
+                return result;
+        }
+    }
+    return { found: false };
+}
+/**
+ * Determine if a value should be changed to match a comparison requirement.
+ *
+ * For 'falsy' comparison: truthy values should become null
+ * For 'truthy' comparison: falsy values should become a default truthy value
+ */
+function getEnforcedValue(currentValue, comparison, valueType) {
+    const isTruthy = Boolean(currentValue);
+    if (comparison === 'falsy') {
+        // Value should be falsy
+        if (isTruthy) {
+            return { shouldChange: true, newValue: null };
+        }
+        return { shouldChange: false, newValue: currentValue };
+    }
+    if (comparison === 'truthy') {
+        // Value should be truthy
+        if (!isTruthy) {
+            // Generate a default truthy value based on valueType
+            const defaultValue = generateDefaultTruthyValue(valueType);
+            return { shouldChange: true, newValue: defaultValue };
+        }
+        return { shouldChange: false, newValue: currentValue };
+    }
+    // For other comparisons (equals, exists, etc.), don't auto-enforce
+    return { shouldChange: false, newValue: currentValue };
+}
+/**
+ * Generate a default truthy value for a given type.
+ */
+function generateDefaultTruthyValue(valueType) {
+    if (!valueType)
+        return { _placeholder: true };
+    switch (valueType.toLowerCase()) {
+        case 'string':
+            return 'default-value';
+        case 'number':
+            return 1;
+        case 'boolean':
+            return true;
+        case 'array':
+            return [{ _placeholder: true }];
+        case 'object':
+        default:
+            return { _placeholder: true };
+    }
+}
 /**
  * For Default Scenario only: detect missing mockData keys and make a follow-up
  * LLM call to fill them in. This handles cases where the LLM completes normally
@@ -477,6 +657,18 @@ export async function generateDataForScenario({ entity, structure, scenario, exe
                     }
                 }
             }
+            // Detect keys that were lost from failed or partial chunk responses
+            // and fill them with schema-based defaults so they aren't permanently lost.
+            const allChunkedKeys = chunks.flatMap((c) => Object.keys(c || {}));
+            const returnedKeys = new Set(Object.keys(chunkedMockData));
+            const missingChunkKeys = allChunkedKeys.filter((k) => !returnedKeys.has(k));
+            if (missingChunkKeys.length > 0) {
+                awsLog(`Chunked processing: ${missingChunkKeys.length} key(s) missing from chunk results, filling with defaults: ${missingChunkKeys.join(', ')}`);
+                const dataForMocksRecord = structure.dataForMocks;
+                for (const key of missingChunkKeys) {
+                    chunkedMockData[key] = generateDefaultForSchemaType(dataForMocksRecord[key]);
+                }
+            }
             awsLog(`Chunked processing complete. Generated ${Object.keys(chunkedMockData).length} keys total`);
         }
     }
@@ -629,6 +821,15 @@ export async function generateDataForScenario({ entity, structure, scenario, exe
         }
         awsLog(`Merged chunked mock data for keys: ${Object.keys(chunkedMockData).join(', ')}`);
     }
+    // Strip _nullable markers from LLM-generated mock data.
+    // The _nullable marker is an internal CodeYam concept used in type definitions
+    // to indicate that a field can be null/undefined. The LLM sometimes includes
+    // these markers in its generated data, which causes runtime errors when code
+    // iterates over object keys (e.g., Object.keys(importedBy) picks up "_nullable",
+    // then Object.keys(importedBy["_nullable"]) calls Object.keys(null) and throws).
+    if (fullScenarioData.data.mockData) {
+        stripNullableMarkers(fullScenarioData.data.mockData);
+    }
     // Relocate misplaced nested keys to their correct position.
     // The LLM sometimes places nested keys at root level instead of inside their
     // parent object (e.g., 'fastener' at root instead of inside 'trpc').
@@ -643,6 +844,23 @@ export async function generateDataForScenario({ entity, structure, scenario, exe
     if (structure.dataForMocks && fullScenarioData.data.mockData) {
         convertNullToUndefinedBySchema(fullScenarioData.data.mockData, structure.dataForMocks);
     }
+    // Coerce objects/arrays to primitives when the schema expects a primitive type.
+    // The LLM sometimes generates an object where the schema expects "string",
+    // e.g., { body: { "env": "production" } } instead of { body: "some string" }.
+    // This causes runtime errors like "TypeError: body.match is not a function".
+    // Must run BEFORE convertCommaSeparatedStringsToArrays, which intentionally
+    // overrides schema types for array-like field names.
+    if (structure.dataForMocks && fullScenarioData.data.mockData) {
+        coerceObjectsToPrimitivesBySchema(fullScenarioData.data.mockData, structure.dataForMocks);
+    }
+    // Coerce primitives to empty arrays when the schema expects an array.
+    // The LLM sometimes generates a primitive (e.g., `webapps: true`) where the
+    // schema expects an array (e.g., `webapps: [{ name: "string" }]`).
+    // This causes runtime errors like "TypeError: config.webapps?.forEach is not a function".
+    // Must run AFTER coerceObjectsToPrimitivesBySchema and BEFORE convertCommaSeparatedStringsToArrays.
+    if (structure.dataForMocks && fullScenarioData.data.mockData) {
+        coercePrimitivesToArraysBySchema(fullScenarioData.data.mockData, structure.dataForMocks);
+    }
     // Convert comma-separated strings to arrays when appropriate.
     // The LLM sometimes generates strings like "color,size" instead of arrays
     // like ["color", "size"] when the schema type is incorrectly inferred as
@@ -651,6 +869,15 @@ export async function generateDataForScenario({ entity, structure, scenario, exe
     if (fullScenarioData.data.mockData) {
         convertCommaSeparatedStringsToArrays(fullScenarioData.data.mockData);
     }
+    // Convert type annotation strings that appear as values to actual values.
+    // The LLM sometimes echoes the schema type annotation as the value.
+    // For example, if the schema says { filePath: "string | undefined" },
+    // the LLM might return { filePath: "string | undefined" } instead of
+    // generating an actual value. This converts those type strings to
+    // appropriate default values (e.g., "string | undefined" → undefined).
+    if (fullScenarioData.data.mockData) {
+        convertTypeAnnotationsToValues(fullScenarioData.data.mockData);
+    }
     // Fix null values for ID fields when the schema indicates they should be non-null.
     // The LLM sometimes generates `null` for ID fields (e.g., `"id": null`) when
     // the schema type is `"number"`. This causes runtime issues when code checks
@@ -658,6 +885,13 @@ export async function generateDataForScenario({ entity, structure, scenario, exe
     if (structure.dataForMocks && fullScenarioData.data.mockData) {
         fixNullIdsBySchema(fullScenarioData.data.mockData, structure.dataForMocks);
     }
+    // Enforce execution flow requiredValues by setting falsy paths to null.
+    // The LLM doesn't reliably generate null for falsy requirements (e.g., diffView: falsy
+    // to hide a modal). This post-processing ensures that scenarios match their
+    // covered flows' requiredValues.
+    if (fullScenarioData.data.mockData && executionFlows) {
+        enforceRequiredValues(fullScenarioData.data.mockData, scenario.metadata?.coveredFlows || [], executionFlows);
+    }
     if (structure.arguments && fullScenarioData.data.argumentsData) {
         for (let i = 0; i < fullScenarioData.data.argumentsData.length; i++) {
             if (structure.arguments[i]) {
@@ -787,6 +1021,46 @@ export default async function generateEntityScenarioData({ entity, structure, sc
                 scenarioData.data.argumentsData =
                     defaultScenarioData.data.argumentsData.map((arg) => ({ ...arg }));
             }
+            // Enforce requiredValues AFTER merge for non-default scenarios
+            // This ensures that if a non-default scenario doesn't cover a certain flow,
+            // it inherits the enforcement from the default scenario
+            if (scenarioData.data?.mockData && executionFlows) {
+                // Get the flows covered by this scenario
+                const scenarioCoveredFlows = nonDefaultScenarios.find((s) => s.name === result.scenarioData.scenarioDescription)?.metadata?.coveredFlows || [];
+                // Get the paths that the scenario's flows affect
+                const scenarioAffectedPaths = new Set();
+                for (const flowId of scenarioCoveredFlows) {
+                    const flow = executionFlows.find((f) => f.id === flowId);
+                    if (flow?.requiredValues) {
+                        for (const rv of flow.requiredValues) {
+                            if (rv.attributePath) {
+                                // Extract base path (e.g., "diffView" from "diffView.type")
+                                const basePath = rv.attributePath.split('.')[0];
+                                scenarioAffectedPaths.add(basePath);
+                            }
+                        }
+                    }
+                }
+                // Get the default scenario's flows
+                const defaultCoveredFlows = defaultScenario.metadata?.coveredFlows || [];
+                // For paths NOT affected by the scenario, apply default's enforcement
+                const defaultFlowsForUnaffectedPaths = defaultCoveredFlows.filter((flowId) => {
+                    const flow = executionFlows.find((f) => f.id === flowId);
+                    if (!flow?.requiredValues)
+                        return false;
+                    // Check if this flow affects a path that the scenario doesn't cover
+                    return flow.requiredValues.some((rv) => {
+                        if (!rv.attributePath)
+                            return false;
+                        const basePath = rv.attributePath.split('.')[0];
+                        return !scenarioAffectedPaths.has(basePath);
+                    });
+                });
+                // Apply enforcement from default scenario for unaffected paths
+                if (defaultFlowsForUnaffectedPaths.length > 0) {
+                    enforceRequiredValues(scenarioData.data.mockData, defaultFlowsForUnaffectedPaths, executionFlows);
+                }
+            }
             return scenarioData;
         });
         scenarioDatas.push(...mergedScenarioDatas);
@@ -810,7 +1084,8 @@ Generate COMPLETE, robust data for the entire data structure.
         : `## Non-Default Scenario
 Generate ONLY the differences from the default scenario.
 - Include only fields that need to change
-- Set to \`null\` to remove data
+- For object/scalar fields: set to \`null\` to remove/unset the data
+- For array fields: use \`[]\` for empty arrays (not \`null\`) unless the schema type explicitly includes \`| null\`
 - Omit unchanged fields—they merge from default`;
     // Only include the "NO ERROR DATA" instruction when the scenario doesn't require error data
     const noErrorDataInstruction = requiresErrorData
@@ -892,6 +1167,7 @@ Use simple elements only (\`<div>\`, \`<span>\`). No custom components.
 - Arrays should have many items (at least 4) unless specified otherwise
 - Each item must follow the exact structure provided
 - In general we want robust data, not minimal data unless specified otherwise
+- For empty arrays, use \`[]\` (not \`null\`) unless the schema type explicitly includes \`| null\` and the scenario requires the attribute be removed
 
 ## CRITICAL: Preserve Exact Structure
 Your response MUST mirror the EXACT nested structure provided in mockData Structure.
@@ -965,6 +1241,7 @@ Use simple elements only (\`<div>\`, \`<span>\`). No custom components.
 ### Arrays
 - Arrays should have many items (at least 4) unless specified otherwise
 - Each item must follow the exact structure provided
+- For empty arrays, use \`[]\` (not \`null\`) unless the schema type explicitly includes \`| null\` and the scenario requires the attribute be removed
 
 ## CRITICAL: Preserve Exact Structure
 Your response MUST mirror the EXACT nested structure provided for the missing keys.
@@ -1087,5 +1364,6 @@ NEVER include "error" fields in responses. Skip them entirely.
 - No \`undefined\`—use \`null\` or omit
 - Generate data for ALL keys in the chunk (don't skip any)
 - Arrays should have many items (at least 4) unless specified otherwise
+- For empty arrays, use \`[]\` (not \`null\`) unless the schema type explicitly includes \`| null\` and the scenario requires the attribute be removed
 `;
 //# sourceMappingURL=generateEntityScenarioData.js.map