@codeyam/codeyam-cli 0.1.0-staging.15d0f46 → 0.1.0-staging.1669d45

package/analyzer-template/packages/aws/src/lib/s3/uploadFileToS3.ts

@@ -24,11 +24,18 @@ export default async function uploadFileToS3({
   });
 
   try {
+    let lastLoggedMB = 0;
     upload.on('httpUploadProgress', (progress) => {
-      console.log(progress);
+      const loadedMB = Math.floor((progress.loaded ?? 0) / (1024 * 1024));
+      // Log every 10MB to avoid spam
+      if (loadedMB >= lastLoggedMB + 10) {
+        lastLoggedMB = loadedMB;
+        console.log(`Uploading ${key}... ${loadedMB}MB`);
+      }
     });
 
     await upload.done();
+    console.log(`Uploaded ${key}`);
   } catch (error) {
     console.log('Error. File not uploaded.', error);
     throw error;

package/analyzer-template/packages/database/src/lib/kysely/db.ts

@@ -33,8 +33,8 @@ import {
 } from './tables/commitBranchesTable';
 import { CommitsTable, createCommitsTable } from './tables/commitsTable';
 import {
-  createDebugReportsTable,
-  DebugReportsTable,
+  createDebugBundlesTable,
+  DebugBundlesTable,
 } from './tables/debugReportsTable';
 import { createEntitiesTable, EntitiesTable } from './tables/entitiesTable';
 import {
@@ -101,7 +101,7 @@ const databaseSchema = {
   branches: schemaField<BranchesTable>(),
   commit_branches: schemaField<CommitBranchesTable>(),
   commits: schemaField<CommitsTable>(),
-  debug_reports: schemaField<DebugReportsTable>(),
+  debug_reports: schemaField<DebugBundlesTable>(),
   entities: schemaField<EntitiesTable>(),
   entity_branches: schemaField<EntityBranchesTable>(),
   entity_statements: schemaField<EntityStatementsTable>(),
@@ -377,7 +377,7 @@ export async function createSqliteSchema(db: Kysely<Database>): Promise<void> {
   await createBranchesTable(db);
   await createCommitBranchesTable(db);
   await createCommitsTable(db);
-  await createDebugReportsTable(db);
+  await createDebugBundlesTable(db);
   await createEntitiesTable(db);
   await createEntityBranchesTable(db);
   await createEntityStatementsTable(db);

package/analyzer-template/packages/database/src/lib/kysely/tableRelations.ts

@@ -6,7 +6,7 @@ import { BackgroundJobsTable } from './tables/backgroundJobsTable';
 import { BranchesTable } from './tables/branchesTable';
 import { CommitsTable } from './tables/commitsTable';
 import { CommitBranchesTable } from './tables/commitBranchesTable';
-import { DebugReportsTable } from './tables/debugReportsTable';
+import { DebugBundlesTable } from './tables/debugReportsTable';
 import { EntitiesTable } from './tables/entitiesTable';
 import { EntityBranchesTable } from './tables/entityBranchesTable';
 import { FilesTable } from './tables/filesTable';
@@ -105,4 +105,4 @@ export type DbUserScenario = Selectable<UserScenariosTable> & {
 
 export type DbStatement = Selectable<StatementsTable>;
 
-export type DbDebugReport = Selectable<DebugReportsTable>;
+export type DbDebugBundle = Selectable<DebugBundlesTable>;

package/analyzer-template/packages/database/src/lib/kysely/tables/debugReportsTable.ts

@@ -3,7 +3,12 @@ import type { Generated, JSONColumnType } from 'kysely';
 
 import { schemaField, defaultNow } from '../schemaHelpers';
 
-interface DebugReportMetadata {
+/**
+ * Metadata for a debug bundle upload.
+ * Note: "bundle" refers to the tarball upload (base + delta).
+ * The markdown "debug report" from /codeyam:diagnose is stored in feedback.debugReport.
+ */
+interface DebugBundleMetadata {
   timestamp: string;
   git: {
     sha: string;
@@ -20,28 +25,48 @@ interface DebugReportMetadata {
     platform: string;
     arch: string;
   };
+  feedback?: {
+    source: string;
+    issueType?: string;
+    description?: string;
+    email?: string;
+    entitySha?: string;
+    scenarioId?: string;
+    analysisId?: string;
+    currentUrl?: string;
+    recentActivity?: string[];
+    debugReport?: string;
+    entityName?: string;
+    entityType?: string;
+    scenarioName?: string;
+    errorMessage?: string;
+  };
 }
 
-const debugReportsSchema = {
+// Table name remains 'debug_reports' in the database for backwards compatibility
+const debugBundlesSchema = {
   id: schemaField<Generated<string>>(),
   project_slug: schemaField<string>(),
   s3_key: schemaField<string>(),
   file_size_bytes: schemaField<number | null>(),
-  metadata: schemaField<JSONColumnType<DebugReportMetadata> | null>(),
+  metadata: schemaField<JSONColumnType<DebugBundleMetadata> | null>(),
   status: schemaField<string | null>(),
   created_at: schemaField<Generated<string>>(),
   uploaded_at: schemaField<string | null>(),
+  base_sha: schemaField<string | null>(),
+  delta_size_bytes: schemaField<number | null>(),
 } as const;
 
-export type DebugReportsTable = {
-  [K in keyof typeof debugReportsSchema]: (typeof debugReportsSchema)[K];
+export type DebugBundlesTable = {
+  [K in keyof typeof debugBundlesSchema]: (typeof debugBundlesSchema)[K];
 };
 
-export const DebugReportsTableColumns = Object.keys(
-  debugReportsSchema,
-) as (keyof DebugReportsTable)[];
+export const DebugBundlesTableColumns = Object.keys(
+  debugBundlesSchema,
+) as (keyof DebugBundlesTable)[];
 
-export async function createDebugReportsTable(db: Kysely<any>): Promise<void> {
+export async function createDebugBundlesTable(db: Kysely<any>): Promise<void> {
+  // Table name remains 'debug_reports' for backwards compatibility
   await db.schema
     .createTable('debug_reports')
     .addColumn('id', 'uuid', (col: ColumnDefinitionBuilder) => col.primaryKey())
@@ -56,6 +81,8 @@ export async function createDebugReportsTable(db: Kysely<any>): Promise<void> {
     .addColumn('status', 'varchar')
     .addColumn('created_at', 'datetime', defaultNow(true))
     .addColumn('uploaded_at', 'datetime')
+    .addColumn('base_sha', 'varchar')
+    .addColumn('delta_size_bytes', 'bigint')
     .ifNotExists()
     .execute();
 }

package/analyzer-template/packages/database/src/lib/loadReadyToBeCapturedAnalyses.ts

@@ -40,15 +40,19 @@ export default async function loadReadyToBeCapturedAnalyses(
           .whereRef('scenarios.analysis_id', '=', 'analyses.id'),
       ).as('scenarios'),
     ])
+    // Cross-database compatible: use -> (not ->>) for boolean JSON fields
+    // PostgreSQL: jsonb `true` auto-casts to string 'true' for comparison
+    // SQLite: -> returns text 'true' which equals string 'true'
+    // (Note: ->> returns integer 1 in SQLite for booleans, breaking string comparisons)
     .where(
-      // Use ->> to extract as text for proper comparison (-> returns JSONB which doesn't compare to string)
-      sql<string>` ${sql.ref('analyses.status')} ->> 'readyToBeCaptured'`,
+      sql<string>`${sql.ref('analyses.status')} -> 'readyToBeCaptured'`,
       '=',
       'true',
     )
     // Exclude entities that are not exported - they cannot be captured because they can't be imported
+    // Use -> operator for cross-database boolean comparison
     .where(
-      sql<boolean>`(${sql.ref('entities.metadata')} ->> 'notExported') IS NULL OR (${sql.ref('entities.metadata')} ->> 'notExported') != 'true'`,
+      sql<boolean>`(${sql.ref('entities.metadata')} -> 'notExported') IS NULL OR (${sql.ref('entities.metadata')} -> 'notExported') != 'true'`,
     );
 
   if (projectId) {

package/analyzer-template/packages/generate/index.ts

@@ -1,6 +1,8 @@
 export { default as getComponentImportStatements } from './src/lib/getComponentImportStatements';
 export { default as componentScenarioPageRemix } from './src/lib/componentScenarioPage/componentScenarioPageRemix';
 export { default as componentScenarioPageNext } from './src/lib/componentScenarioPage/componentScenarioPageNext';
+export { default as generateScenarioServerComponent } from './src/lib/componentScenarioPage/generateScenarioServerComponent';
+export { default as generateScenarioClientWrapper } from './src/lib/componentScenarioPage/generateScenarioClientWrapper';
 export { default as getComponentScenarioPath } from './src/lib/getComponentScenarioPath';
 export { default as libDemoComponent } from './src/lib/libDemoComponent';
 export { default as directExecutionScript } from './src/lib/directExecutionScript';
@@ -9,4 +11,5 @@ export { default as safeFolder } from './src/lib/safeFolder';
 export { default as deepMerge } from './src/lib/deepMerge';
 export { default as simpleRootRemix } from './src/lib/simpleRootRemix';
 export { default as mergeRootRemix } from './src/lib/mergeRootRemix';
+export { default as scenarioComponentForServer } from './src/lib/scenarioComponentForServer';
 export { PLACEHOLDER_IMAGE_SRC } from './src/lib/constants';

package/analyzer-template/packages/generate/src/lib/componentScenarioPage/componentScenarioPageNext.ts

@@ -6,6 +6,7 @@ import escapeQuotes from '../escapeQuotes';
 import getIFrameMessageListenerCode from './getIFrameMessageListenerCode';
 import getImageReplacementCode from './getImageReplacementCode';
 import getNextJsErrorClosingCode from './getNextJsErrorClosingCode';
+import generateScenarioServerComponent from './generateScenarioServerComponent';
 
 const VERSION = '0.5.1';
 
@@ -28,6 +29,21 @@ export default function componentScenarioPageNext({
 }) {
   const fileName = file.name.split('.')[0];
 
+  // For async components (Server Components), generate a Server Component page
+  // that uses a separate client wrapper for interactive features
+  if (entity.metadata?.isAsync) {
+    return generateScenarioServerComponent({
+      file,
+      entity,
+      analysis,
+      currentPath,
+      appPath,
+      scenario,
+      relativeMocksDir,
+    });
+  }
+
+  // For non-async components, use the existing client component approach
   return `/* eslint-disable */
   "use client";
   import {
@@ -58,7 +74,7 @@ ${getComponentImportStatement({
 ${getImageReplacementCode()}
 
 function Scenario({ name, width, height, children }: { name: string, width: string, height: string, children: ReactNode }) {
-  
+
   useEffect(() => {
     if (typeof window === 'undefined') return;
 

package/analyzer-template/packages/generate/src/lib/componentScenarioPage/generateScenarioClientWrapper.ts

@@ -0,0 +1,193 @@
+import type { Scenario } from '~codeyam/types';
+import { safeFileName } from '~codeyam/utils';
+import getImageReplacementCode from './getImageReplacementCode';
+import getNextJsErrorClosingCode from './getNextJsErrorClosingCode';
+
+/**
+ * Generates the ScenarioClientWrapper component code.
+ * This is a Client Component that handles all the interactive features
+ * (iframe messaging, console interception, error closing, etc.)
+ * while allowing the actual page to be a Server Component.
+ */
+export default function generateScenarioClientWrapper(
+  scenario: Scenario,
+): string {
+  const safeScenarioName = safeFileName(scenario.name);
+
+  return `"use client";
+/* eslint-disable */
+// ScenarioClientWrapper - Client Component for interactive features
+// This wraps Server Components to add client-side interactivity
+
+import {
+  useCallback,
+  useEffect,
+  useState,
+  type ReactNode,
+} from 'react';
+import { scenarios } from "./MockData_${safeScenarioName}";
+
+// Inject image interception code at module level
+${getImageReplacementCode()}
+
+interface ScenarioClientWrapperProps {
+  scenarioName: string;
+  fileName: string;
+  version: string;
+  children: ReactNode;
+}
+
+export function ScenarioClientWrapper({
+  scenarioName,
+  fileName,
+  version,
+  children,
+}: ScenarioClientWrapperProps) {
+  const [internalVersion, setInternalVersion] = useState(1);
+  const [searchParams] = useState(() =>
+    typeof window !== 'undefined'
+      ? new URLSearchParams(window.location.search)
+      : new URLSearchParams()
+  );
+  const widthOverride = searchParams.get('width');
+  const heightOverride = searchParams.get('height') || 'auto';
+
+  // Set page metadata
+  useEffect(() => {
+    document.title = \`\${fileName}: \${scenarioName} CodeYam Demo v\${version}\`;
+    let metaDesc = document.querySelector('meta[name="description"]');
+    if (!metaDesc) {
+      metaDesc = document.createElement('meta');
+      metaDesc.setAttribute('name', 'description');
+      document.head.appendChild(metaDesc);
+    }
+    metaDesc.setAttribute('content', \`This is a demo of the \${fileName} component\`);
+  }, [fileName, scenarioName, version]);
+
+  // Message posting helper
+  const respond = useCallback((message: any) => {
+    try {
+      window.parent.postMessage({
+        type: 'codeyam-update',
+        name: scenarioName,
+        message,
+      }, '*');
+    } catch (e) {
+      console.warn('Error posting message to parent', message, e);
+    }
+  }, [scenarioName]);
+
+  // Handle data override messages from parent
+  useEffect(() => {
+    const eventListener = (event: MessageEvent) => {
+      if (event.data.type === 'codeyam-override-data') {
+        const parsedData = JSON.parse(event.data.data);
+        console.log("Override data received");
+        respond("Set override data to " + JSON.stringify(parsedData, null, 2));
+        scenarios().updateData(scenarioName, parsedData);
+        setInternalVersion(prev => prev + 1);
+      }
+    };
+    window.addEventListener('message', eventListener);
+    return () => window.removeEventListener('message', eventListener);
+  }, [respond, scenarioName]);
+
+  // Console interception
+  useEffect(() => {
+    const oldConsoleLog = console.log;
+    console.log = function(...args: any[]) {
+      oldConsoleLog(...args);
+      try {
+        window.parent.postMessage({
+          type: 'codeyam-log',
+          name: scenarioName,
+          data: {
+            log: {
+              name: "console.log",
+              args
+            }
+          }
+        }, '*');
+      } catch (e) {
+        oldConsoleLog('Error posting message to parent', e);
+      }
+    };
+
+    const oldConsoleError = console.error;
+    console.error = function(...args: any[]) {
+      oldConsoleError(...args);
+      window.parent.postMessage({
+        type: 'codeyam-log',
+        name: scenarioName,
+        data: {
+          log: {
+            name: "console.error",
+            args
+          }
+        }
+      }, '*');
+    };
+
+    return () => {
+      console.log = oldConsoleLog;
+      console.error = oldConsoleError;
+    };
+  }, [scenarioName]);
+
+  // Next.js error closing
+  ${getNextJsErrorClosingCode()}
+
+  // Height calculation and resize messaging
+  useEffect(() => {
+    if (typeof window === 'undefined') return;
+
+    const calculateHeight = () => {
+      const bodyHeight = document.body.offsetHeight;
+      const htmlHeight = document.documentElement.offsetHeight;
+      const scrollHeight = Math.max(
+        document.body.scrollHeight,
+        document.documentElement.scrollHeight,
+        document.body.offsetHeight,
+        document.documentElement.offsetHeight,
+        document.body.clientHeight,
+        document.documentElement.clientHeight
+      );
+      return Math.max(100, bodyHeight, htmlHeight, scrollHeight);
+    };
+
+    const calculatedHeight = calculateHeight();
+    parent.postMessage({ type: 'codeyam-resize', name: scenarioName, height: calculatedHeight }, '*');
+
+    const eventListener = (event: MessageEvent) => {
+      if (event.data.name === scenarioName) {
+        if (event.data.type === 'codeyam-respond') {
+          const calculatedHeight = calculateHeight();
+          parent.postMessage({ type: 'codeyam-resize', name: scenarioName, height: calculatedHeight }, '*');
+        }
+      }
+    };
+
+    window.addEventListener('message', eventListener);
+    return () => window.removeEventListener('message', eventListener);
+  }, [scenarioName]);
+
+  const width = widthOverride || 'auto';
+
+  return (
+    <div className='flex flex-col justify-center items-center h-screen' data-version={internalVersion}>
+      <div className='w-full flex items-center justify-center'>
+        <div id='component' style={{
+          minWidth: width !== 'auto' ? \`min(\${width}, 100vw)\` : undefined,
+          height: heightOverride !== 'auto' ? heightOverride : undefined,
+          minHeight: heightOverride !== 'auto' ? heightOverride : undefined,
+          display: 'block',
+          padding: '6px'
+        }}>
+          {children}
+        </div>
+      </div>
+    </div>
+  );
+}
+`;
+}

package/analyzer-template/packages/generate/src/lib/componentScenarioPage/generateScenarioServerComponent.ts

@@ -0,0 +1,73 @@
+import { Entity, Analysis, type File, type Scenario } from '~codeyam/types';
+import { safeFileName } from '~codeyam/utils';
+import getComponentImportStatement from '../getComponentImportStatement';
+import scenarioComponentForServer from '../scenarioComponentForServer';
+
+const VERSION = '0.5.1';
+
+/**
+ * Generates a Server Component page for async components (Server Components in Next.js).
+ *
+ * This is needed because:
+ * 1. Async components use await, which only works in Server Components
+ * 2. Client Components ("use client") don't support async/await in the component body
+ * 3. We use Next.js composition pattern: Server Component page renders the async component,
+ *    then wraps it in a Client Component (ScenarioClientWrapper) for interactive features
+ */
+export default function generateScenarioServerComponent({
+  file,
+  entity,
+  analysis,
+  currentPath,
+  appPath,
+  scenario,
+  relativeMocksDir,
+}: {
+  file: File;
+  entity: Entity;
+  analysis: Analysis;
+  currentPath: string;
+  appPath: string;
+  scenario: Scenario;
+  relativeMocksDir: string;
+}) {
+  const fileName = file.name.split('.')[0];
+  const safeScenarioName = safeFileName(scenario.name);
+
+  return `/* eslint-disable */
+// Server Component page for async component: ${entity.name}
+// This page does NOT have "use client" - it runs on the server
+import { ScenarioClientWrapper } from "${relativeMocksDir}/ScenarioClientWrapper";
+${analysis.scenarios?.length > 0 ? `import { scenarios } from "${relativeMocksDir}/MockData_${safeScenarioName}";` : ''}
+${getComponentImportStatement({
+  file,
+  entity,
+  analysis,
+  currentPath,
+  appPath,
+  scenario,
+  primary: true,
+  namedExport:
+    entity.name !== 'default' &&
+    (entity.metadata?.notExported || entity.metadata?.namedExport) &&
+    entity.entityType !== 'library',
+})}
+
+function getScenarioProps({ argumentIndex, propName }: { argumentIndex: number, propName?: string }) {
+  const data = scenarios().data();
+  const argument = data['arguments'][argumentIndex];
+  return propName ? argument[propName] : argument;
+}
+
+export default async function Index() {
+  return (
+    <ScenarioClientWrapper
+      scenarioName="${scenario.name}"
+      fileName="${fileName}"
+      version="${VERSION}"
+    >
+      ${scenarioComponentForServer(entity, analysis, scenario)}
+    </ScenarioClientWrapper>
+  );
+}`;
+}

package/analyzer-template/packages/generate/src/lib/componentScenarioPage/getIFrameMessageListenerCode.ts

@@ -3,6 +3,11 @@ export default function getIFrameMessageListenerCode({
 }: {
   scenarioName: string;
 }): string {
+  // Escape backslashes first, then single quotes to produce valid JS string literals
+  const escapedScenarioName = scenarioName
+    .replace(/\\/g, '\\\\')
+    .replace(/'/g, "\\'");
+
   return `const [version, setVersion] = useState(1);
 
   function _getScenarioProps({ argumentIndex, propName }: { argumentIndex: number, propName?: string }) {
@@ -14,7 +19,7 @@ export default function getIFrameMessageListenerCode({
     try {
       window.parent.postMessage({ 
         type: 'codeyam-update', 
-        name: '${scenarioName}',
+        name: '${escapedScenarioName}',
         message,
       }, '*');
     } catch (e) {
@@ -28,7 +33,7 @@ export default function getIFrameMessageListenerCode({
         const parsedData = JSON.parse(event.data.data);
         console.log("Override data received");
         respond("Set override data to " + JSON.stringify(parsedData, null, 2));
-        scenarios().updateData('${scenarioName}', parsedData);
+        scenarios().updateData('${escapedScenarioName}', parsedData);
         setVersion(prev => prev + 1);
       }
     }
@@ -44,7 +49,7 @@ export default function getIFrameMessageListenerCode({
       try {
         window.parent.postMessage({
           type: 'codeyam-log',
-          name: '${scenarioName}',
+          name: '${escapedScenarioName}',
           data: {
             log: {
               name: "console.log",
@@ -62,7 +67,7 @@ export default function getIFrameMessageListenerCode({
       oldConsoleError(...args);
       window.parent.postMessage({
         type: 'codeyam-log',
-        name: '${scenarioName}',
+        name: '${escapedScenarioName}',
         data: {
           log: {
             name: "console.log",

package/analyzer-template/packages/generate/src/lib/deepMerge.ts

@@ -14,6 +14,26 @@ export default function deepMerge(
       seen.add(changes);
     }
 
+    // Handle arrays at the top level - this is critical for nested arrays (tuples)
+    // like [["path", { data }]] which should NOT be converted to objects
+    if (Array.isArray(changes)) {
+      const defaultArray = Array.isArray(defaultData) ? defaultData : [];
+      const result: any[] = [];
+      for (let i = 0; i < changes.length; i++) {
+        const item = changes[i];
+        if (item && typeof item === 'object' && !Array.isArray(item)) {
+          // Merge object items with corresponding default array item
+          result[i] = deepMerge(defaultArray[i], item, seen);
+        } else if (Array.isArray(item)) {
+          // Recursively handle nested arrays (tuples)
+          result[i] = deepMerge(defaultArray[i], item, seen);
+        } else {
+          result[i] = item;
+        }
+      }
+      return result;
+    }
+
     const merge = { ...defaultData };
     for (const key in changes) {
       if (changes[key] === null) {
@@ -21,11 +41,16 @@ export default function deepMerge(
         // to distinguish between "not loaded" (undefined) and "explicitly null" (null)
         merge[key] = null;
       } else if (Array.isArray(changes[key])) {
+        // Get the original default array BEFORE we replace it
+        const defaultArray = Array.isArray(defaultData[key])
+          ? defaultData[key]
+          : [];
         merge[key] = [];
         for (let i = 0; i < changes[key].length; i++) {
           const item = changes[key][i];
           if (typeof item === 'object' && item !== null) {
-            merge[key][i] = deepMerge(merge?.[key]?.[i], item, seen);
+            // Merge with corresponding item from default array by index position
+            merge[key][i] = deepMerge(defaultArray[i], item, seen);
           } else {
             merge[key][i] = item;
           }