@atlashub/smartstack-cli 4.69.0 → 4.70.0

package/config/default-config.json

@@ -1,95 +1,75 @@
-{
-  "$schema": "https://atlashub.ch/schemas/claude-gitflow-config.json",
-  "version": "2.0.0",
-  "worktrees": {
-    "enabled": true,
-    "mode": "organized",
-    "structure": {
-      "features": "../features",
-      "releases": "../releases",
-      "hotfixes": "../hotfixes"
-    }
-  },
-  "git": {
-    "branches": {
-      "main": "main",
-      "develop": "develop",
-      "featurePrefix": "feature/",
-      "releasePrefix": "release/",
-      "hotfixPrefix": "hotfix/"
-    },
-    "remote": "origin",
-    "mergeStrategy": "--no-ff",
-    "tagPrefix": "v",
-    "protectedBranches": ["main", "develop"],
-    "requireLinearHistory": false
-  },
-  "efcore": {
-    "enabled": true,
-    "autoDetect": true,
-    "contexts": [
-      {
-        "name": "ApplicationDbContext",
-        "projectPath": "auto-detect",
-        "startupProject": "auto-detect",
-        "migrationsFolder": "Migrations",
-        "migrationsAssembly": null
-      }
-    ],
-    "scripts": {
-      "generateOnRelease": true,
-      "generateOnHotfix": true,
-      "idempotent": true,
-      "outputPath": "./scripts/migrations",
-      "namingPattern": "{type}_{version}_{timestamp}.sql"
-    },
-    "validation": {
-      "validateBeforeCommit": true,
-      "validateBeforeMerge": true,
-      "checkModelSnapshotConflicts": true,
-      "requireBuildSuccess": true,
-      "warnOnPendingMigrations": true
-    },
-    "backup": {
-      "enabled": true,
-      "beforeRebase": true,
-      "beforeMerge": true,
-      "retentionDays": 7
-    },
-    "naming": {
-      "migrationPrefix": "",
-      "hotfixPrefix": "Hotfix_",
-      "timestampFormat": "yyyyMMddHHmmss"
-    }
-  },
-  "workflow": {
-    "requireConfirmation": true,
-    "autoDeleteBranch": false,
-    "createCheckpoints": true,
-    "verboseLogging": false,
-    "interactiveMode": true,
-    "commitConventions": {
-      "enabled": true,
-      "migration": "db(migrations): ",
-      "feature": "feat: ",
-      "fix": "fix: ",
-      "release": "release: ",
-      "hotfix": "hotfix: ",
-      "chore": "chore: "
-    },
-    "hooks": {
-      "prePlan": null,
-      "postPlan": null,
-      "preExec": null,
-      "postExec": null,
-      "preCommit": null,
-      "postCommit": null
-    }
-  },
-  "ui": {
-    "colors": true,
-    "showProgress": true,
-    "compactMode": false,
-    "language": "fr"
-  }
-}
+{
+  "$schema": "https://atlashub.ch/schemas/claude-gitflow-config.json",
+  "version": "2.1.0",
+  "platform": {
+    "detected": "",
+    "shell": "",
+    "detectedAt": ""
+  },
+  "workspace": {
+    "path": "",
+    "name": ""
+  },
+  "repository": {
+    "name": "",
+    "rootFolder": "",
+    "nameVariants": {
+      "pascalCaseDot": "",
+      "pascalCase": "",
+      "kebabCase": "",
+      "snakeCase": "",
+      "displayName": ""
+    },
+    "defaultBranch": "main",
+    "remoteUrl": ""
+  },
+  "git": {
+    "provider": "",
+    "branches": {
+      "main": "main",
+      "develop": "develop"
+    },
+    "prefixes": {
+      "feature": "feature/",
+      "release": "release/",
+      "hotfix": "hotfix/"
+    }
+  },
+  "worktrees": {
+    "enabled": true,
+    "mode": "organized",
+    "structure": {
+      "main": "",
+      "develop": "",
+      "features": "",
+      "releases": "",
+      "hotfixes": ""
+    }
+  },
+  "versioning": {
+    "strategy": "semver",
+    "current": "0.0.0",
+    "tagPrefix": "v",
+    "sources": ["csproj", "package.json", "VERSION"]
+  },
+  "efcore": {
+    "enabled": true,
+    "validateOnCommit": true,
+    "blockDestructive": true,
+    "migrationNaming": "{context}_v{version}_{sequence}_{Description}",
+    "migrationNamingSquash": "{context}_v{version}",
+    "squashBeforePR": true
+  },
+  "workflow": {
+    "push": {
+      "afterCommit": "worktree"
+    },
+    "pr": {
+      "autoLabels": true,
+      "requireReview": true
+    }
+  },
+  "language": {
+    "code": "en"
+  }
+}

package/dist/index.js

@@ -112390,7 +112390,8 @@ async function readClaudeSettings() {
       return null;
     }
     const raw = await import_fs_extra.default.readFile(settingsPath, "utf-8");
-    return JSON.parse(raw);
+    const cleaned = stripJsonComments(raw);
+    return JSON.parse(cleaned);
   } catch {
     return null;
   }
@@ -112424,7 +112425,11 @@ async function registerMcpInClaudeSettings(servers) {
   try {
     logger.debug(`Home directory: ${(0, import_os.homedir)()}`);
     logger.debug(`Target settings path: ${settingsPath}`);
-    const settings = await readClaudeSettings() || {};
+    const existingSettings = await readClaudeSettings();
+    if (existingSettings === null && await import_fs_extra.default.pathExists(settingsPath)) {
+      return { success: false, path: settingsPath, error: "Cannot parse existing settings.json" };
+    }
+    const settings = existingSettings || {};
     const mcpServers = settings["mcpServers"] || {};
     for (const server of servers) {
       mcpServers[server.name] = {
@@ -112482,7 +112487,12 @@ async function unregisterMcpFromClaudeSettings(serverNames) {
 async function configureClaudeEnvironment() {
   const settingsPath = getClaudeSettingsPath();
   try {
-    const settings = await readClaudeSettings() || {};
+    const existingSettings = await readClaudeSettings();
+    if (existingSettings === null && await import_fs_extra.default.pathExists(settingsPath)) {
+      logger.warning("Cannot parse existing settings.json \u2014 skipping to avoid data loss");
+      return { success: false, path: settingsPath, error: "Cannot parse existing settings.json" };
+    }
+    const settings = existingSettings || {};
     const env2 = settings["env"] || {};
     let changed = false;
     if (env2["CLAUDE_CODE_MAX_OUTPUT_TOKENS"] !== "64000") {
@@ -116869,7 +116879,9 @@ EndGlobal
         "Microsoft.AspNetCore.Authentication.JwtBearer",
         "Microsoft.EntityFrameworkCore.Design",
         // Required for EF Core migrations
-        "Swashbuckle.AspNetCore"
+        "Swashbuckle.AspNetCore",
+        "Microsoft.AspNetCore.SignalR.StackExchangeRedis"
+        // SignalR Redis backplane (not transitive from SmartStack NuGet)
       ]
     }
   ];
@@ -117877,7 +117889,7 @@ var initCommand = new Command("init").description("Initialize a new SmartStack p
         ]);
         if (!continueWithoutMcp) {
           logger.info("Install MCP servers and try again.");
-          process.exit(0);
+          return;
         }
       } else {
         logger.warning("Continuing without MCP servers (--yes mode)");
@@ -117930,18 +117942,21 @@ var initCommand = new Command("init").description("Initialize a new SmartStack p
               logger.error("Installation completed but .NET SDK still not detected.");
               logger.info("You may need to restart your terminal, then run ss init again.");
               showInstallHelp();
-              process.exit(1);
+              process.exitCode = 1;
+              return;
             }
           } catch {
             logger.error("winget installation failed.");
             showInstallHelp();
-            process.exit(1);
+            process.exitCode = 1;
+            return;
           }
         } else {
           logger.info("");
           logger.info(`Install manually: ${source_default.cyan(wingetCmd)}`);
           showInstallHelp();
-          process.exit(1);
+          process.exitCode = 1;
+          return;
         }
       } else {
         logger.info(`Installing .NET SDK ${MIN_DOTNET_MAJOR}.0 via winget...`);
@@ -117957,17 +117972,20 @@ var initCommand = new Command("init").description("Initialize a new SmartStack p
             logger.error("Installation completed but .NET SDK still not detected.");
             logger.info("Restart your terminal, then run ss init again.");
             showInstallHelp();
-            process.exit(1);
+            process.exitCode = 1;
+            return;
           }
         } catch {
           logger.error("Automatic installation failed.");
           showInstallHelp();
-          process.exit(1);
+          process.exitCode = 1;
+          return;
         }
       }
     } else {
       showInstallHelp();
-      process.exit(1);
+      process.exitCode = 1;
+      return;
     }
   } else {
     logger.success(`.NET SDK ${prereqs.dotnetVersion} detected`);
@@ -117981,7 +117999,8 @@ var initCommand = new Command("init").description("Initialize a new SmartStack p
     const inPlaceResult = await validateInPlaceDirectory(projectDir);
     if (inPlaceResult.error) {
       logger.error(inPlaceResult.error);
-      process.exit(1);
+      process.exitCode = 1;
+      return;
     }
     if (inPlaceResult.isResume) {
       resumeState = inPlaceResult.existingState;
@@ -117997,7 +118016,7 @@ var initCommand = new Command("init").description("Initialize a new SmartStack p
         ]);
         if (!confirmResume) {
           logger.info("Cancelled by user.");
-          process.exit(0);
+          return;
         }
       }
     } else {
@@ -118012,7 +118031,7 @@ var initCommand = new Command("init").description("Initialize a new SmartStack p
         ]);
         if (!confirm) {
           logger.info("Cancelled by user.");
-          process.exit(0);
+          return;
         }
       }
     }
@@ -118020,7 +118039,8 @@ var initCommand = new Command("init").description("Initialize a new SmartStack p
     if (await import_fs_extra6.default.pathExists(projectDir)) {
       logger.error(`Directory '${projectDir}' already exists.`);
       logger.info(`Tip: Use ${source_default.cyan("--here")} to initialize in the current directory instead.`);
-      process.exit(1);
+      process.exitCode = 1;
+      return;
     }
   }
   let finalProjectName = projectName;
@@ -118043,14 +118063,16 @@ var initCommand = new Command("init").description("Initialize a new SmartStack p
       } else {
         logger.error(`Cannot continue with invalid project name.`);
         logger.info(`Tip: Rename folder to use only letters, digits, and underscores.`);
-        process.exit(1);
+        process.exitCode = 1;
+        return;
       }
     } else if (validation.suggestion && options.yes) {
       finalProjectName = validation.suggestion;
       logger.info(`Auto-converted to "${finalProjectName}" for C# compatibility`);
     } else {
       logger.error(`Invalid project name: ${validation.error}`);
-      process.exit(1);
+      process.exitCode = 1;
+      return;
     }
   }
   if (!inPlace && finalProjectName !== projectName) {
@@ -118059,7 +118081,8 @@ var initCommand = new Command("init").description("Initialize a new SmartStack p
     logger.info(`Project directory updated to: ${source_default.cyan(finalProjectDir)}`);
     if (await import_fs_extra6.default.pathExists(finalProjectDir)) {
       logger.error(`Directory '${finalProjectDir}' already exists.`);
-      process.exit(1);
+      process.exitCode = 1;
+      return;
     }
   }
   let config;
@@ -118220,7 +118243,8 @@ var initCommand = new Command("init").description("Initialize a new SmartStack p
     console.log();
     logger.info(`Fix the issue and re-run: ${source_default.cyan("ss init --here")}`);
     logger.info("Your progress has been saved and will be resumed automatically.");
-    process.exit(1);
+    process.exitCode = 1;
+    return;
   }
 });
 
@@ -124987,6 +125011,32 @@ function isPlainObject(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
+// src/lib/required-packages.ts
+var REQUIRED_PACKAGES = [
+  {
+    suffix: "Domain",
+    packages: []
+  },
+  {
+    suffix: "Infrastructure",
+    packages: [
+      "Microsoft.EntityFrameworkCore",
+      "Microsoft.EntityFrameworkCore.Design",
+      "Microsoft.EntityFrameworkCore.SqlServer"
+    ]
+  },
+  {
+    suffix: "Api",
+    packages: [
+      "Microsoft.AspNetCore.OpenApi",
+      "Microsoft.AspNetCore.Authentication.JwtBearer",
+      "Microsoft.EntityFrameworkCore.Design",
+      "Swashbuckle.AspNetCore",
+      "Microsoft.AspNetCore.SignalR.StackExchangeRedis"
+    ]
+  }
+];
+
 // src/commands/upgrade.ts
 var TEMPLATES_DIR3 = (0, import_path8.join)((0, import_path8.dirname)(__dirname), "templates", "project");
 async function getLatestNuGetVersion2(packageName, prerelease) {
@@ -125429,6 +125479,41 @@ async function syncDockerFiles(projectDir, baseNamespace, dryRun) {
   }
   return updated;
 }
+async function ensureRequiredPackages(projects, baseNamespace, dryRun) {
+  const added = [];
+  const failed = [];
+  for (const rp of REQUIRED_PACKAGES) {
+    if (rp.packages.length === 0) continue;
+    const expectedFolder = `${baseNamespace}.${rp.suffix}`;
+    const project = projects.find((p) => {
+      const folderName = p.relPath.split(/[/\\]/).slice(-2, -1)[0];
+      return folderName === expectedFolder;
+    });
+    if (!project) continue;
+    const currentPackages = readAllPackageReferences(project.csprojContent);
+    const currentNames = new Set(currentPackages.map((p) => p.name.toLowerCase()));
+    for (const requiredPkg of rp.packages) {
+      if (currentNames.has(requiredPkg.toLowerCase())) continue;
+      try {
+        if (dryRun) {
+          logger.info(`  [DRY RUN] Would add ${source_default.cyan(requiredPkg)} to ${source_default.cyan(expectedFolder)}`);
+        } else {
+          execCommand2(
+            `dotnet add "${project.csprojPath}" package ${requiredPkg} --no-restore`,
+            void 0,
+            false
+          );
+          logger.success(`  ${source_default.green("+")} Added ${source_default.cyan(requiredPkg)} to ${source_default.cyan(expectedFolder)}`);
+        }
+        added.push(`${expectedFolder} + ${requiredPkg}`);
+      } catch {
+        failed.push(`${expectedFolder} + ${requiredPkg}`);
+        logger.error(`  ${source_default.red("\u2717")} Failed to add ${requiredPkg} to ${expectedFolder}`);
+      }
+    }
+  }
+  return { added, failed };
+}
 var upgradeCommand = new Command("upgrade").description("Upgrade SmartStack packages to the latest version").option("--preview", "Upgrade to latest preview/prerelease version").option("--dry-run", "Show what would be upgraded without actually upgrading").option("--all-packages", "Also upgrade all other NuGet packages (slow, disabled by default)").action(async (options) => {
   logger.header("SmartStack Package Upgrade");
   const dryRun = options.dryRun || false;
@@ -125450,6 +125535,7 @@ var upgradeCommand = new Command("upgrade").description("Upgrade SmartStack pack
     testFrontendSynced: 0,
     residualsCleaned: 0,
     initStateFixed: false,
+    requiredPkgAdded: 0,
     programCsIssues: []
   };
   if (dryRun) {
@@ -125460,7 +125546,8 @@ var upgradeCommand = new Command("upgrade").description("Upgrade SmartStack pack
   if (!detection.isProject) {
     logger.error("Not a SmartStack project. Run this command from a SmartStack project root.");
     logger.info("Tip: SmartStack projects contain a .smartstack/config.json file.");
-    process.exit(1);
+    process.exitCode = 1;
+    return;
   }
   const { config, projectDir } = detection;
   logger.info(`Project: ${source_default.cyan(config.baseNamespace)}`);
@@ -125476,7 +125563,8 @@ var upgradeCommand = new Command("upgrade").description("Upgrade SmartStack pack
   const npmVersion = await getLatestNpmVersion("@atlashub/smartstack", usePreview);
   if (!nugetVersion) {
     logger.error("Could not fetch latest NuGet version. Check your internet connection.");
-    process.exit(1);
+    process.exitCode = 1;
+    return;
   }
   logger.success(`Latest NuGet version: ${source_default.cyan(nugetVersion)}`);
   if (npmVersion) {
@@ -125538,10 +125626,37 @@ var upgradeCommand = new Command("upgrade").description("Upgrade SmartStack pack
       }
       console.log();
     }
+    logger.info("Checking required NuGet packages...");
+    if (result.nugetUpgraded > 0) {
+      for (const project of allProjects) {
+        if (project.currentVersion !== null) {
+          project.csprojContent = await import_fs_extra7.default.readFile(project.csprojPath, "utf-8");
+        }
+      }
+    }
+    const requiredResult = await ensureRequiredPackages(
+      allProjects,
+      config.baseNamespace,
+      dryRun
+    );
+    result.requiredPkgAdded = requiredResult.added.length;
+    if (requiredResult.added.length > 0) {
+      logger.success(`${requiredResult.added.length} required package(s) added`);
+      if (!dryRun) {
+        logger.info("Restoring NuGet packages...");
+        tryExecCommand("dotnet restore", projectDir);
+      }
+    } else {
+      logger.info(`Required packages ${source_default.green("\u2713")} all present`);
+    }
+    if (requiredResult.failed.length > 0) {
+      logger.error(`${requiredResult.failed.length} required package(s) failed to add`);
+    }
+    console.log();
     if (options.allPackages) {
       logger.info("Checking other NuGet packages...");
       for (const project of allProjects) {
-        const content = result.nugetUpgraded > 0 && project.currentVersion !== null ? await import_fs_extra7.default.readFile(project.csprojPath, "utf-8") : project.csprojContent;
+        const content = result.nugetUpgraded > 0 && project.currentVersion !== null || result.requiredPkgAdded > 0 ? await import_fs_extra7.default.readFile(project.csprojPath, "utf-8") : project.csprojContent;
         const allPackages = readAllPackageReferences(content);
         const otherPackages = allPackages.filter((p) => p.name !== "SmartStack");
         if (otherPackages.length === 0) continue;
@@ -125765,7 +125880,7 @@ var upgradeCommand = new Command("upgrade").description("Upgrade SmartStack pack
     logger.success(`Updated config version to ${source_default.cyan(nugetVersion)}`);
     console.log();
   }
-  const totalChanged = result.nugetUpgraded + result.otherPkgUpdated + (result.npmUpgraded ? 1 : 0) + (result.npmOtherUpdated ? 1 : 0) + migrationSummary.totalApplied + result.configSynced + result.claudeSettingsSynced + result.dockerSynced + result.testFrontendSynced + result.residualsCleaned + (result.initStateFixed ? 1 : 0) + (result.ralphInitialized ? 1 : 0);
+  const totalChanged = result.nugetUpgraded + result.requiredPkgAdded + result.otherPkgUpdated + (result.npmUpgraded ? 1 : 0) + (result.npmOtherUpdated ? 1 : 0) + migrationSummary.totalApplied + result.configSynced + result.claudeSettingsSynced + result.dockerSynced + result.testFrontendSynced + result.residualsCleaned + (result.initStateFixed ? 1 : 0) + (result.ralphInitialized ? 1 : 0);
   const allUpToDate = totalChanged === 0 && result.nugetFailed === 0 && result.otherPkgFailed === 0;
   const hasProgramIssues = result.programCsIssues.length > 0;
   if (allUpToDate && !hasProgramIssues) {
@@ -125802,6 +125917,9 @@ var upgradeCommand = new Command("upgrade").description("Upgrade SmartStack pack
     if (result.nugetFailed > 0) {
       lines.push(`  ${source_default.red("\u2717")} SmartStack: ${result.nugetFailed} project(s) failed`);
     }
+    if (result.requiredPkgAdded > 0) {
+      lines.push(`  ${source_default.green("\u2713")} Required packages: ${result.requiredPkgAdded} added`);
+    }
     if (result.otherPkgUpdated > 0) {
       lines.push(`  ${source_default.green("\u2713")} Other NuGet: ${result.otherPkgUpdated} package(s) updated`);
     }
@@ -130458,7 +130576,8 @@ async function main2() {
 \u2551                                                           \u2551
 \u255A\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u255D
 `));
-      process.exit(1);
+      process.exitCode = 1;
+      return;
     }
     if (result.warnings?.length) {
       for (const warning of result.warnings) {