@devramps/cli 0.1.2 → 0.1.3

package/dist/index.js

@@ -75,77 +75,110 @@ var CloudFormationError = class extends DevRampsError {
 import chalk from "chalk";
 var verboseMode = false;
 var ProgressBar = class {
-  current = 0;
+  completed = 0;
   total = 0;
   label;
   barWidth = 30;
   lastLineCount = 0;
-  eventLines = [];
-  maxVisibleEvents = 5;
+  inProgressResources = /* @__PURE__ */ new Map();
+  isTTY;
   constructor(label, total) {
     this.label = label;
     this.total = total;
+    this.isTTY = process.stdout.isTTY ?? false;
     this.render();
   }
   /**
-   * Update progress and re-render
+   * Update progress with resource status
    */
-  update(current, eventMessage) {
-    this.current = current;
-    if (eventMessage) {
-      this.eventLines.push(eventMessage);
-      if (this.eventLines.length > this.maxVisibleEvents) {
-        this.eventLines.shift();
+  update(completed, resourceStatus) {
+    this.completed = completed;
+    if (resourceStatus) {
+      if (resourceStatus.status === "in_progress") {
+        this.inProgressResources.set(resourceStatus.logicalId, resourceStatus);
+      } else {
+        this.inProgressResources.delete(resourceStatus.logicalId);
       }
     }
     this.render();
   }
   /**
-   * Add an event message without changing progress
+   * Set a resource as in-progress
    */
-  addEvent(message) {
-    this.eventLines.push(message);
-    if (this.eventLines.length > this.maxVisibleEvents) {
-      this.eventLines.shift();
-    }
+  setInProgress(logicalId, resourceType) {
+    this.inProgressResources.set(logicalId, {
+      logicalId,
+      resourceType,
+      status: "in_progress"
+    });
+    this.render();
+  }
+  /**
+   * Mark a resource as complete (removes from in-progress)
+   */
+  setComplete(logicalId) {
+    this.inProgressResources.delete(logicalId);
     this.render();
   }
   /**
-   * Clear the progress bar from the terminal
+   * Clear the progress bar from the terminal (only for TTY)
    */
   clear() {
+    if (!this.isTTY) return;
     for (let i = 0; i < this.lastLineCount; i++) {
       process.stdout.write("\x1B[A\x1B[2K");
     }
     this.lastLineCount = 0;
   }
   /**
-   * Finish and clear the progress bar
+   * Finish the progress bar (don't clear - leave final state visible)
    */
   finish() {
     this.clear();
+    this.inProgressResources.clear();
+    const percentage = this.total > 0 ? this.completed / this.total : 0;
+    const filled = Math.round(this.barWidth * percentage);
+    const empty = this.barWidth - filled;
+    const bar = chalk.green("\u2588".repeat(filled)) + chalk.gray("\u2591".repeat(empty));
+    const count = chalk.cyan(`${this.completed}/${this.total}`);
+    const labelText = chalk.bold(this.label);
+    console.log(`${labelText} ${bar} ${count} resources`);
   }
   /**
-   * Render the progress bar
+   * Render the progress bar with in-progress resources
    */
   render() {
     this.clear();
     const lines = [];
-    for (const event of this.eventLines) {
-      lines.push(event);
-    }
-    const percentage = this.total > 0 ? this.current / this.total : 0;
+    const percentage = this.total > 0 ? this.completed / this.total : 0;
     const filled = Math.round(this.barWidth * percentage);
     const empty = this.barWidth - filled;
     const bar = chalk.green("\u2588".repeat(filled)) + chalk.gray("\u2591".repeat(empty));
-    const count = chalk.cyan(`${this.current}/${this.total}`);
+    const count = chalk.cyan(`${this.completed}/${this.total}`);
     const labelText = chalk.bold(this.label);
     lines.push(`${labelText} ${bar} ${count} resources`);
-    lines.push("");
-    for (const line of lines) {
-      process.stdout.write(line + "\n");
+    const inProgress = Array.from(this.inProgressResources.values()).slice(0, 8);
+    if (inProgress.length > 0) {
+      for (const resource of inProgress) {
+        const spinner = chalk.yellow("\u22EF");
+        const type = chalk.gray(resource.resourceType);
+        lines.push(`  ${spinner} ${resource.logicalId} ${type}`);
+      }
+      const remaining = this.inProgressResources.size - inProgress.length;
+      if (remaining > 0) {
+        lines.push(chalk.gray(`  ... and ${remaining} more in progress`));
+      }
+    }
+    if (this.isTTY) {
+      for (const line of lines) {
+        process.stdout.write(line + "\n");
+      }
+      this.lastLineCount = lines.length;
+    } else {
+      if (this.completed === 0 || this.completed === this.total) {
+        console.log(lines[0]);
+      }
     }
-    this.lastLineCount = lines.length;
   }
 };
 function setVerbose(enabled) {
@@ -208,6 +241,18 @@ function table(rows) {
 function newline() {
   console.log();
 }
+function resourceProgress(stackName, resourceId, resourceType, status, reason) {
+  const stackLabel = chalk.cyan(`[${stackName}]`);
+  const typeLabel = chalk.gray(resourceType);
+  if (status === "in_progress") {
+    console.log(`${stackLabel} ${chalk.yellow("\u22EF")} ${resourceId} ${typeLabel}`);
+  } else if (status === "complete") {
+    console.log(`${stackLabel} ${chalk.green("\u2714")} ${resourceId} ${typeLabel}`);
+  } else if (status === "failed") {
+    const reasonText = reason ? ` - ${reason}` : "";
+    console.log(`${stackLabel} ${chalk.red("\u2716")} ${resourceId} ${typeLabel}${reasonText}`);
+  }
+}
 
 // src/aws/credentials.ts
 var DEFAULT_REGION = "us-east-1";
@@ -353,7 +398,7 @@ async function previewStackChanges(options) {
   const stackStatus = await getStackStatus(stackName, credentials, region);
   const changeSetName = `devramps-preview-${Date.now()}`;
   if (!stackStatus.exists) {
-    info(`  Stack ${stackName} will be created (new stack)`);
+    info(`  Stack ${stackName} will be created (new stack) in account ${options.accountId} (${region || "default region"})`);
     return;
   }
   try {
@@ -376,7 +421,7 @@ async function previewStackChanges(options) {
         ChangeSetName: changeSetName
       })
     );
-    logStackChanges(stackName, changeSetResponse.Changes || [], stackStatus.exists);
+    logStackChanges(stackName, changeSetResponse.Changes || [], stackStatus.exists, options.accountId, region);
     await client.send(
       new DeleteChangeSetCommand({
         StackName: stackName,
@@ -401,13 +446,13 @@ async function previewStackChanges(options) {
     verbose(`  Could not preview changes for ${stackName}: ${errorMessage}`);
   }
 }
-function logStackChanges(stackName, changes, isUpdate) {
+function logStackChanges(stackName, changes, isUpdate, accountId, region) {
   if (changes.length === 0) {
     verbose(`  Stack ${stackName}: No changes`);
     return;
   }
   const action = isUpdate ? "update" : "create";
-  info(`  Stack ${stackName} will ${action} ${changes.length} resource(s):`);
+  info(`  Stack ${stackName} will ${action} ${changes.length} resource(s) in account ${accountId} (${region || "default region"}):`);
   for (const change of changes) {
     const resourceChange = change.ResourceChange;
     if (!resourceChange) continue;
@@ -450,21 +495,6 @@ var SUCCESS_STATES = /* @__PURE__ */ new Set([
   "CREATE_COMPLETE",
   "UPDATE_COMPLETE"
 ]);
-function getStatusSymbol(status) {
-  if (!status) return "?";
-  if (status.includes("COMPLETE") && !status.includes("ROLLBACK")) return "\u2714";
-  if (status.includes("FAILED") || status.includes("ROLLBACK")) return "\u2716";
-  if (status.includes("IN_PROGRESS")) return "\u22EF";
-  return "?";
-}
-function formatStackEvent(event) {
-  const symbol = getStatusSymbol(event.ResourceStatus);
-  const resourceType = event.ResourceType || "Unknown";
-  const logicalId = event.LogicalResourceId || "Unknown";
-  const status = event.ResourceStatus || "Unknown";
-  const reason = event.ResourceStatusReason ? ` - ${event.ResourceStatusReason}` : "";
-  return `  ${symbol} ${resourceType} (${logicalId}): ${status}${reason}`;
-}
 function isResourceComplete(status) {
   if (!status) return false;
   return status.includes("_COMPLETE") && !status.includes("ROLLBACK");
@@ -472,6 +502,7 @@ function isResourceComplete(status) {
 async function waitForStackWithProgress(client, stackName, operationStartTime, totalResources, maxWaitTime = 600, showProgress = true) {
   const seenEventIds = /* @__PURE__ */ new Set();
   const completedResources = /* @__PURE__ */ new Set();
+  const inProgressResources = /* @__PURE__ */ new Map();
   const startTime = Date.now();
   const pollInterval = 3e3;
   const progressBar = showProgress ? new ProgressBar(stackName, totalResources) : null;
@@ -500,11 +531,48 @@ async function waitForStackWithProgress(client, stackName, operationStartTime, t
           seenEventIds.add(event.EventId);
         }
         const logicalId = event.LogicalResourceId;
-        if (logicalId && logicalId !== stackName && isResourceComplete(event.ResourceStatus)) {
-          completedResources.add(logicalId);
-        }
-        if (progressBar) {
-          progressBar.update(completedResources.size, formatStackEvent(event));
+        const resourceType = event.ResourceType || "Unknown";
+        const status = event.ResourceStatus || "";
+        if (logicalId && logicalId !== stackName) {
+          if (status.includes("IN_PROGRESS")) {
+            inProgressResources.set(logicalId, { resourceType });
+            if (progressBar) {
+              const resourceStatus = {
+                logicalId,
+                resourceType,
+                status: "in_progress"
+              };
+              progressBar.update(completedResources.size, resourceStatus);
+            } else {
+              resourceProgress(stackName, logicalId, resourceType, "in_progress");
+            }
+          } else if (isResourceComplete(status)) {
+            completedResources.add(logicalId);
+            inProgressResources.delete(logicalId);
+            if (progressBar) {
+              const resourceStatus = {
+                logicalId,
+                resourceType,
+                status: "complete"
+              };
+              progressBar.update(completedResources.size, resourceStatus);
+            } else {
+              resourceProgress(stackName, logicalId, resourceType, "complete");
+            }
+          } else if (status.includes("FAILED") || status.includes("ROLLBACK")) {
+            inProgressResources.delete(logicalId);
+            if (progressBar) {
+              const resourceStatus = {
+                logicalId,
+                resourceType,
+                status: "failed",
+                reason: event.ResourceStatusReason
+              };
+              progressBar.update(completedResources.size, resourceStatus);
+            } else {
+              resourceProgress(stackName, logicalId, resourceType, "failed", event.ResourceStatusReason);
+            }
+          }
         }
       }
       const currentStatus = stack.StackStatus || "";
@@ -2548,30 +2616,39 @@ async function showDryRunPlan(plan) {
   info(`CI/CD Account: ${plan.cicdAccountId}`);
   info(`CI/CD Region: ${plan.cicdRegion}`);
   newline();
-  info("Phase 1: Org Stack");
+  info("Org Stack:");
   info(`  ${plan.orgStack.action}: ${plan.orgStack.stackName}`);
-  info(`    Account: ${plan.orgStack.accountId}`);
+  info(`    Account: ${plan.orgStack.accountId}, Region: ${plan.orgStack.region}`);
   info(`    Target accounts with bucket access: ${plan.orgStack.targetAccountIds.length}`);
-  newline();
-  info("Phase 2: Pipeline & Account Stacks (parallel)");
-  for (const stack of plan.pipelineStacks) {
-    info(`  ${stack.action}: ${stack.stackName}`);
-    info(`    ECR repos: ${stack.dockerArtifacts.length}, S3 buckets: ${stack.bundleArtifacts.length}`);
+  if (plan.pipelineStacks.length > 0) {
+    newline();
+    info("Pipeline Stacks:");
+    for (const stack of plan.pipelineStacks) {
+      info(`  ${stack.action}: ${stack.stackName}`);
+      info(`    Account: ${stack.accountId}, Region: ${stack.region}`);
+      info(`    ECR repos: ${stack.dockerArtifacts.length}, S3 buckets: ${stack.bundleArtifacts.length}`);
+    }
   }
-  for (const stack of plan.accountStacks) {
-    info(`  ${stack.action}: ${stack.stackName}`);
-    info(`    Account: ${stack.accountId} (OIDC provider)`);
+  if (plan.accountStacks.length > 0) {
+    newline();
+    info("Account Stacks:");
+    for (const stack of plan.accountStacks) {
+      info(`  ${stack.action}: ${stack.stackName}`);
+      info(`    Account: ${stack.accountId}, Region: ${stack.region} (OIDC provider)`);
+    }
   }
-  newline();
-  info("Phase 3: Stage Stacks (parallel)");
-  for (const stack of plan.stageStacks) {
-    info(`  ${stack.action}: ${stack.stackName}`);
-    info(`    Account: ${stack.accountId}, Region: ${stack.region}`);
-    info(`    ECR repos: ${stack.dockerArtifacts.length}, S3 buckets: ${stack.bundleArtifacts.length}`);
+  if (plan.stageStacks.length > 0) {
+    newline();
+    info("Stage Stacks:");
+    for (const stack of plan.stageStacks) {
+      info(`  ${stack.action}: ${stack.stackName}`);
+      info(`    Account: ${stack.accountId}, Region: ${stack.region}`);
+      info(`    ECR repos: ${stack.dockerArtifacts.length}, S3 buckets: ${stack.bundleArtifacts.length}`);
+    }
   }
   const totalStacks = 1 + plan.pipelineStacks.length + plan.accountStacks.length + plan.stageStacks.length;
   newline();
-  info(`Total stacks to deploy: ${totalStacks}`);
+  info(`Total stacks to deploy (in parallel): ${totalStacks}`);
 }
 async function confirmDeploymentPlan(plan) {
   const totalStacks = 1 + plan.pipelineStacks.length + plan.accountStacks.length + plan.stageStacks.length;
@@ -2593,22 +2670,23 @@ async function confirmDeploymentPlan(plan) {
 }
 async function executeDeployment(plan, pipelines, pipelineArtifacts, authData, currentAccountId, options) {
   const results = { success: 0, failed: 0 };
+  const totalStacks = 1 + plan.pipelineStacks.length + plan.accountStacks.length + plan.stageStacks.length;
   newline();
-  header("Phase 1: Org Stack");
-  try {
-    await deployOrgStack(plan, pipelines, authData, currentAccountId, options);
-    results.success++;
-    success("Org stack deployed successfully");
-  } catch (error2) {
-    results.failed++;
-    error(`Org stack failed: ${error2 instanceof Error ? error2.message : String(error2)}`);
-    throw error2;
-  }
-  newline();
-  header("Phase 2: Pipeline & Account Stacks (parallel)");
-  const totalPhase2Stacks = plan.pipelineStacks.length + plan.accountStacks.length;
-  info(`Deploying ${totalPhase2Stacks} stack(s) in parallel...`);
+  header("Deploying All Stacks");
+  info(`Deploying ${totalStacks} stack(s) in parallel...`);
   newline();
+  const orgPromise = (async () => {
+    try {
+      await deployOrgStack(plan, pipelines, authData, currentAccountId, options);
+      return { stack: plan.orgStack.stackName, success: true };
+    } catch (error2) {
+      return {
+        stack: plan.orgStack.stackName,
+        success: false,
+        error: error2 instanceof Error ? error2.message : String(error2)
+      };
+    }
+  })();
   const pipelinePromises = plan.pipelineStacks.map(async (stack) => {
     try {
       await deployPipelineStack(stack, authData, currentAccountId, options);
@@ -2633,27 +2711,6 @@ async function executeDeployment(plan, pipelines, pipelineArtifacts, authData, c
       };
     }
   });
-  const pipelineResults = await Promise.all(pipelinePromises);
-  const accountResults = await Promise.all(accountPromises);
-  newline();
-  let accountStacksFailed = false;
-  for (const result of [...pipelineResults, ...accountResults]) {
-    if (result.success) {
-      success(`${result.stack} deployed`);
-      results.success++;
-    } else {
-      error(`${result.stack} failed: ${result.error}`);
-      results.failed++;
-    }
-  }
-  accountStacksFailed = accountResults.some((r) => !r.success);
-  if (accountStacksFailed) {
-    warn("Some Account stacks failed. Stage stacks may fail if their account OIDC provider did not deploy.");
-  }
-  newline();
-  header("Phase 3: Stage Stacks (parallel)");
-  info(`Deploying ${plan.stageStacks.length} stack(s) in parallel...`);
-  newline();
   const stagePromises = plan.stageStacks.map(async (stack) => {
     try {
       await deployStageStack(stack, authData, currentAccountId, options);
@@ -2666,9 +2723,14 @@ async function executeDeployment(plan, pipelines, pipelineArtifacts, authData, c
       };
     }
   });
-  const phase3Results = await Promise.all(stagePromises);
+  const allResults = await Promise.all([
+    orgPromise,
+    ...pipelinePromises,
+    ...accountPromises,
+    ...stagePromises
+  ]);
   newline();
-  for (const result of phase3Results) {
+  for (const result of allResults) {
     if (result.success) {
       success(`${result.stack} deployed`);
       results.success++;
@@ -2722,7 +2784,9 @@ async function deployOrgStack(plan, pipelines, authData, currentAccountId, optio
     template,
     accountId: cicdAccountId,
     region: cicdRegion,
-    credentials
+    credentials,
+    showProgress: false
+    // Disable progress bar for parallel deployment
   };
   await previewStackChanges(deployOptions);
   await deployStack(deployOptions);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devramps/cli",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "DevRamps CLI - Bootstrap AWS infrastructure for CI/CD pipelines",
   "main": "dist/index.js",
   "bin": {