@magentrix-corp/magentrix-cli 1.2.0 → 1.3.0

package/actions/setup.js

@@ -4,6 +4,7 @@ import Config from "../utils/config.js";
 import { getAccessToken, tryAuthenticate } from "../utils/magentrix/api/auth.js";
 import { ensureVSCodeFileAssociation } from "../utils/preferences.js";
 import { EXPORT_ROOT, HASHED_CWD } from "../vars/global.js";
+import { select } from "@inquirer/prompts";
 
 const config = new Config();
 
@@ -35,24 +36,70 @@ export const setup = async (cliOptions = {}) => {
     }
 
     if (cliOptions.instanceUrl) {
-        const trimmedUrl = cliOptions.instanceUrl.trim();
+        let trimmedUrl = cliOptions.instanceUrl.trim();
+        // Automatically strip trailing slashes
+        trimmedUrl = trimmedUrl.replace(/\/+$/, '');
+
         if (!urlRegex.test(trimmedUrl)) {
-            throw new Error('--instance-url must be in the form: https://subdomain.domain.com (NO http, NO trailing /, NO extra path)');
+            throw new Error('--instance-url must be in the form: https://subdomain.domain.com (no http, no extra path)');
         }
+        // Update the option with the cleaned URL
+        cliOptions.instanceUrl = trimmedUrl;
     }
 
-    // Get API key (from CLI or prompt)
-    const apiKey = cliOptions.apiKey
-        ? cliOptions.apiKey.trim()
-        : await ensureApiKey(true);
-
-    // Get instance URL (from CLI or prompt)
-    const instanceUrl = cliOptions.instanceUrl
-        ? cliOptions.instanceUrl.trim()
-        : await ensureInstanceUrl(true);
-
-    // Validate credentials by attempting to fetch an access token
-    const tokenData = await tryAuthenticate(apiKey, instanceUrl);
+    // Retry loop for authentication
+    let authSuccess = false;
+    let apiKey, instanceUrl, tokenData;
+
+    while (!authSuccess) {
+        // Get API key (from CLI or prompt)
+        apiKey = cliOptions.apiKey
+            ? cliOptions.apiKey.trim()
+            : await ensureApiKey(true);
+
+        // Get instance URL (from CLI or prompt)
+        instanceUrl = cliOptions.instanceUrl
+            ? cliOptions.instanceUrl.trim()
+            : await ensureInstanceUrl(true);
+
+        // Validate credentials by attempting to fetch an access token
+        try {
+            tokenData = await tryAuthenticate(apiKey, instanceUrl);
+            authSuccess = true;
+        } catch (error) {
+            console.log(error.message);
+            console.log();
+
+            // Ask user if they want to retry
+            try {
+                const retry = await select({
+                    message: 'What would you like to do?',
+                    choices: [
+                        { name: 'Try again', value: 'retry' },
+                        { name: 'Exit setup', value: 'exit' }
+                    ],
+                    default: 'retry'
+                });
+
+                if (retry !== 'retry') {
+                    console.log('❌ Setup cancelled.');
+                    process.exit(0);
+                }
+
+                // Reset CLI options so user can re-enter them
+                cliOptions.apiKey = null;
+                cliOptions.instanceUrl = null;
+                console.log(); // Blank line for spacing
+            } catch (error) {
+                // Handle Ctrl+C or other cancellation
+                if (error.name === 'ExitPromptError') {
+                    console.log('\n❌ Setup cancelled.');
+                    process.exit(0);
+                }
+                throw error;
+            }
+        }
+    }
 
     console.log(); // Blank line for spacing
 
@@ -69,7 +116,7 @@ export const setup = async (cliOptions = {}) => {
         { global: true, pathHash: HASHED_CWD }
     );
 
-    // Set up the editor 
+    // Set up the editor
     await ensureVSCodeFileAssociation('./');
 
     console.log(); // Blank line for spacing

package/bin/magentrix.js

@@ -15,6 +15,7 @@ import { EXPORT_ROOT } from '../vars/global.js';
 import { publish } from '../actions/publish.js';
 import { update } from '../actions/update.js';
 import { configWizard } from '../actions/config.js';
+import { irisLink, irisDev, irisDelete, irisRecover, vueBuildStage } from '../actions/iris/index.js';
 
 // ── Middleware ────────────────────────────────
 async function preMiddleware() {
@@ -60,7 +61,12 @@ program
                 { name: 'status', desc: 'Show file conflicts and sync status', icon: '📊 ' },
                 { name: 'publish', desc: 'Publish pending changes to the remote server', icon: '📤 ' },
                 { name: 'autopublish', desc: 'Watch & sync changes in real time', icon: '🔄 ' },
-                { name: 'update', desc: 'Update MagentrixCLI to the latest version', icon: '⬆️  ' }
+                { name: 'update', desc: 'Update MagentrixCLI to the latest version', icon: '⬆️  ' },
+                { name: 'iris-link', desc: 'Link a Vue project to the CLI', icon: '🔗 ' },
+                { name: 'vue-build-stage', desc: 'Build Vue project and stage for publish', icon: '🏗️  ' },
+                { name: 'iris-dev', desc: 'Start Vue dev server with platform assets', icon: '🌐 ' },
+                { name: 'iris-delete', desc: 'Delete an Iris app with backup', icon: '🗑️  ' },
+                { name: 'iris-recover', desc: 'Recover a deleted Iris app from backup', icon: '♻️  ' }
             ];
 
             const maxNameLen = Math.max(...commands.map(c => c.name.length));
@@ -191,6 +197,42 @@ program
     .description('Configure CLI settings')
     .action(configWizard);
 
+// Iris commands for Vue.js app management
+program
+    .command('iris-link')
+    .description('Link a Vue project to the CLI for deployment')
+    .option('--path <path>', 'Path to the Vue project')
+    .option('--unlink', 'Unlink a project instead of linking')
+    .option('--list', 'List all linked projects')
+    .option('--cleanup', 'Remove invalid (non-existent) linked projects')
+    .action(irisLink);
+
+program
+    .command('vue-build-stage')
+    .description('Build a Vue project and stage it for publishing')
+    .option('--path <path>', 'Path to the Vue project')
+    .option('--skip-build', 'Skip build step and use existing dist/')
+    .action(vueBuildStage);
+
+program
+    .command('iris-dev')
+    .description('Start Vue dev server with platform assets injected')
+    .option('--path <path>', 'Path to the Vue project')
+    .option('--no-inject', 'Skip asset injection')
+    .option('--restore', 'Restore config.ts from backup')
+    .action(irisDev);
+
+program
+    .command('iris-delete')
+    .description('Delete a published Iris app with recovery backup')
+    .action(irisDelete);
+
+program
+    .command('iris-recover')
+    .description('Recover a deleted Iris app from backup')
+    .option('--list', 'List available recovery backups')
+    .action(irisRecover);
+
 // ── Unknown Command Handler ──────────────────
 program.argument('[command]', 'command to run').action((cmd) => {
     const runMain = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magentrix-corp/magentrix-cli",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "CLI tool for synchronizing local files with Magentrix cloud platform",
   "main": "index.js",
   "type": "module",
@@ -36,6 +36,7 @@
   ],
   "dependencies": {
     "@inquirer/prompts": "^7.6.0",
+    "archiver": "^7.0.1",
     "chalk": "^5.4.1",
     "chokidar": "^4.0.3",
     "commander": "^14.0.0",

package/utils/autopublishLock.js

@@ -0,0 +1,77 @@
+import fs from 'fs';
+import path from 'path';
+
+const LOCK_FILE_NAME = 'autopublish.lock';
+const LOCK_EXPIRY_MS = 3600000; // 1 hour
+
+/**
+ * Get the path to the autopublish lock file.
+ * @returns {string} - Path to lock file
+ */
+export function getLockFilePath() {
+    return path.join(process.cwd(), '.magentrix', LOCK_FILE_NAME);
+}
+
+/**
+ * Check if autopublish is currently running.
+ * @returns {boolean} - True if autopublish is running (lock file exists and is not stale)
+ */
+export function isAutopublishRunning() {
+    const lockFile = getLockFilePath();
+
+    if (!fs.existsSync(lockFile)) return false;
+
+    try {
+        const lockData = JSON.parse(fs.readFileSync(lockFile, 'utf-8'));
+        const lockAge = Date.now() - lockData.timestamp;
+
+        // If lock is older than 1 hour, consider it stale
+        return lockAge < LOCK_EXPIRY_MS;
+    } catch {
+        // If we can't read the lock file, assume it's not running
+        return false;
+    }
+}
+
+/**
+ * Create a lock file to prevent multiple autopublish instances.
+ * @returns {boolean} - True if lock was acquired, false if already locked
+ */
+export function acquireAutopublishLock() {
+    const lockFile = getLockFilePath();
+
+    try {
+        if (fs.existsSync(lockFile)) {
+            // Check if the lock is stale (process might have crashed)
+            if (isAutopublishRunning()) {
+                return false; // Lock is active
+            }
+        }
+
+        // Create lock file
+        fs.mkdirSync(path.dirname(lockFile), { recursive: true });
+        fs.writeFileSync(lockFile, JSON.stringify({
+            pid: process.pid,
+            timestamp: Date.now()
+        }));
+
+        return true;
+    } catch (err) {
+        return false;
+    }
+}
+
+/**
+ * Release the autopublish lock file.
+ */
+export function releaseAutopublishLock() {
+    const lockFile = getLockFilePath();
+
+    try {
+        if (fs.existsSync(lockFile)) {
+            fs.unlinkSync(lockFile);
+        }
+    } catch {
+        // Ignore errors during cleanup
+    }
+}

package/utils/cli/helpers/compare.js

@@ -243,13 +243,12 @@ export async function showCurrentConflicts(rootDir, instanceUrl, token, forceCon
 export async function promptConflictResolution(fileIssues) {
     if (!fileIssues.length) return 'skip';
 
-    // Clear for better UX (skip in test mode to avoid clearing test output)
-    if (!process.env.MAGENTRIX_TEST_MODE) {
-        console.clear();
-    }
+    // Add spacing instead of clearing (clearing causes flickering with progress tracker)
+    console.log('\n');
+    console.log(chalk.gray('─'.repeat(48)));
     console.log(
         chalk.bold.yellow(
-            `\n${fileIssues.length} file${fileIssues.length > 1 ? 's' : ''} require conflict resolution:\n`
+            `${fileIssues.length} file${fileIssues.length > 1 ? 's' : ''} require conflict resolution:\n`
         )
     );
 

package/utils/cli/helpers/ensureApiKey.js

@@ -1,4 +1,4 @@
-import prompts from "prompts";
+import { password } from "@inquirer/prompts";
 import Config from "../../config.js";
 import { HASHED_CWD } from "../../../vars/global.js";
 
@@ -27,27 +27,33 @@ export const ensureApiKey = async (forcePrompt = false) => {
         console.log('\n🚀 Magentrix CLI Setup:');
 
         while (true) {
-            const response = await prompts({
-                type: 'password',
-                name: 'apiKey',
-                message: 'Enter your Magentrix API key (no spaces):',
-                validate: value =>
-                    !value || value.trim().length < 12
-                        ? "API key must be at least 12 characters."
-                        : /\s/.test(value)
-                            ? "API key cannot contain any spaces."
-                            : true,
-            });
-
-            if (!response.apiKey) {
-                console.error('❌ API key is required. Exiting.');
-                process.exit(1);
-            }
-
-            const trimmed = response.apiKey.trim();
-
-            if (isValid(trimmed)) {
-                return trimmed;
+            try {
+                const apiKeyInput = await password({
+                    message: 'Enter your Magentrix API key (no spaces):',
+                    mask: '*',
+                    validate: (value) => {
+                        if (!value || value.trim().length < 12) {
+                            return "API key must be at least 12 characters.";
+                        }
+                        if (/\s/.test(value)) {
+                            return "API key cannot contain any spaces.";
+                        }
+                        return true;
+                    }
+                });
+
+                const trimmed = apiKeyInput.trim();
+
+                if (isValid(trimmed)) {
+                    return trimmed;
+                }
+            } catch (error) {
+                // Handle Ctrl+C or other cancellation
+                if (error.name === 'ExitPromptError') {
+                    console.error('\n❌ API key is required. Exiting.');
+                    process.exit(1);
+                }
+                throw error;
             }
             // Invalid: will re-prompt.
         }

package/utils/cli/helpers/ensureInstanceUrl.js

@@ -1,4 +1,4 @@
-import prompts from "prompts";
+import { input } from "@inquirer/prompts";
 import Config from "../../config.js";
 import { checkInstanceUrl } from "../checkInstanceUrl.js";
 import { withSpinner } from "../../spinner.js";
@@ -27,37 +27,45 @@ export const ensureInstanceUrl = async (forcePrompt = false) => {
         console.log('\n🚀 Magentrix CLI Setup: Instance URL');
 
         while (true) {
-            // Prompt: Only validate format, NOT reachability
-            const { instanceUrl: inputUrl } = await prompts({
-                type: 'text',
-                name: 'instanceUrl',
-                message: 'Enter your Magentrix instance URL (e.g., https://example.magentrix.com):',
-                validate: value =>
-                    urlRegex.test(value.trim())
-                        ? true
-                        : 'Instance URL must be in the form: https://subdomain.domain.com (NO http, NO trailing /, NO extra path)',
-            });
-
-            if (!inputUrl) {
-                console.error('❌ Instance URL is required. Exiting.');
-                process.exit(1);
-            }
+            try {
+                // Prompt: Only validate format, NOT reachability
+                const inputUrl = await input({
+                    message: 'Enter your Magentrix instance URL (e.g., https://example.magentrix.com):',
+                    validate: (value) => {
+                        // Automatically strip trailing slashes for validation
+                        const cleaned = value.trim().replace(/\/+$/, '');
+                        if (!urlRegex.test(cleaned)) {
+                            return 'Instance URL must be in the form: https://subdomain.domain.com (no http, no extra path)';
+                        }
+                        return true;
+                    }
+                });
 
-            const trimmed = inputUrl.trim();
+                // Trim and automatically strip trailing slashes
+                const trimmed = inputUrl.trim().replace(/\/+$/, '');
 
-            // Now check reachability WITH a spinner
-            try {
-                await withSpinner('Checking instance URL...', () =>
-                    checkInstanceUrl(trimmed)
-                );
-                
-                return trimmed;
+                // Now check reachability WITH a spinner
+                try {
+                    await withSpinner('Checking instance URL...', () =>
+                        checkInstanceUrl(trimmed)
+                    );
+
+                    return trimmed;
+                } catch (error) {
+                    // Print error AFTER spinner, then re-prompt
+                    console.error('❌ Instance URL not reachable. Try again.');
+                }
             } catch (error) {
-                // Print error AFTER spinner, then re-prompt
-                console.error('❌ Instance URL not reachable. Try again.');
+                // Handle Ctrl+C or other cancellation
+                if (error.name === 'ExitPromptError') {
+                    console.error('\n❌ Instance URL is required. Exiting.');
+                    process.exit(1);
+                }
+                throw error;
             }
         }
     }
 
-    return instanceUrl.trim();
+    // Trim and automatically strip trailing slashes from existing URL
+    return instanceUrl.trim().replace(/\/+$/, '');
 };

package/utils/cli/writeRecords.js

@@ -39,7 +39,18 @@ export const mapRecordToFile = (record) => {
         ? path.join(mapping.directory, foundPathByRecordId.split(mapping.directory)[1] || "")
         : "";
 
-    const filePath = foundPathByRecordId ? relativeFoundPath : path.join(mapping.directory, filename);
+    // Fix for Bug 1: If the file exists but the name doesn't match the record name, 
+    // we should treat it as a rename and use the new name.
+    let useExistingPath = false;
+    if (foundPathByRecordId) {
+        const existingName = path.basename(foundPathByRecordId);
+        // Check if existing name matches the expected filename (ignoring extension case if needed, but strict for now)
+        if (existingName === filename) {
+            useExistingPath = true;
+        }
+    }
+
+    const filePath = useExistingPath ? relativeFoundPath : path.join(mapping.directory, filename);
 
     return {
         ...record,
@@ -198,7 +209,7 @@ export const writeRecords = async (records, resolutionMethod, progress = null, l
             try {
                 // Lookup a matching file dir in our cache, in case the file was renamed
                 const cachedFilePath = findFileByTag(record.Id) || path.resolve(filePath);
-                
+
                 // Ensure the directory exists (paranoia for deeply nested files)
                 fs.mkdirSync(path.dirname(cachedFilePath), { recursive: true });
                 fs.writeFileSync(cachedFilePath, finalContent, "utf8");

package/utils/config.js

@@ -200,6 +200,82 @@ class Config {
         }
     }
 
+    /**
+     * Remove multiple keys from config (global or project) in a single save operation.
+     * 
+     * @param {string[]} keys - Array of keys to remove.
+     * @param {Object} opts
+     * @param {boolean} opts.global - If true, use global config. Otherwise, use project config.
+     * @param {string} [opts.pathHash] - Optional. Hash for namespaced global config.
+     * @param {string} [opts.filename] - Optional. Custom filename for project config.
+     */
+    removeKeys(keys, opts = {}) {
+        const isGlobal = opts.global === true;
+        const filename = opts.filename;
+        const pathHash = opts.pathHash;
+
+        if (!Array.isArray(keys) || keys.length === 0) return;
+
+        if (isGlobal) {
+            if (this._globalConfig === null) this._globalConfig = this._loadConfig('global');
+
+            let changed = false;
+            if (pathHash) {
+                if (!this._globalConfig[pathHash]) return;
+                for (const key of keys) {
+                    if (key in this._globalConfig[pathHash]) {
+                        delete this._globalConfig[pathHash][key];
+                        changed = true;
+                    }
+                }
+            } else {
+                for (const key of keys) {
+                    if (key in this._globalConfig) {
+                        delete this._globalConfig[key];
+                        changed = true;
+                    }
+                }
+            }
+
+            if (changed) {
+                this._saveConfig(this._globalConfig, 'global');
+            }
+        } else {
+            if (filename) {
+                const projectFolderPath = path.join(this.projectDir, this.projectFolder);
+                if (!fs.existsSync(projectFolderPath)) return;
+                const customPath = path.join(projectFolderPath, filename);
+                const customConfig = this._loadConfig('project', customPath) || {};
+                
+                let changed = false;
+                for (const key of keys) {
+                    if (key in customConfig) {
+                        delete customConfig[key];
+                        changed = true;
+                    }
+                }
+
+                if (changed) {
+                    this._saveConfig(customConfig, 'project', customPath);
+                }
+            } else {
+                if (this._projectConfig === null) this._projectConfig = this._loadConfig('project');
+                
+                let changed = false;
+                for (const key of keys) {
+                    if (key in this._projectConfig) {
+                        delete this._projectConfig[key];
+                        changed = true;
+                    }
+                }
+
+                if (changed) {
+                    this._saveConfig(this._projectConfig, 'project');
+                }
+            }
+        }
+    }
+
 
     /**
      * Save a key-value pair to config (global or project).