@codeyam/codeyam-cli 0.1.0-staging.323686 → 0.1.0-staging.483fdc2

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

@@ -1,10 +1,10 @@
 {
-  "buildTimestamp": "2026-01-30T00:55:52.181Z",
-  "buildTime": 1769734552181,
-  "gitCommit": "03236865a7602ab6d30df31e0ad3bee876906fb9",
+  "buildTimestamp": "2026-02-04T17:33:57.768Z",
+  "buildTime": 1770226437768,
+  "gitCommit": "483fdc20d9d24e266e9bca6a25b473ccb58957fd",
   "nodeVersion": "v20.20.0",
-  "contentHash": "05d53efd18fbc545b72ac5e31193346a32efa60861ecfb3bf24454bef6533f43",
-  "buildNumber": 549,
-  "semanticVersion": "0.1.549",
-  "version": "0.1.549 (2026-01-30T00:55+05d53ef)"
+  "contentHash": "21dbd7d480c0c50901df9ce172ec9316ac759c210f7ad6216cdfbd7d9f65446e",
+  "buildNumber": 563,
+  "semanticVersion": "0.1.563",
+  "version": "0.1.563 (2026-02-04T17:33+21dbd7d)"
 }

package/analyzer-template/log.txt

@@ -1,7 +1,7 @@
 
-[1/30/2026, 12:55:52 AM] > codeyam-combo@1.0.0 mergeDependencies
-[1/30/2026, 12:55:52 AM] > node ./scripts/mergePackageJsonFiles.cjs
+[2/4/2026, 5:33:57 PM] > codeyam-combo@1.0.0 mergeDependencies
+[2/4/2026, 5:33:57 PM] > node ./scripts/mergePackageJsonFiles.cjs
 
 
-[1/30/2026, 12:55:52 AM] Merged dependencies into root package.json
+[2/4/2026, 5:33:57 PM] Merged dependencies into root package.json
 

package/analyzer-template/package.json

@@ -7,7 +7,7 @@
     "build": "tsc && node ./scripts/postbuild.cjs"
   },
   "dependencies": {
-    "@aws-sdk/client-cloudwatch-logs": "^3.966.0",
+    "@aws-sdk/client-cloudwatch-logs": "^3.980.0",
     "@aws-sdk/client-cloudfront": "^3.966.0",
     "@aws-sdk/client-codebuild": "^3.948.0",
     "@aws-sdk/client-dynamodb": "^3.956.0",
@@ -64,7 +64,7 @@
     "@types/jest": "^30.0.0",
     "@types/pg": "^8.15.5",
     "@types/ws": "^8.18.1",
-    "@octokit/types": "^15.0.0",
+    "@octokit/types": "^16.0.0",
     "@types/react": "^19.2.7",
     "@types/react-dom": "^19.2.3",
     "@types/react-resizable": "^3.0.7",

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

@@ -57,8 +57,13 @@ export {
   removeDuplicateFunctionCalls,
 } from './src/lib/dataStructure/helpers/cleanNonObjectFunctions';
 export { default as convertDotNotation } from './src/lib/dataStructure/helpers/convertDotNotation';
+export { default as convertTypeAnnotationsToValues } from './src/lib/dataStructure/helpers/convertTypeAnnotationsToValues';
 export { default as cleanOutBoundary } from './src/lib/cleanOutBoundary';
-export { fillInDirectSchemaGapsAndUnknowns } from './src/lib/dataStructure/helpers/fillInSchemaGapsAndUnknowns';
+export {
+  fillInDirectSchemaGapsAndUnknowns,
+  buildSchemaIndexes,
+  type SchemaIndexes,
+} from './src/lib/dataStructure/helpers/fillInSchemaGapsAndUnknowns';
 export { default as deduplicateFunctionSchemas } from './src/lib/dataStructure/helpers/deduplicateFunctionSchemas';
 export { default as getConditionalUsagesFromCode } from './src/lib/getConditionalUsagesFromCode';
 export type {

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

@@ -372,7 +372,7 @@ export async function analyzeScopeLocal({
             }
 
             for (const mapping of [structure, equivalentVariables]) {
-              for (let [key, value] of Object.entries(mapping)) {
+              for (let [key, rawValue] of Object.entries(mapping)) {
                 for (const [childScopeId, childScope] of sortedEntries) {
                   const scopeText = fileAnalyzer.sourceFile.text.slice(
                     childScope.start,
@@ -392,27 +392,49 @@ export async function analyzeScopeLocal({
                     return text;
                   };
 
-                  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),
-                        }),
-                      );
+                  // Handle both string and string[] values (for OR expressions)
+                  const processValue = (value: string): string => {
+                    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),
+                          }),
+                        );
+                      }
+                      return replaceChildScopeId(value);
+                    }
+                    return value;
+                  };
+
+                  if (Array.isArray(rawValue)) {
+                    const newValues = rawValue.map(processValue);
+                    (mapping as Record<string, string | string[]>)[key] =
+                      newValues;
+                    rawValue = newValues;
+                  } else if (typeof rawValue === 'string') {
+                    const newValue = processValue(rawValue);
+                    if (newValue !== rawValue) {
+                      (mapping as Record<string, string | string[]>)[key] =
+                        newValue;
+                      rawValue = newValue;
                     }
-                    value = replaceChildScopeId(value);
-                    mapping[key] = value;
                   }
+
                   if (key.includes(scopeText)) {
                     const oldKey = key;
                     key = replaceChildScopeId(key);
-                    mapping[key] = mapping[oldKey];
-                    delete mapping[oldKey];
+                    (mapping as Record<string, string | string[]>)[key] = (
+                      mapping as Record<string, string | string[]>
+                    )[oldKey];
+                    delete (mapping as Record<string, string | string[]>)[
+                      oldKey
+                    ];
                   }
                 }
               }

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

@@ -102,7 +102,7 @@ import { ThrowStatementHandler } from './patterns/throwStatementHandler';
  */
 export class ASTScopeAnalyzer {
   private structure: Record<string, string> = {};
-  private equivalentVariables: Record<string, string> = {};
+  private equivalentVariables: Record<string, string | string[]> = {};
   private environmentVariables: string[] = [];
   private conditionalUsages: Record<string, ConditionalUsage[]> = {};
   private compoundConditionals: CompoundConditional[] = [];
@@ -235,6 +235,8 @@ export class ASTScopeAnalyzer {
       typeChecker: this.fileAnalyzer.typeChecker,
       addEquivalence: (leftSide, rightSide) =>
         this.addEquivalence(leftSide, rightSide),
+      addMultipleEquivalencies: (leftSide, rightSides) =>
+        this.addMultipleEquivalencies(leftSide, rightSides),
       addType: (path, type) => this.addType(path, type),
       addEnvironmentVariable: (variablePath) =>
         this.addEnvironmentVariable(variablePath),
@@ -592,7 +594,9 @@ export class ASTScopeAnalyzer {
   }
 
   /**
-   * Adds an equivalence relationship between two variable paths
+   * Adds an equivalence relationship between two variable paths.
+   * Uses overwrite semantics - if an equivalence already exists, the new value replaces it
+   * (unless the new value is 'undefined' or 'null').
    */
   private addEquivalence(
     leftSide: StructuredPath,
@@ -622,6 +626,44 @@ export class ASTScopeAnalyzer {
     }
   }
 
+  /**
+   * Adds multiple equivalence relationships for a single variable path.
+   * Used for OR expressions like `x = a || b` where x is equivalent to both a and b.
+   * The values are stored as an array to track all possible sources.
+   */
+  private addMultipleEquivalencies(
+    leftSide: StructuredPath,
+    rightSides: StructuredPath[],
+  ): void {
+    if (leftSide?.isLiteral()) {
+      return;
+    }
+
+    const leftSideStr = leftSide?.toLeftHandSideString();
+    if (!leftSideStr) return;
+
+    // Filter out invalid paths and convert to strings
+    const validRightSides = rightSides
+      .map((r) => r?.toRightHandSideString())
+      .filter((r): r is string => !!r && r !== leftSideStr);
+
+    // Remove duplicates while preserving order
+    const uniqueRightSides = [...new Set(validRightSides)];
+
+    // Filter out 'undefined' and 'null' unless they're the only values
+    const meaningfulValues = uniqueRightSides.filter(
+      (v) => v !== 'undefined' && v !== 'null',
+    );
+    const finalValues =
+      meaningfulValues.length > 0 ? meaningfulValues : uniqueRightSides;
+
+    if (finalValues.length === 0) return;
+
+    // Store as single value if only one, otherwise as array
+    this.equivalentVariables[leftSideStr] =
+      finalValues.length === 1 ? finalValues[0] : finalValues;
+  }
+
   /**
    * Adds a type for a variable path
    */
@@ -785,22 +827,38 @@ export class ASTScopeAnalyzer {
     // Update the type for the given path
     this.structure[pathStr] = newType;
 
-    // Also update the type for any equivalent path
+    // Also update the type for any equivalent path(s)
     // e.g., if "state" -> "signature[0]", update "signature[0]" as well
-    const equivalentPath = this.equivalentVariables[pathStr];
-    if (equivalentPath) {
-      this.structure[equivalentPath] = newType;
+    const rawEquivalentPath = this.equivalentVariables[pathStr];
+    const equivalentPaths = Array.isArray(rawEquivalentPath)
+      ? rawEquivalentPath
+      : rawEquivalentPath
+        ? [rawEquivalentPath]
+        : [];
+    for (const equivalentPath of equivalentPaths) {
+      if (typeof equivalentPath === 'string') {
+        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(
+    for (const [varPath, rawEquivalence] of Object.entries(
       this.equivalentVariables,
     )) {
       if (pathStr.startsWith(varPath + '.')) {
+        const equivalences = Array.isArray(rawEquivalence)
+          ? rawEquivalence
+          : rawEquivalence
+            ? [rawEquivalence]
+            : [];
         const suffix = pathStr.slice(varPath.length);
-        const transformedPath = equivalence + suffix;
-        this.structure[transformedPath] = newType;
+        for (const equivalence of equivalences) {
+          if (typeof equivalence === 'string') {
+            const transformedPath = equivalence + suffix;
+            this.structure[transformedPath] = newType;
+          }
+        }
       }
     }
   }