fix: improve template override command in context menu

Author: dermatz

src/extension.ts

@@ -1,3 +1,4 @@
+import * as path from 'node:path';
 import * as vscode from 'vscode';
 import { CommandsProvider, MAGEFORGE_COMMANDS, MageforgeCommand } from './commandsProvider';
 import { ThemeTreeItem, ThemesProvider } from './themesProvider';
@@ -137,8 +138,12 @@ export async function overrideFile(
         return;
     }
 
+    // Use a path relative to the Magento root so the command works inside
+    // containerized environments (ddev, docker-compose, lando) where the
+    // absolute host path does not exist.
+    const relativeTemplatePath = path.relative(magentoRoot, uri.fsPath);
     const commandLine = buildCommandLine(magentoRoot, 'mageforge:template:override', [
-        uri.fsPath,
+        relativeTemplatePath,
         '--theme',
         theme,
     ]);

src/magento.ts

@@ -68,6 +68,10 @@ export function getDockerComposeService(): string {
 /**
  * Build the shell command line that runs a MageForge CLI command.
  * All arguments are safely quoted to prevent shell injection.
+ * The MageForge command name itself is not quoted because it is always a
+ * known, hard-coded CLI identifier (e.g. `mageforge:theme:build`); escaping
+ * its colons makes the generated command hard to read and can confuse
+ * containerized PHP wrappers.
  */
 export function buildCommandLine(
     magentoRoot: string,
@@ -79,26 +83,27 @@ export function buildCommandLine(
         .get<string>('phpBinary', 'php');
     const env = getExecutionEnvironment(magentoRoot);
 
+    const quote = (parts: string[]): string => shellQuote.quote(parts);
+
+    function buildLine(baseParts: string[]): string {
+        const base = quote(baseParts);
+        const quotedArgs = args.length > 0 ? ` ${quote(args)}` : '';
+        return `${base} ${mageforgeCommand}${quotedArgs}`;
+    }
+
     switch (env) {
         case 'ddev':
-            return shellQuote.quote(['ddev', 'php', 'bin/magento', mageforgeCommand, ...args]);
+            return buildLine(['ddev', 'php', 'bin/magento']);
         case 'docker-compose': {
             const service = getDockerComposeService();
-            return shellQuote.quote([
-                'docker-compose',
-                'exec',
-                service,
-                'bin/magento',
-                mageforgeCommand,
-                ...args,
-            ]);
+            return buildLine(['docker-compose', 'exec', service, 'bin/magento']);
         }
         case 'lando':
-            return shellQuote.quote(['lando', 'php', 'bin/magento', mageforgeCommand, ...args]);
+            return buildLine(['lando', 'php', 'bin/magento']);
         default: {
             // phpBinary can be a full command like "docker-compose exec php" or just "php"
             const phpParts = shellQuote.parse(phpBinary) as string[];
-            return shellQuote.quote([...phpParts, 'bin/magento', mageforgeCommand, ...args]);
+            return buildLine([...phpParts, 'bin/magento']);
         }
     }
 }

src/test/unit/magento.test.ts

@@ -131,7 +131,7 @@ suite('magento.ts unit tests', () => {
             const line = moduleUnderTest.buildCommandLine(root, 'mageforge:theme:build', [
                 'Magento/luma',
             ]);
-            assert.strictEqual(line, 'php bin/magento mageforge\\:theme\\:build Magento/luma');
+            assert.strictEqual(line, 'php bin/magento mageforge:theme:build Magento/luma');
         });
 
         test('quotes paths with spaces', () => {
@@ -175,15 +175,15 @@ suite('magento.ts unit tests', () => {
             ]);
             assert.strictEqual(
                 line,
-                'docker-compose exec php bin/magento mageforge\\:theme\\:build Magento/luma',
+                'docker-compose exec php bin/magento mageforge:theme:build Magento/luma',
             );
         });
 
         test('builds ddev command', () => {
             const root = createMagentoRoot();
             moduleUnderTest = loadModule({ 'mageforge.phpExecution': 'ddev' });
             const line = moduleUnderTest.buildCommandLine(root, 'mageforge:theme:list');
-            assert.strictEqual(line, 'ddev php bin/magento mageforge\\:theme\\:list');
+            assert.strictEqual(line, 'ddev php bin/magento mageforge:theme:list');
         });
 
         test('builds docker-compose command with custom service', () => {
@@ -193,10 +193,7 @@ suite('magento.ts unit tests', () => {
                 'mageforge.dockerComposeService': 'app',
             });
             const line = moduleUnderTest.buildCommandLine(root, 'mageforge:theme:list');
-            assert.strictEqual(
-                line,
-                'docker-compose exec app bin/magento mageforge\\:theme\\:list',
-            );
+            assert.strictEqual(line, 'docker-compose exec app bin/magento mageforge:theme:list');
         });
 
         test('quotes Windows-style paths safely', () => {