cistack 3.2.0 → 4.0.0

package/src/index.js

@@ -42,17 +42,16 @@ class CIFlow {
     try {
       // ── 1. Load cistack.config.js ─────────────────────────────────────
       const configLoader = new ConfigLoader(this.projectPath);
-      const userConfig = configLoader.load();
+      const userConfig = await configLoader.load();
       if (Object.keys(userConfig).length > 0) {
         spinner.info(chalk.cyan('cistack.config.js loaded'));
-        spinner.start('Scanning project...');
-        // Allow config to override outputDir
         if (userConfig.outputDir) {
           this.outputDir = path.join(this.projectPath, userConfig.outputDir);
         }
       }
 
       // ── 2. Analyse the codebase ───────────────────────────────────────
+      if (!spinner.isSpinning) spinner.start('Scanning project...');
       const analyzer = new CodebaseAnalyzer(this.projectPath, { verbose: this.verbose });
       const codebaseInfo = await analyzer.analyse();
       spinner.succeed(chalk.green('Project scanned'));
@@ -81,13 +80,22 @@ class CIFlow {
         frameworks,
         languages,
         testing,
+        releaseInfo,
         envVars,
         monorepoPackages,
+        lockFiles: codebaseInfo.lockFiles,
+        defaultBranch: codebaseInfo.defaultBranch,
+        currentBranch: codebaseInfo.currentBranch,
         _config: userConfig,
       });
 
       // ── 5. Print summary ───────────────────────────────────────────────
-      this._printSummary(finalConfig, releaseInfo, envVars, monorepoPackages);
+      this._printSummary(
+        finalConfig,
+        finalConfig.releaseInfo || releaseInfo,
+        finalConfig.envVars || envVars,
+        finalConfig.monorepoPackages || monorepoPackages
+      );
 
       // ── 6. Optional interactive confirmation ──────────────────────────
       if (this.prompt) {
@@ -104,10 +112,11 @@ class CIFlow {
       const dependabotGen = new DependabotGenerator(codebaseInfo);
       const dependabotFile = dependabotGen.generate();
 
-      // ── 9. Generate release.yml (if release tooling detected) ─────────
+      // ── 9. Generate release.yml (if release tooling detected or configured) ─
       let releaseWorkflow = null;
-      if (releaseInfo) {
-        const releaseGen = new ReleaseGenerator(releaseInfo, finalConfig, this.projectPath);
+      const combinedReleaseInfo = finalConfig.releaseInfo || releaseInfo;
+      if (combinedReleaseInfo) {
+        const releaseGen = new ReleaseGenerator(combinedReleaseInfo, finalConfig, this.projectPath);
         releaseWorkflow = releaseGen.generate();
         if (releaseWorkflow) workflows.push(releaseWorkflow);
       }
@@ -388,19 +397,15 @@ class CIFlow {
     ensureDir(githubDir);
 
     if (exists && !this.force) {
+      // dependabot.yml has a fixed schema, simpler to just overwrite or keep if identical
       const existing = fs.readFileSync(filePath, 'utf8');
-      const { content: merged, changes } = smartMergeWorkflow(existing, dependabotFile.content);
-
-      if (changes.length === 0) {
+      if (existing.trim() === dependabotFile.content.trim()) {
         console.log(chalk.dim(`  ○ No changes: dependabot.yml`));
         return;
       }
-
-      writeFile(filePath, merged);
-      console.log(chalk.yellow(`  ↻ Smart-merged: dependabot.yml`));
-      for (const c of changes) {
-        console.log(chalk.dim(`    • ${c}`));
-      }
+      
+      writeFile(filePath, dependabotFile.content);
+      console.log(chalk.yellow(`  ↻ Updated: dependabot.yml (schema mismatch for smart-merge)`));
     } else {
       writeFile(filePath, dependabotFile.content);
       console.log(chalk.green(`  ✔ Written:      .github/dependabot.yml`));

package/src/utils/helpers.js

@@ -129,16 +129,17 @@ function _mergeJob(existJob, genJob, jobId) {
     }
   }
 
-  // Merge steps by name
+  // Merge steps
   if (genJob.steps) {
-    const existStepsByName = {};
-    for (const s of (existJob.steps || [])) {
-      if (s.name) existStepsByName[s.name] = s;
-    }
-
     const mergedSteps = [];
     for (const genStep of genJob.steps) {
-      const existStep = existStepsByName[genStep.name];
+      // Find matches by name, uses, or id
+      const existStep = (existJob.steps || []).find(s => 
+        (genStep.name && s.name === genStep.name) ||
+        (genStep.id && s.id === genStep.id) ||
+        (genStep.uses && s.uses === genStep.uses)
+      );
+
       if (!existStep) {
         mergedSteps.push(genStep);
         jobChanges.push(`  job "${jobId}" → added step "${genStep.name}"`);
@@ -153,6 +154,19 @@ function _mergeJob(existJob, genJob, jobId) {
         }
       }
     }
+    // Append any existing steps that were NOT matched by a generated step
+    // This ensures user customizations are preserved.
+    for (const existStep of (existJob.steps || [])) {
+      const isMatched = genJob.steps.some((genStep) => 
+        (genStep.name && existStep.name === genStep.name) ||
+        (genStep.id && existStep.id === genStep.id) ||
+        (genStep.uses && existStep.uses === genStep.uses)
+      );
+      if (!isMatched) {
+        mergedSteps.push(existStep);
+      }
+    }
+    
     merged.steps = mergedSteps;
   }