@magentrix-corp/magentrix-cli 1.3.7 → 1.3.8

package/actions/iris/buildStage.js

@@ -398,28 +398,9 @@ async function buildFromVueProject(options) {
         console.log(chalk.green('\u2713 Build output validated'));
     }
 
-    // Stage to selected workspace
+    // Check if workspace might be out of sync and offer to pull first (BEFORE staging)
+    // This ensures pull doesn't overwrite our staged files
     console.log();
-    console.log(chalk.blue(`Staging to workspace: ${workspacePath}`));
-
-    const stageResult = stageToWorkspace(distPath, slug, workspacePath);
-
-    if (!stageResult.success) {
-        console.log(chalk.red(`Failed to stage: ${stageResult.error}`));
-        return;
-    }
-
-    console.log(chalk.green(`\u2713 Staged ${stageResult.fileCount} files to ${stageResult.stagedPath}`));
-
-    // Summary
-    console.log();
-    console.log(chalk.green('─'.repeat(48)));
-    console.log(chalk.green.bold('\u2713 Build & Stage Complete!'));
-    console.log();
-    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);
 
@@ -444,7 +425,7 @@ async function buildFromVueProject(options) {
                 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?',
+                    message: 'Do you still want to continue with staging and publishing?',
                     default: false
                 });
 
@@ -453,7 +434,8 @@ async function buildFromVueProject(options) {
                     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`));
+                    console.log(chalk.white(`  3. Run ${chalk.yellow('magentrix vue-build-stage --skip-build')} to stage`));
+                    console.log(chalk.white(`  4. Run ${chalk.yellow('magentrix publish')} to deploy`));
                     return;
                 }
             }
@@ -474,6 +456,27 @@ async function buildFromVueProject(options) {
         console.log(chalk.green('✓ Workspace is in sync'));
     }
 
+    // Stage to selected workspace (AFTER pull to avoid overwriting)
+    console.log();
+    console.log(chalk.blue(`Staging to workspace: ${workspacePath}`));
+
+    const stageResult = stageToWorkspace(distPath, slug, workspacePath);
+
+    if (!stageResult.success) {
+        console.log(chalk.red(`Failed to stage: ${stageResult.error}`));
+        return;
+    }
+
+    console.log(chalk.green(`\u2713 Staged ${stageResult.fileCount} files to ${stageResult.stagedPath}`));
+
+    // Summary
+    console.log();
+    console.log(chalk.green('─'.repeat(48)));
+    console.log(chalk.green.bold('\u2713 Build & Stage Complete!'));
+    console.log();
+    console.log(chalk.gray(`Staged to: ${stageResult.stagedPath}`));
+    console.log();
+
     // Ask if they want to publish now
     const shouldPublish = await confirm({
         message: 'Do you want to publish to Magentrix now?',

package/package.json

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