@codeyam/codeyam-cli 0.1.0-staging.b8a55ba → 0.1.0-staging.c90f8c9

package/packages/analyze/src/lib/files/scenarios/mergeValidatedDataStructures.js

@@ -1,5 +1,38 @@
 import { splitOutsideParenthesesAndArrays } from "../../../../../../packages/ai/index.js";
 import { awsLog } from "../../../../../../packages/utils/index.js";
+/**
+ * Deep merge for JsonTypeDefinition schemas.
+ * Only recursively merges when BOTH sides are plain objects (not arrays, not primitives).
+ * This is different from the general deepMerge which is designed for data values -
+ * here we're merging type schemas where leaf values are strings like "boolean" or "function".
+ *
+ * When types are incompatible (e.g., array vs object), prefer keeping the base value
+ * since it was set first from the root entity's validatedVariables.
+ */
+function deepMergeSchemas(base, override) {
+    // If override is null/undefined, return base
+    if (override === null || override === undefined)
+        return base;
+    // If base is null/undefined, return override
+    if (base === null || base === undefined)
+        return override;
+    // Only recursively merge if BOTH are plain objects (not arrays, not primitives)
+    const baseIsPlainObject = typeof base === 'object' && !Array.isArray(base) && base !== null;
+    const overrideIsPlainObject = typeof override === 'object' &&
+        !Array.isArray(override) &&
+        override !== null;
+    if (baseIsPlainObject && overrideIsPlainObject) {
+        const result = { ...base };
+        for (const key in override) {
+            result[key] = deepMergeSchemas(base[key], override[key]);
+        }
+        return result;
+    }
+    // For incompatible types (array vs object, string vs object, etc.), keep base
+    // This ensures the root entity's structure is preserved when a dependency
+    // has a different view of the same mock
+    return base;
+}
 export function mergeInStructure(name, key, source, target) {
     try {
         const specificSource = source[key];
@@ -118,10 +151,10 @@ export default function mergeValidatedDataStructures({ validatedVariables, relev
             }
             activeValidatedParts = validatedVariables[usedName];
         }
-        dataForMocks = {
-            ...dataForMocks,
-            ...validatedData,
-        };
+        // Use deep merge instead of shallow spread to preserve previously merged
+        // dependency data. This fixes Issue #15 where multiple dependencies with
+        // the same top-level key (e.g., trpc) would overwrite each other.
+        dataForMocks = deepMergeSchemas(dataForMocks, validatedData);
     };
     for (const dependency of relevantDependencies) {
         addMockDataForEntity(dependency.importAlias);
@@ -135,11 +168,15 @@ export default function mergeValidatedDataStructures({ validatedVariables, relev
         const dependencyDataForMocks = dependentAnalysis?.metadata?.scenariosDataStructure?.dataForMocks ?? {};
         for (const mockName in dependencyDataForMocks) {
             addMockDataForEntity(mockName);
-            // If addMockDataForEntity didn't find matching entries in validatedVariables,
-            // copy the dependency's value directly. This handles cases like usePathname()
-            // which returns a simple "string" type but isn't in the root's validatedVariables.
-            if (dataForMocks[mockName] === undefined) {
-                dataForMocks[mockName] = dependencyDataForMocks[mockName];
+            // Always deep merge the dependency's value to preserve nested structures.
+            // This handles cases like usePathname() which returns a simple "string" type,
+            // AND cases like trpc where both root and dependency have nested data that
+            // needs to be combined (e.g., trpc.quote from root + trpc.fastener.getAttributeValues
+            // from dependency).
+            if (dependencyDataForMocks[mockName] !== undefined) {
+                dataForMocks = deepMergeSchemas(dataForMocks, {
+                    [mockName]: dependencyDataForMocks[mockName],
+                });
             }
         }
     }

package/packages/analyze/src/lib/files/scenarios/mergeValidatedDataStructures.js.map

@@ -1 +1 @@
-{"version":3,"file":"mergeValidatedDataStructures.js","sourceRoot":"","sources":["../../../../../../../../packages/analyze/src/lib/files/scenarios/mergeValidatedDataStructures.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mergeValidatedDataStructures.js","sourceRoot":"","sources":["../../../../../../../../packages/analyze/src/lib/files/scenarios/mergeValidatedDataStructures.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gCAAgC,EAAE,MAAM,aAAa,CAAC;AAE/D,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAExC;;;;;;;;GAQG;AACH,SAAS,gBAAgB,CACvB,IAAwB,EACxB,QAA4B;IAE5B,6CAA6C;IAC7C,IAAI,QAAQ,KAAK,IAAI,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC;IAC7D,6CAA6C;IAC7C,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,QAAQ,CAAC;IAEzD,gFAAgF;IAChF,MAAM,iBAAiB,GACrB,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,KAAK,IAAI,CAAC;IACpE,MAAM,qBAAqB,GACzB,OAAO,QAAQ,KAAK,QAAQ;QAC5B,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;QACxB,QAAQ,KAAK,IAAI,CAAC;IAEpB,IAAI,iBAAiB,IAAI,qBAAqB,EAAE,CAAC;QAC/C,MAAM,MAAM,GAAuB,EAAE,GAAG,IAAI,EAAE,CAAC;QAC/C,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;YAC3B,MAAM,CAAC,GAAG,CAAC,GAAG,gBAAgB,CAC5B,IAAI,CAAC,GAAG,CAAuB,EAC/B,QAAQ,CAAC,GAAG,CAAuB,CACpC,CAAC;QACJ,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,8EAA8E;IAC9E,0EAA0E;IAC1E,wCAAwC;IACxC,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,IAAqB,EACrB,GAAoB,EACpB,MAAiD,EACjD,MAAiD;IAEjD,IAAI,CAAC;QACH,MAAM,cAAc,GAAI,MAAc,CAAC,GAAG,CAElB,CAAC;QACzB,IAAI,cAAc,GAAI,MAAc,CAAC,IAAI,CAEjB,CAAC;QACzB,IAAI,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;YAClC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;gBAC9B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;oBACnC,cAAc,GAAG,EAAE,CAAC;gBACtB,CAAC;gBACD,IAAI,CAAC;oBACH,gBAAgB,CAAC,KAAK,EAAE,KAAK,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;gBACjE,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,MAAM,CAAC,2BAA2B,EAAE;wBAClC,IAAI;wBACJ,GAAG;wBACH,MAAM;wBACN,MAAM;qBACP,CAAC,CAAC;oBACH,MAAM,KAAK,CAAC;gBACd,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;aAAM,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE,CAAC;YAC9C,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE,CAAC;gBACvC,cAAc,GAAG,EAAE,CAAC;YACtB,CAAC;YACD,KAAK,MAAM,iBAAiB,IAAI,cAAc,EAAE,CAAC;gBAC/C,IAAI,CAAC;oBACH,gBAAgB,CACd,iBAAiB,EACjB,iBAAiB,EACjB,cAAc,EACd,cAAc,IAAI,EAAE,CACrB,CAAC;gBACJ,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,MAAM,CAAC,2BAA2B,EAAE;wBAClC,IAAI;wBACJ,GAAG;wBACH,MAAM;wBACN,MAAM;qBACP,CAAC,CAAC;oBACH,MAAM,KAAK,CAAC;gBACd,CAAC;YACH,CAAC;QACH,CAAC;aAAM,IAAI,cAAc,EAAE,CAAC;YAC1B,cAAc,GAAG,cAAc,CAAC;QAClC,CAAC;QAED,IAAI,cAAc,EAAE,CAAC;YACnB,IAAI,CAAC;gBACF,MAAc,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC;YACzC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,GAAG,CACT,qCAAqC,EACrC,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,EAC7B,KAAK,CACN,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,0BAA0B,EAAE;YACjC,IAAI;YACJ,GAAG;YACH,MAAM;YACN,MAAM;YACN,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK;SACtD,CAAC,CAAC;QACH,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,CAAC,OAAO,UAAU,4BAA4B,CAAC,EACnD,kBAAkB,EAClB,oBAAoB,GAAG,EAAE,EACzB,iBAAiB,GAAG,EAAE,GASvB;IACC,0FAA0F;IAC1F,wBAAwB;IACxB,6DAA6D;IAC7D,8BAA8B;IAC9B,kCAAkC;IAClC,oCAAoC;IACpC,SAAS;IACT,8DAA8D;IAC9D,2BAA2B;IAC3B,0DAA0D;IAC1D,4BAA4B;IAC5B,kCAAkC;IAClC,0CAA0C;IAC1C,0BAA0B;IAC1B,0CAA0C;IAC1C,kFAAkF;IAClF,kEAAkE;IAClE,kBAAkB;IAClB,iBAAiB;IACjB,cAAc;IACd,YAAY;IACZ,WAAW;IACX,oBAAoB;IACpB,YAAY;IACZ,OAAO;IACP,gBAAgB;IAEhB,IAAI,IAAI,GAAG,CAAC,kBAAkB,CAAC,WAAW,CAAC,IAAI,EAAE,CAAyB,CAAC;IAC3E,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;QAAE,IAAI,GAAG,EAAE,CAAC;IAEpC,IAAI,YAAY,GAAuB,EAAE,CAAC;IAC1C,MAAM,oBAAoB,GAAG,CAAC,QAAgB,EAAE,EAAE;QAChD,MAAM,aAAa,GAAG,gCAAgC,CAAC,QAAQ,CAAC,CAAC;QAEjE,MAAM,aAAa,GAAuB,EAAE,CAAC;QAC7C,IAAI,oBAAoB,GAAuB,aAAa,CAAC;QAC7D,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;YACjC,IAAI,CAAC,oBAAoB;gBAAE,SAAS;YAEpC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;YACtE,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC;YACpE,MAAM,YAAY,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;YAClD,MAAM,gBAAgB,GAAG,YAAY,GAAG,GAAG,CAAC;YAE5C,IAAI,QAAQ,GAAG,QAAQ,CAAC;YACxB,KAAK,MAAM,GAAG,IAAI,kBAAkB,EAAE,CAAC;gBACrC,IAAI,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;oBAC7D,IAAI,GAAG,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;wBACjC,QAAQ,GAAG,gBAAgB,CAAC;oBAC9B,CAAC;oBAED,gBAAgB,CACd,QAAQ,EACR,GAAG,EACH,kBAAwC,EACxC,oBAA0C,CAC3C,CAAC;gBACJ,CAAC;YACH,CAAC;YACD,oBAAoB,GAAG,kBAAkB,CAAC,QAAQ,CAAuB,CAAC;QAC5E,CAAC;QACD,yEAAyE;QACzE,yEAAyE;QACzE,kEAAkE;QAClE,YAAY,GAAG,gBAAgB,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;IAC/D,CAAC,CAAC;IAEF,KAAK,MAAM,UAAU,IAAI,oBAAoB,EAAE,CAAC;QAC9C,oBAAoB,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QAE7C,IAAI,iBAAiB,GACnB,iBAAiB,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QAElE,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,IACE,iBAAiB,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,UAAU;gBAC/D,UAAU,CAAC,UAAU,EACrB,CAAC;gBACD,iBAAiB,GAAG,iBAAiB,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,CAAC;YACxE,CAAC;QACH,CAAC;QAED,MAAM,sBAAsB,GAC1B,iBAAiB,EAAE,QAAQ,EAAE,sBAAsB,EAAE,YAAY,IAAI,EAAE,CAAC;QAC1E,KAAK,MAAM,QAAQ,IAAI,sBAAsB,EAAE,CAAC;YAC9C,oBAAoB,CAAC,QAAQ,CAAC,CAAC;YAE/B,0EAA0E;YAC1E,8EAA8E;YAC9E,2EAA2E;YAC3E,sFAAsF;YACtF,oBAAoB;YACpB,IAAI,sBAAsB,CAAC,QAAQ,CAAC,KAAK,SAAS,EAAE,CAAC;gBACnD,YAAY,GAAG,gBAAgB,CAAC,YAAY,EAAE;oBAC5C,CAAC,QAAQ,CAAC,EAAE,sBAAsB,CAAC,QAAQ,CAAC;iBACvB,CAAC,CAAC;YAC3B,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO;QACL,IAAI;QACJ,YAAY;KACb,CAAC;AACJ,CAAC"}

package/packages/aws/src/lib/ecs/ecsDefineContainer.js

@@ -1,8 +1,9 @@
-export default function ecsDefineContainer({ containerName, containerImage, environmentVariables = {}, openPort, dependsOn, }) {
+export default function ecsDefineContainer({ containerName, containerImage, environmentVariables = {}, openPort, command, }) {
     return {
         name: containerName,
         image: containerImage,
         essential: true,
+        command,
         environment: Object.entries(environmentVariables).map(([name, value]) => ({
             name,
             value,
@@ -24,7 +25,6 @@ export default function ecsDefineContainer({ containerName, containerImage, envi
                 'awslogs-stream-prefix': `${process.env.ECS_CLUSTER_NAME}`,
             },
         },
-        dependsOn,
     };
 }
 //# sourceMappingURL=ecsDefineContainer.js.map

package/packages/aws/src/lib/ecs/ecsDefineContainer.js.map

@@ -1 +1 @@
-{"version":3,"file":"ecsDefineContainer.js","sourceRoot":"","sources":["../../../../../../../packages/aws/src/lib/ecs/ecsDefineContainer.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,OAAO,UAAU,kBAAkB,CAAC,EACzC,aAAa,EACb,cAAc,EACd,oBAAoB,GAAG,EAAE,EACzB,QAAQ,EACR,SAAS,GAOV;IACC,OAAO;QACL,IAAI,EAAE,aAAa;QACnB,KAAK,EAAE,cAAc;QACrB,SAAS,EAAE,IAAI;QACf,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;YACxE,IAAI;YACJ,KAAK;SACN,CAAC,CAAC;QACH,YAAY,EAAE,QAAQ;YACpB,CAAC,CAAC;gBACE;oBACE,aAAa,EAAE,QAAQ;oBACvB,QAAQ,EAAE,QAAQ;iBACnB;aACF;YACH,CAAC,CAAC,SAAS;QACb,gBAAgB,EAAE;YAChB,SAAS,EAAE,SAAS;YACpB,OAAO,EAAE;gBACP,sBAAsB,EAAE,MAAM;gBAC9B,eAAe,EAAE,kBAAkB,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE;gBACxE,gBAAgB,EAAE,WAAW;gBAC7B,uBAAuB,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE;aAC3D;SACF;QACD,SAAS;KACV,CAAC;AACJ,CAAC"}
+{"version":3,"file":"ecsDefineContainer.js","sourceRoot":"","sources":["../../../../../../../packages/aws/src/lib/ecs/ecsDefineContainer.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,OAAO,UAAU,kBAAkB,CAAC,EACzC,aAAa,EACb,cAAc,EACd,oBAAoB,GAAG,EAAE,EACzB,QAAQ,EACR,OAAO,GAOR;IACC,OAAO;QACL,IAAI,EAAE,aAAa;QACnB,KAAK,EAAE,cAAc;QACrB,SAAS,EAAE,IAAI;QACf,OAAO;QACP,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;YACxE,IAAI;YACJ,KAAK;SACN,CAAC,CAAC;QACH,YAAY,EAAE,QAAQ;YACpB,CAAC,CAAC;gBACE;oBACE,aAAa,EAAE,QAAQ;oBACvB,QAAQ,EAAE,QAAQ;iBACnB;aACF;YACH,CAAC,CAAC,SAAS;QACb,gBAAgB,EAAE;YAChB,SAAS,EAAE,SAAS;YACpB,OAAO,EAAE;gBACP,sBAAsB,EAAE,MAAM;gBAC9B,eAAe,EAAE,kBAAkB,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE;gBACxE,gBAAgB,EAAE,WAAW;gBAC7B,uBAAuB,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE;aAC3D;SACF;KACF,CAAC;AACJ,CAAC"}

package/packages/aws/src/lib/ecs/ecsTaskFactory.js

@@ -1,87 +1,43 @@
 /**
- * Prepare to run an ECS task for the classical analysis-then-capture flow
- * which uses a 'project' image for analysis and a 'playwright' image for capture.
+ * Prepare to run an ECS task for analysis with distributed capture orchestration.
+ * Uses the unified 'combo' image which includes both analysis and capture capabilities.
  */
-export function getEcsStartConfigForAnalysisThenCapture(projectEnvironmentVariables, playwrightEnvironmentVariables) {
+export function getEcsStartConfigForAnalysis(environmentVariables) {
     return {
-        taskDefinition: getEcsTaskDefinitionName(EcsTaskDefinitionUse.AnalyzeThenCapture),
-        containerEnvironmentVariables: [
-            [
-                getEcsImageNameForType(EcsImageType.Project),
-                projectEnvironmentVariables,
-            ],
-            [
-                getEcsImageNameForType(EcsImageType.Playwright),
-                playwrightEnvironmentVariables,
-            ],
-        ],
-    };
-}
-/**
- * Prepare to run an ECS task for the new analysis flow with distributed capture
- * tasks orchestrated from only a 'project' image.
- */
-export function getEcsStartConfigFoAnalysisWithOrchestration(environmentVariables) {
-    return {
-        taskDefinition: getEcsTaskDefinitionName(EcsTaskDefinitionUse.AnalyzeWithOrchestration),
-        containerEnvironmentVariables: [
-            [getEcsImageNameForType(EcsImageType.Project), environmentVariables],
-        ],
+        taskDefinition: getEcsTaskDefinitionName(EcsTaskDefinitionUse.Analysis),
+        containerEnvironmentVariables: [[getEcsImageName(), environmentVariables]],
     };
 }
 /**
  * Prepare to run an ECS worker task that implements the capture portion of the
- * distributed orchestration, which uses a 'combo' image. This task is launched
- * from a task created with `getEcsStartConfigFoAnalysisWithOrchestration()`
+ * distributed orchestration. Uses the same unified 'combo' image.
+ * This task is launched from a task created with `getEcsStartConfigForAnalysis()`
  */
 export function getEcsStartConfigForOrchestrationTask(environmentVariables) {
     return {
         taskDefinition: getEcsTaskDefinitionName(EcsTaskDefinitionUse.OrchestrationTask),
-        containerEnvironmentVariables: [
-            [getEcsImageNameForType(EcsImageType.Combo), environmentVariables],
-        ],
+        containerEnvironmentVariables: [[getEcsImageName(), environmentVariables]],
     };
 }
 export var EcsTaskDefinitionUse;
 (function (EcsTaskDefinitionUse) {
-    /* A 'project' image runs analysis while a 'playwright' image captures the entities. */
-    EcsTaskDefinitionUse["AnalyzeThenCapture"] = "analyze-then-capture";
-    /* A 'project' image runs analysis while firing up distributed capture orchestration. */
-    EcsTaskDefinitionUse["AnalyzeWithOrchestration"] = "analyze-with-orchestration";
-    /* A worker task that combines 'project' and 'playwright' code, launched by orchestration. */
+    /* Main analysis task - runs analysis and fires up distributed capture orchestration. */
+    EcsTaskDefinitionUse["Analysis"] = "analysis";
+    /* A worker task launched by orchestration to capture scenarios. */
     EcsTaskDefinitionUse["OrchestrationTask"] = "orchestration-task";
 })(EcsTaskDefinitionUse || (EcsTaskDefinitionUse = {}));
 export function getEcsTaskDefinitionName(forUse) {
     switch (forUse) {
-        case EcsTaskDefinitionUse.AnalyzeThenCapture:
-            return `${process.env.ECR_REPOSITORY_NAME}-project-and-playwright`;
-        case EcsTaskDefinitionUse.AnalyzeWithOrchestration:
-            return `${process.env.ECR_REPOSITORY_NAME}-project`;
+        case EcsTaskDefinitionUse.Analysis:
+            return `${process.env.ECR_REPOSITORY_NAME}-analysis`;
         case EcsTaskDefinitionUse.OrchestrationTask:
-            return `${process.env.ECR_REPOSITORY_NAME}-combo`;
+            return `${process.env.ECR_REPOSITORY_NAME}-orchestration`;
         default:
             throw new Error(`Unknown task definition use: ${forUse}`);
     }
 }
-export var EcsImageType;
-(function (EcsImageType) {
-    /* The virtualized server that runs the project code. */
-    EcsImageType["Project"] = "project";
-    /* The playwright capture process which waits for the project to be ready. */
-    EcsImageType["Playwright"] = "playwright";
-    /* A combo image that combines both project and playwright code, used by orchestration. */
-    EcsImageType["Combo"] = "combo";
-})(EcsImageType || (EcsImageType = {}));
-export function getEcsImageNameForType(type) {
-    switch (type) {
-        case EcsImageType.Project:
-            return `${process.env.ECR_REPOSITORY_NAME}-project`;
-        case EcsImageType.Playwright:
-            return `${process.env.ECR_REPOSITORY_NAME}-playwright`;
-        case EcsImageType.Combo:
-            return `${process.env.ECR_REPOSITORY_NAME}-combo`;
-        default:
-            throw new Error(`Unknown image type: ${type}`);
-    }
+/** Returns the name of the unified Docker image used for all ECS tasks. */
+export function getEcsImageName() {
+    return `${process.env.ECR_REPOSITORY_NAME}-combo`;
 }
 //# sourceMappingURL=ecsTaskFactory.js.map

package/packages/aws/src/lib/ecs/ecsTaskFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"ecsTaskFactory.js","sourceRoot":"","sources":["../../../../../../../packages/aws/src/lib/ecs/ecsTaskFactory.ts"],"names":[],"mappings":"AAMA;;;GAGG;AACH,MAAM,UAAU,uCAAuC,CACrD,2BAAmD,EACnD,8BAAsD;IAEtD,OAAO;QACL,cAAc,EAAE,wBAAwB,CACtC,oBAAoB,CAAC,kBAAkB,CACxC;QACD,6BAA6B,EAAE;YAC7B;gBACE,sBAAsB,CAAC,YAAY,CAAC,OAAO,CAAC;gBAC5C,2BAA2B;aAC5B;YACD;gBACE,sBAAsB,CAAC,YAAY,CAAC,UAAU,CAAC;gBAC/C,8BAA8B;aAC/B;SACF;KACF,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,4CAA4C,CAC1D,oBAA4C;IAE5C,OAAO;QACL,cAAc,EAAE,wBAAwB,CACtC,oBAAoB,CAAC,wBAAwB,CAC9C;QACD,6BAA6B,EAAE;YAC7B,CAAC,sBAAsB,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,oBAAoB,CAAC;SACrE;KACF,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,qCAAqC,CACnD,oBAA4C;IAE5C,OAAO;QACL,cAAc,EAAE,wBAAwB,CACtC,oBAAoB,CAAC,iBAAiB,CACvC;QACD,6BAA6B,EAAE;YAC7B,CAAC,sBAAsB,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,oBAAoB,CAAC;SACnE;KACF,CAAC;AACJ,CAAC;AAED,MAAM,CAAN,IAAY,oBAOX;AAPD,WAAY,oBAAoB;IAC9B,uFAAuF;IACvF,mEAA2C,CAAA;IAC3C,wFAAwF;IACxF,+EAAuD,CAAA;IACvD,6FAA6F;IAC7F,gEAAwC,CAAA;AAC1C,CAAC,EAPW,oBAAoB,KAApB,oBAAoB,QAO/B;AAED,MAAM,UAAU,wBAAwB,CAAC,MAA4B;IACnE,QAAQ,MAAM,EAAE,CAAC;QACf,KAAK,oBAAoB,CAAC,kBAAkB;YAC1C,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,yBAAyB,CAAC;QACrE,KAAK,oBAAoB,CAAC,wBAAwB;YAChD,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,UAAU,CAAC;QACtD,KAAK,oBAAoB,CAAC,iBAAiB;YACzC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,QAAQ,CAAC;QACpD;YACE,MAAM,IAAI,KAAK,CAAC,gCAAgC,MAAM,EAAE,CAAC,CAAC;IAC9D,CAAC;AACH,CAAC;AAED,MAAM,CAAN,IAAY,YAOX;AAPD,WAAY,YAAY;IACtB,wDAAwD;IACxD,mCAAmB,CAAA;IACnB,6EAA6E;IAC7E,yCAAyB,CAAA;IACzB,0FAA0F;IAC1F,+BAAe,CAAA;AACjB,CAAC,EAPW,YAAY,KAAZ,YAAY,QAOvB;AAED,MAAM,UAAU,sBAAsB,CAAC,IAAkB;IACvD,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,YAAY,CAAC,OAAO;YACvB,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,UAAU,CAAC;QACtD,KAAK,YAAY,CAAC,UAAU;YAC1B,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,aAAa,CAAC;QACzD,KAAK,YAAY,CAAC,KAAK;YACrB,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,QAAQ,CAAC;QACpD;YACE,MAAM,IAAI,KAAK,CAAC,uBAAuB,IAAI,EAAE,CAAC,CAAC;IACnD,CAAC;AACH,CAAC"}
+{"version":3,"file":"ecsTaskFactory.js","sourceRoot":"","sources":["../../../../../../../packages/aws/src/lib/ecs/ecsTaskFactory.ts"],"names":[],"mappings":"AAMA;;;GAGG;AACH,MAAM,UAAU,4BAA4B,CAC1C,oBAA4C;IAE5C,OAAO;QACL,cAAc,EAAE,wBAAwB,CAAC,oBAAoB,CAAC,QAAQ,CAAC;QACvE,6BAA6B,EAAE,CAAC,CAAC,eAAe,EAAE,EAAE,oBAAoB,CAAC,CAAC;KAC3E,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,qCAAqC,CACnD,oBAA4C;IAE5C,OAAO;QACL,cAAc,EAAE,wBAAwB,CACtC,oBAAoB,CAAC,iBAAiB,CACvC;QACD,6BAA6B,EAAE,CAAC,CAAC,eAAe,EAAE,EAAE,oBAAoB,CAAC,CAAC;KAC3E,CAAC;AACJ,CAAC;AAED,MAAM,CAAN,IAAY,oBAKX;AALD,WAAY,oBAAoB;IAC9B,wFAAwF;IACxF,6CAAqB,CAAA;IACrB,mEAAmE;IACnE,gEAAwC,CAAA;AAC1C,CAAC,EALW,oBAAoB,KAApB,oBAAoB,QAK/B;AAED,MAAM,UAAU,wBAAwB,CAAC,MAA4B;IACnE,QAAQ,MAAM,EAAE,CAAC;QACf,KAAK,oBAAoB,CAAC,QAAQ;YAChC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,WAAW,CAAC;QACvD,KAAK,oBAAoB,CAAC,iBAAiB;YACzC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,gBAAgB,CAAC;QAC5D;YACE,MAAM,IAAI,KAAK,CAAC,gCAAgC,MAAM,EAAE,CAAC,CAAC;IAC9D,CAAC;AACH,CAAC;AAED,2EAA2E;AAC3E,MAAM,UAAU,eAAe;IAC7B,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,QAAQ,CAAC;AACpD,CAAC"}

package/packages/database/src/lib/kysely/tables/debugReportsTable.js.map

@@ -1 +1 @@
-{"version":3,"file":"debugReportsTable.js","sourceRoot":"","sources":["../../../../../../../../packages/database/src/lib/kysely/tables/debugReportsTable.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AA0B3D,iFAAiF;AACjF,MAAM,kBAAkB,GAAG;IACzB,EAAE,EAAE,WAAW,EAAqB;IACpC,YAAY,EAAE,WAAW,EAAU;IACnC,MAAM,EAAE,WAAW,EAAU;IAC7B,eAAe,EAAE,WAAW,EAAiB;IAC7C,QAAQ,EAAE,WAAW,EAA8C;IACnE,MAAM,EAAE,WAAW,EAAiB;IACpC,UAAU,EAAE,WAAW,EAAqB;IAC5C,WAAW,EAAE,WAAW,EAAiB;IACzC,QAAQ,EAAE,WAAW,EAAiB;IACtC,gBAAgB,EAAE,WAAW,EAAiB;CACtC,CAAC;AAMX,MAAM,CAAC,MAAM,wBAAwB,GAAG,MAAM,CAAC,IAAI,CACjD,kBAAkB,CACY,CAAC;AAEjC,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,EAAe;IAC3D,iEAAiE;IACjE,MAAM,EAAE,CAAC,MAAM;SACZ,WAAW,CAAC,eAAe,CAAC;SAC5B,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,GAA4B,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC;SAC3E,SAAS,CAAC,cAAc,EAAE,SAAS,EAAE,CAAC,GAA4B,EAAE,EAAE,CACrE,GAAG,CAAC,OAAO,EAAE,CACd;SACA,SAAS,CAAC,QAAQ,EAAE,SAAS,EAAE,CAAC,GAA4B,EAAE,EAAE,CAC/D,GAAG,CAAC,OAAO,EAAE,CACd;SACA,SAAS,CAAC,iBAAiB,EAAE,QAAQ,CAAC;SACtC,SAAS,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,gCAAgC;SAC9D,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC;SAC9B,SAAS,CAAC,YAAY,EAAE,UAAU,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;SACrD,SAAS,CAAC,aAAa,EAAE,UAAU,CAAC;SACpC,SAAS,CAAC,UAAU,EAAE,SAAS,CAAC;SAChC,SAAS,CAAC,kBAAkB,EAAE,QAAQ,CAAC;SACvC,WAAW,EAAE;SACb,OAAO,EAAE,CAAC;AACf,CAAC"}
+{"version":3,"file":"debugReportsTable.js","sourceRoot":"","sources":["../../../../../../../../packages/database/src/lib/kysely/tables/debugReportsTable.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AA0C3D,iFAAiF;AACjF,MAAM,kBAAkB,GAAG;IACzB,EAAE,EAAE,WAAW,EAAqB;IACpC,YAAY,EAAE,WAAW,EAAU;IACnC,MAAM,EAAE,WAAW,EAAU;IAC7B,eAAe,EAAE,WAAW,EAAiB;IAC7C,QAAQ,EAAE,WAAW,EAA8C;IACnE,MAAM,EAAE,WAAW,EAAiB;IACpC,UAAU,EAAE,WAAW,EAAqB;IAC5C,WAAW,EAAE,WAAW,EAAiB;IACzC,QAAQ,EAAE,WAAW,EAAiB;IACtC,gBAAgB,EAAE,WAAW,EAAiB;CACtC,CAAC;AAMX,MAAM,CAAC,MAAM,wBAAwB,GAAG,MAAM,CAAC,IAAI,CACjD,kBAAkB,CACY,CAAC;AAEjC,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,EAAe;IAC3D,iEAAiE;IACjE,MAAM,EAAE,CAAC,MAAM;SACZ,WAAW,CAAC,eAAe,CAAC;SAC5B,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,GAA4B,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC;SAC3E,SAAS,CAAC,cAAc,EAAE,SAAS,EAAE,CAAC,GAA4B,EAAE,EAAE,CACrE,GAAG,CAAC,OAAO,EAAE,CACd;SACA,SAAS,CAAC,QAAQ,EAAE,SAAS,EAAE,CAAC,GAA4B,EAAE,EAAE,CAC/D,GAAG,CAAC,OAAO,EAAE,CACd;SACA,SAAS,CAAC,iBAAiB,EAAE,QAAQ,CAAC;SACtC,SAAS,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,gCAAgC;SAC9D,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC;SAC9B,SAAS,CAAC,YAAY,EAAE,UAAU,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;SACrD,SAAS,CAAC,aAAa,EAAE,UAAU,CAAC;SACpC,SAAS,CAAC,UAAU,EAAE,SAAS,CAAC;SAChC,SAAS,CAAC,kBAAkB,EAAE,QAAQ,CAAC;SACvC,WAAW,EAAE;SACb,OAAO,EAAE,CAAC;AACf,CAAC"}

package/packages/database/src/lib/loadAnalyses.js

@@ -10,11 +10,36 @@ function chunk(array, size) {
         ? [array]
         : Array.from({ length: Math.ceil(array.length / size) }, (_, i) => array.slice(i * size, i * size + size));
 }
-function buildAnalysesQuery({ projectId, ids, fileIds, entityName, entityShas, commitIds, branchCommitSha, limit, }) {
+function buildAnalysesQuery({ projectId, ids, fileIds, entityName, entityShas, commitIds, branchCommitSha, limit, excludeMetadata, }) {
     const db = getDatabase();
     const { jsonObjectFrom, jsonArrayFrom } = getJsonHelper();
     // Create CTE for filtering analyses
-    let filteredAnalysisCTE = db.selectFrom('analyses').selectAll('analyses');
+    // When excludeMetadata is true, select specific columns to avoid loading 64MB+ of metadata
+    let filteredAnalysisCTE = excludeMetadata
+        ? db
+            .selectFrom('analyses')
+            .select([
+            'analyses.id',
+            'analyses.project_id',
+            'analyses.file_id',
+            'analyses.commit_id',
+            'analyses.entity_sha',
+            'analyses.entity_name',
+            'analyses.entity_type',
+            'analyses.file_path',
+            'analyses.status',
+            'analyses.created_at',
+            'analyses.updated_at',
+            'analyses.tree_sha',
+            'analyses.analyzed_tree_sha',
+            'analyses.dependency_analyzed_tree_sha',
+            'analyses.previous_analysis_id',
+            'analyses.branch_commit_sha',
+            'analyses.indirect',
+            'analyses.committed_at',
+            'analyses.completed_at',
+        ])
+        : db.selectFrom('analyses').selectAll('analyses');
     // Apply filters
     if (projectId) {
         filteredAnalysisCTE = filteredAnalysisCTE.where('project_id', '=', projectId);
@@ -47,6 +72,24 @@ function buildAnalysesQuery({ projectId, ids, fileIds, entityName, entityShas, c
         filteredAnalysisCTE = filteredAnalysisCTE.limit(limit);
     }
     // Main query with JSON aggregations referencing the CTE
+    // When excludeMetadata is true, skip the entity subquery (saves loading entity metadata again)
+    if (excludeMetadata) {
+        return db
+            .with('filtered_analyses', () => filteredAnalysisCTE)
+            .selectFrom('filtered_analyses')
+            .selectAll('filtered_analyses')
+            .select((eb) => [
+            // Skip entity subquery - not needed for list views and loads 41MB+ of entity metadata
+            jsonArrayFrom(eb
+                .selectFrom('scenarios')
+                .select(aliasedTableColumns('scenarios', ScenariosTableColumns))
+                .whereRef('scenarios.analysis_id', '=', 'filtered_analyses.id')).as('scenarios'),
+            jsonArrayFrom(eb
+                .selectFrom('analysis_branches')
+                .select(['id', 'branch_id'])
+                .whereRef('analysis_branches.analysis_id', '=', 'filtered_analyses.id')).as('analysis_branches'),
+        ]);
+    }
     return db
         .with('filtered_analyses', () => filteredAnalysisCTE)
         .selectFrom('filtered_analyses')

package/packages/database/src/lib/loadAnalyses.js.map

@@ -1 +1 @@
-{"version":3,"file":"loadAnalyses.js","sourceRoot":"","sources":["../../../../../../packages/database/src/lib/loadAnalyses.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"loadAnalyses.js","sourceRoot":"","sources":["../../../../../../packages/database/src/lib/loadAnalyses.ts"],"names":[],"mappings":"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"}

package/packages/database/src/lib/loadCommits.js

@@ -94,7 +94,7 @@ async function loadEntitiesForCommits(commitIds) {
         return new Map();
     }
 }
-export default async function loadCommits({ projectId, branchId, ids, shas, fileNames, limit = 10, }) {
+export default async function loadCommits({ projectId, branchId, ids, shas, fileNames, limit = 10, skipRelations = false, }) {
     if (!projectId && !ids) {
         throw new Error('Must provide projectId or ids');
     }
@@ -147,6 +147,18 @@ export default async function loadCommits({ projectId, branchId, ids, shas, file
         if (!commits || commits.length === 0) {
             return [];
         }
+        // When skipRelations is true, just return commits without loading related data
+        // This is much faster for queries that only need commit metadata
+        if (skipRelations) {
+            const dbCommits = commits.map((commit) => ({
+                ...commit,
+                branch: undefined,
+                mergedBranch: undefined,
+                analyses: [],
+                entities: [],
+            }));
+            return dbCommits.map(dbToCommit);
+        }
         const commitIds = commits.map((c) => c.id);
         // Load all relations in parallel
         const [branchesMap, analysesMap, entitiesMap] = await Promise.all([

package/packages/database/src/lib/loadCommits.js.map

@@ -1 +1 @@
-{"version":3,"file":"loadCommits.js","sourceRoot":"","sources":["../../../../../../packages/database/src/lib/loadCommits.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"loadCommits.js","sourceRoot":"","sources":["../../../../../../packages/database/src/lib/loadCommits.ts"],"names":[],"mappings":"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"}

package/packages/database/src/lib/loadEntities.js

@@ -1,6 +1,6 @@
 import dbToEntity from "./dbToEntity.js";
 import { getDatabase } from "./kysely/db.js";
-export default async function loadEntities({ projectId, branchId, fileIds, filePaths, names, shas, }) {
+export default async function loadEntities({ projectId, branchId, fileIds, filePaths, names, shas, excludeMetadata, }) {
     if ((fileIds && fileIds.length == 0) ||
         (filePaths && filePaths.length == 0) ||
         (names && names.length == 0) ||
@@ -18,6 +18,7 @@ export default async function loadEntities({ projectId, branchId, fileIds, fileP
                 filePaths,
                 names,
                 shas: chunk,
+                excludeMetadata,
             });
             if (chunkEntities) {
                 allEntities.push(...chunkEntities);
@@ -27,9 +28,27 @@ export default async function loadEntities({ projectId, branchId, fileIds, fileP
     }
     const db = getDatabase();
     try {
-        const query = db
-            .selectFrom('entities')
-            .selectAll('entities')
+        // When excludeMetadata is true, select all columns except the large metadata column
+        // This dramatically speeds up list queries (41MB+ of JSON avoided)
+        const baseQuery = excludeMetadata
+            ? db
+                .selectFrom('entities')
+                .select([
+                'entities.project_id',
+                'entities.file_id',
+                'entities.commit_id',
+                'entities.name',
+                'entities.sha',
+                'entities.entity_type',
+                'entities.file_path',
+                'entities.description',
+                'entities.documentation',
+                'entities.quality',
+                'entities.created_at',
+                'entities.updated_at',
+            ])
+            : db.selectFrom('entities').selectAll('entities');
+        const query = baseQuery
             .$if(!!branchId, (qb) => qb
             .innerJoin('entity_branches', 'entity_branches.entity_sha', 'entities.sha')
             .where('entity_branches.branch_id', '=', branchId))

package/packages/database/src/lib/loadEntities.js.map

@@ -1 +1 @@
-{"version":3,"file":"loadEntities.js","sourceRoot":"","sources":["../../../../../../packages/database/src/lib/loadEntities.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"loadEntities.js","sourceRoot":"","sources":["../../../../../../packages/database/src/lib/loadEntities.ts"],"names":[],"mappings":"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"}

package/packages/database/src/lib/loadReadyToBeCapturedAnalyses.js

@@ -23,11 +23,14 @@ export default async function loadReadyToBeCapturedAnalyses(params) {
             .select(aliasedTableColumns('scenarios', ScenariosTableColumns))
             .whereRef('scenarios.analysis_id', '=', 'analyses.id')).as('scenarios'),
     ])
-        .where(
-    // Use ->> to extract as text for proper comparison (-> returns JSONB which doesn't compare to string)
-    sql ` ${sql.ref('analyses.status')} ->> 'readyToBeCaptured'`, '=', 'true')
+        // 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(sql `${sql.ref('analyses.status')} -> 'readyToBeCaptured'`, '=', 'true')
         // Exclude entities that are not exported - they cannot be captured because they can't be imported
-        .where(sql `(${sql.ref('entities.metadata')} ->> 'notExported') IS NULL OR (${sql.ref('entities.metadata')} ->> 'notExported') != 'true'`);
+        // Use -> operator for cross-database boolean comparison
+        .where(sql `(${sql.ref('entities.metadata')} -> 'notExported') IS NULL OR (${sql.ref('entities.metadata')} -> 'notExported') != 'true'`);
     if (projectId) {
         query = query.where('analyses.project_id', '=', projectId);
     }

package/packages/database/src/lib/loadReadyToBeCapturedAnalyses.js.map

@@ -1 +1 @@
-{"version":3,"file":"loadReadyToBeCapturedAnalyses.js","sourceRoot":"","sources":["../../../../../../packages/database/src/lib/loadReadyToBeCapturedAnalyses.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"loadReadyToBeCapturedAnalyses.js","sourceRoot":"","sources":["../../../../../../packages/database/src/lib/loadReadyToBeCapturedAnalyses.ts"],"names":[],"mappings":"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"}

package/packages/generate/index.js

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

package/packages/generate/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/generate/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,4BAA4B,EAAE,MAAM,wCAAwC,CAAC;AACjG,OAAO,EAAE,OAAO,IAAI,0BAA0B,EAAE,MAAM,4DAA4D,CAAC;AACnH,OAAO,EAAE,OAAO,IAAI,yBAAyB,EAAE,MAAM,2DAA2D,CAAC;AACjH,OAAO,EAAE,OAAO,IAAI,wBAAwB,EAAE,MAAM,oCAAoC,CAAC;AACzF,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,EAAE,OAAO,IAAI,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACnF,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,0BAA0B,CAAC;AACrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/generate/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,4BAA4B,EAAE,MAAM,wCAAwC,CAAC;AACjG,OAAO,EAAE,OAAO,IAAI,0BAA0B,EAAE,MAAM,4DAA4D,CAAC;AACnH,OAAO,EAAE,OAAO,IAAI,yBAAyB,EAAE,MAAM,2DAA2D,CAAC;AACjH,OAAO,EAAE,OAAO,IAAI,+BAA+B,EAAE,MAAM,iEAAiE,CAAC;AAC7H,OAAO,EAAE,OAAO,IAAI,6BAA6B,EAAE,MAAM,+DAA+D,CAAC;AACzH,OAAO,EAAE,OAAO,IAAI,wBAAwB,EAAE,MAAM,oCAAoC,CAAC;AACzF,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,EAAE,OAAO,IAAI,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACnF,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,0BAA0B,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,0BAA0B,EAAE,MAAM,sCAAsC,CAAC;AAC7F,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC"}

package/packages/generate/src/lib/componentScenarioPage/componentScenarioPageNext.js

@@ -5,9 +5,24 @@ import escapeQuotes from "../escapeQuotes.js";
 import getIFrameMessageListenerCode from "./getIFrameMessageListenerCode.js";
 import getImageReplacementCode from "./getImageReplacementCode.js";
 import getNextJsErrorClosingCode from "./getNextJsErrorClosingCode.js";
+import generateScenarioServerComponent from "./generateScenarioServerComponent.js";
 const VERSION = '0.5.1';
 export default function componentScenarioPageNext({ file, entity, analysis, currentPath, appPath, scenario, relativeMocksDir, }) {
     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 {
@@ -37,7 +52,7 @@ ${getComponentImportStatement({
 ${getImageReplacementCode()}
 
 function Scenario({ name, width, height, children }: { name: string, width: string, height: string, children: ReactNode }) {
-  
+
   useEffect(() => {
     if (typeof window === 'undefined') return;
 

package/packages/generate/src/lib/componentScenarioPage/componentScenarioPageNext.js.map

@@ -1 +1 @@
-{"version":3,"file":"componentScenarioPageNext.js","sourceRoot":"","sources":["../../../../../../../packages/generate/src/lib/componentScenarioPage/componentScenarioPageNext.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,2BAA2B,MAAM,gCAAgC,CAAC;AACzE,OAAO,iBAAiB,MAAM,sBAAsB,CAAC;AACrD,OAAO,YAAY,MAAM,iBAAiB,CAAC;AAC3C,OAAO,4BAA4B,MAAM,gCAAgC,CAAC;AAC1E,OAAO,uBAAuB,MAAM,2BAA2B,CAAC;AAChE,OAAO,yBAAyB,MAAM,6BAA6B,CAAC;AAEpE,MAAM,OAAO,GAAG,OAAO,CAAC;AAExB,MAAM,CAAC,OAAO,UAAU,yBAAyB,CAAC,EAChD,IAAI,EACJ,MAAM,EACN,QAAQ,EACR,WAAW,EACX,OAAO,EACP,QAAQ,EACR,gBAAgB,GASjB;IACC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAEzC,OAAO;;;;;;;;;;;EAWP,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,CAAC,IAAI,8BAA8B,gBAAgB,aAAa,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI;EAC5H,2BAA2B,CAAC;QAC5B,IAAI;QACJ,MAAM;QACN,QAAQ;QACR,WAAW;QACX,OAAO;QACP,QAAQ;QACR,OAAO,EAAE,IAAI;QACb,WAAW,EACT,MAAM,CAAC,IAAI,KAAK,SAAS;YACzB,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,IAAI,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC;YAC7D,MAAM,CAAC,UAAU,KAAK,SAAS;KAClC,CAAC;;;EAGA,uBAAuB,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wBAgEH,QAAQ,KAAK,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,kBAAkB,OAAO;;;;;;;8DAO3B,QAAQ;;;IAGlE,4BAA4B,CAAC,EAAE,YAAY,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC;IAC7D,yBAAyB,EAAE;;;;QAIvB,iBAAiB,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;;;EAG3E,CAAC;AACH,CAAC"}
+{"version":3,"file":"componentScenarioPageNext.js","sourceRoot":"","sources":["../../../../../../../packages/generate/src/lib/componentScenarioPage/componentScenarioPageNext.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,2BAA2B,MAAM,gCAAgC,CAAC;AACzE,OAAO,iBAAiB,MAAM,sBAAsB,CAAC;AACrD,OAAO,YAAY,MAAM,iBAAiB,CAAC;AAC3C,OAAO,4BAA4B,MAAM,gCAAgC,CAAC;AAC1E,OAAO,uBAAuB,MAAM,2BAA2B,CAAC;AAChE,OAAO,yBAAyB,MAAM,6BAA6B,CAAC;AACpE,OAAO,+BAA+B,MAAM,mCAAmC,CAAC;AAEhF,MAAM,OAAO,GAAG,OAAO,CAAC;AAExB,MAAM,CAAC,OAAO,UAAU,yBAAyB,CAAC,EAChD,IAAI,EACJ,MAAM,EACN,QAAQ,EACR,WAAW,EACX,OAAO,EACP,QAAQ,EACR,gBAAgB,GASjB;IACC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAEzC,6EAA6E;IAC7E,+DAA+D;IAC/D,IAAI,MAAM,CAAC,QAAQ,EAAE,OAAO,EAAE,CAAC;QAC7B,OAAO,+BAA+B,CAAC;YACrC,IAAI;YACJ,MAAM;YACN,QAAQ;YACR,WAAW;YACX,OAAO;YACP,QAAQ;YACR,gBAAgB;SACjB,CAAC,CAAC;IACL,CAAC;IAED,uEAAuE;IACvE,OAAO;;;;;;;;;;;EAWP,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,CAAC,IAAI,8BAA8B,gBAAgB,aAAa,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI;EAC5H,2BAA2B,CAAC;QAC5B,IAAI;QACJ,MAAM;QACN,QAAQ;QACR,WAAW;QACX,OAAO;QACP,QAAQ;QACR,OAAO,EAAE,IAAI;QACb,WAAW,EACT,MAAM,CAAC,IAAI,KAAK,SAAS;YACzB,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,IAAI,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC;YAC7D,MAAM,CAAC,UAAU,KAAK,SAAS;KAClC,CAAC;;;EAGA,uBAAuB,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wBAgEH,QAAQ,KAAK,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,kBAAkB,OAAO;;;;;;;8DAO3B,QAAQ;;;IAGlE,4BAA4B,CAAC,EAAE,YAAY,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC;IAC7D,yBAAyB,EAAE;;;;QAIvB,iBAAiB,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;;;EAG3E,CAAC;AACH,CAAC"}