@codeyam/codeyam-cli 0.1.20 → 0.1.22

package/analyzer-template/.build-info.json

@@ -1,10 +1,10 @@
 {
-  "buildTimestamp": "2026-03-22T12:08:27.765Z",
-  "buildTime": 1774181307765,
-  "gitCommit": "4ae50914b19ee5c5cec03ceca2a8ec32fd82c0d4",
+  "buildTimestamp": "2026-03-24T14:27:03.288Z",
+  "buildTime": 1774362423288,
+  "gitCommit": "af072353c0de778f2916c445dec0ca98b1ee7180",
   "nodeVersion": "v20.20.1",
-  "contentHash": "faebee669133648dadbd8892432f1e62fa8bbf062c5cc67690819cb8f39cfa86",
-  "buildNumber": 1148,
-  "semanticVersion": "0.1.1148",
-  "version": "0.1.1148 (2026-03-22T12:08+faebee6)"
+  "contentHash": "2352c3294573a7af51e18b678f86299d7a1fe24cbf8427cdfcd4472c2f613df6",
+  "buildNumber": 1216,
+  "semanticVersion": "0.1.1216",
+  "version": "0.1.1216 (2026-03-24T14:27+2352c32)"
 }

package/analyzer-template/log.txt

@@ -1,7 +1,7 @@
 
-[3/22/2026, 12:08:27 PM] > codeyam-combo@1.0.0 mergeDependencies
-[3/22/2026, 12:08:27 PM] > node ./scripts/mergePackageJsonFiles.cjs
+[3/24/2026, 2:27:03 PM] > codeyam-combo@1.0.0 mergeDependencies
+[3/24/2026, 2:27:03 PM] > node ./scripts/mergePackageJsonFiles.cjs
 
 
-[3/22/2026, 12:08:27 PM] Merged dependencies into root package.json
+[3/24/2026, 2:27:03 PM] Merged dependencies into root package.json
 

package/analyzer-template/package.json

@@ -9,7 +9,7 @@
   "dependencies": {
     "@aws-sdk/client-cloudwatch-logs": "^3.990.0",
     "@aws-sdk/client-cloudfront": "^3.990.0",
-    "@aws-sdk/client-codebuild": "^3.1000.0",
+    "@aws-sdk/client-codebuild": "^3.1014.0",
     "@aws-sdk/client-dynamodb": "^3.990.0",
     "@aws-sdk/client-ec2": "^3.990.0",
     "@aws-sdk/client-ecr": "^3.990.0",

package/analyzer-template/packages/ai/src/lib/dataStructure/ScopeDataStructure.ts

@@ -398,6 +398,7 @@ const SILENTLY_IGNORED_EQUIVALENCY_REASONS = new Set([
   'transformed non-object function equivalency - Array.from() equivalency',
   'Spread operator equivalency key update: Explicit array deconstruction equivalency value',
   // 'transformed non-object function equivalency - Explicit array deconstruction equivalency value',
+  'useState setter call equivalency (direct)',
 ]);
 
 export class ScopeDataStructure {
@@ -1048,9 +1049,38 @@ export class ScopeDataStructure {
     equivalencyValueChain?: EquivalencyValueChainItem[],
     traceId?: number,
   ) {
+    // Fast early exits that don't count toward the limit.
+    // These are "no-op" calls that would be caught further below anyway,
+    // but checking them first prevents counter inflation from redundant calls
+    // generated by managers and followEquivalencies during scope processing.
+
+    // Skip silently-ignored reasons before counting
+    if (SILENTLY_IGNORED_EQUIVALENCY_REASONS.has(equivalencyReason)) {
+      return;
+    }
+
+    // Skip exact duplicates before counting (Phase 1 only — Phase 2 needs
+    // to process duplicates for database chain tracking)
+    if (this.onlyEquivalencies) {
+      const existing = scopeNode.equivalencies[path];
+      if (
+        existing?.some(
+          (v) =>
+            v.schemaPath === equivalentPath &&
+            v.scopeNodeName === equivalentScopeName,
+        )
+      ) {
+        return;
+      }
+    }
+
     addEquivalencyCallCount++;
 
-    if (addEquivalencyCallCount > 50000) {
+    const limit =
+      typeof (globalThis as any).__CODEYAM_EQUIVALENCY_LIMIT === 'number'
+        ? (globalThis as any).__CODEYAM_EQUIVALENCY_LIMIT
+        : 50000;
+    if (addEquivalencyCallCount > limit) {
       console.error('INFINITE LOOP DETECTED in addEquivalency', {
         callCount: addEquivalencyCallCount,
         path,
@@ -1065,14 +1095,11 @@ export class ScopeDataStructure {
     }
     // Filter equivalency reasons - use pre-computed Sets for O(1) lookup
     if (!ALLOWED_EQUIVALENCY_REASONS.has(equivalencyReason)) {
-      if (SILENTLY_IGNORED_EQUIVALENCY_REASONS.has(equivalencyReason)) {
-        return;
-      } else {
-        // Log and skip - if an equivalency reason isn't in ALLOWED or SILENTLY_IGNORED,
-        // it shouldn't be stored (was previously missing the return)
-        console.info('Not tracked equivalency reason', { equivalencyReason });
-        return;
-      }
+      // Silently-ignored reasons already handled above
+      // Log and skip - if an equivalency reason isn't in ALLOWED or SILENTLY_IGNORED,
+      // it shouldn't be stored (was previously missing the return)
+      console.info('Not tracked equivalency reason', { equivalencyReason });
+      return;
     }
 
     // Skip self-referential equivalencies that would create infinite loops.

package/analyzer-template/packages/ai/src/lib/dataStructure/equivalencyManagers/ParentScopeManager.ts

@@ -97,6 +97,16 @@ export default class ParentScopeManager implements EquivalencyManager {
       }
 
       if (instantiatedInParent || returnValueFromChildScope) {
+        // Skip if we've already propagated this variable to the parent scope.
+        // Without this guard, nested scopes trigger redundant addEquivalency calls
+        // for the same variable on every addToSchema pass (e.g., 'a' and 'b' in sort
+        // callbacks get propagated 30+ times per scope instead of once).
+        this.addedToParent[scopeNode.name] ||= new Set<string>();
+        if (this.addedToParent[scopeNode.name].has(rootPath)) {
+          return false;
+        }
+        this.addedToParent[scopeNode.name].add(rootPath);
+
         if (traceId && debugLevel > 0) {
           console.info(
             'Debug Propagation: parentScope executed',
@@ -114,9 +124,6 @@ export default class ParentScopeManager implements EquivalencyManager {
           );
         }
 
-        this.addedToParent[scopeNode.name] ||= new Set<string>();
-        this.addedToParent[scopeNode.name].add(rootPath);
-
         scopeDataStructure.addEquivalency(
           rootPath,
           rootPath,

package/analyzer-template/packages/ai/src/lib/dataStructure/helpers/cleanKnownObjectFunctions.ts

@@ -6,7 +6,7 @@ import { ScopeNode, ScopeDataStructure } from '../ScopeDataStructure';
 
 type PrimitiveKind = 'array' | 'string' | 'number' | 'boolean' | 'date';
 
-const IGNORE_CLASSES_AND_OBJECTS = [
+const IGNORE_CLASSES_AND_OBJECTS_SET = new Set([
   'Math',
   'JSON',
   'Reflect',
@@ -22,7 +22,7 @@ const IGNORE_CLASSES_AND_OBJECTS = [
   'useContext',
   'useReducer',
   'useLayoutEffect',
-];
+]);
 
 /** cache the tokenised representation of every path we touch */
 const partsCache = new Map<string, string[]>();
@@ -147,16 +147,26 @@ function scrub(
   rootTable: Map<string, PrimitiveKind>,
   onRemove: (key: string) => void,
 ): void {
-  const sortedKeys = Object.keys(mapping).sort((a, b) => a.localeCompare(b));
+  // Early exit: if no primitive types exist in the schema, there are no
+  // built-in methods to clean. Saves sorting + walking 10K+ keys.
+  if (rootTable.size === 0) return;
+
+  // Use direct comparison instead of localeCompare (3-5x faster for large arrays)
+  const sortedKeys = Object.keys(mapping).sort((a, b) =>
+    a < b ? -1 : a > b ? 1 : 0,
+  );
 
   for (const keyPath of sortedKeys) {
     const keyParts = getParts(keyPath);
     const prefixParts = buildPrefixParts(keyParts);
 
+    const firstPart = keyParts[0];
+    const firstPartBase = firstPart.includes('(')
+      ? firstPart.split('(')[0]
+      : firstPart;
     if (
-      IGNORE_CLASSES_AND_OBJECTS.find(
-        (m) => keyParts[0] === m || keyParts[0].startsWith(`${m}(`),
-      )
+      IGNORE_CLASSES_AND_OBJECTS_SET.has(firstPart) ||
+      IGNORE_CLASSES_AND_OBJECTS_SET.has(firstPartBase)
     ) {
       delete mapping[keyPath];
       continue;

package/analyzer-template/packages/analyze/index.ts

@@ -36,7 +36,10 @@ export { getAllEntityNodes } from './src/lib/asts/sourceFiles/getAllEntityNodes'
 export { default as fileAnalyzerFromCode } from './src/lib/files/fileAnalyzerFromCode';
 
 export { default as isolateDataStructure } from './src/lib/files/scenarios/isolateDataStructure';
-export { default as mergeInDependentDataStructure } from './src/lib/files/scenarios/mergeInDependentDataStructure';
+export {
+  default as mergeInDependentDataStructure,
+  DataStructureTimeoutError,
+} from './src/lib/files/scenarios/mergeInDependentDataStructure';
 export { default as mergeValidatedDataStructures } from './src/lib/files/scenarios/mergeValidatedDataStructures';
 
 export { discoverDirectDependencies } from './src/lib/files/analyze/dependencyResolver';

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

@@ -289,18 +289,44 @@ export default async function prepareEntityDataStructures(
     skipWorkerPool();
   }
 
+  awsLogDebugLevel(
+    1,
+    `Preparing data structures for ${entities.length} entities (${entitiesNeedingGeneration} need generation)...`,
+  );
+  const startTime = Date.now();
+  let completedCount = 0;
+
+  // Wrap processEntity to track progress
+  const processEntityWithProgress = async (entity: Entity) => {
+    await processEntity(entity);
+    completedCount++;
+    // Emit progress every 10 entities
+    if (completedCount % 10 === 0) {
+      awsLogDebugLevel(
+        1,
+        `Preparing data structures... (${completedCount}/${entities.length})`,
+      );
+    }
+  };
+
   const sequential =
     DEBUG_SEQUENTIAL_EXECUTION || options.sequentialDataStructurePrep;
 
   if (sequential) {
     // Sequential execution for debugging - process one entity at a time
     for (const entity of entities) {
-      await processEntity(entity);
+      await processEntityWithProgress(entity);
     }
   } else {
     // Parallel execution for speed
-    await Promise.all(entities.map(processEntity));
+    await Promise.all(entities.map(processEntityWithProgress));
   }
+
+  const elapsed = Date.now() - startTime;
+  awsLogDebugLevel(
+    1,
+    `Data structure preparation complete: ${entities.length} entities in ${elapsed}ms`,
+  );
 }
 
 /**

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

@@ -8,13 +8,11 @@ import {
 import { transformationTracer } from '../scenarios/TransformationTracer';
 import { getFileByPathSafe } from '../../utils/getFileByPath';
 import trackEntityCircularDependencies from './trackEntityCircularDependencies';
-import validateDependencyAnalyses from './validateDependencyAnalyses';
 import extractClassMethods from './analyzeEntities/extractClassMethods';
 import prepareDataStructures from './analyzeEntities/prepareDataStructures';
 import { strategies, asyncComplex } from './analyzeEntities/strategies';
 import {
   updateCommitMetadata,
-  updateFreshAnalysisMetadata,
   updateFreshAnalysisStatus,
   upsertAnalyses,
   upsertEntities,
@@ -263,40 +261,11 @@ export default async function analyzeEntities({
     }
   }
 
-  awsLog(`CodeYam: analyzeEntities: Running patch-up dependency validation`);
-  for (const analysis of analyses) {
-    if (!analysis.entity) {
-      throw new Error(
-        `CodeYam: analyzeEntities: Internal error: Analysis entity is missing for ${analysis.filePath}:${analysis.entityName}.`,
-      );
-    }
-
-    // Validate dependencies, which modifies analysis.metadata.dependentAnalyses
-    validateDependencyAnalyses({ analysis, entity: analysis.entity, context });
-
-    // Carefully update only the metadata field
-    if (analysis.id) {
-      const updatedMetadata = await updateFreshAnalysisMetadata(
-        analysis.id,
-        (metadata) => {
-          metadata.dependentAnalyses =
-            analysis.metadata?.dependentAnalyses || [];
-        },
-      );
-
-      if (updatedMetadata) {
-        analysis.metadata = updatedMetadata;
-      } else {
-        console.warn(
-          `CodeYam: analyzeEntities: Failed to update metadata for analysis ${analysis.id}`,
-        );
-      }
-    } else {
-      console.warn(
-        `CodeYam: analyzeEntities: Analysis ${analysis.filePath}:${analysis.entityName} has no ID, skipping metadata update`,
-      );
-    }
-  }
+  // NOTE: patch-up dependency validation loop was removed here.
+  // analysis.metadata.dependentAnalyses is already populated by validateDependencyAnalyses
+  // inside analyzeEntity() (Call #1) and persisted via upsertAnalysesWithScenarios at the
+  // end of analyzeEntity, then again by upsertAnalyses in analyzeOneEntityKey. Re-validating
+  // every analysis from scratch was redundant work — especially costly for large projects.
 
   const newlyReady = await updateReadyAnalyses();
   if (newlyReady.length > 0) {

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

@@ -111,6 +111,7 @@ export default async function findOrCreateEntity({
     entity = await loadEntity({
       projectId: project.id,
       sha,
+      silent: true, // Entity not existing yet is the normal path — we create it below
     });
   }
 

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

@@ -1,5 +1,6 @@
 import type { Entity } from '~codeyam/types';
 import { AnalysisContext } from '../../analysisContext';
+import { awsLogDebugLevel } from '~codeyam/utils';
 
 /**
  * Optimized version that processes multiple root entities in a single traversal.
@@ -16,6 +17,8 @@ export default function trackEntityCircularDependencies(
   try {
     const allEntities = new Set<Entity>();
     const globalVisited = new Set<string>(); // Track by SHA to avoid duplicate traversals
+    let circularCount = 0;
+    const startTime = Date.now();
 
     // Process each root entity, but skip if already processed
     for (const rootEntity of rootEntities) {
@@ -32,8 +35,26 @@ export default function trackEntityCircularDependencies(
         globalVisited,
         allEntities,
       );
+
+      // Emit periodic progress for large projects
+      if (allEntities.size % 100 === 0 && allEntities.size > 0) {
+        awsLogDebugLevel(
+          1,
+          `Mapping dependencies... (${allEntities.size} entities discovered)`,
+        );
+      }
     }
 
+    const elapsed = Date.now() - startTime;
+    // Count circular deps
+    for (const entity of allEntities) {
+      if (entity.metadata?.hasCircularDependency) circularCount++;
+    }
+    awsLogDebugLevel(
+      1,
+      `Dependency mapping complete: ${allEntities.size} entities, ${circularCount} circular, ${elapsed}ms`,
+    );
+
     return allEntities;
   } catch (e) {
     console.log(

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

@@ -6,6 +6,20 @@ import type {
   ReadonlyEntity,
 } from '~codeyam/types';
 import { ImmutableAnalysisContext } from '../../analysisContext';
+import { awsLogDebugLevel } from '~codeyam/utils';
+
+/**
+ * Tracks statistics across the recursive dependency validation.
+ * Shared by all recursive calls to provide a complete picture.
+ */
+interface ValidationStats {
+  totalVisited: number;
+  skippedDuplicate: number;
+  skippedMissing: number;
+  skippedTrivial: number;
+  maxDepth: number;
+  startTime: number;
+}
 
 export default function validateDependencyAnalyses({
   analysis,
@@ -13,12 +27,18 @@ export default function validateDependencyAnalyses({
   entity,
   context,
   dependentAnalyses,
+  _depth = 0,
+  _stats,
 }: {
   analysis?: Analysis;
   readonlyAnalysis?: ReadonlyAnalysis;
   entity: ReadonlyEntity;
   context: ImmutableAnalysisContext;
   dependentAnalyses?: ReadonlyAnalysisMap;
+  /** Recursion depth (internal, do not set) */
+  _depth?: number;
+  /** Shared stats tracker (internal, do not set) */
+  _stats?: ValidationStats;
 }): { dependentAnalyses: ReadonlyAnalysisMap } {
   if (!readonlyAnalysis) readonlyAnalysis = analysis;
   if (!readonlyAnalysis) {
@@ -32,6 +52,28 @@ export default function validateDependencyAnalyses({
     );
   }
 
+  // Initialize stats on the root call
+  const isRootCall = _depth === 0;
+  if (!_stats) {
+    _stats = {
+      totalVisited: 0,
+      skippedDuplicate: 0,
+      skippedMissing: 0,
+      skippedTrivial: 0,
+      maxDepth: 0,
+      startTime: Date.now(),
+    };
+  }
+  if (_depth > _stats.maxDepth) _stats.maxDepth = _depth;
+
+  const importCount = entity.metadata?.importedExports?.length ?? 0;
+  if (isRootCall && importCount > 0) {
+    awsLogDebugLevel(
+      2,
+      `validateDeps: ${entity.name} has ${importCount} imports to validate`,
+    );
+  }
+
   if (
     dependentAnalyses &&
     dependentAnalyses[readonlyAnalysis.filePath]?.[
@@ -45,6 +87,12 @@ export default function validateDependencyAnalyses({
     })
   ) {
     // already processed this analysis
+    if (isRootCall) {
+      awsLogDebugLevel(
+        2,
+        `validateDeps: ${entity.name} already fully processed (cache hit)`,
+      );
+    }
     return { dependentAnalyses };
   }
 
@@ -69,9 +117,20 @@ export default function validateDependencyAnalyses({
 
     // if the entity has duplicate dependencies, handle gracefully
     if (dependentAnalyses[dependencyFilePath]?.[dependencyName]) {
+      _stats.skippedDuplicate++;
       continue;
     }
 
+    _stats.totalVisited++;
+
+    // Emit periodic progress so the spinner stays alive for large trees
+    if (_stats.totalVisited % 50 === 0) {
+      awsLogDebugLevel(
+        1,
+        `Validating dependencies... (${_stats.totalVisited} resolved, depth ${_depth})`,
+      );
+    }
+
     // Check if dependency analysis exists in context
     const dependentAnalysis = context.getAnalysis(
       dependencyFilePath,
@@ -86,21 +145,20 @@ export default function validateDependencyAnalyses({
       );
 
       if (!dependentEntity) {
-        // console.warn(
-        //   `CodeYam: validateDependencyAnalyses: Missing dependent entity ${dependencyFilePath}:${dependencyName} for ${entity.filePath}:${entity.name}. This is likely a bug.`,
-        // );
+        _stats.skippedMissing++;
         continue;
       }
 
       // ignore trivial missing dependencies
-      if (!['library', 'visual'].includes(dependentEntity.entityType)) continue;
+      if (!['library', 'visual'].includes(dependentEntity.entityType)) {
+        _stats.skippedTrivial++;
+        continue;
+      }
 
       if (!dependentEntity?.metadata?.hasCircularDependency) {
         // TODO: This no longer seems to happen thanks to fixes elsewhere, but leave the warning
-        // console.warn(
-        //   `CodeYam: validateDependencyAnalyses: Missing analysis for dependency ${entity.filePath}:${entity.name} -> ${dependencyFilePath}:${dependencyName}, should be marked as having circular dependencies.`,
-        // );
       }
+      _stats.skippedMissing++;
       continue;
     }
 
@@ -136,9 +194,6 @@ export default function validateDependencyAnalyses({
     if (analysis) {
       // Track dependency relationship in analysis metadata
       if (!analysis.metadata.dependentAnalyses.includes(dependentAnalysis.id)) {
-        // console.log(
-        //   `CodeYam: validateDependencyAnalyses: Establishing dependency ${analysis.filePath}:${analysis.entityName} -> ${dependentAnalysis.filePath}:${dependentAnalysis.entityName}.`,
-        // );
         analysis.metadata.dependentAnalyses.push(dependentAnalysis.id);
       }
     }
@@ -152,9 +207,26 @@ export default function validateDependencyAnalyses({
         entity: dependentEntity,
         context: context,
         dependentAnalyses,
+        _depth: _depth + 1,
+        _stats,
       });
     }
   }
 
+  // Log summary on root call completion
+  if (isRootCall) {
+    const elapsed = Date.now() - _stats.startTime;
+    const totalDeps = Object.values(dependentAnalyses).reduce(
+      (sum, fileMap) => sum + Object.keys(fileMap).length,
+      0,
+    );
+    awsLogDebugLevel(
+      1,
+      `Dependency validation complete for ${entity.name}: ${totalDeps} dependencies resolved, ` +
+        `${_stats.skippedDuplicate} duplicates skipped, ${_stats.skippedMissing} missing, ` +
+        `${_stats.skippedTrivial} trivial, max depth ${_stats.maxDepth}, ${elapsed}ms`,
+    );
+  }
+
   return { dependentAnalyses };
 }

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

@@ -91,6 +91,10 @@ export default async function analyzeChange({
     // Structure phase: CPU-intensive, serialize via semaphore if provided
     if (!steps || steps.includes(Step.Structure)) {
       if (structureSemaphore) {
+        awsLogDebugLevel(
+          1,
+          `Waiting for structure semaphore for ${entity.name}...`,
+        );
         await structureSemaphore.acquire();
       }
       try {

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

@@ -58,6 +58,10 @@ export default async function analyzeInitial({
     // Structure phase: CPU-intensive, serialize via semaphore if provided
     if (!steps || steps.includes(Step.Structure)) {
       if (structureSemaphore) {
+        awsLogDebugLevel(
+          1,
+          `Waiting for structure semaphore for ${entity.name}...`,
+        );
         await structureSemaphore.acquire();
       }
       try {

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

@@ -3,6 +3,8 @@ import { ProjectAnalyzer } from '../ProjectAnalyzer';
 import { generateSha } from '~codeyam/database';
 import { isNextRoute } from '~codeyam/utils';
 
+const warnedLayoutPaths = new Set<string>();
+
 export default function analyzeNextRoute(
   file: File,
   projectAnalyzer: ProjectAnalyzer,
@@ -56,9 +58,12 @@ export default function analyzeNextRoute(
 
           // Ensure entities array exists before trying to use it
           if (!layout.entities) {
-            console.log(
-              `CodeYam Warning: layout.entities not populated for ${layout.path}, skipping implicit dependency`,
-            );
+            if (!warnedLayoutPaths.has(layout.path)) {
+              warnedLayoutPaths.add(layout.path);
+              console.log(
+                `CodeYam Warning: layout.entities not populated for ${layout.path}, skipping implicit dependency`,
+              );
+            }
             return;
           }