@codeyam/codeyam-cli 0.1.0-staging.6e699e5 → 0.1.0-staging.73a4bf4

package/analyzer-template/packages/utils/dist/utils/src/lib/fs/rsyncCopy.js

@@ -1,5 +1,97 @@
-import { spawn } from 'child_process';
+import { spawn, execSync } from 'child_process';
+import { existsSync, readdirSync, rmSync } from 'fs';
+import { join } from 'path';
+/**
+ * Try to use APFS copy-on-write clones on macOS for near-instant directory copies.
+ * Falls back to rsync on non-macOS or if the clone fails.
+ *
+ * Returns true if the clone succeeded (caller can skip rsync).
+ */
+function tryApfsClone({ sourcePath, destinationPath, excludes, silent, }) {
+    if (process.platform !== 'darwin')
+        return false;
+    // APFS clone requires the destination to not exist.
+    // If it exists and is empty, remove it so we can clone into it.
+    if (existsSync(destinationPath)) {
+        try {
+            const contents = readdirSync(destinationPath);
+            if (contents.length > 0) {
+                // Destination is non-empty — can't use clone, fall back to rsync
+                return false;
+            }
+            rmSync(destinationPath, { recursive: true });
+        }
+        catch {
+            return false;
+        }
+    }
+    try {
+        // cp -c -R: APFS copy-on-write clone (faster than rsync, avoids data copy)
+        execSync(`cp -c -R "${sourcePath}" "${destinationPath}"`, {
+            stdio: 'pipe',
+            timeout: 300000, // 5 min safety timeout
+        });
+        // Remove excluded items from the clone
+        for (const exclude of excludes) {
+            if (exclude.includes('*')) {
+                // Glob pattern — use shell expansion
+                try {
+                    execSync(`rm -rf "${join(destinationPath, exclude)}"`, {
+                        stdio: 'pipe',
+                        shell: '/bin/sh',
+                    });
+                }
+                catch {
+                    // Glob matched nothing — fine
+                }
+            }
+            else {
+                const excludePath = join(destinationPath, exclude);
+                if (existsSync(excludePath)) {
+                    rmSync(excludePath, { recursive: true, force: true });
+                }
+            }
+        }
+        if (!silent) {
+            console.log(`Directory cloned (APFS CoW) from ${sourcePath} to ${destinationPath}`);
+        }
+        return true;
+    }
+    catch {
+        // Clone failed (cross-volume, non-APFS, etc.) — fall back to rsync
+        // Clean up any partial clone
+        if (existsSync(destinationPath)) {
+            try {
+                rmSync(destinationPath, { recursive: true });
+            }
+            catch {
+                // Best effort cleanup
+            }
+        }
+        return false;
+    }
+}
 export default async function rsyncCopy({ sourcePath, destinationPath, excludes = [], keepExisting = false, silent = false, extraArgs = [], }) {
+    const startTime = Date.now();
+    // On macOS, try APFS copy-on-write clone first (near-instant).
+    // Skip when extraArgs are provided since those are rsync-specific flags
+    // that the clone path can't honor.
+    if (!keepExisting && extraArgs.length === 0) {
+        const cloned = tryApfsClone({
+            sourcePath,
+            destinationPath,
+            excludes,
+            silent,
+        });
+        if (cloned) {
+            if (!silent) {
+                const duration = ((Date.now() - startTime) / 1000).toFixed(1);
+                console.log(`Directory synced from ${sourcePath} to ${destinationPath} [Time: ${duration}s]`);
+            }
+            return;
+        }
+    }
+    // Fall back to rsync
     return new Promise((resolve, reject) => {
         const source = sourcePath.endsWith('/') ? sourcePath : `${sourcePath}/`;
         const dest = destinationPath.endsWith('/')
@@ -16,7 +108,6 @@ export default async function rsyncCopy({ sourcePath, destinationPath, excludes
             rsyncArgs.push(`--exclude=${exclude}`);
         }
         rsyncArgs.push(source, dest);
-        const startTime = Date.now();
         const rsyncProcess = spawn('rsync', rsyncArgs);
         rsyncProcess.on('exit', (code) => {
             if (code === 0) {

package/analyzer-template/packages/utils/dist/utils/src/lib/fs/rsyncCopy.js.map

@@ -1 +1 @@
-{"version":3,"file":"rsyncCopy.js","sourceRoot":"","sources":["../../../../../src/lib/fs/rsyncCopy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAEtC,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,SAAS,CAAC,EACtC,UAAU,EACV,eAAe,EACf,QAAQ,GAAG,EAAE,EACb,YAAY,GAAG,KAAK,EACpB,MAAM,GAAG,KAAK,EACd,SAAS,GAAG,EAAE,GAQf;IACC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,GAAG,CAAC;QACxE,MAAM,IAAI,GAAG,eAAe,CAAC,QAAQ,CAAC,GAAG,CAAC;YACxC,CAAC,CAAC,eAAe;YACjB,CAAC,CAAC,GAAG,eAAe,GAAG,CAAC;QAE1B,MAAM,SAAS,GAAG,CAAC,IAAI,CAAC,CAAC;QAEzB,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,SAAS,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QACxC,CAAC;QAED,wCAAwC;QACxC,SAAS,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC;QAE7B,8BAA8B;QAC9B,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,SAAS,CAAC,IAAI,CAAC,aAAa,OAAO,EAAE,CAAC,CAAC;QACzC,CAAC;QAED,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAE7B,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAE/C,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YAC/B,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;gBACf,IAAI,CAAC,MAAM,EAAE,CAAC;oBACZ,MAAM,QAAQ,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;oBAC9D,OAAO,CAAC,GAAG,CACT,yBAAyB,UAAU,OAAO,eAAe,WAAW,QAAQ,IAAI,CACjF,CAAC;gBACJ,CAAC;gBACD,OAAO,EAAE,CAAC;YACZ,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,IAAI,KAAK,CAAC,+BAA+B,IAAI,EAAE,CAAC,CAAC,CAAC;YAC3D,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YACjC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC;YACxC,CAAC;YACD,MAAM,CAAC,KAAK,CAAC,CAAC;QAChB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"rsyncCopy.js","sourceRoot":"","sources":["../../../../../src/lib/fs/rsyncCopy.ts"],"names":[],"mappings":"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"}

package/analyzer-template/packages/utils/src/lib/fs/rsyncCopy.ts

@@ -1,4 +1,87 @@
-import { spawn } from 'child_process';
+import { spawn, execSync } from 'child_process';
+import { existsSync, readdirSync, rmSync } from 'fs';
+import { join } from 'path';
+
+/**
+ * Try to use APFS copy-on-write clones on macOS for near-instant directory copies.
+ * Falls back to rsync on non-macOS or if the clone fails.
+ *
+ * Returns true if the clone succeeded (caller can skip rsync).
+ */
+function tryApfsClone({
+  sourcePath,
+  destinationPath,
+  excludes,
+  silent,
+}: {
+  sourcePath: string;
+  destinationPath: string;
+  excludes: string[];
+  silent: boolean;
+}): boolean {
+  if (process.platform !== 'darwin') return false;
+
+  // APFS clone requires the destination to not exist.
+  // If it exists and is empty, remove it so we can clone into it.
+  if (existsSync(destinationPath)) {
+    try {
+      const contents = readdirSync(destinationPath);
+      if (contents.length > 0) {
+        // Destination is non-empty — can't use clone, fall back to rsync
+        return false;
+      }
+      rmSync(destinationPath, { recursive: true });
+    } catch {
+      return false;
+    }
+  }
+
+  try {
+    // cp -c -R: APFS copy-on-write clone (faster than rsync, avoids data copy)
+    execSync(`cp -c -R "${sourcePath}" "${destinationPath}"`, {
+      stdio: 'pipe',
+      timeout: 300_000, // 5 min safety timeout
+    });
+
+    // Remove excluded items from the clone
+    for (const exclude of excludes) {
+      if (exclude.includes('*')) {
+        // Glob pattern — use shell expansion
+        try {
+          execSync(`rm -rf "${join(destinationPath, exclude)}"`, {
+            stdio: 'pipe',
+            shell: '/bin/sh',
+          });
+        } catch {
+          // Glob matched nothing — fine
+        }
+      } else {
+        const excludePath = join(destinationPath, exclude);
+        if (existsSync(excludePath)) {
+          rmSync(excludePath, { recursive: true, force: true });
+        }
+      }
+    }
+
+    if (!silent) {
+      console.log(
+        `Directory cloned (APFS CoW) from ${sourcePath} to ${destinationPath}`,
+      );
+    }
+    return true;
+  } catch {
+    // Clone failed (cross-volume, non-APFS, etc.) — fall back to rsync
+    // Clean up any partial clone
+    if (existsSync(destinationPath)) {
+      try {
+        rmSync(destinationPath, { recursive: true });
+      } catch {
+        // Best effort cleanup
+      }
+    }
+    return false;
+  }
+}
 
 export default async function rsyncCopy({
   sourcePath,
@@ -15,6 +98,30 @@ export default async function rsyncCopy({
   silent?: boolean;
   extraArgs?: string[];
 }): Promise<void> {
+  const startTime = Date.now();
+
+  // On macOS, try APFS copy-on-write clone first (near-instant).
+  // Skip when extraArgs are provided since those are rsync-specific flags
+  // that the clone path can't honor.
+  if (!keepExisting && extraArgs.length === 0) {
+    const cloned = tryApfsClone({
+      sourcePath,
+      destinationPath,
+      excludes,
+      silent,
+    });
+    if (cloned) {
+      if (!silent) {
+        const duration = ((Date.now() - startTime) / 1000).toFixed(1);
+        console.log(
+          `Directory synced from ${sourcePath} to ${destinationPath} [Time: ${duration}s]`,
+        );
+      }
+      return;
+    }
+  }
+
+  // Fall back to rsync
   return new Promise((resolve, reject) => {
     const source = sourcePath.endsWith('/') ? sourcePath : `${sourcePath}/`;
     const dest = destinationPath.endsWith('/')
@@ -37,7 +144,6 @@ export default async function rsyncCopy({
 
     rsyncArgs.push(source, dest);
 
-    const startTime = Date.now();
     const rsyncProcess = spawn('rsync', rsyncArgs);
 
     rsyncProcess.on('exit', (code) => {

package/analyzer-template/playwright/capture.ts

@@ -257,11 +257,11 @@ export default async function capture({
           analysisId: analysis.id,
           entityName: analysis.entityName,
         });
-        await updateFreshAnalysisStatus(
+        await updateFreshAnalysisStatusWithScenarios(
           analysis.id,
-          (freshStatus, inAnalysis) => {
+          (freshStatus, dbScenarios, inAnalysis) => {
             // Mark any incomplete scenarios as errored
-            for (const scenario of inAnalysis.scenarios || []) {
+            for (const scenario of dbScenarios) {
               const scenarioStatus = freshStatus.scenarios?.find(
                 (s) => s.name === scenario.name,
               );
@@ -281,17 +281,18 @@ export default async function capture({
             }
 
             // Mark the analysis as finished if all scenarios have been addressed
-            const allScenariosComplete = freshStatus.scenarios?.every(
-              (s) => s.finishedAt || s.error,
-            );
+            // Only set finishedAt - the loader will exclude based on scenario states
+            const allScenariosComplete =
+              freshStatus.scenarios?.length >= dbScenarios.length &&
+              freshStatus.scenarios?.every((s) => s.finishedAt || s.error);
             if (allScenariosComplete && !freshStatus.finishedAt) {
               freshStatus.finishedAt = new Date().toISOString();
-              freshStatus.readyToBeCaptured = false;
               awsLog('CodeYam: Marking analysis as complete on shutdown', {
                 analysisId: inAnalysis.id,
               });
             }
           },
+          'capture-shutdown',
         );
       }
 
@@ -550,7 +551,7 @@ export default async function capture({
 
           await updateFreshAnalysisStatusWithScenarios(
             analysis.id,
-            (freshStatus, scenarios) => {
+            (freshStatus, dbScenarios) => {
               freshStatus.scenarios ||= [];
               const scenarioStatus = freshStatus.scenarios.find(
                 (s) => s.name === scenario.name,
@@ -569,6 +570,17 @@ export default async function capture({
                   error: fullErrorMessage,
                 });
               }
+
+              // Check if all scenarios are now complete (even if with errors)
+              // Only set finishedAt - the loader will exclude this analysis based on
+              // the scenario check (all have finishedAt || error), no need to also
+              // toggle readyToBeCaptured which has different semantics
+              if (
+                freshStatus.scenarios.length >= dbScenarios.length &&
+                freshStatus.scenarios.every((s) => s.finishedAt || s.error)
+              ) {
+                freshStatus.finishedAt = new Date().toISOString();
+              }
             },
             'capture-http-error',
           );

package/analyzer-template/playwright/captureStatic.ts

@@ -40,7 +40,7 @@ export default async function captureStatic({
       const now = new Date().toISOString();
       await updateCommitMetadata({
         commitId: analysis.commitId,
-        updateCallback: (metadata, commit) => {
+        updateCallback: (metadata) => {
           if (metadata.currentRun) {
             metadata.currentRun.firstCaptureAt ??= now;
             metadata.currentRun.lastCaptureAt = now;

package/analyzer-template/project/analyzeBaselineCommit.ts

@@ -103,6 +103,11 @@ export default async function analyzeBaselineCommit({
       entitiesAnalyzedAt: now,
     },
     archiveCurrentRun: true,
+    updateCallback(metadata) {
+      if (metadata.currentRun?.captureCompletedAt) {
+        metadata.currentRun.completedAt = now;
+      }
+    },
   });
 
   awsLog(`CodeYam: Marking baseline completed for project ${project.slug}`);

package/analyzer-template/project/analyzeRegularCommit.ts

@@ -253,6 +253,11 @@ export default async function analyzeRegularCommit({
       // In local mode (CLI), let job.js handle archiving after BOTH analysis AND capture complete
       // In cloud mode (Docker), archive immediately after analysis completes
       archiveCurrentRun: !isLocalMode,
+      updateCallback(metadata) {
+        if (metadata.currentRun?.captureCompletedAt) {
+          metadata.currentRun.completedAt = now;
+        }
+      },
     });
   }
 

package/analyzer-template/project/captureLibraryFunctionDirect.ts

@@ -81,33 +81,36 @@ export default async function captureLibraryFunctionDirect(
       },
     );
 
-    // Mark scenario as complete
-    await updateFreshAnalysisStatus(analysis.id, (freshStatus, inAnalysis) => {
-      freshStatus.scenarios ||= [];
-      const scenarioStatus = freshStatus.scenarios.find(
-        (s) => s.name === scenario.name,
-      );
-      if (scenarioStatus) {
-        scenarioStatus.finishedAt = new Date().toISOString();
-      } else {
-        freshStatus.scenarios.push({
-          name: scenario.name,
-          startedAt: new Date().toISOString(),
-          finishedAt: new Date().toISOString(),
-        });
-      }
+    // Mark scenario as complete (use WithScenarios variant to get actual scenario count)
+    await updateFreshAnalysisStatusWithScenarios(
+      analysis.id,
+      (freshStatus, dbScenarios, _inAnalysis) => {
+        freshStatus.scenarios ||= [];
+        const scenarioStatus = freshStatus.scenarios.find(
+          (s) => s.name === scenario.name,
+        );
+        if (scenarioStatus) {
+          scenarioStatus.finishedAt = new Date().toISOString();
+        } else {
+          freshStatus.scenarios.push({
+            name: scenario.name,
+            startedAt: new Date().toISOString(),
+            finishedAt: new Date().toISOString(),
+          });
+        }
 
-      // Check if all scenarios are done
-      const allScenariosAvailable =
-        freshStatus.scenarios.length >= inAnalysis.scenarios?.length;
-      if (
-        allScenariosAvailable &&
-        freshStatus.scenarios.every((s) => !!s.finishedAt)
-      ) {
-        freshStatus.finishedAt = new Date().toISOString();
-        freshStatus.readyToBeCaptured = false;
-      }
-    });
+        // Check if all scenarios are done
+        const allScenariosAvailable =
+          freshStatus.scenarios.length >= dbScenarios.length;
+        if (
+          allScenariosAvailable &&
+          freshStatus.scenarios.every((s) => !!s.finishedAt)
+        ) {
+          freshStatus.finishedAt = new Date().toISOString();
+          freshStatus.readyToBeCaptured = false;
+        }
+      },
+    );
 
     awsLog('CodeYam: Direct library function capture complete', {
       analysisId: analysis.id,

package/analyzer-template/project/constructMockCode.ts

@@ -342,7 +342,7 @@ export default function constructMockCode(
   let foundEntityWithSignature = false;
   let signatureSchema: DataStructure['signatureSchema'] | undefined;
 
-  for (const filePath in dependencySchemas) {
+  entitySearch: for (const filePath in dependencySchemas) {
     for (const entityName in dependencySchemas[filePath]) {
       // Match entity by base name (without generics/args)
       const entityBaseName = entityName.split(/[<(]/)[0];
@@ -386,7 +386,7 @@ export default function constructMockCode(
         // However, we still need to remove duplicate function calls that create invalid syntax
         removeDuplicateFunctionCalls(relevantReturnValueSchema);
         dataStructureValue = relevantReturnValueSchema?.[dataStructurePath];
-        break;
+        break entitySearch;
       }
     }
   }
@@ -1189,11 +1189,20 @@ export default function constructMockCode(
                   // Valid patterns where arrow function is NOT bare:
                   // 1. Property value: "key: (arg) => ..." - ends with ':'
                   // 2. Function argument: ".map((arg) => ..." - ends with '('
+                  // 3. Method call: "?.map" followed directly by the arrow function
+                  //    In this case, the '(' is consumed by the arrow function regex match,
+                  //    so beforeTrimmed ends with the method name (e.g., 'map'), not '('.
+                  //    We detect this by checking if beforeTrimmed ends with an identifier
+                  //    that could be a method name (preceded by '.' or '?.').
                   // NOTE: We don't include ',' because "{ prop, () => {} }" is invalid
                   // (can't distinguish function argument from object property context)
                   const isPropertyValue = beforeTrimmed.endsWith(':');
                   const isFunctionArg = beforeTrimmed.endsWith('(');
-                  const hasPropertyName = isPropertyValue || isFunctionArg;
+                  // Check if before ends with a method call pattern like ".map" or "?.map"
+                  // The '(' after the method name is consumed by the arrow function regex
+                  const isMethodCallArg = /\??\.\w+$/.test(beforeTrimmed);
+                  const hasPropertyName =
+                    isPropertyValue || isFunctionArg || isMethodCallArg;
 
                   if (!hasPropertyName) {
                     // This is a bare arrow function - filter it out
@@ -1404,6 +1413,17 @@ export default function constructMockCode(
                     .replace(/,\s*$/, '');
                   returnValueContents = `${arrayBasePath}?.map((__item__, __idx__) => (\n${indent(trimmedContent)}\n))`;
                 } else {
+                  // When generating object-wrapped .map(), ensure original item data is preserved.
+                  // If no data spread was included (e.g., because this is a plain array property,
+                  // not a function return), add ...__item__ to spread the original item properties.
+                  // Without this, the .map() would create new objects with only nested function
+                  // properties, losing data like filePath, frontmatter, body, etc.
+                  const hasDataSpread =
+                    mappedContents.includes('...scenarios()') ||
+                    mappedContents.includes('...__item__');
+                  if (!hasDataSpread) {
+                    mappedContents = `...__item__,\n${mappedContents}`;
+                  }
                   returnValueContents = `${arrayBasePath}?.map((__item__, __idx__) => ({\n${indent(mappedContents)}\n}))`;
                 }
               } // Close the empty content check else block
@@ -1470,6 +1490,17 @@ export default function constructMockCode(
               mappedContents = filterOutArrowFunctions(mappedContents);
               mappedContents = filterOutBareObjects(mappedContents, true);
               mappedContents = cleanupContent(mappedContents);
+              // Same as needsWrapper branch: ensure item data is preserved in .map()
+              const hasDataSpreadInner =
+                mappedContents.includes('...scenarios()') ||
+                mappedContents.includes('...__item__');
+              if (!hasDataSpreadInner && mappedContents.trim().length > 0) {
+                // Insert ...__item__ after the opening brace
+                mappedContents = mappedContents.replace(
+                  /^\s*\{/,
+                  '{\n...__item__,',
+                );
+              }
               returnValueContents = `${arrayBasePath}?.map((__item__, __idx__) => (\n${indent(mappedContents)}\n))`;
             }
           } else {
@@ -1693,6 +1724,42 @@ export default function constructMockCode(
     return 0;
   });
 
+  // OPTIMIZATION: Pre-compute prefix indexes for O(1) lookups instead of O(n) scans.
+  // This reduces complexity from O(n²) to O(n) for large schemas (9k+ keys).
+  //
+  // 1. extendedReturnValuePrefixes: Set of all path prefixes that have a .functionCallReturnValue extension
+  //    Used by hasExtendedFunctionCallReturnValue check at line ~1754
+  // 2. functionCallsWithReturnValue: Set of function call paths where .functionCallReturnValue IMMEDIATELY follows
+  //    Used by hasProperFunctionCallPath check at line ~1787
+  //    IMPORTANT: Only includes paths where the function call is directly followed by .functionCallReturnValue
+  //    e.g., "a.b().functionCallReturnValue" -> adds "a.b()" but NOT "a" even if "a" ends with ")"
+  const extendedReturnValuePrefixes = new Set<string>();
+  const functionCallsWithReturnValue = new Set<string>();
+
+  for (const k of relevantKeys) {
+    const parts = splitOutsideParenthesesAndArrays(k);
+    const returnValueIndex = parts.findIndex((part) =>
+      part.startsWith(RETURN_VALUE),
+    );
+    if (returnValueIndex !== -1) {
+      // Add all prefixes of k up to (but not including) functionCallReturnValue
+      const prefix = joinParenthesesAndArrays(parts.slice(0, returnValueIndex));
+      extendedReturnValuePrefixes.add(prefix);
+
+      // ONLY add to functionCallsWithReturnValue if functionCallReturnValue IMMEDIATELY follows
+      if (prefix.endsWith(')')) {
+        functionCallsWithReturnValue.add(prefix);
+      }
+
+      // Also add intermediate prefixes for nested paths to extendedReturnValuePrefixes
+      // This helps hasExtendedFunctionCallReturnValue which checks key + '.'
+      for (let i = 1; i < returnValueIndex; i++) {
+        const partialPrefix = joinParenthesesAndArrays(parts.slice(0, i));
+        extendedReturnValuePrefixes.add(partialPrefix);
+      }
+    }
+  }
+
   for (const key of sortedKeys) {
     const value = relevantReturnValueSchema[key];
     const parts = splitOutsideParenthesesAndArrays(key);
@@ -1749,9 +1816,10 @@ export default function constructMockCode(
     // nested inside (e.g., methods on array elements passed as arguments).
     if (hasSignaturePath) continue;
 
-    const hasExtendedFunctionCallReturnValue = Object.keys(
-      relevantReturnValueSchema,
-    ).some((k) => k.startsWith(key + '.') && k.includes(`.${RETURN_VALUE}`));
+    // OPTIMIZATION: Use pre-computed index instead of O(n) scan
+    // Old code: Object.keys(relevantReturnValueSchema).some((k) => k.startsWith(key + '.') && k.includes('.functionCallReturnValue'))
+    const hasExtendedFunctionCallReturnValue =
+      extendedReturnValuePrefixes.has(key);
 
     // Skip JSX components - they look like function calls (e.g., Context.Provider())
     // but they're React components used in JSX, not functions that need mocking
@@ -1780,11 +1848,10 @@ export default function constructMockCode(
           const functionCallPath = joinParenthesesAndArrays(
             parts.slice(0, i + 1),
           );
-          const hasProperFunctionCallPath = Object.keys(
-            relevantReturnValueSchema,
-          ).some((k) =>
-            k.startsWith(functionCallPath + '.functionCallReturnValue'),
-          );
+          // OPTIMIZATION: Use pre-computed index instead of O(n) scan
+          // Old code: Object.keys(relevantReturnValueSchema).some((k) => k.startsWith(functionCallPath + '.functionCallReturnValue'))
+          const hasProperFunctionCallPath =
+            functionCallsWithReturnValue.has(functionCallPath);
           if (hasProperFunctionCallPath) {
             // Skip this path - the .functionCallReturnValue path will handle it correctly
             shouldSkipKey = true;
@@ -2383,7 +2450,20 @@ export default function constructMockCode(
     const safeReturnValue = isSimpleDataPath
       ? `${returnValue} ?? {}`
       : returnValue;
-    return `${isRootAsyncFunction ? 'async ' : ''}function ${safeFunctionName}(...args) {\n${indent(`return ${safeReturnValue};`)}\n}`;
+    const refName = `_${safeFunctionName}Ref`;
+    const assignment = `${refName}.current = ${safeReturnValue};`;
+    const ifBlock = `if (!${refName}.current) {\n${indent(assignment)}\n}`;
+    const body = `${ifBlock}\nreturn ${refName}.current;`;
+
+    return [
+      `// PATCHED: memoize to return stable reference (prevents infinite useEffect re-triggers)`,
+      `const ${refName} = {`,
+      `  current: null,`,
+      `};`,
+      `${isRootAsyncFunction ? 'async ' : ''}function ${safeFunctionName}(...args) {`,
+      indent(body),
+      `}`,
+    ].join('\n');
   } else {
     // Generate safe const name:
     // 1. For call signatures: use derivedFunctionName