gunshi 0.37.0 → 0.37.1

package/lib/agent.js

@@ -1,5 +1,8 @@
 //#region ../../node_modules/.pnpm/std-env@4.1.0/node_modules/std-env/dist/index.mjs
-const e = globalThis.process?.env || Object.create(null), t = globalThis.process || { env: e }, n = t !== void 0 && t.env && t.env.NODE_ENV || void 0, r = [
+const e = globalThis.process?.env || Object.create(null);
+const t = globalThis.process || { env: e };
+const n = t !== void 0 && t.env && t.env.NODE_ENV || void 0;
+const r = [
 	[`claude`, [`CLAUDECODE`, `CLAUDE_CODE`]],
 	[`replit`, [`REPL_ID`]],
 	[`gemini`, [`GEMINI_CLI`]],
@@ -160,7 +163,14 @@ const S = /^win/i.test(p);
 !e.NO_COLOR && (e.FORCE_COLOR || (h || S) && e.TERM);
 const E = (t.versions?.node || ``).replace(/^v/, ``) || null;
 Number(E?.split(`.`)[0]);
-const O = !!t?.versions?.node, k = `Bun` in globalThis, A = `Deno` in globalThis, j = `fastly` in globalThis, M = `Netlify` in globalThis, N = `EdgeRuntime` in globalThis, P = globalThis.navigator?.userAgent === `Cloudflare-Workers`, F = [
+const O = !!t?.versions?.node;
+const k = `Bun` in globalThis;
+const A = `Deno` in globalThis;
+const j = `fastly` in globalThis;
+const M = `Netlify` in globalThis;
+const N = `EdgeRuntime` in globalThis;
+const P = globalThis.navigator?.userAgent === `Cloudflare-Workers`;
+const F = [
 	[M, `netlify`],
 	[N, `edge-light`],
 	[P, `workerd`],

package/lib/bone.d.ts

@@ -1,5 +1,5 @@
-import { i as Args, n as ArgSchema, r as ArgValues, u as ArgToken } from "./resolver-CgkhQ6Tt.js";
-import { C as NormalizeToGunshiParams, D as SubCommandable, E as RenderingOptions, O as ValidationErrorsDecorator, S as MergeGunshiExtensions, T as RendererDecorator, _ as ExtractArgs, a as CommandContext, b as GunshiParamsConstraint, c as CommandDecorator, d as CommandLoader, f as CommandRunner, g as ExtractArgExplicitlyProvided, h as ExtendContext, i as CommandCallMode, l as CommandEnvironment, m as DefaultGunshiParams, n as CliOptions, o as CommandContextCore, p as Commandable, r as Command, s as CommandContextExtension, t as Awaitable, u as CommandExamplesFetcher, v as ExtractExtensions, w as Prettify, x as LazyCommand, y as GunshiParams } from "./types-CD5eRJFK.js";
+import { i as Args, n as ArgSchema, r as ArgValues, u as ArgToken } from "./resolver-CKLHkuQa.js";
+import { C as NormalizeToGunshiParams, D as SubCommandable, E as RenderingOptions, O as ValidationErrorsDecorator, S as MergeGunshiExtensions, T as RendererDecorator, _ as ExtractArgs, a as CommandContext, b as GunshiParamsConstraint, c as CommandDecorator, d as CommandLoader, f as CommandRunner, g as ExtractArgExplicitlyProvided, h as ExtendContext, i as CommandCallMode, l as CommandEnvironment, m as DefaultGunshiParams, n as CliOptions, o as CommandContextCore, p as Commandable, r as Command, s as CommandContextExtension, t as Awaitable, u as CommandExamplesFetcher, v as ExtractExtensions, w as Prettify, x as LazyCommand, y as GunshiParams } from "./types-8Qh1S2q6.js";
 
 //#region src/cli/bone.d.ts
 /**

package/lib/bone.js

@@ -1,4 +1,4 @@
-import { t as cliCore } from "./core-CbE1I4Jl.js";
+import { t as cliCore } from "./core-vmpEqkpT.js";
 //#region src/cli/bone.ts
 /**
 * @author kazuya kawaguchi (a.k.a. kazupon)

package/lib/{cli-C4_IDXMQ.js → cli-8lpU57Wl.js}

@@ -1,7 +1,7 @@
-import { r as hasPriorityValidationError } from "./error-xSnOOdnr.js";
-import { t as plugin } from "./plugin-DhJZVIbl.js";
-import { a as namespacedId, o as COMMON_ARGS, t as renderer } from "./src-DIz-QFuo.js";
-import { t as cliCore } from "./core-CbE1I4Jl.js";
+import { r as hasPriorityValidationError } from "./error-BxeGn0JU.js";
+import { t as plugin } from "./plugin-BY44BdcY.js";
+import { a as namespacedId, o as COMMON_ARGS, t as renderer } from "./src-a-JpaUM5.js";
+import { t as cliCore } from "./core-vmpEqkpT.js";
 //#region ../plugin-global/src/types.ts
 /**
 * @author kazuya kawaguchi (a.k.a. kazupon)

package/lib/combinators.d.ts

@@ -1,6 +1,6 @@
-import { i as Args, n as ArgSchema } from "./resolver-CgkhQ6Tt.js";
+import { i as Args, n as ArgSchema } from "./resolver-CKLHkuQa.js";
 
-//#region ../../node_modules/.pnpm/args-tokens@0.28.0/node_modules/args-tokens/lib/combinators.d.ts
+//#region ../../node_modules/.pnpm/args-tokens@0.28.1/node_modules/args-tokens/lib/combinators.d.ts
 
 //#region src/combinators.d.ts
 /**

package/lib/combinators.js

@@ -1,6 +1,6 @@
-import { t as formatChoices } from "./utils-BKhsrjPW.js";
-import { n as ArgsValidationErrorKeys, t as ArgsValidationError } from "./resolver-UFOtObbe.js";
-//#region ../../node_modules/.pnpm/args-tokens@0.28.0/node_modules/args-tokens/lib/combinators.js
+import { t as formatChoices } from "./utils-CfOBA5zn.js";
+import { n as ArgsValidationErrorKeys, t as ArgsValidationError } from "./resolver-UjEQwV-U.js";
+//#region ../../node_modules/.pnpm/args-tokens@0.28.1/node_modules/args-tokens/lib/combinators.js
 /**
 * Parser combinator factory functions for composable argument schema construction.
 *

package/lib/context.d.ts

@@ -1,5 +1,5 @@
-import { i as Args, r as ArgValues, u as ArgToken } from "./resolver-CgkhQ6Tt.js";
-import { _ as ExtractArgs, a as CommandContext, b as GunshiParamsConstraint, g as ExtractArgExplicitlyProvided, h as ExtendContext, i as CommandCallMode, m as DefaultGunshiParams, n as CliOptions, r as Command, s as CommandContextExtension, x as LazyCommand, y as GunshiParams } from "./types-CD5eRJFK.js";
+import { i as Args, r as ArgValues, u as ArgToken } from "./resolver-CKLHkuQa.js";
+import { _ as ExtractArgs, a as CommandContext, b as GunshiParamsConstraint, g as ExtractArgExplicitlyProvided, h as ExtendContext, i as CommandCallMode, m as DefaultGunshiParams, n as CliOptions, r as Command, s as CommandContextExtension, x as LazyCommand, y as GunshiParams } from "./types-8Qh1S2q6.js";
 
 //#region src/context.d.ts
 

package/lib/{core-CbE1I4Jl.js → core-vmpEqkpT.js}

@@ -1,8 +1,8 @@
 import { i as NOOP, r as CLI_OPTIONS_DEFAULT, t as createCommandContext } from "./context-CAPhwgJJ.js";
-import { n as kebabnize } from "./utils-BKhsrjPW.js";
+import { n as kebabnize } from "./utils-CfOBA5zn.js";
 import { create, getCommandSubCommands, isLazyCommand, resolveLazyCommand } from "./utils.js";
-import { a as parseArgs, i as resolveArgs, n as ArgsValidationErrorKeys, t as ArgsValidationError } from "./resolver-UFOtObbe.js";
-import { n as CommandNotFoundErrorKeys, r as hasPriorityValidationError, t as CommandNotFoundError } from "./error-xSnOOdnr.js";
+import { a as parseArgs, i as resolveArgs, n as ArgsValidationErrorKeys, t as ArgsValidationError } from "./resolver-UjEQwV-U.js";
+import { n as CommandNotFoundErrorKeys, r as hasPriorityValidationError, t as CommandNotFoundError } from "./error-BxeGn0JU.js";
 //#region src/decorators.ts
 /**
 * @author kazuya kawaguchi (a.k.a. kazupon)

package/lib/definition.d.ts

@@ -1,5 +1,5 @@
-import { i as Args, n as ArgSchema, r as ArgValues } from "./resolver-CgkhQ6Tt.js";
-import { C as NormalizeToGunshiParams, _ as ExtractArgs, b as GunshiParamsConstraint, d as CommandLoader, f as CommandRunner, h as ExtendContext, m as DefaultGunshiParams, r as Command, v as ExtractExtensions, w as Prettify, x as LazyCommand, y as GunshiParams } from "./types-CD5eRJFK.js";
+import { i as Args, n as ArgSchema, r as ArgValues } from "./resolver-CKLHkuQa.js";
+import { C as NormalizeToGunshiParams, _ as ExtractArgs, b as GunshiParamsConstraint, d as CommandLoader, f as CommandRunner, h as ExtendContext, m as DefaultGunshiParams, r as Command, v as ExtractExtensions, w as Prettify, x as LazyCommand, y as GunshiParams } from "./types-8Qh1S2q6.js";
 import { CommandContextParams, createCommandContext } from "./context.js";
 
 //#region src/definition.d.ts

package/lib/{error-xSnOOdnr.js → error-BxeGn0JU.js}

@@ -1,5 +1,5 @@
-import { n as ArgsValidationErrorKeys, r as isArgsValidationError } from "./resolver-UFOtObbe.js";
-//#region ../../node_modules/.pnpm/args-tokens@0.28.0/node_modules/args-tokens/lib/index.js
+import { n as ArgsValidationErrorKeys, r as isArgsValidationError } from "./resolver-UjEQwV-U.js";
+//#region ../../node_modules/.pnpm/args-tokens@0.28.1/node_modules/args-tokens/lib/index.js
 /**
 * @author kazuya kawaguchi (a.k.a. kazupon)
 * @license MIT

package/lib/{error-6srXBX7u.d.ts → error-DdRv50OI.d.ts}

@@ -1,4 +1,4 @@
-import { m as DefaultGunshiParams, n as CliOptions } from "./types-CD5eRJFK.js";
+import { m as DefaultGunshiParams, n as CliOptions } from "./types-8Qh1S2q6.js";
 
 //#region src/constants.d.ts
 /**

package/lib/generator.d.ts

@@ -1,4 +1,4 @@
-import { b as GunshiParamsConstraint, m as DefaultGunshiParams, n as CliOptions, r as Command, x as LazyCommand } from "./types-CD5eRJFK.js";
+import { b as GunshiParamsConstraint, m as DefaultGunshiParams, n as CliOptions, r as Command, x as LazyCommand } from "./types-8Qh1S2q6.js";
 
 //#region src/generator.d.ts
 

package/lib/generator.js

@@ -1,5 +1,5 @@
 import { create } from "./utils.js";
-import { t as cli } from "./cli-C4_IDXMQ.js";
+import { t as cli } from "./cli-8lpU57Wl.js";
 //#region src/generator.ts
 /**
 * The entry for usage generator.

package/lib/index.d.ts

@@ -1,8 +1,8 @@
-import { a as ArgsValidationError, c as isArgsValidationError, d as parseArgs, i as Args, l as resolveArgs, n as ArgSchema, o as ArgsValidationErrorCode, r as ArgValues, s as ArgsValidationErrorKeys, u as ArgToken } from "./resolver-CgkhQ6Tt.js";
-import { A as Plugin, C as NormalizeToGunshiParams, D as SubCommandable, E as RenderingOptions, F as PluginWithExtension, I as PluginWithoutExtension, L as plugin, M as PluginExtension, N as PluginFunction, O as ValidationErrorsDecorator, P as PluginOptions, R as PluginContext, S as MergeGunshiExtensions, T as RendererDecorator, _ as ExtractArgs, a as CommandContext, b as GunshiParamsConstraint, c as CommandDecorator, d as CommandLoader, f as CommandRunner, g as ExtractArgExplicitlyProvided, h as ExtendContext, i as CommandCallMode, j as PluginDependency, k as OnPluginExtension, l as CommandEnvironment, m as DefaultGunshiParams, n as CliOptions, o as CommandContextCore, p as Commandable, r as Command, s as CommandContextExtension, t as Awaitable, u as CommandExamplesFetcher, v as ExtractExtensions, w as Prettify, x as LazyCommand, y as GunshiParams } from "./types-CD5eRJFK.js";
+import { a as ArgsValidationError, c as isArgsValidationError, d as parseArgs, i as Args, l as resolveArgs, n as ArgSchema, o as ArgsValidationErrorCode, r as ArgValues, s as ArgsValidationErrorKeys, u as ArgToken } from "./resolver-CKLHkuQa.js";
+import { A as Plugin, C as NormalizeToGunshiParams, D as SubCommandable, E as RenderingOptions, F as PluginWithExtension, I as PluginWithoutExtension, L as plugin, M as PluginExtension, N as PluginFunction, O as ValidationErrorsDecorator, P as PluginOptions, R as PluginContext, S as MergeGunshiExtensions, T as RendererDecorator, _ as ExtractArgs, a as CommandContext, b as GunshiParamsConstraint, c as CommandDecorator, d as CommandLoader, f as CommandRunner, g as ExtractArgExplicitlyProvided, h as ExtendContext, i as CommandCallMode, j as PluginDependency, k as OnPluginExtension, l as CommandEnvironment, m as DefaultGunshiParams, n as CliOptions, o as CommandContextCore, p as Commandable, r as Command, s as CommandContextExtension, t as Awaitable, u as CommandExamplesFetcher, v as ExtractExtensions, w as Prettify, x as LazyCommand, y as GunshiParams } from "./types-8Qh1S2q6.js";
 import { CommandContextParams, createCommandContext } from "./context.js";
 import { define, defineWithTypes, lazy, lazyWithTypes } from "./definition.js";
-import { a as hasPriorityValidationError, i as CommandNotFoundErrorOptions, n as CommandNotFoundErrorCode, o as isCommandNotFoundError, r as CommandNotFoundErrorKeys, s as ANONYMOUS_COMMAND_NAME, t as CommandNotFoundError } from "./error-6srXBX7u.js";
+import { a as hasPriorityValidationError, i as CommandNotFoundErrorOptions, n as CommandNotFoundErrorCode, o as isCommandNotFoundError, r as CommandNotFoundErrorKeys, s as ANONYMOUS_COMMAND_NAME, t as CommandNotFoundError } from "./error-DdRv50OI.js";
 
 //#region ../plugin-i18n/src/types.d.ts
 /**

package/lib/index.js

@@ -1,9 +1,9 @@
 import { n as ANONYMOUS_COMMAND_NAME, t as createCommandContext } from "./context-CAPhwgJJ.js";
-import { a as parseArgs, i as resolveArgs, n as ArgsValidationErrorKeys, r as isArgsValidationError, t as ArgsValidationError } from "./resolver-UFOtObbe.js";
-import { i as isCommandNotFoundError, n as CommandNotFoundErrorKeys, r as hasPriorityValidationError, t as CommandNotFoundError } from "./error-xSnOOdnr.js";
-import { t as plugin } from "./plugin-DhJZVIbl.js";
-import { a as namespacedId } from "./src-DIz-QFuo.js";
-import { t as cli } from "./cli-C4_IDXMQ.js";
+import { a as parseArgs, i as resolveArgs, n as ArgsValidationErrorKeys, r as isArgsValidationError, t as ArgsValidationError } from "./resolver-UjEQwV-U.js";
+import { i as isCommandNotFoundError, n as CommandNotFoundErrorKeys, r as hasPriorityValidationError, t as CommandNotFoundError } from "./error-BxeGn0JU.js";
+import { t as plugin } from "./plugin-BY44BdcY.js";
+import { a as namespacedId } from "./src-a-JpaUM5.js";
+import { t as cli } from "./cli-8lpU57Wl.js";
 import { define, defineWithTypes, lazy, lazyWithTypes } from "./definition.js";
 //#region ../plugin-i18n/src/translation.ts
 /**

package/lib/{plugin-DhJZVIbl.js → plugin-BY44BdcY.js}

@@ -1,4 +1,4 @@
-import "./error-xSnOOdnr.js";
+import "./error-BxeGn0JU.js";
 //#region src/plugin/core.ts
 /**
 * @author kazuya kawaguchi (a.k.a. kazupon)

package/lib/plugin.d.ts

@@ -1,7 +1,7 @@
-import { a as ArgsValidationError, c as isArgsValidationError, i as Args, n as ArgSchema, o as ArgsValidationErrorCode, r as ArgValues, s as ArgsValidationErrorKeys, u as ArgToken } from "./resolver-CgkhQ6Tt.js";
-import { A as Plugin, C as NormalizeToGunshiParams, F as PluginWithExtension, I as PluginWithoutExtension, L as plugin, M as PluginExtension, N as PluginFunction, O as ValidationErrorsDecorator, P as PluginOptions, R as PluginContext, S as MergeGunshiExtensions, T as RendererDecorator, _ as ExtractArgs, a as CommandContext, b as GunshiParamsConstraint, c as CommandDecorator, f as CommandRunner, h as ExtendContext, j as PluginDependency, k as OnPluginExtension, m as DefaultGunshiParams, o as CommandContextCore, r as Command, s as CommandContextExtension, t as Awaitable, u as CommandExamplesFetcher, v as ExtractExtensions, w as Prettify, x as LazyCommand, y as GunshiParams } from "./types-CD5eRJFK.js";
+import { a as ArgsValidationError, c as isArgsValidationError, i as Args, n as ArgSchema, o as ArgsValidationErrorCode, r as ArgValues, s as ArgsValidationErrorKeys, u as ArgToken } from "./resolver-CKLHkuQa.js";
+import { A as Plugin, C as NormalizeToGunshiParams, F as PluginWithExtension, I as PluginWithoutExtension, L as plugin, M as PluginExtension, N as PluginFunction, O as ValidationErrorsDecorator, P as PluginOptions, R as PluginContext, S as MergeGunshiExtensions, T as RendererDecorator, _ as ExtractArgs, a as CommandContext, b as GunshiParamsConstraint, c as CommandDecorator, f as CommandRunner, h as ExtendContext, j as PluginDependency, k as OnPluginExtension, m as DefaultGunshiParams, o as CommandContextCore, r as Command, s as CommandContextExtension, t as Awaitable, u as CommandExamplesFetcher, v as ExtractExtensions, w as Prettify, x as LazyCommand, y as GunshiParams } from "./types-8Qh1S2q6.js";
 import { CommandContextParams, createCommandContext } from "./context.js";
-import { a as hasPriorityValidationError, c as CLI_OPTIONS_DEFAULT, i as CommandNotFoundErrorOptions, n as CommandNotFoundErrorCode, o as isCommandNotFoundError, r as CommandNotFoundErrorKeys, s as ANONYMOUS_COMMAND_NAME, t as CommandNotFoundError } from "./error-6srXBX7u.js";
+import { a as hasPriorityValidationError, c as CLI_OPTIONS_DEFAULT, i as CommandNotFoundErrorOptions, n as CommandNotFoundErrorCode, o as isCommandNotFoundError, r as CommandNotFoundErrorKeys, s as ANONYMOUS_COMMAND_NAME, t as CommandNotFoundError } from "./error-DdRv50OI.js";
 
 //#region src/plugin.d.ts
 /**

package/lib/plugin.js

@@ -1,5 +1,5 @@
 import { n as ANONYMOUS_COMMAND_NAME, r as CLI_OPTIONS_DEFAULT, t as createCommandContext } from "./context-CAPhwgJJ.js";
-import { n as ArgsValidationErrorKeys, r as isArgsValidationError, t as ArgsValidationError } from "./resolver-UFOtObbe.js";
-import { i as isCommandNotFoundError, n as CommandNotFoundErrorKeys, r as hasPriorityValidationError, t as CommandNotFoundError } from "./error-xSnOOdnr.js";
-import { t as plugin } from "./plugin-DhJZVIbl.js";
+import { n as ArgsValidationErrorKeys, r as isArgsValidationError, t as ArgsValidationError } from "./resolver-UjEQwV-U.js";
+import { i as isCommandNotFoundError, n as CommandNotFoundErrorKeys, r as hasPriorityValidationError, t as CommandNotFoundError } from "./error-BxeGn0JU.js";
+import { t as plugin } from "./plugin-BY44BdcY.js";
 export { ANONYMOUS_COMMAND_NAME, ArgsValidationError, ArgsValidationErrorKeys, CLI_OPTIONS_DEFAULT, CommandNotFoundError, CommandNotFoundErrorKeys, createCommandContext, hasPriorityValidationError, isArgsValidationError, isCommandNotFoundError, plugin };

package/lib/renderer.d.ts

@@ -1,4 +1,4 @@
-import { a as CommandContext, m as DefaultGunshiParams, y as GunshiParams } from "./types-CD5eRJFK.js";
+import { a as CommandContext, m as DefaultGunshiParams, y as GunshiParams } from "./types-8Qh1S2q6.js";
 
 //#region ../plugin-renderer/src/header.d.ts
 /**

package/lib/renderer.js

@@ -1,4 +1,4 @@
-import { i as renderHeader, n as renderValidationErrors, r as renderUsage } from "./src-DIz-QFuo.js";
+import { i as renderHeader, n as renderValidationErrors, r as renderUsage } from "./src-a-JpaUM5.js";
 //#region src/renderer.ts
 /**
 * @author kazuya kawaguchi (a.k.a. kazupon)

package/lib/{resolver-CgkhQ6Tt.d.ts → resolver-CKLHkuQa.d.ts}

@@ -1,4 +1,4 @@
-//#region ../../node_modules/.pnpm/args-tokens@0.28.0/node_modules/args-tokens/lib/parser-DT7Ztcch.d.ts
+//#region ../../node_modules/.pnpm/args-tokens@0.28.1/node_modules/args-tokens/lib/parser-DT7Ztcch.d.ts
 //#region src/parser.d.ts
 /**
  * Entry point of argument parser.
@@ -88,7 +88,7 @@ declare function parseArgs(args: string[], options?: ParserOptions): ArgToken[];
  * @returns Whether `arg` is a short option.
  */
 //#endregion
-//#region ../../node_modules/.pnpm/args-tokens@0.28.0/node_modules/args-tokens/lib/resolver.d.ts
+//#region ../../node_modules/.pnpm/args-tokens@0.28.1/node_modules/args-tokens/lib/resolver.d.ts
 //#region src/resolver.d.ts
 /**
  * An argument schema definition for command-line argument parsing.

package/lib/{resolver-UFOtObbe.js → resolver-UjEQwV-U.js}

@@ -1,5 +1,5 @@
-import { n as kebabnize, t as formatChoices } from "./utils-BKhsrjPW.js";
-//#region ../../node_modules/.pnpm/args-tokens@0.28.0/node_modules/args-tokens/lib/parser.js
+import { n as kebabnize, t as formatChoices } from "./utils-CfOBA5zn.js";
+//#region ../../node_modules/.pnpm/args-tokens@0.28.1/node_modules/args-tokens/lib/parser.js
 /**
 * forked from `nodejs/node` (`pkgjs/parseargs`)
 * repository url: https://github.com/nodejs/node (https://github.com/pkgjs/parseargs)
@@ -204,7 +204,7 @@ function hasOptionValue(value) {
 	return !(value == null) && value.codePointAt(0) !== HYPHEN_CODE;
 }
 //#endregion
-//#region ../../node_modules/.pnpm/args-tokens@0.28.0/node_modules/args-tokens/lib/resolver.js
+//#region ../../node_modules/.pnpm/args-tokens@0.28.1/node_modules/args-tokens/lib/resolver.js
 /**
 * Entry point of argument options resolver.
 *
@@ -306,9 +306,17 @@ function resolveArgs(args, tokens, { shortGrouping = false, skipPositional = SKI
 	const rest = [];
 	const optionTokens = [];
 	const positionalTokens = [];
+	const argEntries = Object.entries(args);
 	let currentLongOption;
 	let currentShortOption;
 	const expandableShortOptions = [];
+	function getOptionName(rawArg, schema) {
+		return toKebab || schema.toKebab ? kebabnize(rawArg) : rawArg;
+	}
+	function checkLongTokenName(option, schema, token) {
+		if (token.rawName == void 0 || !hasLongOptionPrefix(token.rawName)) return false;
+		return token.name === option || schema.type === "boolean" && schema.negatable === true && token.name === `no-${option}`;
+	}
 	function toShortValue() {
 		if (expandableShortOptions.length === 0) return;
 		else {
@@ -336,6 +344,13 @@ function resolveArgs(args, tokens, { shortGrouping = false, skipPositional = SKI
 	* separate tokens into positionals, long and short options, after that resolve values
 	*/
 	const schemas = Object.values(args);
+	const booleanLongOptionNames = /* @__PURE__ */ new Set();
+	for (const [rawArg, schema] of Object.entries(args)) {
+		if (schema.type !== "boolean") continue;
+		const arg = toKebab || schema.toKebab ? kebabnize(rawArg) : rawArg;
+		booleanLongOptionNames.add(arg);
+		if (schema.negatable === true) booleanLongOptionNames.add(`no-${arg}`);
+	}
 	let terminated = false;
 	for (let i = 0; i < tokens.length; i++) {
 		const token = tokens[i];
@@ -348,7 +363,7 @@ function resolveArgs(args, tokens, { shortGrouping = false, skipPositional = SKI
 				positionalTokens.push({ ...token });
 				applyShortOptionValue();
 			} else applyShortOptionValue(token.value);
-			else if (currentLongOption) if (args[currentLongOption.name]?.type === "boolean") {
+			else if (currentLongOption) if (booleanLongOptionNames.has(currentLongOption.name)) {
 				positionalTokens.push({ ...token });
 				applyLongOptionValue();
 			} else applyLongOptionValue(token.value);
@@ -401,11 +416,7 @@ function resolveArgs(args, tokens, { shortGrouping = false, skipPositional = SKI
 	const errors = [];
 	const explicit = Object.create(null);
 	const actualInputNames = /* @__PURE__ */ new Map();
-	const argEntries = Object.entries(args);
 	let requiredPositionalsAfter;
-	function checkTokenName(option, schema, token) {
-		return token.name === (schema.type === "boolean" ? schema.negatable && token.name?.startsWith("no-") ? `no-${option}` : option : option);
-	}
 	const positionalItemCount = tokens.filter((token) => token.kind === "positional").length;
 	function getPositionalSkipIndex() {
 		return Math.min(skipPositionalIndex, positionalItemCount);
@@ -416,7 +427,7 @@ function resolveArgs(args, tokens, { shortGrouping = false, skipPositional = SKI
 	}
 	let positionalsCount = 0;
 	for (const [rawArg, schema] of argEntries) {
-		const arg = toKebab || schema.toKebab ? kebabnize(rawArg) : rawArg;
+		const arg = getOptionName(rawArg, schema);
 		explicit[rawArg] = false;
 		if (schema.type === "positional") {
 			if (skipPositionalIndex > SKIP_POSITIONAL_DEFAULT) while (positionalsCount <= getPositionalSkipIndex()) positionalsCount++;
@@ -470,7 +481,7 @@ function resolveArgs(args, tokens, { shortGrouping = false, skipPositional = SKI
 		}
 		if (schema.required) {
 			if (!optionTokens.find((token) => {
-				return schema.short && token.name === schema.short || token.rawName && hasLongOptionPrefix(token.rawName) && token.name === arg;
+				return schema.short && token.name === schema.short && token.rawName != void 0 && isShortOption(token.rawName) || checkLongTokenName(arg, schema, token);
 			})) {
 				errors.push(createRequireError(rawArg, arg, schema));
 				continue;
@@ -478,14 +489,15 @@ function resolveArgs(args, tokens, { shortGrouping = false, skipPositional = SKI
 		}
 		for (let i = 0; i < optionTokens.length; i++) {
 			const token = optionTokens[i];
-			if (checkTokenName(arg, schema, token) && token.rawName != void 0 && hasLongOptionPrefix(token.rawName) || schema.short === token.name && token.rawName != void 0 && isShortOption(token.rawName)) {
+			if (checkLongTokenName(arg, schema, token) || schema.short === token.name && token.rawName != void 0 && isShortOption(token.rawName)) {
 				const invalid = validateRequire(token, rawArg, arg, schema);
 				if (invalid) {
 					errors.push(invalid);
 					continue;
 				}
 				explicit[rawArg] = true;
-				const actualInputName = isShortOption(token.rawName) ? `-${token.name}` : `--${arg}`;
+				const rawName = token.rawName;
+				const actualInputName = isShortOption(rawName) ? `-${token.name}` : rawName;
 				actualInputNames.set(rawArg, actualInputName);
 				const [parsedValue, error] = parse(token, rawArg, arg, schema);
 				if (error) errors.push(error);

package/lib/{src-DIz-QFuo.js → src-a-JpaUM5.js}

@@ -1,9 +1,9 @@
 import "./context-CAPhwgJJ.js";
-import { n as kebabnize } from "./utils-BKhsrjPW.js";
+import { n as kebabnize } from "./utils-CfOBA5zn.js";
 import { resolveLazyCommand } from "./utils.js";
-import { n as ArgsValidationErrorKeys, r as isArgsValidationError } from "./resolver-UFOtObbe.js";
-import { i as isCommandNotFoundError } from "./error-xSnOOdnr.js";
-import { t as plugin } from "./plugin-DhJZVIbl.js";
+import { n as ArgsValidationErrorKeys, r as isArgsValidationError } from "./resolver-UjEQwV-U.js";
+import { i as isCommandNotFoundError } from "./error-BxeGn0JU.js";
+import { t as plugin } from "./plugin-BY44BdcY.js";
 /**
 * @author kazuya kawaguchi (a.k.a. kazupon)
 * @license MIT

package/lib/{types-CD5eRJFK.d.ts → types-8Qh1S2q6.d.ts}

@@ -1,4 +1,4 @@
-import { i as Args, n as ArgSchema, r as ArgValues, t as ArgExplicitlyProvided, u as ArgToken } from "./resolver-CgkhQ6Tt.js";
+import { i as Args, n as ArgSchema, r as ArgValues, t as ArgExplicitlyProvided, u as ArgToken } from "./resolver-CKLHkuQa.js";
 
 //#region src/plugin/context.d.ts
 /**

package/lib/{utils-BKhsrjPW.js → utils-CfOBA5zn.js}

@@ -1,4 +1,4 @@
-//#region ../../node_modules/.pnpm/args-tokens@0.28.0/node_modules/args-tokens/lib/utils.js
+//#region ../../node_modules/.pnpm/args-tokens@0.28.1/node_modules/args-tokens/lib/utils.js
 /**
 * Entry point of utils.
 *

package/lib/utils.d.ts

@@ -1,6 +1,6 @@
-import { b as GunshiParamsConstraint, m as DefaultGunshiParams, p as Commandable, r as Command, x as LazyCommand } from "./types-CD5eRJFK.js";
+import { b as GunshiParamsConstraint, m as DefaultGunshiParams, p as Commandable, r as Command, x as LazyCommand } from "./types-8Qh1S2q6.js";
 
-//#region ../../node_modules/.pnpm/args-tokens@0.28.0/node_modules/args-tokens/lib/utils.d.ts
+//#region ../../node_modules/.pnpm/args-tokens@0.28.1/node_modules/args-tokens/lib/utils.d.ts
 
 //#region src/utils.d.ts
 /**

package/lib/utils.js

@@ -1,4 +1,4 @@
-import { n as kebabnize } from "./utils-BKhsrjPW.js";
+import { n as kebabnize } from "./utils-CfOBA5zn.js";
 //#region src/utils.ts
 /**
 * @author kazuya kawaguchi (a.k.a. kazupon)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gunshi",
   "description": "Modern javascript command-line library",
-  "version": "0.37.0",
+  "version": "0.37.1",
   "author": {
     "name": "kazuya kawaguchi",
     "email": "kawakazu80@gmail.com"
@@ -108,7 +108,7 @@
     }
   },
   "devDependencies": {
-    "args-tokens": "^0.28.0",
+    "args-tokens": "^0.28.1",
     "deno": "^2.7.14",
     "jsr": "^0.14.3",
     "jsr-exports-lint": "^0.4.2",
@@ -116,11 +116,11 @@
     "std-env": "^4.1.0",
     "tsdown": "0.21.0",
     "zod": "^4.4.3",
-    "@gunshi/plugin-global": "0.37.0",
-    "@gunshi/resources": "0.37.0",
-    "@gunshi/plugin-i18n": "0.37.0",
-    "@gunshi/plugin-renderer": "0.37.0",
-    "@gunshi/shared": "0.37.0"
+    "@gunshi/plugin-i18n": "0.37.1",
+    "@gunshi/plugin-global": "0.37.1",
+    "@gunshi/plugin-renderer": "0.37.1",
+    "@gunshi/shared": "0.37.1",
+    "@gunshi/resources": "0.37.1"
   },
   "scripts": {
     "build": "tsdown",