@codeyam/codeyam-cli 0.1.0-staging.8e7b1bd → 0.1.0-staging.b8a55ba

package/analyzer-template/packages/analyze/src/lib/files/scenarios/generateScenarios.ts

@@ -28,13 +28,10 @@ export default async function generateScenarios({
 }: GenerateScenariosArgs): Promise<void> {
   if (!['visual', 'library'].includes(entity.entityType)) return;
 
-  // Merge direct dataForMocks with recursively gathered data from dependencies
+  // Gather all mock data, consolidated under the root entity name
   const structure = {
     arguments: analysis.metadata.scenariosDataStructure?.arguments ?? [],
-    dataForMocks: {
-      ...(analysis.metadata.scenariosDataStructure?.dataForMocks ?? {}),
-      ...gatherDataForMocks(analysis, dependentAnalyses),
-    },
+    dataForMocks: gatherDataForMocks(analysis, dependentAnalyses, entity.name),
   };
 
   awsLog(`🔮 Generating ${error ? 'error ' : ''}scenarios for`, {

package/analyzer-template/packages/analyze/src/lib/files/scenarios/mergeInDependentDataStructure.ts

@@ -1,4 +1,3 @@
-// import { writeFile } from 'node:fs/promises';
 import {
   splitOutsideParenthesesAndArrays,
   joinParenthesesAndArrays,
@@ -481,6 +480,47 @@ export default function mergeInDependentDataStructure({
   const mergeAllEquivalentSchemaPaths = () => {
     const mergedEquivalentSchemaPaths: typeof equivalentSchemaPaths = [];
 
+    // Pre-pass: Connect entries with array/array-element relationships.
+    // This handles cases like:
+    // - Entry A has root 'surveys' (array)
+    // - Entry B has root 'surveys[]' (array element)
+    // These need to be connected so Entry B's field postfixes flow to Entry A.
+    // We do this before the main merge to ensure the connection happens regardless
+    // of processing order.
+    for (const esp of equivalentSchemaPaths) {
+      for (const root of esp.equivalentRoots) {
+        if (root.schemaRootPath.endsWith('[]')) {
+          // Find a matching parent entry with the base array path
+          const baseArrayPath = root.schemaRootPath.slice(0, -2);
+          const parentEntry = equivalentSchemaPaths.find(
+            (other) =>
+              other !== esp &&
+              other.equivalentRoots.some(
+                (otherRoot) =>
+                  otherRoot.schemaRootPath === baseArrayPath &&
+                  otherRoot.function?.name === root.function?.name &&
+                  otherRoot.function?.filePath === root.function?.filePath,
+              ),
+          );
+          if (parentEntry) {
+            // Add transformed postfixes from child (array element) to parent (array)
+            // so they can be applied with [] prefix to parent paths
+            for (const [postfixPath, postfixValue] of Object.entries(
+              esp.equivalentPostfixes,
+            )) {
+              const transformedPostfix = joinParenthesesAndArrays(
+                ['[]', postfixPath].filter(Boolean),
+              );
+              if (!(transformedPostfix in parentEntry.equivalentPostfixes)) {
+                parentEntry.equivalentPostfixes[transformedPostfix] =
+                  postfixValue;
+              }
+            }
+          }
+        }
+      }
+    }
+
     const findEquivalentSchemaPathEntry = (
       schemaSubPath: string,
       equivalentRootFunction: (typeof equivalentSchemaPaths)[0]['equivalentRoots'][0]['function'],
@@ -768,33 +808,38 @@ export default function mergeInDependentDataStructure({
       name: dependency.name,
     });
 
-    // First, normalize any returnValue. paths that were written by equivalency processing
-    // to the standard functionName().functionCallReturnValue. format.
-    // Also delete returnValue[] artifact paths that don't represent actual array structure.
+    // First, normalize any returnValue paths that were written by equivalency processing
+    // to the standard functionName().functionCallReturnValue format.
+    // This includes both returnValue. (dot) and returnValue[ (array) paths.
     const pathsToNormalize: [string, string][] = [];
-    const pathsToDelete: string[] = [];
     for (const path in depSchema.returnValueSchema) {
-      if (path === 'returnValue' || path.startsWith('returnValue.')) {
+      if (
+        path === 'returnValue' ||
+        path.startsWith('returnValue.') ||
+        path.startsWith('returnValue[')
+      ) {
         pathsToNormalize.push([path, depSchema.returnValueSchema[path]]);
-      } else if (path.match(/^returnValue\[\d*\]/)) {
-        // Delete returnValue[] and returnValue[n] paths - these are artifacts from
-        // equivalency processing and don't represent the actual structure of mocked dependencies.
-        // The correct structure comes from srcSchema (dependencySchemas).
-        pathsToDelete.push(path);
       }
     }
-    for (const path of pathsToDelete) {
-      delete depSchema.returnValueSchema[path];
-    }
     for (const [path, value] of pathsToNormalize) {
       delete depSchema.returnValueSchema[path];
-      const normalizedPath =
-        path === 'returnValue'
-          ? `${dependency.name}().functionCallReturnValue`
-          : path.replace(
-              /^returnValue\./,
-              `${dependency.name}().functionCallReturnValue.`,
-            );
+      let normalizedPath: string;
+      if (path === 'returnValue') {
+        normalizedPath = `${dependency.name}().functionCallReturnValue`;
+      } else if (path.startsWith('returnValue.')) {
+        normalizedPath = path.replace(
+          /^returnValue\./,
+          `${dependency.name}().functionCallReturnValue.`,
+        );
+      } else {
+        // path.startsWith('returnValue[')
+        // e.g., returnValue[] -> getOptions().functionCallReturnValue[]
+        // e.g., returnValue[].label -> getOptions().functionCallReturnValue[].label
+        normalizedPath = path.replace(
+          /^returnValue/,
+          `${dependency.name}().functionCallReturnValue`,
+        );
+      }
       depSchema.returnValueSchema[normalizedPath] = value;
     }
 
@@ -846,6 +891,37 @@ export default function mergeInDependentDataStructure({
           depSchema.returnValueSchema[path] = value;
         }
       }
+
+      // Copy object-typed paths for chained API access patterns (like trpc.customer.getCustomersByOrg)
+      // These intermediate paths are needed for constructMockCode to build the nested mock structure.
+      // Example: for trpc.customer.getCustomersByOrg.useQuery().functionCallReturnValue.data,
+      // we need 'trpc', 'trpc.customer', 'trpc.customer.getCustomersByOrg' all typed as 'object'.
+      // Skip paths starting with 'returnValue' - they were already handled above
+      //
+      // EXCEPTION: For function-style dependencies like getSupabase(), skip intermediate object
+      // paths like 'getSupabase().auth' that are just property access after a function call.
+      // These aren't needed because constructMockCode can infer the structure from the actual
+      // function call paths like 'getSupabase().auth.getUser()'. We only need object paths
+      // for object-style dependencies like 'supabase.auth' where the dependency itself is an object.
+      if (value === 'object' && !path.startsWith('returnValue')) {
+        // Check if this is a function-style dependency (path starts with name() or name<T>())
+        const isFunctionStyleDependency =
+          path.startsWith(`${dependency.name}()`) ||
+          path.match(new RegExp(`^${dependency.name}<[^>]+>\\(\\)`));
+
+        // For function-style dependencies, skip intermediate object paths
+        // Only keep object paths that are within functionCallReturnValue
+        if (
+          isFunctionStyleDependency &&
+          !path.includes('.functionCallReturnValue')
+        ) {
+          continue;
+        }
+
+        if (!(path in depSchema.returnValueSchema)) {
+          depSchema.returnValueSchema[path] = value;
+        }
+      }
     }
 
     cleanSchema(depSchema.returnValueSchema);
@@ -960,11 +1036,5 @@ export default function mergeInDependentDataStructure({
     }
   }
 
-  // writeFile(
-  //   'mergeInDependentDataStructure-debug-result.json',
-  //   // rootScopeName,
-  //   JSON.stringify(mergedDataStructure, null, 2),
-  // ).catch(() => {});
-
   return mergedDataStructure;
 }

package/analyzer-template/packages/aws/dist/src/lib/s3/checkS3ObjectExists.d.ts

@@ -0,0 +1,15 @@
+interface CheckS3ObjectExistsArgs {
+    bucketName: string;
+    key: string;
+}
+interface CheckS3ObjectExistsResult {
+    exists: boolean;
+    size?: number;
+}
+/**
+ * Check if an object exists in S3 using a HEAD request.
+ * Returns the object size if it exists.
+ */
+export default function checkS3ObjectExists({ bucketName, key, }: CheckS3ObjectExistsArgs): Promise<CheckS3ObjectExistsResult>;
+export {};
+//# sourceMappingURL=checkS3ObjectExists.d.ts.map

package/analyzer-template/packages/aws/dist/src/lib/s3/checkS3ObjectExists.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"checkS3ObjectExists.d.ts","sourceRoot":"","sources":["../../../../src/lib/s3/checkS3ObjectExists.ts"],"names":[],"mappings":"AAEA,UAAU,uBAAuB;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;CACb;AAED,UAAU,yBAAyB;IACjC,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;GAGG;AACH,wBAA8B,mBAAmB,CAAC,EAChD,UAAU,EACV,GAAG,GACJ,EAAE,uBAAuB,GAAG,OAAO,CAAC,yBAAyB,CAAC,CA2B9D"}

package/analyzer-template/packages/aws/dist/src/lib/s3/checkS3ObjectExists.js

@@ -0,0 +1,31 @@
+import { S3Client, HeadObjectCommand } from '@aws-sdk/client-s3';
+/**
+ * Check if an object exists in S3 using a HEAD request.
+ * Returns the object size if it exists.
+ */
+export default async function checkS3ObjectExists({ bucketName, key, }) {
+    const s3Client = new S3Client({});
+    const command = new HeadObjectCommand({
+        Bucket: bucketName,
+        Key: key,
+    });
+    try {
+        const response = await s3Client.send(command);
+        return {
+            exists: true,
+            size: response.ContentLength,
+        };
+    }
+    catch (error) {
+        // NotFound is expected when object doesn't exist
+        if (error &&
+            typeof error === 'object' &&
+            'name' in error &&
+            error.name === 'NotFound') {
+            return { exists: false };
+        }
+        // Re-throw unexpected errors
+        throw error;
+    }
+}
+//# sourceMappingURL=checkS3ObjectExists.js.map

package/analyzer-template/packages/aws/dist/src/lib/s3/checkS3ObjectExists.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"checkS3ObjectExists.js","sourceRoot":"","sources":["../../../../src/lib/s3/checkS3ObjectExists.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAYjE;;;GAGG;AACH,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,mBAAmB,CAAC,EAChD,UAAU,EACV,GAAG,GACqB;IACxB,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,EAAE,CAAC,CAAC;IAElC,MAAM,OAAO,GAAG,IAAI,iBAAiB,CAAC;QACpC,MAAM,EAAE,UAAU;QAClB,GAAG,EAAE,GAAG;KACT,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC9C,OAAO;YACL,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,QAAQ,CAAC,aAAa;SAC7B,CAAC;IACJ,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACxB,iDAAiD;QACjD,IACE,KAAK;YACL,OAAO,KAAK,KAAK,QAAQ;YACzB,MAAM,IAAI,KAAK;YACf,KAAK,CAAC,IAAI,KAAK,UAAU,EACzB,CAAC;YACD,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;QAC3B,CAAC;QACD,6BAA6B;QAC7B,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC"}

package/analyzer-template/packages/aws/package.json

@@ -12,7 +12,7 @@
   "license": "ISC",
   "dependencies": {
     "@aws-sdk/client-codebuild": "^3.948.0",
-    "@aws-sdk/client-cloudwatch-logs": "^3.940.0",
+    "@aws-sdk/client-cloudwatch-logs": "^3.962.0",
     "@aws-sdk/client-dynamodb": "^3.956.0",
     "@aws-sdk/client-ecr": "^3.948.0",
     "@aws-sdk/client-ecs": "^3.956.0",

package/analyzer-template/packages/aws/s3/index.ts

@@ -4,3 +4,4 @@ export {
   getPresignedUploadUrl,
   getPresignedDownloadUrl,
 } from '../src/lib/s3/getPresignedUrl';
+export { default as checkS3ObjectExists } from '../src/lib/s3/checkS3ObjectExists';

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

@@ -0,0 +1,47 @@
+import { S3Client, HeadObjectCommand } from '@aws-sdk/client-s3';
+
+interface CheckS3ObjectExistsArgs {
+  bucketName: string;
+  key: string;
+}
+
+interface CheckS3ObjectExistsResult {
+  exists: boolean;
+  size?: number;
+}
+
+/**
+ * Check if an object exists in S3 using a HEAD request.
+ * Returns the object size if it exists.
+ */
+export default async function checkS3ObjectExists({
+  bucketName,
+  key,
+}: CheckS3ObjectExistsArgs): Promise<CheckS3ObjectExistsResult> {
+  const s3Client = new S3Client({});
+
+  const command = new HeadObjectCommand({
+    Bucket: bucketName,
+    Key: key,
+  });
+
+  try {
+    const response = await s3Client.send(command);
+    return {
+      exists: true,
+      size: response.ContentLength,
+    };
+  } catch (error: unknown) {
+    // NotFound is expected when object doesn't exist
+    if (
+      error &&
+      typeof error === 'object' &&
+      'name' in error &&
+      error.name === 'NotFound'
+    ) {
+      return { exists: false };
+    }
+    // Re-throw unexpected errors
+    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 /debug-codeyam is stored in feedback.debugReport.
+ */
+interface DebugBundleMetadata {
   timestamp: string;
   git: {
     sha: string;
@@ -22,26 +27,30 @@ interface DebugReportMetadata {
   };
 }
 
-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 +65,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

@@ -41,13 +41,14 @@ export default async function loadReadyToBeCapturedAnalyses(
       ).as('scenarios'),
     ])
     .where(
-      sql<string>` ${sql.ref('analyses.status')} -> 'readyToBeCaptured'`,
+      // Use ->> to extract as text for proper comparison (-> returns JSONB which doesn't compare to string)
+      sql<string>` ${sql.ref('analyses.status')} ->> 'readyToBeCaptured'`,
       '=',
       'true',
     )
     // Exclude entities that are not exported - they cannot be captured because they can't be imported
     .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/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;
           }

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

@@ -23,13 +23,18 @@ export default function getComponentScenarioPath(
     getRelativePath(currentPath, filePath).split('/').slice(0, -1).join('/'),
   );
 
+  // Check if the file is an index file (e.g., index.tsx, index.ts)
+  // This must match the logic in writeScenarioComponents.ts
+  const isIndexFile = file.name.startsWith('index.');
+  const indexPrefix = isIndexFile ? 'index_' : '';
+
   if (scenario) {
     // Include scenario name in path to allow multiple scenarios to coexist
     const importPath = isLibraryDemoPage
-      ? `${relativePath}/${entity.sha}_${safeFileName(entityName)}_${safeFileName(scenario.name)}`
-      : `${relativePath}/${entity.sha}_${safeFileName(entityName)}_${safeFileName(scenario.name)}`;
+      ? `${relativePath}/${entity.sha}_${indexPrefix}${safeFileName(entityName)}_${safeFileName(scenario.name)}`
+      : `${relativePath}/${entity.sha}_${indexPrefix}${safeFileName(entityName)}_${safeFileName(scenario.name)}`;
     return `${importPath}`;
   }
 
-  return `${relativePath}_${entity.sha}_${safeFileName(entityName)}`;
+  return `${relativePath}_${entity.sha}_${indexPrefix}${safeFileName(entityName)}`;
 }

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

@@ -7,7 +7,7 @@ import { BackgroundJobsTable } from './tables/backgroundJobsTable';
 import { BranchesTable } from './tables/branchesTable';
 import { CommitBranchesTable } from './tables/commitBranchesTable';
 import { CommitsTable } from './tables/commitsTable';
-import { DebugReportsTable } from './tables/debugReportsTable';
+import { DebugBundlesTable } from './tables/debugReportsTable';
 import { EntitiesTable } from './tables/entitiesTable';
 import { EntityBranchesTable } from './tables/entityBranchesTable';
 import { EntityStatementsTable } from './tables/entityStatementsTable';
@@ -29,7 +29,7 @@ declare const databaseSchema: {
     readonly branches: BranchesTable;
     readonly commit_branches: CommitBranchesTable;
     readonly commits: CommitsTable;
-    readonly debug_reports: DebugReportsTable;
+    readonly debug_reports: DebugBundlesTable;
     readonly entities: EntitiesTable;
     readonly entity_branches: EntityBranchesTable;
     readonly entity_statements: EntityStatementsTable;

package/analyzer-template/packages/github/dist/database/src/lib/kysely/db.js

@@ -13,7 +13,7 @@ import { createBackgroundJobsTable, } from './tables/backgroundJobsTable';
 import { createBranchesTable } from './tables/branchesTable';
 import { createCommitBranchesTable, } from './tables/commitBranchesTable';
 import { createCommitsTable } from './tables/commitsTable';
-import { createDebugReportsTable, } from './tables/debugReportsTable';
+import { createDebugBundlesTable, } from './tables/debugReportsTable';
 import { createEntitiesTable } from './tables/entitiesTable';
 import { createEntityBranchesTable, } from './tables/entityBranchesTable';
 import { createEntityStatementsTable, } from './tables/entityStatementsTable';
@@ -274,7 +274,7 @@ export async function createSqliteSchema(db) {
     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/github/dist/database/src/lib/kysely/tableRelations.d.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';
@@ -85,5 +85,5 @@ export type DbUserScenario = Selectable<UserScenariosTable> & {
     user?: DbUser;
 };
 export type DbStatement = Selectable<StatementsTable>;
-export type DbDebugReport = Selectable<DebugReportsTable>;
+export type DbDebugBundle = Selectable<DebugBundlesTable>;
 //# sourceMappingURL=tableRelations.d.ts.map

package/analyzer-template/packages/github/dist/database/src/lib/kysely/tables/analysesTable.d.ts

@@ -43,7 +43,14 @@ declare const analysesSchema: {
             validValueOptions: string[];
             errorValueOptions: string[];
             valueType?: string;
-            dependencies?: Record<string, string>[];
+            dependencies?: {
+                path: string;
+                requiredValue: string | boolean;
+                description: string;
+                fromChainId?: string;
+            }[];
+            compoundConditionalIds?: string[];
+            sourceLocations?: import("~codeyam/types").SourceLocation[];
         }[];
         dependencyTree?: import("~codeyam/types").DependencyTreeNode;
         dependentAnalyses?: string[];

package/analyzer-template/packages/github/dist/database/src/lib/kysely/tables/analysesTable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"analysesTable.d.ts","sourceRoot":"","sources":["../../../../../../../database/src/lib/kysely/tables/analysesTable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,EACV,SAAS,EACT,cAAc,EAEf,MAAM,QAAQ,CAAC;AAKhB,QAAA,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;kBA6Bc,CAAA;;;;;;;;;;;+BAUZ,CAAC;;;6BAEa,CAAC;;;;qBAKhB,CAAC;wBAGf,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sBAUoZ,CAAC;iBAAqB,CAAC;sBAA0B,CAAC;;;;oBAAuE,CAAC;+BAAmC,CAAC;gCAAoC,CAAC;gCAAoC,CAAC;iCAAqC,CAAC;sBAA0B,CAAC;;qBAAkD,CAAC;sBAA0B,CAAC;iBAAqB,CAAC;sBAA0B,CAAC;;;;;;CAtC1zB,CAAC;AAGX,MAAM,MAAM,aAAa,GAAG;KACzB,CAAC,IAAI,MAAM,OAAO,cAAc,GAAG,CAAC,OAAO,cAAc,CAAC,CAAC,CAAC,CAAC;CAC/D,CAAC;AAGF,eAAO,MAAM,oBAAoB,EAE5B,CAAC,MAAM,aAAa,CAAC,EAAE,CAAC;AAE7B,wBAAsB,mBAAmB,CAAC,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAyBxE"}
+{"version":3,"file":"analysesTable.d.ts","sourceRoot":"","sources":["../../../../../../../database/src/lib/kysely/tables/analysesTable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,EACV,SAAS,EACT,cAAc,EAEf,MAAM,QAAQ,CAAC;AAKhB,QAAA,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;kBA4C4B,CAAC;;;;;;;;;;;+BAQvB,CAAC;;;6BAEG,CAAC;;;;qBAKgK,CAAC;wBAAuH,CAAC;;;;2BAAqW,CAAC;;kCAA0H,CAAC;2BAA4G,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sBAA2tB,CAAC;iBAAqB,CAAC;sBAA0B,CAAC;;;;oBAAuE,CAAC;+BAAmC,CAAC;gCAAoC,CAAC;gCAAoC,CAAC;iCAAqC,CAAC;sBAA0B,CAAC;;qBAAkD,CAAC;sBAA0B,CAAC;iBAAqB,CAAC;sBAA0B,CAAC;;;;;;CAtC//D,CAAC;AAGX,MAAM,MAAM,aAAa,GAAG;KACzB,CAAC,IAAI,MAAM,OAAO,cAAc,GAAG,CAAC,OAAO,cAAc,CAAC,CAAC,CAAC,CAAC;CAC/D,CAAC;AAGF,eAAO,MAAM,oBAAoB,EAE5B,CAAC,MAAM,aAAa,CAAC,EAAE,CAAC;AAE7B,wBAAsB,mBAAmB,CAAC,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAyBxE"}