@magentrix-corp/magentrix-cli 1.3.5 → 1.3.7

package/README.md

@@ -505,7 +505,9 @@ magentrix vue-build-stage
 1. Select from linked projects or enter path manually
 2. Run `npm run build` in the Vue project
 3. Validate the build output
-4. Copy to workspace `src/iris-apps/<app-slug>/`
+4. Copy to workspace `src/iris-apps/<app-slug>/` (excludes index.html, favicon.ico)
+5. Check sync status and prompt to pull if needed (required before publishing)
+6. Prompt to publish to Magentrix
 
 #### Vue Development Server
 ```bash
@@ -621,7 +623,7 @@ magentrix run-dev             # Start dev server with platform assets
 # Deployment - Option A (from Vue project folder)
 cd ~/my-vue-app               # Work from your Vue project
 magentrix vue-build-stage     # Build and select workspace to stage into
-# Follow prompts, then navigate to workspace to publish
+# Prompted: "Do you want to publish to Magentrix now?" → Yes/No
 
 # Deployment - Option B (from Magentrix workspace)
 cd ~/magentrix-workspace      # Navigate to Magentrix workspace
@@ -678,6 +680,19 @@ When running from a Vue project, the command looks for registered workspaces in
 
 **Note**: Existing workspaces are auto-registered when you run any command from them.
 
+#### "Publishing Iris apps from an out-of-sync workspace is not allowed"
+When running `vue-build-stage` from a Vue project, the CLI checks if the target workspace is in sync with the server. If there are pending remote changes, you must pull first.
+
+**Why this is required:**
+- Prevents deployment conflicts
+- Ensures your app is deployed alongside the latest server state
+- Avoids overwriting changes made by other team members
+
+**To resolve:**
+1. Navigate to the workspace: `cd /path/to/workspace`
+2. Pull latest changes: `magentrix pull`
+3. Re-run `vue-build-stage` from your Vue project
+
 #### "Missing required field in config.ts: slug (appPath)"
 Your Vue project's `config.ts` is missing the app identifier. Add an `appPath` or `slug` field.
 
@@ -785,7 +800,7 @@ magentrix status        # Verify everything is in sync
 cd ~/my-vue-app               # Navigate to your Vue project
 magentrix iris-link           # Link project (first time only)
 magentrix vue-build-stage     # Build and select workspace to stage into
-# Navigate to workspace and run: magentrix publish
+# Prompted: "Do you want to publish to Magentrix now?" → Yes/No
 ```
 
 **Option B: From Magentrix workspace**

package/actions/iris/buildStage.js

@@ -419,6 +419,61 @@ async function buildFromVueProject(options) {
     console.log(chalk.gray(`Staged to: ${stageResult.stagedPath}`));
     console.log();
 
+    // Check if workspace might be out of sync and offer to pull first
+    console.log(chalk.gray('Checking workspace sync status...'));
+    const syncStatus = await checkWorkspaceSyncStatus(workspacePath);
+
+    if (syncStatus.needsPull) {
+        console.log();
+        console.log(chalk.yellow('⚠ Your workspace may be out of sync with the server.'));
+
+        const shouldPull = await confirm({
+            message: 'Would you like to pull latest changes first?',
+            default: true
+        });
+
+        if (shouldPull) {
+            console.log();
+            console.log(chalk.blue('Running pull from workspace...'));
+            console.log();
+
+            const pullSuccess = await runCommandFromWorkspace(workspacePath, 'pull');
+
+            if (!pullSuccess) {
+                console.log();
+                console.log(chalk.yellow('Pull encountered issues. You may want to resolve them manually.'));
+
+                const continueAnyway = await confirm({
+                    message: 'Do you still want to continue with publishing?',
+                    default: false
+                });
+
+                if (!continueAnyway) {
+                    console.log();
+                    console.log(chalk.cyan('To continue manually:'));
+                    console.log(chalk.white(`  1. Navigate to workspace: ${chalk.yellow(`cd "${workspacePath}"`)}`));
+                    console.log(chalk.white(`  2. Run ${chalk.yellow('magentrix pull')} to resolve conflicts`));
+                    console.log(chalk.white(`  3. Run ${chalk.yellow('magentrix publish')} to deploy`));
+                    return;
+                }
+            }
+            console.log();
+        } else {
+            // User declined to pull - block publishing from out-of-sync workspace
+            console.log();
+            console.log(chalk.red('Publishing Iris apps from an out-of-sync workspace is not allowed.'));
+            console.log(chalk.gray('This prevents conflicts and ensures your deployment is based on the latest server state.'));
+            console.log();
+            console.log(chalk.cyan('To continue:'));
+            console.log(chalk.white(`  1. Navigate to workspace: ${chalk.yellow(`cd "${workspacePath}"`)}`));
+            console.log(chalk.white(`  2. Run ${chalk.yellow('magentrix pull')} to sync with server`));
+            console.log(chalk.white(`  3. Run ${chalk.yellow('magentrix publish')} to deploy`));
+            return;
+        }
+    } else if (syncStatus.checked) {
+        console.log(chalk.green('✓ Workspace is in sync'));
+    }
+
     // Ask if they want to publish now
     const shouldPublish = await confirm({
         message: 'Do you want to publish to Magentrix now?',
@@ -430,7 +485,7 @@ async function buildFromVueProject(options) {
         console.log(chalk.blue('Running publish from workspace...'));
         console.log();
 
-        const publishSuccess = await runPublishFromWorkspace(workspacePath);
+        const publishSuccess = await runCommandFromWorkspace(workspacePath, 'publish');
 
         if (!publishSuccess) {
             console.log();
@@ -448,17 +503,64 @@ async function buildFromVueProject(options) {
 }
 
 /**
- * Run magentrix publish from a specific workspace directory.
+ * Check if a workspace needs to pull (has remote changes or conflicts).
+ *
+ * @param {string} workspacePath - Path to the Magentrix workspace
+ * @returns {Promise<{checked: boolean, needsPull: boolean}>}
+ */
+async function checkWorkspaceSyncStatus(workspacePath) {
+    return new Promise((resolvePromise) => {
+        const isWindows = process.platform === 'win32';
+        const npmCmd = isWindows ? 'npx.cmd' : 'npx';
+
+        let output = '';
+
+        const child = spawn(npmCmd, ['magentrix', 'status'], {
+            cwd: workspacePath,
+            stdio: ['inherit', 'pipe', 'pipe'],
+            shell: isWindows
+        });
+
+        child.stdout.on('data', (data) => {
+            output += data.toString();
+        });
+
+        child.stderr.on('data', (data) => {
+            output += data.toString();
+        });
+
+        child.on('close', (code) => {
+            // Check output for signs of remote changes or conflicts
+            const lowerOutput = output.toLowerCase();
+            const needsPull = lowerOutput.includes('conflict') ||
+                              lowerOutput.includes('remote') ||
+                              lowerOutput.includes('server has changes') ||
+                              lowerOutput.includes('out of sync') ||
+                              lowerOutput.includes('modified on server');
+
+            resolvePromise({ checked: code === 0, needsPull });
+        });
+
+        child.on('error', () => {
+            // If we can't check, assume it's fine and let them proceed
+            resolvePromise({ checked: false, needsPull: false });
+        });
+    });
+}
+
+/**
+ * Run a magentrix command from a specific workspace directory.
  *
  * @param {string} workspacePath - Path to the Magentrix workspace
- * @returns {Promise<boolean>} - True if publish succeeded
+ * @param {string} command - The magentrix command to run (e.g., 'pull', 'publish')
+ * @returns {Promise<boolean>} - True if command succeeded
  */
-async function runPublishFromWorkspace(workspacePath) {
+async function runCommandFromWorkspace(workspacePath, command) {
     return new Promise((resolvePromise) => {
         const isWindows = process.platform === 'win32';
         const npmCmd = isWindows ? 'npx.cmd' : 'npx';
 
-        const child = spawn(npmCmd, ['magentrix', 'publish'], {
+        const child = spawn(npmCmd, ['magentrix', command], {
             cwd: workspacePath,
             stdio: 'inherit',
             shell: isWindows
@@ -469,7 +571,7 @@ async function runPublishFromWorkspace(workspacePath) {
         });
 
         child.on('error', (err) => {
-            console.log(chalk.yellow(`Warning: Could not run publish: ${err.message}`));
+            console.log(chalk.yellow(`Warning: Could not run ${command}: ${err.message}`));
             resolvePromise(false);
         });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magentrix-corp/magentrix-cli",
-  "version": "1.3.5",
+  "version": "1.3.7",
   "description": "CLI tool for synchronizing local files with Magentrix cloud platform",
   "main": "index.js",
   "type": "module",

package/utils/iris/builder.js

@@ -1,10 +1,13 @@
 import { spawn } from 'node:child_process';
 import { existsSync, mkdirSync, cpSync, rmSync, readdirSync } from 'node:fs';
-import { join, resolve } from 'node:path';
+import { join, resolve, basename } from 'node:path';
 import { validateIrisBuild } from './validator.js';
 import { updateLastBuild } from './linker.js';
 import { EXPORT_ROOT, IRIS_APPS_DIR } from '../../vars/global.js';
 
+// Files to exclude when staging Iris apps (not needed on server)
+const EXCLUDED_FILES = new Set(['index.html', 'favicon.ico']);
+
 /**
  * Build a Vue project using npm run build.
  *
@@ -176,9 +179,20 @@ export function stageToWorkspace(distPath, slug, workspacePath = process.cwd())
         rmSync(targetDir, { recursive: true, force: true });
     }
 
-    // Copy dist contents to target
+    // Copy dist contents to target, excluding unnecessary files
     try {
-        cpSync(resolvedDistPath, targetDir, { recursive: true });
+        cpSync(resolvedDistPath, targetDir, {
+            recursive: true,
+            filter: (src) => {
+                // Use basename for reliable cross-platform filename extraction
+                const filename = basename(src);
+                // Only exclude specific files, not directories
+                if (EXCLUDED_FILES.has(filename)) {
+                    return false;
+                }
+                return true;
+            }
+        });
     } catch (err) {
         return {
             success: false,