@codeyam/codeyam-cli 0.1.0-staging.1 → 0.1.0-staging.596f0eb

package/analyzer-template/packages/ai/src/lib/getConditionalUsagesFromCode.ts

@@ -259,8 +259,16 @@ function getLiteralValue(expr: ts.Expression): string | undefined {
 /**
  * Format conditional usages into a string for the LLM prompt
  */
+/**
+ * Interface for conditional usages that may have source tracing information.
+ * This is a superset of ConditionalUsage that includes optional sourceDataPath.
+ */
+interface EnrichedConditionalUsageInput extends ConditionalUsage {
+  sourceDataPath?: string;
+}
+
 export function formatConditionalUsagesForPrompt(
-  conditionalUsages: Record<string, ConditionalUsage[]>,
+  conditionalUsages: Record<string, EnrichedConditionalUsageInput[]>,
 ): string {
   const entries = Object.entries(conditionalUsages);
   if (entries.length === 0) {
@@ -270,7 +278,7 @@ export function formatConditionalUsagesForPrompt(
   const lines: string[] = [
     '\n## Static Analysis: Attributes Used in Conditionals',
     '',
-    'The following attributes were found to be used in conditional statements, making them potential key attributes:',
+    'The following attributes were found to be used in conditional statements, making them very likely key attributes:',
     '',
   ];
 
@@ -281,20 +289,30 @@ export function formatConditionalUsagesForPrompt(
       .flatMap((u) => u.comparedValues || []);
     const uniqueValues = [...new Set(allComparedValues)];
 
-    let description = `- "${path}": `;
+    // Get the source data path if available (traced back to data source)
+    const sourceDataPath = usages.find((u) => u.sourceDataPath)?.sourceDataPath;
+
+    let description = `- "${path}"`;
+
+    // If we have a source data path, show that the local variable derives from a data source
+    if (sourceDataPath) {
+      description += `\n    - Source: "${sourceDataPath}"`;
+    }
+
+    description += '\n    - ';
 
     if (uniqueTypes.includes('switch')) {
-      description += 'used as switch discriminant';
+      description += 'Used as switch discriminant';
       if (uniqueValues.length > 0) {
         description += ` with cases: ${uniqueValues.map((v) => `"${v}"`).join(', ')}`;
       }
     } else if (uniqueTypes.includes('comparison')) {
-      description += 'used in comparison';
+      description += 'Used in comparison';
       if (uniqueValues.length > 0) {
         description += ` against values: ${uniqueValues.map((v) => `"${v}"`).join(', ')}`;
       }
     } else {
-      description += 'used in truthiness check (presence/absence matters)';
+      description += 'Used in truthiness check (presence/absence matters)';
     }
 
     lines.push(description);
@@ -304,6 +322,9 @@ export function formatConditionalUsagesForPrompt(
   lines.push(
     'Consider these attributes as candidates for key attributes, especially those with specific comparison values.',
   );
+  lines.push(
+    'When a local variable derives from a data source, the data source is the key attribute.',
+  );
 
   return lines.join('\n');
 }

package/analyzer-template/packages/ai/src/lib/getLLMCallStats.ts

@@ -2,13 +2,6 @@ import OpenAI from 'openai';
 import { getLLMCallCost } from './getLLMCallCost';
 import { AI, LlmCallStats } from './types';
 
-/**
- * It looks like this function can be massively simplified, and I (AG) think
- * that we aren't using openrouter anymore. But, until this is figured out, it
- * might not be worth refactoring and messing something subtle up. Ideally
- * whatever implicit functionality is in here can be represented in the new
- * `getLLMCallStats` such that this get replaced by it.
- */
 export function getLLMCallStats({
   chatRequest,
   chatCompletion,
@@ -28,13 +21,6 @@ export function getLLMCallStats({
       error: JSON.stringify(chatCompletion.error),
     };
   }
-  if (!chatRequest.model) {
-    // this was previously used to indicate openrouter calls, but we aren't
-    // doing that anymore and anyway it was a pretty obscure way to indicate
-    // that state of affairs. if we bring multi-provider back, we will want
-    // to rewrite a fair bit of this.
-    return null;
-  }
 
   const usage = chatCompletion.usage || {
     prompt_tokens: 0,

package/analyzer-template/packages/ai/src/lib/mergeStatements.ts

@@ -12,6 +12,53 @@ export interface Statement {
 }
 
 export default function mergeStatements(statements: Statement[]) {
+  // Debug: Log input statements to understand what we're merging
+  const hasStateStructure = statements.some((s) =>
+    Object.keys(s.structure || {}).some(
+      (k) => k === 'state' || k.includes('state'),
+    ),
+  );
+  const hasStateEquiv = statements.some((s) =>
+    Object.keys(s.equivalentVariables || {}).some(
+      (k) => k === 'state' || k.includes('state'),
+    ),
+  );
+  if (hasStateStructure || hasStateEquiv) {
+    console.log(
+      `[UNION-TYPE] mergeStatements INPUT: ${statements.length} statements`,
+    );
+    statements.forEach((s, i) => {
+      const stateInStructure = Object.entries(s.structure || {}).filter(
+        ([k]) => k === 'state' || k.includes('state'),
+      );
+      const stateInEquiv = Object.entries(s.equivalentVariables || {}).filter(
+        ([k]) => k === 'state' || k.includes('state'),
+      );
+      const sigInEquiv = Object.entries(s.equivalentVariables || {}).filter(
+        ([k, v]) => k === 'state' || v === 'signature[0]',
+      );
+      if (
+        stateInStructure.length > 0 ||
+        stateInEquiv.length > 0 ||
+        sigInEquiv.length > 0
+      ) {
+        console.log(`[UNION-TYPE]   Statement ${i}:`);
+        if (stateInStructure.length > 0)
+          console.log(
+            `[UNION-TYPE]     structure: ${JSON.stringify(Object.fromEntries(stateInStructure))}`,
+          );
+        if (stateInEquiv.length > 0)
+          console.log(
+            `[UNION-TYPE]     equivalentVariables (state): ${JSON.stringify(Object.fromEntries(stateInEquiv))}`,
+          );
+        if (sigInEquiv.length > 0)
+          console.log(
+            `[UNION-TYPE]     equivalentVariables (sig): ${JSON.stringify(Object.fromEntries(sigInEquiv))}`,
+          );
+      }
+    });
+  }
+
   // This should be handled by the AST Analyzer but it currently has a bug
   const ensureFunctionCallReturnValue = (path: string, value: string) => {
     if (path.endsWith(')') && value !== 'function') {
@@ -77,6 +124,15 @@ export default function mergeStatements(statements: Statement[]) {
   ) => {
     if (!mapping[key] || mapping[key] === 'unknown') {
       mapping[key] = value;
+      return;
+    }
+
+    // Prefer union types (containing ' | ') over generic types like "string"
+    const existingIsGeneric =
+      mapping[key] === 'string' || mapping[key] === 'unknown';
+    const newIsUnion = value.includes("'") && value.includes(' | ');
+    if (existingIsGeneric && newIsUnion) {
+      mapping[key] = value;
     }
   };
 
@@ -157,5 +213,53 @@ export default function mergeStatements(statements: Statement[]) {
 
   const llmCalls = statements.map((result) => result.llmCall).filter(Boolean);
 
+  // Propagate more specific types through equivalentVariables
+  // If we have equivalentVariables[A] = B, and structure[A] is more specific than structure[B],
+  // then update structure[B] to match structure[A]
+  // This handles cases like: "state" -> "signature[0]" where "state" has a union type
+
+  // Debug: Log union types in merged structure
+  const unionTypesInStructure = Object.entries(structure).filter(
+    ([_, v]) => typeof v === 'string' && v.includes("'") && v.includes(' | '),
+  );
+  if (unionTypesInStructure.length > 0) {
+    console.log(
+      `[UNION-TYPE] mergeStatements: Found ${unionTypesInStructure.length} union types in merged structure`,
+    );
+    unionTypesInStructure.forEach(([k, v]) =>
+      console.log(`[UNION-TYPE]   structure["${k}"] = ${v}`),
+    );
+    console.log(
+      `[UNION-TYPE] mergeStatements: equivalentVariables = ${JSON.stringify(equivalentVariables)}`,
+    );
+  }
+
+  for (const [source, target] of Object.entries(equivalentVariables) as [
+    string,
+    string,
+  ][]) {
+    const sourceType = structure[source];
+    const targetType = structure[target];
+
+    // Check if source has a more specific type (union type vs generic type)
+    if (sourceType) {
+      const sourceIsUnion =
+        sourceType.includes("'") && sourceType.includes(' | ');
+
+      if (sourceIsUnion) {
+        // Target doesn't exist or is generic - propagate the union type
+        const targetIsGeneric =
+          !targetType || targetType === 'string' || targetType === 'unknown';
+
+        if (targetIsGeneric) {
+          console.log(
+            `[UNION-TYPE] mergeStatements: Propagating "${source}" (${sourceType}) -> "${target}"`,
+          );
+          structure[target] = sourceType;
+        }
+      }
+    }
+  }
+
   return { structure, equivalentVariables, llmCalls };
 }

package/analyzer-template/packages/ai/src/lib/modelInfo.ts

@@ -27,6 +27,14 @@ export interface ModelInfo {
 
 export const MODEL_INFO: Record<AI.Model, ModelInfo> = {
   // OpenAI models - served directly by OpenAI
+  [AI.Model.OPENAI_GPT5_1]: {
+    id: AI.Model.OPENAI_GPT5_1,
+    provider: OPENAI_PROVIDER,
+    apiModelName: 'gpt-5.1',
+    maxCompletionTokens: 128000,
+    pricing: { input: 1.25, output: 10.0 },
+    reasoningEffort: 'none',
+  },
   [AI.Model.OPENAI_GPT5]: {
     id: AI.Model.OPENAI_GPT5,
     provider: OPENAI_PROVIDER,
@@ -175,6 +183,13 @@ export const MODEL_INFO: Record<AI.Model, ModelInfo> = {
     maxCompletionTokens: 200000,
     pricing: { input: 3.0, output: 15.0 },
   },
+  [AI.Model.ANTHROPIC_CLAUDE_4_5_OPUS]: {
+    id: AI.Model.ANTHROPIC_CLAUDE_4_5_OPUS,
+    provider: ANTHROPIC_PROVIDER,
+    apiModelName: 'claude-opus-4-5',
+    maxCompletionTokens: 200000,
+    pricing: { input: 5.0, output: 25.0 },
+  },
 
   // Deprecated models (kept for backward compatibility)
   [AI.Model.PHIND_CODELLAMA]: {

package/analyzer-template/packages/ai/src/lib/promptGenerators/gatherAttributesMap.ts

@@ -1,13 +1,48 @@
-import { Entity } from '~codeyam/types';
+import { DataStructure } from '~codeyam/types';
 import cleanOutBoundary from '../cleanOutBoundary';
 import {
   joinParenthesesAndArrays,
   splitOutsideParenthesesAndArrays,
 } from '../splitOutsideParentheses';
 
+/**
+ * Checks if a bracket-only path is a valid string key access (not just an index).
+ * Valid: ['*'], ['someKey'] - string key access
+ * Invalid: [0], [1] - numeric index only (meaningless without parent path)
+ */
+function isValidBracketStringKey(attribute: string): boolean {
+  // Match ['string'] or ["string"] patterns
+  return /^\[['"][^'"]+['"]\]$/.test(attribute);
+}
+
+/**
+ * Extracts the string key from a bracket notation like ['*'] or ["key"]
+ * Returns the key without quotes and brackets, e.g., '*' or 'key'
+ */
+function extractBracketStringKey(attribute: string): string | null {
+  const match = attribute.match(/^\[['"]([^'"]+)['"]\]$/);
+  return match ? match[1] : null;
+}
+
+/**
+ * Normalizes a path by extracting string keys from bracket notation.
+ * If the path is a single bracket string key like ['*'], returns the key ('*').
+ * Otherwise returns the path unchanged.
+ */
+function normalizePathForInternalUse(path: string): string {
+  const extracted = extractBracketStringKey(path);
+  return extracted !== null ? extracted : path;
+}
+
 function validAttribute(attribute: string) {
-  if (!attribute || attribute.length === 0 || attribute.startsWith('['))
-    return false;
+  if (!attribute || attribute.length === 0) return false;
+
+  // Allow string-key bracket access like ['*'] or ['someKey']
+  // These are valid data paths from objects with dynamic/special keys
+  if (attribute.startsWith('[')) {
+    return isValidBracketStringKey(attribute);
+  }
+
   const attributeParts = splitOutsideParenthesesAndArrays(attribute);
   if (
     attributeParts.some((part) =>
@@ -30,19 +65,80 @@ function validAttribute(attribute: string) {
   return true;
 }
 
+/**
+ * Gathers attributes from data structures for use in prompts.
+ *
+ * @param isolatedDataStructure - The entity's own data structure (determines which paths to include)
+ * @param mergedDataStructureOrEquivalentVars - Either the merged data structure (with richer types from
+ *   dependent analyses) OR equivalentSignatureVariables for backwards compatibility
+ * @param equivalentSignatureVariablesOrReverse - Either equivalentSignatureVariables OR reverse flag
+ * @param reverseArg - The reverse flag (only used when all 4 args provided)
+ */
 export function gatherAttributesMap(
-  entity: Pick<Entity, 'metadata'>,
-  reverse = false,
+  isolatedDataStructure: Omit<DataStructure, 'equivalentSignatureVariables'>,
+  mergedDataStructureOrEquivalentVars?:
+    | Omit<DataStructure, 'equivalentSignatureVariables'>
+    | DataStructure['equivalentSignatureVariables'],
+  equivalentSignatureVariablesOrReverse?:
+    | DataStructure['equivalentSignatureVariables']
+    | boolean,
+  reverseArg?: boolean,
 ) {
+  // Handle backwards compatibility: detect if called with old signature
+  // Old: (mergedDataStructure, equivalentSignatureVariables?, reverse?)
+  // New: (isolatedDataStructure, mergedDataStructure, equivalentSignatureVariables?, reverse?)
+  let mergedDataStructure: Omit<
+    DataStructure,
+    'equivalentSignatureVariables'
+  > | null;
+  let equivalentSignatureVariables: DataStructure['equivalentSignatureVariables'];
+  let reverse: boolean;
+
+  if (
+    mergedDataStructureOrEquivalentVars &&
+    typeof mergedDataStructureOrEquivalentVars === 'object' &&
+    'dependencySchemas' in mergedDataStructureOrEquivalentVars
+  ) {
+    // New signature: (isolated, merged, equivalentVars?, reverse?)
+    mergedDataStructure = mergedDataStructureOrEquivalentVars as Omit<
+      DataStructure,
+      'equivalentSignatureVariables'
+    >;
+    equivalentSignatureVariables =
+      (equivalentSignatureVariablesOrReverse as DataStructure['equivalentSignatureVariables']) ??
+      {};
+    reverse = reverseArg ?? false;
+  } else {
+    // Old signature: (merged, equivalentVars?, reverse?)
+    // Use isolatedDataStructure as both isolated and merged for backwards compatibility
+    mergedDataStructure = null; // Will use isolatedDataStructure for types
+    equivalentSignatureVariables =
+      (mergedDataStructureOrEquivalentVars as DataStructure['equivalentSignatureVariables']) ??
+      {};
+    reverse =
+      (equivalentSignatureVariablesOrReverse as boolean | undefined) ?? false;
+  }
+
   const attributesMap: Record<string, string> = {};
   const associationMap: Record<string, string> = {};
   // Maps internalPath -> full data structure path (e.g., "useDiffModal().diffView")
   const dataStructurePathMap: Record<string, string> = {};
-  const { signatureSchema, equivalentSignatureVariables, dependencySchemas } =
-    entity.metadata.isolatedDataStructure;
-  for (const key in signatureSchema) {
+
+  // Use isolatedDataStructure for paths, but look up types in mergedDataStructure when available
+  const isolatedSignatureSchema = isolatedDataStructure.signatureSchema;
+  const mergedSignatureSchema =
+    mergedDataStructure?.signatureSchema ?? isolatedSignatureSchema;
+  const isolatedDependencySchemas = isolatedDataStructure.dependencySchemas;
+  const mergedDependencySchemas =
+    mergedDataStructure?.dependencySchemas ?? isolatedDependencySchemas;
+
+  // Process signature schema - use isolatedDataStructure keys, but merged types
+  for (const key in isolatedSignatureSchema) {
     const keyParts = splitOutsideParenthesesAndArrays(key);
     if (keyParts[0].startsWith('signature')) {
+      // Use merged type if available, otherwise fall back to isolated type
+      const typeValue =
+        mergedSignatureSchema[key] ?? isolatedSignatureSchema[key];
       const equivalentSignatureVariable =
         equivalentSignatureVariables[keyParts[0]];
       const equivalentSignatureVariableParts = splitOutsideParenthesesAndArrays(
@@ -57,7 +153,7 @@ export function gatherAttributesMap(
           equivalentKey,
           ...keyParts.slice(1),
         ]);
-        attributesMap[equivalentPath] = signatureSchema[key];
+        attributesMap[equivalentPath] = typeValue;
         associationMap[reverse ? equivalentPath : key] = reverse
           ? key
           : equivalentPath;
@@ -65,7 +161,7 @@ export function gatherAttributesMap(
         dataStructurePathMap[equivalentPath] = equivalentPath;
       } else {
         const relativePath = joinParenthesesAndArrays(keyParts.slice(1));
-        attributesMap[relativePath] = signatureSchema[key];
+        attributesMap[relativePath] = typeValue;
         associationMap[reverse ? relativePath : key] = reverse
           ? key
           : relativePath;
@@ -75,25 +171,34 @@ export function gatherAttributesMap(
     }
   }
 
-  for (const filePath in dependencySchemas) {
-    for (const entityName in dependencySchemas[filePath]) {
-      const returnValueDataStructure =
-        dependencySchemas[filePath][entityName].returnValueSchema ?? {};
+  // Process dependency schemas - iterate through isolatedDependencySchemas (for which paths to include)
+  // but use mergedDependencySchemas for types (richer type information)
+  for (const filePath in isolatedDependencySchemas) {
+    for (const entityName in isolatedDependencySchemas[filePath]) {
+      // Get the isolated return value schema (determines which paths exist)
+      const isolatedReturnValueSchema =
+        isolatedDependencySchemas[filePath][entityName].returnValueSchema ?? {};
 
-      // First pass: collect all function paths
+      // Get the merged return value schema (for richer types)
+      const mergedReturnValueSchema =
+        mergedDependencySchemas?.[filePath]?.[entityName]?.returnValueSchema ??
+        isolatedReturnValueSchema;
+
+      // First pass: collect all function paths from merged schema (for broader coverage)
       const functionPaths: string[] = [];
-      for (const path in returnValueDataStructure) {
-        if (returnValueDataStructure[path] === 'function') {
+      for (const path in mergedReturnValueSchema) {
+        if (mergedReturnValueSchema[path] === 'function') {
           functionPaths.push(path);
         }
       }
 
-      // Second pass: process all paths
-      for (const path in returnValueDataStructure) {
+      // Second pass: process paths from merged schema, but only include paths that
+      // are rooted in an isolated path (i.e., isolatedDataStructure knows about this dependency)
+      for (const path in mergedReturnValueSchema) {
         const pathParts = splitOutsideParenthesesAndArrays(path);
         if (pathParts.length < 2) continue;
 
-        if (returnValueDataStructure[path] === 'function') {
+        if (mergedReturnValueSchema[path] === 'function') {
           continue;
         }
 
@@ -141,7 +246,7 @@ export function gatherAttributesMap(
               const relativePath = path;
               if (!validAttribute(relativePath)) continue;
 
-              attributesMap[relativePath] = returnValueDataStructure[path];
+              attributesMap[relativePath] = mergedReturnValueSchema[path];
               associationMap[reverse ? relativePath : path] = reverse
                 ? path
                 : relativePath;
@@ -153,10 +258,14 @@ export function gatherAttributesMap(
           // Fall through to normal processing for other return value properties
         }
 
-        const relativePath = joinParenthesesAndArrays(pathParts.slice(2));
-        if (!validAttribute(relativePath)) continue;
+        const rawRelativePath = joinParenthesesAndArrays(pathParts.slice(2));
+        if (!validAttribute(rawRelativePath)) continue;
+
+        // Normalize the path for internal use (e.g., ['*'] -> '*')
+        const relativePath = normalizePathForInternalUse(rawRelativePath);
 
-        attributesMap[relativePath] = returnValueDataStructure[path];
+        // Use the type from mergedReturnValueSchema
+        attributesMap[relativePath] = mergedReturnValueSchema[path];
         associationMap[reverse ? relativePath : path] = reverse
           ? path
           : relativePath;

package/analyzer-template/packages/ai/src/lib/promptGenerators/generateChangesEntityDocumentationGenerator.ts

@@ -4,44 +4,19 @@ export default function generateChangesEntityDocumentationGenerator(
   entity: Entity,
   previousDocumentation: string,
 ) {
-  return `A function recently changed. Here is the current documentation for that function:
+  return `## Task
+Review if the existing documentation is still accurate after code changes. If accurate, respond "No changes needed". Otherwise, provide updated documentation.
 
-"""
+## Current Documentation
 ${previousDocumentation}
-"""  
 
-and here is the new code for ${entity.name}:
-  
-"""
+## Updated Code
+\`\`\`typescript
 ${entity.code}
-"""
-
-If the existing documentation is still accurate please respond with "No changes needed". 
-
-Otherwise, please update the documentation to reflect the changes in the code. Using these instructions:
-
-- Start with an overview that describes the overall intent of the code. Be concise in your language. Immediately start with the intent of the code. Here is an example Overview:
-
-\`\`\` Overview
-Displays details about a specific Git commit. It shows the commit message, author, date, and provides a link to the commit on GitHub. Users can copy the commit SHA to their clipboard, with a visual indication of the copy action.
 \`\`\`
 
-Note that it does not mention the name of the function but dives directly into what the code does in concise language followed by a small amount of detail.
-
-- Next, specify the inputs (with details about types, how the input is used, and examples) and expected outputs (with details about types and examples).
-
-- Finally, provide examples of how the code can be used with clear inputs and outputs for each example. Provide diverse examples (there's no need to include repetitive examples). 
-
-Write the documentation as markdown. Be concise. Use bullets when possible. No one wants to read long paragraphs of text. 
-
-Provide no other text than the documentation in proper markdown using the headers below.
-
-## Overview
-
-## Inputs
-
-## Output
+## Overview Example
+Good: "Displays details about a specific Git commit. Shows the commit message, author, date, and provides a link to GitHub."
 
-## Examples
-`;
+Bad: "The CommitDetails function takes a commit object..." (mentions the function name)`;
 }

package/analyzer-template/packages/ai/src/lib/promptGenerators/generateChangesEntityScenarioDataGenerator.ts

@@ -52,77 +52,69 @@ export default function generateChangesEntityScenarioDataGenerator(
   defaultScenarioData?: ScenarioData,
   incompleteResponse?: string,
 ) {
-  return `${
-    incompleteResponse
-      ? `## Incomplete Response
-
-Here is the incomplete response. Please use this and the following data to complete the response, only returning the missing data.
-
-Just pick up where this response left off. It will be improper json but we will combine the responses into proper json.
-
-\`\`\` START INCOMPLETE RESPONSE \`\`\`
+  const incompleteSection = incompleteResponse
+    ? `## Incomplete Response
+Continue from where this left off (combine for valid JSON):
+\`\`\`
 ${incompleteResponse}
-\`\`\` END INCOMPLETE RESPONSE \`\`\`
+\`\`\`
 
 `
-      : ''
-  }## Scenario
-  
-This scenario needs mock data to support it. Here are the keyAttributeInstructions for generating this scenario:
-\`\`\`
-${JSON.stringify(
-  {
-    name: scenario.name,
-    description: scenario.description,
-    keyAttributeInstructions: scenario.metadata.keyAttributeInstructions,
-  },
-  null,
-  2,
-)}
-\`\`\`
+    : '';
 
-## Existing Scenario
-  
-Here are the "keyAttributeInstructions" and data for this scenario before this more recent code change. Please maintain the existing data as effectively as possible while fulfilling the new data structure and "keyAttributeInstructions".
-\`\`\`
-${JSON.stringify(
-  {
-    name: existingScenario.name,
-    data: filterData(structure, existingScenario.metadata.data),
-  },
-  null,
-  2,
-)}
-\`\`\`
-${
-  defaultScenarioData
-    ? `
-## Default Scenario
+  const scenarioJson = JSON.stringify(
+    {
+      name: scenario.name,
+      description: scenario.description,
+      keyAttributeInstructions: scenario.metadata.keyAttributeInstructions,
+    },
+    null,
+    2,
+  );
 
-Data for the default scenario. Do not modify it. The data you are generating will be merged into it to create the full data.
-\`\`\`
+  const existingJson = JSON.stringify(
+    {
+      name: existingScenario.name,
+      data: filterData(structure, existingScenario.metadata.data),
+    },
+    null,
+    2,
+  );
+
+  const defaultSection = defaultScenarioData
+    ? `
+## Default Scenario Data (merge base, do not modify)
+\`\`\`json
 ${JSON.stringify(defaultScenarioData.data, null, 2)}
 \`\`\`
 `
-    : ''
-}
-${
-  structure.dataForMocks
-    ? `The mockData structure (for the default scenario provide robust values for the entire structure):
-\`\`\`
+    : '';
+
+  const mockDataSection = structure.dataForMocks
+    ? `## mockData Structure
+\`\`\`json
 ${JSON.stringify(structure.dataForMocks, null, 2)}
-\`\`\`
-`
-    : 'There is no mockData for this file. Return {} for the mockData.'
-}
-    
-${
-  structure.arguments
-    ? `The argumentsData structure (for the default scenario provide robust values for the entire structure):
-\`\`\`
+\`\`\``
+    : '## mockData Structure\nNone—return `{}` for mockData.';
+
+  const argumentsSection = structure.arguments
+    ? `## argumentsData Structure
+\`\`\`json
 ${JSON.stringify(structure.arguments, null, 2)}
+\`\`\``
+    : '## argumentsData Structure\nNone—return `[]` for argumentsData.';
+
+  return `${incompleteSection}## Scenario (new instructions)
+\`\`\`json
+${scenarioJson}
 \`\`\`
-`
-    : 'There is no argumentsData for this file. Return [] for the argumentsData.'
-}`;
+
+## Existing Scenario (preserve where possible)
+\`\`\`json
+${existingJson}
+\`\`\`
+${defaultSection}
+${mockDataSection}
+
+${argumentsSection}`;
 }