ante-erp-cli 1.11.12 → 1.11.13

package/package.json

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

package/src/commands/update-cli.js

@@ -14,7 +14,7 @@ const __dirname = dirname(fileURLToPath(import.meta.url));
  * Get current CLI version
  * @returns {string} Current version
  */
-function getCurrentVersion() {
+export function getCurrentVersion() {
   const pkgPath = join(__dirname, '../../package.json');
   const pkg = JSON.parse(readFileSync(pkgPath, 'utf8'));
   return pkg.version;
@@ -22,10 +22,11 @@ function getCurrentVersion() {
 
 /**
  * Fetch latest version from npm registry
+ * @param {boolean} silent - If true, don't show spinner
  * @returns {Promise<string>} Latest version
  */
-async function getLatestVersion() {
-  const spinner = ora('Checking npm registry for latest version...').start();
+export async function getLatestVersion(silent = false) {
+  const spinner = silent ? null : ora('Checking npm registry for latest version...').start();
 
   try {
     const response = await fetch('https://registry.npmjs.org/ante-erp-cli/latest', {
@@ -37,11 +38,11 @@ async function getLatestVersion() {
     }
 
     const data = await response.json();
-    spinner.succeed('Retrieved latest version from npm');
+    if (spinner) spinner.succeed('Retrieved latest version from npm');
     return data.version;
 
   } catch (error) {
-    spinner.fail('Failed to check npm registry');
+    if (spinner) spinner.fail('Failed to check npm registry');
     throw new Error(`Unable to fetch latest version: ${error.message}`);
   }
 }

package/src/commands/update.js

@@ -1,11 +1,12 @@
 import chalk from 'chalk';
-import inquirer from 'inquirer';
 import { Listr } from 'listr2';
 import { join } from 'path';
 import { readFileSync, writeFileSync, renameSync } from 'fs';
+import semver from 'semver';
 import { getInstallDir } from '../utils/config.js';
-import { pullImages, stopServices, startServices, waitForServiceHealthy, runMigrations, pruneDocker } from '../utils/docker.js';
+import { pullImagesSilent, stopServicesSilent, startServicesSilent, waitForServiceHealthy, runMigrations, pruneDockerSilent } from '../utils/docker.js';
 import { backup } from './backup.js';
+import { getCurrentVersion, getLatestVersion } from './update-cli.js';
 import { generateDockerCompose } from '../templates/docker-compose.yml.js';
 
 /**
@@ -207,6 +208,17 @@ COMPANY_ID=1
   writeFileSync(envFile, envContent);
 }
 
+/**
+ * Format step title with numbering
+ * @param {number} step - Current step number
+ * @param {number} total - Total number of steps
+ * @param {string} description - Step description
+ * @returns {string} Formatted title
+ */
+function formatStepTitle(step, total, description) {
+  return `[${step}/${total}] ${description}`;
+}
+
 /**
  * Update ANTE to latest version
  */
@@ -216,109 +228,81 @@ export async function update(options) {
     const composeFile = join(installDir, 'docker-compose.yml');
     const envFile = join(installDir, '.env');
 
-    // Detect which apps are installed
-    const { hasGateApp, hasGuardianApp, hasFacialWeb, hasPosApp } = detectInstalledApps(composeFile);
-
     console.log(chalk.bold('\n🔄 ANTE ERP Update\n'));
 
-    // Confirmation
-    if (!options.force) {
-      // Check if running in non-interactive mode (no TTY)
-      if (!process.stdin.isTTY) {
-        console.error(chalk.yellow('\n⚠️  Warning: Running in non-interactive mode (no TTY detected)'));
-        console.error(chalk.gray('Use --force flag to skip confirmation prompts\n'));
-        console.error(chalk.cyan('Example: ante update --force\n'));
+    // Check CLI version first
+    try {
+      const currentVersion = getCurrentVersion();
+      const latestVersion = await getLatestVersion(true); // silent mode
+
+      if (!semver.gte(currentVersion, latestVersion)) {
+        console.error(chalk.red('❌ CLI version check failed!\n'));
+        console.error(chalk.gray(`You are using CLI version ${chalk.yellow(currentVersion)}`));
+        console.error(chalk.gray(`Latest version available: ${chalk.green(latestVersion)}\n`));
+        console.error(chalk.cyan('Please update the CLI first:'));
+        console.error(chalk.white('  npm install -g ante-erp-cli\n'));
+        console.error(chalk.gray('Then run \'ante update\' again.\n'));
         process.exit(1);
       }
-
-      const { confirm } = await inquirer.prompt([
-        {
-          type: 'confirm',
-          name: 'confirm',
-          message: 'Update ANTE to the latest version?',
-          default: true
-        }
-      ]);
-
-      if (!confirm) {
-        console.log(chalk.gray('\nUpdate cancelled.\n'));
-        return;
-      }
+    } catch (error) {
+      console.error(chalk.yellow('⚠️  Warning: Unable to check CLI version'));
+      console.error(chalk.gray(`Reason: ${error.message}`));
+      console.error(chalk.gray('Proceeding with update anyway...\n'));
     }
 
+    // Detect which apps are installed
+    const { hasGateApp, hasGuardianApp, hasFacialWeb, hasPosApp } = detectInstalledApps(composeFile);
+
     // Track which services to install
     let servicesToInstall = { gateApp: false, guardianApp: false, facialWeb: false, posApp: false };
 
+    // Calculate total steps dynamically
+    let totalSteps = 7; // Base steps: check services, install services, pull, stop, start, backend health, migrations
+    if (!options.skipBackup) totalSteps++; // Backup step
+    if (hasGateApp || servicesToInstall.gateApp) totalSteps++; // Gate App health check
+    if (hasGuardianApp || servicesToInstall.guardianApp) totalSteps++; // Guardian App health check
+    if (hasFacialWeb || servicesToInstall.facialWeb) totalSteps++; // Facial Web health check
+    if (hasPosApp || servicesToInstall.posApp) totalSteps++; // POS App health check
+    if (!options.skipCleanup) totalSteps++; // Cleanup step
+
+    let currentStep = 0;
+
     const tasks = new Listr([
       {
-        title: 'Creating backup',
-        skip: () => options.skipBackup,
+        title: formatStepTitle(++currentStep, totalSteps, 'Creating backup'),
+        skip: () => options.skipBackup ? (currentStep--, 'Backup skipped') : false,
         task: async () => {
           const timestamp = new Date().toISOString().split('.')[0].replace(/:/g, '-').replace('T', '_');
           await backup({ output: join(installDir, 'backups', `pre-update-${timestamp}.tar.gz`) });
         }
       },
       {
-        title: 'Checking for available new services',
+        title: formatStepTitle(++currentStep, totalSteps, 'Checking for available new services'),
         task: async (ctx, task) => {
           const missingServices = detectMissingServices(composeFile);
 
           if (!missingServices.gateApp && !missingServices.guardianApp && !missingServices.facialWeb && !missingServices.posApp) {
-            task.skip('All available services are already installed');
+            task.title = formatStepTitle(currentStep, totalSteps, 'Checking for available new services (none found)');
+            ctx.missingServices = null;
             return;
           }
 
+          // Auto-install new services without prompting
+          servicesToInstall = missingServices;
+
           const availableServices = [];
-          if (missingServices.gateApp) availableServices.push('Gate App (School attendance)');
-          if (missingServices.guardianApp) availableServices.push('Guardian App (Parent portal)');
-          if (missingServices.facialWeb) availableServices.push('Facial Web (Face recognition)');
-          if (missingServices.posApp) availableServices.push('POS App (Point of Sale)');
+          if (missingServices.gateApp) availableServices.push('Gate App');
+          if (missingServices.guardianApp) availableServices.push('Guardian App');
+          if (missingServices.facialWeb) availableServices.push('Facial Web');
+          if (missingServices.posApp) availableServices.push('POS App');
 
-          task.output = `Found ${availableServices.length} new service(s): ${availableServices.join(', ')}`;
+          task.title = formatStepTitle(currentStep, totalSteps, `Found new services: ${availableServices.join(', ')}`);
           ctx.missingServices = missingServices;
         }
       },
       {
-        title: 'Confirming installation of new services',
-        skip: (ctx) => !ctx.missingServices || (!ctx.missingServices.gateApp && !ctx.missingServices.guardianApp && !ctx.missingServices.facialWeb && !ctx.missingServices.posApp),
-        task: async (ctx, task) => {
-          if (options.force) {
-            servicesToInstall = ctx.missingServices;
-            task.output = 'Auto-installing new services (--force flag)';
-            return;
-          }
-
-          if (!process.stdin.isTTY) {
-            task.skip('Skipping new services (non-interactive mode, use --force to auto-install)');
-            return;
-          }
-
-          const availableServices = [];
-          if (ctx.missingServices.gateApp) availableServices.push('Gate App');
-          if (ctx.missingServices.guardianApp) availableServices.push('Guardian App');
-          if (ctx.missingServices.facialWeb) availableServices.push('Facial Web');
-          if (ctx.missingServices.posApp) availableServices.push('POS App');
-
-          const { installNew } = await inquirer.prompt([
-            {
-              type: 'confirm',
-              name: 'installNew',
-              message: `Install ${availableServices.join(', ')}?`,
-              default: true
-            }
-          ]);
-
-          if (installNew) {
-            servicesToInstall = ctx.missingServices;
-            task.output = `Installing: ${availableServices.join(', ')}`;
-          } else {
-            task.skip('User declined installation of new services');
-          }
-        }
-      },
-      {
-        title: 'Installing new services',
-        skip: () => !servicesToInstall.gateApp && !servicesToInstall.guardianApp && !servicesToInstall.facialWeb && !servicesToInstall.posApp,
+        title: formatStepTitle(++currentStep, totalSteps, 'Installing new services'),
+        skip: () => !servicesToInstall.gateApp && !servicesToInstall.guardianApp && !servicesToInstall.facialWeb && !servicesToInstall.posApp ? (currentStep--, 'No new services to install') : false,
         task: async (ctx, task) => {
           const servicesAdded = [];
           if (servicesToInstall.gateApp) servicesAdded.push('Gate App');
@@ -326,37 +310,35 @@ export async function update(options) {
           if (servicesToInstall.facialWeb) servicesAdded.push('Facial Web');
           if (servicesToInstall.posApp) servicesAdded.push('POS App');
 
-          task.output = `Adding ${servicesAdded.join(', ')} to configuration...`;
-
           // Update docker-compose.yml with new services
           updateDockerCompose(composeFile, envFile, servicesToInstall);
 
           // Update .env file with new app configuration
           updateEnvFile(envFile, servicesToInstall);
 
-          task.output = `Successfully added ${servicesAdded.join(', ')}`;
+          task.title = formatStepTitle(currentStep, totalSteps, `Installed: ${servicesAdded.join(', ')}`);
         }
       },
       {
-        title: 'Pulling latest images',
+        title: formatStepTitle(++currentStep, totalSteps, 'Pulling latest Docker images'),
         task: async () => {
-          await pullImages(composeFile);
+          await pullImagesSilent(composeFile);
         }
       },
       {
-        title: 'Stopping services',
+        title: formatStepTitle(++currentStep, totalSteps, 'Stopping services'),
         task: async () => {
-          await stopServices(composeFile);
+          await stopServicesSilent(composeFile);
         }
       },
       {
-        title: 'Starting with new images',
+        title: formatStepTitle(++currentStep, totalSteps, 'Starting with new images'),
         task: async () => {
-          await startServices(composeFile);
+          await startServicesSilent(composeFile);
         }
       },
       {
-        title: 'Waiting for backend to be healthy',
+        title: formatStepTitle(++currentStep, totalSteps, 'Waiting for backend to be healthy'),
         task: async () => {
           const healthy = await waitForServiceHealthy(composeFile, 'backend', 120);
           if (!healthy) {
@@ -365,8 +347,8 @@ export async function update(options) {
         }
       },
       {
-        title: 'Waiting for Gate App to be healthy',
-        skip: () => !hasGateApp && !servicesToInstall.gateApp,
+        title: formatStepTitle(++currentStep, totalSteps, 'Waiting for Gate App to be healthy'),
+        skip: () => !hasGateApp && !servicesToInstall.gateApp ? (currentStep--, 'Gate App not installed') : false,
         task: async () => {
           const healthy = await waitForServiceHealthy(composeFile, 'gate-app', 60);
           if (!healthy) {
@@ -375,8 +357,8 @@ export async function update(options) {
         }
       },
       {
-        title: 'Waiting for Guardian App to be healthy',
-        skip: () => !hasGuardianApp && !servicesToInstall.guardianApp,
+        title: formatStepTitle(++currentStep, totalSteps, 'Waiting for Guardian App to be healthy'),
+        skip: () => !hasGuardianApp && !servicesToInstall.guardianApp ? (currentStep--, 'Guardian App not installed') : false,
         task: async () => {
           const healthy = await waitForServiceHealthy(composeFile, 'guardian-app', 60);
           if (!healthy) {
@@ -385,8 +367,8 @@ export async function update(options) {
         }
       },
       {
-        title: 'Waiting for Facial Web to be healthy',
-        skip: () => !hasFacialWeb && !servicesToInstall.facialWeb,
+        title: formatStepTitle(++currentStep, totalSteps, 'Waiting for Facial Web to be healthy'),
+        skip: () => !hasFacialWeb && !servicesToInstall.facialWeb ? (currentStep--, 'Facial Web not installed') : false,
         task: async () => {
           const healthy = await waitForServiceHealthy(composeFile, 'facial-web', 60);
           if (!healthy) {
@@ -395,8 +377,8 @@ export async function update(options) {
         }
       },
       {
-        title: 'Waiting for POS App to be healthy',
-        skip: () => !hasPosApp && !servicesToInstall.posApp,
+        title: formatStepTitle(++currentStep, totalSteps, 'Waiting for POS App to be healthy'),
+        skip: () => !hasPosApp && !servicesToInstall.posApp ? (currentStep--, 'POS App not installed') : false,
         task: async () => {
           const healthy = await waitForServiceHealthy(composeFile, 'pos-app', 60);
           if (!healthy) {
@@ -405,7 +387,7 @@ export async function update(options) {
         }
       },
       {
-        title: 'Running database migrations',
+        title: formatStepTitle(++currentStep, totalSteps, 'Running database migrations'),
         task: async (ctx, task) => {
           const result = await runMigrations(composeFile);
 
@@ -413,27 +395,40 @@ export async function update(options) {
             throw new Error(`Migration failed:\n${result.output}`);
           }
 
-          // Show migration output if there were migrations run
-          if (result.output && result.output.trim()) {
-            task.output = result.output;
+          // Update title if migrations were applied
+          if (result.output && result.output.includes('Applied')) {
+            task.title = formatStepTitle(currentStep, totalSteps, 'Database migrations applied');
+          } else {
+            task.title = formatStepTitle(currentStep, totalSteps, 'Database migrations (up to date)');
           }
         }
       },
       {
-        title: 'Cleaning up unused Docker resources',
-        skip: () => options.skipCleanup,
+        title: formatStepTitle(++currentStep, totalSteps, 'Cleaning up unused Docker resources'),
+        skip: () => options.skipCleanup ? (currentStep--, 'Cleanup skipped') : false,
         task: async (ctx, task) => {
           try {
-            // Run Docker cleanup to remove dangling images
-            await pruneDocker();
-            task.output = 'Removed unused Docker images and containers';
+            await pruneDockerSilent();
+            task.title = formatStepTitle(currentStep, totalSteps, 'Cleaned up unused Docker resources');
           } catch (error) {
             // Non-critical error - don't fail the update
-            task.skip(`Cleanup skipped: ${error.message}`);
+            task.skip(`Cleanup failed: ${error.message}`);
+            currentStep--;
           }
         }
       }
-    ]);
+    ], {
+      renderer: 'default',
+      rendererOptions: {
+        collapse: false,
+        showSubtasks: false,
+        clearOutput: false,
+        showTimer: false,
+        removeEmptyLines: true
+      },
+      concurrent: false,
+      exitOnError: true
+    });
     
     await tasks.run();
     

package/src/utils/docker.js

@@ -279,6 +279,65 @@ export async function pruneDocker() {
   });
 }
 
+/**
+ * Pull Docker images (silent version - no output)
+ * @param {string} composeFile - Path to docker-compose.yml
+ * @returns {Promise<void>}
+ */
+export async function pullImagesSilent(composeFile) {
+  await execa('docker', ['compose', '-f', composeFile, 'pull'], {
+    stdout: 'pipe',
+    stderr: 'pipe'
+  });
+}
+
+/**
+ * Start Docker services (silent version - no output)
+ * @param {string} composeFile - Path to docker-compose.yml
+ * @param {string[]} services - Specific services to start (optional)
+ * @returns {Promise<void>}
+ */
+export async function startServicesSilent(composeFile, services = []) {
+  const args = ['compose', '-f', composeFile, 'up', '-d'];
+  if (services.length > 0) {
+    args.push(...services);
+  }
+
+  await execa('docker', args, {
+    stdout: 'pipe',
+    stderr: 'pipe'
+  });
+}
+
+/**
+ * Stop Docker services (silent version - no output)
+ * @param {string} composeFile - Path to docker-compose.yml
+ * @param {string[]} services - Specific services to stop (optional)
+ * @returns {Promise<void>}
+ */
+export async function stopServicesSilent(composeFile, services = []) {
+  const args = ['compose', '-f', composeFile, 'stop'];
+  if (services.length > 0) {
+    args.push(...services);
+  }
+
+  await execa('docker', args, {
+    stdout: 'pipe',
+    stderr: 'pipe'
+  });
+}
+
+/**
+ * Prune unused Docker resources (silent version - no output)
+ * @returns {Promise<void>}
+ */
+export async function pruneDockerSilent() {
+  await execa('docker', ['system', 'prune', '-af'], {
+    stdout: 'pipe',
+    stderr: 'pipe'
+  });
+}
+
 /**
  * Run Prisma migrations in backend container
  * @param {string} composeFile - Path to docker-compose.yml