@optique/core 1.3.1 → 1.3.3

package/dist/message.cjs

@@ -347,7 +347,8 @@ function renderMessage(msg, options, theme, ambient) {
 							yield {
 								text: match[0],
 								width: require_displaywidth.getDisplayWidth(match[0]),
-								scopes: []
+								scopes: [],
+								trimOnWrap: true
 							};
 						}
 					}
@@ -356,7 +357,8 @@ function renderMessage(msg, options, theme, ambient) {
 					if (normalizedText.trim() === "" && normalizedText.length > 0) yield {
 						text: " ",
 						width: 1,
-						scopes: []
+						scopes: [],
+						trimOnWrap: true
 					};
 					else {
 						wordPattern.lastIndex = 0;
@@ -366,7 +368,8 @@ function renderMessage(msg, options, theme, ambient) {
 							yield {
 								text: match[0],
 								width: require_displaywidth.getDisplayWidth(match[0]),
-								scopes: []
+								scopes: [],
+								trimOnWrap: true
 							};
 						}
 					}
@@ -383,22 +386,46 @@ function renderMessage(msg, options, theme, ambient) {
 	}
 	const tokens = [];
 	let totalWidth = initialWidth;
-	for (const token of stream()) {
+	let pendingWrap = false;
+	let atWrappedLineStart = false;
+	for (let token of stream()) {
 		if (token.width === -1) {
 			tokens.push(token);
 			totalWidth = 0;
+			pendingWrap = false;
+			atWrappedLineStart = false;
+			continue;
+		}
+		const wraps = pendingWrap || options.maxWidth != null && totalWidth > 0 && totalWidth + token.width > options.maxWidth;
+		if ((wraps || atWrappedLineStart) && token.trimOnWrap) {
+			const text$1 = token.text.trimStart();
+			token = {
+				...token,
+				text: text$1,
+				width: token.width - require_displaywidth.getDisplayWidth(token.text.slice(0, token.text.length - text$1.length))
+			};
+			if (text$1 === "") {
+				if (wraps) pendingWrap = true;
+				continue;
+			}
+		}
+		if (pendingWrap && require_displaywidth.stripAnsi(token.text) === "") {
+			tokens.push(token);
 			continue;
 		}
-		if (options.maxWidth != null && totalWidth > 0 && totalWidth + token.width > options.maxWidth) {
+		if (wraps) {
 			tokens.push({
 				text: "\n",
 				width: -1,
 				scopes: []
 			});
 			totalWidth = 0;
+			pendingWrap = false;
+			atWrappedLineStart = true;
 		}
 		tokens.push(token);
 		totalWidth += token.width;
+		if (token.width > 0) atWrappedLineStart = false;
 	}
 	return require_terminal_internal.serializeTokens(tokens, useColors, ambient == null ? resetSuffix : "", ambient);
 }

package/dist/message.js

@@ -1,4 +1,4 @@
-import { getDisplayWidth } from "./displaywidth.js";
+import { getDisplayWidth, stripAnsi } from "./displaywidth.js";
 import { formatTerminalTerm, fragmentTokens, serializeTokens } from "./terminal-internal.js";
 import { messageRenderers } from "./message-registry.js";
 
@@ -347,7 +347,8 @@ function renderMessage(msg, options, theme, ambient) {
 							yield {
 								text: match[0],
 								width: getDisplayWidth(match[0]),
-								scopes: []
+								scopes: [],
+								trimOnWrap: true
 							};
 						}
 					}
@@ -356,7 +357,8 @@ function renderMessage(msg, options, theme, ambient) {
 					if (normalizedText.trim() === "" && normalizedText.length > 0) yield {
 						text: " ",
 						width: 1,
-						scopes: []
+						scopes: [],
+						trimOnWrap: true
 					};
 					else {
 						wordPattern.lastIndex = 0;
@@ -366,7 +368,8 @@ function renderMessage(msg, options, theme, ambient) {
 							yield {
 								text: match[0],
 								width: getDisplayWidth(match[0]),
-								scopes: []
+								scopes: [],
+								trimOnWrap: true
 							};
 						}
 					}
@@ -383,22 +386,46 @@ function renderMessage(msg, options, theme, ambient) {
 	}
 	const tokens = [];
 	let totalWidth = initialWidth;
-	for (const token of stream()) {
+	let pendingWrap = false;
+	let atWrappedLineStart = false;
+	for (let token of stream()) {
 		if (token.width === -1) {
 			tokens.push(token);
 			totalWidth = 0;
+			pendingWrap = false;
+			atWrappedLineStart = false;
+			continue;
+		}
+		const wraps = pendingWrap || options.maxWidth != null && totalWidth > 0 && totalWidth + token.width > options.maxWidth;
+		if ((wraps || atWrappedLineStart) && token.trimOnWrap) {
+			const text$1 = token.text.trimStart();
+			token = {
+				...token,
+				text: text$1,
+				width: token.width - getDisplayWidth(token.text.slice(0, token.text.length - text$1.length))
+			};
+			if (text$1 === "") {
+				if (wraps) pendingWrap = true;
+				continue;
+			}
+		}
+		if (pendingWrap && stripAnsi(token.text) === "") {
+			tokens.push(token);
 			continue;
 		}
-		if (options.maxWidth != null && totalWidth > 0 && totalWidth + token.width > options.maxWidth) {
+		if (wraps) {
 			tokens.push({
 				text: "\n",
 				width: -1,
 				scopes: []
 			});
 			totalWidth = 0;
+			pendingWrap = false;
+			atWrappedLineStart = true;
 		}
 		tokens.push(token);
 		totalWidth += token.width;
+		if (token.width > 0) atWrappedLineStart = false;
 	}
 	return serializeTokens(tokens, useColors, ambient == null ? resetSuffix : "", ambient);
 }

package/dist/modifiers.cjs

@@ -4,6 +4,7 @@ const require_mode_dispatch = require('./internal/mode-dispatch.cjs');
 const require_dependency_runtime = require('./dependency-runtime.cjs');
 const require_internal_parser = require('./internal/parser.cjs');
 const require_annotation_state = require('./annotation-state.cjs');
+const require_passthrough = require('./internal/passthrough.cjs');
 const require_execution_context = require('./execution-context.cjs');
 const require_phase2_seed = require('./phase2-seed.cjs');
 const require_dependency_metadata = require('./dependency-metadata.cjs');
@@ -478,6 +479,9 @@ function optional(parser) {
 	require_internal_parser.defineParseLanes(optionalParser, adaptOptionalStyleParseLanes(parser));
 	require_internal_parser.defineInheritedAnnotationParser(optionalParser);
 	require_internal_parser.defineSourceBindingOnlyAnnotationCompletionParser(optionalParser);
+	require_passthrough.defineOptionMatch(optionalParser, (state, token) => require_passthrough.getOptionMatch(parser, normalizeOptionalLikeSuggestState(state, parser.initialState, parser), token));
+	require_passthrough.definePassThroughPriority(optionalParser, [parser], (state, token) => require_passthrough.getPassThroughPriority(parser, normalizeOptionalLikeSuggestState(state, parser.initialState, parser), token));
+	require_passthrough.defineKnownCompletionLookup(optionalParser, (state) => require_passthrough.getKnownCompletion(parser, deriveOptionalInnerParseState(state, parser)));
 	return fluent(optionalParser);
 }
 /**
@@ -729,6 +733,9 @@ function withDefault(parser, defaultValue, options) {
 	require_internal_parser.defineParseLanes(withDefaultParser, adaptOptionalStyleParseLanes(parser));
 	require_internal_parser.defineInheritedAnnotationParser(withDefaultParser);
 	require_internal_parser.defineSourceBindingOnlyAnnotationCompletionParser(withDefaultParser);
+	require_passthrough.defineOptionMatch(withDefaultParser, (state, token) => require_passthrough.getOptionMatch(parser, normalizeOptionalLikeSuggestState(state, parser.initialState, parser), token));
+	require_passthrough.definePassThroughPriority(withDefaultParser, [parser], (state, token) => require_passthrough.getPassThroughPriority(parser, normalizeOptionalLikeSuggestState(state, parser.initialState, parser), token));
+	require_passthrough.defineKnownCompletionLookup(withDefaultParser, (state) => require_passthrough.getKnownCompletion(parser, deriveOptionalInnerParseState(state, parser)));
 	return fluent(withDefaultParser);
 }
 /**
@@ -1714,6 +1721,19 @@ function multiple(parser, options = {}) {
 			enumerable: false
 		});
 	}
+	const matchingItem = (state) => {
+		const current = state.at(-1);
+		if (current != null && !isTerminalMultipleItemState(current)) return { state: unwrapInjectedWrapper(current) };
+		return state.length < max ? { state: parser.initialState } : void 0;
+	};
+	require_passthrough.defineOptionMatch(resultParser, (state, token) => {
+		const item = matchingItem(state);
+		return item == null ? void 0 : require_passthrough.getOptionMatch(parser, item.state, token);
+	});
+	require_passthrough.definePassThroughPriority(resultParser, [parser], (state, token) => {
+		const item = matchingItem(state);
+		return item == null ? void 0 : require_passthrough.getPassThroughPriority(parser, item.state, token);
+	});
 	return fluent(resultParser);
 }
 /**
@@ -1850,6 +1870,8 @@ function nonEmpty(parser) {
 		enumerable: false
 	});
 	require_dependency_runtime.defineForwardedEffectfulSchedulingNodes(nonEmptyParser, parser);
+	require_passthrough.defineOptionMatch(nonEmptyParser, (state, token) => require_passthrough.getOptionMatch(parser, state, token));
+	require_passthrough.definePassThroughPriority(nonEmptyParser, [parser], (state, token) => require_passthrough.getPassThroughPriority(parser, state, token));
 	return fluent(nonEmptyParser);
 }
 const fluentParserMarker = Symbol.for("@optique/core/fluent");

package/dist/modifiers.js

@@ -4,6 +4,7 @@ import { dispatchByMode, dispatchIterableByMode, mapModeValue, wrapForMode } fro
 import { defineForwardedEffectfulSchedulingNodes } from "./dependency-runtime.js";
 import { defineInheritedAnnotationParser, defineParseLanes, defineSourceBindingOnlyAnnotationCompletionParser, getOwnParseLanes, unmatchedNonCliDependencySourceStateMarker } from "./internal/parser.js";
 import { getDelegatedAnnotationState, hasDelegatedAnnotationCarrier, isAnnotationWrappedInitialState, normalizeDelegatedAnnotationState, normalizeNestedDelegatedAnnotationState } from "./annotation-state.js";
+import { defineKnownCompletionLookup, defineOptionMatch, definePassThroughPriority, getKnownCompletion, getOptionMatch, getPassThroughPriority } from "./internal/passthrough.js";
 import { mergeChildExec, withChildContext, withChildExecPath } from "./execution-context.js";
 import { completeOrExtractPhase2Seed, extractPhase2Seed, extractPhase2SeedKey, phase2SeedFromValueResult } from "./phase2-seed.js";
 import { composeDependencyMetadata } from "./dependency-metadata.js";
@@ -478,6 +479,9 @@ function optional(parser) {
 	defineParseLanes(optionalParser, adaptOptionalStyleParseLanes(parser));
 	defineInheritedAnnotationParser(optionalParser);
 	defineSourceBindingOnlyAnnotationCompletionParser(optionalParser);
+	defineOptionMatch(optionalParser, (state, token) => getOptionMatch(parser, normalizeOptionalLikeSuggestState(state, parser.initialState, parser), token));
+	definePassThroughPriority(optionalParser, [parser], (state, token) => getPassThroughPriority(parser, normalizeOptionalLikeSuggestState(state, parser.initialState, parser), token));
+	defineKnownCompletionLookup(optionalParser, (state) => getKnownCompletion(parser, deriveOptionalInnerParseState(state, parser)));
 	return fluent(optionalParser);
 }
 /**
@@ -729,6 +733,9 @@ function withDefault(parser, defaultValue, options) {
 	defineParseLanes(withDefaultParser, adaptOptionalStyleParseLanes(parser));
 	defineInheritedAnnotationParser(withDefaultParser);
 	defineSourceBindingOnlyAnnotationCompletionParser(withDefaultParser);
+	defineOptionMatch(withDefaultParser, (state, token) => getOptionMatch(parser, normalizeOptionalLikeSuggestState(state, parser.initialState, parser), token));
+	definePassThroughPriority(withDefaultParser, [parser], (state, token) => getPassThroughPriority(parser, normalizeOptionalLikeSuggestState(state, parser.initialState, parser), token));
+	defineKnownCompletionLookup(withDefaultParser, (state) => getKnownCompletion(parser, deriveOptionalInnerParseState(state, parser)));
 	return fluent(withDefaultParser);
 }
 /**
@@ -1714,6 +1721,19 @@ function multiple(parser, options = {}) {
 			enumerable: false
 		});
 	}
+	const matchingItem = (state) => {
+		const current = state.at(-1);
+		if (current != null && !isTerminalMultipleItemState(current)) return { state: unwrapInjectedWrapper(current) };
+		return state.length < max ? { state: parser.initialState } : void 0;
+	};
+	defineOptionMatch(resultParser, (state, token) => {
+		const item = matchingItem(state);
+		return item == null ? void 0 : getOptionMatch(parser, item.state, token);
+	});
+	definePassThroughPriority(resultParser, [parser], (state, token) => {
+		const item = matchingItem(state);
+		return item == null ? void 0 : getPassThroughPriority(parser, item.state, token);
+	});
 	return fluent(resultParser);
 }
 /**
@@ -1850,6 +1870,8 @@ function nonEmpty(parser) {
 		enumerable: false
 	});
 	defineForwardedEffectfulSchedulingNodes(nonEmptyParser, parser);
+	defineOptionMatch(nonEmptyParser, (state, token) => getOptionMatch(parser, state, token));
+	definePassThroughPriority(nonEmptyParser, [parser], (state, token) => getPassThroughPriority(parser, state, token));
 	return fluent(nonEmptyParser);
 }
 const fluentParserMarker = Symbol.for("@optique/core/fluent");

package/dist/primitives.cjs

@@ -6,6 +6,7 @@ const require_mode_dispatch = require('./internal/mode-dispatch.cjs');
 const require_internal_dependency = require('./internal/dependency.cjs');
 const require_dependency_runtime = require('./dependency-runtime.cjs');
 const require_annotation_state = require('./annotation-state.cjs');
+const require_passthrough = require('./internal/passthrough.cjs');
 const require_command_alias = require('./internal/command-alias.cjs');
 const require_execution_context = require('./execution-context.cjs');
 const require_phase2_seed = require('./phase2-seed.cjs');
@@ -151,6 +152,7 @@ function constant(value) {
 			return { fragments: [] };
 		}
 	};
+	require_passthrough.defineKnownCompletion(result, (state) => require_annotation_state.normalizeInjectedAnnotationState(state));
 	Object.defineProperty(result, "placeholder", {
 		value,
 		configurable: true,
@@ -590,10 +592,15 @@ function option(...args) {
 			}
 			const invalidOption = context.buffer[0];
 			if (options.errors?.noMatch) {
+				if (typeof options.errors.noMatch !== "function") return {
+					success: false,
+					consumed: 0,
+					error: options.errors.noMatch
+				};
 				const candidates = /* @__PURE__ */ new Set();
 				for (const name of require_usage.extractOptionNames(context.usage)) candidates.add(name);
 				const suggestions = require_suggestion.findSimilar(invalidOption, candidates, require_suggestion.DEFAULT_FIND_SIMILAR_OPTIONS);
-				const errorMessage = typeof options.errors.noMatch === "function" ? options.errors.noMatch(invalidOption, suggestions) : options.errors.noMatch;
+				const errorMessage = options.errors.noMatch(invalidOption, suggestions);
 				return {
 					success: false,
 					consumed: 0,
@@ -878,10 +885,15 @@ function flag(...args) {
 			}
 			const invalidOption = context.buffer[0];
 			if (options.errors?.noMatch) {
+				if (typeof options.errors.noMatch !== "function") return {
+					success: false,
+					consumed: 0,
+					error: options.errors.noMatch
+				};
 				const candidates = /* @__PURE__ */ new Set();
 				for (const name of require_usage.extractOptionNames(context.usage)) candidates.add(name);
 				const suggestions = require_suggestion.findSimilar(invalidOption, candidates, require_suggestion.DEFAULT_FIND_SIMILAR_OPTIONS);
-				const errorMessage = typeof options.errors.noMatch === "function" ? options.errors.noMatch(invalidOption, suggestions) : options.errors.noMatch;
+				const errorMessage = options.errors.noMatch(invalidOption, suggestions);
 				return {
 					success: false,
 					consumed: 0,
@@ -1190,7 +1202,7 @@ function argument(valueParser, options = {}) {
 	const syncValueParser = valueParser;
 	const dependencyMetadata = require_dependency_metadata.extractDependencyMetadata(valueParser);
 	const formatInvalidValueError = (error) => options.errors?.invalidValue ? typeof options.errors.invalidValue === "function" ? options.errors.invalidValue(error) : options.errors.invalidValue : require_message.message`${require_message.metavar(valueParser.metavar)}: ${error}`;
-	const optionPattern = /^--?[a-z0-9-]+$/i;
+	const optionPattern = /^(?!--=)(--?[a-z0-9-]+)(?:=|$)/i;
 	const term = {
 		type: "argument",
 		metavar: valueParser.metavar,
@@ -1217,14 +1229,15 @@ function argument(valueParser, options = {}) {
 			};
 			let i = 0;
 			let optionsTerminated = context.optionsTerminated;
-			if (!optionsTerminated) {
-				if (context.buffer[i] === "--") {
-					optionsTerminated = true;
-					i++;
-				} else if (context.buffer[i].match(optionPattern)) return {
+			if (!optionsTerminated) if (context.buffer[i] === "--") {
+				optionsTerminated = true;
+				i++;
+			} else {
+				const optionMatch = context.buffer[i].match(optionPattern);
+				if (optionMatch != null) return {
 					success: false,
 					consumed: i,
-					error: require_message.message`Expected an argument, but got an option: ${require_message.optionName(context.buffer[i])}.`
+					error: require_message.message`Expected an argument, but got an option: ${require_message.optionName(optionMatch[1])}.`
 				};
 			}
 			if (context.buffer.length < i + 1) return {
@@ -1734,6 +1747,22 @@ function command(name, parser, options = {}) {
 		configurable: true,
 		enumerable: false
 	});
+	require_passthrough.definePassThroughPriority(result, [parser], (state, token) => {
+		const active = normalizeCommandState(state);
+		if (active == null) return void 0;
+		const childState = active[0] === "matched" ? parser.initialState : active[1];
+		return require_passthrough.getPassThroughPriority(parser, getCommandParseChildState(state, childState, parser), token);
+	});
+	require_passthrough.defineOptionMatch(result, (state, token) => {
+		const active = normalizeCommandState(state);
+		if (active == null) return void 0;
+		const childState = active[0] === "matched" ? parser.initialState : active[1];
+		const match = require_passthrough.getOptionMatch(parser, getCommandParseChildState(state, childState, parser), token);
+		return match == null ? void 0 : {
+			...match,
+			continuesCommand: true
+		};
+	});
 	return require_modifiers.fluent(result);
 }
 /**
@@ -1807,6 +1836,8 @@ function passThrough(options = {}) {
 				consumed: 0,
 				error: require_message.message`No input to pass through.`
 			};
+			const failure = require_passthrough.getPassThroughFailure(context, this?.priority ?? -10);
+			if (failure != null) return failure.failure;
 			const token = context.buffer[0];
 			if (format === "greedy") {
 				const captured = [...context.buffer];
@@ -1918,6 +1949,11 @@ function passThrough(options = {}) {
 			return `passThrough(${format})`;
 		}
 	};
+	require_passthrough.definePassThroughPriority(result, [result], (_state, token) => {
+		if (token == null || format === "greedy") return result.priority;
+		const accepts = format === "equalsOnly" ? equalsOptionPattern.test(token) : format === "nextToken" && optionPattern.test(token);
+		return accepts ? result.priority : void 0;
+	});
 	return require_modifiers.fluent(result);
 }
 

package/dist/primitives.js

@@ -6,6 +6,7 @@ import { dispatchByMode, dispatchIterableByMode, wrapForMode } from "./internal/
 import { getDefaultValuesFunction, getDependencyIds, getSnapshottedDefaultDependencyValues, isDerivedValueParser, suggestWithDependency } from "./internal/dependency.js";
 import { effectfulSchedulingNodesKey, exclusiveSourceScopeKey, includeSourceFailureChain, recordDerivedRawInput, replayDerivedParser, replayDerivedParserAsync, sourceCollectionExpansionKey } from "./dependency-runtime.js";
 import { getWrappedChildParseState, getWrappedChildState, isAnnotationWrappedInitialState, normalizeInjectedAnnotationState } from "./annotation-state.js";
+import { defineKnownCompletion, defineOptionMatch, definePassThroughPriority, getOptionMatch, getPassThroughFailure, getPassThroughPriority } from "./internal/passthrough.js";
 import { hiddenCommandAliasesKey } from "./internal/command-alias.js";
 import { mergeChildExec, withChildContext, withChildExecPath } from "./execution-context.js";
 import { completeOrExtractPhase2Seed, extractPhase2SeedKey } from "./phase2-seed.js";
@@ -151,6 +152,7 @@ function constant(value) {
 			return { fragments: [] };
 		}
 	};
+	defineKnownCompletion(result, (state) => normalizeInjectedAnnotationState(state));
 	Object.defineProperty(result, "placeholder", {
 		value,
 		configurable: true,
@@ -590,10 +592,15 @@ function option(...args) {
 			}
 			const invalidOption = context.buffer[0];
 			if (options.errors?.noMatch) {
+				if (typeof options.errors.noMatch !== "function") return {
+					success: false,
+					consumed: 0,
+					error: options.errors.noMatch
+				};
 				const candidates = /* @__PURE__ */ new Set();
 				for (const name of extractOptionNames(context.usage)) candidates.add(name);
 				const suggestions = findSimilar(invalidOption, candidates, DEFAULT_FIND_SIMILAR_OPTIONS);
-				const errorMessage = typeof options.errors.noMatch === "function" ? options.errors.noMatch(invalidOption, suggestions) : options.errors.noMatch;
+				const errorMessage = options.errors.noMatch(invalidOption, suggestions);
 				return {
 					success: false,
 					consumed: 0,
@@ -878,10 +885,15 @@ function flag(...args) {
 			}
 			const invalidOption = context.buffer[0];
 			if (options.errors?.noMatch) {
+				if (typeof options.errors.noMatch !== "function") return {
+					success: false,
+					consumed: 0,
+					error: options.errors.noMatch
+				};
 				const candidates = /* @__PURE__ */ new Set();
 				for (const name of extractOptionNames(context.usage)) candidates.add(name);
 				const suggestions = findSimilar(invalidOption, candidates, DEFAULT_FIND_SIMILAR_OPTIONS);
-				const errorMessage = typeof options.errors.noMatch === "function" ? options.errors.noMatch(invalidOption, suggestions) : options.errors.noMatch;
+				const errorMessage = options.errors.noMatch(invalidOption, suggestions);
 				return {
 					success: false,
 					consumed: 0,
@@ -1190,7 +1202,7 @@ function argument(valueParser, options = {}) {
 	const syncValueParser = valueParser;
 	const dependencyMetadata = extractDependencyMetadata(valueParser);
 	const formatInvalidValueError = (error) => options.errors?.invalidValue ? typeof options.errors.invalidValue === "function" ? options.errors.invalidValue(error) : options.errors.invalidValue : message`${metavar(valueParser.metavar)}: ${error}`;
-	const optionPattern = /^--?[a-z0-9-]+$/i;
+	const optionPattern = /^(?!--=)(--?[a-z0-9-]+)(?:=|$)/i;
 	const term = {
 		type: "argument",
 		metavar: valueParser.metavar,
@@ -1217,14 +1229,15 @@ function argument(valueParser, options = {}) {
 			};
 			let i = 0;
 			let optionsTerminated = context.optionsTerminated;
-			if (!optionsTerminated) {
-				if (context.buffer[i] === "--") {
-					optionsTerminated = true;
-					i++;
-				} else if (context.buffer[i].match(optionPattern)) return {
+			if (!optionsTerminated) if (context.buffer[i] === "--") {
+				optionsTerminated = true;
+				i++;
+			} else {
+				const optionMatch = context.buffer[i].match(optionPattern);
+				if (optionMatch != null) return {
 					success: false,
 					consumed: i,
-					error: message`Expected an argument, but got an option: ${optionName(context.buffer[i])}.`
+					error: message`Expected an argument, but got an option: ${optionName(optionMatch[1])}.`
 				};
 			}
 			if (context.buffer.length < i + 1) return {
@@ -1734,6 +1747,22 @@ function command(name, parser, options = {}) {
 		configurable: true,
 		enumerable: false
 	});
+	definePassThroughPriority(result, [parser], (state, token) => {
+		const active = normalizeCommandState(state);
+		if (active == null) return void 0;
+		const childState = active[0] === "matched" ? parser.initialState : active[1];
+		return getPassThroughPriority(parser, getCommandParseChildState(state, childState, parser), token);
+	});
+	defineOptionMatch(result, (state, token) => {
+		const active = normalizeCommandState(state);
+		if (active == null) return void 0;
+		const childState = active[0] === "matched" ? parser.initialState : active[1];
+		const match = getOptionMatch(parser, getCommandParseChildState(state, childState, parser), token);
+		return match == null ? void 0 : {
+			...match,
+			continuesCommand: true
+		};
+	});
 	return fluent(result);
 }
 /**
@@ -1807,6 +1836,8 @@ function passThrough(options = {}) {
 				consumed: 0,
 				error: message`No input to pass through.`
 			};
+			const failure = getPassThroughFailure(context, this?.priority ?? -10);
+			if (failure != null) return failure.failure;
 			const token = context.buffer[0];
 			if (format === "greedy") {
 				const captured = [...context.buffer];
@@ -1918,6 +1949,11 @@ function passThrough(options = {}) {
 			return `passThrough(${format})`;
 		}
 	};
+	definePassThroughPriority(result, [result], (_state, token) => {
+		if (token == null || format === "greedy") return result.priority;
+		const accepts = format === "equalsOnly" ? equalsOptionPattern.test(token) : format === "nextToken" && optionPattern.test(token);
+		return accepts ? result.priority : void 0;
+	});
 	return fluent(result);
 }
 

package/dist/suggestion.cjs

@@ -86,8 +86,10 @@ function findSimilar(input, candidates, options = {}) {
 		const normalizedCandidate = caseSensitive ? candidate : candidate.toLowerCase();
 		if (seen.has(candidate)) continue;
 		seen.add(candidate);
+		if (normalizedInput === normalizedCandidate) return [candidate];
+		const minimumDistance = Math.abs(normalizedInput.length - normalizedCandidate.length);
+		if (minimumDistance > maxDistance || minimumDistance / input.length > maxDistanceRatio) continue;
 		const distance = levenshteinDistance(normalizedInput, normalizedCandidate);
-		if (distance === 0) return [candidate];
 		const distanceRatio = distance / input.length;
 		if (distance <= maxDistance && distanceRatio <= maxDistanceRatio) matches.push({
 			candidate,

package/dist/suggestion.js

@@ -86,8 +86,10 @@ function findSimilar(input, candidates, options = {}) {
 		const normalizedCandidate = caseSensitive ? candidate : candidate.toLowerCase();
 		if (seen.has(candidate)) continue;
 		seen.add(candidate);
+		if (normalizedInput === normalizedCandidate) return [candidate];
+		const minimumDistance = Math.abs(normalizedInput.length - normalizedCandidate.length);
+		if (minimumDistance > maxDistance || minimumDistance / input.length > maxDistanceRatio) continue;
 		const distance = levenshteinDistance(normalizedInput, normalizedCandidate);
-		if (distance === 0) return [candidate];
 		const distanceRatio = distance / input.length;
 		if (distance <= maxDistance && distanceRatio <= maxDistanceRatio) matches.push({
 			candidate,

package/dist/terminal-internal.cjs

@@ -1,4 +1,5 @@
 const require_displaywidth = require('./displaywidth.cjs');
+const require_terminal_separators = require('./terminal-separators.cjs');
 const require_terminal = require('./terminal.cjs');
 
 //#region src/terminal-internal.ts
@@ -151,6 +152,7 @@ function sameStyle(a, b) {
 }
 function* fragmentTokens(fragment, scopes = [], inherited = {}) {
 	if (fragment.type === "text") {
+		const marks = require_terminal_separators.wrapTrimmableFragments.has(fragment) ? { trimOnWrap: true } : {};
 		const lines = fragment.text.split("\n");
 		for (let i = 0; i < lines.length; i++) {
 			if (i > 0) yield {
@@ -161,7 +163,8 @@ function* fragmentTokens(fragment, scopes = [], inherited = {}) {
 			if (lines[i].length > 0 || lines.length === 1) yield {
 				text: lines[i],
 				width: require_displaywidth.getDisplayWidth(lines[i]),
-				scopes
+				scopes,
+				...marks
 			};
 		}
 		return;

package/dist/terminal-internal.d.cts

@@ -16,6 +16,11 @@ interface TerminalToken {
   readonly programBoundary?: boolean;
   /** Enables only the legacy default formatter whitespace behavior. */
   readonly legacyWhitespace?: boolean;
+  /**
+   * Leading whitespace only separates the token from preceding content, so
+   * message wrapping may drop it when the token starts a wrapped line.
+   */
+  readonly trimOnWrap?: boolean;
 }
 declare function terminalText(text: string): TerminalFragment;
 declare function formatTerminalTerm(term: TerminalTerm, theme?: TerminalTheme, quotes?: boolean, usage?: TerminalFormatContext["usage"]): TerminalFragment;

package/dist/terminal-internal.d.ts

@@ -16,6 +16,11 @@ interface TerminalToken {
   readonly programBoundary?: boolean;
   /** Enables only the legacy default formatter whitespace behavior. */
   readonly legacyWhitespace?: boolean;
+  /**
+   * Leading whitespace only separates the token from preceding content, so
+   * message wrapping may drop it when the token starts a wrapped line.
+   */
+  readonly trimOnWrap?: boolean;
 }
 declare function terminalText(text: string): TerminalFragment;
 declare function formatTerminalTerm(term: TerminalTerm, theme?: TerminalTheme, quotes?: boolean, usage?: TerminalFormatContext["usage"]): TerminalFragment;

package/dist/terminal-internal.js

@@ -1,4 +1,5 @@
 import { getDisplayWidth } from "./displaywidth.js";
+import { wrapTrimmableFragments } from "./terminal-separators.js";
 import { defaultTerminalTheme } from "./terminal.js";
 
 //#region src/terminal-internal.ts
@@ -151,6 +152,7 @@ function sameStyle(a, b) {
 }
 function* fragmentTokens(fragment, scopes = [], inherited = {}) {
 	if (fragment.type === "text") {
+		const marks = wrapTrimmableFragments.has(fragment) ? { trimOnWrap: true } : {};
 		const lines = fragment.text.split("\n");
 		for (let i = 0; i < lines.length; i++) {
 			if (i > 0) yield {
@@ -161,7 +163,8 @@ function* fragmentTokens(fragment, scopes = [], inherited = {}) {
 			if (lines[i].length > 0 || lines.length === 1) yield {
 				text: lines[i],
 				width: getDisplayWidth(lines[i]),
-				scopes
+				scopes,
+				...marks
 			};
 		}
 		return;

package/dist/terminal-separators.cjs

@@ -0,0 +1,13 @@
+
+//#region src/terminal-separators.ts
+/**
+* Text fragments that only separate the items around them, such as the
+* spaces the default `values` formatter puts between values.  When message
+* wrapping moves such a fragment to the start of a new line, its leading
+* whitespace may be dropped.
+* @internal
+*/
+const wrapTrimmableFragments = /* @__PURE__ */ new WeakSet();
+
+//#endregion
+exports.wrapTrimmableFragments = wrapTrimmableFragments;

package/dist/terminal-separators.js

@@ -0,0 +1,12 @@
+//#region src/terminal-separators.ts
+/**
+* Text fragments that only separate the items around them, such as the
+* spaces the default `values` formatter puts between values.  When message
+* wrapping moves such a fragment to the start of a new line, its leading
+* whitespace may be dropped.
+* @internal
+*/
+const wrapTrimmableFragments = /* @__PURE__ */ new WeakSet();
+
+//#endregion
+export { wrapTrimmableFragments };