mage-remote-run 1.7.0 → 1.8.0

package/bin/mage-remote-run.js

@@ -15,6 +15,7 @@ program
   .name('mage-remote-run')
   .description('The remote swiss army knife for Magento Open Source, Mage-OS, Adobe Commerce')
   .version(pkg.version)
+  .option('--ignore-plugins', 'Skip loading configured plugins')
   .configureHelp({
     visibleCommands: (cmd) => {
       const commands = cmd.commands.filter(c => !c._hidden);
@@ -49,6 +50,7 @@ import { eventBus, events } from '../lib/events.js';
 import { createClient } from '../lib/api/factory.js';
 import * as utils from '../lib/utils.js';
 import * as commandHelper from '../lib/command-helper.js';
+import { hasIgnorePluginsFlag } from '../lib/cli-options.js';
 
 // Connection commands are registered dynamically via registerCommands
 // But we need them registered early if we want them to show up in help even if config fails?
@@ -69,10 +71,14 @@ program.command('mcp [args...]')
     if (args && args.length > 0) {
       // console.error(chalk.yellow(`[mage-remote-run] Warning: Received extra arguments for mcp command: ${args.join(' ')}`));
     }
-    await startMcpServer(options);
+    await startMcpServer({
+      ...options,
+      ignorePlugins: program.opts().ignorePlugins,
+    });
   });
 
 const profile = await getActiveProfile();
+const ignorePlugins = hasIgnorePluginsFlag(process.argv.slice(2));
 
 // Load Plugins
 // We construct an initial context.
@@ -94,8 +100,10 @@ const appContext = {
   },
 };
 
-const pluginLoader = new PluginLoader(appContext);
-await pluginLoader.loadPlugins();
+if (!ignorePlugins) {
+  const pluginLoader = new PluginLoader(appContext);
+  await pluginLoader.loadPlugins();
+}
 
 eventBus.emit(events.INIT, appContext);
 import { registerVirtualCommands } from '../lib/commands/virtual.js';

package/lib/cli-options.js

@@ -0,0 +1,3 @@
+export function hasIgnorePluginsFlag(argv = []) {
+    return argv.includes('--ignore-plugins');
+}

package/lib/commands/plugins-actions.js

@@ -3,6 +3,18 @@ import { loadConfig, saveConfig } from '../config.js';
 import path from 'node:path';
 import { realpath } from 'node:fs/promises';
 
+function getHomeDirectory() {
+    return process.env.HOME || process.env.USERPROFILE || '';
+}
+
+function expandHomeDirectory(pluginRef) {
+    if (pluginRef.startsWith('~/') || pluginRef.startsWith('~\\')) {
+        return path.join(getHomeDirectory(), pluginRef.slice(2));
+    }
+
+    return pluginRef;
+}
+
 function isFilesystemPath(pluginRef) {
     const isScopedPackageName = /^@[^/\\]+\/[^/\\]+$/.test(pluginRef);
     const hasPathSeparator = pluginRef.includes('/') || pluginRef.includes('\\');
@@ -23,24 +35,47 @@ function isFilesystemPath(pluginRef) {
 async function resolvePluginReference(pluginRef) {
     if (!isFilesystemPath(pluginRef)) return pluginRef;
 
+    if (pluginRef.startsWith('file:')) {
+        return realpath(new URL(pluginRef));
+    }
+
+    return realpath(expandHomeDirectory(pluginRef));
+}
+
+async function normalizePluginReferenceForStorage(pluginRef) {
+    if (!isFilesystemPath(pluginRef) || pluginRef.startsWith('file:')) {
+        return resolvePluginReference(pluginRef);
+    }
+
+    const resolvedPluginRef = await resolvePluginReference(pluginRef);
+
     if (pluginRef.startsWith('~/') || pluginRef.startsWith('~\\')) {
-        return realpath(path.join(process.env.HOME || process.env.USERPROFILE || '', pluginRef.slice(2)));
+        return pluginRef;
     }
 
-    if (pluginRef.startsWith('file:')) {
-        return realpath(new URL(pluginRef));
+    return resolvedPluginRef;
+}
+
+async function findRegisteredPluginIndex(plugins, pluginRef) {
+    const resolvedPluginRef = await resolvePluginReference(pluginRef);
+
+    for (const [index, registeredPlugin] of plugins.entries()) {
+        const resolvedRegisteredPlugin = await resolvePluginReference(registeredPlugin);
+        if (resolvedRegisteredPlugin === resolvedPluginRef) {
+            return index;
+        }
     }
 
-    return realpath(pluginRef);
+    return -1;
 }
 
 export async function registerPluginAction(packageName) {
     try {
-        const pluginRef = await resolvePluginReference(packageName);
+        const pluginRef = await normalizePluginReferenceForStorage(packageName);
         const config = await loadConfig();
         if (!config.plugins) config.plugins = [];
 
-        if (config.plugins.includes(pluginRef)) {
+        if ((await findRegisteredPluginIndex(config.plugins, pluginRef)) !== -1) {
             console.log(chalk.yellow(`Plugin "${pluginRef}" is already registered.`));
             return;
         }
@@ -56,14 +91,15 @@ export async function registerPluginAction(packageName) {
 
 export async function unregisterPluginAction(packageName) {
     try {
-        const pluginRef = await resolvePluginReference(packageName);
+        const pluginRef = await normalizePluginReferenceForStorage(packageName);
         const config = await loadConfig();
-        if (!config.plugins || !config.plugins.includes(pluginRef)) {
+        const pluginIndex = config.plugins ? await findRegisteredPluginIndex(config.plugins, pluginRef) : -1;
+        if (pluginIndex === -1) {
             console.log(chalk.yellow(`Plugin "${pluginRef}" is not registered.`));
             return;
         }
 
-        config.plugins = config.plugins.filter(p => p !== pluginRef);
+        config.plugins = config.plugins.filter((_, index) => index !== pluginIndex);
         await saveConfig(config);
         console.log(chalk.green(`Plugin "${pluginRef}" successfully unregistered.`));
     } catch (error) {

package/lib/mcp.js

@@ -139,7 +139,7 @@ export async function startMcpServer(options) {
     );
 
     // 1. Setup a dynamic program to discovery commands
-    const program = await setupProgramAsync();
+    const program = await setupProgramAsync(options);
 
     const server = new McpServer({
         name: "mage-remote-run",
@@ -362,7 +362,7 @@ function registerTools(server, program, options = {}) {
             description,
             zodShape,
             async (args) => {
-                return await executeCommand(cmd, args, segments);
+                return await executeCommand(cmd, args, segments, options);
             }
         );
         count++;
@@ -373,7 +373,7 @@ function registerTools(server, program, options = {}) {
 
 // Re-register all commands on a fresh program instance
 // We export this logic so we can reuse it
-async function setupProgramAsync() {
+async function setupProgramAsync(options = {}) {
     const program = new Command();
 
     // Silence output for the main program instance to avoid double printing during parsing
@@ -394,8 +394,10 @@ async function setupProgramAsync() {
         events
     };
 
-    const pluginLoader = new PluginLoader(appContext);
-    await pluginLoader.loadPlugins();
+    if (!options.ignorePlugins) {
+        const pluginLoader = new PluginLoader(appContext);
+        await pluginLoader.loadPlugins();
+    }
 
     localEventBus.emit(events.INIT, appContext);
 
@@ -412,7 +414,7 @@ async function setupProgramAsync() {
     return program;
 }
 
-async function executeCommand(cmdDefinition, args, commandSegments) {
+async function executeCommand(cmdDefinition, args, commandSegments, options = {}) {
     // Intercept Console
     let output = '';
     const originalLog = console.log;
@@ -428,7 +430,7 @@ async function executeCommand(cmdDefinition, args, commandSegments) {
     console.error = logInterceptor;
 
     try {
-        const program = await setupProgramAsync();
+        const program = await setupProgramAsync(options);
 
         // Construct argv
         // We need to build [node, script, command, subcommand, ..., args, options]

package/lib/plugin-loader.js

@@ -8,6 +8,14 @@ import { loadConfig } from './config.js';
 
 const require = createRequire(import.meta.url);
 
+function expandHomeDirectory(pluginRef) {
+    if (pluginRef.startsWith('~/') || pluginRef.startsWith('~\\')) {
+        return path.join(process.env.HOME || process.env.USERPROFILE || '', pluginRef.slice(2));
+    }
+
+    return pluginRef;
+}
+
 export class PluginLoader {
     constructor(appContext) {
         this.appContext = appContext;
@@ -32,15 +40,16 @@ export class PluginLoader {
     }
 
     async loadPlugin(pluginName) {
+        const resolvedPluginName = expandHomeDirectory(pluginName);
         let pluginPath;
 
         // 1. Try local node_modules
         try {
-            pluginPath = require.resolve(pluginName);
+            pluginPath = require.resolve(resolvedPluginName);
         } catch (e) {
             // 2. Try global node_modules (npm)
             try {
-                const globalNpmPath = path.join(globalDirs.npm.packages, pluginName);
+                const globalNpmPath = path.join(globalDirs.npm.packages, resolvedPluginName);
                 const npmExists = await fs.promises.access(globalNpmPath).then(() => true).catch(() => false);
                 if (npmExists) {
                     const pkgJsonPath = path.join(globalNpmPath, 'package.json');
@@ -55,7 +64,7 @@ export class PluginLoader {
                     }
                 } else {
                     // 3. Try global node_modules (yarn)
-                    const globalYarnPath = path.join(globalDirs.yarn.packages, pluginName);
+                    const globalYarnPath = path.join(globalDirs.yarn.packages, resolvedPluginName);
                     const yarnExists = await fs.promises.access(globalYarnPath).then(() => true).catch(() => false);
                     if (yarnExists) {
                         const pkgJsonPath = path.join(globalYarnPath, 'package.json');
@@ -77,7 +86,7 @@ export class PluginLoader {
 
         if (!pluginPath) {
              throw new Error(`Could not resolve plugin '${pluginName}' locally or globally.`);
-        }
+         }
 
         // Import using file URL for absolute paths in ESM
         // Windows paths need to be converted to file URLs

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mage-remote-run",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "description": "The remote swiss army knife for Magento Open Source, Mage-OS, Adobe Commerce",
   "main": "index.js",
   "scripts": {