ante-erp-cli 1.11.14 → 1.11.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ante-erp-cli",
-  "version": "1.11.14",
+  "version": "1.11.16",
   "description": "Comprehensive CLI tool for managing ANTE ERP self-hosted installations",
   "type": "module",
   "bin": {

package/src/commands/update.js

@@ -270,12 +270,26 @@ export async function update(options) {
     if (hasPosApp || missingServices.posApp) totalSteps++; // POS App health check
     if (!options.skipCleanup) totalSteps++; // Cleanup step
 
+    // Pre-calculate step numbers for each task (fixes step numbering bug)
     let currentStep = 0;
+    const stepBackup = !options.skipBackup ? ++currentStep : null;
+    const stepCheckServices = ++currentStep;
+    const stepInstallServices = hasNewServices ? ++currentStep : null;
+    const stepPull = ++currentStep;
+    const stepStop = ++currentStep;
+    const stepStart = ++currentStep;
+    const stepBackendHealth = ++currentStep;
+    const stepGateHealth = (hasGateApp || missingServices.gateApp) ? ++currentStep : null;
+    const stepGuardianHealth = (hasGuardianApp || missingServices.guardianApp) ? ++currentStep : null;
+    const stepFacialHealth = (hasFacialWeb || missingServices.facialWeb) ? ++currentStep : null;
+    const stepPosHealth = (hasPosApp || missingServices.posApp) ? ++currentStep : null;
+    const stepMigrations = ++currentStep;
+    const stepCleanup = !options.skipCleanup ? ++currentStep : null;
 
     const tasks = new Listr([
       {
-        title: formatStepTitle(++currentStep, totalSteps, 'Creating backup'),
-        skip: () => options.skipBackup ? (currentStep--, 'Backup skipped') : false,
+        title: stepBackup ? formatStepTitle(stepBackup, totalSteps, 'Creating backup') : '',
+        skip: () => !stepBackup ? 'Backup skipped' : false,
         task: async () => {
           const timestamp = new Date().toISOString().split('.')[0].replace(/:/g, '-').replace('T', '_');
           await backup({
@@ -285,12 +299,10 @@ export async function update(options) {
         }
       },
       {
-        title: formatStepTitle(++currentStep, totalSteps, 'Checking for available new services'),
+        title: formatStepTitle(stepCheckServices, totalSteps, 'Checking for available new services'),
         task: async (ctx, task) => {
-          const stepNumber = currentStep; // Capture current step number
-
           if (!hasNewServices) {
-            task.title = formatStepTitle(stepNumber, totalSteps, 'Checking for available new services (none found)');
+            task.title = formatStepTitle(stepCheckServices, totalSteps, 'Checking for available new services (none found)');
             ctx.missingServices = null;
             return;
           }
@@ -304,16 +316,14 @@ export async function update(options) {
           if (missingServices.facialWeb) availableServices.push('Facial Web');
           if (missingServices.posApp) availableServices.push('POS App');
 
-          task.title = formatStepTitle(stepNumber, totalSteps, `Found new services: ${availableServices.join(', ')}`);
+          task.title = formatStepTitle(stepCheckServices, totalSteps, `Found new services: ${availableServices.join(', ')}`);
           ctx.missingServices = missingServices;
         }
       },
       {
-        title: formatStepTitle(++currentStep, totalSteps, 'Installing new services'),
-        skip: () => !hasNewServices ? (currentStep--, 'No new services to install') : false,
+        title: stepInstallServices ? formatStepTitle(stepInstallServices, totalSteps, 'Installing new services') : '',
+        skip: () => !stepInstallServices ? 'No new services to install' : false,
         task: async (ctx, task) => {
-          const stepNumber = currentStep; // Capture current step number
-
           const servicesAdded = [];
           if (servicesToInstall.gateApp) servicesAdded.push('Gate App');
           if (servicesToInstall.guardianApp) servicesAdded.push('Guardian App');
@@ -326,29 +336,29 @@ export async function update(options) {
           // Update .env file with new app configuration
           updateEnvFile(envFile, servicesToInstall);
 
-          task.title = formatStepTitle(stepNumber, totalSteps, `Installed: ${servicesAdded.join(', ')}`);
+          task.title = formatStepTitle(stepInstallServices, totalSteps, `Installed: ${servicesAdded.join(', ')}`);
         }
       },
       {
-        title: formatStepTitle(++currentStep, totalSteps, 'Pulling latest Docker images'),
+        title: formatStepTitle(stepPull, totalSteps, 'Pulling latest Docker images'),
         task: async () => {
           await pullImagesSilent(composeFile);
         }
       },
       {
-        title: formatStepTitle(++currentStep, totalSteps, 'Stopping services'),
+        title: formatStepTitle(stepStop, totalSteps, 'Stopping services'),
         task: async () => {
           await stopServicesSilent(composeFile);
         }
       },
       {
-        title: formatStepTitle(++currentStep, totalSteps, 'Starting with new images'),
+        title: formatStepTitle(stepStart, totalSteps, 'Starting with new images'),
         task: async () => {
           await startServicesSilent(composeFile);
         }
       },
       {
-        title: formatStepTitle(++currentStep, totalSteps, 'Waiting for backend to be healthy'),
+        title: formatStepTitle(stepBackendHealth, totalSteps, 'Waiting for backend to be healthy'),
         task: async () => {
           const healthy = await waitForServiceHealthy(composeFile, 'backend', 120);
           if (!healthy) {
@@ -357,8 +367,8 @@ export async function update(options) {
         }
       },
       {
-        title: formatStepTitle(++currentStep, totalSteps, 'Waiting for Gate App to be healthy'),
-        skip: () => !hasGateApp && !servicesToInstall.gateApp ? (currentStep--, 'Gate App not installed') : false,
+        title: stepGateHealth ? formatStepTitle(stepGateHealth, totalSteps, 'Waiting for Gate App to be healthy') : '',
+        skip: () => !stepGateHealth ? 'Gate App not installed' : false,
         task: async () => {
           const healthy = await waitForServiceHealthy(composeFile, 'gate-app', 60);
           if (!healthy) {
@@ -367,8 +377,8 @@ export async function update(options) {
         }
       },
       {
-        title: formatStepTitle(++currentStep, totalSteps, 'Waiting for Guardian App to be healthy'),
-        skip: () => !hasGuardianApp && !servicesToInstall.guardianApp ? (currentStep--, 'Guardian App not installed') : false,
+        title: stepGuardianHealth ? formatStepTitle(stepGuardianHealth, totalSteps, 'Waiting for Guardian App to be healthy') : '',
+        skip: () => !stepGuardianHealth ? 'Guardian App not installed' : false,
         task: async () => {
           const healthy = await waitForServiceHealthy(composeFile, 'guardian-app', 60);
           if (!healthy) {
@@ -377,8 +387,8 @@ export async function update(options) {
         }
       },
       {
-        title: formatStepTitle(++currentStep, totalSteps, 'Waiting for Facial Web to be healthy'),
-        skip: () => !hasFacialWeb && !servicesToInstall.facialWeb ? (currentStep--, 'Facial Web not installed') : false,
+        title: stepFacialHealth ? formatStepTitle(stepFacialHealth, totalSteps, 'Waiting for Facial Web to be healthy') : '',
+        skip: () => !stepFacialHealth ? 'Facial Web not installed' : false,
         task: async () => {
           const healthy = await waitForServiceHealthy(composeFile, 'facial-web', 60);
           if (!healthy) {
@@ -387,19 +397,18 @@ export async function update(options) {
         }
       },
       {
-        title: formatStepTitle(++currentStep, totalSteps, 'Waiting for POS App to be healthy'),
-        skip: () => !hasPosApp && !servicesToInstall.posApp ? (currentStep--, 'POS App not installed') : false,
+        title: stepPosHealth ? formatStepTitle(stepPosHealth, totalSteps, 'Waiting for POS App to be healthy') : '',
+        skip: () => !stepPosHealth ? 'POS App not installed' : false,
         task: async () => {
-          const healthy = await waitForServiceHealthy(composeFile, 'pos-app', 60);
+          const healthy = await waitForServiceHealthy(composeFile, 'ante-pos', 60);
           if (!healthy) {
             throw new Error('POS App did not become healthy within 60 seconds');
           }
         }
       },
       {
-        title: formatStepTitle(++currentStep, totalSteps, 'Running database migrations'),
+        title: formatStepTitle(stepMigrations, totalSteps, 'Running database migrations'),
         task: async (ctx, task) => {
-          const stepNumber = currentStep; // Capture current step number
           const result = await runMigrations(composeFile);
 
           if (!result.success) {
@@ -408,24 +417,22 @@ export async function update(options) {
 
           // Update title if migrations were applied
           if (result.output && result.output.includes('Applied')) {
-            task.title = formatStepTitle(stepNumber, totalSteps, 'Database migrations applied');
+            task.title = formatStepTitle(stepMigrations, totalSteps, 'Database migrations applied');
           } else {
-            task.title = formatStepTitle(stepNumber, totalSteps, 'Database migrations (up to date)');
+            task.title = formatStepTitle(stepMigrations, totalSteps, 'Database migrations (up to date)');
           }
         }
       },
       {
-        title: formatStepTitle(++currentStep, totalSteps, 'Cleaning up unused Docker resources'),
-        skip: () => options.skipCleanup ? (currentStep--, 'Cleanup skipped') : false,
+        title: stepCleanup ? formatStepTitle(stepCleanup, totalSteps, 'Cleaning up unused Docker resources') : '',
+        skip: () => !stepCleanup ? 'Cleanup skipped' : false,
         task: async (ctx, task) => {
-          const stepNumber = currentStep; // Capture current step number
           try {
             await pruneDockerSilent();
-            task.title = formatStepTitle(stepNumber, totalSteps, 'Cleaned up unused Docker resources');
+            task.title = formatStepTitle(stepCleanup, totalSteps, 'Cleaned up unused Docker resources');
           } catch (error) {
             // Non-critical error - don't fail the update
             task.skip(`Cleanup failed: ${error.message}`);
-            currentStep--;
           }
         }
       }