ember-cli · 2005rishabh · May 8, 2026
diff --git a/lib/models/command.js b/lib/models/command.js
@@ -569,17 +569,73 @@ let Command = CoreObject.extend({
      }
    };

+    let stringOptions = new Set();
+
    this.availableOptions.forEach((option) => {
-      if (typeof option.type !== 'string') {
-        knownOpts[option.name] = option.type;
-      } else if (option.type === 'Path') {
+      let type = option.type;
+
+      if (typeof type !== 'string' && type !== undefined) {
+        knownOpts[option.name] = type;
+      } else if (type === 'Path') {
        knownOpts[option.name] = path;
+      } else if (typeof type === 'string' && type.toLowerCase() === 'boolean') {
+        knownOpts[option.name] = Boolean;
      } else {
-        knownOpts[option.name] = String;
+        knownOpts[option.name] = [String, null];
+      }
+
+      if (
+        knownOpts[option.name] === String ||
+        (Array.isArray(knownOpts[option.name]) && knownOpts[option.name].includes(String))
+      ) {
+        stringOptions.add(`--${option.name}`);
      }
    });

-    parsedOptions = nopt(knownOpts, this.optionsAliases, commandArgs, 0);
+    if (this.optionsAliases) {
+      for (let key of Object.keys(this.optionsAliases)) {
+        let value = this.optionsAliases[key];
+
+        if (stringOptions.has(value[0]) && value.length === 1) {
+          stringOptions.add(`-${key}`);
+          stringOptions.add(`--${key}`);
+        }
+      }
+    }
+
+    const MASK = '__EMBER_STRING_OPTION__';
+
+    let maskedArgs = (commandArgs || []).slice(0);
+
+    for (let i = 0; i < maskedArgs.length; i++) {
+      let arg = maskedArgs[i];
+
+      if (stringOptions.has(arg) && i + 1 < maskedArgs.length) {
+        if (typeof maskedArgs[i + 1] === 'string' && maskedArgs[i + 1].startsWith('--')) {
+          maskedArgs[i + 1] = `${MASK}${maskedArgs[i + 1]}`;
+        }
+      } else if (typeof arg === 'string' && arg.includes('=')) {
+        let parts = arg.split('=');
+        let option = parts[0];
+        let value = parts.slice(1).join('=');
+
+        if (stringOptions.has(option) && value.startsWith('--')) {
+          maskedArgs[i] = `${option}=${MASK}${value}`;
+        }
+      }
+    }
+
+    parsedOptions = nopt(knownOpts, this.optionsAliases, maskedArgs, 0);
+
+    let unmask = (value) => (typeof value === 'string' && value.startsWith(MASK) ? value.replace(MASK, '') : value);
+
+    for (let key of Object.keys(parsedOptions)) {
+      if (key !== 'argv') {
+        parsedOptions[key] = unmask(parsedOptions[key]);
+      }
+    }
+
+    parsedOptions.argv.remain = parsedOptions.argv.remain.map(unmask);

    if (!this.availableOptions.every(assembleAndValidateOption.bind(this))) {
      return null;