@codeyam/codeyam-cli 0.1.0-staging.e38f7bd → 0.1.0-staging.fef152f

package/analyzer-template/playwright/takeScreenshot.ts

@@ -194,12 +194,6 @@ export default async function takeScreenshot({
         const freshScenario = freshScenarios.find(
           (s) => s.name === scenario.name,
         );
-        freshScenario.metadata.screenshotPaths ||= [];
-        if (
-          !freshScenario.metadata.screenshotPaths.includes(screenshotFileName)
-        ) {
-          freshScenario.metadata.screenshotPaths.unshift(screenshotFileName);
-        }
 
         const statusScenario = freshStatus.scenarios.find(
           (s) => s.name === scenario.name,
@@ -208,14 +202,26 @@ export default async function takeScreenshot({
           statusScenario.screenshotFinishedAt = new Date().toISOString();
         }
 
-        if (!screenshotTaken) {
+        // Only add to screenshotPaths if the screenshot was actually taken
+        if (screenshotTaken) {
+          freshScenario.metadata.screenshotPaths ||= [];
+          if (
+            !freshScenario.metadata.screenshotPaths.includes(screenshotFileName)
+          ) {
+            freshScenario.metadata.screenshotPaths.unshift(screenshotFileName);
+          }
+        } else {
           freshScenario.metadata.noScreenshotSaved = true;
-          statusScenario.error = 'Screenshot not taken properly';
+          if (!statusScenario.error) {
+            statusScenario.error = 'Screenshot not taken properly';
+          }
         }
 
         if (isUniform) {
           freshScenario.metadata.isUniformScreenshot = true;
-          statusScenario.error = 'Screenshot is uniform';
+          if (!statusScenario.error) {
+            statusScenario.error = 'Screenshot is uniform';
+          }
         }
       },
     );

package/analyzer-template/playwright/waitForServer.ts

@@ -17,10 +17,18 @@ export interface WaitForServerResult {
   shutdown: boolean;
 }
 
+export interface WaitForServerOptions {
+  // In local CLI mode, treat connection failures as shutdown signal (server should be running)
+  // In cloud mode, connection failures are normal between work items
+  isLocalMode?: boolean;
+}
+
 export default async function waitForServer(
   url: string,
   shouldStop: () => boolean,
+  options?: WaitForServerOptions,
 ): Promise<WaitForServerResult> {
+  const isLocalMode = options?.isLocalMode ?? false;
   let retryDelay = INITIAL_RETRY_DELAY;
   const startTime = Date.now();
   let consecutiveConnectionFailures = 0;
@@ -49,14 +57,21 @@ export default async function waitForServer(
         return { shutdown: true };
       }
 
-      // Check if connection failed (server exited)
+      // Check if connection failed (server exited or not started yet)
       if (result.connectionFailed) {
-        consecutiveConnectionFailures++;
-        // If we've had many consecutive connection failures, the controller has likely exited
-        if (consecutiveConnectionFailures >= MAX_CONNECTION_FAILURES_FOR_SHUTDOWN) {
-          awsLog('CodeYam: Controller connection lost, treating as shutdown');
-          return { shutdown: true };
+        // Only treat connection failures as shutdown in local mode
+        // In cloud mode, connection failures are expected between work items
+        if (isLocalMode) {
+          consecutiveConnectionFailures++;
+          if (
+            consecutiveConnectionFailures >=
+            MAX_CONNECTION_FAILURES_FOR_SHUTDOWN
+          ) {
+            awsLog('CodeYam: Controller connection lost, treating as shutdown');
+            return { shutdown: true };
+          }
         }
+        // In cloud mode, just continue waiting (don't count failures)
       } else {
         consecutiveConnectionFailures = 0;
       }

package/analyzer-template/project/TESTING.md

@@ -0,0 +1,83 @@
+# Testing writeScenarioComponents
+
+This document describes how to test changes to `writeScenarioComponents.ts`.
+
+## 1. Run the specific test
+
+```bash
+npx jest background/src/lib/virtualized/project/__tests__/writeScenarioComponents.test.ts -t "test name here" --no-coverage
+```
+
+## 2. Run all tests in the file
+
+```bash
+npx jest background/src/lib/virtualized/project/__tests__/writeScenarioComponents.test.ts --no-coverage -w 2
+```
+
+## 3. Rebuild and reinstall the CLI
+
+The globally installed CLI must be reinstalled to pick up changes:
+
+```bash
+# Remove the globally installed CLI and rebuild
+rm -rf /Users/jaredcosulich/.nvm/versions/node/v20.16.0/lib/node_modules/@codeyam/codeyam-cli && pnpm cli
+```
+
+## 4. Restart the server in the client project
+
+After rebuilding the CLI, restart the codeyam server in the client project:
+
+```bash
+cd /Users/jaredcosulich/workspace/codeyam/formbricks && codeyam stop & codeyam
+```
+
+## 5. Force analyzer update and run debug
+
+The analyzer is cached in `/tmp/codeyam/local-dev/{project-slug}/codeyam/analyzer`.
+To force it to use the new code:
+
+```bash
+# Remove cached analyzer
+rm -rf /tmp/codeyam/local-dev/formbricks-formbricks/codeyam/analyzer
+
+# Run debug (from the project directory)
+cd /Users/jaredcosulich/workspace/codeyam/formbricks && codeyam debug <analysis-id>
+```
+
+## 6. Verify the fix
+
+```bash
+# Check version in logs (should match version in writeScenarioComponents.ts)
+grep "CodeYam \[v" /tmp/codeyam/local-dev/formbricks-formbricks/codeyam/log.txt | tail -3
+
+# Check generated files
+head -30 /tmp/codeyam/local-dev/formbricks-formbricks/project/path/to/generated/file.tsx
+
+# List data scenario files
+ls -la /tmp/codeyam/local-dev/formbricks-formbricks/project/apps/web/lib/*_data_Default_Scenario*
+```
+
+## 7. Start dev server and test in browser
+
+```bash
+cd /tmp/codeyam/local-dev/formbricks-formbricks/project/apps/web && pnpm next dev --turbopack -p 3112
+```
+
+Test the actual simulation page (not just codeyam-sample):
+
+```bash
+# Format: /static/{project-slug}/{analysis-id}/{entity-name}/{scenario-name}/default
+curl http://localhost:3112/static/formbricks-formbricks/7925cfe4-7789-470d-bddc-2a85e48ef356/SurveysPage/Default_Scenario/default
+```
+
+Visit in browser: http://localhost:3112/static/formbricks-formbricks/7925cfe4-7789-470d-bddc-2a85e48ef356/SurveysPage/Default_Scenario/default
+
+## Version Tracking
+
+The version is defined in `writeScenarioComponents.ts`:
+
+```typescript
+const WRITE_SCENARIO_COMPONENTS_VERSION = '2.5.13-strip-use-server-directive';
+```
+
+Increment this when making changes to help track which version is running.

package/analyzer-template/project/analyzeBaselineCommit.ts

@@ -21,6 +21,8 @@ export interface AnalyzeBaselineCommitArgs {
   desiredAnalyses?: Analysis[];
   force?: boolean;
   fileStore?: LazyFileStore;
+  /** Called after data structures are prepared, signaling orchestration can begin */
+  onAnalysisProducing?: () => void;
 }
 
 export interface AnalyzeBaselineCommitResult {
@@ -40,6 +42,7 @@ export default async function analyzeBaselineCommit({
   desiredAnalyses = [],
   force = false,
   fileStore,
+  onAnalysisProducing,
 }: AnalyzeBaselineCommitArgs): Promise<AnalyzeBaselineCommitResult> {
   awsLog('CodeYam: Analyze - branchCommit (baseline) path', {
     analysisIds,
@@ -64,6 +67,7 @@ export default async function analyzeBaselineCommit({
     context,
     steps,
     fileStore,
+    onAnalysisProducing,
   });
 
   let analysisBranches = Object.values(context.getAnalysisMap())
@@ -99,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/analyzeBranchCommit.ts

@@ -24,6 +24,8 @@ interface AnalyzeBranchCommitArgs {
   context: AnalysisContext;
   steps: string[];
   fileStore?: LazyFileStore;
+  /** Called after data structures are prepared, signaling orchestration can begin */
+  onAnalysisProducing?: () => void;
 }
 
 export default async function analyzeBranchCommit({
@@ -34,6 +36,7 @@ export default async function analyzeBranchCommit({
   context,
   steps,
   fileStore,
+  onAnalysisProducing,
 }: AnalyzeBranchCommitArgs) {
   console.log('CodeYam: Starting Branch Commit Analysis', branchCommit.sha, {
     analysisIds,
@@ -231,6 +234,7 @@ export default async function analyzeBranchCommit({
           steps,
           force: !!process.env.FORCE,
           forceAll: !!process.env.FORCE_ALL,
+          onAnalysisProducing,
         },
       });
     } catch (error) {

package/analyzer-template/project/analyzeFileEntities.ts

@@ -27,6 +27,8 @@ interface AnalyzeFileEntitiesArgs {
   steps: string[];
   context: AnalysisContext;
   fileStore?: LazyFileStore;
+  /** Called after data structures are prepared, signaling orchestration can begin */
+  onAnalysisProducing?: () => void;
 }
 
 export default async function analyzeFileEntities({
@@ -40,6 +42,7 @@ export default async function analyzeFileEntities({
   steps,
   context,
   fileStore,
+  onAnalysisProducing,
 }: AnalyzeFileEntitiesArgs) {
   // Enable baseline mode for E2E tests to skip expensive importedBy tracking
   // This eliminates thousands of DB operations that aren't needed for simulation/capture
@@ -263,6 +266,7 @@ export default async function analyzeFileEntities({
         fresh: !!process.env.FRESH,
         force: !!process.env.FORCE,
         forceAll: !!process.env.FORCE_ALL,
+        onAnalysisProducing,
       },
     });
   }

package/analyzer-template/project/analyzeRegularCommit.ts

@@ -36,6 +36,8 @@ export interface AnalyzeRegularCommitArgs {
   backgroundJob?: BackgroundJob;
   desiredAnalyses?: Analysis[];
   fileStore?: LazyFileStore;
+  /** Called after data structures are prepared, signaling orchestration can begin */
+  onAnalysisProducing?: () => void;
 }
 
 export interface AnalyzeRegularCommitResult {
@@ -97,6 +99,7 @@ export default async function analyzeRegularCommit({
   backgroundJob,
   desiredAnalyses = [],
   fileStore,
+  onAnalysisProducing,
 }: AnalyzeRegularCommitArgs): Promise<AnalyzeRegularCommitResult> {
   awsLog('CodeYam: Analyze - commit path');
 
@@ -174,6 +177,7 @@ export default async function analyzeRegularCommit({
     steps,
     context,
     fileStore,
+    onAnalysisProducing,
   });
   let entities = fileEntities;
 
@@ -249,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,