@optique/core 1.4.0-dev.2614 → 1.4.0-dev.2616

package/dist/constructs.cjs

@@ -8,10 +8,10 @@ const require_internal_dependency = require('./internal/dependency.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_execution_context = require('./execution-context.cjs');
 const require_usage_internals = require('./usage-internals.cjs');
 const require_short_option = require('./short-option.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');
 const require_modifiers = require('./modifiers.cjs');
 const require_suggestion = require('./suggestion.cjs');

package/dist/constructs.js

@@ -8,10 +8,10 @@ import { createDependencySourceState, dependencyId, isDependencySourceState, isP
 import { buildRuntimeNodesFromArray, buildRuntimeNodesFromPairs, collectExplicitSourceValues, collectExplicitSourceValuesAsync, collectSourcesFromState, completeEffectfulSourcesAsync, createDependencyRuntimeContext, effectfulSchedulingNodesKey, exclusiveSourceScopeKey, extractRawInputFromState, fillMissingSourceDefaults, fillMissingSourceDefaultsAsync, forkRuntimeForCommittedSubtree, getDefaultDependencySnapshot, guaranteedStaticSourceIdsKey, hasInactiveCompletion, isMatchedState, recordSourceScope, releaseUncollectedSourceValues, replaceCachedBarrierFailure, resolveDerivedSourceValues, resolveDerivedSourceValuesAsync, resolveStateWithRuntime, resolveStateWithRuntimeAsync, serializeSchedulingPath, sourceCollectionExpansionKey, staticSourceScopeKey } from "./dependency-runtime.js";
 import { defineInheritedAnnotationParser, defineParseLanes, getOwnParseLanes, getParserSuggestRuntimeNodes, unmatchedNonCliDependencySourceStateMarker } from "./internal/parser.js";
 import { annotationViewTargets, getWrappedChildParseState, getWrappedChildState, reconcileObjectChildState, unwrapAnnotationView } from "./annotation-state.js";
+import { mergeChildExec, withChildContext, withChildExecPath } from "./execution-context.js";
 import { collectLeadingCandidates } from "./usage-internals.js";
 import { adoptOptionScope, combinedOptionScope, conditionalOptionScope, forkOptionScope, restoreOptionScope, scopeParser, selectableOptionScope, withOptionScope, withParserOptionScope } from "./short-option.js";
 import { allowDuplicateLeadingCommandNamesKey } from "./internal/command-alias.js";
-import { mergeChildExec, withChildContext, withChildExecPath } from "./execution-context.js";
 import { completeOrExtractPhase2Seed, extractPhase2Seed, extractPhase2SeedKey, phase2SeedFromValueResult } from "./phase2-seed.js";
 import { fluent } from "./modifiers.js";
 import { DEFAULT_FIND_SIMILAR_OPTIONS, createErrorWithSuggestions, createSuggestionMessage, deduplicateSuggestions, expandCommandAliasSuggestions, findSimilar } from "./suggestion.js";

package/dist/extension.cjs

@@ -2,6 +2,7 @@ const require_internal_annotations = require('./internal/annotations.cjs');
 const require_mode_dispatch = require('./internal/mode-dispatch.cjs');
 const require_internal_parser = require('./internal/parser.cjs');
 const require_annotation_state = require('./annotation-state.cjs');
+const require_short_option = require('./short-option.cjs');
 const require_phase2_seed = require('./phase2-seed.cjs');
 
 //#region src/extension.ts
@@ -28,6 +29,19 @@ function defineTraits(parser, traits) {
 	});
 }
 /**
+* Preserves a wrapped parser's reachable option names in the same parse path.
+* Call this when a transparent wrapper constructs a fresh parser object instead
+* of copying the inner parser with object spread.
+*
+* @param parser The wrapper parser to annotate.
+* @param innerParser The parser that handles the wrapper's CLI input.
+* @throws {TypeError} If scope metadata cannot be defined on the wrapper.
+* @since 1.4.0
+*/
+function inheritOptionScope$1(parser, innerParser) {
+	require_short_option.inheritOptionScope(parser, innerParser);
+}
+/**
 * Reads the stable extension traits defined on a parser object.
 *
 * @param parser The parser object to inspect.
@@ -80,6 +94,7 @@ exports.dispatchByMode = require_mode_dispatch.dispatchByMode;
 exports.extractPhase2SeedKey = require_phase2_seed.extractPhase2SeedKey;
 exports.getTraits = getTraits;
 exports.inheritAnnotations = require_internal_annotations.inheritAnnotations;
+exports.inheritOptionScope = inheritOptionScope$1;
 exports.injectAnnotations = require_internal_annotations.injectAnnotations;
 exports.isInjectedAnnotationState = require_internal_annotations.isInjectedAnnotationState;
 exports.mapModeValue = require_mode_dispatch.mapModeValue;

package/dist/extension.d.cts

@@ -60,6 +60,17 @@ type ParserSourceMetadata<M extends Mode = Mode, TValue = unknown, TState = unkn
  * @since 1.0.0
  */
 declare function defineTraits(parser: object, traits: ParserTraits): void;
+/**
+ * Preserves a wrapped parser's reachable option names in the same parse path.
+ * Call this when a transparent wrapper constructs a fresh parser object instead
+ * of copying the inner parser with object spread.
+ *
+ * @param parser The wrapper parser to annotate.
+ * @param innerParser The parser that handles the wrapper's CLI input.
+ * @throws {TypeError} If scope metadata cannot be defined on the wrapper.
+ * @since 1.4.0
+ */
+declare function inheritOptionScope(parser: object, innerParser: Parser<Mode, unknown, unknown>): void;
 /**
  * Reads the stable extension traits defined on a parser object.
  *
@@ -95,4 +106,4 @@ declare function delegateSuggestNodes<TInnerState>(innerParser: Parser<Mode, unk
  */
 declare function mapSourceMetadata<M extends Mode, TValue, TState>(parser: Pick<Parser<M, TValue, TState>, "dependencyMetadata">, mapSource: (source: ParserSourceMetadata<M, TValue, TState>) => ParserSourceMetadata<M, TValue, TState>): Parser<M, TValue, TState>["dependencyMetadata"] | undefined;
 //#endregion
-export { ParserSourceMetadata, ParserTraits, SuggestNode, defineTraits, delegateSuggestNodes, dispatchByMode, extractPhase2SeedKey, getTraits, inheritAnnotations, injectAnnotations, isInjectedAnnotationState, mapModeValue, mapSourceMetadata, unwrapInjectedAnnotationState, withAnnotationView, wrapForMode };
+export { ParserSourceMetadata, ParserTraits, SuggestNode, defineTraits, delegateSuggestNodes, dispatchByMode, extractPhase2SeedKey, getTraits, inheritAnnotations, inheritOptionScope, injectAnnotations, isInjectedAnnotationState, mapModeValue, mapSourceMetadata, unwrapInjectedAnnotationState, withAnnotationView, wrapForMode };

package/dist/extension.d.ts

@@ -60,6 +60,17 @@ type ParserSourceMetadata<M extends Mode = Mode, TValue = unknown, TState = unkn
  * @since 1.0.0
  */
 declare function defineTraits(parser: object, traits: ParserTraits): void;
+/**
+ * Preserves a wrapped parser's reachable option names in the same parse path.
+ * Call this when a transparent wrapper constructs a fresh parser object instead
+ * of copying the inner parser with object spread.
+ *
+ * @param parser The wrapper parser to annotate.
+ * @param innerParser The parser that handles the wrapper's CLI input.
+ * @throws {TypeError} If scope metadata cannot be defined on the wrapper.
+ * @since 1.4.0
+ */
+declare function inheritOptionScope(parser: object, innerParser: Parser<Mode, unknown, unknown>): void;
 /**
  * Reads the stable extension traits defined on a parser object.
  *
@@ -95,4 +106,4 @@ declare function delegateSuggestNodes<TInnerState>(innerParser: Parser<Mode, unk
  */
 declare function mapSourceMetadata<M extends Mode, TValue, TState>(parser: Pick<Parser<M, TValue, TState>, "dependencyMetadata">, mapSource: (source: ParserSourceMetadata<M, TValue, TState>) => ParserSourceMetadata<M, TValue, TState>): Parser<M, TValue, TState>["dependencyMetadata"] | undefined;
 //#endregion
-export { ParserSourceMetadata, ParserTraits, SuggestNode, defineTraits, delegateSuggestNodes, dispatchByMode, extractPhase2SeedKey, getTraits, inheritAnnotations, injectAnnotations, isInjectedAnnotationState, mapModeValue, mapSourceMetadata, unwrapInjectedAnnotationState, withAnnotationView, wrapForMode };
+export { ParserSourceMetadata, ParserTraits, SuggestNode, defineTraits, delegateSuggestNodes, dispatchByMode, extractPhase2SeedKey, getTraits, inheritAnnotations, inheritOptionScope, injectAnnotations, isInjectedAnnotationState, mapModeValue, mapSourceMetadata, unwrapInjectedAnnotationState, withAnnotationView, wrapForMode };

package/dist/extension.js

@@ -2,6 +2,7 @@ import { inheritAnnotations, injectAnnotations, isInjectedAnnotationState, unwra
 import { dispatchByMode, mapModeValue, wrapForMode } from "./internal/mode-dispatch.js";
 import { annotationWrapperRequiresSourceBindingKey, composeWrappedSourceMetadata, defineInheritedAnnotationParser, getDelegatingSuggestRuntimeNodes, inheritParentAnnotationsKey, unmatchedNonCliDependencySourceStateMarker } from "./internal/parser.js";
 import { withAnnotationView } from "./annotation-state.js";
+import { inheritOptionScope } from "./short-option.js";
 import { extractPhase2SeedKey } from "./phase2-seed.js";
 
 //#region src/extension.ts
@@ -28,6 +29,19 @@ function defineTraits(parser, traits) {
 	});
 }
 /**
+* Preserves a wrapped parser's reachable option names in the same parse path.
+* Call this when a transparent wrapper constructs a fresh parser object instead
+* of copying the inner parser with object spread.
+*
+* @param parser The wrapper parser to annotate.
+* @param innerParser The parser that handles the wrapper's CLI input.
+* @throws {TypeError} If scope metadata cannot be defined on the wrapper.
+* @since 1.4.0
+*/
+function inheritOptionScope$1(parser, innerParser) {
+	inheritOptionScope(parser, innerParser);
+}
+/**
 * Reads the stable extension traits defined on a parser object.
 *
 * @param parser The parser object to inspect.
@@ -74,4 +88,4 @@ function mapSourceMetadata(parser, mapSource) {
 }
 
 //#endregion
-export { defineTraits, delegateSuggestNodes, dispatchByMode, extractPhase2SeedKey, getTraits, inheritAnnotations, injectAnnotations, isInjectedAnnotationState, mapModeValue, mapSourceMetadata, unwrapInjectedAnnotationState, withAnnotationView, wrapForMode };
+export { defineTraits, delegateSuggestNodes, dispatchByMode, extractPhase2SeedKey, getTraits, inheritAnnotations, inheritOptionScope$1 as inheritOptionScope, injectAnnotations, isInjectedAnnotationState, mapModeValue, mapSourceMetadata, unwrapInjectedAnnotationState, withAnnotationView, wrapForMode };

package/dist/modifiers.cjs

@@ -4,8 +4,8 @@ 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_short_option = require('./short-option.cjs');
 const require_execution_context = require('./execution-context.cjs');
+const require_short_option = require('./short-option.cjs');
 const require_phase2_seed = require('./phase2-seed.cjs');
 const require_dependency_metadata = require('./dependency-metadata.cjs');
 

package/dist/modifiers.js

@@ -4,8 +4,8 @@ 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 { combinedOptionScope, repeatedOptionScope, scopeParser } from "./short-option.js";
 import { mergeChildExec, withChildContext, withChildExecPath } from "./execution-context.js";
+import { combinedOptionScope, repeatedOptionScope, scopeParser } from "./short-option.js";
 import { completeOrExtractPhase2Seed, extractPhase2Seed, extractPhase2SeedKey, phase2SeedFromValueResult } from "./phase2-seed.js";
 import { composeDependencyMetadata } from "./dependency-metadata.js";
 

package/dist/primitives.cjs

@@ -6,10 +6,10 @@ 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_execution_context = require('./execution-context.cjs');
 const require_usage_internals = require('./usage-internals.cjs');
 const require_short_option = require('./short-option.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');
 const require_dependency_metadata = require('./dependency-metadata.cjs');
 const require_modifiers = require('./modifiers.cjs');

package/dist/primitives.js

@@ -6,10 +6,10 @@ 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 { 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 { hiddenCommandAliasesKey } from "./internal/command-alias.js";
-import { mergeChildExec, withChildContext, withChildExecPath } from "./execution-context.js";
 import { completeOrExtractPhase2Seed, extractPhase2SeedKey } from "./phase2-seed.js";
 import { extractDependencyMetadata } from "./dependency-metadata.js";
 import { fluent } from "./modifiers.js";

package/dist/short-option.cjs

@@ -1,6 +1,7 @@
 const require_internal_annotations = require('./internal/annotations.cjs');
 const require_usage = require('./usage.cjs');
 const require_mode_dispatch = require('./internal/mode-dispatch.cjs');
+const require_execution_context = require('./execution-context.cjs');
 const require_usage_internals = require('./usage-internals.cjs');
 
 //#region src/short-option.ts
@@ -8,13 +9,22 @@ const optionScopeKey = Symbol("optionScope");
 const optionPathKey = Symbol("optionScopePath");
 const scopeSourceKey = Symbol("optionScopeSource");
 const scopeLocations = /* @__PURE__ */ new WeakMap();
-const boundScopes = /* @__PURE__ */ new WeakMap();
-function bindScope(source, path) {
+const scopeBindings = /* @__PURE__ */ new WeakMap();
+function getScopeBindings(selections) {
+	let bindings = scopeBindings.get(selections);
+	if (bindings == null) {
+		bindings = /* @__PURE__ */ new WeakMap();
+		scopeBindings.set(selections, bindings);
+	}
+	return bindings;
+}
+function bindScope(source, path, selections) {
+	const boundScopes = getScopeBindings(selections);
 	let node = boundScopes.get(source);
 	if (node == null) {
 		node = {
 			children: /* @__PURE__ */ new Map(),
-			bound: (selections, arities, context) => source(selections, arities, context, [])
+			bound: (selections$1, arities, context) => source(selections$1, arities, context, [])
 		};
 		boundScopes.set(source, node);
 		scopeLocations.set(node.bound, []);
@@ -25,7 +35,7 @@ function bindScope(source, path) {
 			const occurrence = path.slice(0, i + 1);
 			child = {
 				children: /* @__PURE__ */ new Map(),
-				bound: (selections, arities, context) => source(selections, arities, context, occurrence)
+				bound: (selections$1, arities, context) => source(selections$1, arities, context, occurrence)
 			};
 			node.children.set(path[i], child);
 			scopeLocations.set(child.bound, occurrence);
@@ -58,6 +68,14 @@ function parserScope(parser) {
 	}
 	return source;
 }
+/** Preserves dynamic option ownership through a transparent wrapper. @internal */
+function inheritOptionScope(target, inner) {
+	Object.defineProperty(target, scopeSourceKey, {
+		value: parserScope(inner),
+		enumerable: true,
+		configurable: true
+	});
+}
 /** Combines declarations without flattening conditional ownership. @internal */
 function combinedOptionScope(parsers, segments) {
 	return (selections, arities, context, path = []) => new Set(parsers.flatMap((parser, index) => [...parserScope(parser)(selections, arities, context, segments == null ? path : [...path, segments[index]])]));
@@ -80,18 +98,23 @@ function repeatedOptionScope(parser) {
 }
 /** Tracks declarations after a command or discriminator routes input. @internal */
 function selectableOptionScope(initial) {
-	const source = (selections, arities, context, path = []) => (selections.get(bindScope(source, path)) ?? initial)(selections, arities, context, path);
+	const source = (selections, arities, context, path = []) => (selections.get(bindScope(source, path, selections)) ?? initial)(selections, arities, context, path);
 	return {
 		source,
 		select(context, selected) {
-			context[optionScopeKey]?.selections.set(bindScope(source, scopePath(context)), selected);
+			const selections = context[optionScopeKey]?.selections;
+			if (selections == null) return;
+			selections.set(bindScope(source, scopePath(context), selections), selected);
 		}
 	};
 }
 /** Keeps selected conditional names distinct from sibling declarations. @internal */
 function conditionalOptionScope(discriminator, fallback, candidates = []) {
 	const scope = selectableOptionScope((selections, arities, context, path) => {
-		const canSkip = discriminator.canSkip?.(context == null ? discriminator.initialState : require_internal_annotations.inheritAnnotations(context.state, discriminator.initialState), context?.exec) === true;
+		const canSkip = discriminator.canSkip?.(context == null ? discriminator.initialState : require_internal_annotations.inheritAnnotations(context.state, discriminator.initialState), context?.exec == null ? void 0 : require_execution_context.withChildExecPath({
+			...context.exec,
+			path: path ?? scopePath(context)
+		}, "_discriminator")) === true;
 		return combinedOptionScope([
 			discriminator,
 			...canSkip ? candidates : [],
@@ -130,23 +153,27 @@ function withOptionScope(context, names) {
 /** Adds a parser's owned declarations, retaining modifier metadata. @internal */
 function withParserOptionScope(context, parser, segment) {
 	const inherited = context[optionScopeKey];
+	const selections = inherited?.selections ?? /* @__PURE__ */ new Map();
 	return {
 		...context,
 		[optionScopeKey]: {
 			names: inherited?.names ?? /* @__PURE__ */ new Set(),
-			sources: new Set([...inherited?.sources ?? [], bindScope(parserScope(parser), segment == null ? scopePath(context) : [...scopePath(context), segment])]),
-			selections: inherited?.selections ?? /* @__PURE__ */ new Map()
+			sources: new Set([...inherited?.sources ?? [], bindScope(parserScope(parser), segment == null ? scopePath(context) : [...scopePath(context), segment], selections)]),
+			selections
 		}
 	};
 }
 /** Isolates route selections while probing a competing branch. @internal */
 function forkOptionScope(context) {
 	const scoped = context[optionScopeKey];
-	return scoped == null ? context : {
+	if (scoped == null) return context;
+	const selections = new Map(scoped.selections);
+	scopeBindings.set(selections, getScopeBindings(scoped.selections));
+	return {
 		...context,
 		[optionScopeKey]: {
 			...scoped,
-			selections: new Map(scoped.selections)
+			selections
 		}
 	};
 }
@@ -273,6 +300,7 @@ exports.combinedOptionScope = combinedOptionScope;
 exports.conditionalOptionScope = conditionalOptionScope;
 exports.forkOptionScope = forkOptionScope;
 exports.fullNameOwnsToken = fullNameOwnsToken;
+exports.inheritOptionScope = inheritOptionScope;
 exports.prefixSuggestion = prefixSuggestion;
 exports.repeatedOptionScope = repeatedOptionScope;
 exports.restoreOptionScope = restoreOptionScope;

package/dist/short-option.js

@@ -1,6 +1,7 @@
 import { inheritAnnotations } from "./internal/annotations.js";
 import { extractOptionNames } from "./usage.js";
 import { mapModeValue } from "./internal/mode-dispatch.js";
+import { withChildExecPath } from "./execution-context.js";
 import { collectOptionNamesAtCurrentCommandDepth } from "./usage-internals.js";
 
 //#region src/short-option.ts
@@ -8,13 +9,22 @@ const optionScopeKey = Symbol("optionScope");
 const optionPathKey = Symbol("optionScopePath");
 const scopeSourceKey = Symbol("optionScopeSource");
 const scopeLocations = /* @__PURE__ */ new WeakMap();
-const boundScopes = /* @__PURE__ */ new WeakMap();
-function bindScope(source, path) {
+const scopeBindings = /* @__PURE__ */ new WeakMap();
+function getScopeBindings(selections) {
+	let bindings = scopeBindings.get(selections);
+	if (bindings == null) {
+		bindings = /* @__PURE__ */ new WeakMap();
+		scopeBindings.set(selections, bindings);
+	}
+	return bindings;
+}
+function bindScope(source, path, selections) {
+	const boundScopes = getScopeBindings(selections);
 	let node = boundScopes.get(source);
 	if (node == null) {
 		node = {
 			children: /* @__PURE__ */ new Map(),
-			bound: (selections, arities, context) => source(selections, arities, context, [])
+			bound: (selections$1, arities, context) => source(selections$1, arities, context, [])
 		};
 		boundScopes.set(source, node);
 		scopeLocations.set(node.bound, []);
@@ -25,7 +35,7 @@ function bindScope(source, path) {
 			const occurrence = path.slice(0, i + 1);
 			child = {
 				children: /* @__PURE__ */ new Map(),
-				bound: (selections, arities, context) => source(selections, arities, context, occurrence)
+				bound: (selections$1, arities, context) => source(selections$1, arities, context, occurrence)
 			};
 			node.children.set(path[i], child);
 			scopeLocations.set(child.bound, occurrence);
@@ -58,6 +68,14 @@ function parserScope(parser) {
 	}
 	return source;
 }
+/** Preserves dynamic option ownership through a transparent wrapper. @internal */
+function inheritOptionScope(target, inner) {
+	Object.defineProperty(target, scopeSourceKey, {
+		value: parserScope(inner),
+		enumerable: true,
+		configurable: true
+	});
+}
 /** Combines declarations without flattening conditional ownership. @internal */
 function combinedOptionScope(parsers, segments) {
 	return (selections, arities, context, path = []) => new Set(parsers.flatMap((parser, index) => [...parserScope(parser)(selections, arities, context, segments == null ? path : [...path, segments[index]])]));
@@ -80,18 +98,23 @@ function repeatedOptionScope(parser) {
 }
 /** Tracks declarations after a command or discriminator routes input. @internal */
 function selectableOptionScope(initial) {
-	const source = (selections, arities, context, path = []) => (selections.get(bindScope(source, path)) ?? initial)(selections, arities, context, path);
+	const source = (selections, arities, context, path = []) => (selections.get(bindScope(source, path, selections)) ?? initial)(selections, arities, context, path);
 	return {
 		source,
 		select(context, selected) {
-			context[optionScopeKey]?.selections.set(bindScope(source, scopePath(context)), selected);
+			const selections = context[optionScopeKey]?.selections;
+			if (selections == null) return;
+			selections.set(bindScope(source, scopePath(context), selections), selected);
 		}
 	};
 }
 /** Keeps selected conditional names distinct from sibling declarations. @internal */
 function conditionalOptionScope(discriminator, fallback, candidates = []) {
 	const scope = selectableOptionScope((selections, arities, context, path) => {
-		const canSkip = discriminator.canSkip?.(context == null ? discriminator.initialState : inheritAnnotations(context.state, discriminator.initialState), context?.exec) === true;
+		const canSkip = discriminator.canSkip?.(context == null ? discriminator.initialState : inheritAnnotations(context.state, discriminator.initialState), context?.exec == null ? void 0 : withChildExecPath({
+			...context.exec,
+			path: path ?? scopePath(context)
+		}, "_discriminator")) === true;
 		return combinedOptionScope([
 			discriminator,
 			...canSkip ? candidates : [],
@@ -130,23 +153,27 @@ function withOptionScope(context, names) {
 /** Adds a parser's owned declarations, retaining modifier metadata. @internal */
 function withParserOptionScope(context, parser, segment) {
 	const inherited = context[optionScopeKey];
+	const selections = inherited?.selections ?? /* @__PURE__ */ new Map();
 	return {
 		...context,
 		[optionScopeKey]: {
 			names: inherited?.names ?? /* @__PURE__ */ new Set(),
-			sources: new Set([...inherited?.sources ?? [], bindScope(parserScope(parser), segment == null ? scopePath(context) : [...scopePath(context), segment])]),
-			selections: inherited?.selections ?? /* @__PURE__ */ new Map()
+			sources: new Set([...inherited?.sources ?? [], bindScope(parserScope(parser), segment == null ? scopePath(context) : [...scopePath(context), segment], selections)]),
+			selections
 		}
 	};
 }
 /** Isolates route selections while probing a competing branch. @internal */
 function forkOptionScope(context) {
 	const scoped = context[optionScopeKey];
-	return scoped == null ? context : {
+	if (scoped == null) return context;
+	const selections = new Map(scoped.selections);
+	scopeBindings.set(selections, getScopeBindings(scoped.selections));
+	return {
 		...context,
 		[optionScopeKey]: {
 			...scoped,
-			selections: new Map(scoped.selections)
+			selections
 		}
 	};
 }
@@ -267,4 +294,4 @@ function prefixSuggestion(head, suggestion) {
 }
 
 //#endregion
-export { adoptOptionScope, attachedValuePrefix, combinedOptionScope, conditionalOptionScope, forkOptionScope, fullNameOwnsToken, prefixSuggestion, repeatedOptionScope, restoreOptionScope, scopeParser, selectableOptionScope, withOptionScope, withOptionScopeChild, withParserOptionScope };
+export { adoptOptionScope, attachedValuePrefix, combinedOptionScope, conditionalOptionScope, forkOptionScope, fullNameOwnsToken, inheritOptionScope, prefixSuggestion, repeatedOptionScope, restoreOptionScope, scopeParser, selectableOptionScope, withOptionScope, withOptionScopeChild, withParserOptionScope };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "1.4.0-dev.2614",
+  "version": "1.4.0-dev.2616",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",
@@ -237,7 +237,7 @@
   },
   "sideEffects": false,
   "devDependencies": {
-    "@optique/env": "1.4.0-dev.2614+5915742e",
+    "@optique/env": "1.4.0-dev.2616+37c516eb",
     "@types/node": "^24.0.0",
     "fast-check": "^4.7.0",
     "tsdown": "^0.13.0",