@codeyam/codeyam-cli 0.1.0-staging.1 → 0.1.0-staging.1669d45

package/analyzer-template/packages/aws/src/lib/codebuild/waitForBuild.ts

@@ -1,11 +1,30 @@
 import {
-  CodeBuildClient,
   BatchGetBuildsCommand,
+  CodeBuildClient,
 } from '@aws-sdk/client-codebuild';
 
+export interface BuildResult {
+  status: 'SUCCEEDED' | 'FAILED' | 'TIMED_OUT';
+  buildId: string;
+  consoleUrl: string;
+  failedPhase?: {
+    phaseType: string;
+    statusCode?: string;
+    message?: string;
+  };
+}
+
+function getConsoleUrl(buildId: string): string {
+  // buildId format: project-name:uuid
+  // ARN format: arn:aws:codebuild:region:account:build/project-name:uuid
+  const region = process.env.AWS_REGION || 'us-east-1';
+  const encodedBuildId = encodeURIComponent(buildId);
+  return `https://${region}.console.aws.amazon.com/codesuite/codebuild/projects/${buildId.split(':')[0]}/build/${encodedBuildId}/log`;
+}
+
 export default async function waitForBuild(
   buildId: string,
-): Promise<'SUCCEEDED' | 'FAILED' | 'TIMED_OUT'> {
+): Promise<BuildResult> {
   const codeBuildClient = new CodeBuildClient({});
 
   let attempts = 0;
@@ -23,9 +42,11 @@ export default async function waitForBuild(
       throw new Error(`Build ${buildId} not found`);
     }
 
+    const consoleUrl = getConsoleUrl(buildId);
+
     switch (build.buildStatus) {
       case 'SUCCEEDED':
-        return 'SUCCEEDED';
+        return { status: 'SUCCEEDED', buildId, consoleUrl };
       case 'FAILED':
       case 'FAULT':
       case 'STOPPED': {
@@ -33,23 +54,22 @@ export default async function waitForBuild(
         const failedPhase = build.phases?.find(
           (phase) => phase.phaseStatus === 'FAILED',
         );
-        if (failedPhase) {
-          const context = failedPhase.contexts?.[0];
-          console.log('Build failed:', {
-            phase: failedPhase.phaseType,
-            statusCode: context?.statusCode,
-            message: context?.message,
-          });
-
-          // Also log full phases for debugging if needed
-          console.log('Full build phases:', build.phases);
-        } else {
-          console.log('Build failed but no failed phase found:', build.phases);
-        }
-        return 'FAILED';
+        const context = failedPhase?.contexts?.[0];
+        return {
+          status: 'FAILED',
+          buildId,
+          consoleUrl,
+          failedPhase: failedPhase
+            ? {
+                phaseType: failedPhase.phaseType ?? 'UNKNOWN',
+                statusCode: context?.statusCode,
+                message: context?.message,
+              }
+            : undefined,
+        };
       }
       case 'TIMED_OUT':
-        return 'TIMED_OUT';
+        return { status: 'TIMED_OUT', buildId, consoleUrl };
       case 'IN_PROGRESS':
         await new Promise((resolve) => setTimeout(resolve, 10000)); // Wait 10 seconds
         attempts++;
@@ -59,5 +79,9 @@ export default async function waitForBuild(
     }
   }
 
-  return 'TIMED_OUT';
+  return {
+    status: 'TIMED_OUT',
+    buildId,
+    consoleUrl: getConsoleUrl(buildId),
+  };
 }

package/analyzer-template/packages/aws/src/lib/ecs/ecsDefineContainer.ts

@@ -5,18 +5,19 @@ export default function ecsDefineContainer({
   containerImage,
   environmentVariables = {},
   openPort,
-  dependsOn,
+  command,
 }: {
   containerName: string;
   containerImage: string;
   environmentVariables?: { [key: string]: string };
   openPort?: number;
-  dependsOn?: ContainerDefinition['dependsOn'];
+  command?: string[];
 }): ContainerDefinition {
   return {
     name: containerName,
     image: containerImage,
     essential: true,
+    command,
     environment: Object.entries(environmentVariables).map(([name, value]) => ({
       name,
       value,
@@ -38,6 +39,5 @@ export default function ecsDefineContainer({
         'awslogs-stream-prefix': `${process.env.ECS_CLUSTER_NAME}`,
       },
     },
-    dependsOn,
   };
 }

package/analyzer-template/packages/aws/src/lib/ecs/ecsTaskFactory.ts

@@ -5,51 +5,22 @@ export type EcsStartConfig = {
 };
 
 /**
- * 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: Record<string, string>,
-  playwrightEnvironmentVariables: Record<string, string>,
-): EcsStartConfig {
-  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(
+export function getEcsStartConfigForAnalysis(
   environmentVariables: Record<string, string>,
 ): EcsStartConfig {
   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: Record<string, string>,
@@ -58,52 +29,29 @@ export function getEcsStartConfigForOrchestrationTask(
     taskDefinition: getEcsTaskDefinitionName(
       EcsTaskDefinitionUse.OrchestrationTask,
     ),
-    containerEnvironmentVariables: [
-      [getEcsImageNameForType(EcsImageType.Combo), environmentVariables],
-    ],
+    containerEnvironmentVariables: [[getEcsImageName(), environmentVariables]],
   };
 }
 
 export enum EcsTaskDefinitionUse {
-  /* A 'project' image runs analysis while a 'playwright' image captures the entities. */
-  AnalyzeThenCapture = 'analyze-then-capture',
-  /* A 'project' image runs analysis while firing up distributed capture orchestration. */
-  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. */
+  Analysis = 'analysis',
+  /* A worker task launched by orchestration to capture scenarios. */
   OrchestrationTask = 'orchestration-task',
 }
 
 export function getEcsTaskDefinitionName(forUse: EcsTaskDefinitionUse): string {
   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 enum EcsImageType {
-  /* The virtualized server that runs the project code. */
-  Project = 'project',
-  /* The playwright capture process which waits for the project to be ready. */
-  Playwright = 'playwright',
-  /* A combo image that combines both project and playwright code, used by orchestration. */
-  Combo = 'combo',
-}
-
-export function getEcsImageNameForType(type: EcsImageType): string {
-  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(): string {
+  return `${process.env.ECR_REPOSITORY_NAME}-combo`;
 }

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/aws/src/lib/s3/getPresignedUrl.ts

@@ -0,0 +1,62 @@
+import {
+  S3Client,
+  PutObjectCommand,
+  GetObjectCommand,
+} from '@aws-sdk/client-s3';
+import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
+
+interface GetPresignedUploadUrlArgs {
+  bucketName: string;
+  key: string;
+  contentType?: string;
+  expiresInSeconds?: number;
+}
+
+interface GetPresignedDownloadUrlArgs {
+  bucketName: string;
+  key: string;
+  expiresInSeconds?: number;
+}
+
+const DEFAULT_UPLOAD_EXPIRY = 2 * 60 * 60; // 2 hours
+const DEFAULT_DOWNLOAD_EXPIRY = 24 * 60 * 60; // 24 hours
+
+/**
+ * Generate a presigned URL for uploading a file to S3.
+ * The client can PUT directly to this URL without AWS credentials.
+ */
+export function getPresignedUploadUrl({
+  bucketName,
+  key,
+  contentType = 'application/gzip',
+  expiresInSeconds = DEFAULT_UPLOAD_EXPIRY,
+}: GetPresignedUploadUrlArgs): Promise<string> {
+  const s3Client = new S3Client({});
+
+  const command = new PutObjectCommand({
+    Bucket: bucketName,
+    Key: key,
+    ContentType: contentType,
+  });
+
+  return getSignedUrl(s3Client, command, { expiresIn: expiresInSeconds });
+}
+
+/**
+ * Generate a presigned URL for downloading a file from S3.
+ * Anyone with this URL can GET the file without AWS credentials.
+ */
+export function getPresignedDownloadUrl({
+  bucketName,
+  key,
+  expiresInSeconds = DEFAULT_DOWNLOAD_EXPIRY,
+}: GetPresignedDownloadUrlArgs): Promise<string> {
+  const s3Client = new S3Client({});
+
+  const command = new GetObjectCommand({
+    Bucket: bucketName,
+    Key: key,
+  });
+
+  return getSignedUrl(s3Client, command, { expiresIn: expiresInSeconds });
+}

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

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

package/analyzer-template/packages/database/client.ts

@@ -0,0 +1,35 @@
+/**
+ * This index file re-exports modules which are safe to use in a browser
+ * environment with our current set of polyfills. Two considerations:
+ * - It must compile: it can't rely on node modules we don't polyfill
+ * - It must use Supabase for its REST capabilities. None of the db.ts
+ *   infrastructure must be invoked in this file or any of its imports.
+ *
+ *   Kysely itself is fine.
+ */
+
+export { getSupabase, getAdminSupabase } from './src/lib/supabase';
+
+export type { SupabaseClient } from '@supabase/supabase-js';
+export { default as upsertFiles_Client } from './src/lib/client/upsertFiles_Client';
+export { default as loadAnalyses_Client } from './src/lib/client/loadAnalysesInClient';
+export { default as loadBranches_Client } from './src/lib/client/loadBranches_Client';
+export { default as loadAnalysis_Client } from './src/lib/client/loadAnalysis_Client';
+
+export { default as listenForCommits_Client } from './src/lib/client/listenForCommits_Client';
+
+export { default as dbToAnalysis } from './src/lib/dbToAnalysis';
+export { default as dbToBranch } from './src/lib/dbToBranch';
+export { default as dbToCommit } from './src/lib/dbToCommit';
+export { default as dbToEntity } from './src/lib/dbToEntity';
+export { default as dbToFile } from './src/lib/dbToFile';
+export { default as dbToProject } from './src/lib/dbToProject';
+export { default as dbToScenario } from './src/lib/dbToScenario';
+export { default as dbToUserScenario } from './src/lib/dbToUserScenario';
+export { default as dbToScenarioComment } from './src/lib/dbToScenarioComment';
+
+// NOTE: generateSha is NOT exported here because it uses Node's crypto module
+// which is server-only. Import from '~codeyam/database' (server) instead.
+
+// Export ONLY types from tableRelations (no runtime code that imports Kysely)
+export type * from './src/lib/kysely/tableRelationsTypes';

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

@@ -0,0 +1,31 @@
+{
+  "name": "@codeyam/supabase",
+  "version": "1.0.0",
+  "description": "",
+  "type": "module",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "scripts": {
+    "test": "jest --watchAll --verbose"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "@supabase/supabase-js": "2.88.0",
+    "better-sqlite3": "^12.4.1",
+    "fetch-retry": "^6.0.0",
+    "kysely": "^0.28.5",
+    "pg": "^8.16.3"
+  },
+  "jest": {
+    "preset": "ts-jest",
+    "testEnvironment": "node"
+  },
+  "devDependencies": {
+    "@types/better-sqlite3": "^7.6.13",
+    "@types/jest": "^30.0.0",
+    "@types/pg": "^8.15.5",
+    "@types/ws": "^8.18.1"
+  }
+}