@codeyam/codeyam-cli 0.1.0-staging.28f73cf → 0.1.0-staging.76566f9

package/packages/ai/src/lib/promptGenerators/gatherAttributesMap.js

@@ -47,15 +47,57 @@ function validAttribute(attribute) {
     }
     return true;
 }
-export function gatherAttributesMap(entity, reverse = false) {
+/**
+ * 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(isolatedDataStructure, mergedDataStructureOrEquivalentVars, equivalentSignatureVariablesOrReverse, reverseArg) {
+    // Handle backwards compatibility: detect if called with old signature
+    // Old: (mergedDataStructure, equivalentSignatureVariables?, reverse?)
+    // New: (isolatedDataStructure, mergedDataStructure, equivalentSignatureVariables?, reverse?)
+    let mergedDataStructure;
+    let equivalentSignatureVariables;
+    let reverse;
+    if (mergedDataStructureOrEquivalentVars &&
+        typeof mergedDataStructureOrEquivalentVars === 'object' &&
+        'dependencySchemas' in mergedDataStructureOrEquivalentVars) {
+        // New signature: (isolated, merged, equivalentVars?, reverse?)
+        mergedDataStructure = mergedDataStructureOrEquivalentVars;
+        equivalentSignatureVariables =
+            equivalentSignatureVariablesOrReverse ??
+                {};
+        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 ??
+                {};
+        reverse =
+            equivalentSignatureVariablesOrReverse ?? false;
+    }
     const attributesMap = {};
     const associationMap = {};
     // Maps internalPath -> full data structure path (e.g., "useDiffModal().diffView")
     const dataStructurePathMap = {};
-    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(equivalentSignatureVariable);
             if (equivalentSignatureVariable &&
@@ -65,7 +107,7 @@ export function gatherAttributesMap(entity, reverse = false) {
                     equivalentKey,
                     ...keyParts.slice(1),
                 ]);
-                attributesMap[equivalentPath] = signatureSchema[key];
+                attributesMap[equivalentPath] = typeValue;
                 associationMap[reverse ? equivalentPath : key] = reverse
                     ? key
                     : equivalentPath;
@@ -74,7 +116,7 @@ export function gatherAttributesMap(entity, reverse = false) {
             }
             else {
                 const relativePath = joinParenthesesAndArrays(keyParts.slice(1));
-                attributesMap[relativePath] = signatureSchema[key];
+                attributesMap[relativePath] = typeValue;
                 associationMap[reverse ? relativePath : key] = reverse
                     ? key
                     : relativePath;
@@ -83,22 +125,35 @@ export function gatherAttributesMap(entity, reverse = false) {
             }
         }
     }
-    for (const filePath in dependencySchemas) {
-        for (const entityName in dependencySchemas[filePath]) {
-            const returnValueDataStructure = dependencySchemas[filePath][entityName].returnValueSchema ?? {};
-            // First pass: collect all function paths
+    // 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 ?? {};
+            // 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 = [];
-            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') {
+                // Filter out paths that contain signature[N] anywhere
+                // These represent function input parameters, not data from data sources
+                // Key attributes must reference data sources, not function inputs
+                if (pathParts.some((part) => part.startsWith('signature['))) {
+                    continue;
+                }
+                if (mergedReturnValueSchema[path] === 'function') {
                     continue;
                 }
                 // Check if this path is inside a function (but not a function return value we care about)
@@ -137,7 +192,7 @@ export function gatherAttributesMap(entity, reverse = false) {
                             const relativePath = path;
                             if (!validAttribute(relativePath))
                                 continue;
-                            attributesMap[relativePath] = returnValueDataStructure[path];
+                            attributesMap[relativePath] = mergedReturnValueSchema[path];
                             associationMap[reverse ? relativePath : path] = reverse
                                 ? path
                                 : relativePath;
@@ -153,7 +208,8 @@ export function gatherAttributesMap(entity, reverse = false) {
                     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/packages/ai/src/lib/promptGenerators/gatherAttributesMap.js.map

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

package/packages/ai/src/lib/promptGenerators/generateChangesEntityScenariosGenerator.js

@@ -1,6 +1,6 @@
 import gatherRelevantDependentKeyAttributes from "../gatherRelevantDependentKeyAttributes.js";
-export default function generateChangesEntityScenariosGenerator({ entity, keyAttributes, addedKeyAttributes, removedKeyAttributes, dependentAnalyses, existingScenarios, commitDiff, error, changedDataStructureFields = [], }) {
-    const relevantDependentKeyAttributesFlat = gatherRelevantDependentKeyAttributes(entity, dependentAnalyses);
+export default function generateChangesEntityScenariosGenerator({ entity, mergedDataStructure, keyAttributes, addedKeyAttributes, removedKeyAttributes, dependentAnalyses, existingScenarios, commitDiff, error, changedDataStructureFields = [], }) {
+    const relevantDependentKeyAttributesFlat = gatherRelevantDependentKeyAttributes(entity, mergedDataStructure, dependentAnalyses);
     // Restructure flat array into nested format: { [filePath]: { [entityName]: KeyAttribute[] } }
     const relevantDependentKeyAttributes = {};
     for (const attr of relevantDependentKeyAttributesFlat) {
@@ -20,7 +20,28 @@ export default function generateChangesEntityScenariosGenerator({ entity, keyAtt
         dataStructurePath: ka.dataStructurePath,
         localVariable: ka.internalPath,
         description: ka.description,
-        validValueOptions: ka.validValueOptions,
+        // Include indexed validValueOptions for structured references
+        validValueOptions: ka.validValueOptions.map((value, index) => ({
+            index,
+            value,
+        })),
+        ...(ka.errorValueOptions?.length && {
+            errorValueOptions: ka.errorValueOptions.map((value, index) => ({
+                index,
+                value,
+            })),
+        }),
+        // Include new fields when present
+        ...(ka.valueType && { valueType: ka.valueType }),
+        ...(ka.dependencies && { dependencies: ka.dependencies }),
+        // Include source locations showing where this attribute is used in conditionals
+        ...(ka.sourceLocations?.length && {
+            codeUsages: ka.sourceLocations.map((loc) => ({
+                line: loc.lineNumber,
+                code: loc.codeSnippet,
+                context: loc.description,
+            })),
+        }),
     }));
     const addedSection = addedKeyAttributes?.length > 0
         ? JSON.stringify(formatKeyAttrs(addedKeyAttributes), null, 2)
@@ -66,7 +87,28 @@ ${JSON.stringify(Object.keys(relevantDependentKeyAttributes).reduce((acc, path)
                     dataStructurePath: ka.dataStructurePath,
                     localVariable: ka.path || ka.internalPath,
                     description: ka.description,
-                    validValueOptions: ka.validValueOptions,
+                    // Include indexed validValueOptions for structured references
+                    validValueOptions: (ka.validValueOptions || []).map((value, index) => ({
+                        index,
+                        value,
+                    })),
+                    ...(ka.errorValueOptions?.length && {
+                        errorValueOptions: ka.errorValueOptions.map((value, index) => ({
+                            index,
+                            value,
+                        })),
+                    }),
+                    // Include new fields when present
+                    ...(ka.valueType && { valueType: ka.valueType }),
+                    ...(ka.dependencies && { dependencies: ka.dependencies }),
+                    // Include source locations showing where this attribute is used in conditionals
+                    ...(ka.sourceLocations?.length && {
+                        codeUsages: ka.sourceLocations.map((loc) => ({
+                            line: loc.lineNumber,
+                            code: loc.codeSnippet,
+                            context: loc.description,
+                        })),
+                    }),
                 }));
                 return entityAcc;
             }, {});

package/packages/ai/src/lib/promptGenerators/generateChangesEntityScenariosGenerator.js.map

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

package/packages/ai/src/lib/promptGenerators/generateEntityScenariosGenerator.js

@@ -5,7 +5,28 @@ export default function generateEntityScenariosGenerator({ entity, keyAttributes
         dataStructurePath: ka.dataStructurePath,
         localVariable: ka.internalPath,
         description: ka.description,
-        validValueOptions: ka.validValueOptions,
+        // Include indexed validValueOptions for structured references
+        validValueOptions: ka.validValueOptions.map((value, index) => ({
+            index,
+            value,
+        })),
+        ...(ka.errorValueOptions?.length && {
+            errorValueOptions: ka.errorValueOptions.map((value, index) => ({
+                index,
+                value,
+            })),
+        }),
+        // Include new fields when present
+        ...(ka.valueType && { valueType: ka.valueType }),
+        ...(ka.dependencies && { dependencies: ka.dependencies }),
+        // Include source locations showing where this attribute is used in conditionals
+        ...(ka.sourceLocations?.length && {
+            codeUsages: ka.sourceLocations.map((loc) => ({
+                line: loc.lineNumber,
+                code: loc.codeSnippet,
+                context: loc.description,
+            })),
+        }),
     })), null, 2);
     const dependencySection = !error &&
         relevantDependentKeyAttributes &&
@@ -18,7 +39,28 @@ ${JSON.stringify(relevantDependentKeyAttributes.map((ka) => ({
             localVariable: ka.internalPath,
             forDependency: ka.dependentEntityName,
             description: ka.description,
-            validValueOptions: ka.validValueOptions,
+            // Include indexed validValueOptions for structured references
+            validValueOptions: ka.validValueOptions.map((value, index) => ({
+                index,
+                value,
+            })),
+            ...(ka.errorValueOptions?.length && {
+                errorValueOptions: ka.errorValueOptions.map((value, index) => ({
+                    index,
+                    value,
+                })),
+            }),
+            // Include new fields when present
+            ...(ka.valueType && { valueType: ka.valueType }),
+            ...(ka.dependencies && { dependencies: ka.dependencies }),
+            // Include source locations showing where this attribute is used in conditionals
+            ...(ka.sourceLocations?.length && {
+                codeUsages: ka.sourceLocations.map((loc) => ({
+                    line: loc.lineNumber,
+                    code: loc.codeSnippet,
+                    context: loc.description,
+                })),
+            }),
         })), null, 2)}
 \`\`\``
         : '';

package/packages/ai/src/lib/promptGenerators/generateEntityScenariosGenerator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generateEntityScenariosGenerator.js","sourceRoot":"","sources":["../../../../../../../packages/ai/src/lib/promptGenerators/generateEntityScenariosGenerator.ts"],"names":[],"mappings":"AAQA,MAAM,CAAC,OAAO,UAAU,gCAAgC,CAAC,EACvD,MAAM,EACN,aAAa,EACb,KAAK,GACgC;IACrC,MAAM,uBAAuB,GAAG,aAAa,EAAE,MAAM,CACnD,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,mBAAmB,CAChC,CAAC;IAEF,MAAM,8BAA8B,GAAG,aAAa,EAAE,MAAM,CAC1D,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,mBAAmB,CAC/B,CAAC;IAEF,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CACjC,uBAAuB,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QACnC,iBAAiB,EAAE,EAAE,CAAC,iBAAiB;QACvC,aAAa,EAAE,EAAE,CAAC,YAAY;QAC9B,WAAW,EAAE,EAAE,CAAC,WAAW;QAC3B,iBAAiB,EAAE,EAAE,CAAC,iBAAiB;KACxC,CAAC,CAAC,EACH,IAAI,EACJ,CAAC,CACF,CAAC;IAEF,MAAM,iBAAiB,GACrB,CAAC,KAAK;QACN,8BAA8B;QAC9B,8BAA8B,CAAC,MAAM,GAAG,CAAC;QACvC,CAAC,CAAC;;;EAGN,IAAI,CAAC,SAAS,CACd,8BAA8B,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YAC1C,iBAAiB,EAAE,EAAE,CAAC,iBAAiB;YACvC,aAAa,EAAE,EAAE,CAAC,YAAY;YAC9B,aAAa,EAAE,EAAE,CAAC,mBAAmB;YACrC,WAAW,EAAE,EAAE,CAAC,WAAW;YAC3B,iBAAiB,EAAE,EAAE,CAAC,iBAAiB;SACxC,CAAC,CAAC,EACH,IAAI,EACJ,CAAC,CACF;OACM;QACD,CAAC,CAAC,EAAE,CAAC;IAET,OAAO;;EAEP,YAAY;;;;;EAKZ,MAAM,CAAC,IAAI;QACL,iBAAiB,EAAE,CAAC;AAC5B,CAAC"}
+{"version":3,"file":"generateEntityScenariosGenerator.js","sourceRoot":"","sources":["../../../../../../../packages/ai/src/lib/promptGenerators/generateEntityScenariosGenerator.ts"],"names":[],"mappings":"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"}

package/packages/ai/src/lib/promptGenerators/guessNewScenarioDataFromDescriptionGenerator.js

@@ -1,13 +1,26 @@
-export default function guessNewScenarioDataFromDescriptionGenerator({ description, existingScenarios, scenariosDataStructure, }) {
+export default function guessNewScenarioDataFromDescriptionGenerator({ description, existingScenarios, scenariosDataStructure, keyAttributeSelections, }) {
+    let keyAttributesSection = '';
+    if (keyAttributeSelections && keyAttributeSelections.length > 0) {
+        keyAttributesSection = `
+  User-selected Key Attributes and Values:
+  The user has specifically requested these key attributes and values be used in the scenario:
+  ${keyAttributeSelections
+            .map((sel) => `  - ${sel.path}: ${sel.value}${sel.isCustom ? ' (custom value)' : ''}`)
+            .join('\n')}
+
+  IMPORTANT: The mockData MUST include these specific values for the specified paths. Generate a scenario name and description that reflects these choices.
+  `;
+    }
     return `Mock Scenario Data Structure:
   \`\`\`
   ${JSON.stringify(scenariosDataStructure, null, 2)}
-  \`\`\
+  \`\`\`
   Existing Mock Scenario Data:
   \`\`\`
   ${JSON.stringify(existingScenarios, null, 2)}
   \`\`\`
-  New Scenario user-created prompt: "${description}"
+${keyAttributesSection}
+  New Scenario user-created prompt: "${description || '(No additional description - generate based on selected key attributes)'}"
   `;
 }
 //# sourceMappingURL=guessNewScenarioDataFromDescriptionGenerator.js.map

package/packages/ai/src/lib/promptGenerators/guessNewScenarioDataFromDescriptionGenerator.js.map

@@ -1 +1 @@
-{"version":3,"file":"guessNewScenarioDataFromDescriptionGenerator.js","sourceRoot":"","sources":["../../../../../../../packages/ai/src/lib/promptGenerators/guessNewScenarioDataFromDescriptionGenerator.ts"],"names":[],"mappings":"AAQA,MAAM,CAAC,OAAO,UAAU,4CAA4C,CAAC,EACnE,WAAW,EACX,iBAAiB,EACjB,sBAAsB,GACe;IACrC,OAAO;;IAEL,IAAI,CAAC,SAAS,CAAC,sBAAsB,EAAE,IAAI,EAAE,CAAC,CAAC;;;;IAI/C,IAAI,CAAC,SAAS,CAAC,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC;;uCAEP,WAAW;GAC/C,CAAC;AACJ,CAAC"}
+{"version":3,"file":"guessNewScenarioDataFromDescriptionGenerator.js","sourceRoot":"","sources":["../../../../../../../packages/ai/src/lib/promptGenerators/guessNewScenarioDataFromDescriptionGenerator.ts"],"names":[],"mappings":"AAgBA,MAAM,CAAC,OAAO,UAAU,4CAA4C,CAAC,EACnE,WAAW,EACX,iBAAiB,EACjB,sBAAsB,EACtB,sBAAsB,GACe;IACrC,IAAI,oBAAoB,GAAG,EAAE,CAAC;IAC9B,IAAI,sBAAsB,IAAI,sBAAsB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAChE,oBAAoB,GAAG;;;IAGvB,sBAAsB;aACrB,GAAG,CACF,CAAC,GAAG,EAAE,EAAE,CACN,OAAO,GAAG,CAAC,IAAI,KAAK,GAAG,CAAC,KAAK,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,EAAE,CAC1E;aACA,IAAI,CAAC,IAAI,CAAC;;;GAGZ,CAAC;IACF,CAAC;IAED,OAAO;;IAEL,IAAI,CAAC,SAAS,CAAC,sBAAsB,EAAE,IAAI,EAAE,CAAC,CAAC;;;;IAI/C,IAAI,CAAC,SAAS,CAAC,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC;;EAE5C,oBAAoB;uCACiB,WAAW,IAAI,yEAAyE;GAC5H,CAAC;AACJ,CAAC"}

package/packages/ai/src/lib/worker/SerializableDataStructure.js.map

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

package/packages/ai/src/lib/worker/analyzeScopeWorker.js

@@ -6,6 +6,7 @@
  */
 import { FileAnalyzer, ProjectAnalyzer } from "../../../../../packages/analyze/index.js";
 import { analyzeScopeLocal } from "../analyzeScope.js";
+import { resetScopeDataStructureMetrics, } from "../dataStructure/ScopeDataStructure.js";
 import { setThreadContext } from "../../../../../packages/utils/index.js";
 import { threadId } from 'worker_threads';
 // Set thread context for logging
@@ -19,6 +20,9 @@ let fileAnalyzerPath = null;
  * Main worker function called by Piscina
  */
 export default async function runAnalyzeScope(input) {
+    // Reset metrics counters at the start of each entity analysis to prevent
+    // false "infinite loop" detection when processing multiple entities
+    resetScopeDataStructureMetrics();
     try {
         const { entity, project, dirPath, filePath, file, scope, model } = input;
         // Create or reuse ProjectAnalyzer

package/packages/ai/src/lib/worker/analyzeScopeWorker.js.map

@@ -1 +1 @@
-{"version":3,"file":"analyzeScopeWorker.js","sourceRoot":"","sources":["../../../../../../../packages/ai/src/lib/worker/analyzeScopeWorker.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAIpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,iCAAiC;AACjC,gBAAgB,CAAC,WAAW,QAAQ,GAAG,CAAC,CAAC;AAoBzC,qCAAqC;AACrC,IAAI,eAAe,GAA2B,IAAI,CAAC;AACnD,IAAI,kBAAkB,GAAkB,IAAI,CAAC;AAE7C,IAAI,YAAY,GAAwB,IAAI,CAAC;AAC7C,IAAI,gBAAgB,GAAkB,IAAI,CAAC;AAE3C;;GAEG;AACH,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,eAAe,CAC3C,KAA8B;IAE9B,IAAI,CAAC;QACH,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC;QAEzE,kCAAkC;QAClC,MAAM,KAAK,GAAG,GAAG,OAAO,EAAE,CAAC;QAC3B,IAAI,CAAC,eAAe,IAAI,kBAAkB,KAAK,KAAK,EAAE,CAAC;YACrD,eAAe,GAAG,MAAM,eAAe,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;YACnE,kBAAkB,GAAG,KAAK,CAAC;QAC7B,CAAC;QAED,+BAA+B;QAC/B,IAAI,CAAC,YAAY,IAAI,gBAAgB,KAAK,QAAQ,EAAE,CAAC;YACnD,YAAY,GAAG,IAAI,YAAY,CAAC;gBAC9B,eAAe;gBACf,IAAI;aACL,CAAC,CAAC;YACH,gBAAgB,GAAG,QAAQ,CAAC;QAC9B,CAAC;QAED,8CAA8C;QAC9C,MAAM,SAAS,GAAc;YAC3B,GAAG,KAAK;YACR,yDAAyD;SAC1D,CAAC;QAEF,qEAAqE;QACrE,MAAM,aAAa,GAAG,MAAM,iBAAiB,CAAC;YAC5C,MAAM;YACN,YAAY;YACZ,KAAK,EAAE,SAAS;YAChB,KAAK;SACN,CAAC,CAAC;QAEH,0CAA0C;QAC1C,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CACb,uDAAuD,MAAM,CAAC,IAAI,OAAO,MAAM,CAAC,QAAQ,EAAE,CAC3F,CAAC;QACJ,CAAC;QAED,OAAO,EAAE,aAAa,EAAE,aAAa,CAAC,cAAc,EAAE,EAAE,CAAC;IAC3D,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CACX,yCAAyC,KAAK,CAAC,MAAM,CAAC,IAAI,OAAO,KAAK,CAAC,MAAM,CAAC,QAAQ,GAAG,EACzF,KAAK,CACN,CAAC;QACF,MAAM,KAAK,CAAC,CAAC,oCAAoC;IACnD,CAAC;AACH,CAAC"}
+{"version":3,"file":"analyzeScopeWorker.js","sourceRoot":"","sources":["../../../../../../../packages/ai/src/lib/worker/analyzeScopeWorker.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAEL,8BAA8B,GAC/B,MAAM,qCAAqC,CAAC;AAG7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,iCAAiC;AACjC,gBAAgB,CAAC,WAAW,QAAQ,GAAG,CAAC,CAAC;AAoBzC,qCAAqC;AACrC,IAAI,eAAe,GAA2B,IAAI,CAAC;AACnD,IAAI,kBAAkB,GAAkB,IAAI,CAAC;AAE7C,IAAI,YAAY,GAAwB,IAAI,CAAC;AAC7C,IAAI,gBAAgB,GAAkB,IAAI,CAAC;AAE3C;;GAEG;AACH,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,eAAe,CAC3C,KAA8B;IAE9B,yEAAyE;IACzE,oEAAoE;IACpE,8BAA8B,EAAE,CAAC;IAEjC,IAAI,CAAC;QACH,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC;QAEzE,kCAAkC;QAClC,MAAM,KAAK,GAAG,GAAG,OAAO,EAAE,CAAC;QAC3B,IAAI,CAAC,eAAe,IAAI,kBAAkB,KAAK,KAAK,EAAE,CAAC;YACrD,eAAe,GAAG,MAAM,eAAe,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;YACnE,kBAAkB,GAAG,KAAK,CAAC;QAC7B,CAAC;QAED,+BAA+B;QAC/B,IAAI,CAAC,YAAY,IAAI,gBAAgB,KAAK,QAAQ,EAAE,CAAC;YACnD,YAAY,GAAG,IAAI,YAAY,CAAC;gBAC9B,eAAe;gBACf,IAAI;aACL,CAAC,CAAC;YACH,gBAAgB,GAAG,QAAQ,CAAC;QAC9B,CAAC;QAED,8CAA8C;QAC9C,MAAM,SAAS,GAAc;YAC3B,GAAG,KAAK;YACR,yDAAyD;SAC1D,CAAC;QAEF,qEAAqE;QACrE,MAAM,aAAa,GAAG,MAAM,iBAAiB,CAAC;YAC5C,MAAM;YACN,YAAY;YACZ,KAAK,EAAE,SAAS;YAChB,KAAK;SACN,CAAC,CAAC;QAEH,0CAA0C;QAC1C,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CACb,uDAAuD,MAAM,CAAC,IAAI,OAAO,MAAM,CAAC,QAAQ,EAAE,CAC3F,CAAC;QACJ,CAAC;QAED,OAAO,EAAE,aAAa,EAAE,aAAa,CAAC,cAAc,EAAE,EAAE,CAAC;IAC3D,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CACX,yCAAyC,KAAK,CAAC,MAAM,CAAC,IAAI,OAAO,KAAK,CAAC,MAAM,CAAC,QAAQ,GAAG,EACzF,KAAK,CACN,CAAC;QACF,MAAM,KAAK,CAAC,CAAC,oCAAoC;IACnD,CAAC;AACH,CAAC"}

package/packages/analyze/src/lib/FileAnalyzer.js

@@ -134,6 +134,65 @@ export class FileAnalyzer {
             return {};
         return lib.asts.sourceFiles.getAllExports(this.sourceFile);
     }
+    /**
+     * Find an export by following star export chains.
+     * When a file has `export * from "./path.js"`, this method will recursively
+     * resolve the path and search for the export in the target module.
+     *
+     * @param exportName The name of the export to find
+     * @param visited Set of already visited file paths to prevent infinite loops
+     * @returns The export info with resolved path if found, undefined otherwise
+     */
+    findExportThroughStarExports(exportName, visited = new Set()) {
+        if (!this.file?.path || visited.has(this.file.path)) {
+            return undefined;
+        }
+        visited.add(this.file.path);
+        const exports = this.getAllExports();
+        // First, check if the export exists directly
+        const directExport = exports[exportName];
+        if (directExport) {
+            return { export: directExport, resolvedPath: this.file.path };
+        }
+        // If not found directly, look for star exports and follow them
+        const starExports = Object.entries(exports).filter(([_, exp]) => exp.isStarExport);
+        for (const [_, starExport] of starExports) {
+            if (!starExport.directImportPath)
+                continue;
+            // Resolve the star export path
+            const resolvedModule = this.getResolvedModule(starExport.directImportPath);
+            if (!resolvedModule)
+                continue;
+            const resolvedPath = this.projectAnalyzer.getRelativePath(resolvedModule.resolvedFileName);
+            // Handle dist -> src mapping for workspace packages
+            let targetPath = resolvedPath;
+            let targetFile = this.projectAnalyzer.project.files.find((f) => f.path === targetPath);
+            if (!targetFile && targetPath.includes('/dist/')) {
+                const srcPath = targetPath.replace('/dist/', '/src/');
+                targetFile = this.projectAnalyzer.project.files.find((f) => f.path === srcPath);
+                if (targetFile) {
+                    targetPath = srcPath;
+                }
+                // Try with different extensions if still not found
+                if (!targetFile) {
+                    const basePath = srcPath.replace(/\.d\.ts$/, '').replace(/\.js$/, '');
+                    targetFile = this.projectAnalyzer.project.files.find((f) => f.path === basePath + '.ts' || f.path === basePath + '.tsx');
+                    if (targetFile) {
+                        targetPath = targetFile.path;
+                    }
+                }
+            }
+            if (!targetFile)
+                continue;
+            // Recursively search in the target file
+            const targetAnalyzer = this.projectAnalyzer.getFileAnalyzer(targetFile);
+            const result = targetAnalyzer.findExportThroughStarExports(exportName, visited);
+            if (result) {
+                return result;
+            }
+        }
+        return undefined;
+    }
     getImportsAnalysis() {
         if (!this.sourceFile)
             return {};
@@ -267,8 +326,28 @@ export class FileAnalyzer {
                 return [importPath, { externalLibrary, exportInfos }];
             }
             const relativePath = this.projectAnalyzer.getRelativePath(importPath);
-            const projectPath = this.projectAnalyzer.getRelativePath(resolvedImport.resolvedFileName);
-            const importedFile = this.projectAnalyzer.project.files.find((f) => f.path === projectPath);
+            let projectPath = this.projectAnalyzer.getRelativePath(resolvedImport.resolvedFileName);
+            let importedFile = this.projectAnalyzer.project.files.find((f) => f.path === projectPath);
+            // Workspace packages often resolve to dist/ paths (from package.json "types" or "main"),
+            // but our project.files contains source files in src/. Try mapping dist -> src.
+            if (!importedFile && projectPath.includes('/dist/')) {
+                const srcPath = projectPath.replace('/dist/', '/src/');
+                // Try exact match first (e.g., dist/index.d.ts -> src/index.ts)
+                importedFile = this.projectAnalyzer.project.files.find((f) => f.path === srcPath);
+                if (importedFile) {
+                    projectPath = srcPath;
+                }
+                // If not found, try with different extensions
+                if (!importedFile) {
+                    const basePath = srcPath
+                        .replace(/\.d\.ts$/, '')
+                        .replace(/\.js$/, '');
+                    importedFile = this.projectAnalyzer.project.files.find((f) => f.path === basePath + '.ts' || f.path === basePath + '.tsx');
+                    if (importedFile) {
+                        projectPath = importedFile.path;
+                    }
+                }
+            }
             if (!importedFile) {
                 // File not found in project.files, but still preserve resolvedPath
                 return [
@@ -290,9 +369,32 @@ export class FileAnalyzer {
                         }
                     });
                 }
-                const importedExport = importedExports[exportInfo.exportName];
-                const directImportPath = importedExport?.directImportPath;
-                if (directImportPath) {
+                let importedExport = importedExports[exportInfo.exportName];
+                let directImportPath = importedExport?.directImportPath;
+                let foundThroughStarExports = false;
+                // If export not found directly, try following star export chains
+                // This handles cases like `export * from "./client.js"` where the actual
+                // export is defined in a re-exported module
+                if (!importedExport &&
+                    typeof importedFileAnalyer.findExportThroughStarExports ===
+                        'function') {
+                    const starExportResult = importedFileAnalyer.findExportThroughStarExports(exportInfo.exportName);
+                    if (starExportResult) {
+                        // Found the export through star exports - update the resolved path
+                        // The directImportPath is effectively the resolved path where we found it
+                        directImportPath = starExportResult.export.directImportPath;
+                        // Update exportInfo with the resolved location
+                        if (!exportInfo.resolvedPath) {
+                            exportInfo.resolvedPath = starExportResult.resolvedPath;
+                        }
+                        importedExport = starExportResult.export;
+                        foundThroughStarExports = true;
+                    }
+                }
+                // Skip recursive processing if we found the export through star exports,
+                // since we already have the resolved path and the recursive call would
+                // use the wrong file analyzer (the original file, not where we found the export)
+                if (directImportPath && !foundThroughStarExports) {
                     const directImportResolvedImports = importedFileAnalyer.getResolvedImportsRelevantToFunctionName(exportInfo.exportName);
                     const directImportResolvedImport = directImportResolvedImports[directImportPath];
                     if (directImportResolvedImport) {
@@ -541,7 +643,9 @@ export class FileAnalyzer {
         if (!this.sourceFile)
             return { start: 0, end: 0 };
         const node = this.getAllEntityNodes()[entityName];
-        const start = this.sourceFile.getLineAndCharacterOfPosition(node.getStart()).line;
+        if (!node)
+            return { start: 0, end: 0 };
+        const start = this.sourceFile.getLineAndCharacterOfPosition(node.getStart(this.sourceFile)).line;
         const end = this.sourceFile.getLineAndCharacterOfPosition(node.getEnd()).line;
         // Convert to 1-based line numbers to match git diff format
         return { start: start + 1, end: end + 1 };