@optique/core 1.4.0-dev.2661 → 1.4.0-dev.2662

package/dist/internal/passthrough.js

@@ -28,6 +28,15 @@ function getPassThroughFailure(context, capturePriority$1 = -Infinity) {
 * @internal
 */
 function withPassThroughFailure(context, failure, capturePriority$1 = -Infinity) {
+	const incoming = context;
+	if (incoming[passThroughFailure]?.own != null) {
+		const { own: _own,...hint } = incoming[passThroughFailure];
+		const stripped = {
+			...context,
+			[passThroughFailure]: hint
+		};
+		context = stripped;
+	}
 	const token = context.buffer[0];
 	const existing = getPassThroughFailure(context);
 	if (existing != null && existing.priority < capturePriority$1) {
@@ -48,11 +57,39 @@ function withPassThroughFailure(context, failure, capturePriority$1 = -Infinity)
 	};
 	return hinted;
 }
-/** Retains a child's rejected option failure only at the parent's cursor. @internal */
+/** Reads locally originated diagnostics at the same cursor. @internal */
+function getOwnConsumingFailure(context) {
+	const hinted = context;
+	const hint = hinted[passThroughFailure];
+	return hint?.buffer === context.buffer && hint.optionsTerminated === context.optionsTerminated ? hint.own : void 0;
+}
+/**
+* Returns a successful child's local diagnostic to its parent without merging
+* its provenance with an inherited sibling diagnostic. Both share a cursor.
+* @internal
+*/
+function withReturnedConsumingFailure(context, failure) {
+	const next = withPassThroughFailure(context, failure);
+	if (failure == null || getPassThroughFailure(next) == null) return next;
+	const token = next.buffer[0];
+	if (next.optionsTerminated || token == null || token === "--" || !/^[-/+]/.test(token) || failure.failure.consumed < 1) return next;
+	const hinted = next;
+	const hint = hinted[passThroughFailure];
+	if (hint == null) return next;
+	const returned = {
+		...next,
+		[passThroughFailure]: {
+			...hint,
+			own: failure
+		}
+	};
+	return returned;
+}
+/** Retains a child's own rejected option failure at the parent's cursor. @internal */
 function retainConsumingFailureHint(current, context, next) {
 	if (next.buffer !== context.buffer || next.optionsTerminated !== context.optionsTerminated) return current;
-	const hint = getPassThroughFailure(next);
-	return hint == null ? current : retainConsumingFailure(current, hint.failure, hint.priority);
+	const own = getOwnConsumingFailure(next);
+	return own == null || own === getOwnConsumingFailure(context) ? current : retainConsumingFailure(current, own.failure, own.priority);
 }
 const capturePriority = Symbol("capturePriority");
 /** Checks for capture through usage-preserving wrappers. @internal */
@@ -208,6 +245,24 @@ function delegateKnownCompletion(wrapper, inner) {
 		enumerable: true
 	});
 }
+/**
+* Installs option and capture inspection from one pure child-state selector.
+* Static children retain capture metadata even when no child is selected yet.
+* Selection must not execute parsing, completion, or user callbacks. Potential
+* alternatives remain candidates until parse-time replay or canSkip resolves
+* them; inspection cannot safely predict opaque custom parser callbacks.
+* @internal
+*/
+function defineReachableChildren(parser, children, select) {
+	defineOptionMatch(parser, (state, token) => combineOptionMatches(select(state).map((child) => {
+		const match = getOptionMatch(child.parser, child.state, token);
+		return match == null || !child.continuesCommand ? match : {
+			...match,
+			continuesCommand: true
+		};
+	})));
+	definePassThroughPriority(parser, children, (state, token) => combinePassThroughPriorities(select(state).map((child) => getPassThroughPriority(child.parser, child.state, token))));
+}
 
 //#endregion
-export { combineOptionMatches, combinePassThroughPriorities, defineKnownCompletion, defineKnownCompletionLookup, defineOptionMatch, definePassThroughPriority, delegateKnownCompletion, getKnownCompletion, getOptionMatch, getPassThroughFailure, getPassThroughFailureHint, getPassThroughPriority, hasPassThroughUsage, matchesOptionToken, retainConsumingFailure, retainConsumingFailureHint, withPassThroughFailure };
+export { defineKnownCompletion, defineKnownCompletionLookup, definePassThroughPriority, defineReachableChildren, delegateKnownCompletion, getKnownCompletion, getOptionMatch, getPassThroughFailure, getPassThroughFailureHint, getPassThroughPriority, hasPassThroughUsage, matchesOptionToken, retainConsumingFailure, retainConsumingFailureHint, withPassThroughFailure, withReturnedConsumingFailure };

package/dist/modifiers.cjs

@@ -480,8 +480,10 @@ 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.defineReachableChildren(optionalParser, [parser], (state) => [{
+		parser,
+		state: deriveOptionalInnerParseState(state, parser)
+	}]);
 	require_passthrough.defineKnownCompletionLookup(optionalParser, (state) => require_passthrough.getKnownCompletion(parser, deriveOptionalInnerParseState(state, parser)));
 	return fluent(require_short_option.scopeParser(optionalParser, require_short_option.combinedOptionScope([parser])));
 }
@@ -734,8 +736,10 @@ 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.defineReachableChildren(withDefaultParser, [parser], (state) => [{
+		parser,
+		state: deriveOptionalInnerParseState(state, parser)
+	}]);
 	require_passthrough.defineKnownCompletionLookup(withDefaultParser, (state) => require_passthrough.getKnownCompletion(parser, deriveOptionalInnerParseState(state, parser)));
 	return fluent(require_short_option.scopeParser(withDefaultParser, require_short_option.combinedOptionScope([parser])));
 }
@@ -1195,12 +1199,28 @@ function multiple(parser, options = {}) {
 		parser,
 		state
 	}] : []);
+	const selectItems = (state) => {
+		const current = state.at(-1);
+		return [...current != null && !isTerminalMultipleItemState(current) ? [{
+			parser,
+			state: current,
+			index: state.length - 1,
+			fresh: false
+		}] : [], ...state.length < max ? [{
+			parser,
+			state: parser.initialState,
+			index: state.length,
+			fresh: true
+		}] : []];
+	};
 	const canExtendMultipleItem = (state, itemIndex, exec) => state != null && !isTerminalMultipleItemState(state) && (isMatchedCommandParserState(parser, state) || parser.canSkip?.(state, require_execution_context.withChildExecPath(exec, itemIndex)) !== true);
 	const parseSync = (context) => {
-		const currentItemState = context.state.at(-1);
-		const currentItemIndex = context.state.length - 1;
-		const canExtendCurrent = canExtendMultipleItem(currentItemState, currentItemIndex, context.exec);
-		const canOpenFreshItem = context.state.length < max;
+		const items = selectItems(context.state);
+		const current = items.find((item) => !item.fresh);
+		const fresh = items.find((item) => item.fresh);
+		const currentItemState = current?.state;
+		const canExtendCurrent = current != null && canExtendMultipleItem(current.state, current.index, context.exec);
+		const canOpenFreshItem = fresh != null;
 		if (!canExtendCurrent && !canOpenFreshItem) return {
 			success: true,
 			next: context,
@@ -1208,7 +1228,7 @@ function multiple(parser, options = {}) {
 		};
 		let added = !canExtendCurrent;
 		let itemIndex = canExtendCurrent ? context.state.length - 1 : context.state.length;
-		const currentItemStateWithAnnotations = canExtendCurrent ? currentItemState : require_internal_annotations.inheritAnnotations(context.state, syncParser.initialState);
+		const currentItemStateWithAnnotations = canExtendCurrent ? currentItemState : require_internal_annotations.inheritAnnotations(context.state, fresh?.state ?? parser.initialState);
 		let result = parseSyncWithUnwrappedFallback(require_execution_context.withChildContext(context, itemIndex, currentItemStateWithAnnotations));
 		if (!result.success) {
 			if (result.consumed !== 0) return result;
@@ -1278,10 +1298,12 @@ function multiple(parser, options = {}) {
 		};
 	};
 	const parseAsync = async (context) => {
-		const currentItemState = context.state.at(-1);
-		const currentItemIndex = context.state.length - 1;
-		const canExtendCurrent = canExtendMultipleItem(currentItemState, currentItemIndex, context.exec);
-		const canOpenFreshItem = context.state.length < max;
+		const items = selectItems(context.state);
+		const current = items.find((item) => !item.fresh);
+		const fresh = items.find((item) => item.fresh);
+		const currentItemState = current?.state;
+		const canExtendCurrent = current != null && canExtendMultipleItem(current.state, current.index, context.exec);
+		const canOpenFreshItem = fresh != null;
 		if (!canExtendCurrent && !canOpenFreshItem) return {
 			success: true,
 			next: context,
@@ -1289,7 +1311,7 @@ function multiple(parser, options = {}) {
 		};
 		let added = !canExtendCurrent;
 		let itemIndex = canExtendCurrent ? context.state.length - 1 : context.state.length;
-		const currentItemStateWithAnnotations = canExtendCurrent ? currentItemState : require_internal_annotations.inheritAnnotations(context.state, parser.initialState);
+		const currentItemStateWithAnnotations = canExtendCurrent ? currentItemState : require_internal_annotations.inheritAnnotations(context.state, fresh?.state ?? parser.initialState);
 		let result = await parseAsyncWithUnwrappedFallback(require_execution_context.withChildContext(context, itemIndex, currentItemStateWithAnnotations));
 		if (!result.success) {
 			if (result.consumed !== 0) return result;
@@ -1722,19 +1744,10 @@ 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);
-	});
+	require_passthrough.defineReachableChildren(resultParser, [parser], (state) => selectItems(state).map((item) => ({
+		parser,
+		state: unwrapInjectedWrapper(item.state)
+	})));
 	return fluent(require_short_option.scopeParser(resultParser, require_short_option.repeatedOptionScope(parser)));
 }
 /**
@@ -1871,8 +1884,10 @@ 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));
+	require_passthrough.defineReachableChildren(nonEmptyParser, [parser], (state) => [{
+		parser,
+		state
+	}]);
 	return fluent(require_short_option.scopeParser(nonEmptyParser, require_short_option.combinedOptionScope([parser])));
 }
 const fluentParserMarker = Symbol.for("@optique/core/fluent");

package/dist/modifiers.js

@@ -6,7 +6,7 @@ import { defineInheritedAnnotationParser, defineParseLanes, defineSourceBindingO
 import { getDelegatedAnnotationState, hasDelegatedAnnotationCarrier, isAnnotationWrappedInitialState, normalizeDelegatedAnnotationState, normalizeNestedDelegatedAnnotationState } from "./annotation-state.js";
 import { mergeChildExec, withChildContext, withChildExecPath } from "./execution-context.js";
 import { combinedOptionScope, repeatedOptionScope, scopeParser } from "./short-option.js";
-import { defineKnownCompletionLookup, defineOptionMatch, definePassThroughPriority, getKnownCompletion, getOptionMatch, getPassThroughPriority } from "./internal/passthrough.js";
+import { defineKnownCompletionLookup, defineReachableChildren, getKnownCompletion } from "./internal/passthrough.js";
 import { completeOrExtractPhase2Seed, extractPhase2Seed, extractPhase2SeedKey, phase2SeedFromValueResult } from "./phase2-seed.js";
 import { composeDependencyMetadata } from "./dependency-metadata.js";
 
@@ -480,8 +480,10 @@ 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));
+	defineReachableChildren(optionalParser, [parser], (state) => [{
+		parser,
+		state: deriveOptionalInnerParseState(state, parser)
+	}]);
 	defineKnownCompletionLookup(optionalParser, (state) => getKnownCompletion(parser, deriveOptionalInnerParseState(state, parser)));
 	return fluent(scopeParser(optionalParser, combinedOptionScope([parser])));
 }
@@ -734,8 +736,10 @@ 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));
+	defineReachableChildren(withDefaultParser, [parser], (state) => [{
+		parser,
+		state: deriveOptionalInnerParseState(state, parser)
+	}]);
 	defineKnownCompletionLookup(withDefaultParser, (state) => getKnownCompletion(parser, deriveOptionalInnerParseState(state, parser)));
 	return fluent(scopeParser(withDefaultParser, combinedOptionScope([parser])));
 }
@@ -1195,12 +1199,28 @@ function multiple(parser, options = {}) {
 		parser,
 		state
 	}] : []);
+	const selectItems = (state) => {
+		const current = state.at(-1);
+		return [...current != null && !isTerminalMultipleItemState(current) ? [{
+			parser,
+			state: current,
+			index: state.length - 1,
+			fresh: false
+		}] : [], ...state.length < max ? [{
+			parser,
+			state: parser.initialState,
+			index: state.length,
+			fresh: true
+		}] : []];
+	};
 	const canExtendMultipleItem = (state, itemIndex, exec) => state != null && !isTerminalMultipleItemState(state) && (isMatchedCommandParserState(parser, state) || parser.canSkip?.(state, withChildExecPath(exec, itemIndex)) !== true);
 	const parseSync = (context) => {
-		const currentItemState = context.state.at(-1);
-		const currentItemIndex = context.state.length - 1;
-		const canExtendCurrent = canExtendMultipleItem(currentItemState, currentItemIndex, context.exec);
-		const canOpenFreshItem = context.state.length < max;
+		const items = selectItems(context.state);
+		const current = items.find((item) => !item.fresh);
+		const fresh = items.find((item) => item.fresh);
+		const currentItemState = current?.state;
+		const canExtendCurrent = current != null && canExtendMultipleItem(current.state, current.index, context.exec);
+		const canOpenFreshItem = fresh != null;
 		if (!canExtendCurrent && !canOpenFreshItem) return {
 			success: true,
 			next: context,
@@ -1208,7 +1228,7 @@ function multiple(parser, options = {}) {
 		};
 		let added = !canExtendCurrent;
 		let itemIndex = canExtendCurrent ? context.state.length - 1 : context.state.length;
-		const currentItemStateWithAnnotations = canExtendCurrent ? currentItemState : inheritAnnotations(context.state, syncParser.initialState);
+		const currentItemStateWithAnnotations = canExtendCurrent ? currentItemState : inheritAnnotations(context.state, fresh?.state ?? parser.initialState);
 		let result = parseSyncWithUnwrappedFallback(withChildContext(context, itemIndex, currentItemStateWithAnnotations));
 		if (!result.success) {
 			if (result.consumed !== 0) return result;
@@ -1278,10 +1298,12 @@ function multiple(parser, options = {}) {
 		};
 	};
 	const parseAsync = async (context) => {
-		const currentItemState = context.state.at(-1);
-		const currentItemIndex = context.state.length - 1;
-		const canExtendCurrent = canExtendMultipleItem(currentItemState, currentItemIndex, context.exec);
-		const canOpenFreshItem = context.state.length < max;
+		const items = selectItems(context.state);
+		const current = items.find((item) => !item.fresh);
+		const fresh = items.find((item) => item.fresh);
+		const currentItemState = current?.state;
+		const canExtendCurrent = current != null && canExtendMultipleItem(current.state, current.index, context.exec);
+		const canOpenFreshItem = fresh != null;
 		if (!canExtendCurrent && !canOpenFreshItem) return {
 			success: true,
 			next: context,
@@ -1289,7 +1311,7 @@ function multiple(parser, options = {}) {
 		};
 		let added = !canExtendCurrent;
 		let itemIndex = canExtendCurrent ? context.state.length - 1 : context.state.length;
-		const currentItemStateWithAnnotations = canExtendCurrent ? currentItemState : inheritAnnotations(context.state, parser.initialState);
+		const currentItemStateWithAnnotations = canExtendCurrent ? currentItemState : inheritAnnotations(context.state, fresh?.state ?? parser.initialState);
 		let result = await parseAsyncWithUnwrappedFallback(withChildContext(context, itemIndex, currentItemStateWithAnnotations));
 		if (!result.success) {
 			if (result.consumed !== 0) return result;
@@ -1722,19 +1744,10 @@ 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);
-	});
+	defineReachableChildren(resultParser, [parser], (state) => selectItems(state).map((item) => ({
+		parser,
+		state: unwrapInjectedWrapper(item.state)
+	})));
 	return fluent(scopeParser(resultParser, repeatedOptionScope(parser)));
 }
 /**
@@ -1871,8 +1884,10 @@ 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));
+	defineReachableChildren(nonEmptyParser, [parser], (state) => [{
+		parser,
+		state
+	}]);
 	return fluent(scopeParser(nonEmptyParser, combinedOptionScope([parser])));
 }
 const fluentParserMarker = Symbol.for("@optique/core/fluent");

package/dist/primitives.cjs

@@ -1544,6 +1544,15 @@ function command(name, parser, options = {}) {
 	const isAsync = parser.mode === "async";
 	const syncInnerParser = parser;
 	const asyncInnerParser = parser;
+	const getChildState = (state, active) => getCommandParseChildState(state, active[0] === "matched" ? parser.initialState : active[1], parser);
+	const selectChild = (state) => {
+		const active = normalizeCommandState(state);
+		return active == null ? void 0 : {
+			parser,
+			state: getChildState(state, active),
+			continuesCommand: true
+		};
+	};
 	const commandScope = require_short_option.selectableOptionScope(() => /* @__PURE__ */ new Set());
 	const enteredScope = require_short_option.combinedOptionScope([parser], [name]);
 	const result = {
@@ -1625,7 +1634,7 @@ function command(name, parser, options = {}) {
 					consumed: context.buffer.slice(0, 1)
 				};
 			} else if (state[0] === "matched" || state[0] === "parsing") {
-				const innerState = state[0] === "matched" ? getCommandParseChildState(context.state, parser.initialState, parser) : getCommandParseChildState(context.state, state[1], parser);
+				const innerState = getChildState(context.state, state);
 				const wrapState = (parseResult) => {
 					if (parseResult.success) {
 						const mergedExec = require_execution_context.mergeChildExec(context.exec, parseResult.next.exec);
@@ -1794,21 +1803,9 @@ 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
-		};
+	require_passthrough.defineReachableChildren(result, [parser], (state) => {
+		const child = selectChild(state);
+		return child == null ? [] : [child];
 	});
 	return require_modifiers.fluent(require_short_option.scopeParser(result, commandScope.source, (context) => {
 		if (normalizeCommandState(context.state) != null) commandScope.select(context, enteredScope);

package/dist/primitives.js

@@ -9,7 +9,7 @@ import { getWrappedChildParseState, getWrappedChildState, isAnnotationWrappedIni
 import { mergeChildExec, withChildContext, withChildExecPath } from "./execution-context.js";
 import { extractLeadingCommandNames } from "./usage-internals.js";
 import { attachedValuePrefix, combinedOptionScope, fullNameOwnsToken, prefixSuggestion, scopeParser, selectableOptionScope } from "./short-option.js";
-import { defineKnownCompletion, defineOptionMatch, definePassThroughPriority, getOptionMatch, getPassThroughFailure, getPassThroughPriority } from "./internal/passthrough.js";
+import { defineKnownCompletion, definePassThroughPriority, defineReachableChildren, getPassThroughFailure } from "./internal/passthrough.js";
 import { hiddenCommandAliasesKey } from "./internal/command-alias.js";
 import { completeOrExtractPhase2Seed, extractPhase2SeedKey } from "./phase2-seed.js";
 import { extractDependencyMetadata } from "./dependency-metadata.js";
@@ -1544,6 +1544,15 @@ function command(name, parser, options = {}) {
 	const isAsync = parser.mode === "async";
 	const syncInnerParser = parser;
 	const asyncInnerParser = parser;
+	const getChildState = (state, active) => getCommandParseChildState(state, active[0] === "matched" ? parser.initialState : active[1], parser);
+	const selectChild = (state) => {
+		const active = normalizeCommandState(state);
+		return active == null ? void 0 : {
+			parser,
+			state: getChildState(state, active),
+			continuesCommand: true
+		};
+	};
 	const commandScope = selectableOptionScope(() => /* @__PURE__ */ new Set());
 	const enteredScope = combinedOptionScope([parser], [name]);
 	const result = {
@@ -1625,7 +1634,7 @@ function command(name, parser, options = {}) {
 					consumed: context.buffer.slice(0, 1)
 				};
 			} else if (state[0] === "matched" || state[0] === "parsing") {
-				const innerState = state[0] === "matched" ? getCommandParseChildState(context.state, parser.initialState, parser) : getCommandParseChildState(context.state, state[1], parser);
+				const innerState = getChildState(context.state, state);
 				const wrapState = (parseResult) => {
 					if (parseResult.success) {
 						const mergedExec = mergeChildExec(context.exec, parseResult.next.exec);
@@ -1794,21 +1803,9 @@ 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
-		};
+	defineReachableChildren(result, [parser], (state) => {
+		const child = selectChild(state);
+		return child == null ? [] : [child];
 	});
 	return fluent(scopeParser(result, commandScope.source, (context) => {
 		if (normalizeCommandState(context.state) != null) commandScope.select(context, enteredScope);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "1.4.0-dev.2661",
+  "version": "1.4.0-dev.2662",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",
@@ -237,7 +237,7 @@
   },
   "sideEffects": false,
   "devDependencies": {
-    "@optique/env": "1.4.0-dev.2661+04e7de36",
+    "@optique/env": "1.4.0-dev.2662+8add1ff9",
     "@types/node": "^24.0.0",
     "fast-check": "^4.7.0",
     "tsdown": "^0.13.0",