@codeyam/codeyam-cli 0.1.0-staging.596f0eb → 0.1.0-staging.5fba2e4

package/analyzer-template/project/writeScenarioComponents.ts

@@ -27,6 +27,67 @@ import ts from 'typescript';
 import { LazyFileStore } from './LazyFileStore';
 import { applyServerOnlyMocks } from './serverOnlyModules';
 
+// Debug timing helper for tracking where time is spent
+const DEBUG_TIMING = process.env.DEBUG_WRITE_SCENARIO === 'true';
+let debugStartTime: number;
+let debugLastTime: number;
+
+// Timeout protection to prevent infinite hangs
+const WRITE_SCENARIO_TIMEOUT_MS = parseInt(
+  process.env.WRITE_SCENARIO_TIMEOUT_MS || '300000', // Default 5 minutes
+  10,
+);
+
+class WriteScenarioTimeoutError extends Error {
+  constructor(operation: string, timeoutMs: number) {
+    super(
+      `WriteScenarioComponents timed out after ${timeoutMs}ms during: ${operation}`,
+    );
+    this.name = 'WriteScenarioTimeoutError';
+  }
+}
+
+async function withTimeout<T>(
+  operation: string,
+  promise: Promise<T>,
+  timeoutMs: number = WRITE_SCENARIO_TIMEOUT_MS,
+): Promise<T> {
+  let timeoutId: NodeJS.Timeout | undefined;
+
+  const timeoutPromise = new Promise<never>((_, reject) => {
+    timeoutId = setTimeout(() => {
+      reject(new WriteScenarioTimeoutError(operation, timeoutMs));
+    }, timeoutMs);
+  });
+
+  try {
+    return await Promise.race([promise, timeoutPromise]);
+  } finally {
+    if (timeoutId) clearTimeout(timeoutId);
+  }
+}
+
+function debugLog(message: string, extra?: Record<string, unknown>): void {
+  if (!DEBUG_TIMING) return;
+  const now = Date.now();
+  if (!debugStartTime) {
+    debugStartTime = now;
+    debugLastTime = now;
+  }
+  const elapsed = now - debugStartTime;
+  const delta = now - debugLastTime;
+  debugLastTime = now;
+  console.log(
+    `[WriteScenario +${elapsed}ms Δ${delta}ms] ${message}`,
+    extra ? JSON.stringify(extra, null, 2) : '',
+  );
+}
+
+function resetDebugTiming(): void {
+  debugStartTime = 0;
+  debugLastTime = 0;
+}
+
 /**
  * Find the end position of the last import/export-from statement using TypeScript AST.
  * This is more reliable than regex for handling multiline imports, comments, etc.
@@ -36,11 +97,15 @@ import { applyServerOnlyMocks } from './serverOnlyModules';
  */
 function findEndOfImports(content: string): number {
   try {
+    // Use temp.tsx to enable JSX parsing - otherwise TypeScript may misparse
+    // JSX content containing the word "import" (e.g., "Entities that import this")
+    // as an import statement, causing mock code to be inserted in the wrong location.
     const sourceFile = ts.createSourceFile(
-      'temp.ts',
+      'temp.tsx',
       content,
       ts.ScriptTarget.Latest,
       true,
+      ts.ScriptKind.TSX,
     );
 
     let lastImportEnd = 0;
@@ -75,6 +140,125 @@ function escapeRegExp(str: string): string {
   return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 }
 
+/**
+ * Remove a named import from file content using TypeScript AST.
+ * Handles both regular imports (`EntityName`) and type-only imports (`type EntityName`).
+ *
+ * @param fileContent - The file content to modify
+ * @param entityName - The name of the entity to remove from imports
+ * @returns The modified file content with the entity removed from imports
+ */
+function removeNamedImportAst(fileContent: string, entityName: string): string {
+  try {
+    const sourceFile = ts.createSourceFile(
+      'temp.tsx',
+      fileContent,
+      ts.ScriptTarget.Latest,
+      true,
+      ts.ScriptKind.TSX,
+    );
+
+    const replacements: { start: number; end: number; replacement: string }[] =
+      [];
+
+    for (const statement of sourceFile.statements) {
+      if (!ts.isImportDeclaration(statement)) continue;
+      if (!statement.importClause?.namedBindings) continue;
+      if (!ts.isNamedImports(statement.importClause.namedBindings)) continue;
+
+      const namedImports = statement.importClause.namedBindings;
+      const elements = namedImports.elements;
+
+      // Find the element that matches our entity name
+      const matchingIndex = elements.findIndex(
+        (el) => el.name.text === entityName,
+      );
+      if (matchingIndex === -1) continue;
+
+      // Check if there's a default import (e.g., `import DefaultName, { NamedImport } from '...'`)
+      const hasDefaultImport = !!statement.importClause.name;
+
+      // If this is the only named import AND there's no default import, remove the entire statement
+      if (elements.length === 1 && !hasDefaultImport) {
+        // Find the end including any trailing newline
+        let end = statement.getEnd();
+        const afterStatement = fileContent.slice(end);
+        const trailingNewline = afterStatement.match(/^\r?\n/);
+        if (trailingNewline) {
+          end += trailingNewline[0].length;
+        }
+        replacements.push({
+          start: statement.getStart(sourceFile),
+          end,
+          replacement: '',
+        });
+        continue;
+      }
+
+      // Otherwise, rebuild the import without this element
+      const remainingElements = elements.filter((_, i) => i !== matchingIndex);
+
+      // Get the module specifier
+      const moduleSpecifier = statement.moduleSpecifier;
+      if (!ts.isStringLiteral(moduleSpecifier)) continue;
+
+      // Preserve import type modifier if present
+      const importTypePrefix = statement.importClause.isTypeOnly ? 'type ' : '';
+
+      // Get the default import name if present
+      const defaultImportName = statement.importClause.name?.text;
+
+      let newImport: string;
+
+      if (remainingElements.length === 0) {
+        // All named imports were removed, but there's a default import to preserve
+        // (we only get here when hasDefaultImport is true, because otherwise we'd have
+        // removed the whole statement at the elements.length === 1 check above)
+        newImport = `import ${defaultImportName} from ${moduleSpecifier.getText(sourceFile)};`;
+      } else {
+        // Build the new named imports string
+        const newNamedImports = remainingElements
+          .map((el) => {
+            const isTypeOnly = el.isTypeOnly;
+            const name = el.name.text;
+            const propertyName = el.propertyName?.text;
+            if (propertyName) {
+              return isTypeOnly
+                ? `type ${propertyName} as ${name}`
+                : `${propertyName} as ${name}`;
+            }
+            return isTypeOnly ? `type ${name}` : name;
+          })
+          .join(', ');
+
+        // Build the new import statement, preserving default import if present
+        const defaultImportPrefix = defaultImportName
+          ? `${defaultImportName}, `
+          : '';
+        newImport = `import ${importTypePrefix}${defaultImportPrefix}{ ${newNamedImports} } from ${moduleSpecifier.getText(sourceFile)};`;
+      }
+
+      replacements.push({
+        start: statement.getStart(sourceFile),
+        end: statement.getEnd(),
+        replacement: newImport,
+      });
+    }
+
+    // Apply replacements in reverse order to preserve positions
+    let result = fileContent;
+    replacements.sort((a, b) => b.start - a.start);
+    for (const { start, end, replacement } of replacements) {
+      result = result.slice(0, start) + replacement + result.slice(end);
+    }
+
+    return result;
+  } catch (error) {
+    console.warn('[removeNamedImportAst] Failed to parse file:', error);
+    return fileContent; // Return original content on error
+  }
+}
+
 /**
  * Map nested dist paths to src paths.
  * Some build tools create nested structures like:
@@ -518,27 +702,49 @@ function stripServerOnlyImport(fileContent: string): string {
  * Excludes node_modules imports (bare specifiers like 'react', '@prisma/client').
  */
 function extractInternalImportPaths(fileContent: string): string[] {
-  const importPaths: string[] = [];
+  // Always use AST parsing - regex with nested quantifiers can cause catastrophic
+  // backtracking that hangs on a single .exec() call (before iteration limits kick in)
+  return extractInternalImportPathsAst(fileContent);
+}
 
-  // Match import statements with their paths
-  // Handles: import x from "path", import { x } from "path", import * as x from "path"
-  const importRegex =
-    /import\s+(?:(?:\{[^}]*\}|\*\s+as\s+\w+|\w+)\s*,?\s*)*\s*from\s*["']([^"']+)["']/g;
+/**
+ * Extract internal import paths using TypeScript AST - more reliable for large files
+ */
+function extractInternalImportPathsAst(fileContent: string): string[] {
+  const importPaths: string[] = [];
 
-  let match;
-  while ((match = importRegex.exec(fileContent)) !== null) {
-    const importPath = match[1];
+  try {
+    // Use temp.tsx to enable JSX parsing for consistent handling of JSX files
+    const sourceFile = ts.createSourceFile(
+      'temp.tsx',
+      fileContent,
+      ts.ScriptTarget.Latest,
+      true,
+      ts.ScriptKind.TSX,
+    );
 
-    // Skip node_modules imports (bare specifiers)
-    // Internal imports start with '.', '@/', '~/' or similar path aliases
-    if (
-      importPath.startsWith('.') ||
-      importPath.startsWith('@/') ||
-      importPath.startsWith('~/') ||
-      importPath.startsWith('#')
-    ) {
-      importPaths.push(importPath);
+    for (const statement of sourceFile.statements) {
+      if (ts.isImportDeclaration(statement) && statement.moduleSpecifier) {
+        const moduleSpecifier = statement.moduleSpecifier;
+        if (ts.isStringLiteral(moduleSpecifier)) {
+          const importPath = moduleSpecifier.text;
+          // Skip node_modules imports (bare specifiers)
+          if (
+            importPath.startsWith('.') ||
+            importPath.startsWith('@/') ||
+            importPath.startsWith('~/') ||
+            importPath.startsWith('#')
+          ) {
+            importPaths.push(importPath);
+          }
+        }
+      }
     }
+  } catch (error) {
+    console.warn(
+      '[extractInternalImportPathsAst] Failed to parse file:',
+      error,
+    );
   }
 
   return importPaths;
@@ -664,22 +870,72 @@ function addMockToContent(
 
   // Check if we have multiple calls with different variable names
   // This requires generating separate mock functions for each call site
+  //
+  // IMPORTANT: calls array may contain BOTH base hook calls (e.g., "useFetcher<Type>()")
+  // AND method chain usages (e.g., "useFetcher().functionCallReturnValue.submit(...)").
+  // We only want to count base hook calls for the length comparison with callVariableNames.
+  // A "base call" is one that ends with "()" possibly preceded by a type annotation,
+  // without any subsequent method chains like ".functionCallReturnValue" or ".submit(...)".
+  const baseHookCalls = importedExport.calls?.filter((call) => {
+    // Base hook calls match patterns like:
+    // - "useFetcher()"
+    // - "useFetcher<Type>()"
+    // - "useFetcher<{ complex: Type }>()"
+    // They end with "()" and don't have method chains after the call.
+    // Method chains contain ".functionCallReturnValue" or have property access after "()".
+    return (
+      call.endsWith('()') &&
+      !call.includes('.functionCallReturnValue') &&
+      // Also exclude method chains like "hook().something" or "hook().method()"
+      !call.match(/\(\)\.[a-zA-Z]/)
+    );
+  });
+
+  // Determine if we can generate unique mock functions for multiple variables.
+  // We need:
+  // 1. Multiple variable names (callVariableNames.length > 1)
+  // 2. Base hook calls to match them (baseHookCalls.length > 0)
+  // Note: We use min(baseHookCalls.length, callVariableNames.length) for iteration
+  // to handle cases where data might be slightly out of sync (stale entries).
   const hasMultipleCallsWithVariables =
-    importedExport.calls &&
-    importedExport.calls.length > 1 &&
+    baseHookCalls &&
+    baseHookCalls.length > 1 &&
     importedExport.callVariableNames &&
-    importedExport.callVariableNames.length === importedExport.calls.length;
+    importedExport.callVariableNames.length > 1 &&
+    // Only proceed if we have at least as many base calls as variable names,
+    // OR they're close enough (within 1) to handle minor sync issues
+    Math.abs(baseHookCalls.length - importedExport.callVariableNames.length) <=
+      1;
 
   let mockCode: string | undefined;
   const variableMockCodes: string[] = [];
 
   if (hasMultipleCallsWithVariables) {
     // Generate separate mock functions for each variable-qualified call
-    // Track variable name occurrences to disambiguate when same variable is reused
-    // (mirrors the logic in gatherDataForMocks)
+    // Look up canonical keys from dataForMocks and track variable names for function naming
+
+    // Get all call signature keys for this hook from dataForMocks
+    const dataForMocks =
+      rootAnalysis.metadata?.scenariosDataStructure?.dataForMocks;
+    // Match keys that start with the hook name (e.g., "useFetcher" matches "useFetcher<User>()")
+    const callSignatureKeysForHook = dataForMocks
+      ? Object.keys(dataForMocks).filter((key) => {
+          const hookBaseName = importedExport.name.split(/[<(]/)[0];
+          const keyBaseName = key.split(/[<(]/)[0];
+          return keyBaseName === hookBaseName;
+        })
+      : [];
+
+    // Track variable name occurrences for unique function naming
     const variableNameCounts: Record<string, number> = {};
 
-    for (let i = 0; i < importedExport.calls!.length; i++) {
+    // Use the minimum of both array lengths to handle slight mismatches
+    // (e.g., stale data from previous analysis runs)
+    const iterationLimit = Math.min(
+      baseHookCalls!.length,
+      importedExport.callVariableNames!.length,
+    );
+    for (let i = 0; i < iterationLimit; i++) {
       const variableName = importedExport.callVariableNames![i];
       if (!variableName) continue;
 
@@ -687,18 +943,37 @@ function addMockToContent(
       const occurrence = variableNameCounts[variableName] ?? 0;
       variableNameCounts[variableName] = occurrence + 1;
 
-      // If this is a reused variable name (occurrence > 0), append index
-      // e.g., "fetcher[1] <- useFetcher" for the second usage of "fetcher"
+      // Build indexed variable name for function naming
       const indexedVariableName =
         occurrence > 0 ? `${variableName}[${occurrence}]` : variableName;
 
-      // Generate mock code for this specific call using variable-qualified name
-      // Format: "variableName <- functionName" (reads as "variableName receives from functionName")
-      const qualifiedName = `${indexedVariableName} <- ${importedExport.name}`;
+      // Use safe function name with underscores instead of brackets
+      // e.g., fetcher[1] -> fetcher_1
+      const safeFunctionName = indexedVariableName.replace(/\[(\d+)\]/g, '_$1');
+      // Compute unique mock function name for call site replacement
+      // e.g., useFetcher_entityDiffFetcher, useFetcher_reportFetcher
+      const mockFunctionName = `${importedExport.name}_${safeFunctionName}`;
+
+      // Use the call signature from baseHookCalls[i] as the data key
+      // This matches what's stored in dataForMocks
+      const callSignature = baseHookCalls![i];
+
+      // Generate mock code using the call signature directly
+      // This prevents "symbol already declared" errors when multiple calls exist
+      // Check if this is a package import that won't have scenario copies
+      const isPackageImportForMock = importPath?.startsWith('@');
       const variableMockCode = constructMockCode(
-        qualifiedName,
+        callSignature, // Use call signature format for data lookup
         dependencySchemas,
         importedExport.entityType,
+        undefined, // No need for separate canonical key
+        {
+          uniqueFunctionSuffix: safeFunctionName, // Use variable name for unique function naming
+          // For node_modules or package imports, skip spreading from __cyOriginal
+          // since those packages/files don't export *__cyOriginal variants
+          skipOriginalSpread:
+            importedExport.isNodeModule || isPackageImportForMock,
+        },
       );
 
       if (variableMockCode) {
@@ -707,25 +982,25 @@ function addMockToContent(
         // Replace the call site with the variable-specific mock function
         // e.g., useFetcher<BranchEntityDiffResult>() -> useFetcher_entityDiffFetcher()
         // e.g., useFetcher() -> useFetcher_reportFetcher()
-        // For indexed variables: useFetcher() -> useFetcher_fetcher_1()
-        const callSignature = importedExport.calls![i];
         // Escape special regex characters in the call signature
         const escapedCallSignature = callSignature.replace(
           /[.*+?^${}()|[\]\\]/g,
           '\\$&',
         );
-        // Create regex that matches the call (with optional whitespace variations)
+        // Create regex that matches the call (with optional whitespace variations).
+        // TypeScript formatters commonly break type parameters across lines, e.g.:
+        //   useLoaderData<
+        //     typeof loader
+        //   >()
+        // So we allow optional whitespace around < and > delimiters, not just
+        // where whitespace already exists in the call signature string.
         const callRegex = new RegExp(
-          escapedCallSignature.replace(/\s+/g, '\\s*'),
-          'g',
-        );
-        // Use safe function name with underscores instead of brackets
-        // e.g., fetcher[1] -> fetcher_1
-        const safeFunctionName = indexedVariableName.replace(
-          /\[(\d+)\]/g,
-          '_$1',
+          escapedCallSignature
+            .replace(/\s+/g, '\\s*')
+            .replace(/</g, '\\s*<\\s*')
+            .replace(/>/g, '\\s*>\\s*'),
+          'gs',
         );
-        const mockFunctionName = `${importedExport.name}_${safeFunctionName}`;
         fileContent = fileContent.replace(callRegex, `${mockFunctionName}()`);
       }
     }
@@ -741,83 +1016,186 @@ function addMockToContent(
         : undefined;
 
     if (singleCallVariableName) {
-      // For single variable assignments, use the variable-qualified key for data lookup
-      // Use constructMockCode to generate proper dispatch functions for nested function calls
-      // (e.g., useTranslation returns { t } where t() needs to dispatch based on translation key)
-      const qualifiedKey = `${singleCallVariableName} <- ${importedExport.name}`;
-      // Keep the original function name since there's only one call - no need for unique names
+      // For single variable assignments, use the call signature directly from dataForMocks
+      const dataForMocks =
+        rootAnalysis.metadata?.scenariosDataStructure?.dataForMocks;
+
+      // Find matching call signature key in dataForMocks
+      // IMPORTANT: First try exact match with type parameters (e.g., "useLoaderData<LoaderData>()")
+      // to avoid picking the wrong variant (e.g., "useLoaderData<typeof loader>()" which may
+      // have different properties). Fall back to base name matching only if exact match fails.
+      const hookBaseName = importedExport.name.split(/[<(]/)[0];
+      const expectedKey = importedExport.calls?.[0];
+      let callSignatureKey: string | undefined;
+
+      if (dataForMocks) {
+        const keys = Object.keys(dataForMocks);
+
+        // First try exact match with the expected call signature
+        if (expectedKey && keys.includes(expectedKey)) {
+          callSignatureKey = expectedKey;
+        } else {
+          // Fall back to base name matching
+          callSignatureKey = keys.find((key) => {
+            // Split on ., <, or ( to get the true base name
+            // This handles both "useFlags()" -> "useFlags" and "trpc.useUtils()" -> "trpc"
+            const keyBaseName = key.split(/[.<(]/)[0];
+            return keyBaseName === hookBaseName;
+          });
+        }
+      }
+
+      // Use the call signature if found, otherwise construct it
+      const dataKey =
+        callSignatureKey ??
+        importedExport.calls?.[0] ??
+        `${importedExport.name}()`;
+
+      // IMPORTANT: If the dataKey is a method chain (e.g., "trpc.useUtils()"), we should
+      // use the base name (e.g., "trpc") when calling constructMockCode. This ensures
+      // constructMockCode generates a complete nested mock from the schema without
+      // referencing __cyOriginal variables.
+      // NOTE: Only check for dots BEFORE the first open paren. Function calls with
+      // dotted arguments like "getSurveyWithMetadata(params.surveyId)" have dots
+      // INSIDE parens — these are NOT method chains and should keep the full signature.
+      const dataKeyBaseName = dataKey.split(/[.<(]/)[0];
+      const firstParenIndex = dataKey.indexOf('(');
+      const partBeforeFirstParen =
+        firstParenIndex >= 0 ? dataKey.substring(0, firstParenIndex) : dataKey;
+      const isMethodChainDataKey =
+        dataKeyBaseName === importedExport.name &&
+        dataKey !== importedExport.name &&
+        partBeforeFirstParen.includes('.');
+      const mockNameToUse = isMethodChainDataKey
+        ? importedExport.name
+        : dataKey;
+
+      // Keep the original function name since there's only one call
+      // Check if this is a package import that won't have scenario copies
+      const isPackageImportForSingleCall = importPath?.startsWith('@');
       mockCode = constructMockCode(
-        qualifiedKey,
+        mockNameToUse,
         dependencySchemas,
         importedExport.entityType,
-        { keepOriginalFunctionName: true },
+        undefined,
+        {
+          keepOriginalFunctionName: true,
+          // For node_modules or package imports, skip spreading from __cyOriginal
+          // since those packages/files don't export *__cyOriginal variants
+          skipOriginalSpread:
+            importedExport.isNodeModule || isPackageImportForSingleCall,
+        },
       );
       // If constructMockCode didn't generate code, fall back to simple return
+      // IMPORTANT: We inline scenarios().data() inside the function rather than
+      // storing in a const - see comment in constructMockCode.ts for why.
       if (!mockCode) {
-        mockCode = `const ${importedExport.name}ReturnValue = scenarios().data()?.["${qualifiedKey}"];
-
-function ${importedExport.name}() {
-  return ${importedExport.name}ReturnValue;
+        mockCode = `// PATCHED: memoize to return stable reference (prevents infinite useEffect re-triggers)
+const _${importedExport.name}Ref = {
+  current: null,
+};
+function ${importedExport.name}(...args) {
+  if (!_${importedExport.name}Ref.current) {
+    _${importedExport.name}Ref.current = scenarios().data()?.["${dataKey}"];
+  }
+  return _${importedExport.name}Ref.current;
 }`;
       }
     } else {
-      // Check if any analysis (fileAnalyses or rootAnalysis) has this function's data
-      // under a variable-qualified key. The entity that CALLS the function (e.g., FileTableRow)
-      // has the dataForMocks with the variable-qualified key, not the root analysis (e.g., GitView).
-      let variableQualifiedKey: string | undefined;
-
-      // First check fileAnalyses (the analyses for the entity being written)
-      for (const analysis of fileAnalyses) {
-        const dataForMocks =
-          analysis.metadata?.scenariosDataStructure?.dataForMocks;
-        if (dataForMocks) {
-          variableQualifiedKey = Object.keys(dataForMocks).find((key) => {
-            const match = key.match(/^([a-zA-Z_][a-zA-Z0-9_]*)\s*<-\s*(.+)$/);
-            return match && match[2] === importedExport.name;
-          });
-          if (variableQualifiedKey) {
-            break;
-          }
+      // Helper to find matching call signature key from dataForMocks
+      // IMPORTANT: First try exact match with type parameters (e.g., "useLoaderData<LoaderData>()")
+      // to avoid picking the wrong variant. Fall back to base name matching only if needed.
+      const hookBaseName = importedExport.name.split(/[<(]/)[0];
+      const expectedKey = importedExport.calls?.[0];
+      const findMatchingKey = (
+        dataForMocks: Record<string, unknown> | undefined,
+      ): string | undefined => {
+        if (!dataForMocks) return undefined;
+        const keys = Object.keys(dataForMocks);
+
+        // First try exact match with the expected call signature
+        if (expectedKey && keys.includes(expectedKey)) {
+          return expectedKey;
         }
-      }
 
-      // If not found in fileAnalyses, fall back to rootAnalysis
-      if (!variableQualifiedKey) {
-        const dataForMocks =
-          rootAnalysis.metadata?.scenariosDataStructure?.dataForMocks;
-        if (dataForMocks) {
-          variableQualifiedKey = Object.keys(dataForMocks).find((key) => {
-            const match = key.match(/^([a-zA-Z_][a-zA-Z0-9_]*)\s*<-\s*(.+)$/);
-            return match && match[2] === importedExport.name;
-          });
+        // Fall back to base name matching
+        return keys.find((key) => {
+          // Split on ., <, or ( to get the true base name
+          // This handles both "useFlags()" -> "useFlags" and "trpc.useUtils()" -> "trpc"
+          const keyBaseName = key.split(/[.<(]/)[0];
+          return keyBaseName === hookBaseName;
+        });
+      };
+
+      // Check rootAnalysis FIRST for matching keys.
+      // The mock DATA is generated from rootAnalysis, so the mock CODE must
+      // also use rootAnalysis keys to ensure the lookup succeeds.
+      let dataKey = findMatchingKey(
+        rootAnalysis.metadata?.scenariosDataStructure?.dataForMocks,
+      );
+
+      // If not found in rootAnalysis, fall back to fileAnalyses
+      if (!dataKey) {
+        for (const analysis of fileAnalyses) {
+          dataKey = findMatchingKey(
+            analysis.metadata?.scenariosDataStructure?.dataForMocks,
+          );
+          if (dataKey) break;
         }
       }
 
-      if (variableQualifiedKey) {
-        // Use the variable-qualified key found in the analysis
-        // Use constructMockCode to generate proper dispatch functions for nested function calls
-        // Keep the original function name since there's only one call - no need for unique names
-        mockCode = constructMockCode(
-          variableQualifiedKey,
-          dependencySchemas,
-          importedExport.entityType,
-          { keepOriginalFunctionName: true },
-        );
-        // If constructMockCode didn't generate code, fall back to simple return
-        if (!mockCode) {
-          mockCode = `const ${importedExport.name}ReturnValue = scenarios().data()?.["${variableQualifiedKey}"];
+      // Use the data key if found, otherwise use call signature or function name.
+      // IMPORTANT: If the dataKey is a method chain (e.g., "trpc.useUtils()"), we should
+      // use the base name (e.g., "trpc") when calling constructMockCode. This ensures
+      // constructMockCode generates a complete nested mock from the schema without
+      // referencing __cyOriginal variables. The __cyOriginal pattern is only needed
+      // for partial mocking where we preserve some original methods, not for complete
+      // method-chain mocks where we provide all implementations.
+      // NOTE: Only check for dots BEFORE the first open paren. Function calls with
+      // dotted arguments like "getSurveyWithMetadata(params.surveyId)" have dots
+      // INSIDE parens — these are NOT method chains and should keep the full signature.
+      const dataKeyBaseName = dataKey?.split(/[.<(]/)[0];
+      const elseFirstParenIndex = dataKey?.indexOf('(') ?? -1;
+      const elsePartBeforeFirstParen =
+        dataKey && elseFirstParenIndex >= 0
+          ? dataKey.substring(0, elseFirstParenIndex)
+          : dataKey;
+      const isMethodChainDataKey =
+        dataKey &&
+        dataKeyBaseName === importedExport.name &&
+        dataKey !== importedExport.name &&
+        (elsePartBeforeFirstParen?.includes('.') ?? false);
+      const mockNameToUse = isMethodChainDataKey
+        ? importedExport.name
+        : (dataKey ?? importedExport.calls?.[0] ?? `${importedExport.name}()`);
 
-function ${importedExport.name}() {
-  return ${importedExport.name}ReturnValue;
+      mockCode = constructMockCode(
+        mockNameToUse,
+        dependencySchemas,
+        importedExport.entityType,
+        undefined,
+        {
+          keepOriginalFunctionName: true,
+          // For node_modules or package imports, skip spreading from __cyOriginal
+          // since those packages/files don't export *__cyOriginal variants
+          skipOriginalSpread:
+            importedExport.isNodeModule || importPath?.startsWith('@'),
+        },
+      );
+      // If constructMockCode didn't generate code, fall back to simple return
+      // IMPORTANT: We inline scenarios().data() inside the function rather than
+      // storing in a const - see comment in constructMockCode.ts for why.
+      if (!mockCode && dataKey) {
+        mockCode = `// PATCHED: memoize to return stable reference (prevents infinite useEffect re-triggers)
+const _${importedExport.name}Ref = {
+  current: null,
+};
+function ${importedExport.name}(...args) {
+  if (!_${importedExport.name}Ref.current) {
+    _${importedExport.name}Ref.current = scenarios().data()?.["${dataKey}"];
+  }
+  return _${importedExport.name}Ref.current;
 }`;
-        }
-      } else {
-        // Original behavior for calls without variable names
-        mockCode = constructMockCode(
-          importedExport.name,
-          dependencySchemas,
-          importedExport.entityType,
-        );
       }
     }
   }
@@ -848,12 +1226,39 @@ function ${importedExport.name}() {
         /[.*+?^${}()|[\]\\]/g,
         '\\$&',
       );
+      // Use a simpler, more robust regex pattern that matches the fallback path.
+      // Key improvements:
+      // 1. Uses escapeRegExp(firstPart) to handle special characters in function names
+      // 2. Uses word boundaries (\b) to prevent partial matches
+      // 3. Handles comma BEFORE or AFTER the name: (?:,\s*|\s*,)?
+      // 4. Matches specific import path (escapedImportPath)
       const importRegExp = new RegExp(
-        `(import(?:(?!${firstPart}|from|import)[\\s\\S])*?)${firstPart}(?:,\\s*)?((?:(?!import)[\\s\\S])*?from\\s+['"]${escapedImportPath}['"])`,
+        `(import\\s*\\{[^}]*?)\\b${escapeRegExp(firstPart)}\\b(?:,\\s*|\\s*,)?((?:[^}]*\\}\\s*from\\s*['"]${escapedImportPath}['"];?))`,
         'm',
       );
 
-      if (importedExportNameParts.length > 1) {
+      // Check if any call signature has multiple parts (e.g., "logger.error(error)")
+      // If so, the mock code will spread from __cyOriginal, so we need to rename the import
+      // EXCEPT:
+      // 1. For node_module imports, the __cyOriginal pattern doesn't work because
+      //    the original package doesn't export *__cyOriginal variants.
+      // 2. For package imports (starting with @), the __cyOriginal pattern doesn't work
+      //    because scenario copies aren't created for package files - they keep the
+      //    original import path which doesn't export *__cyOriginal.
+      const anyCallHasMultipleParts = importedExport.calls?.some((call) => {
+        const callParts = splitOutsideParenthesesAndArrays(call);
+        return callParts.length > 1;
+      });
+
+      // Package imports (starting with @) don't get scenario copies, so __cyOriginal won't exist
+      const isPackageImport = importPath.startsWith('@');
+
+      const shouldRenameToOriginal =
+        !importedExport.isNodeModule &&
+        !isPackageImport &&
+        (importedExportNameParts.length > 1 || anyCallHasMultipleParts);
+
+      if (shouldRenameToOriginal) {
         fileContent = fileContent.replace(
           importRegExp,
           `$1${firstPart}__cyOriginal$2`,
@@ -862,6 +1267,21 @@ function ${importedExport.name}() {
         fileContent = fileContent.replace(importRegExp, '$1$2');
       }
 
+      // Also handle namespace imports (import * as foo from '...')
+      // These need to be renamed to foo__cyOriginal when the mock code spreads from the original.
+      // Note: We match any path (not just escapedImportPath) because the import path may have
+      // been rewritten by transitive import handling before this code runs.
+      if (shouldRenameToOriginal) {
+        const namespaceImportRegExp = new RegExp(
+          `(import\\s+\\*\\s+as\\s+)${escapeRegExp(firstPart)}(\\s+from\\s+['"][^'"]*['"])`,
+          'm',
+        );
+        fileContent = fileContent.replace(
+          namespaceImportRegExp,
+          `$1${firstPart}__cyOriginal$2`,
+        );
+      }
+
       // Remove empty imports entirely to avoid partial commenting issues with multiline imports
       // This handles both single-line and multiline empty imports
       fileContent = fileContent.replace(
@@ -886,7 +1306,20 @@ function ${importedExport.name}() {
       'm',
     );
 
-    if (importedExportNameParts.length > 1) {
+    // Check if any call signature has multiple parts (e.g., "logger.error(error)")
+    // If so, the mock code will spread from __cyOriginal, so we need to rename the import
+    // EXCEPT: For node_module imports, the __cyOriginal pattern doesn't work because
+    // the original package doesn't export *__cyOriginal variants.
+    const anyCallHasMultipleParts = importedExport.calls?.some((call) => {
+      const callParts = splitOutsideParenthesesAndArrays(call);
+      return callParts.length > 1;
+    });
+
+    const shouldRenameToOriginal =
+      !importedExport.isNodeModule &&
+      (importedExportNameParts.length > 1 || anyCallHasMultipleParts);
+
+    if (shouldRenameToOriginal) {
       // Rename the import instead of removing (for destructured access patterns)
       fileContent = fileContent.replace(
         namedImportRegExp,
@@ -1108,6 +1541,15 @@ export default async function writeScenarioComponents({
   scenarioComponentPaths: string[];
   writtenScenarioComponents: { [key: string]: string[] };
 }> {
+  // Reset debug timing for this invocation
+  resetDebugTiming();
+  debugLog('START writeScenarioComponents', {
+    filePath: file.path,
+    entityName: entity.name,
+    scenarioName: scenario.name,
+    isRootFile: !rootFile || rootFile === file,
+  });
+
   // Capture arguments for testing if debug mode is enabled
   captureArgumentsForTesting({
     project,
@@ -1327,7 +1769,31 @@ export default async function writeScenarioComponents({
     return 0;
   });
 
+  debugLog('Starting main importedExports loop', {
+    count: sortedImportedExports.length,
+    fileContentLength: fileContent.length,
+  });
+
+  let importedExportIndex = 0;
+  const loopStartTime = Date.now();
+  console.log(
+    `[WriteScenario] Starting import loop for ${entity.name}: ${sortedImportedExports.length} imports`,
+  );
   for (const importedExport of sortedImportedExports) {
+    importedExportIndex++;
+    if (importedExportIndex % 5 === 0 || importedExportIndex === 1) {
+      console.log(
+        `[WriteScenario] ${entity.name} import ${importedExportIndex}/${sortedImportedExports.length}: ${importedExport.name} elapsed=${Date.now() - loopStartTime}ms`,
+      );
+      debugLog(
+        `Processing importedExport ${importedExportIndex}/${sortedImportedExports.length}`,
+        {
+          name: importedExport.name,
+          filePath: importedExport.filePath,
+          isMocked: importedExport.isMocked,
+        },
+      );
+    }
     // IMPORTANT: The import mapping keys may be either absolute or relative paths
     // depending on how they were created by the file analyzer. We try multiple formats.
     // Also need to normalize paths to handle /tmp vs /private/tmp on macOS
@@ -1468,6 +1934,17 @@ export default async function writeScenarioComponents({
               dataFileContent = stripServerOnlyImport(dataFileContent);
               dataFileContent = applyServerOnlyMocks(dataFileContent);
 
+              // Process transitive imports: if the data entity file imports from files
+              // that have `import "server-only"`, rewrite those imports to transitive
+              // copies with server-only stripped. Without this, data entity files that
+              // end up in a client bundle (e.g., via a stripped "use server" boundary)
+              // would pull in server-only code and cause build failures.
+              dataFileContent = await processTransitiveImportsRecursively(
+                dataFileContent,
+                fileNotMocked.path,
+                dataScenarioPath,
+              );
+
               // Write the transformed data entity file
               await writeFile(dataScenarioPath, dataFileContent);
               scenarioComponentPaths.push(dataScenarioPath);
@@ -1493,9 +1970,9 @@ export default async function writeScenarioComponents({
               importedExport.name,
             );
 
-            // Don't recurse - data entities don't need their dependencies processed
-            // The import rewriting will happen later in this same loop iteration
-            // (at lines ~1590-1702) to point imports to this transformed file
+            // Don't recurse into full writeScenarioComponents - data entities don't
+            // need mock generation for their dependencies. Transitive server-only
+            // import processing is already handled above via processTransitiveImportsRecursively.
           } else {
             // For visual/library entities, recurse to process their dependencies
 
@@ -1506,28 +1983,49 @@ export default async function writeScenarioComponents({
               importedExport.resolvedIsDefault === true &&
               importedExport.isDefault === false;
 
+            console.log(
+              `[WriteScenario] RECURSE START: ${entity.name} -> ${importedExportEntity.name}`,
+            );
+            const recurseStartTime = Date.now();
+            debugLog(
+              `Recursing into writeScenarioComponents for ${importedExportEntity.name}`,
+              {
+                entityName: importedExportEntity.name,
+                filePath: fileNotMocked.path,
+              },
+            );
             const {
               scenarioComponentPaths: newScenarioComponentPaths,
               writtenScenarioComponents: updatedWrittenScenarioComponents,
-            } = await writeScenarioComponents({
-              project,
-              file: fileNotMocked,
-              entity: importedExportEntity,
-              rootAnalysis,
-              scenario,
-              context,
-              projectAnalyzer,
-              framework,
-              mocksDir,
-              rootFile,
-              namespaceMocks,
-              writtenScenarioComponents,
-              fileStore,
-              // Pass the import name so we can add `export { default as Name };`
-              exportAsNamed: needsNamedReExport
-                ? importedExport.name
-                : undefined,
-            });
+            } = await withTimeout(
+              `recursive writeScenarioComponents for ${importedExportEntity.name}`,
+              writeScenarioComponents({
+                project,
+                file: fileNotMocked,
+                entity: importedExportEntity,
+                rootAnalysis,
+                scenario,
+                context,
+                projectAnalyzer,
+                framework,
+                mocksDir,
+                rootFile,
+                namespaceMocks,
+                writtenScenarioComponents,
+                fileStore,
+                // Pass the import name so we can add `export { default as Name };`
+                exportAsNamed: needsNamedReExport
+                  ? importedExport.name
+                  : undefined,
+              }),
+              180000, // 3 minute timeout for recursive calls (complex components need more time)
+            );
+            console.log(
+              `[WriteScenario] RECURSE END: ${entity.name} -> ${importedExportEntity.name} took ${Date.now() - recurseStartTime}ms`,
+            );
+            debugLog(
+              `Completed recursive writeScenarioComponents for ${importedExportEntity.name}`,
+            );
             writtenScenarioComponents = updatedWrittenScenarioComponents;
             scenarioComponentPaths.push(...newScenarioComponentPaths);
           }
@@ -1547,20 +2045,25 @@ export default async function writeScenarioComponents({
       // that stubbing would break (e.g., Zod schemas with .superRefine())
       const isDataEntity = entityType === 'data' || entityType === 'type';
 
-      // Heuristic: Zod schemas are often misclassified as 'library' but should be preserved
-      // Detect by: name starts with Z + uppercase letter, AND has Zod method calls
-      const looksLikeZodSchema =
-        entityType === 'library' &&
-        /^Z[A-Z]/.test(importedExport.name) &&
-        importedExport.calls?.some((call: string) =>
-          /\.(superRefine|refine|transform|default|optional|nullable|array|object|string|number|boolean|parse|safeParse)\s*\(/.test(
-            call,
-          ),
-        );
+      // If calls data shows the entity is only accessed via properties/methods
+      // (e.g., formValidator.validate(), schema.superRefine()) and never directly
+      // invoked (e.g., getInitialProps()), it's used as an object and should be
+      // preserved rather than replaced with a Proxy stub.
+      const onlyPropertyAccessed =
+        importedExport.calls?.length > 0 &&
+        !importedExport.calls.some((call: string) => {
+          const afterName = call.slice(importedExport.name.length);
+          return afterName.startsWith('(') || afterName.startsWith('<');
+        });
 
-      // Callable entities can be safely stubbed (but not Zod schemas)
+      // Callable entities can be safely stubbed. Entities that are only
+      // property-accessed should be preserved (their methods need to work).
+      // 'other' entities are unknown types — safer to preserve than stub.
       const isCallable =
-        !isDataEntity && !looksLikeZodSchema && entityType !== undefined;
+        !isDataEntity &&
+        !onlyPropertyAccessed &&
+        entityType !== undefined &&
+        entityType !== 'other';
 
       // Determine what action to take
       const shouldStripAndReplace = hasMock;
@@ -1831,9 +2334,7 @@ ${exportKeyword}const ${functionName} = new Proxy(() => scenarios().data()?.["${
 
           // First, try to remove this entity from the already-rewritten grouped import
           // This prevents duplicate/conflicting imports
-          // IMPORTANT: Only remove from import statements, NOT from the entire file!
-          // The global patterns used previously would also match type annotations like:
-          //   "param: MyType," in function signatures, corrupting the syntax.
+          // Use AST-based removal to properly handle type-only imports like `type EntityName`
           const escapedEntityName = escapeRegExp(entityImportName);
 
           // For default imports: remove "DefaultName, " from "import DefaultName, { ... }"
@@ -1846,33 +2347,12 @@ ${exportKeyword}const ${functionName} = new Proxy(() => scenarios().data()?.["${
             fileContent = fileContent.replace(defaultImportPattern, '$1$2');
           }
 
-          // Match import statements that contain this entity and remove just the entity
-          // Pattern: import { ... EntityName, ... } from '...'
-          // We match the full import and use a replacer function to remove the entity name
-          const importWithEntityPattern = new RegExp(
-            `(import\\s*\\{)([^}]*\\b${escapedEntityName}\\b[^}]*)(\\}\\s*from\\s*['"][^'"]*['"];?)`,
-            'gm',
-          );
-          fileContent = fileContent.replace(
-            importWithEntityPattern,
-            (match, prefix, namedImports, suffix) => {
-              // Remove the entity name from the named imports
-              let cleaned = namedImports
-                .replace(new RegExp(`\\b${escapedEntityName}\\s*,\\s*`), '') // "EntityName, "
-                .replace(new RegExp(`\\s*,\\s*${escapedEntityName}\\b`), '') // ", EntityName"
-                .replace(new RegExp(`\\b${escapedEntityName}\\b`), ''); // "EntityName" (only one)
-              // Clean up any double commas or leading/trailing commas
-              cleaned = cleaned
-                .replace(/,\s*,/g, ',')
-                .replace(/^\s*,\s*/, '')
-                .replace(/\s*,\s*$/, '');
-              // If no imports left, remove the entire import statement
-              if (cleaned.trim() === '') {
-                return '';
-              }
-              return prefix + cleaned + suffix;
-            },
-          );
+          // Remove the named import using AST parsing
+          // This properly handles:
+          // - Regular imports: `import { EntityName } from '...'`
+          // - Type-only imports: `import { type EntityName } from '...'`
+          // - Mixed imports: `import { type EntityName, OtherName } from '...'`
+          fileContent = removeNamedImportAst(fileContent, entityImportName);
 
           // Add the new import at the beginning of fileContent
           // Note: The header comment (// Scenario:) doesn't exist yet - it's prepended at writeFile time
@@ -1888,9 +2368,32 @@ ${exportKeyword}const ${functionName} = new Proxy(() => scenarios().data()?.["${
     }
   }
 
+  // Track post-import-loop timing
+  const postLoopStartTime = Date.now();
+  console.log(`[WriteScenario] POST-LOOP START: ${entity.name}`);
+
+  // Collect universal mocks BEFORE processing nodeModuleImports
+  // This is needed to check if a node module import is handled by a universal mock
+  const universalMocks = project.metadata?.universalMocks ?? [];
+  const nodeModuleUniversalMocks = universalMocks.filter(
+    (mock) => mock.nodeModule && mock.content,
+  );
+
+  // Create a set of import paths that have universal mocks for quick lookup
+  const universalMockPaths = new Set(
+    nodeModuleUniversalMocks.map((mock) => mock.filePath),
+  );
+
   for (const nodeModuleImport of nodeModuleImports) {
     if (!nodeModuleImport.isMocked) continue;
 
+    // Skip generating local mock functions for imports that have universal mocks.
+    // Universal mocks provide the exports via rewritten import paths (handled below).
+    // Generating a local mock function would cause "name defined multiple times" errors.
+    if (universalMockPaths.has(nodeModuleImport.filePath)) {
+      continue;
+    }
+
     fileContent = addMockToContent(
       fileContent,
       nodeModuleImport,
@@ -1906,10 +2409,6 @@ ${exportKeyword}const ${functionName} = new Proxy(() => scenarios().data()?.["${
   // Universal mocks create mock files at __codeyamMocks__/{safeFileName}.tsx
   // We need to rewrite imports like `import { logger } from "@formbricks/logger"`
   // to `import { logger } from "../__codeyamMocks__/_formbricks_logger"`
-  const universalMocks = project.metadata?.universalMocks ?? [];
-  const nodeModuleUniversalMocks = universalMocks.filter(
-    (mock) => mock.nodeModule && mock.content,
-  );
 
   for (const universalMock of nodeModuleUniversalMocks) {
     const originalPath = universalMock.filePath;
@@ -1932,6 +2431,10 @@ ${exportKeyword}const ${functionName} = new Proxy(() => scenarios().data()?.["${
     );
   }
 
+  console.log(
+    `[WriteScenario] POST-LOOP ${entity.name}: node+universal mocks took ${Date.now() - postLoopStartTime}ms`,
+  );
+
   if (
     rootAnalysis.entitySha === entity.sha &&
     entity.metadata?.notExported &&
@@ -1973,31 +2476,46 @@ ${exportKeyword}const ${functionName} = new Proxy(() => scenarios().data()?.["${
     });
   }
 
+  debugLog('Route path computed', { scenarioComponentPath });
+
   // Strip <html> and <body> tags from root layout files for Next.js
   // These tags cause hydration errors when the scenario layout is nested under the real root
+  debugLog('Starting stripHtmlBodyTags');
   fileContent = stripHtmlBodyTags(fileContent, file.path, framework);
+  debugLog('Completed stripHtmlBodyTags');
 
   // Strip "server-only" imports for Next.js
   // These cause errors when the scenario component is rendered client-side
+  debugLog('Starting stripServerOnlyImport');
   fileContent = stripServerOnlyImport(fileContent);
+  debugLog('Starting applyServerOnlyMocks');
   fileContent = applyServerOnlyMocks(fileContent);
+  debugLog('Completed server-only processing');
 
   // Rewrite asset imports (CSS, images, fonts, etc.) to correct relative paths
   // The original file path is relative to PROJECT_RELATIVE_PATH, the new path is scenarioComponentPath
+  debugLog('Starting rewriteAssetImports');
   fileContent = rewriteAssetImports(
     fileContent,
     `${PROJECT_RELATIVE_PATH}/${file.path}`,
     scenarioComponentPath,
   );
+  debugLog('Completed rewriteAssetImports');
 
   // Rewrite relative TypeScript/JavaScript module imports to correct relative paths
   // This handles cases where the file is moved (e.g., from [environmentId]/ to _environmentId_/)
   // and relative imports like "./lib/organization" need to be rewritten
+  debugLog('Starting rewriteRelativeModuleImports');
   fileContent = rewriteRelativeModuleImports(
     fileContent,
     `${PROJECT_RELATIVE_PATH}/${file.path}`,
     scenarioComponentPath,
   );
+  debugLog('Completed rewriteRelativeModuleImports');
+
+  console.log(
+    `[WriteScenario] POST-LOOP ${entity.name}: transformations took ${Date.now() - postLoopStartTime}ms`,
+  );
 
   /**
    * Recursively process a file's imports to create transitive copies with server-only stripped.
@@ -2015,21 +2533,69 @@ ${exportKeyword}const ${functionName} = new Proxy(() => scenarios().data()?.["${
     sourceFilePath: string,
     targetFilePath: string,
     visitedPaths: Set<string> = new Set(),
+    depth: number = 0,
+    startTime: number = Date.now(),
   ): Promise<string> {
+    // Global timeout for entire transitive processing
+    const GLOBAL_TIMEOUT_MS = 180000; // 3 minutes max for all transitive processing (complex components need more time)
+    const elapsed = Date.now() - startTime;
+    if (elapsed > GLOBAL_TIMEOUT_MS) {
+      throw new Error(
+        `processTransitiveImportsRecursively exceeded ${GLOBAL_TIMEOUT_MS}ms (elapsed: ${elapsed}ms) at depth=${depth} for ${sourceFilePath}`,
+      );
+    }
+
     const importPaths = extractInternalImportPaths(content);
+    // Always log to help debug timeout issues
+    console.log(
+      `[TransitiveImports] depth=${depth} file=${path.basename(sourceFilePath)} imports=${importPaths.length} visited=${visitedPaths.size} elapsed=${Date.now() - startTime}ms`,
+    );
+    debugLog(`processTransitiveImportsRecursively depth=${depth}`, {
+      sourceFilePath,
+      importCount: importPaths.length,
+      visitedCount: visitedPaths.size,
+    });
     let modifiedContent = content;
 
-    for (const importPath of importPaths) {
+    // Safety check: limit iterations to prevent infinite loops
+    const MAX_IMPORTS_PER_FILE = 100;
+    if (importPaths.length > MAX_IMPORTS_PER_FILE) {
+      console.warn(
+        `[WriteScenario] WARNING: File ${sourceFilePath} has ${importPaths.length} imports (> ${MAX_IMPORTS_PER_FILE}), limiting processing`,
+      );
+    }
+
+    let importIndex = 0;
+    debugLog(
+      `Starting import loop at depth=${depth}, ${importPaths.length} imports to process`,
+    );
+    const slicedImports = importPaths.slice(0, MAX_IMPORTS_PER_FILE);
+    for (const importPath of slicedImports) {
+      if (!importPath) {
+        continue;
+      }
+      importIndex++;
+      debugLog(
+        `[LOOP] depth=${depth} import ${importIndex}/${Math.min(importPaths.length, MAX_IMPORTS_PER_FILE)}: ${importPath}`,
+      );
+      debugLog(`[LOOP] Calling resolveImportPath...`);
       const resolvedPath = resolveImportPath(
         importPath,
         sourceFilePath,
         project,
       );
+      debugLog(
+        `[LOOP] resolveImportPath returned: ${resolvedPath?.slice(0, 80) ?? 'null'}`,
+      );
       if (!resolvedPath) continue;
 
+      debugLog(`[LOOP] Looking up importFile...`);
       let importFile = fileStore
         ? fileStore.getByPath(resolvedPath)
         : project.files?.find((f) => f.path === resolvedPath);
+      debugLog(
+        `[LOOP] importFile lookup result: ${importFile ? 'found' : 'not found'}`,
+      );
       if (!importFile) continue;
 
       // Build the transitive file path (needed for import rewriting even if we skip creating)
@@ -2038,8 +2604,10 @@ ${exportKeyword}const ${functionName} = new Proxy(() => scenarios().data()?.["${
       );
       const extension = importFile.name.split('.').pop();
       const isIndex = isIndexPath(importFile.path);
-      const pathHash = safeFileName(importFile.path);
-      const transitiveFilePath = `${PROJECT_RELATIVE_PATH}/${basePath}/${pathHash}_${isIndex ? 'index_' : ''}transitive_${safeFileName(scenario.name)}.${extension}`;
+      // Limit pathHash length to prevent ENAMETOOLONG errors on macOS (255 char limit)
+      const pathHash = safeFileName(importFile.path, { maxLength: 80 });
+      const scenarioSlug = safeFileName(scenario.name, { maxLength: 60 });
+      const transitiveFilePath = `${PROJECT_RELATIVE_PATH}/${basePath}/${pathHash}_${isIndex ? 'index_' : ''}transitive_${scenarioSlug}.${extension}`;
 
       // Check if this is a circular import (we're already processing this file)
       const isCircularImport = visitedPaths.has(resolvedPath);
@@ -2064,14 +2632,37 @@ ${exportKeyword}const ${functionName} = new Proxy(() => scenarios().data()?.["${
           // Strip server-only and mock server-only packages, then recursively process imports
           let transitiveContent = stripServerOnlyImport(importFile.content);
           transitiveContent = applyServerOnlyMocks(transitiveContent);
-          transitiveContent = await processTransitiveImportsRecursively(
-            transitiveContent,
-            importFile.path,
-            transitiveFilePath,
-            visitedPaths,
+          debugLog(
+            `processTransitiveImportsRecursively depth=${depth} for ${importFile.path}`,
+          );
+          debugLog(
+            `Calling processTransitiveImportsRecursively depth=${depth + 1} for ${importFile.path}`,
+          );
+          transitiveContent = await withTimeout(
+            `processTransitiveImportsRecursively depth=${depth} for ${path.basename(importFile.path)}`,
+            processTransitiveImportsRecursively(
+              transitiveContent,
+              importFile.path,
+              transitiveFilePath,
+              visitedPaths,
+              depth + 1,
+              startTime, // Pass through the original start time
+            ),
+            30000, // 30 second timeout per transitive import
+          );
+          debugLog(
+            `withTimeout returned for depth=${depth}, transitiveContent length=${transitiveContent.length}`,
+          );
+          debugLog(
+            `Completed processTransitiveImportsRecursively depth=${depth} for ${importFile.path}`,
           );
 
+          debugLog(`Writing transitive file depth=${depth}`, {
+            transitiveFilePath: path.basename(transitiveFilePath),
+            contentLength: transitiveContent.length,
+          });
           await writeFile(transitiveFilePath, transitiveContent);
+          debugLog(`Wrote transitive file depth=${depth}`);
           scenarioComponentPaths.push(transitiveFilePath);
 
           if (!writtenScenarioComponents[resolvedPath]) {
@@ -2085,6 +2676,10 @@ ${exportKeyword}const ${functionName} = new Proxy(() => scenarios().data()?.["${
 
       // ALWAYS rewrite the import to point to the transitive copy
       // (even for circular imports or already-processed files)
+      debugLog(`Rewriting import path depth=${depth}`, {
+        importPath,
+        resolvedPath,
+      });
       const relativePath = getRelativePath(targetFilePath, transitiveFilePath);
       const relativePathWithoutExt = relativePath.replace(
         /\.(ts|tsx|js|jsx)$/,
@@ -2095,30 +2690,93 @@ ${exportKeyword}const ${functionName} = new Proxy(() => scenarios().data()?.["${
         /[.*+?^${}()|[\]\\]/g,
         '\\$&',
       );
-      const importRegex = new RegExp(
-        `(from\\s*["'])${escapedImportPath}(["'])`,
-        'g',
-      );
-      modifiedContent = modifiedContent.replace(
-        importRegex,
-        `$1${safeRelativePath}$2`,
+      debugLog(`Applying regex depth=${depth}`, {
+        escapedImportPath,
+        contentLength: modifiedContent.length,
+      });
+      // Quick check if the import path even exists in content
+      const simpleCheck = modifiedContent.includes(importPath);
+      debugLog(
+        `Simple check: importPath "${importPath}" exists: ${simpleCheck}`,
       );
+      if (!simpleCheck) {
+        debugLog(`Skipping regex - import path not found in content`);
+      } else {
+        const regexPattern = `(from\\s*["'])${escapedImportPath}(["'])`;
+        debugLog(`Regex pattern: ${regexPattern.slice(0, 100)}`);
+        const importRegex = new RegExp(regexPattern, 'g');
+        debugLog(`About to call replace...`);
+
+        // Timing for regex replace to detect slow operations
+        const replaceStart = Date.now();
+        modifiedContent = modifiedContent.replace(
+          importRegex,
+          `$1${safeRelativePath}$2`,
+        );
+        const replaceTime = Date.now() - replaceStart;
+        if (replaceTime > 100) {
+          console.warn(
+            `[WriteScenario] SLOW regex replace: ${replaceTime}ms for pattern ${regexPattern.slice(0, 50)} on ${modifiedContent.length} bytes`,
+          );
+        }
+        debugLog(`Regex applied depth=${depth} in ${replaceTime}ms`);
+      }
+      debugLog(`[LOOP END] depth=${depth} import ${importIndex} completed`);
     }
 
+    debugLog(`[LOOP DONE] Exiting import loop at depth=${depth}`);
+    debugLog(
+      `Returning from processTransitiveImportsRecursively depth=${depth}`,
+    );
     return modifiedContent;
   }
 
+  console.log(
+    `[WriteScenario] POST-LOOP ${entity.name}: before remaining imports ${Date.now() - postLoopStartTime}ms`,
+  );
+
   // Process remaining internal imports that weren't in importedExports
   // This handles transitive dependencies: when the file content includes code (e.g., from
   // other functions in the same file) that imports from files with "server-only"
+  debugLog('Extracting remaining import paths');
   const remainingImportPaths = extractInternalImportPaths(fileContent);
+  debugLog('Found remaining import paths', {
+    count: remainingImportPaths.length,
+  });
 
   // Get all file paths that are in importedExports - these are handled by main processing
   const importedExportFilePaths = new Set(
     allImportedExports.map((ie) => ie.resolvedFilePath || ie.filePath),
   );
 
+  debugLog('Starting remaining imports loop', {
+    remainingCount: remainingImportPaths.length,
+    importedExportCount: importedExportFilePaths.size,
+  });
+
+  let remainingImportIndex = 0;
+  debugLog(
+    `[REMAINING] Starting remaining imports loop, ${remainingImportPaths.length} imports`,
+  );
   for (const importPath of remainingImportPaths) {
+    remainingImportIndex++;
+    debugLog(
+      `[REMAINING LOOP] import ${remainingImportIndex}/${remainingImportPaths.length}: ${importPath}`,
+    );
+
+    // Skip imports that point to generated CodeYam files (same skip logic as
+    // rewriteRelativeModuleImports). Without this, MockData files from earlier
+    // captures that get discovered by the TypeScript compiler would be treated as
+    // regular imports, creating transitive copies with stale content.
+    const scenarioFilePattern = /[a-f0-9]{64}_\w+_[A-Z]\w*$/;
+    const mockDataPattern = /__codeyamMocks__\//;
+    if (
+      scenarioFilePattern.test(importPath) ||
+      mockDataPattern.test(importPath)
+    ) {
+      continue;
+    }
+
     // Resolve the import path to a project file path
     const resolvedFilePath = resolveImportPath(importPath, file.path, project);
 
@@ -2166,8 +2824,10 @@ ${exportKeyword}const ${functionName} = new Proxy(() => scenarios().data()?.["${
     );
     const targetFileExtension = targetFile.name.split('.').pop();
     const targetFileIsIndex = isIndexPath(targetFile.path);
-    const filePathHash = safeFileName(targetFile.path);
-    const transformedFilePath = `${PROJECT_RELATIVE_PATH}/${targetFileBasePath}/${filePathHash}_${targetFileIsIndex ? 'index_' : ''}transitive_${safeFileName(scenario.name)}.${targetFileExtension}`;
+    // Limit path hash length to prevent ENAMETOOLONG errors
+    const filePathHash = safeFileName(targetFile.path, { maxLength: 80 });
+    const targetScenarioSlug = safeFileName(scenario.name, { maxLength: 60 });
+    const transformedFilePath = `${PROJECT_RELATIVE_PATH}/${targetFileBasePath}/${filePathHash}_${targetFileIsIndex ? 'index_' : ''}transitive_${targetScenarioSlug}.${targetFileExtension}`;
 
     // Check if we've already processed this file as a transitive copy
     // Note: __data_file_written__ is for entity-specific scenario files with different naming,
@@ -2194,7 +2854,15 @@ ${exportKeyword}const ${functionName} = new Proxy(() => scenarios().data()?.["${
       // Recursively process this transitive file's imports
       // This handles the nested case: service.ts → brevo.ts → constants.ts
       const nestedImportPaths = extractInternalImportPaths(transformedContent);
+      debugLog(
+        `[NESTED] Processing ${nestedImportPaths.length} nested imports for ${targetFile.path}`,
+      );
+      let nestedIndex = 0;
       for (const nestedImportPath of nestedImportPaths) {
+        nestedIndex++;
+        debugLog(
+          `[NESTED LOOP] import ${nestedIndex}/${nestedImportPaths.length}: ${nestedImportPath}`,
+        );
         const nestedResolvedPath = resolveImportPath(
           nestedImportPath,
           targetFile.path,
@@ -2214,8 +2882,12 @@ ${exportKeyword}const ${functionName} = new Proxy(() => scenarios().data()?.["${
         );
         const nestedExtension = nestedFile.name.split('.').pop();
         const nestedIsIndex = isIndexPath(nestedFile.path);
-        const nestedPathHash = safeFileName(nestedFile.path);
-        const nestedTransformedPath = `${PROJECT_RELATIVE_PATH}/${nestedBasePath}/${nestedPathHash}_${nestedIsIndex ? 'index_' : ''}transitive_${safeFileName(scenario.name)}.${nestedExtension}`;
+        // Limit path hash length to prevent ENAMETOOLONG errors
+        const nestedPathHash = safeFileName(nestedFile.path, { maxLength: 80 });
+        const nestedScenarioSlug = safeFileName(scenario.name, {
+          maxLength: 60,
+        });
+        const nestedTransformedPath = `${PROJECT_RELATIVE_PATH}/${nestedBasePath}/${nestedPathHash}_${nestedIsIndex ? 'index_' : ''}transitive_${nestedScenarioSlug}.${nestedExtension}`;
 
         // Check if already processed as a transitive file (we can rewrite to point to it)
         // Note: __data_file_written__ is for entity-specific scenario files with different naming,
@@ -2235,10 +2907,20 @@ ${exportKeyword}const ${functionName} = new Proxy(() => scenarios().data()?.["${
           // This handles chains of any depth: A -> B -> C -> D
           let nestedContent = stripServerOnlyImport(nestedFile.content);
           nestedContent = applyServerOnlyMocks(nestedContent);
-          nestedContent = await processTransitiveImportsRecursively(
-            nestedContent,
-            nestedFile.path,
-            nestedTransformedPath,
+          debugLog(
+            `processTransitiveImportsRecursively (nested) for ${nestedFile.path}`,
+          );
+          nestedContent = await withTimeout(
+            `processTransitiveImportsRecursively (nested) for ${path.basename(nestedFile.path)}`,
+            processTransitiveImportsRecursively(
+              nestedContent,
+              nestedFile.path,
+              nestedTransformedPath,
+            ),
+            30000, // 30 second timeout per nested transitive import
+          );
+          debugLog(
+            `Completed processTransitiveImportsRecursively (nested) for ${nestedFile.path}`,
           );
 
           await writeFile(nestedTransformedPath, nestedContent);
@@ -2326,6 +3008,10 @@ ${exportKeyword}const ${functionName} = new Proxy(() => scenarios().data()?.["${
     fileContent = fileContent.replace(importRegex, `$1${safeRelativePath}$2`);
   }
 
+  console.log(
+    `[WriteScenario] POST-LOOP ${entity.name}: remaining imports loop took ${Date.now() - postLoopStartTime}ms`,
+  );
+
   const scenarioComponentComment = `// This file is auto-generated by CodeYam. Do not edit this file manually.
 // This file contains content for a scenario component:
 // Analyses being written: ${JSON.stringify(fileAnalyses?.map((a) => ({ id: a.id, entityName: a.entityName })))}
@@ -2337,6 +3023,83 @@ ${exportKeyword}const ${functionName} = new Proxy(() => scenarios().data()?.["${
 // Scenario: ${scenario.id} - ${scenario.name}
 `;
 
+  // Final pass: Rename any namespace imports (import * as X from '...') that have
+  // corresponding mock code using ...X__cyOriginal spread pattern.
+  // This handles cases where:
+  // 1. The import path was rewritten by transitive import handling
+  // 2. The import wasn't caught by the earlier renaming logic
+  // We scan for all __cyOriginal references in the mock code and ensure the imports are renamed.
+  const cyOriginalReferences = fileContent.match(/\.\.\.(\w+)__cyOriginal/g);
+  if (cyOriginalReferences) {
+    const uniqueNames = [
+      ...new Set(
+        cyOriginalReferences.map((ref) =>
+          ref.replace('...', '').replace('__cyOriginal', ''),
+        ),
+      ),
+    ];
+    for (const name of uniqueNames) {
+      // Match namespace imports for this name that haven't been renamed yet
+      const namespaceImportRegex = new RegExp(
+        `(import\\s+\\*\\s+as\\s+)${escapeRegExp(name)}(\\s+from\\s+['"][^'"]*['"])`,
+        'g',
+      );
+      fileContent = fileContent.replace(
+        namespaceImportRegex,
+        `$1${name}__cyOriginal$2`,
+      );
+    }
+  }
+
+  // For route components (page.tsx, layout.tsx), the component IS the Next.js page.
+  // There's no wrapper page to inject argumentsData as props (unlike non-route components
+  // which get a scenarioComponent wrapper). We need to wrap the default export so that
+  // the scenario's argumentsData is passed as props to the component.
+  if (
+    isFrameworkRoute(file, entity, framework, file === rootFile) &&
+    rootAnalysis.metadata?.scenariosDataStructure?.arguments?.length > 0
+  ) {
+    const positionalArguments =
+      rootAnalysis.metadata.scenariosDataStructure.arguments;
+    const hasNamedArgs =
+      positionalArguments.length === 1 &&
+      typeof positionalArguments[0] === 'object';
+
+    if (hasNamedArgs) {
+      // Match: export default function Name(
+      // Also: export default async function Name(
+      const defaultExportMatch = fileContent.match(
+        /export\s+default\s+(async\s+)?function\s+(\w+)\s*\(/,
+      );
+
+      if (defaultExportMatch) {
+        const funcName = defaultExportMatch[2];
+
+        // Remove "export default" from the original function declaration
+        fileContent = fileContent.replace(
+          /export\s+default\s+(async\s+)?function\s+(\w+)\s*\(/,
+          '$1function $2(',
+        );
+
+        // Ensure scenarios import is present
+        const mockDataPath = `${relativeMocksDir}/MockData_${safeFileName(scenario.name)}`;
+        if (fileContent.indexOf('import { scenarios } from') === -1) {
+          fileContent = `import { scenarios } from "${mockDataPath}";\n\n${fileContent}`;
+        }
+
+        // Add wrapper default export that injects argumentsData as props.
+        // Filter null values: the LLM uses null to mean "don't pass this prop"
+        // but spreading { prop: null } explicitly passes null, which differs from
+        // undefined (absent) and crashes components that check `prop !== undefined`.
+        fileContent += `\n\nexport default function _CYRouteWrapper(props: any) {
+  const _cyArgs = scenarios().data()?.['arguments']?.[0] ?? {};
+  const _cyCleanArgs = Object.fromEntries(Object.entries(_cyArgs).filter(([_, v]) => v !== null));
+  return <${funcName} {...props} {..._cyCleanArgs} />;
+}\n`;
+      }
+    }
+  }
+
   // Use the directive that was extracted at the beginning of processing
   // This ensures it stays at the very top even after imports are prepended
   // NOTE: We only preserve "use client" directives, NOT "use server" directives.
@@ -2350,8 +3113,17 @@ ${exportKeyword}const ${functionName} = new Proxy(() => scenarios().data()?.["${
     finalContent = `${scenarioComponentComment}\n\n${fileContent}`;
   }
 
+  debugLog('About to write final scenario file', {
+    scenarioComponentPath,
+    contentLength: finalContent.length,
+  });
   await writeFile(scenarioComponentPath, finalContent);
+  debugLog('Successfully wrote scenario file');
   scenarioComponentPaths.push(scenarioComponentPath);
 
+  console.log(
+    `[WriteScenario] POST-LOOP ${entity.name}: COMPLETE total=${Date.now() - postLoopStartTime}ms`,
+  );
+
   return { scenarioComponentPaths, writtenScenarioComponents };
 }