@optique/core 1.0.0-dev.1903 → 1.0.0-dev.1972

package/dist/constructs.cjs

@@ -1,16 +1,17 @@
-const require_annotations = require('./annotations.cjs');
+const require_annotations = require('./internal/annotations.cjs');
 const require_message = require('./message.cjs');
 const require_validate = require('./validate.cjs');
 const require_usage = require('./usage.cjs');
 const require_doc = require('./doc.cjs');
-const require_mode_dispatch = require('./mode-dispatch.cjs');
-const require_dependency = require('./dependency.cjs');
+const require_mode_dispatch = require('./internal/mode-dispatch.cjs');
+const require_dependency = require('./internal/dependency.cjs');
 const require_dependency_runtime = require('./dependency-runtime.cjs');
+const require_parser = require('./internal/parser.cjs');
+const require_annotation_state = require('./annotation-state.cjs');
+const require_execution_context = require('./execution-context.cjs');
 const require_phase2_seed = require('./phase2-seed.cjs');
 const require_suggestion = require('./suggestion.cjs');
 const require_usage_internals = require('./usage-internals.cjs');
-const require_parser = require('./parser.cjs');
-const require_annotation_state = require('./annotation-state.cjs');
 
 //#region src/constructs.ts
 /**
@@ -21,13 +22,6 @@ const EMPTY_LEADING_NAMES = /* @__PURE__ */ new Set();
 function isNonCliBoundSourceState(state, parser) {
 	return parser[require_parser.unmatchedNonCliDependencySourceStateMarker] === true && state != null && typeof state === "object" && Object.hasOwn(state, "hasCliValue") && state.hasCliValue === false;
 }
-function withChildExecPath(exec, segment) {
-	if (exec == null) return void 0;
-	return {
-		...exec,
-		path: [...exec.path ?? [], segment]
-	};
-}
 function withDependencyRuntimeExec(usage, exec, runtime) {
 	if (exec == null) return {
 		usage,
@@ -43,35 +37,9 @@ function withDependencyRuntimeExec(usage, exec, runtime) {
 		dependencyRegistry: runtime.registry
 	};
 }
-function mergeChildExec(parent, child) {
-	if (parent == null) return child;
-	if (child == null) return parent;
-	return {
-		...parent,
-		trace: child.trace ?? parent.trace,
-		dependencyRuntime: child.dependencyRuntime ?? parent.dependencyRuntime,
-		dependencyRegistry: child.dependencyRegistry ?? parent.dependencyRegistry,
-		commandPath: child.commandPath ?? parent.commandPath,
-		preCompletedByParser: child.preCompletedByParser ?? parent.preCompletedByParser,
-		excludedSourceFields: child.excludedSourceFields ?? parent.excludedSourceFields
-	};
-}
-function withChildContext(context, segment, state, parser, usage) {
-	const exec = withChildExecPath(context.exec, segment);
-	const dependencyRegistry = context.dependencyRegistry ?? exec?.dependencyRegistry;
+function withChildContext$1(context, segment, state, parser, usage) {
 	const childState = parser == null ? state : require_annotation_state.getWrappedChildParseState(context.state, state, parser);
-	return {
-		...context,
-		state: childState,
-		...usage != null ? { usage } : {},
-		...exec != null ? {
-			exec: dependencyRegistry === exec.dependencyRegistry ? exec : {
-				...exec,
-				dependencyRegistry
-			},
-			dependencyRegistry
-		} : {}
-	};
+	return require_execution_context.withChildContext(context, segment, childState, usage);
 }
 function isUnmatchedDependencyState(state, parser) {
 	if (state === void 0) return true;
@@ -451,7 +419,7 @@ function assertParsers(parsers, callerName) {
 	for (let i = 0; i < parsers.length; i++) {
 		const p = parsers[i];
 		const r = p;
-		if (p == null || typeof p !== "object" && typeof p !== "function" || !(r.$mode === "sync" || r.$mode === "async") || !Array.isArray(r.usage) || typeof r.priority !== "number" || Number.isNaN(r.priority) || !("initialState" in p) || typeof r.parse !== "function" || typeof r.complete !== "function" || typeof r.suggest !== "function" || typeof r.getDocFragments !== "function") throw new TypeError(`${callerName} argument at index ${i} is not a valid Parser.`);
+		if (p == null || typeof p !== "object" && typeof p !== "function" || !(r.mode === "sync" || r.mode === "async") || !Array.isArray(r.usage) || typeof r.priority !== "number" || Number.isNaN(r.priority) || !("initialState" in p) || typeof r.parse !== "function" || typeof r.complete !== "function" || typeof r.suggest !== "function" || typeof r.getDocFragments !== "function") throw new TypeError(`${callerName} argument at index ${i} is not a valid Parser.`);
 	}
 }
 /**
@@ -560,7 +528,7 @@ function createExclusiveComplete(parsers, options, noMatchContext, mode) {
 			if (candidate != null) {
 				const p = syncParsers[candidate.index];
 				const annotatedState = require_annotation_state.getWrappedChildState(state, candidate.parseResult.next.state, p);
-				return p.complete(annotatedState, withChildExecPath(exec, candidate.index));
+				return p.complete(annotatedState, require_execution_context.withChildExecPath(exec, candidate.index));
 			}
 			return {
 				success: false,
@@ -568,10 +536,10 @@ function createExclusiveComplete(parsers, options, noMatchContext, mode) {
 			};
 		}, async () => {
 			const candidate = await findExclusiveZeroInputCandidateAsync(parsers, state, exec);
-			if (candidate != null && (parsers[candidate.index].$mode === "sync" || exec?.phase !== "parse" && exec?.phase !== "suggest")) {
+			if (candidate != null && (parsers[candidate.index].mode === "sync" || exec?.phase !== "parse" && exec?.phase !== "suggest")) {
 				const p = parsers[candidate.index];
 				const annotatedState = require_annotation_state.getWrappedChildState(state, candidate.parseResult.next.state, p);
-				return await p.complete(annotatedState, withChildExecPath(exec, candidate.index));
+				return await p.complete(annotatedState, require_execution_context.withChildExecPath(exec, candidate.index));
 			}
 			return {
 				success: false,
@@ -583,8 +551,8 @@ function createExclusiveComplete(parsers, options, noMatchContext, mode) {
 			success: false,
 			error: result.error
 		};
-		return require_mode_dispatch.dispatchByMode(mode, () => syncParsers[i].complete(result.next.state, withChildExecPath(exec, i)), async () => {
-			const completeResult = await parsers[i].complete(result.next.state, withChildExecPath(exec, i));
+		return require_mode_dispatch.dispatchByMode(mode, () => syncParsers[i].complete(result.next.state, require_execution_context.withChildExecPath(exec, i)), async () => {
+			const completeResult = await parsers[i].complete(result.next.state, require_execution_context.withChildExecPath(exec, i));
 			return completeResult;
 		});
 	};
@@ -601,14 +569,14 @@ function createExclusiveSuggest(parsers, mode) {
 			const activeState = normalizeExclusiveState(context.state);
 			if (activeState == null || activeState[1].success && activeState[1].consumed.length === 0) for (let i = 0; i < syncParsers.length; i++) {
 				const parser = syncParsers[i];
-				const parserSuggestions = parser.suggest(withChildContext(context, i, parser.initialState, parser), prefix);
+				const parserSuggestions = parser.suggest(withChildContext$1(context, i, parser.initialState, parser), prefix);
 				suggestions.push(...parserSuggestions);
 			}
 			else {
 				const [index, parserResult] = activeState;
 				if (parserResult.success) {
 					const parser = syncParsers[index];
-					const parserSuggestions = parser.suggest(withChildContext(context, index, parserResult.next.state, parser), prefix);
+					const parserSuggestions = parser.suggest(withChildContext$1(context, index, parserResult.next.state, parser), prefix);
 					suggestions.push(...parserSuggestions);
 				}
 			}
@@ -618,16 +586,16 @@ function createExclusiveSuggest(parsers, mode) {
 			const activeState = normalizeExclusiveState(context.state);
 			if (activeState == null || activeState[1].success && activeState[1].consumed.length === 0) for (let i = 0; i < parsers.length; i++) {
 				const parser = parsers[i];
-				const parserSuggestions = parser.suggest(withChildContext(context, i, parser.initialState, parser), prefix);
-				if (parser.$mode === "async") for await (const s of parserSuggestions) suggestions.push(s);
+				const parserSuggestions = parser.suggest(withChildContext$1(context, i, parser.initialState, parser), prefix);
+				if (parser.mode === "async") for await (const s of parserSuggestions) suggestions.push(s);
 				else suggestions.push(...parserSuggestions);
 			}
 			else {
 				const [index, parserResult] = activeState;
 				if (parserResult.success) {
 					const parser = parsers[index];
-					const parserSuggestions = parser.suggest(withChildContext(context, index, parserResult.next.state, parser), prefix);
-					if (parser.$mode === "async") for await (const s of parserSuggestions) suggestions.push(s);
+					const parserSuggestions = parser.suggest(withChildContext$1(context, index, parserResult.next.state, parser), prefix);
+					if (parser.mode === "async") for await (const s of parserSuggestions) suggestions.push(s);
 					else suggestions.push(...parserSuggestions);
 				}
 			}
@@ -710,15 +678,15 @@ function extractExclusivePhase2Seed(parsers, state, exec, mode) {
 	if (activeState == null) return require_mode_dispatch.dispatchByMode(mode, () => {
 		const candidate = findExclusiveZeroInputCandidateSync(parsers, state, exec);
 		if (candidate == null) return null;
-		return extractOrCompletePhase2SeedSync(parsers[candidate.index], candidate.parseResult.next.state, withChildExecPath(exec, candidate.index));
+		return extractOrCompletePhase2SeedSync(parsers[candidate.index], candidate.parseResult.next.state, require_execution_context.withChildExecPath(exec, candidate.index));
 	}, async () => {
 		const candidate = await findExclusiveZeroInputCandidateAsync(parsers, state, exec);
 		if (candidate == null) return null;
-		return await extractOrCompletePhase2SeedAsync(parsers[candidate.index], candidate.parseResult.next.state, withChildExecPath(exec, candidate.index));
+		return await extractOrCompletePhase2SeedAsync(parsers[candidate.index], candidate.parseResult.next.state, require_execution_context.withChildExecPath(exec, candidate.index));
 	});
 	if (!activeState[1].success) return require_mode_dispatch.dispatchByMode(mode, () => null, () => Promise.resolve(null));
 	const [index, parserResult] = activeState;
-	return require_phase2_seed.completeOrExtractPhase2Seed(parsers[index], parserResult.next.state, withChildExecPath(exec, index));
+	return require_phase2_seed.completeOrExtractPhase2Seed(parsers[index], parserResult.next.state, require_execution_context.withChildExecPath(exec, index));
 }
 /**
 * Gets the no-match error, either from custom options or default.
@@ -765,7 +733,7 @@ function or(...args) {
 	if (parsers.length < 1) throw new TypeError("or() requires at least one parser argument.");
 	assertParsers(parsers, "or()");
 	const noMatchContext = analyzeNoMatchContext(parsers);
-	const combinedMode = parsers.some((p) => p.$mode === "async") ? "async" : "sync";
+	const combinedMode = parsers.some((p) => p.mode === "async") ? "async" : "sync";
 	const syncParsers = parsers;
 	const getInitialError = (context) => ({
 		consumed: 0,
@@ -786,7 +754,7 @@ function or(...args) {
 		let provisionalConsuming = null;
 		let provisionalAmbiguous = false;
 		for (const [parser, i] of orderedParsers) {
-			const result = parser.parse(withChildContext(context, i, activeState == null || activeState[0] !== i || !activeState[1].success ? parser.initialState : activeState[1].next.state, parser));
+			const result = parser.parse(withChildContext$1(context, i, activeState == null || activeState[0] !== i || !activeState[1].success ? parser.initialState : activeState[1].next.state, parser));
 			if (result.success && result.consumed.length > 0) {
 				if (result.provisional) {
 					const activeBranchLocked = activeState != null && activeState[1].success && activeState[1].consumed.length > 0;
@@ -812,7 +780,7 @@ function or(...args) {
 				}
 				if (activeState?.[0] !== i && activeState?.[1].success) {
 					if (activeState[1].consumed.length === 0) {
-						const mergedExec$2 = mergeChildExec(context.exec, result.next.exec);
+						const mergedExec$2 = require_execution_context.mergeChildExec(context.exec, result.next.exec);
 						return {
 							success: true,
 							next: {
@@ -830,7 +798,7 @@ function or(...args) {
 					}
 					const previouslyConsumed = activeState[1].consumed;
 					const checkResult = parser.parse({
-						...withChildContext(context, i, parser.initialState, parser),
+						...withChildContext$1(context, i, parser.initialState, parser),
 						buffer: previouslyConsumed
 					});
 					const canConsumeShared = checkResult.success && checkResult.consumed.length === previouslyConsumed.length && checkResult.consumed.every((c, idx) => c === previouslyConsumed[idx]);
@@ -839,8 +807,8 @@ function or(...args) {
 						consumed: context.buffer.length - result.next.buffer.length,
 						error: require_message.message`${require_message.values(activeState[1].consumed)} and ${require_message.values(result.consumed)} cannot be used together.`
 					};
-					const replayExec = mergeChildExec(context.exec, checkResult.next.exec);
-					const replayedResult = parser.parse(withChildContext({
+					const replayExec = require_execution_context.mergeChildExec(context.exec, checkResult.next.exec);
+					const replayedResult = parser.parse(withChildContext$1({
 						...context,
 						...replayExec != null ? {
 							exec: replayExec,
@@ -848,7 +816,7 @@ function or(...args) {
 						} : {}
 					}, i, checkResult.next.state, parser));
 					if (!replayedResult.success) return replayedResult;
-					const mergedExec$1 = mergeChildExec(replayExec, replayedResult.next.exec);
+					const mergedExec$1 = require_execution_context.mergeChildExec(replayExec, replayedResult.next.exec);
 					return {
 						success: true,
 						next: {
@@ -867,7 +835,7 @@ function or(...args) {
 						consumed: replayedResult.consumed
 					};
 				}
-				const mergedExec = mergeChildExec(context.exec, result.next.exec);
+				const mergedExec = require_execution_context.mergeChildExec(context.exec, result.next.exec);
 				return {
 					success: true,
 					next: {
@@ -892,7 +860,7 @@ function or(...args) {
 			} else if (!result.success && error.consumed < result.consumed) error = result;
 		}
 		if (zeroConsumedBranch !== null && zeroConsumedCount === 1 && error.consumed === 0 && context.buffer.length === 0) {
-			const mergedExec = mergeChildExec(context.exec, zeroConsumedBranch.result.next.exec);
+			const mergedExec = require_execution_context.mergeChildExec(context.exec, zeroConsumedBranch.result.next.exec);
 			return {
 				success: true,
 				...zeroConsumedBranch.result.provisional ? { provisional: true } : {},
@@ -910,7 +878,7 @@ function or(...args) {
 		if (provisionalConsuming !== null) {
 			const activeIsLockedDifferent = activeState != null && activeState[1].success && activeState[1].consumed.length > 0 && activeState[0] !== provisionalConsuming.index;
 			if (!activeIsLockedDifferent) {
-				const mergedExec = mergeChildExec(context.exec, provisionalConsuming.result.next.exec);
+				const mergedExec = require_execution_context.mergeChildExec(context.exec, provisionalConsuming.result.next.exec);
 				return {
 					success: true,
 					provisional: true,
@@ -930,13 +898,13 @@ function or(...args) {
 			if (activeState != null && activeState[1].success) {
 				const previouslyConsumed = activeState[1].consumed;
 				const checkResult = provisionalConsuming.parser.parse({
-					...withChildContext(context, provisionalConsuming.index, provisionalConsuming.parser.initialState, provisionalConsuming.parser),
+					...withChildContext$1(context, provisionalConsuming.index, provisionalConsuming.parser.initialState, provisionalConsuming.parser),
 					buffer: previouslyConsumed
 				});
 				const canConsumeShared = checkResult.success && checkResult.consumed.length === previouslyConsumed.length && checkResult.consumed.every((c, idx) => c === previouslyConsumed[idx]);
 				if (canConsumeShared && checkResult.success) {
-					const replayExec = mergeChildExec(context.exec, checkResult.next.exec);
-					const replayedResult = provisionalConsuming.parser.parse(withChildContext({
+					const replayExec = require_execution_context.mergeChildExec(context.exec, checkResult.next.exec);
+					const replayedResult = provisionalConsuming.parser.parse(withChildContext$1({
 						...context,
 						...replayExec != null ? {
 							exec: replayExec,
@@ -944,7 +912,7 @@ function or(...args) {
 						} : {}
 					}, provisionalConsuming.index, checkResult.next.state, provisionalConsuming.parser));
 					if (!replayedResult.success) return replayedResult;
-					const mergedExec = mergeChildExec(replayExec, replayedResult.next.exec);
+					const mergedExec = require_execution_context.mergeChildExec(replayExec, replayedResult.next.exec);
 					return {
 						success: true,
 						provisional: true,
@@ -982,7 +950,7 @@ function or(...args) {
 		let provisionalConsuming = null;
 		let provisionalAmbiguous = false;
 		for (const [parser, i] of orderedParsers) {
-			const resultOrPromise = parser.parse(withChildContext(context, i, activeState == null || activeState[0] !== i || !activeState[1].success ? parser.initialState : activeState[1].next.state, parser));
+			const resultOrPromise = parser.parse(withChildContext$1(context, i, activeState == null || activeState[0] !== i || !activeState[1].success ? parser.initialState : activeState[1].next.state, parser));
 			const result = await resultOrPromise;
 			if (result.success && result.consumed.length > 0) {
 				if (result.provisional) {
@@ -1009,7 +977,7 @@ function or(...args) {
 				}
 				if (activeState?.[0] !== i && activeState?.[1].success) {
 					if (activeState[1].consumed.length === 0) {
-						const mergedExec$2 = mergeChildExec(context.exec, result.next.exec);
+						const mergedExec$2 = require_execution_context.mergeChildExec(context.exec, result.next.exec);
 						return {
 							success: true,
 							next: {
@@ -1027,7 +995,7 @@ function or(...args) {
 					}
 					const previouslyConsumed = activeState[1].consumed;
 					const checkResultOrPromise = parser.parse({
-						...withChildContext(context, i, parser.initialState, parser),
+						...withChildContext$1(context, i, parser.initialState, parser),
 						buffer: previouslyConsumed
 					});
 					const checkResult = await checkResultOrPromise;
@@ -1037,8 +1005,8 @@ function or(...args) {
 						consumed: context.buffer.length - result.next.buffer.length,
 						error: require_message.message`${require_message.values(activeState[1].consumed)} and ${require_message.values(result.consumed)} cannot be used together.`
 					};
-					const replayExec = mergeChildExec(context.exec, checkResult.next.exec);
-					const replayedResultOrPromise = parser.parse(withChildContext({
+					const replayExec = require_execution_context.mergeChildExec(context.exec, checkResult.next.exec);
+					const replayedResultOrPromise = parser.parse(withChildContext$1({
 						...context,
 						...replayExec != null ? {
 							exec: replayExec,
@@ -1047,7 +1015,7 @@ function or(...args) {
 					}, i, checkResult.next.state, parser));
 					const replayedResult = await replayedResultOrPromise;
 					if (!replayedResult.success) return replayedResult;
-					const mergedExec$1 = mergeChildExec(replayExec, replayedResult.next.exec);
+					const mergedExec$1 = require_execution_context.mergeChildExec(replayExec, replayedResult.next.exec);
 					return {
 						success: true,
 						next: {
@@ -1066,7 +1034,7 @@ function or(...args) {
 						consumed: replayedResult.consumed
 					};
 				}
-				const mergedExec = mergeChildExec(context.exec, result.next.exec);
+				const mergedExec = require_execution_context.mergeChildExec(context.exec, result.next.exec);
 				return {
 					success: true,
 					next: {
@@ -1091,7 +1059,7 @@ function or(...args) {
 			} else if (!result.success && error.consumed < result.consumed) error = result;
 		}
 		if (zeroConsumedBranch !== null && zeroConsumedCount === 1 && error.consumed === 0 && context.buffer.length === 0) {
-			const mergedExec = mergeChildExec(context.exec, zeroConsumedBranch.result.next.exec);
+			const mergedExec = require_execution_context.mergeChildExec(context.exec, zeroConsumedBranch.result.next.exec);
 			return {
 				success: true,
 				...zeroConsumedBranch.result.provisional ? { provisional: true } : {},
@@ -1109,7 +1077,7 @@ function or(...args) {
 		if (provisionalConsuming !== null) {
 			const activeIsLockedDifferent = activeState != null && activeState[1].success && activeState[1].consumed.length > 0 && activeState[0] !== provisionalConsuming.index;
 			if (!activeIsLockedDifferent) {
-				const mergedExec = mergeChildExec(context.exec, provisionalConsuming.result.next.exec);
+				const mergedExec = require_execution_context.mergeChildExec(context.exec, provisionalConsuming.result.next.exec);
 				return {
 					success: true,
 					provisional: true,
@@ -1129,13 +1097,13 @@ function or(...args) {
 			if (activeState != null && activeState[1].success) {
 				const previouslyConsumed = activeState[1].consumed;
 				const checkResult = await provisionalConsuming.parser.parse({
-					...withChildContext(context, provisionalConsuming.index, provisionalConsuming.parser.initialState, provisionalConsuming.parser),
+					...withChildContext$1(context, provisionalConsuming.index, provisionalConsuming.parser.initialState, provisionalConsuming.parser),
 					buffer: previouslyConsumed
 				});
 				const canConsumeShared = checkResult.success && checkResult.consumed.length === previouslyConsumed.length && checkResult.consumed.every((c, idx) => c === previouslyConsumed[idx]);
 				if (canConsumeShared && checkResult.success) {
-					const replayExec = mergeChildExec(context.exec, checkResult.next.exec);
-					const replayedResult = await provisionalConsuming.parser.parse(withChildContext({
+					const replayExec = require_execution_context.mergeChildExec(context.exec, checkResult.next.exec);
+					const replayedResult = await provisionalConsuming.parser.parse(withChildContext$1({
 						...context,
 						...replayExec != null ? {
 							exec: replayExec,
@@ -1143,7 +1111,7 @@ function or(...args) {
 						} : {}
 					}, provisionalConsuming.index, checkResult.next.state, provisionalConsuming.parser));
 					if (!replayedResult.success) return replayedResult;
-					const mergedExec = mergeChildExec(replayExec, replayedResult.next.exec);
+					const mergedExec = require_execution_context.mergeChildExec(replayExec, replayedResult.next.exec);
 					return {
 						success: true,
 						provisional: true,
@@ -1172,7 +1140,7 @@ function or(...args) {
 		};
 	};
 	const singleResult = {
-		$mode: combinedMode,
+		mode: combinedMode,
 		$valueType: [],
 		$stateType: [],
 		priority: Math.max(...parsers.map((p) => p.priority)),
@@ -1242,7 +1210,7 @@ function longestMatch(...args) {
 	if (parsers.length < 1) throw new TypeError("longestMatch() requires at least one parser argument.");
 	assertParsers(parsers, "longestMatch()");
 	const noMatchContext = analyzeNoMatchContext(parsers);
-	const combinedMode = parsers.some((p) => p.$mode === "async") ? "async" : "sync";
+	const combinedMode = parsers.some((p) => p.mode === "async") ? "async" : "sync";
 	const syncParsers = parsers;
 	const getInitialError = (context) => ({
 		consumed: 0,
@@ -1259,7 +1227,7 @@ function longestMatch(...args) {
 		const activeState = normalizeExclusiveState(context.state);
 		for (let i = 0; i < syncParsers.length; i++) {
 			const parser = syncParsers[i];
-			const result = parser.parse(withChildContext(context, i, activeState == null || activeState[0] !== i || !activeState[1].success ? parser.initialState : activeState[1].next.state, parser));
+			const result = parser.parse(withChildContext$1(context, i, activeState == null || activeState[0] !== i || !activeState[1].success ? parser.initialState : activeState[1].next.state, parser));
 			if (result.success) {
 				const consumed = context.buffer.length - result.next.buffer.length;
 				const bestIsProvisional = bestMatch != null && bestMatch.result.success && !!bestMatch.result.provisional;
@@ -1272,7 +1240,7 @@ function longestMatch(...args) {
 			} else if (error.consumed < result.consumed) error = result;
 		}
 		if (bestMatch && bestMatch.result.success) {
-			const mergedExec = mergeChildExec(context.exec, bestMatch.result.next.exec);
+			const mergedExec = require_execution_context.mergeChildExec(context.exec, bestMatch.result.next.exec);
 			return {
 				success: true,
 				next: {
@@ -1299,7 +1267,7 @@ function longestMatch(...args) {
 		const activeState = normalizeExclusiveState(context.state);
 		for (let i = 0; i < parsers.length; i++) {
 			const parser = parsers[i];
-			const resultOrPromise = parser.parse(withChildContext(context, i, activeState == null || activeState[0] !== i || !activeState[1].success ? parser.initialState : activeState[1].next.state, parser));
+			const resultOrPromise = parser.parse(withChildContext$1(context, i, activeState == null || activeState[0] !== i || !activeState[1].success ? parser.initialState : activeState[1].next.state, parser));
 			const result = await resultOrPromise;
 			if (result.success) {
 				const consumed = context.buffer.length - result.next.buffer.length;
@@ -1313,7 +1281,7 @@ function longestMatch(...args) {
 			} else if (error.consumed < result.consumed) error = result;
 		}
 		if (bestMatch && bestMatch.result.success) {
-			const mergedExec = mergeChildExec(context.exec, bestMatch.result.next.exec);
+			const mergedExec = require_execution_context.mergeChildExec(context.exec, bestMatch.result.next.exec);
 			return {
 				success: true,
 				next: {
@@ -1335,7 +1303,7 @@ function longestMatch(...args) {
 		};
 	};
 	const multiResult = {
-		$mode: combinedMode,
+		mode: combinedMode,
 		$valueType: [],
 		$stateType: [],
 		priority: Math.max(...parsers.map((p) => p.priority)),
@@ -1420,14 +1388,14 @@ function* suggestObjectSync(context, prefix, parserPairs) {
 		const lastToken = context.buffer[context.buffer.length - 1];
 		for (const [field, parser] of parserPairs) if (isOptionRequiringValue(parser.usage, lastToken)) {
 			const annotatedFieldState = getAnnotatedFieldState(context.state, field, parser);
-			yield* parser.suggest(withChildContext(contextWithRegistry, field, annotatedFieldState, parser), prefix);
+			yield* parser.suggest(withChildContext$1(contextWithRegistry, field, annotatedFieldState, parser), prefix);
 			return;
 		}
 	}
 	const suggestions = [];
 	for (const [field, parser] of parserPairs) {
 		const annotatedFieldState = getAnnotatedFieldState(context.state, field, parser);
-		const fieldSuggestions = parser.suggest(withChildContext(contextWithRegistry, field, annotatedFieldState, parser), prefix);
+		const fieldSuggestions = parser.suggest(withChildContext$1(contextWithRegistry, field, annotatedFieldState, parser), prefix);
 		suggestions.push(...fieldSuggestions);
 	}
 	yield* require_suggestion.deduplicateSuggestions(suggestions);
@@ -1456,7 +1424,7 @@ async function* suggestObjectAsync(context, prefix, parserPairs) {
 		const lastToken = context.buffer[context.buffer.length - 1];
 		for (const [field, parser] of parserPairs) if (isOptionRequiringValue(parser.usage, lastToken)) {
 			const annotatedFieldState = getAnnotatedFieldState(context.state, field, parser);
-			const suggestions$1 = parser.suggest(withChildContext(contextWithRegistry, field, annotatedFieldState, parser), prefix);
+			const suggestions$1 = parser.suggest(withChildContext$1(contextWithRegistry, field, annotatedFieldState, parser), prefix);
 			for await (const s of suggestions$1) yield s;
 			return;
 		}
@@ -1464,7 +1432,7 @@ async function* suggestObjectAsync(context, prefix, parserPairs) {
 	const suggestions = [];
 	for (const [field, parser] of parserPairs) {
 		const annotatedFieldState = getAnnotatedFieldState(context.state, field, parser);
-		const fieldSuggestions = parser.suggest(withChildContext(contextWithRegistry, field, annotatedFieldState, parser), prefix);
+		const fieldSuggestions = parser.suggest(withChildContext$1(contextWithRegistry, field, annotatedFieldState, parser), prefix);
 		for await (const s of fieldSuggestions) suggestions.push(s);
 	}
 	yield* require_suggestion.deduplicateSuggestions(suggestions);
@@ -1653,35 +1621,35 @@ function preCompleteAndRegisterDependencies(state, fieldParserPairs, registry, e
 		const fieldState = state[field];
 		const annotatedFieldState = getAnnotatedFieldState(state, field, fieldParser);
 		if (fieldParser.dependencyMetadata?.source?.getMissingSourceValue != null && isUnmatchedDependencyState(fieldState, fieldParser)) {
-			const completed = fieldParser.complete(annotatedFieldState, withChildExecPath(exec, field));
+			const completed = fieldParser.complete(annotatedFieldState, require_execution_context.withChildExecPath(exec, field));
 			preCompleted.set(field, completed);
 			const depState = wrapAsDependencySourceState(completed, fieldParser);
 			if (depState) registerCompletedDependency(depState, registry);
 			continue;
 		}
 		if (fieldParser.dependencyMetadata?.source != null && isUnmatchedDependencyState(fieldState, fieldParser) && (annotatedFieldState !== fieldState || isNonCliBoundSourceState(fieldState, fieldParser))) {
-			const completed = fieldParser.complete(annotatedFieldState, withChildExecPath(exec, field));
+			const completed = fieldParser.complete(annotatedFieldState, require_execution_context.withChildExecPath(exec, field));
 			preCompleted.set(field, completed);
 			const depState = wrapAsDependencySourceState(completed, fieldParser);
 			if (depState) registerCompletedDependency(depState, registry);
 			continue;
 		}
 		if (Array.isArray(fieldState) && fieldState.length === 1 && require_dependency.isPendingDependencySourceState(fieldState[0])) {
-			const completed = fieldParser.complete(fieldState, withChildExecPath(exec, field));
+			const completed = fieldParser.complete(fieldState, require_execution_context.withChildExecPath(exec, field));
 			preCompleted.set(field, completed);
 			if (require_dependency.isDependencySourceState(completed)) registerCompletedDependency(completed, registry);
 		} else if (fieldState === void 0 && require_dependency.isPendingDependencySourceState(fieldParser.initialState)) {
-			const completed = fieldParser.complete([fieldParser.initialState], withChildExecPath(exec, field));
+			const completed = fieldParser.complete([fieldParser.initialState], require_execution_context.withChildExecPath(exec, field));
 			preCompleted.set(field, completed);
 			if (require_dependency.isDependencySourceState(completed)) registerCompletedDependency(completed, registry);
 		} else if (fieldState === void 0 && require_dependency.isWrappedDependencySource(fieldParser)) {
 			const pendingState = fieldParser[require_dependency.wrappedDependencySourceMarker];
-			const completed = fieldParser.complete([pendingState], withChildExecPath(exec, field));
+			const completed = fieldParser.complete([pendingState], require_execution_context.withChildExecPath(exec, field));
 			preCompleted.set(field, completed);
 			if (require_dependency.isDependencySourceState(completed)) registerCompletedDependency(completed, registry);
 		} else if (fieldState != null && !Array.isArray(fieldState) && !require_dependency.isDependencySourceState(fieldState) && (require_dependency.isWrappedDependencySource(fieldParser) || require_dependency.isPendingDependencySourceState(fieldParser.initialState))) {
 			const annotatedFieldState$1 = getAnnotatedFieldState(state, field, fieldParser);
-			const completed = fieldParser.complete(annotatedFieldState$1, withChildExecPath(exec, field));
+			const completed = fieldParser.complete(annotatedFieldState$1, require_execution_context.withChildExecPath(exec, field));
 			preCompleted.set(field, completed);
 			const depState = wrapAsDependencySourceState(completed, fieldParser);
 			if (depState) registerCompletedDependency(depState, registry);
@@ -1706,35 +1674,35 @@ async function preCompleteAndRegisterDependenciesAsync(state, fieldParserPairs,
 		const fieldState = state[field];
 		const annotatedFieldState = getAnnotatedFieldState(state, field, fieldParser);
 		if (fieldParser.dependencyMetadata?.source?.getMissingSourceValue != null && isUnmatchedDependencyState(fieldState, fieldParser)) {
-			const completed = await fieldParser.complete(annotatedFieldState, withChildExecPath(exec, field));
+			const completed = await fieldParser.complete(annotatedFieldState, require_execution_context.withChildExecPath(exec, field));
 			preCompleted.set(field, completed);
 			const depState = wrapAsDependencySourceState(completed, fieldParser);
 			if (depState) registerCompletedDependency(depState, registry);
 			continue;
 		}
 		if (fieldParser.dependencyMetadata?.source != null && isUnmatchedDependencyState(fieldState, fieldParser) && (annotatedFieldState !== fieldState || isNonCliBoundSourceState(fieldState, fieldParser))) {
-			const completed = await fieldParser.complete(annotatedFieldState, withChildExecPath(exec, field));
+			const completed = await fieldParser.complete(annotatedFieldState, require_execution_context.withChildExecPath(exec, field));
 			preCompleted.set(field, completed);
 			const depState = wrapAsDependencySourceState(completed, fieldParser);
 			if (depState) registerCompletedDependency(depState, registry);
 			continue;
 		}
 		if (Array.isArray(fieldState) && fieldState.length === 1 && require_dependency.isPendingDependencySourceState(fieldState[0])) {
-			const completed = await fieldParser.complete(fieldState, withChildExecPath(exec, field));
+			const completed = await fieldParser.complete(fieldState, require_execution_context.withChildExecPath(exec, field));
 			preCompleted.set(field, completed);
 			if (require_dependency.isDependencySourceState(completed)) registerCompletedDependency(completed, registry);
 		} else if (fieldState === void 0 && require_dependency.isPendingDependencySourceState(fieldParser.initialState)) {
-			const completed = await fieldParser.complete([fieldParser.initialState], withChildExecPath(exec, field));
+			const completed = await fieldParser.complete([fieldParser.initialState], require_execution_context.withChildExecPath(exec, field));
 			preCompleted.set(field, completed);
 			if (require_dependency.isDependencySourceState(completed)) registerCompletedDependency(completed, registry);
 		} else if (fieldState === void 0 && require_dependency.isWrappedDependencySource(fieldParser)) {
 			const pendingState = fieldParser[require_dependency.wrappedDependencySourceMarker];
-			const completed = await fieldParser.complete([pendingState], withChildExecPath(exec, field));
+			const completed = await fieldParser.complete([pendingState], require_execution_context.withChildExecPath(exec, field));
 			preCompleted.set(field, completed);
 			if (require_dependency.isDependencySourceState(completed)) registerCompletedDependency(completed, registry);
 		} else if (fieldState != null && !Array.isArray(fieldState) && !require_dependency.isDependencySourceState(fieldState) && (require_dependency.isWrappedDependencySource(fieldParser) || require_dependency.isPendingDependencySourceState(fieldParser.initialState))) {
 			const annotatedFieldState$1 = getAnnotatedFieldState(state, field, fieldParser);
-			const completed = await fieldParser.complete(annotatedFieldState$1, withChildExecPath(exec, field));
+			const completed = await fieldParser.complete(annotatedFieldState$1, require_execution_context.withChildExecPath(exec, field));
 			preCompleted.set(field, completed);
 			const depState = wrapAsDependencySourceState(completed, fieldParser);
 			if (depState) registerCompletedDependency(depState, registry);
@@ -1787,7 +1755,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 	};
 	if (!options.allowDuplicates) checkDuplicateOptionNames(parserPairs.map(([field, parser]) => [field, parser.usage]));
 	const noMatchContext = analyzeNoMatchContext(parserKeys.map((k) => parsers[k]));
-	const combinedMode = parserKeys.some((k) => parsers[k].$mode === "async") ? "async" : "sync";
+	const combinedMode = parserKeys.some((k) => parsers[k].mode === "async") ? "async" : "sync";
 	const getInitialError = (context) => ({
 		consumed: 0,
 		error: context.buffer.length > 0 ? (() => {
@@ -1812,9 +1780,9 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 			madeProgress = false;
 			const getFieldState = createFieldStateGetter(currentContext.state, getObjectParseChildState);
 			for (const [field, parser] of parserPairs) {
-				const result = parser.parse(withChildContext(currentContext, field, getFieldState(field, parser), parser));
+				const result = parser.parse(withChildContext$1(currentContext, field, getFieldState(field, parser), parser));
 				if (result.success && result.consumed.length > 0) {
-					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
+					const mergedExec = require_execution_context.mergeChildExec(currentContext.exec, result.next.exec);
 					currentContext = {
 						...currentContext,
 						buffer: result.next.buffer,
@@ -1844,9 +1812,9 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				const typedParser = parser;
 				if (parser.leadingNames.size > 0 || typedParser.acceptingAnyToken) continue;
 				const fieldState = getFieldState(field, parser);
-				const result = typedParser.parse(withChildContext(currentContext, field, fieldState, parser));
+				const result = typedParser.parse(withChildContext$1(currentContext, field, fieldState, parser));
 				if (result.success && result.consumed.length === 0 && result.next.state !== fieldState) {
-					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
+					const mergedExec = require_execution_context.mergeChildExec(currentContext.exec, result.next.exec);
 					currentContext = {
 						...currentContext,
 						state: {
@@ -1881,7 +1849,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 			};
 			for (const [field, parser] of parserPairs) {
 				const fieldState = getFieldState(field, parser);
-				const completeResult = parser.complete(fieldState, withChildExecPath(probeExec, field));
+				const completeResult = parser.complete(fieldState, require_execution_context.withChildExecPath(probeExec, field));
 				if (!completeResult.success) {
 					allCanComplete = false;
 					break;
@@ -1909,10 +1877,10 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 			madeProgress = false;
 			const getFieldState = createFieldStateGetter(currentContext.state, getObjectParseChildState);
 			for (const [field, parser] of parserPairs) {
-				const resultOrPromise = parser.parse(withChildContext(currentContext, field, getFieldState(field, parser), parser));
+				const resultOrPromise = parser.parse(withChildContext$1(currentContext, field, getFieldState(field, parser), parser));
 				const result = await resultOrPromise;
 				if (result.success && result.consumed.length > 0) {
-					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
+					const mergedExec = require_execution_context.mergeChildExec(currentContext.exec, result.next.exec);
 					currentContext = {
 						...currentContext,
 						buffer: result.next.buffer,
@@ -1941,10 +1909,10 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				if (consumedFields.has(field)) continue;
 				if (parser.leadingNames.size > 0 || parser.acceptingAnyToken) continue;
 				const fieldState = getFieldState(field, parser);
-				const resultOrPromise = parser.parse(withChildContext(currentContext, field, fieldState, parser));
+				const resultOrPromise = parser.parse(withChildContext$1(currentContext, field, fieldState, parser));
 				const result = await resultOrPromise;
 				if (result.success && result.consumed.length === 0 && result.next.state !== fieldState) {
-					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
+					const mergedExec = require_execution_context.mergeChildExec(currentContext.exec, result.next.exec);
 					currentContext = {
 						...currentContext,
 						state: {
@@ -1979,7 +1947,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 			};
 			for (const [field, parser] of parserPairs) {
 				const fieldState = getFieldState(field, parser);
-				const completeResult = await parser.complete(fieldState, withChildExecPath(probeExec, field));
+				const completeResult = await parser.complete(fieldState, require_execution_context.withChildExecPath(probeExec, field));
 				if (!completeResult.success) {
 					allCanComplete = false;
 					break;
@@ -1997,7 +1965,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 		};
 	};
 	const objectParser = {
-		$mode: combinedMode,
+		mode: combinedMode,
 		$valueType: [],
 		$stateType: [],
 		[fieldParsersKey]: parserPairs,
@@ -2048,7 +2016,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 					if (preCompletedResult !== void 0) valueResult = unwrapCompleteResult(preCompletedResult);
 					else {
 						const fieldState = resolvedFieldStates[fieldKey];
-						valueResult = unwrapCompleteResult(fieldParser.complete(fieldState, withChildExecPath(phase3Exec, fieldKey)));
+						valueResult = unwrapCompleteResult(fieldParser.complete(fieldState, require_execution_context.withChildExecPath(phase3Exec, fieldKey)));
 					}
 					if (valueResult.success) {
 						result[fieldKey] = valueResult.value;
@@ -2116,13 +2084,13 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 						if (failure != null) return failure;
 						continue;
 					}
-					if (typeof fieldParser.shouldDeferCompletion === "function" && fieldParser.shouldDeferCompletion(resolvedFieldStates[fieldKey], withChildExecPath(phase3Exec, fieldKey)) === true) deferredFields.push(field);
+					if (typeof fieldParser.shouldDeferCompletion === "function" && fieldParser.shouldDeferCompletion(resolvedFieldStates[fieldKey], require_execution_context.withChildExecPath(phase3Exec, fieldKey)) === true) deferredFields.push(field);
 					else concurrentFields.push(field);
 				}
 				const concurrentResults = await Promise.all(concurrentFields.map(async (field) => {
 					const fieldKey = field;
 					const fieldParser = parsers[field];
-					const valueResult = unwrapCompleteResult(await fieldParser.complete(resolvedFieldStates[fieldKey], withChildExecPath(phase3Exec, fieldKey)));
+					const valueResult = unwrapCompleteResult(await fieldParser.complete(resolvedFieldStates[fieldKey], require_execution_context.withChildExecPath(phase3Exec, fieldKey)));
 					return {
 						fieldKey,
 						valueResult
@@ -2135,7 +2103,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				for (const field of deferredFields) {
 					const fieldKey = field;
 					const fieldParser = parsers[field];
-					const valueResult = unwrapCompleteResult(await fieldParser.complete(resolvedFieldStates[fieldKey], withChildExecPath(phase3Exec, fieldKey)));
+					const valueResult = unwrapCompleteResult(await fieldParser.complete(resolvedFieldStates[fieldKey], require_execution_context.withChildExecPath(phase3Exec, fieldKey)));
 					const failure = applyValueResult(fieldKey, valueResult);
 					if (failure != null) return failure;
 				}
@@ -2176,7 +2144,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				for (const field of parserKeys) {
 					const fieldKey = field;
 					const fieldParser = parsers[field];
-					const childExec$1 = withChildExecPath(phase3Exec, fieldKey);
+					const childExec$1 = require_execution_context.withChildExecPath(phase3Exec, fieldKey);
 					const preCompletedResult = preCompleted.get(fieldKey);
 					const seed = preCompletedResult !== void 0 ? reusePreCompletedPhase2Seed(fieldParser, resolvedFieldStates[fieldKey], preCompletedResult, childExec$1) : require_phase2_seed.completeOrExtractPhase2Seed(fieldParser, resolvedFieldStates[fieldKey], childExec$1);
 					if (seed == null) continue;
@@ -2219,7 +2187,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				for (const field of parserKeys) {
 					const fieldKey = field;
 					const fieldParser = parsers[field];
-					const childExec$1 = withChildExecPath(phase3Exec, fieldKey);
+					const childExec$1 = require_execution_context.withChildExecPath(phase3Exec, fieldKey);
 					const preCompletedResult = preCompleted.get(fieldKey);
 					const seed = preCompletedResult !== void 0 ? await reusePreCompletedPhase2SeedAsync(fieldParser, resolvedFieldStates[fieldKey], preCompletedResult, childExec$1) : await require_phase2_seed.completeOrExtractPhase2Seed(fieldParser, resolvedFieldStates[fieldKey], childExec$1);
 					if (seed == null) continue;
@@ -2326,7 +2294,7 @@ function suggestTupleSync(context, prefix, parsers) {
 	for (let i = 0; i < parsers.length; i++) {
 		const parser = parsers[i];
 		const parserState = stateArray && Array.isArray(stateArray) ? stateArray[i] : parser.initialState;
-		const parserSuggestions = parser.suggest(withChildContext(contextWithRegistry, i, parserState, parser), prefix);
+		const parserSuggestions = parser.suggest(withChildContext$1(contextWithRegistry, i, parserState, parser), prefix);
 		suggestions.push(...parserSuggestions);
 	}
 	return require_suggestion.deduplicateSuggestions(suggestions);
@@ -2360,8 +2328,8 @@ async function* suggestTupleAsync(context, prefix, parsers) {
 	for (let i = 0; i < parsers.length; i++) {
 		const parser = parsers[i];
 		const parserState = stateArray && Array.isArray(stateArray) ? stateArray[i] : parser.initialState;
-		const parserSuggestions = parser.suggest(withChildContext(contextWithRegistry, i, parserState, parser), prefix);
-		if (parser.$mode === "async") for await (const s of parserSuggestions) suggestions.push(s);
+		const parserSuggestions = parser.suggest(withChildContext$1(contextWithRegistry, i, parserState, parser), prefix);
+		if (parser.mode === "async") for await (const s of parserSuggestions) suggestions.push(s);
 		else suggestions.push(...parserSuggestions);
 	}
 	yield* require_suggestion.deduplicateSuggestions(suggestions);
@@ -2376,10 +2344,10 @@ function advanceTupleSuggestContextSync(context, parsers) {
 		const stateArray = Array.isArray(currentContext.state) ? [...currentContext.state] : parsers.map((parser) => parser.initialState);
 		const remainingParsers = parsers.map((parser, index) => [parser, index]).filter(([_, index]) => !matchedParsers.has(index)).sort(([parserA], [parserB]) => parserB.priority - parserA.priority);
 		for (const [parser, index] of remainingParsers) {
-			const result = parser.parse(withChildContext(currentContext, index, stateArray[index], parser));
+			const result = parser.parse(withChildContext$1(currentContext, index, stateArray[index], parser));
 			if (result.success && result.consumed.length > 0) {
 				const newStateArray = require_annotations.annotateFreshArray(currentContext.state, stateArray.map((state, idx) => idx === index ? require_annotation_state.getWrappedChildState(currentContext.state, result.next.state, parser) : state));
-				const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
+				const mergedExec = require_execution_context.mergeChildExec(currentContext.exec, result.next.exec);
 				currentContext = {
 					...currentContext,
 					buffer: result.next.buffer,
@@ -2401,10 +2369,10 @@ function advanceTupleSuggestContextSync(context, parsers) {
 			}
 		}
 		if (!foundMatch) for (const [parser, index] of remainingParsers) {
-			const result = parser.parse(withChildContext(currentContext, index, stateArray[index], parser));
+			const result = parser.parse(withChildContext$1(currentContext, index, stateArray[index], parser));
 			if (result.success && result.consumed.length < 1) {
 				const newStateArray = require_annotations.annotateFreshArray(currentContext.state, stateArray.map((state, idx) => idx === index ? require_annotation_state.getWrappedChildState(currentContext.state, result.next.state, parser) : state));
-				const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
+				const mergedExec = require_execution_context.mergeChildExec(currentContext.exec, result.next.exec);
 				currentContext = {
 					...currentContext,
 					state: newStateArray,
@@ -2442,10 +2410,10 @@ async function advanceTupleSuggestContextAsync(context, parsers) {
 		const stateArray = Array.isArray(currentContext.state) ? [...currentContext.state] : parsers.map((parser) => parser.initialState);
 		const remainingParsers = parsers.map((parser, index) => [parser, index]).filter(([_, index]) => !matchedParsers.has(index)).sort(([parserA], [parserB]) => parserB.priority - parserA.priority);
 		for (const [parser, index] of remainingParsers) {
-			const result = await parser.parse(withChildContext(currentContext, index, stateArray[index], parser));
+			const result = await parser.parse(withChildContext$1(currentContext, index, stateArray[index], parser));
 			if (result.success && result.consumed.length > 0) {
 				const newStateArray = require_annotations.annotateFreshArray(currentContext.state, stateArray.map((state, idx) => idx === index ? require_annotation_state.getWrappedChildState(currentContext.state, result.next.state, parser) : state));
-				const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
+				const mergedExec = require_execution_context.mergeChildExec(currentContext.exec, result.next.exec);
 				currentContext = {
 					...currentContext,
 					buffer: result.next.buffer,
@@ -2467,10 +2435,10 @@ async function advanceTupleSuggestContextAsync(context, parsers) {
 			}
 		}
 		if (!foundMatch) for (const [parser, index] of remainingParsers) {
-			const result = await parser.parse(withChildContext(currentContext, index, stateArray[index], parser));
+			const result = await parser.parse(withChildContext$1(currentContext, index, stateArray[index], parser));
 			if (result.success && result.consumed.length < 1) {
 				const newStateArray = require_annotations.annotateFreshArray(currentContext.state, stateArray.map((state, idx) => idx === index ? require_annotation_state.getWrappedChildState(currentContext.state, result.next.state, parser) : state));
-				const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
+				const mergedExec = require_execution_context.mergeChildExec(currentContext.exec, result.next.exec);
 				currentContext = {
 					...currentContext,
 					state: newStateArray,
@@ -2544,7 +2512,7 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 		parsers = labelOrParsers;
 		options = maybeParsersOrOptions ?? {};
 	}
-	const combinedMode = parsers.some((p) => p.$mode === "async") ? "async" : "sync";
+	const combinedMode = parsers.some((p) => p.mode === "async") ? "async" : "sync";
 	const syncParsers = parsers;
 	if (!options.allowDuplicates) checkDuplicateOptionNames(parsers.map((parser, index) => [String(index), parser.usage]));
 	const parseSync = (context) => {
@@ -2560,10 +2528,10 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 			const stateArray = currentContext.state;
 			const remainingParsers = syncParsers.map((parser, index) => [parser, index]).filter(([_, index]) => !matchedParsers.has(index)).sort(([parserA], [parserB]) => parserB.priority - parserA.priority);
 			for (const [parser, index] of remainingParsers) {
-				const result = parser.parse(withChildContext(currentContext, index, stateArray[index], parser));
+				const result = parser.parse(withChildContext$1(currentContext, index, stateArray[index], parser));
 				if (result.success && result.consumed.length > 0) {
 					const newStateArray = require_annotations.annotateFreshArray(currentContext.state, stateArray.map((s, idx) => idx === index ? require_annotation_state.getWrappedChildState(currentContext.state, result.next.state, parser) : s));
-					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
+					const mergedExec = require_execution_context.mergeChildExec(currentContext.exec, result.next.exec);
 					currentContext = {
 						...currentContext,
 						buffer: result.next.buffer,
@@ -2581,10 +2549,10 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				} else if (!result.success && error.consumed < result.consumed) error = result;
 			}
 			if (!foundMatch) for (const [parser, index] of remainingParsers) {
-				const result = parser.parse(withChildContext(currentContext, index, stateArray[index], parser));
+				const result = parser.parse(withChildContext$1(currentContext, index, stateArray[index], parser));
 				if (result.success && result.consumed.length < 1) {
 					const newStateArray = require_annotations.annotateFreshArray(currentContext.state, stateArray.map((s, idx) => idx === index ? require_annotation_state.getWrappedChildState(currentContext.state, result.next.state, parser) : s));
-					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
+					const mergedExec = require_execution_context.mergeChildExec(currentContext.exec, result.next.exec);
 					currentContext = {
 						...currentContext,
 						state: newStateArray,
@@ -2626,11 +2594,11 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 			const stateArray = currentContext.state;
 			const remainingParsers = parsers.map((parser, index) => [parser, index]).filter(([_, index]) => !matchedParsers.has(index)).sort(([parserA], [parserB]) => parserB.priority - parserA.priority);
 			for (const [parser, index] of remainingParsers) {
-				const resultOrPromise = parser.parse(withChildContext(currentContext, index, stateArray[index], parser));
+				const resultOrPromise = parser.parse(withChildContext$1(currentContext, index, stateArray[index], parser));
 				const result = await resultOrPromise;
 				if (result.success && result.consumed.length > 0) {
 					const newStateArray = require_annotations.annotateFreshArray(currentContext.state, stateArray.map((s, idx) => idx === index ? require_annotation_state.getWrappedChildState(currentContext.state, result.next.state, parser) : s));
-					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
+					const mergedExec = require_execution_context.mergeChildExec(currentContext.exec, result.next.exec);
 					currentContext = {
 						...currentContext,
 						buffer: result.next.buffer,
@@ -2648,11 +2616,11 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				} else if (!result.success && error.consumed < result.consumed) error = result;
 			}
 			if (!foundMatch) for (const [parser, index] of remainingParsers) {
-				const resultOrPromise = parser.parse(withChildContext(currentContext, index, stateArray[index], parser));
+				const resultOrPromise = parser.parse(withChildContext$1(currentContext, index, stateArray[index], parser));
 				const result = await resultOrPromise;
 				if (result.success && result.consumed.length < 1) {
 					const newStateArray = require_annotations.annotateFreshArray(currentContext.state, stateArray.map((s, idx) => idx === index ? require_annotation_state.getWrappedChildState(currentContext.state, result.next.state, parser) : s));
-					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
+					const mergedExec = require_execution_context.mergeChildExec(currentContext.exec, result.next.exec);
 					currentContext = {
 						...currentContext,
 						state: newStateArray,
@@ -2682,7 +2650,7 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 		};
 	};
 	const tupleParser = {
-		$mode: combinedMode,
+		mode: combinedMode,
 		$valueType: [],
 		$stateType: [],
 		[fieldParsersKey]: parsers.map((parser, index) => [String(index), parser]),
@@ -2721,7 +2689,7 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 					if (preCompletedResult !== void 0) valueResult = unwrapCompleteResult(preCompletedResult);
 					else {
 						const elementState = prepareStateForCompletion(resolvedArray[i], elementParser);
-						valueResult = unwrapCompleteResult(elementParser.complete(elementState, withChildExecPath(phase3Exec, i)));
+						valueResult = unwrapCompleteResult(elementParser.complete(elementState, require_execution_context.withChildExecPath(phase3Exec, i)));
 					}
 					if (valueResult.success) {
 						result[i] = valueResult.value;
@@ -2768,7 +2736,7 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 					if (preCompletedResult !== void 0) valueResult = unwrapCompleteResult(preCompletedResult);
 					else {
 						const elementState = prepareStateForCompletion(resolvedArray[i], elementParser);
-						valueResult = unwrapCompleteResult(await elementParser.complete(elementState, withChildExecPath(phase3Exec, i)));
+						valueResult = unwrapCompleteResult(await elementParser.complete(elementState, require_execution_context.withChildExecPath(phase3Exec, i)));
 					}
 					if (valueResult.success) {
 						result[i] = valueResult.value;
@@ -2811,7 +2779,7 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				let hasAnySeed = false;
 				for (let i = 0; i < syncParsers.length; i++) {
 					const elementParser = syncParsers[i];
-					const childExec$1 = withChildExecPath(phase3Exec, i);
+					const childExec$1 = require_execution_context.withChildExecPath(phase3Exec, i);
 					const preCompletedResult = preCompleted.get(String(i));
 					const seed = preCompletedResult !== void 0 ? reusePreCompletedPhase2Seed(elementParser, prepareStateForCompletion(resolvedArray[i], elementParser), preCompletedResult, childExec$1) : require_phase2_seed.completeOrExtractPhase2Seed(elementParser, prepareStateForCompletion(resolvedArray[i], elementParser), childExec$1);
 					if (seed == null) continue;
@@ -2848,7 +2816,7 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				let hasAnySeed = false;
 				for (let i = 0; i < parsers.length; i++) {
 					const elementParser = parsers[i];
-					const childExec$1 = withChildExecPath(phase3Exec, i);
+					const childExec$1 = require_execution_context.withChildExecPath(phase3Exec, i);
 					const preCompletedResult = preCompleted.get(String(i));
 					const seed = preCompletedResult !== void 0 ? await reusePreCompletedPhase2SeedAsync(elementParser, prepareStateForCompletion(resolvedArray[i], elementParser), preCompletedResult, childExec$1) : await require_phase2_seed.completeOrExtractPhase2Seed(elementParser, prepareStateForCompletion(resolvedArray[i], elementParser), childExec$1);
 					if (seed == null) continue;
@@ -2939,7 +2907,7 @@ function merge(...args) {
 	const rawParsers = args.slice(startIndex, endIndex);
 	if (rawParsers.length < 1) throw new TypeError("merge() requires at least one parser argument.");
 	assertParsers(rawParsers, "merge()");
-	const combinedMode = rawParsers.some((p) => p.$mode === "async") ? "async" : "sync";
+	const combinedMode = rawParsers.some((p) => p.mode === "async") ? "async" : "sync";
 	const isAsync = combinedMode === "async";
 	const syncRawParsers = rawParsers;
 	const withIndex = rawParsers.map((p, i) => [p, i]);
@@ -3006,9 +2974,9 @@ function merge(...args) {
 		for (let i = 0; i < syncParsers.length; i++) {
 			const parser = syncParsers[i];
 			const parserState = extractParserState(parser, currentContext, i);
-			const result = parser.parse(withChildContext(currentContext, i, parserState, parser));
+			const result = parser.parse(withChildContext$1(currentContext, i, parserState, parser));
 			if (result.success) {
-				const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
+				const mergedExec = require_execution_context.mergeChildExec(currentContext.exec, result.next.exec);
 				const newState = mergeResultState(parser, currentContext, parserState, result, i);
 				const newContext = {
 					...currentContext,
@@ -3051,10 +3019,10 @@ function merge(...args) {
 		for (let i = 0; i < parsers.length; i++) {
 			const parser = parsers[i];
 			const parserState = extractParserState(parser, currentContext, i);
-			const resultOrPromise = parser.parse(withChildContext(currentContext, i, parserState, parser));
+			const resultOrPromise = parser.parse(withChildContext$1(currentContext, i, parserState, parser));
 			const result = await resultOrPromise;
 			if (result.success) {
-				const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
+				const mergedExec = require_execution_context.mergeChildExec(currentContext.exec, result.next.exec);
 				const newState = mergeResultState(parser, currentContext, parserState, result, i);
 				const newContext = {
 					...currentContext,
@@ -3092,7 +3060,7 @@ function merge(...args) {
 		};
 	};
 	const mergeParser = {
-		$mode: combinedMode,
+		mode: combinedMode,
 		$valueType: [],
 		$stateType: [],
 		[fieldParsersKey]: mergedFieldParsers,
@@ -3138,7 +3106,7 @@ function merge(...args) {
 						const pairs = parser[fieldParsersKey];
 						const excludedSourceFields = new Set(pairs.map(([field]) => field).filter((field) => duplicateFieldNames.has(field)));
 						const phase1Pairs = filterExcludedFieldParsers(pairs, excludedSourceFields);
-						const preCompleted = preCompleteAndRegisterDependencies(state, phase1Pairs, runtime.registry, withChildExecPath(childExec, i));
+						const preCompleted = preCompleteAndRegisterDependencies(state, phase1Pairs, runtime.registry, require_execution_context.withChildExecPath(childExec, i));
 						return {
 							cache: filterDuplicateKeys(preCompleted, phase1Pairs),
 							excludedSourceFields: excludedSourceFields.size > 0 ? excludedSourceFields : void 0
@@ -3158,7 +3126,7 @@ function merge(...args) {
 					const parser = syncParsers[i];
 					const parserState = extractCompleteState(parser, resolvedState, i);
 					const { cache, excludedSourceFields } = perChildPhase1[i];
-					const childCompleteExec = withChildExecPath(childExec, i);
+					const childCompleteExec = require_execution_context.withChildExecPath(childExec, i);
 					const completeExec = excludedSourceFields == null ? {
 						...childCompleteExec,
 						preCompletedByParser: cache
@@ -3206,7 +3174,7 @@ function merge(...args) {
 						const pairs = parser[fieldParsersKey];
 						const excludedSourceFields = new Set(pairs.map(([field]) => field).filter((field) => duplicateFieldNames.has(field)));
 						const phase1Pairs = filterExcludedFieldParsers(pairs, excludedSourceFields);
-						const preCompleted = await preCompleteAndRegisterDependenciesAsync(state, phase1Pairs, runtime.registry, withChildExecPath(childExec, i));
+						const preCompleted = await preCompleteAndRegisterDependenciesAsync(state, phase1Pairs, runtime.registry, require_execution_context.withChildExecPath(childExec, i));
 						perChildPhase1.push({
 							cache: filterDuplicateKeys(preCompleted, phase1Pairs),
 							excludedSourceFields: excludedSourceFields.size > 0 ? excludedSourceFields : void 0
@@ -3225,7 +3193,7 @@ function merge(...args) {
 					const parser = parsers[i];
 					const parserState = extractCompleteState(parser, resolvedState, i);
 					const { cache: asyncCache, excludedSourceFields } = perChildPhase1[i];
-					const childCompleteExec = withChildExecPath(childExec, i);
+					const childCompleteExec = require_execution_context.withChildExecPath(childExec, i);
 					const completeExec = excludedSourceFields == null ? {
 						...childCompleteExec,
 						preCompletedByParser: asyncCache
@@ -3287,7 +3255,7 @@ function merge(...args) {
 						const pairs = parser[fieldParsersKey];
 						const excludedSourceFields = new Set(pairs.map(([field]) => field).filter((field) => duplicateFieldNames.has(field)));
 						const phase1Pairs = filterExcludedFieldParsers(pairs, excludedSourceFields);
-						const preCompleted = preCompleteAndRegisterDependencies(state, phase1Pairs, runtime.registry, withChildExecPath(childExec, i));
+						const preCompleted = preCompleteAndRegisterDependencies(state, phase1Pairs, runtime.registry, require_execution_context.withChildExecPath(childExec, i));
 						return {
 							cache: filterDuplicateKeys(preCompleted, phase1Pairs),
 							excludedSourceFields: excludedSourceFields.size > 0 ? excludedSourceFields : void 0
@@ -3308,7 +3276,7 @@ function merge(...args) {
 					const parser = syncParsers[i];
 					const parserState = extractMergeCompleteState(parser, resolvedState, i);
 					const { cache, excludedSourceFields } = perChildPhase1[i];
-					const childCompleteExec = withChildExecPath(childExec, i);
+					const childCompleteExec = require_execution_context.withChildExecPath(childExec, i);
 					const completeExec = excludedSourceFields == null ? {
 						...childCompleteExec,
 						preCompletedByParser: cache
@@ -3352,7 +3320,7 @@ function merge(...args) {
 						const pairs = parser[fieldParsersKey];
 						const excludedSourceFields = new Set(pairs.map(([field]) => field).filter((field) => duplicateFieldNames.has(field)));
 						const phase1Pairs = filterExcludedFieldParsers(pairs, excludedSourceFields);
-						const preCompleted = await preCompleteAndRegisterDependenciesAsync(state, phase1Pairs, runtime.registry, withChildExecPath(childExec, i));
+						const preCompleted = await preCompleteAndRegisterDependenciesAsync(state, phase1Pairs, runtime.registry, require_execution_context.withChildExecPath(childExec, i));
 						perChildPhase1.push({
 							cache: filterDuplicateKeys(preCompleted, phase1Pairs),
 							excludedSourceFields: excludedSourceFields.size > 0 ? excludedSourceFields : void 0
@@ -3372,7 +3340,7 @@ function merge(...args) {
 					const parser = parsers[i];
 					const parserState = extractMergeCompleteState(parser, resolvedState, i);
 					const { cache: asyncCache, excludedSourceFields } = perChildPhase1[i];
-					const childCompleteExec = withChildExecPath(childExec, i);
+					const childCompleteExec = require_execution_context.withChildExecPath(childExec, i);
 					const completeExec = excludedSourceFields == null ? {
 						...childCompleteExec,
 						preCompletedByParser: asyncCache
@@ -3447,7 +3415,7 @@ function merge(...args) {
 				for (let i = 0; i < parsers.length; i++) {
 					const parser = parsers[i];
 					const parserState = extractState(parser, i);
-					const childContext = withChildContext(contextWithRegistry$1, i, parserState, parser);
+					const childContext = withChildContext$1(contextWithRegistry$1, i, parserState, parser);
 					const excludedSourceFields = perChildExcludedSourceFields$1[i];
 					const contextForChild = excludedSourceFields == null ? childContext : (() => {
 						const childRuntime = require_dependency_runtime.createDependencyRuntimeContext(runtime$1.registry.clone());
@@ -3461,7 +3429,7 @@ function merge(...args) {
 						};
 					})();
 					const parserSuggestions = parser.suggest(contextForChild, prefix);
-					if (parser.$mode === "async") for await (const s of parserSuggestions) suggestions.push(s);
+					if (parser.mode === "async") for await (const s of parserSuggestions) suggestions.push(s);
 					else suggestions.push(...parserSuggestions);
 				}
 				yield* require_suggestion.deduplicateSuggestions(suggestions);
@@ -3488,7 +3456,7 @@ function merge(...args) {
 				for (let i = 0; i < syncParsers.length; i++) {
 					const parser = syncParsers[i];
 					const parserState = extractState(parser, i);
-					const childContext = withChildContext(contextWithRegistry, i, parserState, parser);
+					const childContext = withChildContext$1(contextWithRegistry, i, parserState, parser);
 					const excludedSourceFields = perChildExcludedSourceFields[i];
 					const contextForChild = excludedSourceFields == null ? childContext : (() => {
 						const childRuntime = require_dependency_runtime.createDependencyRuntimeContext(runtime.registry.clone());
@@ -3749,14 +3717,14 @@ function tryParseSuggestList(context, stateArray, parsers, matchedParsers, remai
 	for (let ri = 0; ri < remaining.length; ri++) {
 		const [parser, index] = remaining[ri];
 		const parserState = index < stateArray.length ? stateArray[index] : parser.initialState;
-		const resultOrPromise = parser.parse(withChildContext(context, index, parserState, parser));
+		const resultOrPromise = parser.parse(withChildContext$1(context, index, parserState, parser));
 		if (resultOrPromise != null && typeof resultOrPromise === "object" && "then" in resultOrPromise && typeof resultOrPromise.then === "function") {
 			const tail = remaining.slice(ri + 1);
 			return resultOrPromise.then((result$1) => {
 				if (result$1.success && result$1.consumed.length > 0) {
 					stateArray[index] = require_annotation_state.getWrappedChildState(context.state, result$1.next.state, parser);
 					matchedParsers.add(index);
-					const mergedExec = mergeChildExec(context.exec, result$1.next.exec);
+					const mergedExec = require_execution_context.mergeChildExec(context.exec, result$1.next.exec);
 					return preParseSuggestLoop({
 						...context,
 						buffer: result$1.next.buffer,
@@ -3783,7 +3751,7 @@ function tryParseSuggestList(context, stateArray, parsers, matchedParsers, remai
 		if (result.success && result.consumed.length > 0) {
 			stateArray[index] = require_annotation_state.getWrappedChildState(context.state, result.next.state, parser);
 			matchedParsers.add(index);
-			const mergedExec = mergeChildExec(context.exec, result.next.exec);
+			const mergedExec = require_execution_context.mergeChildExec(context.exec, result.next.exec);
 			return {
 				...context,
 				buffer: result.next.buffer,
@@ -3801,7 +3769,7 @@ function tryParseSuggestList(context, stateArray, parsers, matchedParsers, remai
 function concat(...parsers) {
 	if (parsers.length < 1) throw new TypeError("concat() requires at least one parser argument.");
 	assertParsers(parsers, "concat()");
-	const combinedMode = parsers.some((p) => p.$mode === "async") ? "async" : "sync";
+	const combinedMode = parsers.some((p) => p.mode === "async") ? "async" : "sync";
 	const isAsync = combinedMode === "async";
 	const syncParsers = parsers;
 	const initialState = parsers.map((parser) => parser.initialState);
@@ -3818,10 +3786,10 @@ function concat(...parsers) {
 			const stateArray = currentContext.state;
 			const remainingParsers = syncParsers.map((parser, index) => [parser, index]).filter(([_, index]) => !matchedParsers.has(index)).sort(([parserA], [parserB]) => parserB.priority - parserA.priority);
 			for (const [parser, index] of remainingParsers) {
-				const result = parser.parse(withChildContext(currentContext, index, stateArray[index], parser));
+				const result = parser.parse(withChildContext$1(currentContext, index, stateArray[index], parser));
 				if (result.success && result.consumed.length > 0) {
 					const newStateArray = require_annotations.annotateFreshArray(currentContext.state, stateArray.map((s, idx) => idx === index ? require_annotation_state.getWrappedChildState(currentContext.state, result.next.state, parser) : s));
-					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
+					const mergedExec = require_execution_context.mergeChildExec(currentContext.exec, result.next.exec);
 					currentContext = {
 						...currentContext,
 						buffer: result.next.buffer,
@@ -3839,10 +3807,10 @@ function concat(...parsers) {
 				} else if (!result.success && error.consumed < result.consumed) error = result;
 			}
 			if (!foundMatch) for (const [parser, index] of remainingParsers) {
-				const result = parser.parse(withChildContext(currentContext, index, stateArray[index], parser));
+				const result = parser.parse(withChildContext$1(currentContext, index, stateArray[index], parser));
 				if (result.success && result.consumed.length < 1) {
 					const newStateArray = require_annotations.annotateFreshArray(currentContext.state, stateArray.map((s, idx) => idx === index ? require_annotation_state.getWrappedChildState(currentContext.state, result.next.state, parser) : s));
-					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
+					const mergedExec = require_execution_context.mergeChildExec(currentContext.exec, result.next.exec);
 					currentContext = {
 						...currentContext,
 						state: newStateArray,
@@ -3884,10 +3852,10 @@ function concat(...parsers) {
 			const stateArray = currentContext.state;
 			const remainingParsers = parsers.map((parser, index) => [parser, index]).filter(([_, index]) => !matchedParsers.has(index)).sort(([parserA], [parserB]) => parserB.priority - parserA.priority);
 			for (const [parser, index] of remainingParsers) {
-				const result = await parser.parse(withChildContext(currentContext, index, stateArray[index], parser));
+				const result = await parser.parse(withChildContext$1(currentContext, index, stateArray[index], parser));
 				if (result.success && result.consumed.length > 0) {
 					const newStateArray = require_annotations.annotateFreshArray(currentContext.state, stateArray.map((s, idx) => idx === index ? require_annotation_state.getWrappedChildState(currentContext.state, result.next.state, parser) : s));
-					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
+					const mergedExec = require_execution_context.mergeChildExec(currentContext.exec, result.next.exec);
 					currentContext = {
 						...currentContext,
 						buffer: result.next.buffer,
@@ -3905,10 +3873,10 @@ function concat(...parsers) {
 				} else if (!result.success && error.consumed < result.consumed) error = result;
 			}
 			if (!foundMatch) for (const [parser, index] of remainingParsers) {
-				const result = await parser.parse(withChildContext(currentContext, index, stateArray[index], parser));
+				const result = await parser.parse(withChildContext$1(currentContext, index, stateArray[index], parser));
 				if (result.success && result.consumed.length < 1) {
 					const newStateArray = require_annotations.annotateFreshArray(currentContext.state, stateArray.map((s, idx) => idx === index ? require_annotation_state.getWrappedChildState(currentContext.state, result.next.state, parser) : s));
-					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
+					const mergedExec = require_execution_context.mergeChildExec(currentContext.exec, result.next.exec);
 					currentContext = {
 						...currentContext,
 						state: newStateArray,
@@ -3959,7 +3927,7 @@ function concat(...parsers) {
 		for (let i = 0; i < syncParsers.length; i++) {
 			const parser = syncParsers[i];
 			const preCompletedResult = preCompleted.get(String(i));
-			const result = preCompletedResult !== void 0 ? unwrapCompleteResult(preCompletedResult) : unwrapCompleteResult(parser.complete(prepareStateForCompletion(resolvedArray[i], parser), withChildExecPath(phase3Exec, i)));
+			const result = preCompletedResult !== void 0 ? unwrapCompleteResult(preCompletedResult) : unwrapCompleteResult(parser.complete(prepareStateForCompletion(resolvedArray[i], parser), require_execution_context.withChildExecPath(phase3Exec, i)));
 			if (!result.success) return result;
 			const baseIndex = results.length;
 			if (Array.isArray(result.value)) {
@@ -4009,7 +3977,7 @@ function concat(...parsers) {
 		for (let i = 0; i < parsers.length; i++) {
 			const parser = parsers[i];
 			const preCompletedResult = preCompleted.get(String(i));
-			const result = preCompletedResult !== void 0 ? unwrapCompleteResult(preCompletedResult) : unwrapCompleteResult(await parser.complete(prepareStateForCompletion(resolvedArray[i], parser), withChildExecPath(phase3Exec, i)));
+			const result = preCompletedResult !== void 0 ? unwrapCompleteResult(preCompletedResult) : unwrapCompleteResult(await parser.complete(prepareStateForCompletion(resolvedArray[i], parser), require_execution_context.withChildExecPath(phase3Exec, i)));
 			if (!result.success) return result;
 			const baseIndex = results.length;
 			if (Array.isArray(result.value)) {
@@ -4038,7 +4006,7 @@ function concat(...parsers) {
 		};
 	};
 	const concatParser = {
-		$mode: combinedMode,
+		mode: combinedMode,
 		$valueType: [],
 		$stateType: [],
 		priority: parsers.length > 0 ? Math.max(...parsers.map((p) => p.priority)) : 0,
@@ -4074,7 +4042,7 @@ function concat(...parsers) {
 				let hasAnySeed = false;
 				for (let i = 0; i < syncParsers.length; i++) {
 					const parser = syncParsers[i];
-					const childExec$1 = withChildExecPath(phase3Exec, i);
+					const childExec$1 = require_execution_context.withChildExecPath(phase3Exec, i);
 					const preCompletedResult = preCompleted.get(String(i));
 					const seed = preCompletedResult !== void 0 ? reusePreCompletedPhase2Seed(parser, prepareStateForCompletion(resolvedArray[i], parser), preCompletedResult, childExec$1) : require_phase2_seed.completeOrExtractPhase2Seed(parser, prepareStateForCompletion(resolvedArray[i], parser), childExec$1);
 					if (seed == null) continue;
@@ -4108,7 +4076,7 @@ function concat(...parsers) {
 				let hasAnySeed = false;
 				for (let i = 0; i < parsers.length; i++) {
 					const parser = parsers[i];
-					const childExec$1 = withChildExecPath(phase3Exec, i);
+					const childExec$1 = require_execution_context.withChildExecPath(phase3Exec, i);
 					const preCompletedResult = preCompleted.get(String(i));
 					const seed = preCompletedResult !== void 0 ? await reusePreCompletedPhase2SeedAsync(parser, prepareStateForCompletion(resolvedArray[i], parser), preCompletedResult, childExec$1) : await require_phase2_seed.completeOrExtractPhase2Seed(parser, prepareStateForCompletion(resolvedArray[i], parser), childExec$1);
 					if (seed == null) continue;
@@ -4133,8 +4101,8 @@ function concat(...parsers) {
 				for (let i = 0; i < parsers.length; i++) {
 					const parser = parsers[i];
 					const parserState = stateArray$1 && Array.isArray(stateArray$1) ? stateArray$1[i] : parser.initialState;
-					const parserSuggestions = parser.suggest(withChildContext(contextWithRegistry$1, i, parserState, parser), prefix);
-					if (parser.$mode === "async") for await (const s of parserSuggestions) suggestions.push(s);
+					const parserSuggestions = parser.suggest(withChildContext$1(contextWithRegistry$1, i, parserState, parser), prefix);
+					if (parser.mode === "async") for await (const s of parserSuggestions) suggestions.push(s);
 					else suggestions.push(...parserSuggestions);
 				}
 				yield* require_suggestion.deduplicateSuggestions(suggestions);
@@ -4146,7 +4114,7 @@ function concat(...parsers) {
 				for (let i = 0; i < syncParsers.length; i++) {
 					const parser = syncParsers[i];
 					const parserState = stateArray && Array.isArray(stateArray) ? stateArray[i] : parser.initialState;
-					const parserSuggestions = parser.suggest(withChildContext(contextWithRegistry, i, parserState, parser), prefix);
+					const parserSuggestions = parser.suggest(withChildContext$1(contextWithRegistry, i, parserState, parser), prefix);
 					suggestions.push(...parserSuggestions);
 				}
 				yield* require_suggestion.deduplicateSuggestions(suggestions);
@@ -4184,7 +4152,7 @@ function concat(...parsers) {
 function group(label, parser, options = {}) {
 	require_validate.validateLabel(label);
 	const groupParser = {
-		$mode: parser.$mode,
+		mode: parser.mode,
 		$valueType: parser.$valueType,
 		$stateType: parser.$stateType,
 		priority: parser.priority,
@@ -4204,7 +4172,7 @@ function group(label, parser, options = {}) {
 		parse: (context) => parser.parse(context),
 		complete: (state, exec) => parser.complete(state, exec),
 		suggest: (context, prefix) => {
-			if (options.hidden === true) return require_mode_dispatch.dispatchIterableByMode(parser.$mode, function* () {}, async function* () {});
+			if (options.hidden === true) return require_mode_dispatch.dispatchIterableByMode(parser.mode, function* () {}, async function* () {});
 			return parser.suggest(context, prefix);
 		},
 		getDocFragments: (state, defaultValue) => {
@@ -4330,7 +4298,7 @@ function group(label, parser, options = {}) {
 function conditional(discriminator, branches, defaultBranch, options) {
 	const branchParsers = Object.entries(branches);
 	const allBranchParsers = defaultBranch ? [...branchParsers.map(([_, p]) => p), defaultBranch] : branchParsers.map(([_, p]) => p);
-	const combinedMode = discriminator.$mode === "async" || allBranchParsers.some((p) => p.$mode === "async") ? "async" : "sync";
+	const combinedMode = discriminator.mode === "async" || allBranchParsers.some((p) => p.mode === "async") ? "async" : "sync";
 	const isAsync = combinedMode === "async";
 	const maxPriority = Math.max(discriminator.priority, ...allBranchParsers.map((p) => p.priority));
 	function appendLiteralToUsage(usage$1, literalValue) {
@@ -4381,9 +4349,9 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		const syncDefaultBranch = defaultBranch;
 		if (state.selectedBranch !== void 0) {
 			const branchParser = state.selectedBranch.kind === "default" ? syncDefaultBranch : syncBranches[state.selectedBranch.key];
-			const branchResult = branchParser.parse(withChildContext(context, "_branch", state.branchState, branchParser, branchParser.usage));
+			const branchResult = branchParser.parse(withChildContext$1(context, "_branch", state.branchState, branchParser, branchParser.usage));
 			if (branchResult.success) {
-				const mergedExec = mergeChildExec(context.exec, branchResult.next.exec);
+				const mergedExec = require_execution_context.mergeChildExec(context.exec, branchResult.next.exec);
 				return {
 					success: true,
 					next: {
@@ -4402,17 +4370,17 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			}
 			return branchResult;
 		}
-		const discriminatorResult = syncDiscriminator.parse({ ...withChildContext(context, "_discriminator", state.discriminatorState, syncDiscriminator) });
+		const discriminatorResult = syncDiscriminator.parse({ ...withChildContext$1(context, "_discriminator", state.discriminatorState, syncDiscriminator) });
 		if (discriminatorResult.success) {
 			const annotatedDiscriminatorState = require_annotation_state.getWrappedChildState(state, discriminatorResult.next.state, syncDiscriminator);
-			const completionResult = syncDiscriminator.complete(annotatedDiscriminatorState, withChildExecPath(context.exec, "_discriminator"));
+			const completionResult = syncDiscriminator.complete(annotatedDiscriminatorState, require_execution_context.withChildExecPath(context.exec, "_discriminator"));
 			if (completionResult.success) {
 				const value = completionResult.value;
 				const branchParser = syncBranches[value];
 				if (branchParser) {
-					const discriminatorExec = mergeChildExec(context.exec, discriminatorResult.next.exec);
+					const discriminatorExec = require_execution_context.mergeChildExec(context.exec, discriminatorResult.next.exec);
 					const branchParseResult = branchParser.parse({
-						...withChildContext({
+						...withChildContext$1({
 							...context,
 							...discriminatorExec != null ? {
 								exec: discriminatorExec,
@@ -4423,7 +4391,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 						optionsTerminated: discriminatorResult.next.optionsTerminated
 					});
 					if (branchParseResult.success) {
-						const mergedExec = mergeChildExec(discriminatorExec, branchParseResult.next.exec);
+						const mergedExec = require_execution_context.mergeChildExec(discriminatorExec, branchParseResult.next.exec);
 						const isProvisional = branchParseResult.provisional || discriminatorResult.consumed.length === 0 && branchParseResult.consumed.length === 0 && (branchParser.leadingNames.size > 0 || branchParser.acceptingAnyToken);
 						return {
 							success: true,
@@ -4478,9 +4446,9 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		}
 		const discriminatorConsumed = discriminatorResult.success ? discriminatorResult.consumed.length : discriminatorResult.consumed;
 		if (syncDefaultBranch !== void 0) {
-			const defaultResult = syncDefaultBranch.parse(withChildContext(context, "_branch", state.branchState ?? syncDefaultBranch.initialState, syncDefaultBranch, syncDefaultBranch.usage));
+			const defaultResult = syncDefaultBranch.parse(withChildContext$1(context, "_branch", state.branchState ?? syncDefaultBranch.initialState, syncDefaultBranch, syncDefaultBranch.usage));
 			if (defaultResult.success && (defaultResult.consumed.length > 0 || discriminatorConsumed === 0 && context.buffer.length === 0)) {
-				const mergedExec = mergeChildExec(context.exec, defaultResult.next.exec);
+				const mergedExec = require_execution_context.mergeChildExec(context.exec, defaultResult.next.exec);
 				const commitDefault = defaultResult.consumed.length > 0 || context.buffer.length === 0;
 				return {
 					success: true,
@@ -4512,9 +4480,9 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		const state = context.state ?? initialState;
 		if (state.selectedBranch !== void 0) {
 			const branchParser = state.selectedBranch.kind === "default" ? defaultBranch : branches[state.selectedBranch.key];
-			const branchResult = await branchParser.parse(withChildContext(context, "_branch", state.branchState, branchParser, branchParser.usage));
+			const branchResult = await branchParser.parse(withChildContext$1(context, "_branch", state.branchState, branchParser, branchParser.usage));
 			if (branchResult.success) {
-				const mergedExec = mergeChildExec(context.exec, branchResult.next.exec);
+				const mergedExec = require_execution_context.mergeChildExec(context.exec, branchResult.next.exec);
 				return {
 					success: true,
 					...state.speculative || branchResult.provisional ? { provisional: true } : {},
@@ -4534,10 +4502,10 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			}
 			return branchResult;
 		}
-		const discriminatorResult = await discriminator.parse({ ...withChildContext(context, "_discriminator", state.discriminatorState, discriminator) });
+		const discriminatorResult = await discriminator.parse({ ...withChildContext$1(context, "_discriminator", state.discriminatorState, discriminator) });
 		if (discriminatorResult.success) {
-			if (discriminatorResult.consumed.length === 0 && discriminator.$mode === "async") {
-				const discriminatorExec = mergeChildExec(context.exec, discriminatorResult.next.exec);
+			if (discriminatorResult.consumed.length === 0 && discriminator.mode === "async") {
+				const discriminatorExec = require_execution_context.mergeChildExec(context.exec, discriminatorResult.next.exec);
 				const speculationContext = {
 					...context,
 					buffer: discriminatorResult.next.buffer,
@@ -4553,7 +4521,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				let speculativeError;
 				let ambiguous = false;
 				for (const [key, bp] of branchParsers) {
-					const branchResult = await bp.parse(withChildContext(speculationContext, "_branch", bp.initialState, bp, bp.usage));
+					const branchResult = await bp.parse(withChildContext$1(speculationContext, "_branch", bp.initialState, bp, bp.usage));
 					if (branchResult.success && branchResult.consumed.length > 0) {
 						if (branchResult.provisional) {
 							if (provisionalHit == null && !provisionalAmbiguous) provisionalHit = {
@@ -4585,7 +4553,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 					const { key, bp, result: branchResult } = speculativeHit;
 					if (branchResult.success) {
 						const annotatedDiscriminatorState$2 = require_annotation_state.getWrappedChildState(state, discriminatorResult.next.state, discriminator);
-						const mergedExec = mergeChildExec(discriminatorExec, branchResult.next.exec);
+						const mergedExec = require_execution_context.mergeChildExec(discriminatorExec, branchResult.next.exec);
 						return {
 							success: true,
 							provisional: true,
@@ -4612,9 +4580,9 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				}
 				let deferredBranchState = state.branchState;
 				if (defaultBranch !== void 0 && !ambiguous && !provisionalAmbiguous) {
-					const defaultResult = await defaultBranch.parse(withChildContext(speculationContext, "_branch", state.branchState ?? defaultBranch.initialState, defaultBranch, defaultBranch.usage));
+					const defaultResult = await defaultBranch.parse(withChildContext$1(speculationContext, "_branch", state.branchState ?? defaultBranch.initialState, defaultBranch, defaultBranch.usage));
 					if (defaultResult.success && defaultResult.consumed.length > 0) {
-						const defaultExec = mergeChildExec(discriminatorExec ?? context.exec, defaultResult.next.exec);
+						const defaultExec = require_execution_context.mergeChildExec(discriminatorExec ?? context.exec, defaultResult.next.exec);
 						return {
 							success: true,
 							...defaultResult.provisional ? { provisional: true } : {},
@@ -4653,14 +4621,14 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				};
 			}
 			const annotatedDiscriminatorState = require_annotation_state.getWrappedChildState(state, discriminatorResult.next.state, discriminator);
-			const completionResult = await discriminator.complete(annotatedDiscriminatorState, withChildExecPath(context.exec, "_discriminator"));
+			const completionResult = await discriminator.complete(annotatedDiscriminatorState, require_execution_context.withChildExecPath(context.exec, "_discriminator"));
 			if (completionResult.success) {
 				const value = completionResult.value;
 				const branchParser = branches[value];
 				if (branchParser) {
-					const discriminatorExec = mergeChildExec(context.exec, discriminatorResult.next.exec);
+					const discriminatorExec = require_execution_context.mergeChildExec(context.exec, discriminatorResult.next.exec);
 					const branchParseResult = await branchParser.parse({
-						...withChildContext({
+						...withChildContext$1({
 							...context,
 							...discriminatorExec != null ? {
 								exec: discriminatorExec,
@@ -4671,7 +4639,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 						optionsTerminated: discriminatorResult.next.optionsTerminated
 					});
 					if (branchParseResult.success) {
-						const mergedExec = mergeChildExec(discriminatorExec, branchParseResult.next.exec);
+						const mergedExec = require_execution_context.mergeChildExec(discriminatorExec, branchParseResult.next.exec);
 						return {
 							success: true,
 							...branchParseResult.provisional || discriminatorResult.consumed.length === 0 && branchParseResult.consumed.length === 0 && (branchParser.leadingNames.size > 0 || branchParser.acceptingAnyToken) ? { provisional: true } : {},
@@ -4725,9 +4693,9 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		}
 		const discriminatorConsumed = discriminatorResult.success ? discriminatorResult.consumed.length : discriminatorResult.consumed;
 		if (defaultBranch !== void 0) {
-			const defaultResult = await defaultBranch.parse(withChildContext(context, "_branch", state.branchState ?? defaultBranch.initialState, defaultBranch, defaultBranch.usage));
+			const defaultResult = await defaultBranch.parse(withChildContext$1(context, "_branch", state.branchState ?? defaultBranch.initialState, defaultBranch, defaultBranch.usage));
 			if (defaultResult.success && (defaultResult.consumed.length > 0 || discriminatorConsumed === 0 && context.buffer.length === 0)) {
-				const mergedExec = mergeChildExec(context.exec, defaultResult.next.exec);
+				const mergedExec = require_execution_context.mergeChildExec(context.exec, defaultResult.next.exec);
 				const commitDefault = defaultResult.consumed.length > 0 || context.buffer.length === 0;
 				return {
 					success: true,
@@ -4762,12 +4730,12 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		if (state.selectedBranch === void 0) {
 			{
 				const annotatedDiscriminatorStateForDeferred = require_annotation_state.getWrappedChildState(state, state.discriminatorState, syncDiscriminator);
-				const deferredDiscriminatorResult = unwrapCompleteResult(syncDiscriminator.complete(annotatedDiscriminatorStateForDeferred, withChildExecPath(exec, "_discriminator")));
+				const deferredDiscriminatorResult = unwrapCompleteResult(syncDiscriminator.complete(annotatedDiscriminatorStateForDeferred, require_execution_context.withChildExecPath(exec, "_discriminator")));
 				if (deferredDiscriminatorResult.success) {
 					const deferredValue = deferredDiscriminatorResult.value;
 					const deferredBranch = syncBranches[deferredValue];
 					if (deferredBranch) {
-						const branchExec = withChildExecPath(exec, "_branch");
+						const branchExec = require_execution_context.withChildExecPath(exec, "_branch");
 						const emptyCtx = {
 							buffer: [],
 							optionsTerminated: false,
@@ -4805,7 +4773,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			}
 			if (syncDefaultBranch !== void 0) {
 				const branchState = require_annotation_state.getWrappedChildState(state, state.branchState ?? syncDefaultBranch.initialState, syncDefaultBranch);
-				const defaultResult = unwrapCompleteResult(syncDefaultBranch.complete(branchState, withChildExecPath(exec, "_branch")));
+				const defaultResult = unwrapCompleteResult(syncDefaultBranch.complete(branchState, require_execution_context.withChildExecPath(exec, "_branch")));
 				if (!defaultResult.success) return defaultResult;
 				return {
 					success: true,
@@ -4842,8 +4810,8 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			dependencyRegistry: runtime.registry
 		};
 		const needsDiscriminatorCompletion = state.selectedBranch.kind !== "default" && !(state.discriminatorValue != null && state.discriminatorValue === state.selectedBranch.key);
-		const discriminatorCompleteResult = needsDiscriminatorCompletion ? syncDiscriminator.complete(annotatedDiscriminatorState, withChildExecPath(completionExec, "_discriminator")) : void 0;
-		const branchResult = unwrapCompleteResult(branchParser.complete(resolvedBranchState, withChildExecPath(completionExec, "_branch")));
+		const discriminatorCompleteResult = needsDiscriminatorCompletion ? syncDiscriminator.complete(annotatedDiscriminatorState, require_execution_context.withChildExecPath(completionExec, "_discriminator")) : void 0;
+		const branchResult = unwrapCompleteResult(branchParser.complete(resolvedBranchState, require_execution_context.withChildExecPath(completionExec, "_branch")));
 		if (!branchResult.success) {
 			if (state.discriminatorValue !== void 0 && options?.errors?.branchError) return {
 				success: false,
@@ -4882,12 +4850,12 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		if (state.selectedBranch === void 0) {
 			if (exec?.phase !== "parse" && exec?.phase !== "suggest") {
 				const annotatedDiscriminatorStateForDeferred = require_annotation_state.getWrappedChildState(state, state.discriminatorState, discriminator);
-				const deferredDiscriminatorResult = unwrapCompleteResult(await discriminator.complete(annotatedDiscriminatorStateForDeferred, withChildExecPath(exec, "_discriminator")));
+				const deferredDiscriminatorResult = unwrapCompleteResult(await discriminator.complete(annotatedDiscriminatorStateForDeferred, require_execution_context.withChildExecPath(exec, "_discriminator")));
 				if (deferredDiscriminatorResult.success) {
 					const deferredValue = deferredDiscriminatorResult.value;
 					const deferredBranch = branches[deferredValue];
 					if (deferredBranch) {
-						const branchExec = withChildExecPath(exec, "_branch");
+						const branchExec = require_execution_context.withChildExecPath(exec, "_branch");
 						const emptyCtx = {
 							buffer: [],
 							optionsTerminated: false,
@@ -4929,7 +4897,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			};
 			if (defaultBranch !== void 0) {
 				const branchState = require_annotation_state.getWrappedChildState(state, state.branchState ?? defaultBranch.initialState, defaultBranch);
-				const defaultResult = unwrapCompleteResult(await defaultBranch.complete(branchState, withChildExecPath(exec, "_branch")));
+				const defaultResult = unwrapCompleteResult(await defaultBranch.complete(branchState, require_execution_context.withChildExecPath(exec, "_branch")));
 				if (!defaultResult.success) return defaultResult;
 				return {
 					success: true,
@@ -4977,7 +4945,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				dependencyRegistry: discOnlyRuntime.registry
 			};
 		}
-		const discriminatorCompleteResult = needsDiscriminatorCompletion ? await discriminator.complete(annotatedDiscriminatorState, withChildExecPath(discriminatorCompletionExec, "_discriminator")) : void 0;
+		const discriminatorCompleteResult = needsDiscriminatorCompletion ? await discriminator.complete(annotatedDiscriminatorState, require_execution_context.withChildExecPath(discriminatorCompletionExec, "_discriminator")) : void 0;
 		let discriminatorValue;
 		if (state.selectedBranch.kind === "default") discriminatorValue = void 0;
 		else if (state.discriminatorValue != null && state.discriminatorValue === state.selectedBranch.key) discriminatorValue = state.discriminatorValue;
@@ -4996,7 +4964,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			};
 		}
 		const resolvedBranchState = require_annotation_state.getWrappedChildState(state, await require_dependency_runtime.resolveStateWithRuntimeAsync(state.branchState, runtime), branchParser);
-		const branchResult = unwrapCompleteResult(await branchParser.complete(resolvedBranchState, withChildExecPath(completionExec, "_branch")));
+		const branchResult = unwrapCompleteResult(await branchParser.complete(resolvedBranchState, require_execution_context.withChildExecPath(completionExec, "_branch")));
 		if (!branchResult.success) {
 			if (discriminatorValue !== void 0 && options?.errors?.branchError) return {
 				success: false,
@@ -5014,12 +4982,12 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		};
 	};
 	const getConditionalBranchSeedSync = (currentState, branchParser, branchState, exec) => {
-		const branchExec = withChildExecPath(exec, "_branch");
+		const branchExec = require_execution_context.withChildExecPath(exec, "_branch");
 		const annotatedState = require_annotation_state.getWrappedChildState(currentState, branchState, branchParser);
 		return extractOrCompletePhase2SeedSync(branchParser, annotatedState, branchExec);
 	};
 	const getConditionalBranchSeedAsync = async (currentState, branchParser, branchState, exec) => {
-		const branchExec = withChildExecPath(exec, "_branch");
+		const branchExec = require_execution_context.withChildExecPath(exec, "_branch");
 		const annotatedState = require_annotation_state.getWrappedChildState(currentState, branchState, branchParser);
 		return await extractOrCompletePhase2SeedAsync(branchParser, annotatedState, branchExec);
 	};
@@ -5046,16 +5014,16 @@ function conditional(discriminator, branches, defaultBranch, options) {
 					dependencyRegistry: runtime.registry
 				} } : {}
 			};
-			yield* syncDiscriminator.suggest(withChildContext(suggestContext, "_discriminator", state.discriminatorState, syncDiscriminator), prefix);
+			yield* syncDiscriminator.suggest(withChildContext$1(suggestContext, "_discriminator", state.discriminatorState, syncDiscriminator), prefix);
 			const annotatedDiscState = require_annotation_state.getWrappedChildState(state, state.discriminatorState, syncDiscriminator);
-			const discComplete = syncDiscriminator.complete(annotatedDiscState, withChildExecPath(suggestContext.exec ? {
+			const discComplete = syncDiscriminator.complete(annotatedDiscState, require_execution_context.withChildExecPath(suggestContext.exec ? {
 				...suggestContext.exec,
 				phase: "suggest"
 			} : void 0, "_discriminator"));
 			if (discComplete.success && syncBranches[discComplete.value] !== void 0) {
 				const resolvedBranch = syncBranches[discComplete.value];
-				yield* resolvedBranch.suggest(withChildContext(suggestContext, "_branch", state.branchState ?? resolvedBranch.initialState, resolvedBranch), prefix);
-			} else if (syncDefaultBranch !== void 0) yield* syncDefaultBranch.suggest(withChildContext(suggestContext, "_branch", state.branchState ?? syncDefaultBranch.initialState, syncDefaultBranch), prefix);
+				yield* resolvedBranch.suggest(withChildContext$1(suggestContext, "_branch", state.branchState ?? resolvedBranch.initialState, resolvedBranch), prefix);
+			} else if (syncDefaultBranch !== void 0) yield* syncDefaultBranch.suggest(withChildContext$1(suggestContext, "_branch", state.branchState ?? syncDefaultBranch.initialState, syncDefaultBranch), prefix);
 		} else {
 			const branchParser = state.selectedBranch.kind === "default" ? syncDefaultBranch : syncBranches[state.selectedBranch.key];
 			const runtime = require_dependency_runtime.createDependencyRuntimeContext(context.dependencyRegistry?.clone());
@@ -5075,7 +5043,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 					dependencyRegistry: runtime.registry
 				} } : {}
 			};
-			yield* branchParser.suggest(withChildContext(suggestContext, "_branch", state.branchState, branchParser), prefix);
+			yield* branchParser.suggest(withChildContext$1(suggestContext, "_branch", state.branchState, branchParser), prefix);
 		}
 	}
 	async function* suggestAsync(context, prefix) {
@@ -5098,22 +5066,22 @@ function conditional(discriminator, branches, defaultBranch, options) {
 					dependencyRegistry: runtime.registry
 				} } : {}
 			};
-			yield* discriminator.suggest(withChildContext(suggestContext, "_discriminator", state.discriminatorState, discriminator), prefix);
+			yield* discriminator.suggest(withChildContext$1(suggestContext, "_discriminator", state.discriminatorState, discriminator), prefix);
 			let discResolved = false;
-			if (discriminator.$mode === "sync") {
+			if (discriminator.mode === "sync") {
 				const annotatedDiscState = require_annotation_state.getWrappedChildState(state, state.discriminatorState, discriminator);
-				const discComplete = discriminator.complete(annotatedDiscState, withChildExecPath(suggestContext.exec ? {
+				const discComplete = discriminator.complete(annotatedDiscState, require_execution_context.withChildExecPath(suggestContext.exec ? {
 					...suggestContext.exec,
 					phase: "suggest"
 				} : void 0, "_discriminator"));
 				if (discComplete.success && branches[discComplete.value] !== void 0) {
 					const resolvedBranch = branches[discComplete.value];
-					yield* resolvedBranch.suggest(withChildContext(suggestContext, "_branch", state.branchState ?? resolvedBranch.initialState, resolvedBranch), prefix);
+					yield* resolvedBranch.suggest(withChildContext$1(suggestContext, "_branch", state.branchState ?? resolvedBranch.initialState, resolvedBranch), prefix);
 					discResolved = true;
 				}
 			}
 			if (!discResolved) {
-				if (defaultBranch !== void 0) yield* defaultBranch.suggest(withChildContext(suggestContext, "_branch", state.branchState ?? defaultBranch.initialState, defaultBranch), prefix);
+				if (defaultBranch !== void 0) yield* defaultBranch.suggest(withChildContext$1(suggestContext, "_branch", state.branchState ?? defaultBranch.initialState, defaultBranch), prefix);
 			}
 		} else {
 			const branchParser = state.selectedBranch.kind === "default" ? defaultBranch : branches[state.selectedBranch.key];
@@ -5134,11 +5102,11 @@ function conditional(discriminator, branches, defaultBranch, options) {
 					dependencyRegistry: runtime.registry
 				} } : {}
 			};
-			yield* branchParser.suggest(withChildContext(suggestContext, "_branch", state.branchState, branchParser), prefix);
+			yield* branchParser.suggest(withChildContext$1(suggestContext, "_branch", state.branchState, branchParser), prefix);
 		}
 	}
 	const conditionalParser = {
-		$mode: combinedMode,
+		mode: combinedMode,
 		$valueType: [],
 		$stateType: [],
 		priority: maxPriority,
@@ -5159,7 +5127,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				const syncDiscriminator = discriminator;
 				const syncDefaultBranch = defaultBranch;
 				const syncBranches = branches;
-				const discriminatorExec = withChildExecPath(exec, "_discriminator");
+				const discriminatorExec = require_execution_context.withChildExecPath(exec, "_discriminator");
 				if (state.selectedBranch === void 0) {
 					const discriminatorSeed$1 = require_phase2_seed.completeOrExtractPhase2Seed(syncDiscriminator, require_annotation_state.getWrappedChildState(state, state.discriminatorState, syncDiscriminator), discriminatorExec);
 					if (typeof discriminatorSeed$1?.value === "string") {
@@ -5180,7 +5148,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				const discriminatorSeed = state.selectedBranch.kind === "default" ? null : state.discriminatorValue != null && state.discriminatorValue === state.selectedBranch.key ? { value: state.discriminatorValue } : require_phase2_seed.completeOrExtractPhase2Seed(syncDiscriminator, require_annotation_state.getWrappedChildState(state, state.discriminatorState, syncDiscriminator), discriminatorExec) ?? { value: state.selectedBranch.key };
 				return combineTuplePhase2Seeds(discriminatorSeed, branchSeed);
 			}, async () => {
-				const discriminatorExec = withChildExecPath(exec, "_discriminator");
+				const discriminatorExec = require_execution_context.withChildExecPath(exec, "_discriminator");
 				if (state.selectedBranch === void 0) {
 					const discriminatorSeed$1 = await require_phase2_seed.completeOrExtractPhase2Seed(discriminator, require_annotation_state.getWrappedChildState(state, state.discriminatorState, discriminator), discriminatorExec);
 					if (typeof discriminatorSeed$1?.value === "string") {