@guanghechen/commander 4.7.1 → 4.7.3

package/lib/cjs/node.cjs

@@ -197,6 +197,140 @@ function kebabToCamelCase(str) {
 function camelToKebabCase$1(str) {
     return str.replace(/[A-Z]/g, m => '-' + m.toLowerCase());
 }
+const ANSI_ESCAPE_REGEX = new RegExp(String.raw `\\x1B\\[[0-?]*[ -/]*[@-~]`, 'g');
+const DECIMAL_INTEGER_REGEX = /^\d(?:_?\d)*$/;
+const DECIMAL_FRACTION_REGEX = /^\d(?:_?\d)*$/;
+const DECIMAL_EXPONENT_REGEX = /^[eE][+-]?\d(?:_?\d)*$/;
+const BINARY_LITERAL_REGEX = /^0[bB][01](?:_?[01])*$/;
+const OCTAL_LITERAL_REGEX = /^0[oO][0-7](?:_?[0-7])*$/;
+const HEX_LITERAL_REGEX = /^0[xX][0-9a-fA-F](?:_?[0-9a-fA-F])*$/;
+function stripAnsi(value) {
+    return value.replace(ANSI_ESCAPE_REGEX, '');
+}
+function isCombiningMark(codePoint) {
+    return ((codePoint >= 0x0300 && codePoint <= 0x036f) ||
+        (codePoint >= 0x1ab0 && codePoint <= 0x1aff) ||
+        (codePoint >= 0x1dc0 && codePoint <= 0x1dff) ||
+        (codePoint >= 0x20d0 && codePoint <= 0x20ff) ||
+        (codePoint >= 0xfe20 && codePoint <= 0xfe2f));
+}
+function isWideCodePoint(codePoint) {
+    if (codePoint < 0x1100) {
+        return false;
+    }
+    return (codePoint <= 0x115f ||
+        codePoint === 0x2329 ||
+        codePoint === 0x232a ||
+        (codePoint >= 0x2e80 && codePoint <= 0x3247 && codePoint !== 0x303f) ||
+        (codePoint >= 0x3250 && codePoint <= 0x4dbf) ||
+        (codePoint >= 0x4e00 && codePoint <= 0xa4c6) ||
+        (codePoint >= 0xa960 && codePoint <= 0xa97c) ||
+        (codePoint >= 0xac00 && codePoint <= 0xd7a3) ||
+        (codePoint >= 0xf900 && codePoint <= 0xfaff) ||
+        (codePoint >= 0xfe10 && codePoint <= 0xfe19) ||
+        (codePoint >= 0xfe30 && codePoint <= 0xfe6b) ||
+        (codePoint >= 0xff01 && codePoint <= 0xff60) ||
+        (codePoint >= 0xffe0 && codePoint <= 0xffe6) ||
+        (codePoint >= 0x1b000 && codePoint <= 0x1b001) ||
+        (codePoint >= 0x1f200 && codePoint <= 0x1f251) ||
+        (codePoint >= 0x20000 && codePoint <= 0x3fffd));
+}
+function getDisplayWidth(value) {
+    const normalized = stripAnsi(value).normalize('NFC');
+    let width = 0;
+    for (const char of normalized) {
+        const codePoint = char.codePointAt(0);
+        if (codePoint === undefined || isCombiningMark(codePoint)) {
+            continue;
+        }
+        width += isWideCodePoint(codePoint) ? 2 : 1;
+    }
+    return width;
+}
+function padDisplayEnd(value, targetWidth) {
+    const width = getDisplayWidth(value);
+    if (width >= targetWidth) {
+        return value;
+    }
+    return value + ' '.repeat(targetWidth - width);
+}
+function isValidPrimitiveNumberLiteral(rawValue) {
+    if (rawValue.trim() !== rawValue || rawValue.length === 0) {
+        return false;
+    }
+    if (rawValue === 'NaN' || rawValue === 'Infinity' || rawValue === '-Infinity') {
+        return false;
+    }
+    if (BINARY_LITERAL_REGEX.test(rawValue)) {
+        return true;
+    }
+    if (OCTAL_LITERAL_REGEX.test(rawValue)) {
+        return true;
+    }
+    if (HEX_LITERAL_REGEX.test(rawValue)) {
+        return true;
+    }
+    const sign = rawValue[0] === '+' || rawValue[0] === '-' ? rawValue[0] : '';
+    const body = sign ? rawValue.slice(1) : rawValue;
+    if (body.length === 0) {
+        return false;
+    }
+    const expIndex = body.search(/[eE]/);
+    const basePart = expIndex === -1 ? body : body.slice(0, expIndex);
+    const expPart = expIndex === -1 ? '' : body.slice(expIndex);
+    if (expPart && !DECIMAL_EXPONENT_REGEX.test(expPart)) {
+        return false;
+    }
+    if (basePart.includes('.')) {
+        const decimalParts = basePart.split('.');
+        if (decimalParts.length !== 2) {
+            return false;
+        }
+        const [intPart, fracPart] = decimalParts;
+        const intOk = intPart.length === 0 || DECIMAL_INTEGER_REGEX.test(intPart);
+        const fracOk = fracPart.length === 0 || DECIMAL_FRACTION_REGEX.test(fracPart);
+        if (!intOk || !fracOk) {
+            return false;
+        }
+        return intPart.length > 0 || fracPart.length > 0;
+    }
+    return DECIMAL_INTEGER_REGEX.test(basePart);
+}
+function parsePrimitiveNumber(rawValue) {
+    if (!isValidPrimitiveNumberLiteral(rawValue)) {
+        return undefined;
+    }
+    const normalized = rawValue.replaceAll('_', '');
+    const value = Number(normalized);
+    if (!Number.isFinite(value)) {
+        return undefined;
+    }
+    return value;
+}
+function normalizeSubcommandNameForDistance(name) {
+    return camelToKebabCase$1(name).toLowerCase();
+}
+function levenshteinDistance(left, right) {
+    if (left === right) {
+        return 0;
+    }
+    if (left.length === 0) {
+        return right.length;
+    }
+    if (right.length === 0) {
+        return left.length;
+    }
+    let prev = Array.from({ length: right.length + 1 }, (_, i) => i);
+    for (let i = 0; i < left.length; i += 1) {
+        const current = [i + 1];
+        for (let j = 0; j < right.length; j += 1) {
+            const substitutionCost = left[i] === right[j] ? 0 : 1;
+            current[j + 1] = Math.min(current[j] + 1, prev[j + 1] + 1, prev[j] + substitutionCost);
+        }
+        prev = current;
+    }
+    return prev[right.length];
+}
 function tokenizeLongOption(arg, commandPath) {
     const eqIdx = arg.indexOf('=');
     const namePart = eqIdx !== -1 ? arg.slice(0, eqIdx) : arg;
@@ -433,9 +567,13 @@ class Command {
         if (cmd.#parent && cmd.#parent !== this) {
             throw new CommanderError('ConfigurationError', `command "${cmd.#name}" already has a parent`, this.#getCommandPath());
         }
+        const occupied = this.#subcommandsMap.get(name);
+        if (occupied && occupied !== cmd) {
+            throw new CommanderError('ConfigurationError', `subcommand name/alias "${name}" conflicts with an existing command`, this.#getCommandPath());
+        }
         const existing = this.#subcommandsList.find(e => e.command === cmd);
         if (existing) {
-            if (existing.aliases.includes(name)) {
+            if (existing.name === name || existing.aliases.includes(name)) {
                 return this;
             }
             existing.aliases.push(name);
@@ -564,16 +702,41 @@ class Command {
             else if (arg.kind === 'optional') {
                 usage += ` [${arg.name}]`;
             }
+            else if (arg.kind === 'some') {
+                usage += ` <${arg.name}...>`;
+            }
             else {
                 usage += ` [${arg.name}...]`;
             }
         }
+        const argumentsLines = [];
+        for (const arg of this.#arguments) {
+            const sig = arg.kind === 'required'
+                ? `<${arg.name}>`
+                : arg.kind === 'optional'
+                    ? `[${arg.name}]`
+                    : arg.kind === 'some'
+                        ? `<${arg.name}...>`
+                        : `[${arg.name}...]`;
+            const metadata = [`[type: ${arg.type}]`];
+            if (arg.kind === 'optional' && arg.default !== undefined) {
+                metadata.push(`[default: ${JSON.stringify(arg.default)}]`);
+            }
+            if (arg.choices && arg.choices.length > 0) {
+                metadata.push(`[choices: ${arg.choices.map(choice => JSON.stringify(choice)).join(', ')}]`);
+            }
+            const desc = metadata.length > 0 ? `${arg.desc} ${metadata.join(' ')}` : arg.desc;
+            argumentsLines.push({ sig, desc });
+        }
         const options = [];
         for (const opt of allOptions) {
             const kebabLong = camelToKebabCase$1(opt.long);
             let sig = opt.short ? `-${opt.short}, ` : '    ';
             sig += `--${kebabLong}`;
-            if (opt.args !== 'none') {
+            if (opt.args === 'optional') {
+                sig += ' [value]';
+            }
+            else if (opt.args !== 'none') {
                 sig += ' <value>';
             }
             let desc = opt.desc;
@@ -581,7 +744,7 @@ class Command {
                 desc += ` (default: ${JSON.stringify(opt.default)})`;
             }
             if (opt.choices) {
-                desc += ` [choices: ${opt.choices.join(', ')}]`;
+                desc += ` [choices: ${opt.choices.map(choice => JSON.stringify(choice)).join(', ')}]`;
             }
             options.push({ sig, desc });
             if (opt.type === 'boolean' &&
@@ -613,6 +776,7 @@ class Command {
         return {
             desc: this.#desc,
             usage,
+            arguments: argumentsLines,
             options,
             commands,
             examples,
@@ -620,25 +784,29 @@ class Command {
     }
     #renderHelpPlain(helpData) {
         const lines = [];
+        const labelWidth = this.#getHelpLabelWidth(helpData);
         lines.push(helpData.desc);
         lines.push('');
         lines.push(helpData.usage);
         lines.push('');
+        if (helpData.arguments.length > 0) {
+            lines.push('Arguments:');
+            for (const { sig, desc } of helpData.arguments) {
+                lines.push(this.#renderAlignedHelpLine(sig, desc, labelWidth));
+            }
+            lines.push('');
+        }
         if (helpData.options.length > 0) {
             lines.push('Options:');
-            const maxSigLen = Math.max(...helpData.options.map(line => line.sig.length));
             for (const { sig, desc } of helpData.options) {
-                const padding = ' '.repeat(maxSigLen - sig.length + 2);
-                lines.push(`  ${sig}${padding}${desc}`);
+                lines.push(this.#renderAlignedHelpLine(sig, desc, labelWidth));
             }
             lines.push('');
         }
         if (helpData.commands.length > 0) {
             lines.push('Commands:');
-            const maxNameLen = Math.max(...helpData.commands.map(line => line.name.length));
             for (const { name, desc } of helpData.commands) {
-                const padding = ' '.repeat(maxNameLen - name.length + 2);
-                lines.push(`  ${name}${padding}${desc}`);
+                lines.push(this.#renderAlignedHelpLine(name, desc, labelWidth));
             }
             lines.push('');
         }
@@ -655,25 +823,29 @@ class Command {
     }
     #renderHelpTerminal(helpData) {
         const lines = [];
+        const labelWidth = this.#getHelpLabelWidth(helpData);
         lines.push(helpData.desc);
         lines.push('');
         lines.push(styleText(helpData.usage, TERMINAL_STYLE.bold));
         lines.push('');
+        if (helpData.arguments.length > 0) {
+            lines.push(styleText('Arguments:', TERMINAL_STYLE.bold, TERMINAL_STYLE.underline));
+            for (const { sig, desc } of helpData.arguments) {
+                lines.push(this.#renderAlignedHelpLine(sig, desc, labelWidth, value => styleText(value, TERMINAL_STYLE.cyan)));
+            }
+            lines.push('');
+        }
         if (helpData.options.length > 0) {
             lines.push(styleText('Options:', TERMINAL_STYLE.bold, TERMINAL_STYLE.underline));
-            const maxSigLen = Math.max(...helpData.options.map(line => line.sig.length));
             for (const { sig, desc } of helpData.options) {
-                const padding = ' '.repeat(maxSigLen - sig.length + 2);
-                lines.push(`  ${styleText(sig, TERMINAL_STYLE.cyan)}${padding}${desc}`);
+                lines.push(this.#renderAlignedHelpLine(sig, desc, labelWidth, value => styleText(value, TERMINAL_STYLE.cyan)));
             }
             lines.push('');
         }
         if (helpData.commands.length > 0) {
             lines.push(styleText('Commands:', TERMINAL_STYLE.bold, TERMINAL_STYLE.underline));
-            const maxNameLen = Math.max(...helpData.commands.map(line => line.name.length));
             for (const { name, desc } of helpData.commands) {
-                const padding = ' '.repeat(maxNameLen - name.length + 2);
-                lines.push(`  ${styleText(name, TERMINAL_STYLE.cyan)}${padding}${desc}`);
+                lines.push(this.#renderAlignedHelpLine(name, desc, labelWidth, value => styleText(value, TERMINAL_STYLE.cyan)));
             }
             lines.push('');
         }
@@ -688,16 +860,41 @@ class Command {
         }
         return lines.join('\n');
     }
+    #getHelpLabelWidth(helpData) {
+        const labels = [
+            ...helpData.arguments.map(line => line.sig),
+            ...helpData.options.map(line => line.sig),
+            ...helpData.commands.map(line => line.name),
+        ];
+        if (labels.length === 0) {
+            return 0;
+        }
+        return Math.max(...labels.map(getDisplayWidth));
+    }
+    #renderAlignedHelpLine(label, desc, labelWidth, styleLabel) {
+        const paddedLabel = padDisplayEnd(label, labelWidth);
+        const outputLabel = styleLabel ? styleLabel(paddedLabel) : paddedLabel;
+        return `  ${outputLabel}  ${desc}`;
+    }
     getCompletionMeta() {
         const allOptions = this.#resolveOptionPolicy().mergedOptions;
         const options = [];
+        const argumentsMeta = [];
         for (const opt of allOptions) {
             options.push({
                 long: opt.long,
                 short: opt.short,
                 desc: opt.desc,
                 takesValue: opt.args !== 'none',
-                choices: opt.choices,
+                choices: opt.choices?.map(choice => String(choice)),
+            });
+        }
+        for (const arg of this.#arguments) {
+            argumentsMeta.push({
+                name: arg.name,
+                kind: arg.kind,
+                type: arg.type,
+                choices: arg.type === 'choice' ? arg.choices?.map(choice => String(choice)) : undefined,
             });
         }
         return {
@@ -705,6 +902,7 @@ class Command {
             desc: this.#desc,
             aliases: [],
             options,
+            arguments: argumentsMeta,
             subcommands: this.#subcommandsList.map(entry => {
                 const subMeta = entry.command.getCompletionMeta();
                 return {
@@ -1157,6 +1355,14 @@ class Command {
                             consumed.push(tokens[i]);
                         }
                     }
+                    else if (opt.args === 'optional') {
+                        if (!token.resolved.includes('=') &&
+                            i + 1 < tokens.length &&
+                            tokens[i + 1].type === 'none') {
+                            i += 1;
+                            consumed.push(tokens[i]);
+                        }
+                    }
                     else if (opt.args === 'variadic') {
                         if (!token.resolved.includes('=')) {
                             while (i + 1 < tokens.length && tokens[i + 1].type === 'none') {
@@ -1182,6 +1388,12 @@ class Command {
                             consumed.push(tokens[i]);
                         }
                     }
+                    else if (opt.args === 'optional') {
+                        if (i + 1 < tokens.length && tokens[i + 1].type === 'none') {
+                            i += 1;
+                            consumed.push(tokens[i]);
+                        }
+                    }
                     else if (opt.args === 'variadic') {
                         while (i + 1 < tokens.length && tokens[i + 1].type === 'none') {
                             i += 1;
@@ -1223,6 +1435,7 @@ class Command {
                 leafLocalOpts[opt.long] = leafParsedOpts[opt.long];
             }
         }
+        leafCommand.#assertUnknownSubcommand(ctx.sources.user.argv);
         const rawArgStrings = [...argTokens.map(t => t.original), ...restArgs];
         const { args, rawArgs } = leafCommand.#parseArguments(rawArgStrings);
         const parseCtx = {
@@ -1305,6 +1518,23 @@ class Command {
                 i += 1;
                 continue;
             }
+            if (opt.args === 'optional') {
+                const eqIdx = token.resolved.indexOf('=');
+                if (eqIdx !== -1) {
+                    opts[opt.long] = this.#convertValue(opt, token.resolved.slice(eqIdx + 1));
+                    i += 1;
+                    continue;
+                }
+                if (i + 1 < tokens.length && tokens[i + 1].type === 'none') {
+                    opts[opt.long] = this.#convertValue(opt, tokens[i + 1].original);
+                    i += 1;
+                }
+                else {
+                    opts[opt.long] = undefined;
+                }
+                i += 1;
+                continue;
+            }
             if (opt.args === 'variadic') {
                 const values = Array.isArray(opts[opt.long]) ? opts[opt.long] : [];
                 const eqIdx = token.resolved.indexOf('=');
@@ -1324,7 +1554,7 @@ class Command {
             i += 1;
         }
         for (const opt of allOptions) {
-            if (opt.required && opts[opt.long] === undefined) {
+            if (opt.required && !Object.prototype.hasOwnProperty.call(opts, opt.long)) {
                 throw new CommanderError('MissingRequired', `missing required option "--${camelToKebabCase$1(opt.long)}"`, this.#getCommandPath());
             }
         }
@@ -1350,8 +1580,8 @@ class Command {
             return opt.coerce(rawValue);
         }
         if (opt.type === 'number') {
-            const num = Number(rawValue);
-            if (Number.isNaN(num)) {
+            const num = parsePrimitiveNumber(rawValue);
+            if (num === undefined) {
                 throw new CommanderError('InvalidType', `invalid number "${rawValue}" for option "--${camelToKebabCase$1(opt.long)}"`, this.#getCommandPath());
             }
             return num;
@@ -1361,12 +1591,37 @@ class Command {
     #parseArguments(rawArgs) {
         const argumentDefs = this.#arguments;
         const args = {};
-        const requiredCount = argumentDefs.filter(a => a.kind === 'required').length;
-        if (rawArgs.length < requiredCount) {
-            const missing = argumentDefs
-                .filter(a => a.kind === 'required')
-                .slice(rawArgs.length)
-                .map(a => a.name);
+        if (argumentDefs.length === 0 && rawArgs.length > 0) {
+            throw new CommanderError('UnexpectedArgument', `unexpected argument "${rawArgs[0]}"`, this.#getCommandPath());
+        }
+        const missing = [];
+        let remaining = rawArgs.length;
+        for (const def of argumentDefs) {
+            if (def.kind === 'required') {
+                if (remaining === 0) {
+                    missing.push(def.name);
+                }
+                else {
+                    remaining -= 1;
+                }
+                continue;
+            }
+            if (def.kind === 'optional') {
+                if (remaining > 0) {
+                    remaining -= 1;
+                }
+                continue;
+            }
+            if (def.kind === 'some') {
+                if (remaining === 0) {
+                    missing.push(def.name);
+                }
+                remaining = 0;
+                continue;
+            }
+            remaining = 0;
+        }
+        if (missing.length > 0) {
             throw new CommanderError('MissingRequiredArgument', `missing required argument(s): ${missing.join(', ')}`, this.#getCommandPath());
         }
         let index = 0;
@@ -1377,41 +1632,101 @@ class Command {
                 index = rawArgs.length;
                 break;
             }
-            const raw = rawArgs[index];
-            if (raw === undefined) {
-                if (def.kind === 'optional') {
+            if (def.kind === 'some') {
+                const rest = rawArgs.slice(index);
+                args[def.name] = rest.map(raw => this.#convertArgument(def, raw));
+                index = rawArgs.length;
+                break;
+            }
+            if (def.kind === 'optional') {
+                const raw = rawArgs[index];
+                if (raw === undefined) {
                     args[def.name] = def.default ?? undefined;
                     continue;
                 }
-            }
-            else {
                 args[def.name] = this.#convertArgument(def, raw);
                 index += 1;
+                continue;
             }
+            const raw = rawArgs[index];
+            args[def.name] = this.#convertArgument(def, raw);
+            index += 1;
         }
-        const hasVariadic = argumentDefs.some(a => a.kind === 'variadic');
-        if (!hasVariadic && index < rawArgs.length) {
+        const hasRestArgument = argumentDefs.some(a => a.kind === 'variadic' || a.kind === 'some');
+        if (!hasRestArgument && index < rawArgs.length) {
             throw new CommanderError('TooManyArguments', `too many arguments: expected ${argumentDefs.length}, got ${rawArgs.length}`, this.#getCommandPath());
         }
         return { args, rawArgs };
     }
     #convertArgument(def, raw) {
+        let value;
         if (def.coerce) {
             try {
-                return def.coerce(raw);
+                value = def.coerce(raw);
             }
             catch {
                 throw new CommanderError('InvalidType', `invalid value "${raw}" for argument "${def.name}"`, this.#getCommandPath());
             }
         }
-        if (def.type === 'number') {
-            const n = Number(raw);
-            if (Number.isNaN(n)) {
-                throw new CommanderError('InvalidType', `invalid number "${raw}" for argument "${def.name}"`, this.#getCommandPath());
+        else {
+            value = raw;
+        }
+        if (typeof value !== 'string') {
+            throw new CommanderError('InvalidType', `invalid value for argument "${def.name}": expected ${def.type}`, this.#getCommandPath());
+        }
+        if (def.type === 'choice') {
+            const choices = def.choices ?? [];
+            if (!choices.includes(value)) {
+                throw new CommanderError('InvalidChoice', `invalid value "${value}" for argument "${def.name}". Allowed: ${choices
+                    .map(choice => JSON.stringify(choice))
+                    .join(', ')}`, this.#getCommandPath());
             }
-            return n;
         }
-        return raw;
+        return value;
+    }
+    #assertUnknownSubcommand(userTailArgv) {
+        if (this.#subcommandsList.length === 0) {
+            return;
+        }
+        const token = userTailArgv[0];
+        if (token === undefined || token.startsWith('-') || token === 'help') {
+            return;
+        }
+        if (this.#findSubcommandEntry(token) !== undefined) {
+            return;
+        }
+        const hints = [];
+        if (this.#arguments.length === 0) {
+            hints.push(`Hint: command "${this.#getCommandPath()}" does not accept positional arguments.`);
+        }
+        const candidate = this.#resolveDidYouMeanSubcommandName(token);
+        if (candidate !== undefined) {
+            hints.push(`Hint: did you mean "${candidate}"?`);
+        }
+        const details = hints.length > 0 ? `\n${hints.join('\n')}` : '';
+        throw new CommanderError('UnknownSubcommand', `unknown subcommand "${token}" for command "${this.#getCommandPath()}"${details}`, this.#getCommandPath());
+    }
+    #resolveDidYouMeanSubcommandName(token) {
+        const source = normalizeSubcommandNameForDistance(token);
+        let minDistance = Number.POSITIVE_INFINITY;
+        let bestName;
+        let isUniqueBest = false;
+        for (const entry of this.#subcommandsList) {
+            const target = normalizeSubcommandNameForDistance(entry.name);
+            const distance = levenshteinDistance(source, target);
+            if (distance < minDistance) {
+                minDistance = distance;
+                bestName = entry.name;
+                isUniqueBest = true;
+            }
+            else if (distance === minDistance) {
+                isUniqueBest = false;
+            }
+        }
+        if (minDistance <= 2 && isUniqueBest) {
+            return bestName;
+        }
+        return undefined;
     }
     #hasUserOption(long) {
         return this.#options.some(option => option.long === long);
@@ -1456,11 +1771,9 @@ class Command {
         return optionPolicyMap;
     }
     #mustGetOptionPolicy(optionPolicyMap, cmd) {
-        const policy = optionPolicyMap.get(cmd);
-        if (policy !== undefined) {
-            return policy;
-        }
-        throw new CommanderError('ConfigurationError', `missing option policy for command "${cmd.#getCommandPath()}"`, this.#getCommandPath());
+        const policy = optionPolicyMap.get(cmd) ?? cmd.#resolveOptionPolicy();
+        optionPolicyMap.set(cmd, policy);
+        return policy;
     }
     #validateMergedShortOptions(chain, optionPolicyMap) {
         const mergedByLong = new Map();
@@ -1489,7 +1802,10 @@ class Command {
             throw new CommanderError('ConfigurationError', `boolean option "--${opt.long}" must have args: 'none'`, this.#getCommandPath());
         }
         if ((opt.type === 'string' || opt.type === 'number') && opt.args === 'none') {
-            throw new CommanderError('ConfigurationError', `${opt.type} option "--${opt.long}" must have args: 'required' or 'variadic'`, this.#getCommandPath());
+            throw new CommanderError('ConfigurationError', `${opt.type} option "--${opt.long}" must have args: 'required', 'optional', or 'variadic'`, this.#getCommandPath());
+        }
+        if (opt.type === 'number' && opt.args === 'optional') {
+            throw new CommanderError('ConfigurationError', `number option "--${opt.long}" does not support args: 'optional'`, this.#getCommandPath());
         }
         if (opt.long.startsWith('no')) {
             throw new CommanderError('ConfigurationError', `option long name cannot start with "no": "${opt.long}"`, this.#getCommandPath());
@@ -1497,12 +1813,18 @@ class Command {
         if (!/^[a-z][a-zA-Z0-9]*$/.test(opt.long)) {
             throw new CommanderError('ConfigurationError', `option long name must be camelCase: "${opt.long}"`, this.#getCommandPath());
         }
+        if (opt.short !== undefined && opt.short.length !== 1) {
+            throw new CommanderError('ConfigurationError', `option short name must be a single character: "${opt.short}"`, this.#getCommandPath());
+        }
         if (opt.required && opt.default !== undefined) {
             throw new CommanderError('ConfigurationError', `option "--${opt.long}" cannot be both required and have a default value`, this.#getCommandPath());
         }
         if (opt.type === 'boolean' && opt.required) {
             throw new CommanderError('ConfigurationError', `boolean option "--${opt.long}" cannot be required`, this.#getCommandPath());
         }
+        if (opt.required && opt.args !== 'required') {
+            throw new CommanderError('ConfigurationError', `required option "--${opt.long}" must use args: 'required'`, this.#getCommandPath());
+        }
     }
     #checkOptionUniqueness(opt) {
         if (this.#options.some(o => o.long === opt.long)) {
@@ -1513,24 +1835,58 @@ class Command {
         }
     }
     #validateArgumentConfig(arg) {
-        if (arg.kind === 'required' && arg.default !== undefined) {
-            throw new CommanderError('ConfigurationError', `required argument "${arg.name}" cannot have a default value`, this.#getCommandPath());
+        if (arg.kind !== 'required' &&
+            arg.kind !== 'optional' &&
+            arg.kind !== 'variadic' &&
+            arg.kind !== 'some') {
+            throw new CommanderError('ConfigurationError', `argument "${arg.name}" must specify a valid kind`, this.#getCommandPath());
+        }
+        if (arg.type !== 'string' && arg.type !== 'choice') {
+            throw new CommanderError('ConfigurationError', `argument "${arg.name}" must specify a valid type`, this.#getCommandPath());
         }
-        if (arg.kind === 'variadic') {
-            if (this.#arguments.some(a => a.kind === 'variadic')) {
-                throw new CommanderError('ConfigurationError', 'only one variadic argument is allowed', this.#getCommandPath());
+        if (arg.default !== undefined && arg.kind !== 'optional') {
+            throw new CommanderError('ConfigurationError', `only optional argument "${arg.name}" can have a default value`, this.#getCommandPath());
+        }
+        if (arg.type === 'string' && arg.choices !== undefined) {
+            throw new CommanderError('ConfigurationError', `argument "${arg.name}" of type "string" cannot declare choices`, this.#getCommandPath());
+        }
+        if (arg.type === 'choice') {
+            if (!Array.isArray(arg.choices) || arg.choices.length === 0) {
+                throw new CommanderError('ConfigurationError', `argument "${arg.name}" of type "choice" must declare a non-empty choices array`, this.#getCommandPath());
+            }
+            if (arg.choices.some(choice => typeof choice !== 'string')) {
+                throw new CommanderError('ConfigurationError', `argument "${arg.name}" choices must be string[]`, this.#getCommandPath());
+            }
+        }
+        if (arg.default !== undefined) {
+            this.#validateArgumentDefaultValue(arg);
+        }
+        if (arg.kind === 'variadic' || arg.kind === 'some') {
+            if (this.#arguments.some(a => a.kind === 'variadic' || a.kind === 'some')) {
+                throw new CommanderError('ConfigurationError', 'only one variadic/some argument is allowed', this.#getCommandPath());
             }
         }
         if (this.#arguments.length > 0) {
             const last = this.#arguments[this.#arguments.length - 1];
-            if (last.kind === 'variadic') {
-                throw new CommanderError('ConfigurationError', 'variadic argument must be the last argument', this.#getCommandPath());
+            if (last.kind === 'variadic' || last.kind === 'some') {
+                throw new CommanderError('ConfigurationError', 'variadic/some argument must be the last argument', this.#getCommandPath());
             }
         }
         if (arg.kind === 'required') {
-            const hasOptional = this.#arguments.some(a => a.kind === 'optional' || a.kind === 'variadic');
+            const hasOptional = this.#arguments.some(a => a.kind === 'optional' || a.kind === 'variadic' || a.kind === 'some');
             if (hasOptional) {
-                throw new CommanderError('ConfigurationError', `required argument "${arg.name}" cannot come after optional/variadic arguments`, this.#getCommandPath());
+                throw new CommanderError('ConfigurationError', `required argument "${arg.name}" cannot come after optional/variadic/some arguments`, this.#getCommandPath());
+            }
+        }
+    }
+    #validateArgumentDefaultValue(arg) {
+        if (typeof arg.default !== 'string') {
+            throw new CommanderError('ConfigurationError', `default value for argument "${arg.name}" must match type "${arg.type}"`, this.#getCommandPath());
+        }
+        if (arg.type === 'choice') {
+            const choices = arg.choices ?? [];
+            if (!choices.includes(arg.default)) {
+                throw new CommanderError('ConfigurationError', `default value for argument "${arg.name}" must be one of declared choices`, this.#getCommandPath());
             }
         }
     }
@@ -1777,6 +2133,35 @@ class Coerce {
 function camelToKebabCase(str) {
     return str.replace(/[A-Z]/g, m => '-' + m.toLowerCase());
 }
+const COMPLETION_SHELL_STATE = Symbol('completion-shell-state');
+function getCommandPath(ctx) {
+    const names = ctx.chain
+        .map(command => command.name)
+        .filter((name) => Boolean(name));
+    if (names.length > 0) {
+        return names.join(' ');
+    }
+    return ctx.cmd.name ?? 'command';
+}
+function getCompletionShellState(ctx) {
+    const host = ctx;
+    host[COMPLETION_SHELL_STATE] ??= {};
+    return host[COMPLETION_SHELL_STATE];
+}
+function registerCompletionShell(ctx, shell) {
+    const state = getCompletionShellState(ctx);
+    if (state.shell !== undefined && state.shell !== shell) {
+        throw new CommanderError('OptionConflict', 'options "--bash", "--fish", and "--pwsh" are mutually exclusive', getCommandPath(ctx));
+    }
+    state.shell = shell;
+}
+function mustGetCompletionShell(ctx) {
+    const state = getCompletionShellState(ctx);
+    if (state.shell === undefined) {
+        throw new CommanderError('MissingRequired', 'missing required option: one of "--bash", "--fish", or "--pwsh"', getCommandPath(ctx));
+    }
+    return state.shell;
+}
 class CompletionCommand extends Command {
     constructor(root, config = {}) {
         const programName = config.programName ?? root.name ?? 'program';
@@ -1790,45 +2175,45 @@ class CompletionCommand extends Command {
             type: 'boolean',
             args: 'none',
             desc: 'Generate Bash completion script',
+            apply: (value, ctx) => {
+                if (value === true) {
+                    registerCompletionShell(ctx, 'bash');
+                }
+            },
         })
             .option({
             long: 'fish',
             type: 'boolean',
             args: 'none',
             desc: 'Generate Fish completion script',
+            apply: (value, ctx) => {
+                if (value === true) {
+                    registerCompletionShell(ctx, 'fish');
+                }
+            },
         })
             .option({
             long: 'pwsh',
             type: 'boolean',
             args: 'none',
             desc: 'Generate PowerShell completion script',
+            apply: (value, ctx) => {
+                if (value === true) {
+                    registerCompletionShell(ctx, 'pwsh');
+                }
+                mustGetCompletionShell(ctx);
+            },
         })
             .option({
             long: 'write',
             short: 'w',
             type: 'string',
-            args: 'required',
-            desc: 'Write to file (use shell default path if empty)',
-            default: undefined,
+            args: 'optional',
+            desc: 'Write to file (use shell default path when value is omitted or empty)',
         })
-            .action(({ opts }) => {
+            .action(({ opts, ctx }) => {
             const meta = root.getCompletionMeta();
-            const selectedShells = [
-                opts['bash'] && 'bash',
-                opts['fish'] && 'fish',
-                opts['pwsh'] && 'pwsh',
-            ].filter(Boolean);
-            if (selectedShells.length === 0) {
-                console.error('Please specify a shell: --bash, --fish, or --pwsh');
-                process.exit(1);
-                return;
-            }
-            if (selectedShells.length > 1) {
-                console.error('Please specify only one shell option');
-                process.exit(1);
-                return;
-            }
-            const shell = selectedShells[0];
+            const shell = mustGetCompletionShell(ctx);
             let script;
             switch (shell) {
                 case 'bash':
@@ -1841,8 +2226,9 @@ class CompletionCommand extends Command {
                     script = new PwshCompletion(meta, programName).generate();
                     break;
             }
-            const writeOpt = opts['write'];
-            if (writeOpt !== undefined) {
+            const hasWrite = Object.prototype.hasOwnProperty.call(opts, 'write');
+            if (hasWrite) {
+                const writeOpt = opts['write'];
                 const filePath = typeof writeOpt === 'string' && writeOpt !== '' ? writeOpt : paths[shell];
                 const expandedPath = expandHome(filePath);
                 const dir = path.dirname(expandedPath);
@@ -1887,6 +2273,7 @@ class BashCompletion {
             '',
             `${funcName}() {`,
             '  local cur prev words cword',
+            '  local opts arg_choices prefer_value_choices',
             '  _init_completion || return',
             '',
             ...this.#generateCommandCase(this.#meta, 1),
@@ -1906,13 +2293,15 @@ class BashCompletion {
         for (const opt of cmd.options) {
             const kebabLong = camelToKebabCase(opt.long);
             if (opt.short)
-                optParts.push(`-${opt.short}`);
-            optParts.push(`--${kebabLong}`);
+                optParts.push(this.#escapeWord(`-${opt.short}`));
+            optParts.push(this.#escapeWord(`--${kebabLong}`));
             if (!opt.takesValue) {
-                optParts.push(`--no-${kebabLong}`);
+                optParts.push(this.#escapeWord(`--no-${kebabLong}`));
             }
         }
-        const subParts = cmd.subcommands.flatMap(sub => [sub.name, ...sub.aliases]);
+        const subParts = cmd.subcommands
+            .flatMap(sub => [sub.name, ...sub.aliases])
+            .map(value => this.#escapeWord(value));
         const allOpts = [...optParts, ...subParts].join(' ');
         if (cmd.subcommands.length > 0) {
             lines.push(`${indent}case "\${words[${depth}]}" in`);
@@ -1924,14 +2313,105 @@ class BashCompletion {
             }
             lines.push(`${indent}  *)`);
             lines.push(`${indent}    opts="${allOpts}"`);
+            this.#appendChoiceLogicForCommand(lines, `${indent}    `, cmd, depth);
             lines.push(`${indent}    ;;`);
             lines.push(`${indent}esac`);
         }
         else {
             lines.push(`${indent}opts="${allOpts}"`);
+            this.#appendChoiceLogicForCommand(lines, indent, cmd, depth);
         }
         return lines;
     }
+    #serializeWordList(words) {
+        return words.map(choice => this.#escapeWord(choice)).join(' ');
+    }
+    #appendChoiceLogicForCommand(lines, indent, cmd, depth) {
+        const valueOptions = cmd.options.filter(opt => opt.takesValue);
+        const valueOptionsWithChoices = valueOptions.filter(opt => opt.choices && opt.choices.length > 0);
+        const valueLongPatterns = valueOptions.map(opt => `--${camelToKebabCase(opt.long)}`);
+        const valueShortPatterns = valueOptions
+            .map(opt => opt.short)
+            .filter((short) => typeof short === 'string');
+        lines.push(`${indent}prefer_value_choices=0`);
+        if (valueOptionsWithChoices.length > 0) {
+            lines.push(`${indent}if [[ "$cur" != -* ]]; then`);
+            lines.push(`${indent}  case "$prev" in`);
+            for (const opt of valueOptionsWithChoices) {
+                const patterns = [`--${camelToKebabCase(opt.long)}`];
+                if (opt.short) {
+                    patterns.push(`-${opt.short}`);
+                }
+                lines.push(`${indent}    ${patterns.join('|')})`);
+                lines.push(`${indent}      opts="${this.#serializeWordList(opt.choices ?? [])}"`);
+                lines.push(`${indent}      prefer_value_choices=1`);
+                lines.push(`${indent}      ;;`);
+            }
+            lines.push(`${indent}  esac`);
+            lines.push(`${indent}fi`);
+        }
+        lines.push(`${indent}if [[ $prefer_value_choices -eq 0 ]]; then`);
+        lines.push(`${indent}  positional_count=0`);
+        lines.push(`${indent}  expect_value=0`);
+        lines.push(`${indent}  for ((idx=${depth}; idx<cword; idx++)); do`);
+        lines.push(`${indent}    token="\${words[idx]}"`);
+        lines.push(`${indent}    if [[ $expect_value -eq 1 ]]; then`);
+        lines.push(`${indent}      expect_value=0`);
+        lines.push(`${indent}      continue`);
+        lines.push(`${indent}    fi`);
+        lines.push(`${indent}    if [[ "$token" == --* ]]; then`);
+        lines.push(`${indent}      if [[ "$token" == *=* ]]; then`);
+        lines.push(`${indent}        continue`);
+        lines.push(`${indent}      fi`);
+        if (valueLongPatterns.length > 0) {
+            lines.push(`${indent}      case "$token" in`);
+            lines.push(`${indent}        ${valueLongPatterns.join('|')}) expect_value=1 ;;`);
+            lines.push(`${indent}      esac`);
+        }
+        lines.push(`${indent}      continue`);
+        lines.push(`${indent}    fi`);
+        lines.push(`${indent}    if [[ "$token" == -* && "$token" != "-" ]]; then`);
+        lines.push(`${indent}      if [[ \${#token} -eq 2 ]]; then`);
+        if (valueShortPatterns.length > 0) {
+            lines.push(`${indent}        case "\${token:1:1}" in`);
+            lines.push(`${indent}          ${valueShortPatterns.join('|')}) expect_value=1 ;;`);
+            lines.push(`${indent}        esac`);
+        }
+        lines.push(`${indent}      fi`);
+        lines.push(`${indent}      continue`);
+        lines.push(`${indent}    fi`);
+        lines.push(`${indent}    positional_count=$((positional_count + 1))`);
+        lines.push(`${indent}  done`);
+        lines.push(`${indent}  if [[ $expect_value -eq 1 ]]; then`);
+        lines.push(`${indent}    opts=""`);
+        lines.push(`${indent}    prefer_value_choices=1`);
+        lines.push(`${indent}  elif [[ "$cur" != -* ]]; then`);
+        lines.push(`${indent}    arg_slot=-1`);
+        lines.push(`${indent}    arg_count=${cmd.arguments.length}`);
+        const hasRestArgument = cmd.arguments.length > 0 &&
+            (cmd.arguments[cmd.arguments.length - 1].kind === 'variadic' ||
+                cmd.arguments[cmd.arguments.length - 1].kind === 'some');
+        lines.push(`${indent}    has_rest=${hasRestArgument ? 1 : 0}`);
+        lines.push(`${indent}    if [[ $has_rest -eq 1 && $positional_count -ge $((arg_count - 1)) ]]; then`);
+        lines.push(`${indent}      arg_slot=$((arg_count - 1))`);
+        lines.push(`${indent}    elif [[ $positional_count -lt $arg_count ]]; then`);
+        lines.push(`${indent}      arg_slot=$positional_count`);
+        lines.push(`${indent}    fi`);
+        lines.push(`${indent}    case "$arg_slot" in`);
+        for (let index = 0; index < cmd.arguments.length; index += 1) {
+            const arg = cmd.arguments[index];
+            if (arg.type !== 'choice' || !arg.choices || arg.choices.length === 0) {
+                continue;
+            }
+            lines.push(`${indent}      ${index}) opts="${this.#serializeWordList(arg.choices)}" ;;`);
+        }
+        lines.push(`${indent}    esac`);
+        lines.push(`${indent}  fi`);
+        lines.push(`${indent}fi`);
+    }
+    #escapeWord(word) {
+        return word.replace(/([\\\s'"`$!])/g, '\\$1');
+    }
     #sanitizeName(name) {
         return name.replace(/[^a-zA-Z0-9]/g, '_');
     }
@@ -1939,15 +2419,19 @@ class BashCompletion {
 class FishCompletion {
     #meta;
     #programName;
+    #slotMatcherName;
     constructor(meta, programName) {
         this.#meta = meta;
         this.#programName = programName;
+        this.#slotMatcherName = `__${this.#sanitizeName(programName)}_match_arg_slot`;
     }
     generate() {
         const lines = [
             `# Fish completion for ${this.#programName}`,
             '# Generated by @guanghechen/commander',
             '',
+            ...this.#generateSlotMatcherFunction(),
+            '',
             ...this.#generateCommandCompletions(this.#meta, []),
             '',
         ];
@@ -1967,7 +2451,7 @@ class FishCompletion {
             line += ` -l ${kebabLong}`;
             line += ` -d '${this.#escape(opt.desc)}'`;
             if (opt.choices && opt.choices.length > 0) {
-                line += ` -xa '${opt.choices.join(' ')}'`;
+                line += ` -xa '${opt.choices.map(choice => this.#escapeChoice(choice)).join(' ')}'`;
             }
             lines.push(line);
             if (!opt.takesValue) {
@@ -1979,6 +2463,36 @@ class FishCompletion {
                 lines.push(noLine);
             }
         }
+        const valueOptionLongs = cmd.options
+            .filter(opt => opt.takesValue)
+            .map(opt => camelToKebabCase(opt.long))
+            .join(',');
+        const valueOptionShorts = cmd.options
+            .filter(opt => opt.takesValue && opt.short)
+            .map(opt => opt.short)
+            .join(',');
+        const argCount = cmd.arguments.length;
+        const hasRestArgument = argCount > 0 &&
+            (cmd.arguments[argCount - 1].kind === 'variadic' ||
+                cmd.arguments[argCount - 1].kind === 'some');
+        for (let index = 0; index < cmd.arguments.length; index += 1) {
+            const arg = cmd.arguments[index];
+            if (arg.type !== 'choice' || !arg.choices || arg.choices.length === 0) {
+                continue;
+            }
+            let line = `complete -c ${this.#programName}`;
+            const slotCondition = `${this.#slotMatcherName} ${parentPath.length} ${argCount} ${hasRestArgument ? 1 : 0} ${index} '${valueOptionLongs}' '${valueOptionShorts}'`;
+            if (condition) {
+                line += ` -n '${condition}; and ${slotCondition}'`;
+            }
+            else {
+                line += ` -n '${slotCondition}'`;
+            }
+            line += ` -f`;
+            line += ` -a '${arg.choices.map(choice => this.#escapeChoice(choice)).join(' ')}'`;
+            line += ` -d '${this.#escape(`Argument: ${arg.name}`)}'`;
+            lines.push(line);
+        }
         for (const sub of cmd.subcommands) {
             let line = `complete -c ${this.#programName}`;
             if (isRoot) {
@@ -2002,7 +2516,7 @@ class FishCompletion {
                 aliasLine += ` -d 'Alias for ${sub.name}'`;
                 lines.push(aliasLine);
             }
-            const newPath = [...parentPath, sub.name];
+            const newPath = [...parentPath, [sub.name, ...sub.aliases]];
             lines.push(...this.#generateCommandCompletions(sub, newPath));
         }
         return lines;
@@ -2010,7 +2524,7 @@ class FishCompletion {
     #buildCondition(path) {
         if (path.length === 0)
             return '';
-        return `__fish_seen_subcommand_from ${path[path.length - 1]}`;
+        return path.map(level => `__fish_seen_subcommand_from ${level.join(' ')}`).join('; and ');
     }
     #getSubcommandNames(cmd) {
         return cmd.subcommands.flatMap(sub => [sub.name, ...sub.aliases]);
@@ -2018,6 +2532,68 @@ class FishCompletion {
     #escape(s) {
         return s.replace(/'/g, "\\'");
     }
+    #escapeChoice(s) {
+        return s.replace(/\\/g, '\\\\').replace(/'/g, "\\'").replace(/\s/g, '\\ ');
+    }
+    #sanitizeName(name) {
+        return name.replace(/[^a-zA-Z0-9]/g, '_');
+    }
+    #generateSlotMatcherFunction() {
+        return [
+            `function ${this.#slotMatcherName} --argument-names depth arg_count has_rest target_index long_opts short_opts`,
+            '  set -l tokens (commandline -opc)',
+            '  set -l start (math $depth + 2)',
+            '  set -l positional 0',
+            '  set -l expect_value 0',
+            '  set -l i $start',
+            '  set -l token_count (count $tokens)',
+            '  set -l long_list (string split "," -- $long_opts)',
+            '  set -l short_list (string split "," -- $short_opts)',
+            '  while test $i -le $token_count',
+            '    set -l token $tokens[$i]',
+            '    if test $expect_value -eq 1',
+            '      set expect_value 0',
+            '      set i (math $i + 1)',
+            '      continue',
+            '    end',
+            '    if string match -q -- "--*" $token',
+            '      if string match -q -- "*=*" $token',
+            '        set i (math $i + 1)',
+            '        continue',
+            '      end',
+            '      set -l opt_name (string replace -r "^--" "" -- $token)',
+            '      if contains -- $opt_name $long_list',
+            '        set expect_value 1',
+            '      end',
+            '      set i (math $i + 1)',
+            '      continue',
+            '    end',
+            '    if test "$token" != "-"; and string match -q -- "-*" $token',
+            '      set -l raw_short (string replace -r "^-" "" -- $token)',
+            '      if test (string length -- $raw_short) -eq 1',
+            '        if contains -- $raw_short $short_list',
+            '          set expect_value 1',
+            '        end',
+            '      end',
+            '      set i (math $i + 1)',
+            '      continue',
+            '    end',
+            '    set positional (math $positional + 1)',
+            '    set i (math $i + 1)',
+            '  end',
+            '  if test $expect_value -eq 1',
+            '    return 1',
+            '  end',
+            '  set -l slot -1',
+            '  if test $has_rest -eq 1; and test $positional -ge (math $arg_count - 1)',
+            '    set slot (math $arg_count - 1)',
+            '  else if test $positional -lt $arg_count',
+            '    set slot $positional',
+            '  end',
+            '  test $slot -eq $target_index',
+            'end',
+        ];
+    }
 }
 class PwshCompletion {
     #meta;
@@ -2043,16 +2619,105 @@ class PwshCompletion {
             '',
             '  # Find current command context',
             '  $cmd = $commands',
+            '  $commandDepth = 1',
             '  foreach ($word in $words[1..($words.Count - 1)]) {',
             '    if ($word.StartsWith("-")) { continue }',
             '    if ($cmd.subcommands -and $cmd.subcommands.ContainsKey($word)) {',
             '      $cmd = $cmd.subcommands[$word]',
+            '      $commandDepth += 1',
             '    }',
             '  }',
             '',
             '  # Generate completions',
             '  $completions = @()',
             '',
+            '  # Option value slot (always higher priority than arguments)',
+            '  $previous = if ($words.Count -ge 2) { $words[$words.Count - 2] } else { $null }',
+            '  if ($previous) {',
+            '    foreach ($opt in $cmd.options) {',
+            '      $isLong = $previous -eq "--$($opt.long)"',
+            '      $isShort = $opt.short -and $previous -eq "-$($opt.short)"',
+            '      if ($isLong -or $isShort) {',
+            '        if ($opt.choices) {',
+            '          foreach ($choice in $opt.choices) {',
+            '            if ($choice -like "$current*") {',
+            '              $completions += [System.Management.Automation.CompletionResult]::new(',
+            '                $choice,',
+            '                $choice,',
+            '                "ParameterValue",',
+            '                $choice',
+            '              )',
+            '            }',
+            '          }',
+            '        }',
+            '        return $completions',
+            '      }',
+            '    }',
+            '  }',
+            '',
+            '  # Determine argument slot',
+            '  $positionalCount = 0',
+            '  $expectValue = $false',
+            '  for ($i = $commandDepth; $i -lt ($words.Count - 1); $i += 1) {',
+            '    $token = $words[$i]',
+            '    if ($expectValue) {',
+            '      $expectValue = $false',
+            '      continue',
+            '    }',
+            '    if ($token.StartsWith("--")) {',
+            '      if ($token.Contains("=")) { continue }',
+            '      foreach ($opt in $cmd.options) {',
+            '        if ($token -eq "--$($opt.long)" -and $opt.takesValue) {',
+            '          $expectValue = $true',
+            '          break',
+            '        }',
+            '      }',
+            '      continue',
+            '    }',
+            '    if ($token.StartsWith("-") -and $token -ne "-") {',
+            '      if ($token.Length -eq 2) {',
+            '        foreach ($opt in $cmd.options) {',
+            '          if ($opt.short -and $token -eq "-$($opt.short)" -and $opt.takesValue) {',
+            '            $expectValue = $true',
+            '            break',
+            '          }',
+            '        }',
+            '      }',
+            '      continue',
+            '    }',
+            '    $positionalCount += 1',
+            '  }',
+            '  if ($expectValue) {',
+            '    return $completions',
+            '  }',
+            '  if (-not $current.StartsWith("-") -and $cmd.arguments -and $cmd.arguments.Count -gt 0) {',
+            '    $argSlot = -1',
+            '    $argCount = $cmd.arguments.Count',
+            '    $lastArg = $cmd.arguments[$argCount - 1]',
+            '    $hasRest = $lastArg.kind -eq "variadic" -or $lastArg.kind -eq "some"',
+            '    if ($hasRest -and $positionalCount -ge ($argCount - 1)) {',
+            '      $argSlot = $argCount - 1',
+            '    } elseif ($positionalCount -lt $argCount) {',
+            '      $argSlot = $positionalCount',
+            '    }',
+            '    if ($argSlot -ge 0) {',
+            '      $argMeta = $cmd.arguments[$argSlot]',
+            '      if ($argMeta.choices) {',
+            '        foreach ($choice in $argMeta.choices) {',
+            '          if ($choice -like "$current*") {',
+            '            $completions += [System.Management.Automation.CompletionResult]::new(',
+            '              $choice,',
+            '              $choice,',
+            '              "ParameterValue",',
+            '              $choice',
+            '            )',
+            '          }',
+            '        }',
+            '        return $completions',
+            '      }',
+            '    }',
+            '  }',
+            '',
             '  # Options',
             '  if ($current.StartsWith("-")) {',
             '    foreach ($opt in $cmd.options) {',
@@ -2061,7 +2726,7 @@ class PwshCompletion {
             '          "--$($opt.long)",',
             '          $opt.long,',
             '          "ParameterName",',
-            '          $opt.desc',
+            '          $opt.description',
             '        )',
             '      }',
             '      if ($opt.isBoolean -and "--no-$($opt.long)" -like "$current*") {',
@@ -2069,7 +2734,7 @@ class PwshCompletion {
             '          "--no-$($opt.long)",',
             '          "no-$($opt.long)",',
             '          "ParameterName",',
-            '          $opt.desc',
+            '          $opt.description',
             '        )',
             '      }',
             '      if ($opt.short -and "-$($opt.short)" -like "$current*") {',
@@ -2077,7 +2742,7 @@ class PwshCompletion {
             '          "-$($opt.short)",',
             '          $opt.short,',
             '          "ParameterName",',
-            '          $opt.desc',
+            '          $opt.description',
             '        )',
             '      }',
             '    }',
@@ -2091,7 +2756,7 @@ class PwshCompletion {
             '          $sub,',
             '          $sub,',
             '          "Command",',
-            '          $cmd.subcommands[$sub].desc',
+            '          $cmd.subcommands[$sub].description',
             '        )',
             '      }',
             '    }',
@@ -2115,8 +2780,25 @@ class PwshCompletion {
             lines.push(`${indent}    long = '${kebabLong}'`);
             lines.push(`${indent}    description = '${this.#escape(opt.desc)}'`);
             lines.push(`${indent}    isBoolean = $${!opt.takesValue}`);
+            lines.push(`${indent}    takesValue = $${opt.takesValue}`);
             if (opt.choices) {
-                lines.push(`${indent}    choices = @('${opt.choices.join("', '")}')`);
+                lines.push(`${indent}    choices = @('${opt.choices
+                    .map(choice => this.#escape(choice))
+                    .join("', '")}')`);
+            }
+            lines.push(`${indent}  }`);
+        }
+        lines.push(`${indent})`);
+        lines.push(`${indent}arguments = @(`);
+        for (const arg of cmd.arguments) {
+            lines.push(`${indent}  @{`);
+            lines.push(`${indent}    name = '${this.#escape(arg.name)}'`);
+            lines.push(`${indent}    kind = '${arg.kind}'`);
+            lines.push(`${indent}    type = '${arg.type}'`);
+            if (arg.choices && arg.choices.length > 0) {
+                lines.push(`${indent}    choices = @('${arg.choices
+                    .map(choice => this.#escape(choice))
+                    .join("', '")}')`);
             }
             lines.push(`${indent}  }`);
         }