@optique/core 1.0.0-dev.1786 → 1.0.0-dev.1789

package/dist/constructs.js

@@ -1,15 +1,16 @@
-import { annotateFreshArray, annotationKey, getAnnotations, inheritAnnotations, injectAnnotations } from "./annotations.js";
+import { annotateFreshArray, getAnnotations, inheritAnnotations } from "./annotations.js";
 import { message, optionName, text, values } from "./message.js";
-import { createDependencySourceState, dependencyId, isDependencySourceState, isPendingDependencySourceState, isWrappedDependencySource, wrappedDependencySourceMarker } from "./dependency.js";
 import { validateLabel } from "./validate.js";
 import { extractArgumentMetavars, extractCommandNames, extractOptionNames, isDocHidden, mergeHidden } from "./usage.js";
 import { deduplicateDocFragments } from "./doc.js";
 import { dispatchByMode, dispatchIterableByMode } from "./mode-dispatch.js";
+import { createDependencySourceState, dependencyId, isDependencySourceState, isPendingDependencySourceState, isWrappedDependencySource, wrappedDependencySourceMarker } from "./dependency.js";
+import { buildRuntimeNodesFromArray, buildRuntimeNodesFromPairs, collectExplicitSourceValues, collectExplicitSourceValuesAsync, collectSourcesFromState, createDependencyRuntimeContext, fillMissingSourceDefaults, fillMissingSourceDefaultsAsync, resolveStateWithRuntime, resolveStateWithRuntimeAsync } from "./dependency-runtime.js";
 import { completeOrExtractPhase2Seed, extractPhase2Seed, extractPhase2SeedKey, phase2SeedFromValueResult } from "./phase2-seed.js";
 import { DEFAULT_FIND_SIMILAR_OPTIONS, createErrorWithSuggestions, createSuggestionMessage, deduplicateSuggestions, findSimilar } from "./suggestion.js";
 import { collectLeadingCandidates } from "./usage-internals.js";
-import { defineInheritedAnnotationParser, getParserSuggestRuntimeNodes, inheritParentAnnotationsKey, unmatchedNonCliDependencySourceStateMarker } from "./parser.js";
-import { buildRuntimeNodesFromArray, buildRuntimeNodesFromPairs, collectExplicitSourceValues, collectExplicitSourceValuesAsync, collectSourcesFromState, createDependencyRuntimeContext, fillMissingSourceDefaults, fillMissingSourceDefaultsAsync, resolveStateWithRuntime, resolveStateWithRuntimeAsync } from "./dependency-runtime.js";
+import { defineInheritedAnnotationParser, getParserSuggestRuntimeNodes, unmatchedNonCliDependencySourceStateMarker } from "./parser.js";
+import { annotationViewTargets, getWrappedChildParseState, getWrappedChildState, reconcileObjectChildState, unwrapAnnotationView } from "./annotation-state.js";
 
 //#region src/constructs.ts
 /**
@@ -57,7 +58,7 @@ function mergeChildExec(parent, child) {
 function withChildContext(context, segment, state, parser, usage) {
 	const exec = withChildExecPath(context.exec, segment);
 	const dependencyRegistry = context.dependencyRegistry ?? exec?.dependencyRegistry;
-	const childState = parser == null ? state : getParseChildState(context.state, state, parser);
+	const childState = parser == null ? state : getWrappedChildParseState(context.state, state, parser);
 	return {
 		...context,
 		state: childState,
@@ -139,10 +140,6 @@ const fieldParsersKey = Symbol("fieldParsers");
 * to consume results from parsers that still return `DependencySourceState`.
 * @internal
 */
-function unwrapAnnotationView(value) {
-	if (value == null || typeof value !== "object") return value;
-	return annotationViewTargets.get(value) ?? value;
-}
 function containsAnnotationView(value, seen = /* @__PURE__ */ new WeakSet()) {
 	if (value == null || typeof value !== "object") return false;
 	const candidate = value;
@@ -305,61 +302,17 @@ function prepareStateForCompletion(fieldState, parser) {
 */
 function getAnnotatedFieldState(parentState, field, parser) {
 	const sourceState = parentState != null && typeof parentState === "object" && field in parentState ? parentState[field] : parser.initialState;
-	return getAnnotatedChildState(parentState, sourceState, parser);
-}
-const annotationViewTargets = /* @__PURE__ */ new WeakMap();
-function withAnnotationView(state, annotations) {
-	const target = unwrapAnnotationView(state);
-	const view = new Proxy(target, {
-		get(target$1, key) {
-			if (key === annotationKey) return annotations;
-			const value = Reflect.get(target$1, key, target$1);
-			return typeof value === "function" ? value.bind(target$1) : value;
-		},
-		has(target$1, key) {
-			return key === annotationKey || Reflect.has(target$1, key);
-		}
-	});
-	annotationViewTargets.set(view, target);
-	return view;
-}
-function getParseChildState(parentState, childState, parser) {
-	const annotations = getAnnotations(parentState);
-	const shouldInheritAnnotations = Reflect.get(parser, inheritParentAnnotationsKey) === true;
-	if (childState == null) {
-		if (annotations !== void 0 && shouldInheritAnnotations) return injectAnnotations({}, annotations);
-		return childState;
-	}
-	if (annotations === void 0 || typeof childState !== "object" || getAnnotations(childState) === annotations || !shouldInheritAnnotations) return childState;
-	const injectedState = injectAnnotations(childState, annotations);
-	return getAnnotations(injectedState) === annotations ? injectedState : childState;
+	return getWrappedChildState(parentState, sourceState, parser);
 }
 function getObjectParseChildState(parentState, childState, _parser) {
-	const annotations = getAnnotations(parentState);
-	if (annotations === void 0 || childState == null || typeof childState !== "object" || getAnnotations(childState) === annotations) return childState;
-	return inheritAnnotations(parentState, childState);
-}
-function getAnnotatedChildState(parentState, childState, parser) {
-	const annotations = getAnnotations(parentState);
-	const shouldInheritAnnotations = Reflect.get(parser, inheritParentAnnotationsKey) === true;
-	if (childState == null) {
-		if (annotations !== void 0 && shouldInheritAnnotations) return injectAnnotations({}, annotations);
-		return childState;
-	}
-	if (typeof childState !== "object") return childState;
-	if (annotations === void 0 || getAnnotations(childState) === annotations) return childState;
-	if (shouldInheritAnnotations) {
-		const injectedState = injectAnnotations(childState, annotations);
-		if (getAnnotations(injectedState) === annotations) return injectedState;
-	}
-	return withAnnotationView(childState, annotations);
+	return reconcileObjectChildState(parentState, childState);
 }
 function buildSuggestRuntimeNodesFromPairs(pairs, state, parentPath) {
 	const prefix = parentPath ?? [];
 	const nodes = [];
 	for (const [field, parser] of pairs) {
 		const fieldState = Object.hasOwn(state, field) ? state[field] : parser.initialState;
-		nodes.push(...getParserSuggestRuntimeNodes(parser, getAnnotatedChildState(state, fieldState, parser), [...prefix, field]));
+		nodes.push(...getParserSuggestRuntimeNodes(parser, getWrappedChildState(state, fieldState, parser), [...prefix, field]));
 	}
 	return nodes;
 }
@@ -369,7 +322,7 @@ function buildSuggestRuntimeNodesFromArray(parsers, stateArray, parentPath) {
 	for (let i = 0; i < parsers.length; i++) {
 		const parser = parsers[i];
 		const elementState = i < stateArray.length ? stateArray[i] : void 0;
-		nodes.push(...getParserSuggestRuntimeNodes(parser, getAnnotatedChildState(stateArray, elementState, parser), [...prefix, i]));
+		nodes.push(...getParserSuggestRuntimeNodes(parser, getWrappedChildState(stateArray, elementState, parser), [...prefix, i]));
 	}
 	return nodes;
 }
@@ -569,7 +522,7 @@ function normalizeExclusiveState(state) {
 }
 function annotateExclusiveParserResult(parentState, parser, result) {
 	if (!result.success) return result;
-	const annotatedState = getAnnotatedChildState(parentState, result.next.state, parser);
+	const annotatedState = getWrappedChildState(parentState, result.next.state, parser);
 	if (annotatedState === result.next.state) return result;
 	return {
 		...result,
@@ -595,7 +548,7 @@ function createExclusiveComplete(parsers, options, noMatchContext, mode) {
 			const candidate = findExclusiveZeroInputCandidateSync(syncParsers, state, exec);
 			if (candidate != null) {
 				const p = syncParsers[candidate.index];
-				const annotatedState = getAnnotatedChildState(state, candidate.parseResult.next.state, p);
+				const annotatedState = getWrappedChildState(state, candidate.parseResult.next.state, p);
 				return p.complete(annotatedState, withChildExecPath(exec, candidate.index));
 			}
 			return {
@@ -606,7 +559,7 @@ function createExclusiveComplete(parsers, options, noMatchContext, mode) {
 			const candidate = await findExclusiveZeroInputCandidateAsync(parsers, state, exec);
 			if (candidate != null && (parsers[candidate.index].$mode === "sync" || exec?.phase !== "parse" && exec?.phase !== "suggest")) {
 				const p = parsers[candidate.index];
-				const annotatedState = getAnnotatedChildState(state, candidate.parseResult.next.state, p);
+				const annotatedState = getWrappedChildState(state, candidate.parseResult.next.state, p);
 				return await p.complete(annotatedState, withChildExecPath(exec, candidate.index));
 			}
 			return {
@@ -695,7 +648,7 @@ function findExclusiveZeroInputCandidateSync(parsers, state, exec) {
 		if (parser.leadingNames.size > 0 || parser.acceptingAnyToken) continue;
 		const parseResult = parser.parse({
 			...emptyCtx,
-			state: getAnnotatedChildState(state, parser.initialState, parser)
+			state: getWrappedChildState(state, parser.initialState, parser)
 		});
 		if (!parseResult.success || parseResult.provisional) continue;
 		candidateCount++;
@@ -726,7 +679,7 @@ async function findExclusiveZeroInputCandidateAsync(parsers, state, exec) {
 		if (parser.leadingNames.size > 0 || parser.acceptingAnyToken) continue;
 		const parseResult = await parser.parse({
 			...emptyCtx,
-			state: getAnnotatedChildState(state, parser.initialState, parser)
+			state: getWrappedChildState(state, parser.initialState, parser)
 		});
 		if (!parseResult.success || parseResult.provisional) continue;
 		candidateCount++;
@@ -1799,7 +1752,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 		return state;
 	};
 	const inheritedFieldStateCache = /* @__PURE__ */ new WeakMap();
-	const createFieldStateGetter = (parentState, annotateChildState = getAnnotatedChildState) => {
+	const createFieldStateGetter = (parentState, annotateChildState = getWrappedChildState) => {
 		return (field, parser) => {
 			const fieldKey = field;
 			const cache = parentState != null && typeof parentState === "object" ? (() => {
@@ -1857,7 +1810,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 						optionsTerminated: result.next.optionsTerminated,
 						state: {
 							...currentContext.state,
-							[field]: getAnnotatedChildState(currentContext.state, result.next.state, parser)
+							[field]: getWrappedChildState(currentContext.state, result.next.state, parser)
 						},
 						...mergedExec != null ? {
 							trace: mergedExec.trace,
@@ -1887,7 +1840,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 						...currentContext,
 						state: {
 							...currentContext.state,
-							[field]: getAnnotatedChildState(currentContext.state, result.next.state, parser)
+							[field]: getWrappedChildState(currentContext.state, result.next.state, parser)
 						},
 						...mergedExec != null ? {
 							trace: mergedExec.trace,
@@ -1955,7 +1908,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 						optionsTerminated: result.next.optionsTerminated,
 						state: {
 							...currentContext.state,
-							[field]: getAnnotatedChildState(currentContext.state, result.next.state, parser)
+							[field]: getWrappedChildState(currentContext.state, result.next.state, parser)
 						},
 						...mergedExec != null ? {
 							trace: mergedExec.trace,
@@ -1985,7 +1938,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 						...currentContext,
 						state: {
 							...currentContext.state,
-							[field]: getAnnotatedChildState(currentContext.state, result.next.state, parser)
+							[field]: getWrappedChildState(currentContext.state, result.next.state, parser)
 						},
 						...mergedExec != null ? {
 							trace: mergedExec.trace,
@@ -2414,7 +2367,7 @@ function advanceTupleSuggestContextSync(context, parsers) {
 		for (const [parser, index] of remainingParsers) {
 			const result = parser.parse(withChildContext(currentContext, index, stateArray[index], parser));
 			if (result.success && result.consumed.length > 0) {
-				const newStateArray = annotateFreshArray(currentContext.state, stateArray.map((state, idx) => idx === index ? getAnnotatedChildState(currentContext.state, result.next.state, parser) : state));
+				const newStateArray = annotateFreshArray(currentContext.state, stateArray.map((state, idx) => idx === index ? getWrappedChildState(currentContext.state, result.next.state, parser) : state));
 				const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
 				currentContext = {
 					...currentContext,
@@ -2439,7 +2392,7 @@ function advanceTupleSuggestContextSync(context, parsers) {
 		if (!foundMatch) for (const [parser, index] of remainingParsers) {
 			const result = parser.parse(withChildContext(currentContext, index, stateArray[index], parser));
 			if (result.success && result.consumed.length < 1) {
-				const newStateArray = annotateFreshArray(currentContext.state, stateArray.map((state, idx) => idx === index ? getAnnotatedChildState(currentContext.state, result.next.state, parser) : state));
+				const newStateArray = annotateFreshArray(currentContext.state, stateArray.map((state, idx) => idx === index ? getWrappedChildState(currentContext.state, result.next.state, parser) : state));
 				const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
 				currentContext = {
 					...currentContext,
@@ -2480,7 +2433,7 @@ async function advanceTupleSuggestContextAsync(context, parsers) {
 		for (const [parser, index] of remainingParsers) {
 			const result = await parser.parse(withChildContext(currentContext, index, stateArray[index], parser));
 			if (result.success && result.consumed.length > 0) {
-				const newStateArray = annotateFreshArray(currentContext.state, stateArray.map((state, idx) => idx === index ? getAnnotatedChildState(currentContext.state, result.next.state, parser) : state));
+				const newStateArray = annotateFreshArray(currentContext.state, stateArray.map((state, idx) => idx === index ? getWrappedChildState(currentContext.state, result.next.state, parser) : state));
 				const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
 				currentContext = {
 					...currentContext,
@@ -2505,7 +2458,7 @@ async function advanceTupleSuggestContextAsync(context, parsers) {
 		if (!foundMatch) for (const [parser, index] of remainingParsers) {
 			const result = await parser.parse(withChildContext(currentContext, index, stateArray[index], parser));
 			if (result.success && result.consumed.length < 1) {
-				const newStateArray = annotateFreshArray(currentContext.state, stateArray.map((state, idx) => idx === index ? getAnnotatedChildState(currentContext.state, result.next.state, parser) : state));
+				const newStateArray = annotateFreshArray(currentContext.state, stateArray.map((state, idx) => idx === index ? getWrappedChildState(currentContext.state, result.next.state, parser) : state));
 				const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
 				currentContext = {
 					...currentContext,
@@ -2541,7 +2494,7 @@ function markFailedTupleSuggestSources(parsers, stateArray, failedParserIndexes,
 		const parser = parsers[index];
 		if (parser == null) continue;
 		const parserState = stateArray && Array.isArray(stateArray) ? stateArray[index] : parser.initialState;
-		const nodes = getParserSuggestRuntimeNodes(parser, getAnnotatedChildState(stateArray, parserState, parser), [...prefix, index]);
+		const nodes = getParserSuggestRuntimeNodes(parser, getWrappedChildState(stateArray, parserState, parser), [...prefix, index]);
 		if (nodes.length < 1) continue;
 		const failedRuntime = createDependencyRuntimeContext();
 		collectExplicitSourceValues(nodes, failedRuntime);
@@ -2558,7 +2511,7 @@ async function markFailedTupleSuggestSourcesAsync(parsers, stateArray, failedPar
 		const parser = parsers[index];
 		if (parser == null) continue;
 		const parserState = stateArray && Array.isArray(stateArray) ? stateArray[index] : parser.initialState;
-		const nodes = getParserSuggestRuntimeNodes(parser, getAnnotatedChildState(stateArray, parserState, parser), [...prefix, index]);
+		const nodes = getParserSuggestRuntimeNodes(parser, getWrappedChildState(stateArray, parserState, parser), [...prefix, index]);
 		if (nodes.length < 1) continue;
 		const failedRuntime = createDependencyRuntimeContext();
 		await collectExplicitSourceValuesAsync(nodes, failedRuntime);
@@ -2598,7 +2551,7 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 			for (const [parser, index] of remainingParsers) {
 				const result = parser.parse(withChildContext(currentContext, index, stateArray[index], parser));
 				if (result.success && result.consumed.length > 0) {
-					const newStateArray = annotateFreshArray(currentContext.state, stateArray.map((s, idx) => idx === index ? getAnnotatedChildState(currentContext.state, result.next.state, parser) : s));
+					const newStateArray = annotateFreshArray(currentContext.state, stateArray.map((s, idx) => idx === index ? getWrappedChildState(currentContext.state, result.next.state, parser) : s));
 					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
 					currentContext = {
 						...currentContext,
@@ -2619,7 +2572,7 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 			if (!foundMatch) for (const [parser, index] of remainingParsers) {
 				const result = parser.parse(withChildContext(currentContext, index, stateArray[index], parser));
 				if (result.success && result.consumed.length < 1) {
-					const newStateArray = annotateFreshArray(currentContext.state, stateArray.map((s, idx) => idx === index ? getAnnotatedChildState(currentContext.state, result.next.state, parser) : s));
+					const newStateArray = annotateFreshArray(currentContext.state, stateArray.map((s, idx) => idx === index ? getWrappedChildState(currentContext.state, result.next.state, parser) : s));
 					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
 					currentContext = {
 						...currentContext,
@@ -2665,7 +2618,7 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				const resultOrPromise = parser.parse(withChildContext(currentContext, index, stateArray[index], parser));
 				const result = await resultOrPromise;
 				if (result.success && result.consumed.length > 0) {
-					const newStateArray = annotateFreshArray(currentContext.state, stateArray.map((s, idx) => idx === index ? getAnnotatedChildState(currentContext.state, result.next.state, parser) : s));
+					const newStateArray = annotateFreshArray(currentContext.state, stateArray.map((s, idx) => idx === index ? getWrappedChildState(currentContext.state, result.next.state, parser) : s));
 					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
 					currentContext = {
 						...currentContext,
@@ -2687,7 +2640,7 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				const resultOrPromise = parser.parse(withChildContext(currentContext, index, stateArray[index], parser));
 				const result = await resultOrPromise;
 				if (result.success && result.consumed.length < 1) {
-					const newStateArray = annotateFreshArray(currentContext.state, stateArray.map((s, idx) => idx === index ? getAnnotatedChildState(currentContext.state, result.next.state, parser) : s));
+					const newStateArray = annotateFreshArray(currentContext.state, stateArray.map((s, idx) => idx === index ? getWrappedChildState(currentContext.state, result.next.state, parser) : s));
 					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
 					currentContext = {
 						...currentContext,
@@ -3626,7 +3579,7 @@ function buildSuggestRegistry(preParsedContext, parsers) {
 			state: createAnnotatedArrayStateRecord(stateArray)
 		}, buildIndexedParserPairs(parsers), runtime.registry, preParsedContext.exec);
 		const prefix = preParsedContext.exec?.path ?? [];
-		for (let i = 0; i < parsers.length; i++) seedSuggestRuntimeFromFieldParsers(parsers[i], getAnnotatedChildState(stateArray, stateArray[i], parsers[i]), runtime, [...prefix, i]);
+		for (let i = 0; i < parsers.length; i++) seedSuggestRuntimeFromFieldParsers(parsers[i], getWrappedChildState(stateArray, stateArray[i], parsers[i]), runtime, [...prefix, i]);
 	}
 	return {
 		context: {
@@ -3654,7 +3607,7 @@ async function buildSuggestRegistryAsync(preParsedContext, parsers) {
 			state: createAnnotatedArrayStateRecord(stateArray)
 		}, buildIndexedParserPairs(parsers), runtime.registry, preParsedContext.exec);
 		const prefix = preParsedContext.exec?.path ?? [];
-		for (let i = 0; i < parsers.length; i++) await seedSuggestRuntimeFromFieldParsersAsync(parsers[i], getAnnotatedChildState(stateArray, stateArray[i], parsers[i]), runtime, [...prefix, i]);
+		for (let i = 0; i < parsers.length; i++) await seedSuggestRuntimeFromFieldParsersAsync(parsers[i], getWrappedChildState(stateArray, stateArray[i], parsers[i]), runtime, [...prefix, i]);
 	}
 	return {
 		context: {
@@ -3790,7 +3743,7 @@ function tryParseSuggestList(context, stateArray, parsers, matchedParsers, remai
 			const tail = remaining.slice(ri + 1);
 			return resultOrPromise.then((result$1) => {
 				if (result$1.success && result$1.consumed.length > 0) {
-					stateArray[index] = getAnnotatedChildState(context.state, result$1.next.state, parser);
+					stateArray[index] = getWrappedChildState(context.state, result$1.next.state, parser);
 					matchedParsers.add(index);
 					const mergedExec = mergeChildExec(context.exec, result$1.next.exec);
 					return preParseSuggestLoop({
@@ -3817,7 +3770,7 @@ function tryParseSuggestList(context, stateArray, parsers, matchedParsers, remai
 		}
 		const result = resultOrPromise;
 		if (result.success && result.consumed.length > 0) {
-			stateArray[index] = getAnnotatedChildState(context.state, result.next.state, parser);
+			stateArray[index] = getWrappedChildState(context.state, result.next.state, parser);
 			matchedParsers.add(index);
 			const mergedExec = mergeChildExec(context.exec, result.next.exec);
 			return {
@@ -3856,7 +3809,7 @@ function concat(...parsers) {
 			for (const [parser, index] of remainingParsers) {
 				const result = parser.parse(withChildContext(currentContext, index, stateArray[index], parser));
 				if (result.success && result.consumed.length > 0) {
-					const newStateArray = annotateFreshArray(currentContext.state, stateArray.map((s, idx) => idx === index ? getAnnotatedChildState(currentContext.state, result.next.state, parser) : s));
+					const newStateArray = annotateFreshArray(currentContext.state, stateArray.map((s, idx) => idx === index ? getWrappedChildState(currentContext.state, result.next.state, parser) : s));
 					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
 					currentContext = {
 						...currentContext,
@@ -3877,7 +3830,7 @@ function concat(...parsers) {
 			if (!foundMatch) for (const [parser, index] of remainingParsers) {
 				const result = parser.parse(withChildContext(currentContext, index, stateArray[index], parser));
 				if (result.success && result.consumed.length < 1) {
-					const newStateArray = annotateFreshArray(currentContext.state, stateArray.map((s, idx) => idx === index ? getAnnotatedChildState(currentContext.state, result.next.state, parser) : s));
+					const newStateArray = annotateFreshArray(currentContext.state, stateArray.map((s, idx) => idx === index ? getWrappedChildState(currentContext.state, result.next.state, parser) : s));
 					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
 					currentContext = {
 						...currentContext,
@@ -3922,7 +3875,7 @@ function concat(...parsers) {
 			for (const [parser, index] of remainingParsers) {
 				const result = await parser.parse(withChildContext(currentContext, index, stateArray[index], parser));
 				if (result.success && result.consumed.length > 0) {
-					const newStateArray = annotateFreshArray(currentContext.state, stateArray.map((s, idx) => idx === index ? getAnnotatedChildState(currentContext.state, result.next.state, parser) : s));
+					const newStateArray = annotateFreshArray(currentContext.state, stateArray.map((s, idx) => idx === index ? getWrappedChildState(currentContext.state, result.next.state, parser) : s));
 					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
 					currentContext = {
 						...currentContext,
@@ -3943,7 +3896,7 @@ function concat(...parsers) {
 			if (!foundMatch) for (const [parser, index] of remainingParsers) {
 				const result = await parser.parse(withChildContext(currentContext, index, stateArray[index], parser));
 				if (result.success && result.consumed.length < 1) {
-					const newStateArray = annotateFreshArray(currentContext.state, stateArray.map((s, idx) => idx === index ? getAnnotatedChildState(currentContext.state, result.next.state, parser) : s));
+					const newStateArray = annotateFreshArray(currentContext.state, stateArray.map((s, idx) => idx === index ? getWrappedChildState(currentContext.state, result.next.state, parser) : s));
 					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
 					currentContext = {
 						...currentContext,
@@ -4426,7 +4379,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 						...branchResult.next,
 						state: {
 							...state,
-							branchState: getAnnotatedChildState(state, branchResult.next.state, branchParser)
+							branchState: getWrappedChildState(state, branchResult.next.state, branchParser)
 						},
 						...mergedExec != null ? {
 							exec: mergedExec,
@@ -4440,7 +4393,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		}
 		const discriminatorResult = syncDiscriminator.parse({ ...withChildContext(context, "_discriminator", state.discriminatorState, syncDiscriminator) });
 		if (discriminatorResult.success) {
-			const annotatedDiscriminatorState = getAnnotatedChildState(state, discriminatorResult.next.state, syncDiscriminator);
+			const annotatedDiscriminatorState = getWrappedChildState(state, discriminatorResult.next.state, syncDiscriminator);
 			const completionResult = syncDiscriminator.complete(annotatedDiscriminatorState, withChildExecPath(context.exec, "_discriminator"));
 			if (completionResult.success) {
 				const value = completionResult.value;
@@ -4473,7 +4426,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 										kind: "branch",
 										key: value
 									},
-									branchState: getAnnotatedChildState(state, branchParseResult.next.state, branchParser)
+									branchState: getWrappedChildState(state, branchParseResult.next.state, branchParser)
 								},
 								...mergedExec != null ? {
 									exec: mergedExec,
@@ -4494,7 +4447,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 									kind: "branch",
 									key: value
 								},
-								branchState: getAnnotatedChildState(state, branchParser.initialState, branchParser)
+								branchState: getWrappedChildState(state, branchParser.initialState, branchParser)
 							},
 							...discriminatorExec != null ? {
 								exec: discriminatorExec,
@@ -4526,7 +4479,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 						state: {
 							...state,
 							...commitDefault ? { selectedBranch: { kind: "default" } } : {},
-							branchState: getAnnotatedChildState(state, defaultResult.next.state, syncDefaultBranch)
+							branchState: getWrappedChildState(state, defaultResult.next.state, syncDefaultBranch)
 						},
 						...mergedExec != null ? {
 							exec: mergedExec,
@@ -4558,7 +4511,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 						...branchResult.next,
 						state: {
 							...state,
-							branchState: getAnnotatedChildState(state, branchResult.next.state, branchParser)
+							branchState: getWrappedChildState(state, branchResult.next.state, branchParser)
 						},
 						...mergedExec != null ? {
 							exec: mergedExec,
@@ -4620,7 +4573,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				if (speculativeHit != null && !ambiguous) {
 					const { key, bp, result: branchResult } = speculativeHit;
 					if (branchResult.success) {
-						const annotatedDiscriminatorState$2 = getAnnotatedChildState(state, discriminatorResult.next.state, discriminator);
+						const annotatedDiscriminatorState$2 = getWrappedChildState(state, discriminatorResult.next.state, discriminator);
 						const mergedExec = mergeChildExec(discriminatorExec, branchResult.next.exec);
 						return {
 							success: true,
@@ -4634,7 +4587,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 										kind: "branch",
 										key
 									},
-									branchState: getAnnotatedChildState(state, branchResult.next.state, bp),
+									branchState: getWrappedChildState(state, branchResult.next.state, bp),
 									speculative: true
 								},
 								...mergedExec != null ? {
@@ -4659,7 +4612,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 								state: {
 									...state,
 									selectedBranch: { kind: "default" },
-									branchState: getAnnotatedChildState(state, defaultResult.next.state, defaultBranch)
+									branchState: getWrappedChildState(state, defaultResult.next.state, defaultBranch)
 								},
 								...defaultExec != null ? {
 									exec: defaultExec,
@@ -4670,10 +4623,10 @@ function conditional(discriminator, branches, defaultBranch, options) {
 						};
 					}
 					if (!defaultResult.success && defaultResult.consumed > 0) return defaultResult;
-					if (defaultResult.success && defaultResult.consumed.length === 0 && speculationContext.buffer.length === 0) deferredBranchState = getAnnotatedChildState(state, defaultResult.next.state, defaultBranch);
+					if (defaultResult.success && defaultResult.consumed.length === 0 && speculationContext.buffer.length === 0) deferredBranchState = getWrappedChildState(state, defaultResult.next.state, defaultBranch);
 				}
 				if (speculativeError != null && !ambiguous && !provisionalAmbiguous) return speculativeError;
-				const annotatedDiscriminatorState$1 = getAnnotatedChildState(state, discriminatorResult.next.state, discriminator);
+				const annotatedDiscriminatorState$1 = getWrappedChildState(state, discriminatorResult.next.state, discriminator);
 				return {
 					success: true,
 					provisional: true,
@@ -4688,7 +4641,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 					consumed: []
 				};
 			}
-			const annotatedDiscriminatorState = getAnnotatedChildState(state, discriminatorResult.next.state, discriminator);
+			const annotatedDiscriminatorState = getWrappedChildState(state, discriminatorResult.next.state, discriminator);
 			const completionResult = await discriminator.complete(annotatedDiscriminatorState, withChildExecPath(context.exec, "_discriminator"));
 			if (completionResult.success) {
 				const value = completionResult.value;
@@ -4720,7 +4673,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 										kind: "branch",
 										key: value
 									},
-									branchState: getAnnotatedChildState(state, branchParseResult.next.state, branchParser)
+									branchState: getWrappedChildState(state, branchParseResult.next.state, branchParser)
 								},
 								...mergedExec != null ? {
 									exec: mergedExec,
@@ -4741,7 +4694,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 									kind: "branch",
 									key: value
 								},
-								branchState: getAnnotatedChildState(state, branchParser.initialState, branchParser)
+								branchState: getWrappedChildState(state, branchParser.initialState, branchParser)
 							},
 							...discriminatorExec != null ? {
 								exec: discriminatorExec,
@@ -4773,7 +4726,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 						state: {
 							...state,
 							...commitDefault ? { selectedBranch: { kind: "default" } } : {},
-							branchState: getAnnotatedChildState(state, defaultResult.next.state, defaultBranch)
+							branchState: getWrappedChildState(state, defaultResult.next.state, defaultBranch)
 						},
 						...mergedExec != null ? {
 							exec: mergedExec,
@@ -4797,7 +4750,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		const syncBranches = branches;
 		if (state.selectedBranch === void 0) {
 			{
-				const annotatedDiscriminatorStateForDeferred = getAnnotatedChildState(state, state.discriminatorState, syncDiscriminator);
+				const annotatedDiscriminatorStateForDeferred = getWrappedChildState(state, state.discriminatorState, syncDiscriminator);
 				const deferredDiscriminatorResult = unwrapCompleteResult(syncDiscriminator.complete(annotatedDiscriminatorStateForDeferred, withChildExecPath(exec, "_discriminator")));
 				if (deferredDiscriminatorResult.success) {
 					const deferredValue = deferredDiscriminatorResult.value;
@@ -4811,13 +4764,13 @@ function conditional(discriminator, branches, defaultBranch, options) {
 							exec: branchExec,
 							dependencyRegistry: exec?.dependencyRegistry
 						};
-						const annotatedInitial = getAnnotatedChildState(state, deferredBranch.initialState, deferredBranch);
+						const annotatedInitial = getWrappedChildState(state, deferredBranch.initialState, deferredBranch);
 						const replayResult = deferredBranch.parse({
 							...emptyCtx,
 							state: annotatedInitial
 						});
 						const branchState = replayResult.success ? replayResult.next.state : annotatedInitial;
-						const annotatedBranchState = getAnnotatedChildState(state, branchState, deferredBranch);
+						const annotatedBranchState = getWrappedChildState(state, branchState, deferredBranch);
 						const branchResult$1 = unwrapCompleteResult(deferredBranch.complete(annotatedBranchState, branchExec));
 						if (branchResult$1.success) return {
 							success: true,
@@ -4840,7 +4793,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				} else if (syncDefaultBranch === void 0) return deferredDiscriminatorResult;
 			}
 			if (syncDefaultBranch !== void 0) {
-				const branchState = getAnnotatedChildState(state, state.branchState ?? syncDefaultBranch.initialState, syncDefaultBranch);
+				const branchState = getWrappedChildState(state, state.branchState ?? syncDefaultBranch.initialState, syncDefaultBranch);
 				const defaultResult = unwrapCompleteResult(syncDefaultBranch.complete(branchState, withChildExecPath(exec, "_branch")));
 				if (!defaultResult.success) return defaultResult;
 				return {
@@ -4858,15 +4811,15 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			};
 		}
 		const branchParser = state.selectedBranch.kind === "default" ? syncDefaultBranch : syncBranches[state.selectedBranch.key];
-		const annotatedDiscriminatorState = getAnnotatedChildState(state, state.discriminatorState, syncDiscriminator);
+		const annotatedDiscriminatorState = getWrappedChildState(state, state.discriminatorState, syncDiscriminator);
 		const combinedState = {
 			_discriminator: annotatedDiscriminatorState,
-			_branch: getAnnotatedChildState(state, state.branchState, branchParser)
+			_branch: getWrappedChildState(state, state.branchState, branchParser)
 		};
 		const runtime = createDependencyRuntimeContext(exec?.dependencyRegistry?.clone());
 		collectExplicitSourceValues(buildRuntimeNodesFromPairs([["_discriminator", discriminator], ["_branch", branchParser]], combinedState, exec?.path), runtime);
 		collectSourcesFromState(combinedState, runtime);
-		const resolvedBranchState = getAnnotatedChildState(state, resolveStateWithRuntime(state.branchState, runtime), branchParser);
+		const resolvedBranchState = getWrappedChildState(state, resolveStateWithRuntime(state.branchState, runtime), branchParser);
 		const completionExec = {
 			...exec ?? {
 				usage: branchParser.usage,
@@ -4917,7 +4870,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		};
 		if (state.selectedBranch === void 0) {
 			if (exec?.phase !== "parse" && exec?.phase !== "suggest") {
-				const annotatedDiscriminatorStateForDeferred = getAnnotatedChildState(state, state.discriminatorState, discriminator);
+				const annotatedDiscriminatorStateForDeferred = getWrappedChildState(state, state.discriminatorState, discriminator);
 				const deferredDiscriminatorResult = unwrapCompleteResult(await discriminator.complete(annotatedDiscriminatorStateForDeferred, withChildExecPath(exec, "_discriminator")));
 				if (deferredDiscriminatorResult.success) {
 					const deferredValue = deferredDiscriminatorResult.value;
@@ -4931,13 +4884,13 @@ function conditional(discriminator, branches, defaultBranch, options) {
 							exec: branchExec,
 							dependencyRegistry: exec?.dependencyRegistry
 						};
-						const annotatedInitial = getAnnotatedChildState(state, deferredBranch.initialState, deferredBranch);
+						const annotatedInitial = getWrappedChildState(state, deferredBranch.initialState, deferredBranch);
 						const replayResult = await deferredBranch.parse({
 							...emptyCtx,
 							state: annotatedInitial
 						});
 						const branchState = replayResult.success ? replayResult.next.state : annotatedInitial;
-						const annotatedBranchState = getAnnotatedChildState(state, branchState, deferredBranch);
+						const annotatedBranchState = getWrappedChildState(state, branchState, deferredBranch);
 						const branchResult$1 = unwrapCompleteResult(await deferredBranch.complete(annotatedBranchState, branchExec));
 						if (branchResult$1.success) return {
 							success: true,
@@ -4964,7 +4917,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				value: [void 0, void 0]
 			};
 			if (defaultBranch !== void 0) {
-				const branchState = getAnnotatedChildState(state, state.branchState ?? defaultBranch.initialState, defaultBranch);
+				const branchState = getWrappedChildState(state, state.branchState ?? defaultBranch.initialState, defaultBranch);
 				const defaultResult = unwrapCompleteResult(await defaultBranch.complete(branchState, withChildExecPath(exec, "_branch")));
 				if (!defaultResult.success) return defaultResult;
 				return {
@@ -4982,10 +4935,10 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			};
 		}
 		const branchParser = state.selectedBranch.kind === "default" ? defaultBranch : branches[state.selectedBranch.key];
-		const annotatedDiscriminatorState = getAnnotatedChildState(state, state.discriminatorState, discriminator);
+		const annotatedDiscriminatorState = getWrappedChildState(state, state.discriminatorState, discriminator);
 		const combinedState = {
 			_discriminator: annotatedDiscriminatorState,
-			_branch: getAnnotatedChildState(state, state.branchState, branchParser)
+			_branch: getWrappedChildState(state, state.branchState, branchParser)
 		};
 		const runtime = createDependencyRuntimeContext(exec?.dependencyRegistry?.clone());
 		await collectExplicitSourceValuesAsync(buildRuntimeNodesFromPairs([["_discriminator", discriminator], ["_branch", branchParser]], combinedState, exec?.path), runtime);
@@ -5031,7 +4984,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				error: options?.errors?.branchMismatch ? options.errors.branchMismatch(resolvedKey, speculativeKey) : message`Branch mismatch: tokens for ${speculativeKey} were consumed, but the discriminator resolved to ${resolvedKey}.`
 			};
 		}
-		const resolvedBranchState = getAnnotatedChildState(state, await resolveStateWithRuntimeAsync(state.branchState, runtime), branchParser);
+		const resolvedBranchState = getWrappedChildState(state, await resolveStateWithRuntimeAsync(state.branchState, runtime), branchParser);
 		const branchResult = unwrapCompleteResult(await branchParser.complete(resolvedBranchState, withChildExecPath(completionExec, "_branch")));
 		if (!branchResult.success) {
 			if (discriminatorValue !== void 0 && options?.errors?.branchError) return {
@@ -5051,12 +5004,12 @@ function conditional(discriminator, branches, defaultBranch, options) {
 	};
 	const getConditionalBranchSeedSync = (currentState, branchParser, branchState, exec) => {
 		const branchExec = withChildExecPath(exec, "_branch");
-		const annotatedState = getAnnotatedChildState(currentState, branchState, branchParser);
+		const annotatedState = getWrappedChildState(currentState, branchState, branchParser);
 		return extractOrCompletePhase2SeedSync(branchParser, annotatedState, branchExec);
 	};
 	const getConditionalBranchSeedAsync = async (currentState, branchParser, branchState, exec) => {
 		const branchExec = withChildExecPath(exec, "_branch");
-		const annotatedState = getAnnotatedChildState(currentState, branchState, branchParser);
+		const annotatedState = getWrappedChildState(currentState, branchState, branchParser);
 		return await extractOrCompletePhase2SeedAsync(branchParser, annotatedState, branchExec);
 	};
 	function* suggestSync(context, prefix) {
@@ -5066,10 +5019,10 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		const syncDefaultBranch = defaultBranch;
 		if (state.selectedBranch === void 0) {
 			const runtime = createDependencyRuntimeContext(context.dependencyRegistry?.clone());
-			const annotatedDiscriminatorState = getAnnotatedChildState(state, state.discriminatorState, syncDiscriminator);
+			const annotatedDiscriminatorState = getWrappedChildState(state, state.discriminatorState, syncDiscriminator);
 			const defaultCombinedState = {
 				_discriminator: annotatedDiscriminatorState,
-				_branch: syncDefaultBranch == null ? state.branchState : getAnnotatedChildState(state, state.branchState, syncDefaultBranch)
+				_branch: syncDefaultBranch == null ? state.branchState : getWrappedChildState(state, state.branchState, syncDefaultBranch)
 			};
 			collectExplicitSourceValues(buildRuntimeNodesFromPairs(syncDefaultBranch == null ? [["_discriminator", discriminator]] : [["_discriminator", discriminator], ["_branch", syncDefaultBranch]], defaultCombinedState, context.exec?.path), runtime);
 			collectSourcesFromState(defaultCombinedState, runtime);
@@ -5083,7 +5036,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				} } : {}
 			};
 			yield* syncDiscriminator.suggest(withChildContext(suggestContext, "_discriminator", state.discriminatorState, syncDiscriminator), prefix);
-			const annotatedDiscState = getAnnotatedChildState(state, state.discriminatorState, syncDiscriminator);
+			const annotatedDiscState = getWrappedChildState(state, state.discriminatorState, syncDiscriminator);
 			const discComplete = syncDiscriminator.complete(annotatedDiscState, withChildExecPath(suggestContext.exec ? {
 				...suggestContext.exec,
 				phase: "suggest"
@@ -5095,10 +5048,10 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		} else {
 			const branchParser = state.selectedBranch.kind === "default" ? syncDefaultBranch : syncBranches[state.selectedBranch.key];
 			const runtime = createDependencyRuntimeContext(context.dependencyRegistry?.clone());
-			const annotatedDiscriminatorState = getAnnotatedChildState(state, state.discriminatorState, syncDiscriminator);
+			const annotatedDiscriminatorState = getWrappedChildState(state, state.discriminatorState, syncDiscriminator);
 			const combinedState = {
 				_discriminator: annotatedDiscriminatorState,
-				_branch: getAnnotatedChildState(state, state.branchState, branchParser)
+				_branch: getWrappedChildState(state, state.branchState, branchParser)
 			};
 			collectExplicitSourceValues(buildRuntimeNodesFromPairs([["_discriminator", discriminator], ["_branch", branchParser]], combinedState, context.exec?.path), runtime);
 			collectSourcesFromState(combinedState, runtime);
@@ -5118,10 +5071,10 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		const state = context.state ?? initialState;
 		if (state.selectedBranch === void 0) {
 			const runtime = createDependencyRuntimeContext(context.dependencyRegistry?.clone());
-			const annotatedDiscriminatorState = getAnnotatedChildState(state, state.discriminatorState, discriminator);
+			const annotatedDiscriminatorState = getWrappedChildState(state, state.discriminatorState, discriminator);
 			const defaultCombinedState = {
 				_discriminator: annotatedDiscriminatorState,
-				_branch: defaultBranch == null ? state.branchState : getAnnotatedChildState(state, state.branchState, defaultBranch)
+				_branch: defaultBranch == null ? state.branchState : getWrappedChildState(state, state.branchState, defaultBranch)
 			};
 			await collectExplicitSourceValuesAsync(buildRuntimeNodesFromPairs(defaultBranch == null ? [["_discriminator", discriminator]] : [["_discriminator", discriminator], ["_branch", defaultBranch]], defaultCombinedState, context.exec?.path), runtime);
 			collectSourcesFromState(defaultCombinedState, runtime);
@@ -5137,7 +5090,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			yield* discriminator.suggest(withChildContext(suggestContext, "_discriminator", state.discriminatorState, discriminator), prefix);
 			let discResolved = false;
 			if (discriminator.$mode === "sync") {
-				const annotatedDiscState = getAnnotatedChildState(state, state.discriminatorState, discriminator);
+				const annotatedDiscState = getWrappedChildState(state, state.discriminatorState, discriminator);
 				const discComplete = discriminator.complete(annotatedDiscState, withChildExecPath(suggestContext.exec ? {
 					...suggestContext.exec,
 					phase: "suggest"
@@ -5154,10 +5107,10 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		} else {
 			const branchParser = state.selectedBranch.kind === "default" ? defaultBranch : branches[state.selectedBranch.key];
 			const runtime = createDependencyRuntimeContext(context.dependencyRegistry?.clone());
-			const annotatedDiscriminatorState = getAnnotatedChildState(state, state.discriminatorState, discriminator);
+			const annotatedDiscriminatorState = getWrappedChildState(state, state.discriminatorState, discriminator);
 			const combinedState = {
 				_discriminator: annotatedDiscriminatorState,
-				_branch: getAnnotatedChildState(state, state.branchState, branchParser)
+				_branch: getWrappedChildState(state, state.branchState, branchParser)
 			};
 			await collectExplicitSourceValuesAsync(buildRuntimeNodesFromPairs([["_discriminator", discriminator], ["_branch", branchParser]], combinedState, context.exec?.path), runtime);
 			collectSourcesFromState(combinedState, runtime);
@@ -5197,7 +5150,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				const syncBranches = branches;
 				const discriminatorExec = withChildExecPath(exec, "_discriminator");
 				if (state.selectedBranch === void 0) {
-					const discriminatorSeed$1 = completeOrExtractPhase2Seed(syncDiscriminator, getAnnotatedChildState(state, state.discriminatorState, syncDiscriminator), discriminatorExec);
+					const discriminatorSeed$1 = completeOrExtractPhase2Seed(syncDiscriminator, getWrappedChildState(state, state.discriminatorState, syncDiscriminator), discriminatorExec);
 					if (typeof discriminatorSeed$1?.value === "string") {
 						const branchParser$1 = syncBranches[discriminatorSeed$1.value];
 						if (branchParser$1 != null) {
@@ -5213,12 +5166,12 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				}
 				const branchParser = state.selectedBranch.kind === "default" ? syncDefaultBranch : syncBranches[state.selectedBranch.key];
 				const branchSeed = getConditionalBranchSeedSync(state, branchParser, state.branchState ?? branchParser.initialState, exec);
-				const discriminatorSeed = state.selectedBranch.kind === "default" ? null : state.discriminatorValue != null && state.discriminatorValue === state.selectedBranch.key ? { value: state.discriminatorValue } : completeOrExtractPhase2Seed(syncDiscriminator, getAnnotatedChildState(state, state.discriminatorState, syncDiscriminator), discriminatorExec) ?? { value: state.selectedBranch.key };
+				const discriminatorSeed = state.selectedBranch.kind === "default" ? null : state.discriminatorValue != null && state.discriminatorValue === state.selectedBranch.key ? { value: state.discriminatorValue } : completeOrExtractPhase2Seed(syncDiscriminator, getWrappedChildState(state, state.discriminatorState, syncDiscriminator), discriminatorExec) ?? { value: state.selectedBranch.key };
 				return combineTuplePhase2Seeds(discriminatorSeed, branchSeed);
 			}, async () => {
 				const discriminatorExec = withChildExecPath(exec, "_discriminator");
 				if (state.selectedBranch === void 0) {
-					const discriminatorSeed$1 = await completeOrExtractPhase2Seed(discriminator, getAnnotatedChildState(state, state.discriminatorState, discriminator), discriminatorExec);
+					const discriminatorSeed$1 = await completeOrExtractPhase2Seed(discriminator, getWrappedChildState(state, state.discriminatorState, discriminator), discriminatorExec);
 					if (typeof discriminatorSeed$1?.value === "string") {
 						const branchParser$1 = branches[discriminatorSeed$1.value];
 						if (branchParser$1 != null) {
@@ -5234,7 +5187,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				}
 				const branchParser = state.selectedBranch.kind === "default" ? defaultBranch : branches[state.selectedBranch.key];
 				const branchSeed = await getConditionalBranchSeedAsync(state, branchParser, state.branchState ?? branchParser.initialState, exec);
-				const discriminatorSeed = state.selectedBranch.kind === "default" ? null : state.discriminatorValue != null && state.discriminatorValue === state.selectedBranch.key ? { value: state.discriminatorValue } : await completeOrExtractPhase2Seed(discriminator, getAnnotatedChildState(state, state.discriminatorState, discriminator), discriminatorExec) ?? { value: state.selectedBranch.key };
+				const discriminatorSeed = state.selectedBranch.kind === "default" ? null : state.discriminatorValue != null && state.discriminatorValue === state.selectedBranch.key ? { value: state.discriminatorValue } : await completeOrExtractPhase2Seed(discriminator, getWrappedChildState(state, state.discriminatorState, discriminator), discriminatorExec) ?? { value: state.selectedBranch.key };
 				return combineTuplePhase2Seeds(discriminatorSeed, branchSeed);
 			});
 		},