scripts-orchestrator 1.2.2 → 1.2.3

package/lib/orchestrator.js

@@ -120,6 +120,8 @@ export class Orchestrator {
     // Execute the main command with retries
     let result = false;
     let commandOutput = '';
+    let commandFailed = false;
+    
     for (let attempt = 1; attempt <= attempts; attempt++) {
       if (attempt > 1) {
         this.logger.warn(`Retrying ${command} (attempt ${attempt}/${attempts})`);
@@ -136,22 +138,29 @@ export class Orchestrator {
       result = success;
 
       if (result) {
+        // Remove from failed commands if it was there
         this.failedCommands = this.failedCommands.filter(cmd => cmd !== command);
+        commandFailed = false;
         break;
       } else if (attempt < attempts) {
         if (should_retry && !should_retry(commandOutput)) {
           this.logger.warn(
             `${command} failed but doesn't meet retry criteria. Skipping retry.`,
           );
-          this.failedCommands.push(command);
+          commandFailed = true;
           break;
         }
         this.logger.error(`Attempt ${attempt}/${attempts} failed for ${command}`);
+        commandFailed = true;
       } else {
-        this.failedCommands.push(command);
+        commandFailed = true;
       }
     }
 
+    if (commandFailed) {
+      this.failedCommands.push(command);
+    }
+
     this.commandTimings.set(command, Date.now() - startTime);
     visited.delete(command);
     return result;
@@ -159,20 +168,24 @@ export class Orchestrator {
 
   summarizeResults() {
     this.logger.info('\nCommand Summary:');
+    let hasFailures = false;
+    
     this.config.forEach(({ command }) => {
       const duration = this.commandTimings.get(command);
       const durationStr = duration ? ` (${this.formatDuration(duration)})` : '';
       
       if (this.failedCommands.includes(command)) {
+        hasFailures = true;
         this.logger.error(`- ${command}: ❌${durationStr} (See logs/scripts-orchestrator_${command}.log)`);
       } else if (this.skippedCommands.includes(command)) {
+        hasFailures = true;
         this.logger.warn(`- ${command}: ⚠️${durationStr} (Skipped due to failed dependency)`);
       } else {
         this.logger.success(`- ${command}: ✅${durationStr}`);
       }
     });
 
-    if (this.failedCommands.length > 0 || this.skippedCommands.length > 0) {
+    if (hasFailures) {
       this.logger.error('\n❌ Some commands failed or were skipped. See details above.');
     } else {
       this.logger.success('\n🎉 All commands executed successfully!');
@@ -187,21 +200,28 @@ export class Orchestrator {
       );
 
       // Wait for all top-level commands to complete
-      await Promise.all(tasks);
+      const results = await Promise.all(tasks);
+      
+      // Check if any command failed
+      const hasFailures = results.some(result => !result) || 
+                         this.failedCommands.length > 0 || 
+                         this.skippedCommands.length > 0;
 
       // Add a small delay to ensure all processes have finished
       await new Promise((resolve) => setTimeout(resolve, 1000));
 
       this.summarizeResults();
+      
+      // Exit with appropriate status
+      if (hasFailures) {
+        process.exit(1);
+      }
     } finally {
       try {
         await this.processManager.cleanup();
       } catch (error) {
         this.logger.error(`Cleanup failed: ${error.message}`);
       }
-      if (this.failedCommands.length > 0 || this.skippedCommands.length > 0) {
-        process.exit(1);
-      }
     }
   }
 } 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scripts-orchestrator",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "A powerful script orchestrator for running parallel commands with dependency management, background processes, and health checks",
   "main": "lib/index.js",
   "type": "module",