@codeyam/codeyam-cli 0.1.0-staging.1 → 0.1.0-staging.1669d45

package/analyzer-template/packages/ai/src/lib/__mocks__/completionCall.ts

@@ -1,3 +1,5 @@
+import * as fs from 'fs';
+import * as path from 'path';
 import OpenAI from 'openai';
 import * as lib from '../../lib';
 import { AI } from '../../lib/types';
@@ -23,6 +25,121 @@ interface CompletionCallProps {
   attempts?: number;
 }
 
+// Track which fixture index to use for each type (for LLM replay)
+const callIndexByType: Record<string, number> = {};
+
+/**
+ * Replays a captured LLM call from test fixtures instead of making a real API call.
+ */
+function replayLlmCall(
+  type: string,
+  fixturesDir: string,
+): {
+  finishReason: string;
+  completion: string;
+  stats: lib.types.LlmCallStats;
+} {
+  console.log(
+    `CodeYam Test: Replaying LLM call for type '${type}' from ${fixturesDir}`,
+  );
+
+  // Ensure the fixtures directory exists
+  if (!fs.existsSync(fixturesDir)) {
+    throw new Error(
+      `No LLM fixture files found - directory does not exist: ${fixturesDir}`,
+    );
+  }
+
+  // Load all JSON files from fixtures directory
+  const files = fs
+    .readdirSync(fixturesDir)
+    .filter((f) => f.endsWith('.json'));
+
+  if (files.length === 0) {
+    throw new Error(`No LLM fixture files found in ${fixturesDir}`);
+  }
+
+  // Track calls of each type to handle multiple calls with same type
+  const callsByType: Record<string, any[]> = {};
+
+  for (const file of files) {
+    try {
+      const content = fs.readFileSync(path.join(fixturesDir, file), 'utf-8');
+      const call = JSON.parse(content);
+
+      if (!callsByType[call.prompt_type]) {
+        callsByType[call.prompt_type] = [];
+      }
+      callsByType[call.prompt_type].push(call);
+    } catch (error) {
+      console.warn(`Failed to parse LLM fixture file ${file}:`, error);
+    }
+  }
+
+  const matchingCalls = callsByType[type];
+
+  if (!matchingCalls || matchingCalls.length === 0) {
+    const availableTypes = Object.keys(callsByType).join(', ');
+    console.warn(
+      `CodeYam Test: No captured LLM call found for type '${type}'. Available types: ${availableTypes}`,
+    );
+    // Return empty response - callers should handle gracefully
+    // This allows new LLM call types to be added without breaking existing fixtures
+    return {
+      finishReason: 'stop',
+      completion: '{}',
+      stats: {
+        model: 'fixture-fallback',
+        prompt_type: type,
+        system_message: '',
+        prompt_text: '',
+        response: '{}',
+        input_tokens: 0,
+        output_tokens: 0,
+        cost: 0,
+      },
+    };
+  }
+
+  // Track call count per type and cycle through multiple responses
+  const callKey = `${fixturesDir}::${type}`;
+  if (!callIndexByType[callKey]) {
+    callIndexByType[callKey] = 0;
+  }
+  const callIndex = callIndexByType[callKey];
+  callIndexByType[callKey] = (callIndex + 1) % matchingCalls.length;
+
+  const call = matchingCalls[callIndex];
+
+  console.log(
+    `CodeYam Test: Replaying LLM response for '${type}' [${callIndex + 1}/${matchingCalls.length}]`,
+  );
+
+  // Extract the actual completion content from the OpenAI response
+  let completion: string;
+  try {
+    const responseObj = JSON.parse(call.response);
+    completion = responseObj.choices?.[0]?.message?.content || call.response;
+  } catch {
+    completion = call.response;
+  }
+
+  return {
+    finishReason: 'stop',
+    completion,
+    stats: {
+      model: call.model ?? 'fixture',
+      prompt_type: type,
+      system_message: call.system_message ?? '',
+      prompt_text: call.prompt_text ?? '',
+      response: call.response ?? '',
+      input_tokens: call.input_tokens ?? 0,
+      output_tokens: call.output_tokens ?? 0,
+      cost: call.cost ?? 0,
+    },
+  };
+}
+
 export default async function completionCall({
   type,
   systemMessage,
@@ -34,6 +151,11 @@ export default async function completionCall({
   // model = AI.Model.DEEPSEEK_CHAT,
   attempts = 0,
 }: CompletionCallProps) {
+  // Support for E2E testing with replayed LLM calls
+  if (process.env.CODEYAM_LLM_FIXTURES_DIR) {
+    return replayLlmCall(type, process.env.CODEYAM_LLM_FIXTURES_DIR);
+  }
+
   const modelInfo = getModelInfo(model);
   const apiKey = process.env[modelInfo.provider.apiKeyEnvVar];
 

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

@@ -24,7 +24,7 @@ import mergeStatements, { Statement } from './mergeStatements';
 import { analyzeScopeWithAst } from './astScopes';
 import { FileAnalyzer } from '~codeyam/analyze';
 import { writeFile } from 'fs/promises';
-import { saveEntityStatements } from '~codeyam/supabase';
+import { saveEntityStatements } from '~codeyam/database';
 import {
   ScopeDataStructure,
   ScopeInfo,
@@ -32,6 +32,7 @@ import {
 import FunctionCallManager from './dataStructure/equivalencyManagers/FunctionCallManager';
 import { ReactFrameworkManager } from './dataStructure/equivalencyManagers/frameworks/ReactFrameworkManager';
 import { JavascriptFrameworkManager } from './dataStructure/equivalencyManagers/frameworks/JavascriptFrameworkManager';
+import { MuiManager } from './dataStructure/equivalencyManagers/frameworks/MuiManager';
 import ParentScopeManager from './dataStructure/equivalencyManagers/ParentScopeManager';
 import { AI } from '~codeyam/ai';
 import Piscina from 'piscina';
@@ -160,6 +161,27 @@ export async function analyzeScopeLocal({
 
     const llmCalls: any[] = [];
     const allEnvironmentVariables: Set<string> = new Set();
+    // Collect conditional usages from all statement analyses
+    const allConditionalUsages: Record<
+      string,
+      import('./astScopes/types').ConditionalUsage[]
+    > = {};
+    // Collect conditional effects (setter calls inside conditionals)
+    const allConditionalEffects: import('./astScopes/types').ConditionalEffect[] =
+      [];
+    // Collect compound conditionals (grouped conditions that must all be true)
+    const allCompoundConditionals: import('./astScopes/types').CompoundConditional[] =
+      [];
+    // Collect derived variables (variables computed from boolean expressions)
+    const allDerivedVariables: Record<
+      string,
+      import('./astScopes/types').DerivedVariableInfo
+    > = {};
+    // Collect child boundary gating conditions across all statements
+    const allChildBoundaryGatingConditions: Record<
+      string,
+      import('./astScopes/types').ConditionalUsage[]
+    > = {};
 
     const astAnalysisResultWithStatements = statementScopes.map(
       (statementScope) => {
@@ -171,6 +193,54 @@ export async function analyzeScopeLocal({
         astAnalysisResult.environmentVariables.forEach((envVar) =>
           allEnvironmentVariables.add(envVar),
         );
+        // Collect conditional usages from AST analysis
+        for (const [path, usages] of Object.entries(
+          astAnalysisResult.conditionalUsages,
+        )) {
+          if (!allConditionalUsages[path]) {
+            allConditionalUsages[path] = [];
+          }
+          allConditionalUsages[path].push(...usages);
+        }
+        // Collect conditional effects from AST analysis
+        if (astAnalysisResult.conditionalEffects?.length > 0) {
+          console.log(
+            `[ConditionalEffects] analyzeScope collecting from statement "${statementScope.name}":`,
+            astAnalysisResult.conditionalEffects.map((e) => ({
+              setter: e.effect.setterName,
+              value: e.effect.value,
+              condition:
+                e.condition?.path ||
+                e.conditions?.map((c) => c.path).join(' && '),
+            })),
+          );
+          allConditionalEffects.push(...astAnalysisResult.conditionalEffects);
+        }
+        // Collect compound conditionals from AST analysis
+        if (astAnalysisResult.compoundConditionals?.length > 0) {
+          allCompoundConditionals.push(
+            ...astAnalysisResult.compoundConditionals,
+          );
+        }
+        // Collect derived variables from AST analysis
+        if (astAnalysisResult.derivedVariables) {
+          for (const [varName, derivationInfo] of Object.entries(
+            astAnalysisResult.derivedVariables,
+          )) {
+            allDerivedVariables[varName] = derivationInfo;
+          }
+        }
+        // Collect child boundary gating conditions from AST analysis
+        if (astAnalysisResult.childBoundaryGatingConditions) {
+          for (const [childName, usages] of Object.entries(
+            astAnalysisResult.childBoundaryGatingConditions,
+          )) {
+            if (!allChildBoundaryGatingConditions[childName]) {
+              allChildBoundaryGatingConditions[childName] = [];
+            }
+            allChildBoundaryGatingConditions[childName].push(...usages);
+          }
+        }
         return {
           statementScope,
           astAnalysisResult,
@@ -240,6 +310,32 @@ export async function analyzeScopeLocal({
               },
             );
 
+            // DEBUG: Log child scope replacement context for fetcher statements
+            if (
+              statementScope.text.includes('Fetcher') ||
+              statementScope.text.includes('fetcher')
+            ) {
+              console.log(
+                'CodeYam DEBUG childScope replacement:',
+                JSON.stringify(
+                  {
+                    statementText: statementScope.text.slice(0, 80),
+                    statementStart: statementScope.start,
+                    statementEnd: statementScope.end,
+                    childBoundaries: statementScope.childBoundaries,
+                    relevantChildScopes: Object.keys(relevantChildScopes),
+                    astStructure: astAnalysisResult.structure,
+                    astEquivalentVariables:
+                      astAnalysisResult.equivalentVariables,
+                    astIsComplete: astAnalysisResult.isComplete,
+                    equivalentVariables,
+                  },
+                  null,
+                  2,
+                ),
+              );
+            }
+
             for (const mapping of [structure, equivalentVariables]) {
               for (let [key, value] of Object.entries(mapping)) {
                 for (const [childScopeId, childScope] of sortedEntries) {
@@ -262,6 +358,18 @@ export async function analyzeScopeLocal({
                   };
 
                   if (value.includes(scopeText)) {
+                    // DEBUG: Log when replacement happens
+                    if (key.includes('Fetcher') || key.includes('fetcher')) {
+                      console.log(
+                        'CodeYam DEBUG value replacement:',
+                        JSON.stringify({
+                          key,
+                          oldValue: value,
+                          childScopeId,
+                          scopeTextPreview: scopeText.slice(0, 50),
+                        }),
+                      );
+                    }
                     value = replaceChildScopeId(value);
                     mapping[key] = value;
                   }
@@ -416,6 +524,7 @@ export async function analyzeScopeLocal({
           new FunctionCallManager(),
           new ReactFrameworkManager(),
           new JavascriptFrameworkManager(),
+          new MuiManager(),
           new ParentScopeManager(),
         ],
         scope.name,
@@ -432,6 +541,94 @@ export async function analyzeScopeLocal({
       );
     }
 
+    // Enrich conditional usages with derived variable info
+    // This must happen after all statements are processed so derived variables from
+    // earlier statements can be used to enrich usages from later statements
+    if (Object.keys(allDerivedVariables).length > 0) {
+      for (const [path, usages] of Object.entries(allConditionalUsages)) {
+        for (const usage of usages) {
+          if (!usage.derivedFrom && allDerivedVariables[path]) {
+            usage.derivedFrom = allDerivedVariables[path];
+          }
+        }
+      }
+    }
+
+    // Add conditional usages from this scope's analysis
+    if (Object.keys(allConditionalUsages).length > 0) {
+      scopeDataStructure.addConditionalUsages(allConditionalUsages);
+    }
+
+    // Add conditional effects from this scope's analysis
+    if (allConditionalEffects.length > 0) {
+      console.log(
+        `[ConditionalEffects] analyzeScope adding ${allConditionalEffects.length} effects to scopeDataStructure for scope "${scope.name}"`,
+      );
+      scopeDataStructure.addConditionalEffects(allConditionalEffects);
+    } else {
+      console.log(
+        `[ConditionalEffects] analyzeScope: no conditional effects found for scope "${scope.name}"`,
+      );
+    }
+
+    // Add compound conditionals from this scope's analysis
+    if (allCompoundConditionals.length > 0) {
+      scopeDataStructure.addCompoundConditionals(allCompoundConditionals);
+    }
+
+    // Merge extracted gating conditions from JSX extraction (processJSXForScope)
+    // These were detected BEFORE JSX was simplified, so they have the full context
+    if (scope.extractedGatingConditions) {
+      for (const [childName, conditions] of Object.entries(
+        scope.extractedGatingConditions,
+      )) {
+        if (!allChildBoundaryGatingConditions[childName]) {
+          allChildBoundaryGatingConditions[childName] = [];
+        }
+        for (const condition of conditions) {
+          // Convert to full ConditionalUsage format
+          allChildBoundaryGatingConditions[childName].push({
+            path: condition.path,
+            conditionType: condition.conditionType,
+            location: condition.location,
+            isNegated: condition.isNegated,
+            controlsJsxRendering: true,
+          });
+        }
+      }
+    }
+
+    // Enrich child boundary gating conditions with derived variable info
+    // This must happen after all statements are processed so derived variables from
+    // earlier statements can be used to enrich gating conditions from later statements
+    if (Object.keys(allDerivedVariables).length > 0) {
+      for (const [_childName, conditions] of Object.entries(
+        allChildBoundaryGatingConditions,
+      )) {
+        for (const condition of conditions) {
+          if (!condition.derivedFrom && allDerivedVariables[condition.path]) {
+            condition.derivedFrom = allDerivedVariables[condition.path];
+          }
+        }
+      }
+    }
+
+    // Add child boundary gating conditions from this scope's analysis
+    if (Object.keys(allChildBoundaryGatingConditions).length > 0) {
+      scopeDataStructure.addChildBoundaryGatingConditions(
+        allChildBoundaryGatingConditions,
+      );
+    }
+
+    // Log child scopes that will be processed
+    const childScopeNames = Object.keys(scope.childScopes);
+    if (childScopeNames.length > 0) {
+      console.log(
+        `[ConditionalEffects] analyzeScope will process ${childScopeNames.length} child scopes:`,
+        childScopeNames,
+      );
+    }
+
     await Promise.all(
       Object.values(scope.childScopes).map(async (childScope) => {
         // This is awkward but need to identify class scopes
@@ -510,6 +707,7 @@ export default async function analyzeScope(
         end: scope.end,
         variables: scope.variables,
         childScopes: scope.childScopes,
+        extractedGatingConditions: scope.extractedGatingConditions,
       },
       model: args.model,
     };
@@ -521,6 +719,16 @@ export default async function analyzeScope(
     try {
       const result = await workerPool.run(workerInput);
 
+      // Log the conditional effects from the worker result
+      const workerConditionalEffects =
+        result.dataStructure?.conditionalEffects || [];
+      console.log(
+        `[ConditionalEffects] Worker returned ${workerConditionalEffects.length} conditional effects for ${entity.name}:`,
+        workerConditionalEffects.map(
+          (e: any) => `${e.effect?.setterName}(${e.effect?.value})`,
+        ),
+      );
+
       // Store the serializable data structure in the scope
       scope.dataStructure = result.dataStructure as any;
       return;

package/analyzer-template/packages/ai/src/lib/astScopes/astScopeAnalyzer.ts

@@ -5,7 +5,9 @@ import {
   AnalysisIssue,
   AstScopeAnalysisResult,
   CompletenessInfo,
+  CompoundConditional,
   ConditionalUsage,
+  DerivedVariableInfo,
 } from './types';
 import { PatternHandler } from './patterns/patternHandler';
 import { VariableDeclarationHandler } from './patterns/variableDeclarationHandler';
@@ -103,6 +105,16 @@ export class ASTScopeAnalyzer {
   private equivalentVariables: Record<string, string> = {};
   private environmentVariables: string[] = [];
   private conditionalUsages: Record<string, ConditionalUsage[]> = {};
+  private compoundConditionals: CompoundConditional[] = [];
+  private conditionalEffects: import('./types').ConditionalEffect[] = [];
+  private childBoundaryGatingConditions: Record<string, ConditionalUsage[]> =
+    {};
+  /**
+   * Tracks derived boolean variables and their source expressions.
+   * Maps variable name to derivation info.
+   * Example: { hasAnalysis: { sourcePath: 'analysis', operation: 'notNull' } }
+   */
+  private derivedVariables: Record<string, DerivedVariableInfo> = {};
   private sourceFile: ts.SourceFile;
   private statementInfo: StatementInfo;
   private issues: AnalysisIssue[] = [];
@@ -155,9 +167,6 @@ export class ASTScopeAnalyzer {
    * Performs the analysis by identifying and processing patterns in the AST
    */
   analyze(): AstScopeAnalysisResult {
-    // Debug log the source code
-    // console.log('Analyzing source code:', this.scope.text);
-
     // Create analysis context
     const context: AnalysisContext = this.createAnalysisContext();
 
@@ -167,38 +176,9 @@ export class ASTScopeAnalyzer {
       this.statementInfo.start,
       this.statementInfo.end,
     );
-    // console.info('SOURCEFILE', this.sourceFile.getText());
-    // console.info('RANGE', this.statementInfo.start, this.statementInfo.end, this.sourceFile.getText().slice(this.statementInfo.start, this.statementInfo.end));
 
-    // console.info('RELEVANT NODES:\n\n', this.statementInfo.text);
-    // relevantNodes.forEach((node, i) =>
-    //   console.info(`RELEVANT NODE ${i}`, node.getText(this.sourceFile)),
-    // );
-
-    // console.info(
-    //   'CHILD BOUNDARIES',
-    //   this.statementInfo.childBoundaries.map((b) =>
-    //     this.sourceFile.getText().slice(b.start, b.end),
-    //   ),
-    // );
     this.processNodes(relevantNodes, context);
 
-    // for (const childBoundary of this.statementInfo.childBoundaries) {
-    //   const boundaryText = this.sourceFile.getText().slice(childBoundary.start, childBoundary.end);
-    //   console.info('CHILD', boundaryText);
-    //   for (const equivalentVariableKey in this.equivalentVariables) {
-    //     const equivalentVariableValue = this.equivalentVariables[equivalentVariableKey];
-    //     for (const path of [equivalentVariableKey, equivalentVariableValue]) {
-    //       console.info('CHECKING', path);
-    //       console.info("REPLACE", path.replace(boundaryText, ''))
-    //       if (path.replace(boundaryText, '').replace(/[\s\(\)]*/g, '') === '') {
-    //         this.equivalentVariables[equivalentVariableKey] = 'cyScope3'
-    //         delete this.equivalentVariables[equivalentVariableKey];
-    //       }
-    //     }
-    //   }
-    // }
-
     // Calculate completeness
     const completeness = this.calculateCompleteness();
 
@@ -235,6 +215,10 @@ export class ASTScopeAnalyzer {
       equivalentVariables: this.equivalentVariables,
       environmentVariables: this.environmentVariables,
       conditionalUsages: this.conditionalUsages,
+      compoundConditionals: this.compoundConditionals,
+      conditionalEffects: this.conditionalEffects,
+      derivedVariables: this.derivedVariables,
+      childBoundaryGatingConditions: this.childBoundaryGatingConditions,
       isComplete:
         completeness.equivalences === 'full' &&
         completeness.structures === 'full',
@@ -277,6 +261,18 @@ export class ASTScopeAnalyzer {
         processExpression({ node, context, targetPath }),
       addConditionalUsage: (usage) => this.addConditionalUsage(usage),
       getConditionalUsages: () => this.conditionalUsages,
+      addChildBoundaryGatingCondition: (childName, condition) =>
+        this.addChildBoundaryGatingCondition(childName, condition),
+      getChildBoundaryGatingConditions: () =>
+        this.childBoundaryGatingConditions,
+      addDerivedVariable: (variableName, derivationInfo) =>
+        this.addDerivedVariable(variableName, derivationInfo),
+      addCompoundConditional: (compound) =>
+        this.addCompoundConditional(compound),
+      getCompoundConditionals: () => this.compoundConditionals,
+      updateSchemaType: (path, newType) => this.updateSchemaType(path, newType),
+      addConditionalEffect: (effect) => this.addConditionalEffect(effect),
+      getConditionalEffects: () => this.conditionalEffects,
     };
     return context;
   }
@@ -285,12 +281,13 @@ export class ASTScopeAnalyzer {
     node: ts.Node,
     sourceFile: ts.SourceFile,
   ): { nodeStart: number; nodeEnd: number } {
-    const sourceText = sourceFile.text;
-    const sourceGetText = sourceFile.getText();
-    const leadingContentOffset = sourceText.length - sourceGetText.length;
+    // Use getStart(sourceFile) to get the position after leading trivia.
+    // Note: We intentionally don't adjust for leadingContentOffset here because
+    // the positions from isolateStatements are calculated using getStart() too,
+    // which uses the same sourceFile.text coordinate system.
     return {
-      nodeStart: node.getStart(sourceFile) - leadingContentOffset,
-      nodeEnd: node.getEnd() - leadingContentOffset,
+      nodeStart: node.getStart(sourceFile),
+      nodeEnd: node.getEnd(),
     };
   }
 
@@ -637,11 +634,39 @@ export class ASTScopeAnalyzer {
     }
   }
 
+  /**
+   * Record a derived variable and its source expression.
+   * Called when we see patterns like:
+   * - const hasAnalysis = analysis !== null
+   * - const isLoading = status === 'loading'
+   * - const isBusy = isRunning || isQueued
+   */
+  private addDerivedVariable(
+    variableName: string,
+    derivationInfo: DerivedVariableInfo,
+  ): void {
+    this.derivedVariables[variableName] = derivationInfo;
+  }
+
+  /**
+   * Get derivation info for a variable if it was derived from another expression.
+   */
+  private getDerivedVariableInfo(
+    variableName: string,
+  ): DerivedVariableInfo | undefined {
+    return this.derivedVariables[variableName];
+  }
+
   /**
    * Add a conditional usage for key attribute detection
-   * Groups usages by path for easy lookup
+   * Groups usages by path for easy lookup.
+   * Also enriches the usage with derivation info if the variable is derived.
    */
   private addConditionalUsage(usage: ConditionalUsage): void {
+    // Note: Derivation info enrichment now happens in analyzeScope.ts after all
+    // statements are processed, so derived variables from earlier statements can
+    // be used to enrich usages from later statements.
+
     if (!this.conditionalUsages[usage.path]) {
       this.conditionalUsages[usage.path] = [];
     }
@@ -658,6 +683,97 @@ export class ASTScopeAnalyzer {
     }
   }
 
+  /**
+   * Add a gating condition for a child component.
+   * Called when we see patterns like: {hasAnalysis && <ChildComponent />}
+   * Groups conditions by child component name.
+   */
+  private addChildBoundaryGatingCondition(
+    childComponentName: string,
+    gatingCondition: ConditionalUsage,
+  ): void {
+    if (!this.childBoundaryGatingConditions[childComponentName]) {
+      this.childBoundaryGatingConditions[childComponentName] = [];
+    }
+    // Avoid duplicates with same path and conditionType
+    const exists = this.childBoundaryGatingConditions[childComponentName].some(
+      (existing) =>
+        existing.path === gatingCondition.path &&
+        existing.conditionType === gatingCondition.conditionType &&
+        existing.isNegated === gatingCondition.isNegated,
+    );
+    if (!exists) {
+      this.childBoundaryGatingConditions[childComponentName].push(
+        gatingCondition,
+      );
+    }
+  }
+
+  /**
+   * Add a compound conditional for key attribute dependency detection
+   */
+  private addCompoundConditional(compound: CompoundConditional): void {
+    // Avoid duplicates by expression and location (chainId is generated each time)
+    const exists = this.compoundConditionals.some(
+      (existing) =>
+        existing.expression === compound.expression &&
+        existing.sourceLocation.lineNumber ===
+          compound.sourceLocation.lineNumber,
+    );
+    if (!exists) {
+      this.compoundConditionals.push(compound);
+    }
+  }
+
+  /**
+   * Add a conditional effect (setter call inside a conditional)
+   */
+  private addConditionalEffect(
+    effect: import('./types').ConditionalEffect,
+  ): void {
+    this.conditionalEffects.push(effect);
+  }
+
+  /**
+   * Updates the schema type for a path, typically used when switch statements
+   * reveal the valid values for a parameter (creating a union type like "'a' | 'b' | 'c'")
+   *
+   * This method:
+   * 1. Updates the type for the given path
+   * 2. Also updates the type for any equivalent path (e.g., if "state" -> "signature[0]",
+   *    we update both "state" and "signature[0]")
+   * 3. For property paths like "data.status", if "data" -> "signature[0]",
+   *    we also update "signature[0].status"
+   */
+  private updateSchemaType(
+    path: string | StructuredPath,
+    newType: string,
+  ): void {
+    const pathStr = path.toString();
+
+    // Update the type for the given path
+    this.structure[pathStr] = newType;
+
+    // Also update the type for any equivalent path
+    // e.g., if "state" -> "signature[0]", update "signature[0]" as well
+    const equivalentPath = this.equivalentVariables[pathStr];
+    if (equivalentPath) {
+      this.structure[equivalentPath] = newType;
+    }
+
+    // For property paths like "data.status", check if the base has an equivalence
+    // e.g., if "data" -> "signature[0]", transform "data.status" to "signature[0].status"
+    for (const [varPath, equivalence] of Object.entries(
+      this.equivalentVariables,
+    )) {
+      if (pathStr.startsWith(varPath + '.')) {
+        const suffix = pathStr.slice(varPath.length);
+        const transformedPath = equivalence + suffix;
+        this.structure[transformedPath] = newType;
+      }
+    }
+  }
+
   /**
    * Get a simplified type string from a TypeScript Type object
    * This converts TypeScript's internal type representation to our type system