@codeyam/codeyam-cli 0.1.0-staging.9574237 → 0.1.0-staging.a2f381a

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

@@ -11,15 +11,15 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@aws-sdk/client-codebuild": "^3.1000.0",
+    "@aws-sdk/client-codebuild": "^3.1014.0",
     "@aws-sdk/client-cloudwatch-logs": "^3.990.0",
     "@aws-sdk/client-dynamodb": "^3.990.0",
-    "@aws-sdk/client-ecr": "^3.990.0",
+    "@aws-sdk/client-ecr": "^3.1019.0",
     "@aws-sdk/client-ecs": "^3.1009.0",
-    "@aws-sdk/client-s3": "^3.990.0",
-    "@aws-sdk/client-sqs": "^3.990.0",
-    "@aws-sdk/lib-storage": "^3.990.0",
-    "@aws-sdk/s3-request-presigner": "^3.990.0",
+    "@aws-sdk/client-s3": "^3.1019.0",
+    "@aws-sdk/client-sqs": "^3.1020.0",
+    "@aws-sdk/lib-storage": "^3.1019.0",
+    "@aws-sdk/s3-request-presigner": "^3.1019.0",
     "@aws-sdk/util-dynamodb": "^3.990.0"
   }
 }

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

@@ -15,7 +15,7 @@
     "@supabase/supabase-js": "2.88.0",
     "better-sqlite3": "^12.6.2",
     "fetch-retry": "^6.0.0",
-    "kysely": "^0.28.11",
+    "kysely": "^0.28.14",
     "pg": "^8.20.0"
   },
   "jest": {
@@ -25,7 +25,7 @@
   "devDependencies": {
     "@types/better-sqlite3": "^7.6.13",
     "@types/jest": "^30.0.0",
-    "@types/pg": "^8.18.0",
+    "@types/pg": "^8.20.0",
     "@types/ws": "^8.18.1"
   }
 }

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

@@ -173,21 +173,31 @@ export default async function loadAnalysis({
     const queryTime = Date.now() - startTime;
 
     if (!analysis) {
-      awsLog('CodeYam Error: Analysis not found', null, {
-        id,
-        analysisBranchId,
-        projectId,
-        fileId,
-        commitId,
-        entityName,
-        dependencyAnalyzedTreeSha,
-        analyzedTreeSha,
-        includeFile,
-        includeProject,
-        includeCommitAndBranch,
-        includeScenarios,
-        includeBranches,
-      });
+      // When queried by dependencyAnalyzedTreeSha, this is a cache check
+      // (findValidExistingAnalysis pattern). Not finding a cached analysis is
+      // expected for new entities — log as debug, not error.
+      const isExpectedMiss = !!dependencyAnalyzedTreeSha;
+      awsLog(
+        isExpectedMiss
+          ? `CodeYam: Analysis cache miss for dependency tree SHA ${dependencyAnalyzedTreeSha.substring(0, 12)}...`
+          : `CodeYam Error: Analysis not found${entityName ? ` for ${entityName}` : ''}${id ? ` (id=${id})` : ''}`,
+        null,
+        {
+          id,
+          analysisBranchId,
+          projectId,
+          fileId,
+          commitId,
+          entityName,
+          dependencyAnalyzedTreeSha,
+          analyzedTreeSha,
+          includeFile,
+          includeProject,
+          includeCommitAndBranch,
+          includeScenarios,
+          includeBranches,
+        },
+      );
       return null;
     }
 

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

@@ -7,6 +7,9 @@ import { getEntityBranchesAsJson } from './loadEntityBranches';
 export interface loadEntityArgs {
   projectId: string;
   sha: string;
+  /** When true, suppress "Entity not found" log. Use when the caller expects
+   *  the entity might not exist (e.g., findOrCreateEntity on fresh databases). */
+  silent?: boolean;
 }
 
 export interface loadEntityByNameAndPathArgs {
@@ -15,7 +18,11 @@ export interface loadEntityByNameAndPathArgs {
   filePath: string;
 }
 
-export default async function loadEntity({ projectId, sha }: loadEntityArgs) {
+export default async function loadEntity({
+  projectId,
+  sha,
+  silent,
+}: loadEntityArgs) {
   const db = getDatabase();
 
   try {
@@ -33,13 +40,17 @@ export default async function loadEntity({ projectId, sha }: loadEntityArgs) {
       .executeTakeFirst();
 
     if (!entity) {
-      // Only log at debug level - Entity not found is expected in E2E baseline mode
-      // where entities are created fresh and don't exist in the database yet
-      if (process.env.CODEYAM_E2E_BASELINE_MODE !== 'true') {
-        awsLog('CodeYam Error: Load Entity: Entity not found', null, {
-          projectId,
-          sha,
-        });
+      // Entity not found is expected in baseline mode (fresh DB) and in
+      // findOrCreateEntity where the caller creates the entity if missing.
+      if (!silent && process.env.CODEYAM_E2E_BASELINE_MODE !== 'true') {
+        awsLog(
+          `CodeYam Error: Load Entity: Entity not found (sha=${sha?.substring(0, 12)})`,
+          null,
+          {
+            projectId,
+            sha,
+          },
+        );
       }
       return null;
     }

package/analyzer-template/packages/github/dist/database/src/lib/loadAnalysis.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loadAnalysis.d.ts","sourceRoot":"","sources":["../../../../../database/src/lib/loadAnalysis.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,gBAAgB;IAC/B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,wBAA8B,YAAY,CAAC,EACzC,EAAE,EACF,gBAAgB,EAChB,SAAS,EACT,MAAM,EACN,QAAQ,EACR,UAAU,EACV,yBAAyB,EACzB,eAAe,EACf,WAAW,EACX,cAAc,EACd,sBAAsB,EACtB,gBAAgB,EAChB,eAAe,GAChB,EAAE,gBAAgB,8CAmLlB"}
+{"version":3,"file":"loadAnalysis.d.ts","sourceRoot":"","sources":["../../../../../database/src/lib/loadAnalysis.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,gBAAgB;IAC/B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,wBAA8B,YAAY,CAAC,EACzC,EAAE,EACF,gBAAgB,EAChB,SAAS,EACT,MAAM,EACN,QAAQ,EACR,UAAU,EACV,yBAAyB,EACzB,eAAe,EACf,WAAW,EACX,cAAc,EACd,sBAAsB,EACtB,gBAAgB,EAChB,eAAe,GAChB,EAAE,gBAAgB,8CA6LlB"}

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

@@ -91,7 +91,13 @@ export default async function loadAnalysis({ id, analysisBranchId, projectId, fi
         const analysis = await query.executeTakeFirst();
         const queryTime = Date.now() - startTime;
         if (!analysis) {
-            awsLog('CodeYam Error: Analysis not found', null, {
+            // When queried by dependencyAnalyzedTreeSha, this is a cache check
+            // (findValidExistingAnalysis pattern). Not finding a cached analysis is
+            // expected for new entities — log as debug, not error.
+            const isExpectedMiss = !!dependencyAnalyzedTreeSha;
+            awsLog(isExpectedMiss
+                ? `CodeYam: Analysis cache miss for dependency tree SHA ${dependencyAnalyzedTreeSha.substring(0, 12)}...`
+                : `CodeYam Error: Analysis not found${entityName ? ` for ${entityName}` : ''}${id ? ` (id=${id})` : ''}`, null, {
                 id,
                 analysisBranchId,
                 projectId,

package/analyzer-template/packages/github/dist/database/src/lib/loadAnalysis.js.map

@@ -1 +1 @@
-{"version":3,"file":"loadAnalysis.js","sourceRoot":"","sources":["../../../../../database/src/lib/loadAnalysis.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAExC,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,+BAA+B,EAAE,MAAM,wBAAwB,CAAC;AACzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAmBnE,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,YAAY,CAAC,EACzC,EAAE,EACF,gBAAgB,EAChB,SAAS,EACT,MAAM,EACN,QAAQ,EACR,UAAU,EACV,yBAAyB,EACzB,eAAe,EACf,WAAW,EACX,cAAc,EACd,sBAAsB,EACtB,gBAAgB,EAChB,eAAe,GACE;IACjB,kFAAkF;IAClF,6EAA6E;IAC7E,MAAM,EAAE,GAAG,WAAW,EAAE,CAAC;IACzB,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAE7B,IAAI,CAAC;QACH,uBAAuB;QACvB,IAAI,KAAK,GAAG,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QAE5D,mBAAmB;QACnB,IAAI,EAAE,EAAE,CAAC;YACP,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;QACrC,CAAC;QAED,IAAI,SAAS,EAAE,CAAC;YACd,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,YAAY,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC;QACpD,CAAC;QAED,gDAAgD;QAChD,IAAI,yBAAyB,EAAE,CAAC;YAC9B,KAAK,GAAG,KAAK,CAAC,KAAK,CACjB,8BAA8B,EAC9B,GAAG,EACH,yBAAyB,CAC1B,CAAC;QACJ,CAAC;aAAM,IAAI,eAAe,EAAE,CAAC;YAC3B,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,mBAAmB,EAAE,GAAG,EAAE,eAAe,CAAC,CAAC;QACjE,CAAC;aAAM,IAAI,MAAM,EAAE,CAAC;YAClB,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;QAC9C,CAAC;QAED,IAAI,UAAU,EAAE,CAAC;YACf,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,aAAa,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;QACtD,CAAC;QAED,IAAI,QAAQ,EAAE,CAAC;YACb,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,WAAW,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;QAClD,CAAC;aAAM,CAAC;YACN,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACvD,CAAC;QAED,uEAAuE;QACvE,IAAI,gBAAgB,EAAE,CAAC;YACrB,KAAK,GAAG,KAAK;iBACV,SAAS,CACR,mBAAmB,EACnB,aAAa,EACb,+BAA+B,CAChC;iBACA,KAAK,CAAC,sBAAsB,EAAE,GAAG,EAAE,gBAAgB,CAAC,CAAC;QAC1D,CAAC;QAED,MAAM,EAAE,cAAc,EAAE,aAAa,EAAE,GAAG,aAAa,EAAE,CAAC;QAE1D,+CAA+C;QAC/C,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,EAA+B,EAAE,EAAE;YACvD,MAAM,UAAU,GAAG,EAAE,CAAC;YAEtB,wBAAwB;YACxB,UAAU,CAAC,IAAI,CACb,cAAc,CACZ,EAAE;iBACC,UAAU,CAAC,UAAU,CAAC;iBACtB,MAAM,CAAC,oBAAoB,CAAC;iBAC5B,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE,qBAAqB,CAAC,CACxD,CAAC,EAAE,CAAC,QAAQ,CAAC,CACf,CAAC;YAEF,IAAI,WAAW,EAAE,CAAC;gBAChB,UAAU,CAAC,IAAI,CACb,cAAc,CACZ,EAAE;qBACC,UAAU,CAAC,OAAO,CAAC;qBACnB,MAAM,CAAC,iBAAiB,CAAC;qBACzB,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE,kBAAkB,CAAC,CACjD,CAAC,EAAE,CAAC,MAAM,CAAC,CACb,CAAC;YACJ,CAAC;YAED,IAAI,cAAc,EAAE,CAAC;gBACnB,UAAU,CAAC,IAAI,CACb,cAAc,CACZ,EAAE;qBACC,UAAU,CAAC,UAAU,CAAC;qBACtB,MAAM,CAAC,oBAAoB,CAAC;qBAC5B,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE,qBAAqB,CAAC,CACvD,CAAC,EAAE,CAAC,SAAS,CAAC,CAChB,CAAC;YACJ,CAAC;YAED,IAAI,gBAAgB,EAAE,CAAC;gBACrB,UAAU,CAAC,IAAI,CACb,aAAa,CACX,EAAE;qBACC,UAAU,CAAC,WAAW,CAAC;qBACvB,MAAM,CAAC,qBAAqB,CAAC;qBAC7B,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE,aAAa,CAAC,CACzD,CAAC,EAAE,CAAC,WAAW,CAAC,CAClB,CAAC;YACJ,CAAC;YAED,IAAI,eAAe,EAAE,CAAC;gBACpB,UAAU,CAAC,IAAI,CACb,+BAA+B,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,EAAE,CAC1C,GAAG,CAAC,QAAQ,CAAC,+BAA+B,EAAE,GAAG,EAAE,aAAa,CAAC,CAClE,CAAC,EAAE,CAAC,mBAAmB,CAAC,CAC1B,CAAC;YACJ,CAAC;YAED,qCAAqC;YACrC,IAAI,sBAAsB,EAAE,CAAC;gBAC3B,UAAU,CAAC,IAAI,CACb,cAAc,CACZ,EAAE;qBACC,UAAU,CAAC,SAAS,CAAC;qBACrB,MAAM,CAAC,mBAAmB,CAAC;qBAC3B,MAAM,CAAC,CAAC,KAAU,EAAE,EAAE,CACrB,sBAAsB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAC3C;qBACA,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE,oBAAoB,CAAC,CACrD,CAAC,EAAE,CAAC,QAAQ,CAAC,CACf,CAAC;YACJ,CAAC;YAED,OAAO,UAAU,CAAC;QACpB,CAAC,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,gBAAgB,EAAE,CAAC;QAChD,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;QAEzC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,CAAC,mCAAmC,EAAE,IAAI,EAAE;gBAChD,EAAE;gBACF,gBAAgB;gBAChB,SAAS;gBACT,MAAM;gBACN,QAAQ;gBACR,UAAU;gBACV,yBAAyB;gBACzB,eAAe;gBACf,WAAW;gBACX,cAAc;gBACd,sBAAsB;gBACtB,gBAAgB;gBAChB,eAAe;aAChB,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACd,CAAC;QAED,sGAAsG;QACtG,IAAI,SAAS,GAAG,GAAG,IAAI,sBAAsB,EAAE,CAAC;YAC9C,MAAM,MAAM,GAAI,QAAgB,CAAC,MAAM,CAAC;YACxC,MAAM,SAAS,GAAG,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1E,OAAO,CAAC,GAAG,CACT,wDAAwD,SAAS,cAAc,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,KAAK,EAChH,EAAE,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAE,UAAU,EAAE,QAAQ,CAAC,WAAW,EAAE,CACtD,CAAC;QACJ,CAAC;QAED,OAAO,YAAY,CAAC,QAAQ,CAAC,CAAC;IAChC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,gDAAgD,EAAE,KAAK,EAAE;YAC9D,EAAE;YACF,gBAAgB;YAChB,SAAS;YACT,MAAM;YACN,QAAQ;YACR,UAAU;YACV,yBAAyB;YACzB,eAAe;YACf,WAAW;YACX,cAAc;YACd,sBAAsB;YACtB,gBAAgB;YAChB,eAAe;SAChB,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC"}
+{"version":3,"file":"loadAnalysis.js","sourceRoot":"","sources":["../../../../../database/src/lib/loadAnalysis.ts"],"names":[],"mappings":"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"}

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

@@ -1,13 +1,16 @@
 export interface loadEntityArgs {
     projectId: string;
     sha: string;
+    /** When true, suppress "Entity not found" log. Use when the caller expects
+     *  the entity might not exist (e.g., findOrCreateEntity on fresh databases). */
+    silent?: boolean;
 }
 export interface loadEntityByNameAndPathArgs {
     projectId: string;
     name: string;
     filePath: string;
 }
-export default function loadEntity({ projectId, sha }: loadEntityArgs): Promise<import("~codeyam/types").Entity>;
+export default function loadEntity({ projectId, sha, silent, }: loadEntityArgs): Promise<import("~codeyam/types").Entity>;
 /**
  * Load entity by name and file path instead of SHA.
  * This is useful for E2E tests where we want to avoid hardcoding SHAs.

package/analyzer-template/packages/github/dist/database/src/lib/loadEntity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loadEntity.d.ts","sourceRoot":"","sources":["../../../../../database/src/lib/loadEntity.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,2BAA2B;IAC1C,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,wBAA8B,UAAU,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE,cAAc,4CAqC1E;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,CAAC,EAC5C,SAAS,EACT,IAAI,EACJ,QAAQ,GACT,EAAE,2BAA2B,4CAwC7B"}
+{"version":3,"file":"loadEntity.d.ts","sourceRoot":"","sources":["../../../../../database/src/lib/loadEntity.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ;oFACgF;IAChF,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,2BAA2B;IAC1C,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,wBAA8B,UAAU,CAAC,EACvC,SAAS,EACT,GAAG,EACH,MAAM,GACP,EAAE,cAAc,4CAyChB;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,CAAC,EAC5C,SAAS,EACT,IAAI,EACJ,QAAQ,GACT,EAAE,2BAA2B,4CAwC7B"}

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

@@ -2,7 +2,7 @@ import { getDatabase } from './kysely/db';
 import dbToEntity from './dbToEntity';
 import { awsLog } from '~codeyam/utils';
 import { getEntityBranchesAsJson } from './loadEntityBranches';
-export default async function loadEntity({ projectId, sha }) {
+export default async function loadEntity({ projectId, sha, silent, }) {
     const db = getDatabase();
     try {
         const entity = await db
@@ -14,10 +14,10 @@ export default async function loadEntity({ projectId, sha }) {
             .where('entities.sha', '=', sha)
             .executeTakeFirst();
         if (!entity) {
-            // Only log at debug level - Entity not found is expected in E2E baseline mode
-            // where entities are created fresh and don't exist in the database yet
-            if (process.env.CODEYAM_E2E_BASELINE_MODE !== 'true') {
-                awsLog('CodeYam Error: Load Entity: Entity not found', null, {
+            // Entity not found is expected in baseline mode (fresh DB) and in
+            // findOrCreateEntity where the caller creates the entity if missing.
+            if (!silent && process.env.CODEYAM_E2E_BASELINE_MODE !== 'true') {
+                awsLog(`CodeYam Error: Load Entity: Entity not found (sha=${sha?.substring(0, 12)})`, null, {
                     projectId,
                     sha,
                 });

package/analyzer-template/packages/github/dist/database/src/lib/loadEntity.js.map

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

package/analyzer-template/packages/utils/dist/utils/src/lib/fs/rsyncCopy.d.ts

@@ -1,9 +1,11 @@
-export default function rsyncCopy({ sourcePath, destinationPath, excludes, keepExisting, silent, extraArgs, }: {
+export default function rsyncCopy({ sourcePath, destinationPath, excludes, keepExisting, silent, extraArgs, timeoutMs, }: {
     sourcePath: string;
     destinationPath: string;
     excludes?: string[];
     keepExisting?: boolean;
     silent?: boolean;
     extraArgs?: string[];
+    /** Timeout in milliseconds. Defaults to 300s (5 min). */
+    timeoutMs?: number;
 }): Promise<void>;
 //# sourceMappingURL=rsyncCopy.d.ts.map

package/analyzer-template/packages/utils/dist/utils/src/lib/fs/rsyncCopy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rsyncCopy.d.ts","sourceRoot":"","sources":["../../../../../src/lib/fs/rsyncCopy.ts"],"names":[],"mappings":"AAqFA,wBAA8B,SAAS,CAAC,EACtC,UAAU,EACV,eAAe,EACf,QAAa,EACb,YAAoB,EACpB,MAAc,EACd,SAAc,GACf,EAAE;IACD,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB,GAAG,OAAO,CAAC,IAAI,CAAC,CAkFhB"}
+{"version":3,"file":"rsyncCopy.d.ts","sourceRoot":"","sources":["../../../../../src/lib/fs/rsyncCopy.ts"],"names":[],"mappings":"AAqFA,wBAA8B,SAAS,CAAC,EACtC,UAAU,EACV,eAAe,EACf,QAAa,EACb,YAAoB,EACpB,MAAc,EACd,SAAc,EACd,SAAmB,GACpB,EAAE;IACD,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,yDAAyD;IACzD,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GAAG,OAAO,CAAC,IAAI,CAAC,CA0GhB"}

package/analyzer-template/packages/utils/dist/utils/src/lib/fs/rsyncCopy.js

@@ -71,7 +71,7 @@ function tryApfsClone({ sourcePath, destinationPath, excludes, silent, }) {
         return false;
     }
 }
-export default async function rsyncCopy({ sourcePath, destinationPath, excludes = [], keepExisting = false, silent = false, extraArgs = [], }) {
+export default async function rsyncCopy({ sourcePath, destinationPath, excludes = [], keepExisting = false, silent = false, extraArgs = [], timeoutMs = 300000, }) {
     const startTime = Date.now();
     // On macOS, try APFS copy-on-write clone first (near-instant).
     // Skip when extraArgs are provided since those are rsync-specific flags
@@ -110,7 +110,23 @@ export default async function rsyncCopy({ sourcePath, destinationPath, excludes
         }
         rsyncArgs.push(source, dest);
         const rsyncProcess = spawn('rsync', rsyncArgs);
+        let settled = false;
+        const timer = timeoutMs
+            ? setTimeout(() => {
+                if (!settled) {
+                    settled = true;
+                    rsyncProcess.kill('SIGKILL');
+                    const duration = ((Date.now() - startTime) / 1000).toFixed(1);
+                    reject(new Error(`rsync timed out after ${duration}s syncing ${sourcePath} → ${destinationPath}`));
+                }
+            }, timeoutMs)
+            : undefined;
         rsyncProcess.on('exit', (code) => {
+            if (settled)
+                return;
+            settled = true;
+            if (timer)
+                clearTimeout(timer);
             if (code === 0) {
                 if (!silent) {
                     const duration = ((Date.now() - startTime) / 1000).toFixed(1);
@@ -126,6 +142,11 @@ export default async function rsyncCopy({ sourcePath, destinationPath, excludes
             }
         });
         rsyncProcess.on('error', (error) => {
+            if (settled)
+                return;
+            settled = true;
+            if (timer)
+                clearTimeout(timer);
             if (!silent) {
                 console.log('Error occurred:', error);
             }

package/analyzer-template/packages/utils/dist/utils/src/lib/fs/rsyncCopy.js.map

@@ -1 +1 @@
-{"version":3,"file":"rsyncCopy.js","sourceRoot":"","sources":["../../../../../src/lib/fs/rsyncCopy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC;AACrD,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B;;;;;GAKG;AACH,SAAS,YAAY,CAAC,EACpB,UAAU,EACV,eAAe,EACf,QAAQ,EACR,MAAM,GAMP;IACC,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAEhD,oDAAoD;IACpD,gEAAgE;IAChE,IAAI,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;QAChC,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,WAAW,CAAC,eAAe,CAAC,CAAC;YAC9C,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACxB,iEAAiE;gBACjE,OAAO,KAAK,CAAC;YACf,CAAC;YACD,MAAM,CAAC,eAAe,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/C,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED,IAAI,CAAC;QACH,2EAA2E;QAC3E,QAAQ,CAAC,aAAa,UAAU,MAAM,eAAe,GAAG,EAAE;YACxD,KAAK,EAAE,MAAM;YACb,OAAO,EAAE,MAAO,EAAE,uBAAuB;SAC1C,CAAC,CAAC;QAEH,uCAAuC;QACvC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC1B,qCAAqC;gBACrC,IAAI,CAAC;oBACH,QAAQ,CAAC,WAAW,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,GAAG,EAAE;wBACrD,KAAK,EAAE,MAAM;wBACb,KAAK,EAAE,SAAS;qBACjB,CAAC,CAAC;gBACL,CAAC;gBAAC,MAAM,CAAC;oBACP,8BAA8B;gBAChC,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,WAAW,GAAG,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;gBACnD,IAAI,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;oBAC5B,MAAM,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;gBACxD,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,CAAC,GAAG,CACT,oCAAoC,UAAU,OAAO,eAAe,EAAE,CACvE,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,mEAAmE;QACnE,6BAA6B;QAC7B,IAAI,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;YAChC,IAAI,CAAC;gBACH,MAAM,CAAC,eAAe,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC/C,CAAC;YAAC,MAAM,CAAC;gBACP,sBAAsB;YACxB,CAAC;QACH,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,SAAS,CAAC,EACtC,UAAU,EACV,eAAe,EACf,QAAQ,GAAG,EAAE,EACb,YAAY,GAAG,KAAK,EACpB,MAAM,GAAG,KAAK,EACd,SAAS,GAAG,EAAE,GAQf;IACC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAE7B,+DAA+D;IAC/D,wEAAwE;IACxE,mCAAmC;IACnC,IAAI,CAAC,YAAY,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5C,MAAM,MAAM,GAAG,YAAY,CAAC;YAC1B,UAAU;YACV,eAAe;YACf,QAAQ;YACR,MAAM;SACP,CAAC,CAAC;QACH,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,MAAM,QAAQ,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;gBAC9D,OAAO,CAAC,GAAG,CACT,yBAAyB,UAAU,OAAO,eAAe,WAAW,QAAQ,IAAI,CACjF,CAAC;YACJ,CAAC;YACD,OAAO;QACT,CAAC;IACH,CAAC;IAED,qBAAqB;IACrB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,GAAG,CAAC;QACxE,MAAM,IAAI,GAAG,eAAe,CAAC,QAAQ,CAAC,GAAG,CAAC;YACxC,CAAC,CAAC,eAAe;YACjB,CAAC,CAAC,GAAG,eAAe,GAAG,CAAC;QAE1B,wEAAwE;QACxE,MAAM,SAAS,GAAG,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;QAE1C,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,SAAS,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QACxC,CAAC;QAED,wCAAwC;QACxC,SAAS,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC;QAE7B,8BAA8B;QAC9B,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,SAAS,CAAC,IAAI,CAAC,aAAa,OAAO,EAAE,CAAC,CAAC;QACzC,CAAC;QAED,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAE7B,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAE/C,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YAC/B,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;gBACf,IAAI,CAAC,MAAM,EAAE,CAAC;oBACZ,MAAM,QAAQ,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;oBAC9D,OAAO,CAAC,GAAG,CACT,yBAAyB,UAAU,OAAO,eAAe,WAAW,QAAQ,IAAI,CACjF,CAAC;gBACJ,CAAC;gBACD,OAAO,EAAE,CAAC;YACZ,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,KAAK,CACX,0CAA0C,IAAI,EAAE,EAChD,IAAI,CAAC,SAAS,CACZ;oBACE,SAAS;iBACV,EACD,IAAI,EACJ,CAAC,CACF,CACF,CAAC;gBAEF,MAAM,CAAC,IAAI,KAAK,CAAC,+BAA+B,IAAI,EAAE,CAAC,CAAC,CAAC;YAC3D,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YACjC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC;YACxC,CAAC;YACD,MAAM,CAAC,KAAK,CAAC,CAAC;QAChB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"rsyncCopy.js","sourceRoot":"","sources":["../../../../../src/lib/fs/rsyncCopy.ts"],"names":[],"mappings":"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"}

package/analyzer-template/packages/utils/src/lib/fs/rsyncCopy.ts

@@ -90,6 +90,7 @@ export default async function rsyncCopy({
   keepExisting = false,
   silent = false,
   extraArgs = [],
+  timeoutMs = 300_000,
 }: {
   sourcePath: string;
   destinationPath: string;
@@ -97,6 +98,8 @@ export default async function rsyncCopy({
   keepExisting?: boolean;
   silent?: boolean;
   extraArgs?: string[];
+  /** Timeout in milliseconds. Defaults to 300s (5 min). */
+  timeoutMs?: number;
 }): Promise<void> {
   const startTime = Date.now();
 
@@ -147,7 +150,27 @@ export default async function rsyncCopy({
 
     const rsyncProcess = spawn('rsync', rsyncArgs);
 
+    let settled = false;
+    const timer = timeoutMs
+      ? setTimeout(() => {
+          if (!settled) {
+            settled = true;
+            rsyncProcess.kill('SIGKILL');
+            const duration = ((Date.now() - startTime) / 1000).toFixed(1);
+            reject(
+              new Error(
+                `rsync timed out after ${duration}s syncing ${sourcePath} → ${destinationPath}`,
+              ),
+            );
+          }
+        }, timeoutMs)
+      : undefined;
+
     rsyncProcess.on('exit', (code) => {
+      if (settled) return;
+      settled = true;
+      if (timer) clearTimeout(timer);
+
       if (code === 0) {
         if (!silent) {
           const duration = ((Date.now() - startTime) / 1000).toFixed(1);
@@ -173,6 +196,10 @@ export default async function rsyncCopy({
     });
 
     rsyncProcess.on('error', (error) => {
+      if (settled) return;
+      settled = true;
+      if (timer) clearTimeout(timer);
+
       if (!silent) {
         console.log('Error occurred:', error);
       }

package/analyzer-template/project/analyzeFileEntities.ts

@@ -120,6 +120,32 @@ export default async function analyzeFileEntities({
           }
         }
       }
+
+      // If still not found at the old file path, search all project files.
+      // This handles entity extraction: e.g., MyComponent was moved from
+      // src/library/MonolithPage.tsx to src/components/MyComponent.tsx.
+      if (!basicEntity && dbEntity) {
+        for (const f of filesToIterate) {
+          if (f.path === dbEntity.filePath) continue; // already checked above
+          // Ensure entities are loaded for this file when using fileStore
+          let fileToCheck = f;
+          if (fileStore && !fileStore.isEntitiesLoaded(f.path)) {
+            fileToCheck = await fileStore.ensureEntities(f.path);
+          }
+          const match = (fileToCheck.entities || []).find(
+            (e) => e.name === dbEntity.name,
+          );
+          if (match) {
+            console.log(
+              `CodeYam: Entity "${dbEntity.name}" moved from ${dbEntity.filePath} to ${fileToCheck.path} (old SHA: ${entitySha}, new SHA: ${match.sha})`,
+            );
+            match.file = fileToCheck;
+            basicEntity = match;
+            entityShas[ii] = match.sha;
+            break;
+          }
+        }
+      }
     }
 
     if (!basicEntity) {

package/analyzer-template/project/runMultiScenarioServer.ts

@@ -200,18 +200,41 @@ export async function runMultiScenarioServer({
           serverStartResolve(port);
         }
 
-        // In interactive mode, log the first scenario URL
+        // In interactive mode, log the scenario URL for the UI to extract.
+        // Use INITIAL_SCENARIO_ID (the scenario the user clicked) if set,
+        // otherwise fall back to the first scenario.
         if (process.env.INTERACTIVE_MODE === 'true' && scenarios.length > 0) {
-          const firstScenario = scenarios[0].scenario;
+          const initialId = process.env.INITIAL_SCENARIO_ID;
+          const initialScenario = initialId
+            ? (scenarios.find((s) => s.scenario.id === initialId)?.scenario ??
+              scenarios[0].scenario)
+            : scenarios[0].scenario;
           const scenarioPath = getScenarioUrl({
             project,
             file: analysis.file,
             analysis,
-            scenario: firstScenario,
+            scenario: initialScenario,
             framework,
           });
           const serverUrl = `http://localhost:${projectPort}${scenarioPath}`;
           awsLog(`$$INTERACTIVE_SERVER_URL$$:${serverUrl}`);
+
+          // Publish URL map for ALL scenarios so the UI can switch without URL manipulation.
+          // Each scenario ID maps to its full URL on this server.
+          const scenarioUrlMap: Record<string, string> = {};
+          for (const { scenario: s } of scenarios) {
+            const sPath = getScenarioUrl({
+              project,
+              file: analysis.file,
+              analysis,
+              scenario: s,
+              framework,
+            });
+            scenarioUrlMap[s.id] = `http://localhost:${projectPort}${sPath}`;
+          }
+          awsLog(
+            `$$INTERACTIVE_SCENARIO_URLS$$:${JSON.stringify(scenarioUrlMap)}`,
+          );
         }
 
         if (open && scenarios.length > 0) {

package/background/src/lib/virtualized/project/analyzeFileEntities.js

@@ -60,6 +60,28 @@ export default async function analyzeFileEntities({ project, projectAnalyzer, co
                     }
                 }
             }
+            // If still not found at the old file path, search all project files.
+            // This handles entity extraction: e.g., MyComponent was moved from
+            // src/library/MonolithPage.tsx to src/components/MyComponent.tsx.
+            if (!basicEntity && dbEntity) {
+                for (const f of filesToIterate) {
+                    if (f.path === dbEntity.filePath)
+                        continue; // already checked above
+                    // Ensure entities are loaded for this file when using fileStore
+                    let fileToCheck = f;
+                    if (fileStore && !fileStore.isEntitiesLoaded(f.path)) {
+                        fileToCheck = await fileStore.ensureEntities(f.path);
+                    }
+                    const match = (fileToCheck.entities || []).find((e) => e.name === dbEntity.name);
+                    if (match) {
+                        console.log(`CodeYam: Entity "${dbEntity.name}" moved from ${dbEntity.filePath} to ${fileToCheck.path} (old SHA: ${entitySha}, new SHA: ${match.sha})`);
+                        match.file = fileToCheck;
+                        basicEntity = match;
+                        entityShas[ii] = match.sha;
+                        break;
+                    }
+                }
+            }
         }
         if (!basicEntity) {
             // This should be very rare now that we have early validation in prep.ts

package/background/src/lib/virtualized/project/analyzeFileEntities.js.map

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

package/background/src/lib/virtualized/project/runMultiScenarioServer.js

@@ -129,18 +129,38 @@ export async function runMultiScenarioServer({ project, analysis, scenarios, fra
                 if (serverStartResolve) {
                     serverStartResolve(port);
                 }
-                // In interactive mode, log the first scenario URL
+                // In interactive mode, log the scenario URL for the UI to extract.
+                // Use INITIAL_SCENARIO_ID (the scenario the user clicked) if set,
+                // otherwise fall back to the first scenario.
                 if (process.env.INTERACTIVE_MODE === 'true' && scenarios.length > 0) {
-                    const firstScenario = scenarios[0].scenario;
+                    const initialId = process.env.INITIAL_SCENARIO_ID;
+                    const initialScenario = initialId
+                        ? (scenarios.find((s) => s.scenario.id === initialId)?.scenario ??
+                            scenarios[0].scenario)
+                        : scenarios[0].scenario;
                     const scenarioPath = getScenarioUrl({
                         project,
                         file: analysis.file,
                         analysis,
-                        scenario: firstScenario,
+                        scenario: initialScenario,
                         framework,
                     });
                     const serverUrl = `http://localhost:${projectPort}${scenarioPath}`;
                     awsLog(`$$INTERACTIVE_SERVER_URL$$:${serverUrl}`);
+                    // Publish URL map for ALL scenarios so the UI can switch without URL manipulation.
+                    // Each scenario ID maps to its full URL on this server.
+                    const scenarioUrlMap = {};
+                    for (const { scenario: s } of scenarios) {
+                        const sPath = getScenarioUrl({
+                            project,
+                            file: analysis.file,
+                            analysis,
+                            scenario: s,
+                            framework,
+                        });
+                        scenarioUrlMap[s.id] = `http://localhost:${projectPort}${sPath}`;
+                    }
+                    awsLog(`$$INTERACTIVE_SCENARIO_URLS$$:${JSON.stringify(scenarioUrlMap)}`);
                 }
                 if (open && scenarios.length > 0) {
                     const url = `http://localhost:${projectPort}/static/codeyam-sample`;