@codeyam/codeyam-cli 0.1.0-staging.dd216e0 → 0.1.0-staging.e2d4438

package/background/src/lib/virtualized/project/reconcileMockDataKeys.js

@@ -5,7 +5,13 @@
  * (e.g., "eq('user_id', 'user-12345')") when the mock code expects variable
  * references (e.g., "eq('user_id', user.id)").
  *
- * This function remaps mismatched keys to their expected equivalents.
+ * Keys are now original call signatures (e.g., "useFetcher<User>()", "db.select(query)").
+ *
+ * Also handles flat dotted keys (e.g., "trpc.fastener.getAttributeValues.useQuery(...)")
+ * by converting them to nested structure.
+ *
+ * @param mockData The mock data object to reconcile
+ * @param expectedKeys The expected keys from the structure
  */
 export function reconcileMockDataKeys(mockData, expectedKeys) {
     const result = {};
@@ -19,7 +25,19 @@ export function reconcileMockDataKeys(mockData, expectedKeys) {
             result[key] = reconciledValue;
             continue;
         }
-        // Try to find closest match
+        // Check if this is a flat dotted key that should be converted to nested structure
+        // e.g., "trpc.fastener.getAttributeValues.useQuery({ ... })"
+        const flatKeyParts = parseFlatDottedKey(key);
+        if (flatKeyParts && flatKeyParts.length > 1) {
+            // Check if the parts match expected keys (indicating this should be nested)
+            const partsMatchExpected = flatKeyParts.some((part) => expectedKeys.includes(part));
+            if (partsMatchExpected) {
+                // Convert flat key to nested structure and merge
+                deepMergeIntoResult(result, flatKeyParts, reconciledValue, expectedKeys);
+                continue;
+            }
+        }
+        // Try to find closest match using existing logic
         const closestKey = findClosestKey(key, expectedKeys);
         if (closestKey) {
             result[closestKey] = reconciledValue;
@@ -31,6 +49,83 @@ export function reconcileMockDataKeys(mockData, expectedKeys) {
     }
     return result;
 }
+/**
+ * Parse a flat dotted key into path segments.
+ * Handles keys like "trpc.fastener.getAttributeValues.useQuery({ ... })"
+ * where the last part might contain parentheses with function arguments.
+ *
+ * Returns null if the key doesn't look like a dotted path.
+ */
+function parseFlatDottedKey(key) {
+    // Don't treat keys that start with a function call as dotted paths
+    // e.g., "useQuery({ id: 123 })" should not be parsed
+    if (key.match(/^[a-zA-Z_][a-zA-Z0-9_]*\s*\(/)) {
+        // Check if there's a dot BEFORE the first parenthesis
+        const parenIndex = key.indexOf('(');
+        const dotBeforeParen = key.slice(0, parenIndex).includes('.');
+        if (!dotBeforeParen) {
+            return null;
+        }
+    }
+    // Must contain a dot to be a dotted path
+    if (!key.includes('.')) {
+        return null;
+    }
+    const parts = [];
+    let current = '';
+    let depth = 0;
+    for (let i = 0; i < key.length; i++) {
+        const char = key[i];
+        if (char === '(' || char === '{' || char === '[') {
+            depth++;
+            current += char;
+        }
+        else if (char === ')' || char === '}' || char === ']') {
+            depth--;
+            current += char;
+        }
+        else if (char === '.' && depth === 0) {
+            if (current) {
+                parts.push(current);
+            }
+            current = '';
+        }
+        else {
+            current += char;
+        }
+    }
+    if (current) {
+        parts.push(current);
+    }
+    // Need at least 2 parts for it to be a meaningful dotted path
+    return parts.length >= 2 ? parts : null;
+}
+/**
+ * Deep merge a value into the result object following the path segments.
+ * Reconciles the leaf key against expected keys.
+ */
+function deepMergeIntoResult(result, parts, value, expectedKeys) {
+    let current = result;
+    // Navigate/create path for all but the last part
+    for (let i = 0; i < parts.length - 1; i++) {
+        const part = parts[i];
+        if (!(part in current)) {
+            current[part] = {};
+        }
+        const next = current[part];
+        if (next && typeof next === 'object' && !Array.isArray(next)) {
+            current = next;
+        }
+        else {
+            // Can't traverse further, structure mismatch
+            return;
+        }
+    }
+    // Handle the leaf key
+    const leafKey = parts[parts.length - 1];
+    const closestLeafKey = findClosestKey(leafKey, expectedKeys) || leafKey;
+    current[closestLeafKey] = value;
+}
 /**
  * Find the closest matching key from expectedKeys for a given key.
  *
@@ -39,9 +134,15 @@ export function reconcileMockDataKeys(mockData, expectedKeys) {
  * - Ignore the last argument value (could be literal or variable)
  * - Match based on the common prefix
  * - If key has no parentheses, try matching with "()" appended
+ * - If key is "funcName()" (empty args), match expected key "funcName({...})" by function name
+ * - If key has object arguments (like useQuery({...})), match by function name
+ * - If key has single argument with literal value, match by function name
  *
  * e.g., "eq('user_id', 'user-12345')" matches "eq('user_id', user.id)"
  * e.g., "getAll" matches "getAll()"
+ * e.g., "getSurveysAction()" matches "getSurveysAction({ environmentId, ... })"
+ * e.g., "useQuery({ id: 123 })" matches "useQuery({ id: Number(id) })"
+ * e.g., "useCustomSizes('example-slug')" matches "useCustomSizes(projectSlug)"
  */
 function findClosestKey(key, expectedKeys) {
     const keyBase = extractKeyBase(key);
@@ -63,8 +164,109 @@ function findClosestKey(key, expectedKeys) {
             }
         }
     }
+    // If key is "funcName()" (empty args), try matching expected key "funcName({...})"
+    // This handles the case where LLM generates "getSurveysAction()" but expected key
+    // is "getSurveysAction({ environmentId, limit, ... })" with an object argument
+    const emptyArgsMatch = key.match(/^([a-zA-Z_][a-zA-Z0-9_]*)\(\)$/);
+    if (emptyArgsMatch) {
+        const funcName = emptyArgsMatch[1];
+        for (const expected of expectedKeys) {
+            // Match if expected key starts with the same function name and has args
+            const expectedMatch = expected.match(new RegExp(`^${escapeRegExp(funcName)}\\([^)]+\\)$`));
+            if (expectedMatch) {
+                return expected;
+            }
+        }
+    }
+    // If key has object literal arguments (like "useQuery({ id: 123, ... })"),
+    // try matching expected keys with the same function path AND first object property.
+    // This handles cases where LLM generates literal values but expected keys have variable references.
+    // e.g., "useQuery({ attributes: ['a', 'b'] })" matches "useQuery({ attributes: items || [] })"
+    // e.g., "trpc.users.getById.useQuery({ userId: 'user-123' })" matches "trpc.users.getById.useQuery({ userId })"
+    // Uses first property matching when multiple candidates exist for disambiguation.
+    const objectArgMatch = key.match(/^([a-zA-Z_][a-zA-Z0-9_.]*)\s*\(\s*\{/);
+    if (objectArgMatch) {
+        const funcPath = objectArgMatch[1]; // Can be "funcName" or "path.to.funcName"
+        // Extract the first property name from the object argument
+        const firstPropMatch = key.match(/\(\s*\{\s*\n?\s*([a-zA-Z_][a-zA-Z0-9_]*)\s*:/);
+        const firstProp = firstPropMatch ? firstPropMatch[1] : null;
+        // Collect all matching candidates
+        const candidates = [];
+        for (const expected of expectedKeys) {
+            // Match if expected key has the same function path and starts with object argument
+            const expectedObjArgMatch = expected.match(new RegExp(`^${escapeRegExp(funcPath)}\\s*\\(\\s*\\{`));
+            if (expectedObjArgMatch) {
+                candidates.push(expected);
+            }
+        }
+        // If we have a first property, prefer matching by property name
+        if (firstProp && candidates.length > 1) {
+            // Look for a candidate with the same first property
+            const propRegex = new RegExp(`\\(\\s*\\{[\\s\\n]*${escapeRegExp(firstProp)}\\s*:`);
+            const propMatch = candidates.find((c) => propRegex.test(c));
+            if (propMatch) {
+                return propMatch;
+            }
+        }
+        // Fall back to first candidate if no property match found
+        if (candidates.length > 0) {
+            return candidates[0];
+        }
+    }
+    // If key has a single argument (literal value OR variable reference),
+    // try matching expected keys with the same function name but different argument.
+    // This handles cases where:
+    // - LLM generates "useCustomSizes('example-slug')" but expected key is "useCustomSizes(projectSlug)"
+    // - LLM generates "useCustomSizes(someProjectSlug)" but expected key is "useCustomSizes(projectSlug)"
+    //
+    // The second case is important because when LLM generates multiple keys with different
+    // variable names (e.g., "useCustomSizes(someProjectSlug)" and "useCustomSizes(projectSlug)"),
+    // without reconciliation, normalizeMockData merges them into "useCustomSizes()" which
+    // doesn't match the expected key "useCustomSizes(projectSlug)", causing undefined data access.
+    const singleArgMatch = key.match(/^([a-zA-Z_][a-zA-Z0-9_.]*)\s*\(([^,)]+)\)$/);
+    if (singleArgMatch) {
+        const funcPath = singleArgMatch[1];
+        const arg = singleArgMatch[2].trim();
+        // Apply this matching if the argument is a literal OR a simple variable reference
+        const isLiteralArg = /^['"`].*['"`]$/.test(arg) || /^\d+$/.test(arg);
+        const isVariableRef = /^[a-zA-Z_][a-zA-Z0-9_]*$/.test(arg);
+        if (isLiteralArg || isVariableRef) {
+            for (const expected of expectedKeys) {
+                // Match if expected key has the same function path with a single argument
+                const expectedSingleArgMatch = expected.match(new RegExp(`^${escapeRegExp(funcPath)}\\s*\\([^,)]+\\)$`));
+                if (expectedSingleArgMatch) {
+                    return expected;
+                }
+            }
+        }
+    }
+    // If key has multiple arguments where one contains a literal value,
+    // try matching expected keys with the same function name and argument count.
+    // This handles cases like "getScenarioDisplayState(scenario, undefined, undefined, 'entitysha123', undefined)"
+    // matching "getScenarioDisplayState(scenario, undefined, undefined, entitySha, undefined)"
+    const multiArgWithLiteralMatch = key.match(/^([a-zA-Z_][a-zA-Z0-9_.]*)\s*\((.+)\)$/);
+    if (multiArgWithLiteralMatch) {
+        const funcPath = multiArgWithLiteralMatch[1];
+        const argsStr = multiArgWithLiteralMatch[2];
+        // Check if any argument is a string literal
+        const hasLiteralArg = /'[^']*'|"[^"]*"/.test(argsStr);
+        if (hasLiteralArg) {
+            for (const expected of expectedKeys) {
+                // Match if expected key starts with the same function path
+                if (expected.startsWith(funcPath + '(')) {
+                    return expected;
+                }
+            }
+        }
+    }
     return null;
 }
+/**
+ * Escape special regex characters in a string.
+ */
+function escapeRegExp(str) {
+    return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
 /**
  * Normalize quotes in a string: convert double quotes to single quotes.
  * This handles cases where the LLM generates keys with double quotes

package/background/src/lib/virtualized/project/reconcileMockDataKeys.js.map

@@ -1 +1 @@
-{"version":3,"file":"reconcileMockDataKeys.js","sourceRoot":"","sources":["../../../../../../../background/src/lib/virtualized/project/reconcileMockDataKeys.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"reconcileMockDataKeys.js","sourceRoot":"","sources":["../../../../../../../background/src/lib/virtualized/project/reconcileMockDataKeys.ts"],"names":[],"mappings":"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"}

package/background/src/lib/virtualized/project/runAnalysis.js

@@ -123,6 +123,10 @@ export default async function runAnalysis({ envConfig, sharedContext, controller
             entityShas,
             branchName: branch?.name,
         });
+        // Propagate the fallback branch to branchCommit so downstream code can use it
+        if (branchCommit && branch) {
+            branchCommit.branch = branch;
+        }
     }
     // After this block, 'commit' is the union of a regular or baseline commit
     commit ?? (commit = branchCommit);
@@ -199,6 +203,9 @@ export default async function runAnalysis({ envConfig, sharedContext, controller
     // Route to appropriate analyzer
     try {
         if (runReadyToBeCapturedPath) {
+            // Signal that analysis can produce captures immediately since analyses are already ready.
+            // This is needed for recapture to work - orchestration waits for the 'analysisProducing' event.
+            controller?.setAnalysisProducingPhase();
             return await analyzeReadyToBeCaptured({
                 project,
                 projectAnalyzer,
@@ -220,6 +227,7 @@ export default async function runAnalysis({ envConfig, sharedContext, controller
                 desiredAnalyses,
                 force,
                 fileStore,
+                onAnalysisProducing: () => controller?.setAnalysisProducingPhase(),
             });
         }
         // Regular commit path
@@ -239,6 +247,7 @@ export default async function runAnalysis({ envConfig, sharedContext, controller
             backgroundJob,
             desiredAnalyses,
             fileStore,
+            onAnalysisProducing: () => controller?.setAnalysisProducingPhase(),
         });
     }
     catch (e) {

package/background/src/lib/virtualized/project/runAnalysis.js.map

@@ -1 +1 @@
-{"version":3,"file":"runAnalysis.js","sourceRoot":"","sources":["../../../../../../../background/src/lib/virtualized/project/runAnalysis.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"runAnalysis.js","sourceRoot":"","sources":["../../../../../../../background/src/lib/virtualized/project/runAnalysis.ts"],"names":[],"mappings":"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"}

package/background/src/lib/virtualized/project/serverOnlyModules.js

@@ -172,6 +172,93 @@ export function applyServerOnlyMocks(fileContent) {
     // backtracking that hangs on a single .exec() call (before iteration limits kick in)
     return applyServerOnlyMocksAst(fileContent);
 }
+/**
+ * Check if a file exports an "env" variable that's derived from a node module import.
+ * This is a generic pattern for env configuration packages (like @t3-oss/env-*, envalid, etc.)
+ * that create server-only environment objects.
+ *
+ * Pattern detected:
+ *   import { someFunc } from "some-package";
+ *   export const env = someFunc({...});
+ *
+ * Returns the name of the imported function if detected, null otherwise.
+ */
+function detectEnvStoreFromNodeModule(sourceFile) {
+    // First, collect all imported function names from node modules
+    const nodeModuleImports = new Map(); // functionName -> modulePath
+    for (const statement of sourceFile.statements) {
+        if (!ts.isImportDeclaration(statement))
+            continue;
+        const moduleSpecifier = statement.moduleSpecifier;
+        if (!ts.isStringLiteral(moduleSpecifier))
+            continue;
+        const modulePath = moduleSpecifier.text;
+        // Skip relative imports - only look at node modules
+        if (modulePath.startsWith('.') || modulePath.startsWith('/'))
+            continue;
+        if (statement.importClause?.namedBindings &&
+            ts.isNamedImports(statement.importClause.namedBindings)) {
+            for (const element of statement.importClause.namedBindings.elements) {
+                nodeModuleImports.set(element.name.text, modulePath);
+            }
+        }
+        if (statement.importClause?.name) {
+            nodeModuleImports.set(statement.importClause.name.text, modulePath);
+        }
+    }
+    // Now look for: export const env = importedFunc(...)
+    for (const statement of sourceFile.statements) {
+        if (!ts.isVariableStatement(statement))
+            continue;
+        // Check if it's exported
+        const isExported = statement.modifiers?.some((m) => m.kind === ts.SyntaxKind.ExportKeyword);
+        if (!isExported)
+            continue;
+        for (const decl of statement.declarationList.declarations) {
+            // Check if variable is named "env"
+            if (!ts.isIdentifier(decl.name) || decl.name.text !== 'env')
+                continue;
+            // Check if initializer is a call expression
+            if (!decl.initializer || !ts.isCallExpression(decl.initializer))
+                continue;
+            // Get the function being called
+            const callExpr = decl.initializer.expression;
+            let funcName = null;
+            if (ts.isIdentifier(callExpr)) {
+                funcName = callExpr.text;
+            }
+            else if (ts.isPropertyAccessExpression(callExpr) &&
+                ts.isIdentifier(callExpr.name)) {
+                funcName = callExpr.name.text;
+            }
+            if (funcName && nodeModuleImports.has(funcName)) {
+                return {
+                    importedFunctionName: funcName,
+                    modulePath: nodeModuleImports.get(funcName),
+                };
+            }
+        }
+    }
+    return null;
+}
+/**
+ * Generate mock code for env store patterns.
+ * Replaces the imported function with one that returns a proxy.
+ */
+function generateEnvStoreMock(functionName) {
+    return `// Mock for env store function (server-only env vars)
+const ${functionName} = (config: any) => {
+  // Return a proxy that returns undefined for any property access
+  // This allows the code to run on the client without throwing
+  return new Proxy({} as any, {
+    get: (target, prop) => {
+      if (prop === 'then' || prop === Symbol.toStringTag) return undefined;
+      return undefined;
+    },
+  });
+};
+`;
+}
 /**
  * AST-based implementation of applyServerOnlyMocks for large files.
  * Uses TypeScript parser instead of regex to avoid catastrophic backtracking.
@@ -180,6 +267,9 @@ function applyServerOnlyMocksAst(fileContent) {
     try {
         const sourceFile = ts.createSourceFile('temp.ts', fileContent, ts.ScriptTarget.Latest, true);
         const replacements = [];
+        // Check if this file exports an "env" variable from a node module function call
+        // This is a generic pattern for env configuration packages
+        const envStoreInfo = detectEnvStoreFromNodeModule(sourceFile);
         for (const statement of sourceFile.statements) {
             if (!ts.isImportDeclaration(statement))
                 continue;
@@ -187,9 +277,6 @@ function applyServerOnlyMocksAst(fileContent) {
             if (!ts.isStringLiteral(moduleSpecifier))
                 continue;
             const modulePath = moduleSpecifier.text;
-            const config = findServerOnlyModule(modulePath);
-            if (!config)
-                continue;
             // Extract import names
             const importNames = [];
             let defaultImportName;
@@ -212,6 +299,22 @@ function applyServerOnlyMocksAst(fileContent) {
                     }
                 }
             }
+            // Check if this import provides the function used to create the env store
+            if (envStoreInfo &&
+                modulePath === envStoreInfo.modulePath &&
+                importNames.includes(envStoreInfo.importedFunctionName)) {
+                const mockCode = generateEnvStoreMock(envStoreInfo.importedFunctionName);
+                replacements.push({
+                    start: statement.getStart(sourceFile),
+                    end: statement.getEnd(),
+                    replacement: mockCode,
+                });
+                continue;
+            }
+            // Check for known server-only modules (from explicit list)
+            const config = findServerOnlyModule(modulePath);
+            if (!config)
+                continue;
             const mockCode = config.getMockCode(importNames, defaultImportName);
             replacements.push({
                 start: statement.getStart(sourceFile),

package/background/src/lib/virtualized/project/serverOnlyModules.js.map

@@ -1 +1 @@
-{"version":3,"file":"serverOnlyModules.js","sourceRoot":"","sources":["../../../../../../../background/src/lib/virtualized/project/serverOnlyModules.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"serverOnlyModules.js","sourceRoot":"","sources":["../../../../../../../background/src/lib/virtualized/project/serverOnlyModules.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAyB5B;;;GAGG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAA2B;IACzD,oBAAoB;IACpB;QACE,MAAM,EAAE,aAAa;QACrB,MAAM,EAAE,mDAAmD;QAC3D,QAAQ,EAAE,cAAc;QACxB,WAAW,EAAE,CAAC,WAAW,EAAE,iBAAiB,EAAE,EAAE;YAC9C,IAAI,iBAAiB,EAAE,CAAC;gBACtB,OAAO;QACP,iBAAiB;;;;;;;;;;;;CAYxB,CAAC;YACI,CAAC;YACD,gBAAgB;YAChB,IAAI,IAAI,GACN,wEAAwE,CAAC;YAC3E,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;gBAC/B,MAAM,CAAC,YAAY,EAAE,SAAS,CAAC,GAAG,IAAI;qBACnC,KAAK,CAAC,UAAU,CAAC;qBACjB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;gBACxB,MAAM,SAAS,GAAG,SAAS,IAAI,YAAY,CAAC;gBAC5C,IAAI,YAAY,KAAK,YAAY,EAAE,CAAC;oBAClC,IAAI,IAAI,SAAS,SAAS;;;;;CAKnC,CAAC;gBACM,CAAC;qBAAM,IAAI,YAAY,KAAK,aAAa,EAAE,CAAC;oBAC1C,IAAI,IAAI,SAAS,SAAS;CACnC,CAAC;gBACM,CAAC;qBAAM,IAAI,YAAY,KAAK,YAAY,EAAE,CAAC;oBACzC,IAAI,IAAI,SAAS,SAAS;;;;CAInC,CAAC;gBACM,CAAC;qBAAM,CAAC;oBACN,IAAI,IAAI,SAAS,SAAS,+BAA+B,YAAY;CAC9E,CAAC;gBACM,CAAC;YACH,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;KACF;IAED,oCAAoC;IACpC;QACE,MAAM,EAAE,mBAAmB;QAC3B,MAAM,EAAE,kCAAkC;QAC1C,QAAQ,EAAE,aAAa;QACvB,WAAW,EAAE,CAAC,WAAW,EAAE,EAAE;YAC3B,OAAO;;;;CAIZ,CAAC;QACE,CAAC;KACF;IACD;QACE,MAAM,EAAE,YAAY;QACpB,MAAM,EAAE,qCAAqC;QAC7C,QAAQ,EAAE,aAAa;QACvB,WAAW,EAAE,CAAC,WAAW,EAAE,iBAAiB,EAAE,EAAE;YAC9C,IAAI,iBAAiB,EAAE,CAAC;gBACtB,OAAO;QACP,iBAAiB;;;;;;;CAOxB,CAAC;YACI,CAAC;YACD,6DAA6D;YAC7D,OAAO,+DAA+D,CAAC;QACzE,CAAC;KACF;IAED,iCAAiC;IACjC;QACE,MAAM,EAAE,cAAc;QACtB,MAAM,EAAE,qDAAqD;QAC7D,QAAQ,EAAE,WAAW;QACrB,WAAW,EAAE,GAAG,EAAE;YAChB,OAAO;;;;;;;;;;;;;;;;CAgBZ,CAAC;QACE,CAAC;KACF;CACF,CAAC;AAEF;;GAEG;AACH,MAAM,UAAU,oBAAoB,CAClC,eAAuB;IAEvB,OAAO,mBAAmB,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;QACzC,IAAI,OAAO,MAAM,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YACtC,OAAO,MAAM,CAAC,MAAM,KAAK,eAAe,CAAC;QAC3C,CAAC;QACD,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,kBAAkB,CAAC,eAAuB;IACxD,OAAO,oBAAoB,CAAC,eAAe,CAAC,KAAK,SAAS,CAAC;AAC7D,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,oBAAoB,CAAC,eAAuB;IAK1D,uCAAuC;IACvC,MAAM,UAAU,GAAG,eAAe,CAAC,KAAK,CACtC,gDAAgD,CACjD,CAAC;IACF,IAAI,UAAU,EAAE,CAAC;QACf,MAAM,KAAK,GAAG,UAAU,CAAC,CAAC,CAAC;aACxB,KAAK,CAAC,GAAG,CAAC;aACV,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;aACpB,MAAM,CAAC,OAAO,CAAC,CAAC;QACnB,OAAO;YACL,eAAe,EAAE,UAAU,CAAC,CAAC,CAAC;YAC9B,WAAW,EAAE,KAAK;SACnB,CAAC;IACJ,CAAC;IAED,mEAAmE;IACnE,MAAM,YAAY,GAAG,eAAe,CAAC,KAAK,CACxC,yDAAyD,CAC1D,CAAC;IACF,IAAI,YAAY,EAAE,CAAC;QACjB,OAAO;YACL,eAAe,EAAE,YAAY,CAAC,CAAC,CAAC;YAChC,WAAW,EAAE,EAAE;YACf,iBAAiB,EAAE,YAAY,CAAC,CAAC,CAAC;SACnC,CAAC;IACJ,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,oBAAoB,CAAC,WAAmB;IACtD,gFAAgF;IAChF,qFAAqF;IACrF,OAAO,uBAAuB,CAAC,WAAW,CAAC,CAAC;AAC9C,CAAC;AAED;;;;;;;;;;GAUG;AACH,SAAS,4BAA4B,CAAC,UAAyB;IAI7D,+DAA+D;IAC/D,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAkB,CAAC,CAAC,6BAA6B;IAElF,KAAK,MAAM,SAAS,IAAI,UAAU,CAAC,UAAU,EAAE,CAAC;QAC9C,IAAI,CAAC,EAAE,CAAC,mBAAmB,CAAC,SAAS,CAAC;YAAE,SAAS;QAEjD,MAAM,eAAe,GAAG,SAAS,CAAC,eAAe,CAAC;QAClD,IAAI,CAAC,EAAE,CAAC,eAAe,CAAC,eAAe,CAAC;YAAE,SAAS;QAEnD,MAAM,UAAU,GAAG,eAAe,CAAC,IAAI,CAAC;QACxC,oDAAoD;QACpD,IAAI,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,SAAS;QAEvE,IACE,SAAS,CAAC,YAAY,EAAE,aAAa;YACrC,EAAE,CAAC,cAAc,CAAC,SAAS,CAAC,YAAY,CAAC,aAAa,CAAC,EACvD,CAAC;YACD,KAAK,MAAM,OAAO,IAAI,SAAS,CAAC,YAAY,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;gBACpE,iBAAiB,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YACvD,CAAC;QACH,CAAC;QACD,IAAI,SAAS,CAAC,YAAY,EAAE,IAAI,EAAE,CAAC;YACjC,iBAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACtE,CAAC;IACH,CAAC;IAED,qDAAqD;IACrD,KAAK,MAAM,SAAS,IAAI,UAAU,CAAC,UAAU,EAAE,CAAC;QAC9C,IAAI,CAAC,EAAE,CAAC,mBAAmB,CAAC,SAAS,CAAC;YAAE,SAAS;QAEjD,yBAAyB;QACzB,MAAM,UAAU,GAAG,SAAS,CAAC,SAAS,EAAE,IAAI,CAC1C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,aAAa,CAC9C,CAAC;QACF,IAAI,CAAC,UAAU;YAAE,SAAS;QAE1B,KAAK,MAAM,IAAI,IAAI,SAAS,CAAC,eAAe,CAAC,YAAY,EAAE,CAAC;YAC1D,mCAAmC;YACnC,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,KAAK;gBAAE,SAAS;YAEtE,4CAA4C;YAC5C,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,WAAW,CAAC;gBAAE,SAAS;YAE1E,gCAAgC;YAChC,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC;YAC7C,IAAI,QAAQ,GAAkB,IAAI,CAAC;YAEnC,IAAI,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC9B,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC;YAC3B,CAAC;iBAAM,IACL,EAAE,CAAC,0BAA0B,CAAC,QAAQ,CAAC;gBACvC,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,EAC9B,CAAC;gBACD,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;YAChC,CAAC;YAED,IAAI,QAAQ,IAAI,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAChD,OAAO;oBACL,oBAAoB,EAAE,QAAQ;oBAC9B,UAAU,EAAE,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAE;iBAC7C,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;GAGG;AACH,SAAS,oBAAoB,CAAC,YAAoB;IAChD,OAAO;QACD,YAAY;;;;;;;;;;CAUnB,CAAC;AACF,CAAC;AAED;;;GAGG;AACH,SAAS,uBAAuB,CAAC,WAAmB;IAClD,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,EAAE,CAAC,gBAAgB,CACpC,SAAS,EACT,WAAW,EACX,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;QAEF,MAAM,YAAY,GAChB,EAAE,CAAC;QAEL,gFAAgF;QAChF,2DAA2D;QAC3D,MAAM,YAAY,GAAG,4BAA4B,CAAC,UAAU,CAAC,CAAC;QAE9D,KAAK,MAAM,SAAS,IAAI,UAAU,CAAC,UAAU,EAAE,CAAC;YAC9C,IAAI,CAAC,EAAE,CAAC,mBAAmB,CAAC,SAAS,CAAC;gBAAE,SAAS;YAEjD,MAAM,eAAe,GAAG,SAAS,CAAC,eAAe,CAAC;YAClD,IAAI,CAAC,EAAE,CAAC,eAAe,CAAC,eAAe,CAAC;gBAAE,SAAS;YAEnD,MAAM,UAAU,GAAG,eAAe,CAAC,IAAI,CAAC;YAExC,uBAAuB;YACvB,MAAM,WAAW,GAAa,EAAE,CAAC;YACjC,IAAI,iBAAqC,CAAC;YAE1C,IAAI,SAAS,CAAC,YAAY,EAAE,CAAC;gBAC3B,iBAAiB;gBACjB,IAAI,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;oBAChC,iBAAiB,GAAG,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC;gBACvD,CAAC;gBAED,gBAAgB;gBAChB,IAAI,SAAS,CAAC,YAAY,CAAC,aAAa,EAAE,CAAC;oBACzC,IAAI,EAAE,CAAC,cAAc,CAAC,SAAS,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE,CAAC;wBAC5D,KAAK,MAAM,OAAO,IAAI,SAAS,CAAC,YAAY,CAAC,aAAa;6BACvD,QAAQ,EAAE,CAAC;4BACZ,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;wBACtC,CAAC;oBACH,CAAC;yBAAM,IACL,EAAE,CAAC,iBAAiB,CAAC,SAAS,CAAC,YAAY,CAAC,aAAa,CAAC,EAC1D,CAAC;wBACD,uDAAuD;wBACvD,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBACnE,CAAC;gBACH,CAAC;YACH,CAAC;YAED,0EAA0E;YAC1E,IACE,YAAY;gBACZ,UAAU,KAAK,YAAY,CAAC,UAAU;gBACtC,WAAW,CAAC,QAAQ,CAAC,YAAY,CAAC,oBAAoB,CAAC,EACvD,CAAC;gBACD,MAAM,QAAQ,GAAG,oBAAoB,CACnC,YAAY,CAAC,oBAAoB,CAClC,CAAC;gBACF,YAAY,CAAC,IAAI,CAAC;oBAChB,KAAK,EAAE,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC;oBACrC,GAAG,EAAE,SAAS,CAAC,MAAM,EAAE;oBACvB,WAAW,EAAE,QAAQ;iBACtB,CAAC,CAAC;gBACH,SAAS;YACX,CAAC;YAED,2DAA2D;YAC3D,MAAM,MAAM,GAAG,oBAAoB,CAAC,UAAU,CAAC,CAAC;YAChD,IAAI,CAAC,MAAM;gBAAE,SAAS;YAEtB,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;YACpE,YAAY,CAAC,IAAI,CAAC;gBAChB,KAAK,EAAE,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC;gBACrC,GAAG,EAAE,SAAS,CAAC,MAAM,EAAE;gBACvB,WAAW,EAAE,QAAQ;aACtB,CAAC,CAAC;QACL,CAAC;QAED,4DAA4D;QAC5D,IAAI,MAAM,GAAG,WAAW,CAAC;QACzB,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;QAC/C,KAAK,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,YAAY,EAAE,CAAC;YACvD,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACpE,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,IAAI,CAAC,iDAAiD,EAAE,KAAK,CAAC,CAAC;QACvE,OAAO,WAAW,CAAC,CAAC,mCAAmC;IACzD,CAAC;AACH,CAAC"}

package/background/src/lib/virtualized/project/start.js

@@ -1,4 +1,5 @@
 import 'dotenv/config';
+import { once } from 'events';
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
 import { loadBackgroundJob, loadProject, updateBackgroundJobProgress, updateCommitMetadata, } from "../../../../../packages/database/index.js";
@@ -11,10 +12,11 @@ import { startScenarioCapture } from "./startScenarioCapture.js";
 import { createController } from "./controller/startController.js";
 import { awsLog, awsLogDebugLevel } from "../../../../../packages/utils/index.js";
 import * as v8 from 'v8';
-import { initializeAIServiceMode } from "../../../../../packages/ai/index.js";
+import * as os from 'os';
+import { initializeAIServiceMode, destroyWorkerPool } from "../../../../../packages/ai/index.js";
 import runAnalysis from "./runAnalysis.js";
 import { loadOrCreateCommit, syncHeadBranches, syncPrimaryBranch, } from "../../../../../packages/github/index.js";
-import { installSignalHandlers } from "../../process/index.js";
+import { installSignalHandlers } from "../../../../../packages/process/index.js";
 // Set process title for Activity Monitor visibility
 if (process.env.CODEYAM_PROCESS_NAME) {
     process.title = process.env.CODEYAM_PROCESS_NAME;
@@ -66,24 +68,27 @@ async function main({ steps, packageManager, exitAfterSuccessfulAppStart, port,
         // This fixes a race condition where orchestration and analysis ran in parallel
         // and attempted to access project/commit/branch data before it was loaded.
         const sharedContext = await loadSharedContext(envConfig);
-        // Heap monitoring: pulse every 1s, log every 30s when normal, warn every 1s when high
+        // Memory monitoring: tracks both V8 heap and RSS (which includes worker threads)
+        const containerMemoryMB = process.env.ECS_CONTAINER_MEMORY_MB
+            ? parseInt(process.env.ECS_CONTAINER_MEMORY_MB, 10)
+            : Math.round(os.totalmem() / 1024 / 1024);
         let lastLogTime = 0;
         setInterval(() => {
             const mem = process.memoryUsage();
             const heap = v8.getHeapStatistics();
-            const usagePercent = (mem.heapUsed / heap.heap_size_limit) * 100;
+            const heapMB = Math.round(mem.heapUsed / 1024 / 1024);
+            const rssMB = Math.round(mem.rss / 1024 / 1024);
+            const heapLimitMB = Math.round(heap.heap_size_limit / 1024 / 1024);
+            const rssPercent = (rssMB / containerMemoryMB) * 100;
             const now = Date.now();
-            if (usagePercent >= 80) {
-                // High usage: warn every second
-                console.warn(`CodeYam Heap Warning: ${Math.round(mem.heapUsed / 1024 / 1024)}MB used / ${Math.round(heap.heap_size_limit / 1024 / 1024)}MB limit (${Math.round(usagePercent)}%) ⚠️ HIGH USAGE`);
+            if (rssPercent >= 80) {
+                console.warn(`CodeYam Memory Warning: RSS ${rssMB}MB/${containerMemoryMB}MB (${Math.round(rssPercent)}%), heap ${heapMB}MB/${heapLimitMB}MB ⚠️ HIGH`);
             }
-            else if (usagePercent >= 50 && now - lastLogTime >= 5000) {
-                // Elevated usage: log every 5 seconds
-                console.log(`CodeYam Heap Notice: ${Math.round(mem.heapUsed / 1024 / 1024)}MB used / ${Math.round(heap.heap_size_limit / 1024 / 1024)}MB limit (${Math.round(usagePercent)}%) ⚠️ Elevated`);
+            else if (rssPercent >= 50 && now - lastLogTime >= 5000) {
+                console.log(`CodeYam Memory Notice: RSS ${rssMB}MB/${containerMemoryMB}MB (${Math.round(rssPercent)}%), heap ${heapMB}MB/${heapLimitMB}MB ⚠️ Elevated`);
             }
             else if (now - lastLogTime >= 30000) {
-                // Normal usage: log every 30 seconds
-                console.log(`CodeYam Heap Stats: ${Math.round(mem.heapUsed / 1024 / 1024)}MB used / ${Math.round(heap.heap_size_limit / 1024 / 1024)}MB limit (${Math.round(usagePercent)}%) 📊 OK`);
+                console.log(`CodeYam Memory Stats: RSS ${rssMB}MB/${containerMemoryMB}MB (${Math.round(rssPercent)}%), heap ${heapMB}MB/${heapLimitMB}MB 📊 OK`);
             }
             lastLogTime = now;
         }, 1000);
@@ -118,6 +123,11 @@ async function main({ steps, packageManager, exitAfterSuccessfulAppStart, port,
                             analyzerPid: undefined,
                             capturePid: process.pid,
                         },
+                        updateCallback(metadata) {
+                            if (metadata.currentRun?.captureCompletedAt) {
+                                metadata.currentRun.completedAt = new Date().toISOString();
+                            }
+                        },
                     }).catch((error) => {
                         awsLog(`Warning: Failed to update commit metadata: ${error}`);
                     });
@@ -138,7 +148,18 @@ async function main({ steps, packageManager, exitAfterSuccessfulAppStart, port,
                 while (!controller?.hasCompletedRepoCheckout()) {
                     await new Promise((resolve) => setTimeout(resolve, 1000));
                 }
-                awsLog('CodeYam: Repo checkout complete, starting orchestration...');
+                awsLog('CodeYam: Repo checkout complete.');
+                // Wait for analysis to enter producing phase (after prepareDataStructures)
+                // This prevents the 20-minute orchestration timeout from triggering before
+                // any analyses become ready to capture
+                awsLog('CodeYam: Waiting for analysis to start producing...');
+                if (!controller.hasStartedProducing()) {
+                    await once(controller, 'analysisProducing');
+                }
+                awsLog('CodeYam: Analysis producing, starting orchestration...');
+                // Worker pool is no longer needed after data structure prep phase.
+                // Freeing it reclaims ~2GB before capture workers ramp up.
+                await destroyWorkerPool();
                 // Create task runner based on orchestration mode
                 let taskRunner;
                 if (orchestrateCapture === 'aws') {
@@ -148,6 +169,15 @@ async function main({ steps, packageManager, exitAfterSuccessfulAppStart, port,
                         framework: framework,
                         packageManager: packageManager,
                     });
+                    const captureCommit = sharedContext.commit ?? sharedContext.branchCommit;
+                    if (captureCommit) {
+                        await updateCommitMetadata({
+                            commitId: captureCommit.id,
+                            runStatusUpdate: {
+                                captureTaskArns: taskRunner.getTaskArns(),
+                            },
+                        });
+                    }
                 }
                 else if (orchestrateCapture === 'local-sequential') {
                     taskRunner = await SequentialCaptureTaskRunner.create({
@@ -182,8 +212,8 @@ async function main({ steps, packageManager, exitAfterSuccessfulAppStart, port,
                         }
                     },
                     project: sharedContext.project,
-                    // In local-sequential mode, don't filter by commit since each analysis run
-                    // creates a new fake commit. We want to capture all ready analyses for the project.
+                    // In local-sequential mode, don't filter by commit (full=true handles that).
+                    // For AWS mode, filter by the specific commit being analyzed.
                     commit: orchestrateCapture === 'local-sequential'
                         ? null
                         : (sharedContext.commit ?? sharedContext.branchCommit),
@@ -198,6 +228,8 @@ async function main({ steps, packageManager, exitAfterSuccessfulAppStart, port,
                         : envConfig.entityShas,
                     full: orchestrateCapture === 'local-sequential',
                     taskRunner,
+                    // Always track capture progress on the commit, even when not filtering by it.
+                    metadataCommit: sharedContext.commit ?? sharedContext.branchCommit,
                 });
                 awsLog('CodeYam Capture: runCaptureOrchestration() completed');
             };