@magentrix-corp/magentrix-cli 1.3.2 → 1.3.3

package/README.md

@@ -480,7 +480,7 @@ magentrix iris-link
 - `--cleanup` - Remove invalid (non-existent) linked projects
 
 **Menu options:**
-- Link a new Vue project
+- Link a Vue project
 - View all linked projects
 - Unlink a project
 - Cleanup invalid projects

package/actions/iris/dev.js

@@ -13,11 +13,11 @@ import {
     getInjectionTarget
 } from '../../utils/iris/config-reader.js';
 import { getIrisAssets } from '../../utils/magentrix/api/iris.js';
+import { getAccessToken } from '../../utils/magentrix/api/auth.js';
 import {
     getLinkedProjectsWithStatus,
     buildProjectChoices
 } from '../../utils/iris/linker.js';
-import { ensureValidCredentials } from '../../utils/cli/helpers/ensureCredentials.js';
 
 /**
  * iris-dev command - Start Vue dev server with platform assets injected.
@@ -100,55 +100,57 @@ export const irisDev = async (options = {}) => {
 
     // Inject assets if enabled
     if (inject && siteUrl) {
-        console.log(chalk.blue('Fetching platform assets...'));
-
-        try {
-            // Get credentials for API call
-            const { instanceUrl, token } = await ensureValidCredentials();
-
-            // Use siteUrl from config if different from instanceUrl
-            const targetUrl = siteUrl || instanceUrl;
-
-            const assetsResult = await getIrisAssets(targetUrl, token.value);
-
-            if (assetsResult.success && assetsResult.assets?.length > 0) {
-                console.log(chalk.green(`\u2713 Found ${assetsResult.assets.length} platform assets`));
-
-                // Determine which file will be modified
-                const { targetFile, targetName } = getInjectionTarget(projectPath);
+        // Check if we have the refresh token for authentication
+        if (!vueConfig.refreshToken) {
+            console.log(chalk.yellow('Warning: VITE_REFRESH_TOKEN not set in .env.development'));
+            console.log(chalk.gray('Asset injection requires authentication. Continuing without assets.'));
+        } else {
+            console.log(chalk.blue('Fetching platform assets...'));
 
-                if (!targetFile) {
-                    console.log(chalk.yellow('Warning: No .env.development file found. Cannot inject assets.'));
-                    console.log(chalk.gray('Create a .env.development file to enable asset injection.'));
-                } else {
-                    modifiedFilePath = targetFile;
-                    modifiedFileName = targetName;
+            try {
+                // Get access token using the refresh token from .env.development
+                const tokenData = await getAccessToken(vueConfig.refreshToken, siteUrl);
+                const assetsResult = await getIrisAssets(siteUrl, tokenData.token);
 
-                    // Backup before modifying
-                    console.log(chalk.blue(`Backing up ${modifiedFileName}...`));
-                    backupPath = backupFile(modifiedFilePath);
-                    console.log(chalk.green(`\u2713 Backup created`));
+                if (assetsResult.success && assetsResult.assets?.length > 0) {
+                    console.log(chalk.green(`\u2713 Found ${assetsResult.assets.length} platform assets`));
 
-                    // Inject assets
-                    console.log(chalk.blue('Injecting assets...'));
-                    const injectResult = injectAssets(projectPath, assetsResult.assets);
+                    // Determine which file will be modified
+                    const { targetFile, targetName } = getInjectionTarget(projectPath);
 
-                    if (injectResult.success) {
-                        assetsInjected = true;
-                        console.log(chalk.green(`\u2713 Assets injected into ${injectResult.targetName}`));
+                    if (!targetFile) {
+                        console.log(chalk.yellow('Warning: No .env.development file found. Cannot inject assets.'));
+                        console.log(chalk.gray('Create a .env.development file to enable asset injection.'));
                     } else {
-                        console.log(chalk.yellow('Warning: Could not inject assets. Continuing without injection.'));
+                        modifiedFilePath = targetFile;
+                        modifiedFileName = targetName;
+
+                        // Backup before modifying
+                        console.log(chalk.blue(`Backing up ${modifiedFileName}...`));
+                        backupPath = backupFile(modifiedFilePath);
+                        console.log(chalk.green(`\u2713 Backup created`));
+
+                        // Inject assets
+                        console.log(chalk.blue('Injecting assets...'));
+                        const injectResult = injectAssets(projectPath, assetsResult.assets);
+
+                        if (injectResult.success) {
+                            assetsInjected = true;
+                            console.log(chalk.green(`\u2713 Assets injected into ${injectResult.targetName}`));
+                        } else {
+                            console.log(chalk.yellow('Warning: Could not inject assets. Continuing without injection.'));
+                        }
                     }
+                } else if (assetsResult.error) {
+                    console.log(chalk.yellow(`Warning: Could not fetch assets: ${assetsResult.error}`));
+                    console.log(chalk.gray('Continuing without asset injection.'));
+                } else {
+                    console.log(chalk.yellow('No platform assets found.'));
                 }
-            } else if (assetsResult.error) {
-                console.log(chalk.yellow(`Warning: Could not fetch assets: ${assetsResult.error}`));
+            } catch (err) {
+                console.log(chalk.yellow(`Warning: Error fetching assets: ${err.message}`));
                 console.log(chalk.gray('Continuing without asset injection.'));
-            } else {
-                console.log(chalk.yellow('No platform assets found.'));
             }
-        } catch (err) {
-            console.log(chalk.yellow(`Warning: Error fetching assets: ${err.message}`));
-            console.log(chalk.gray('Continuing without asset injection.'));
         }
     } else if (!inject) {
         console.log(chalk.gray('Skipping asset injection (--no-inject)'));

package/actions/iris/link.js

@@ -77,9 +77,9 @@ async function showMainMenu() {
 
     const choices = [
         {
-            name: 'Link a new Vue project',
+            name: 'Link a Vue project',
             value: 'link',
-            description: 'Add a Vue project to the CLI'
+            description: chalk.dim('→ Add a Vue project to the CLI')
         }
     ];
 
@@ -87,12 +87,12 @@ async function showMainMenu() {
         choices.push({
             name: 'View linked projects',
             value: 'list',
-            description: 'Show all linked Vue projects with status'
+            description: chalk.dim('→ Show all linked Vue projects with status')
         });
         choices.push({
             name: 'Unlink a project',
             value: 'unlink',
-            description: 'Remove a Vue project from the CLI'
+            description: chalk.dim('→ Remove a Vue project from the CLI')
         });
     }
 
@@ -100,7 +100,7 @@ async function showMainMenu() {
         choices.push({
             name: `Clean up invalid projects (${invalidCount})`,
             value: 'cleanup',
-            description: 'Remove projects with missing paths'
+            description: chalk.dim('→ Remove projects with missing paths')
         });
     }
 
@@ -152,33 +152,31 @@ async function handleLink(pathOption) {
         if (cwdConfig.found && cwdConfig.errors.length === 0) {
             // Valid Vue project
             choices.push({
-                name: `Current directory - ${cwdConfig.appName} (${cwdConfig.slug})`,
+                name: `Current directory (${cwdPath})`,
                 value: cwdPath,
-                description: cwdPath
+                description: chalk.dim(`→ App: "${cwdConfig.appName}" (${cwdConfig.slug})`)
             });
         } else if (cwdConfig.found && cwdConfig.errors.length > 0) {
             // Has config.ts but with errors
             const errorMsg = cwdConfig.errors[0] || 'Invalid config';
             choices.push({
-                name: `Current directory`,
+                name: `Current directory (${cwdPath})`,
                 value: '__disabled__',
-                disabled: `Config error: ${errorMsg}`,
-                description: cwdPath
+                disabled: `Config error: ${errorMsg}`
             });
         } else {
             // No config.ts found
             choices.push({
-                name: `Current directory`,
+                name: `Current directory (${cwdPath})`,
                 value: '__disabled__',
-                disabled: 'No config.ts found',
-                description: cwdPath
+                disabled: 'No config.ts found'
             });
         }
 
         choices.push({
             name: 'Enter path manually',
             value: '__manual__',
-            description: 'Specify the full path to a Vue project'
+            description: chalk.dim('→ Specify the full path to a Vue project')
         });
 
         choices.push({
@@ -303,7 +301,7 @@ async function handleUnlink(pathOption) {
             return {
                 name: `${prefix}${displayName} (${displaySlug})`,
                 value: p.slug,
-                description: p.path
+                description: chalk.dim(`→ Path: ${p.path}`)
             };
         });
 

package/bin/magentrix.js

@@ -3,6 +3,8 @@
 // Imports
 import { Command } from 'commander';
 import chalk from 'chalk';
+import { existsSync } from 'node:fs';
+import { join } from 'node:path';
 import { VERSION } from '../vars/config.js';
 import { setup } from '../actions/setup.js';
 import { main } from '../actions/main.js';
@@ -17,6 +19,40 @@ import { update } from '../actions/update.js';
 import { configWizard } from '../actions/config.js';
 import { irisLink, irisDev, irisDelete, irisRecover, vueBuildStage } from '../actions/iris/index.js';
 
+// ── Vue Project Detection ────────────────────────────────
+/**
+ * Check if current directory is a Vue project (has config.ts)
+ */
+function isInVueProject() {
+    const configLocations = [
+        'src/config.ts',
+        'config.ts',
+        'src/iris-config.ts',
+        'iris-config.ts'
+    ];
+    return configLocations.some(loc => existsSync(join(process.cwd(), loc)));
+}
+
+/**
+ * Block non-iris commands when in a Vue project
+ */
+function requireMagentrixWorkspace(fn) {
+    return async (...args) => {
+        if (isInVueProject()) {
+            console.error(`\n${chalk.bgRed.white.bold(' ERROR ')} ${chalk.redBright('This command must be run in a Magentrix workspace')}\n`);
+            console.error(chalk.yellow('It looks like you\'re in a Vue project directory.'));
+            console.error(chalk.gray('This command requires a Magentrix workspace with global API key and instance URL.\n'));
+            console.error(chalk.cyan('Available commands in Vue projects:'));
+            console.error(chalk.gray('  • magentrix iris-link'));
+            console.error(chalk.gray('  • magentrix iris-dev'));
+            console.error(chalk.gray('  • magentrix vue-build-stage\n'));
+            process.exit(1);
+        }
+        // Execute the command
+        await fn(...args);
+    };
+}
+
 // ── Middleware ────────────────────────────────
 async function preMiddleware() {
     await recacheFileIdIndex(EXPORT_ROOT);
@@ -32,6 +68,11 @@ const withMiddleware = ({ pre, post }) => (fn) => async (...args) => {
     if (post) await post(...args);
 };
 
+const withDefault = withMiddleware({ pre: preMiddleware, post: postMiddleware });
+
+// Combined wrapper: check for Vue project + run middleware
+const withWorkspaceCheck = (fn) => requireMagentrixWorkspace(withDefault(fn));
+
 // ── CLI Setup ────────────────────────────────
 const program = new Command();
 program
@@ -93,8 +134,6 @@ program
         }
     });
 
-const withDefault = withMiddleware({ pre: preMiddleware, post: postMiddleware });
-
 // ── Error Handlers ───────────────────────────
 program.showHelpAfterError(false);
 program.configureOutput({
@@ -128,8 +167,8 @@ program
     .description('Configure your Magentrix API key')
     .option('--api-key <apiKey>', 'Magentrix API key')
     .option('--instance-url <instanceUrl>', 'Magentrix instance URL (e.g., https://example.magentrixcloud.com)')
-    .action(withDefault(setup));
-program.command('pull').description('Pull files from the remote server').action(withDefault(pull));
+    .action(withWorkspaceCheck(setup));
+program.command('pull').description('Pull files from the remote server').action(withWorkspaceCheck(pull));
 const createCommand = program
     .command('create')
     .description('Create files locally')
@@ -138,7 +177,7 @@ const createCommand = program
     .option('--name <name>', 'Name of the file to create')
     .option('--description <description>', 'Optional description')
     .option('--entity-id <entityId>', 'Entity ID (required for triggers)')
-    .action(withDefault(create));
+    .action(withWorkspaceCheck(create));
 
 // Override help for create command to show options
 createCommand.configureHelp({
@@ -185,17 +224,17 @@ createCommand.configureHelp({
         return help;
     }
 });
-program.command('status').description('Show file conflicts').action(withDefault(status));
-program.command('autopublish').description('Watch & sync changes in real time').action(withDefault(autoPublish));
+program.command('status').description('Show file conflicts').action(withWorkspaceCheck(status));
+program.command('autopublish').description('Watch & sync changes in real time').action(withWorkspaceCheck(autoPublish));
 // Publish does its own comprehensive file scanning, so skip the pre-cache middleware
-program.command('publish').description('Publish pending changes to the remote server').action(withDefault(publish));
-program.command('update').description('Update MagentrixCLI to the latest version').action(update);
+program.command('publish').description('Publish pending changes to the remote server').action(withWorkspaceCheck(publish));
+program.command('update').description('Update MagentrixCLI to the latest version').action(requireMagentrixWorkspace(update));
 
 // Config command - interactive wizard
 program
     .command('config')
     .description('Configure CLI settings')
-    .action(configWizard);
+    .action(requireMagentrixWorkspace(configWizard));
 
 // Iris commands for Vue.js app management
 program
@@ -236,6 +275,18 @@ program
 // ── Unknown Command Handler ──────────────────
 program.argument('[command]', 'command to run').action((cmd) => {
     const runMain = async () => {
+        // Check if in Vue project
+        if (isInVueProject()) {
+            console.error(`\n${chalk.bgRed.white.bold(' ERROR ')} ${chalk.redBright('This command must be run in a Magentrix workspace')}\n`);
+            console.error(chalk.yellow('It looks like you\'re in a Vue project directory.'));
+            console.error(chalk.gray('This command requires a Magentrix workspace with global API key and instance URL.\n'));
+            console.error(chalk.cyan('Available commands in Vue projects:'));
+            console.error(chalk.gray('  • magentrix iris-link'));
+            console.error(chalk.gray('  • magentrix iris-dev'));
+            console.error(chalk.gray('  • magentrix vue-build-stage\n'));
+            process.exit(1);
+        }
+
         await preMiddleware();
         await main();
         await postMiddleware();

package/package.json

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