@optique/core 1.0.0-dev.1611 → 1.0.0-dev.1658

package/dist/constructs.cjs

@@ -1,13 +1,14 @@
 const require_annotations = require('./annotations.cjs');
 const require_message = require('./message.cjs');
 const require_dependency = require('./dependency.cjs');
-const require_dependency_runtime = require('./dependency-runtime.cjs');
-const require_mode_dispatch = require('./mode-dispatch.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_suggestion = require('./suggestion.cjs');
 const require_usage_internals = require('./usage-internals.cjs');
+const require_parser = require('./parser.cjs');
+const require_dependency_runtime = require('./dependency-runtime.cjs');
 
 //#region src/constructs.ts
 /**
@@ -15,6 +16,59 @@ const require_usage_internals = require('./usage-internals.cjs');
 * do not match any specific name at the first buffer position.
 */
 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 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,
+		preCompletedByParser: child.preCompletedByParser ?? parent.preCompletedByParser,
+		excludedSourceFields: child.excludedSourceFields ?? parent.excludedSourceFields
+	};
+}
+function withChildContext(context, segment, state, usage) {
+	const exec = withChildExecPath(context.exec, segment);
+	const dependencyRegistry = context.dependencyRegistry ?? exec?.dependencyRegistry;
+	return {
+		...context,
+		state,
+		...usage != null ? { usage } : {},
+		...exec != null ? {
+			exec: dependencyRegistry === exec.dependencyRegistry ? exec : {
+				...exec,
+				dependencyRegistry
+			},
+			dependencyRegistry
+		} : {}
+	};
+}
+function isUnmatchedDependencyState(state, parser) {
+	if (state === void 0) return true;
+	if (Array.isArray(state) && state.length === 1 && require_dependency.isPendingDependencySourceState(state[0])) return true;
+	if (require_dependency.isPendingDependencySourceState(state)) return true;
+	if (isNonCliBoundSourceState(state, parser)) return true;
+	return state === parser.initialState;
+}
+function filterPreCompletedRuntimeNodes(nodes, preCompletedKeys) {
+	if (preCompletedKeys.size < 1) return nodes;
+	return nodes.filter((node) => {
+		const segment = node.path.at(-1);
+		if (typeof segment === "number") return !preCompletedKeys.has(String(segment));
+		return segment == null || !preCompletedKeys.has(segment);
+	});
+}
 /**
 * Computes the union of `leadingNames` from all given parsers.
 * Used for alternative combinators (`or()`, `longestMatch()`) where all
@@ -93,8 +147,12 @@ function prepareStateForCompletion(fieldState, parser) {
 */
 function getAnnotatedFieldState(parentState, field, parser) {
 	const sourceState = parentState != null && typeof parentState === "object" && field in parentState ? parentState[field] : parser.initialState;
-	if (sourceState == null || typeof sourceState !== "object") return sourceState;
 	const annotations = require_annotations.getAnnotations(parentState);
+	if (sourceState == null) {
+		if (annotations !== void 0 && Reflect.get(parser, inheritParentAnnotationsKey) === true) return require_annotations.injectAnnotations({}, annotations);
+		return sourceState;
+	}
+	if (typeof sourceState !== "object") return sourceState;
 	if (annotations === void 0 || require_annotations.getAnnotations(sourceState) === annotations) return sourceState;
 	return Reflect.get(parser, inheritParentAnnotationsKey) === true ? require_annotations.injectAnnotations(sourceState, annotations) : require_annotations.inheritAnnotations(parentState, sourceState);
 }
@@ -304,8 +362,8 @@ function createExclusiveComplete(parsers, options, noMatchContext, mode) {
 			success: false,
 			error: result.error
 		};
-		return require_mode_dispatch.dispatchByMode(mode, () => syncParsers[i].complete(result.next.state, exec), async () => {
-			const completeResult = await parsers[i].complete(result.next.state, exec);
+		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 completeResult;
 		});
 	};
@@ -319,31 +377,24 @@ function createExclusiveSuggest(parsers, mode) {
 	return (context, prefix) => {
 		return require_mode_dispatch.dispatchIterableByMode(mode, function* () {
 			const suggestions = [];
-			if (context.state == null) for (const parser of syncParsers) {
-				const parserSuggestions = parser.suggest({
-					...context,
-					state: parser.initialState
-				}, prefix);
+			if (context.state == null) for (let i = 0; i < syncParsers.length; i++) {
+				const parser = syncParsers[i];
+				const parserSuggestions = parser.suggest(withChildContext(context, i, parser.initialState), prefix);
 				suggestions.push(...parserSuggestions);
 			}
 			else {
 				const [index, parserResult] = context.state;
 				if (parserResult.success) {
-					const parserSuggestions = syncParsers[index].suggest({
-						...context,
-						state: parserResult.next.state
-					}, prefix);
+					const parserSuggestions = syncParsers[index].suggest(withChildContext(context, index, parserResult.next.state), prefix);
 					suggestions.push(...parserSuggestions);
 				}
 			}
 			yield* require_suggestion.deduplicateSuggestions(suggestions);
 		}, async function* () {
 			const suggestions = [];
-			if (context.state == null) for (const parser of parsers) {
-				const parserSuggestions = parser.suggest({
-					...context,
-					state: parser.initialState
-				}, prefix);
+			if (context.state == null) for (let i = 0; i < parsers.length; i++) {
+				const parser = parsers[i];
+				const parserSuggestions = parser.suggest(withChildContext(context, i, parser.initialState), prefix);
 				if (parser.$mode === "async") for await (const s of parserSuggestions) suggestions.push(s);
 				else suggestions.push(...parserSuggestions);
 			}
@@ -351,10 +402,7 @@ function createExclusiveSuggest(parsers, mode) {
 				const [index, parserResult] = context.state;
 				if (parserResult.success) {
 					const parser = parsers[index];
-					const parserSuggestions = parser.suggest({
-						...context,
-						state: parserResult.next.state
-					}, prefix);
+					const parserSuggestions = parser.suggest(withChildContext(context, index, parserResult.next.state), prefix);
 					if (parser.$mode === "async") for await (const s of parserSuggestions) suggestions.push(s);
 					else suggestions.push(...parserSuggestions);
 				}
@@ -363,6 +411,13 @@ function createExclusiveSuggest(parsers, mode) {
 		});
 	};
 }
+function getExclusiveSuggestRuntimeNodes(parsers, state, path) {
+	if (!Array.isArray(state) || state.length !== 2 || typeof state[0] !== "number") return [];
+	const [index, parserResult] = state;
+	if (!parserResult?.success || index < 0 || index >= parsers.length) return [];
+	const parser = parsers[index];
+	return require_parser.getParserSuggestRuntimeNodes(parser, parserResult.next.state, [...path, index]);
+}
 /**
 * Gets the no-match error, either from custom options or default.
 * Shared by or() and longestMatch().
@@ -372,6 +427,26 @@ function getNoMatchError(options, noMatchContext) {
 	const customNoMatch = options?.errors?.noMatch;
 	return customNoMatch ? typeof customNoMatch === "function" ? customNoMatch(noMatchContext) : customNoMatch : generateNoMatchError(noMatchContext);
 }
+function composeExclusiveDependencyMetadata(parsers) {
+	const sourceBranches = parsers.filter((parser) => parser.dependencyMetadata?.source != null);
+	if (sourceBranches.length < 1) return void 0;
+	const sourceIds = new Set(sourceBranches.map((parser) => parser.dependencyMetadata.source.sourceId));
+	if (sourceIds.size !== 1) return void 0;
+	const sharedSource = sourceBranches[0].dependencyMetadata.source;
+	return { source: {
+		...sharedSource,
+		getMissingSourceValue: void 0,
+		preservesSourceValue: sourceBranches.every((parser) => parser.dependencyMetadata?.source?.preservesSourceValue !== false),
+		extractSourceValue(state) {
+			if (!Array.isArray(state) || state.length !== 2 || typeof state[0] !== "number") return void 0;
+			const [index, parserResult] = state;
+			if (!parserResult?.success) return void 0;
+			const branchSource = parsers[index].dependencyMetadata?.source;
+			if (branchSource?.extractSourceValue == null) return void 0;
+			return branchSource.extractSourceValue(parserResult.next.state);
+		}
+	} };
+}
 /**
 * @since 0.5.0
 */
@@ -404,17 +479,13 @@ function or(...args) {
 		const orderedParsers = syncParsers.map((p, i) => [p, i]);
 		orderedParsers.sort(([_, a], [__, b]) => context.state?.[0] === a ? -1 : context.state?.[0] === b ? 1 : a - b);
 		for (const [parser, i] of orderedParsers) {
-			const result = parser.parse({
-				...context,
-				state: context.state == null || context.state[0] !== i || !context.state[1].success ? parser.initialState : context.state[1].next.state
-			});
+			const result = parser.parse(withChildContext(context, i, context.state == null || context.state[0] !== i || !context.state[1].success ? parser.initialState : context.state[1].next.state));
 			if (result.success && result.consumed.length > 0) {
 				if (context.state?.[0] !== i && context.state?.[1].success) {
 					const previouslyConsumed = context.state[1].consumed;
 					const checkResult = parser.parse({
-						...context,
-						buffer: previouslyConsumed,
-						state: parser.initialState
+						...withChildContext(context, i, parser.initialState),
+						buffer: previouslyConsumed
 					});
 					const canConsumeShared = checkResult.success && checkResult.consumed.length === previouslyConsumed.length && checkResult.consumed.every((c, idx) => c === previouslyConsumed[idx]);
 					if (!canConsumeShared) return {
@@ -422,11 +493,19 @@ function or(...args) {
 						consumed: context.buffer.length - result.next.buffer.length,
 						error: require_message.message`${require_message.values(context.state[1].consumed)} and ${require_message.values(result.consumed)} cannot be used together.`
 					};
+					const replayExec = mergeChildExec(context.exec, checkResult.next.exec);
 					const replayedResult = parser.parse({
-						...context,
+						...withChildContext({
+							...context,
+							...replayExec != null ? {
+								exec: replayExec,
+								dependencyRegistry: replayExec.dependencyRegistry
+							} : {}
+						}, i, checkResult.next.state),
 						state: checkResult.next.state
 					});
 					if (!replayedResult.success) return replayedResult;
+					const mergedExec$1 = mergeChildExec(replayExec, replayedResult.next.exec);
 					return {
 						success: true,
 						next: {
@@ -436,18 +515,27 @@ function or(...args) {
 							state: [i, {
 								...replayedResult,
 								consumed: [...previouslyConsumed, ...replayedResult.consumed]
-							}]
+							}],
+							...mergedExec$1 != null ? {
+								exec: mergedExec$1,
+								dependencyRegistry: mergedExec$1.dependencyRegistry
+							} : {}
 						},
 						consumed: replayedResult.consumed
 					};
 				}
+				const mergedExec = mergeChildExec(context.exec, result.next.exec);
 				return {
 					success: true,
 					next: {
 						...context,
 						buffer: result.next.buffer,
 						optionsTerminated: result.next.optionsTerminated,
-						state: [i, result]
+						state: [i, result],
+						...mergedExec != null ? {
+							exec: mergedExec,
+							dependencyRegistry: mergedExec.dependencyRegistry
+						} : {}
 					},
 					consumed: result.consumed
 				};
@@ -463,18 +551,14 @@ function or(...args) {
 		const orderedParsers = parsers.map((p, i) => [p, i]);
 		orderedParsers.sort(([_, a], [__, b]) => context.state?.[0] === a ? -1 : context.state?.[0] === b ? 1 : a - b);
 		for (const [parser, i] of orderedParsers) {
-			const resultOrPromise = parser.parse({
-				...context,
-				state: context.state == null || context.state[0] !== i || !context.state[1].success ? parser.initialState : context.state[1].next.state
-			});
+			const resultOrPromise = parser.parse(withChildContext(context, i, context.state == null || context.state[0] !== i || !context.state[1].success ? parser.initialState : context.state[1].next.state));
 			const result = await resultOrPromise;
 			if (result.success && result.consumed.length > 0) {
 				if (context.state?.[0] !== i && context.state?.[1].success) {
 					const previouslyConsumed = context.state[1].consumed;
 					const checkResultOrPromise = parser.parse({
-						...context,
-						buffer: previouslyConsumed,
-						state: parser.initialState
+						...withChildContext(context, i, parser.initialState),
+						buffer: previouslyConsumed
 					});
 					const checkResult = await checkResultOrPromise;
 					const canConsumeShared = checkResult.success && checkResult.consumed.length === previouslyConsumed.length && checkResult.consumed.every((c, idx) => c === previouslyConsumed[idx]);
@@ -483,12 +567,17 @@ function or(...args) {
 						consumed: context.buffer.length - result.next.buffer.length,
 						error: require_message.message`${require_message.values(context.state[1].consumed)} and ${require_message.values(result.consumed)} cannot be used together.`
 					};
-					const replayedResultOrPromise = parser.parse({
+					const replayExec = mergeChildExec(context.exec, checkResult.next.exec);
+					const replayedResultOrPromise = parser.parse({ ...withChildContext({
 						...context,
-						state: checkResult.next.state
-					});
+						...replayExec != null ? {
+							exec: replayExec,
+							dependencyRegistry: replayExec.dependencyRegistry
+						} : {}
+					}, i, checkResult.next.state) });
 					const replayedResult = await replayedResultOrPromise;
 					if (!replayedResult.success) return replayedResult;
+					const mergedExec$1 = mergeChildExec(replayExec, replayedResult.next.exec);
 					return {
 						success: true,
 						next: {
@@ -498,18 +587,27 @@ function or(...args) {
 							state: [i, {
 								...replayedResult,
 								consumed: [...previouslyConsumed, ...replayedResult.consumed]
-							}]
+							}],
+							...mergedExec$1 != null ? {
+								exec: mergedExec$1,
+								dependencyRegistry: mergedExec$1.dependencyRegistry
+							} : {}
 						},
 						consumed: replayedResult.consumed
 					};
 				}
+				const mergedExec = mergeChildExec(context.exec, result.next.exec);
 				return {
 					success: true,
 					next: {
 						...context,
 						buffer: result.next.buffer,
 						optionsTerminated: result.next.optionsTerminated,
-						state: [i, result]
+						state: [i, result],
+						...mergedExec != null ? {
+							exec: mergedExec,
+							dependencyRegistry: mergedExec.dependencyRegistry
+						} : {}
 					},
 					consumed: result.consumed
 				};
@@ -536,6 +634,9 @@ function or(...args) {
 		parse(context) {
 			return require_mode_dispatch.dispatchByMode(combinedMode, () => parseSync(context), () => parseAsync(context));
 		},
+		getSuggestRuntimeNodes(state, path) {
+			return getExclusiveSuggestRuntimeNodes(parsers, state, path);
+		},
 		suggest: createExclusiveSuggest(parsers, combinedMode),
 		getDocFragments(state, _defaultValue) {
 			let brief;
@@ -564,6 +665,8 @@ function or(...args) {
 			};
 		}
 	};
+	const singleDependencyMetadata = composeExclusiveDependencyMetadata(parsers);
+	if (singleDependencyMetadata != null) singleResult.dependencyMetadata = singleDependencyMetadata;
 	return singleResult;
 }
 /**
@@ -598,10 +701,7 @@ function longestMatch(...args) {
 		let error = getInitialError(context);
 		for (let i = 0; i < syncParsers.length; i++) {
 			const parser = syncParsers[i];
-			const result = parser.parse({
-				...context,
-				state: context.state == null || context.state[0] !== i || !context.state[1].success ? parser.initialState : context.state[1].next.state
-			});
+			const result = parser.parse(withChildContext(context, i, context.state == null || context.state[0] !== i || !context.state[1].success ? parser.initialState : context.state[1].next.state));
 			if (result.success) {
 				const consumed = context.buffer.length - result.next.buffer.length;
 				if (bestMatch === null || consumed > bestMatch.consumed) bestMatch = {
@@ -611,16 +711,23 @@ function longestMatch(...args) {
 				};
 			} else if (error.consumed < result.consumed) error = result;
 		}
-		if (bestMatch && bestMatch.result.success) return {
-			success: true,
-			next: {
-				...context,
-				buffer: bestMatch.result.next.buffer,
-				optionsTerminated: bestMatch.result.next.optionsTerminated,
-				state: [bestMatch.index, bestMatch.result]
-			},
-			consumed: bestMatch.result.consumed
-		};
+		if (bestMatch && bestMatch.result.success) {
+			const mergedExec = mergeChildExec(context.exec, bestMatch.result.next.exec);
+			return {
+				success: true,
+				next: {
+					...context,
+					buffer: bestMatch.result.next.buffer,
+					optionsTerminated: bestMatch.result.next.optionsTerminated,
+					state: [bestMatch.index, bestMatch.result],
+					...mergedExec != null ? {
+						exec: mergedExec,
+						dependencyRegistry: mergedExec.dependencyRegistry
+					} : {}
+				},
+				consumed: bestMatch.result.consumed
+			};
+		}
 		return {
 			...error,
 			success: false
@@ -631,10 +738,7 @@ function longestMatch(...args) {
 		let error = getInitialError(context);
 		for (let i = 0; i < parsers.length; i++) {
 			const parser = parsers[i];
-			const resultOrPromise = parser.parse({
-				...context,
-				state: context.state == null || context.state[0] !== i || !context.state[1].success ? parser.initialState : context.state[1].next.state
-			});
+			const resultOrPromise = parser.parse(withChildContext(context, i, context.state == null || context.state[0] !== i || !context.state[1].success ? parser.initialState : context.state[1].next.state));
 			const result = await resultOrPromise;
 			if (result.success) {
 				const consumed = context.buffer.length - result.next.buffer.length;
@@ -645,16 +749,23 @@ function longestMatch(...args) {
 				};
 			} else if (error.consumed < result.consumed) error = result;
 		}
-		if (bestMatch && bestMatch.result.success) return {
-			success: true,
-			next: {
-				...context,
-				buffer: bestMatch.result.next.buffer,
-				optionsTerminated: bestMatch.result.next.optionsTerminated,
-				state: [bestMatch.index, bestMatch.result]
-			},
-			consumed: bestMatch.result.consumed
-		};
+		if (bestMatch && bestMatch.result.success) {
+			const mergedExec = mergeChildExec(context.exec, bestMatch.result.next.exec);
+			return {
+				success: true,
+				next: {
+					...context,
+					buffer: bestMatch.result.next.buffer,
+					optionsTerminated: bestMatch.result.next.optionsTerminated,
+					state: [bestMatch.index, bestMatch.result],
+					...mergedExec != null ? {
+						exec: mergedExec,
+						dependencyRegistry: mergedExec.dependencyRegistry
+					} : {}
+				},
+				consumed: bestMatch.result.consumed
+			};
+		}
 		return {
 			...error,
 			success: false
@@ -676,6 +787,9 @@ function longestMatch(...args) {
 		parse(context) {
 			return require_mode_dispatch.dispatchByMode(combinedMode, () => parseSync(context), () => parseAsync(context));
 		},
+		getSuggestRuntimeNodes(state, path) {
+			return getExclusiveSuggestRuntimeNodes(parsers, state, path);
+		},
 		suggest: createExclusiveSuggest(parsers, combinedMode),
 		getDocFragments(state, _defaultValue) {
 			let brief;
@@ -711,6 +825,8 @@ function longestMatch(...args) {
 			};
 		}
 	};
+	const multiDependencyMetadata = composeExclusiveDependencyMetadata(parsers);
+	if (multiDependencyMetadata != null) multiResult.dependencyMetadata = multiDependencyMetadata;
 	return multiResult;
 }
 /**
@@ -719,32 +835,32 @@ function longestMatch(...args) {
 */
 function* suggestObjectSync(context, prefix, parserPairs) {
 	const runtime = require_dependency_runtime.createDependencyRuntimeContext(context.dependencyRegistry?.clone());
-	const nodes = require_dependency_runtime.buildRuntimeNodesFromPairs(parserPairs, context.state && typeof context.state === "object" ? context.state : {}, context.exec?.path);
+	const sourceParserPairs = filterExcludedFieldParsers(parserPairs, context.exec?.excludedSourceFields);
+	const nodes = require_dependency_runtime.buildRuntimeNodesFromPairs(sourceParserPairs, context.state && typeof context.state === "object" ? context.state : {}, context.exec?.path);
 	require_dependency_runtime.collectExplicitSourceValues(nodes, runtime);
-	if (context.state && typeof context.state === "object") require_dependency_runtime.collectSourcesFromState(context.state, runtime);
-	completeDependencySourceDefaults(context, parserPairs, runtime.registry, context.exec);
+	if (context.state && typeof context.state === "object") require_dependency_runtime.collectSourcesFromState(context.state, runtime, /* @__PURE__ */ new WeakSet(), context.exec?.excludedSourceFields);
+	completeDependencySourceDefaults(context, sourceParserPairs, runtime.registry, context.exec);
 	const contextWithRegistry = {
 		...context,
-		dependencyRegistry: runtime.registry
+		dependencyRegistry: runtime.registry,
+		...context.exec != null ? { exec: {
+			...context.exec,
+			dependencyRuntime: runtime,
+			dependencyRegistry: runtime.registry
+		} } : {}
 	};
 	if (context.buffer.length > 0) {
 		const lastToken = context.buffer[context.buffer.length - 1];
 		for (const [field, parser] of parserPairs) if (isOptionRequiringValue(parser.usage, lastToken)) {
 			const fieldState = context.state && typeof context.state === "object" && field in context.state ? context.state[field] : parser.initialState;
-			yield* parser.suggest({
-				...contextWithRegistry,
-				state: fieldState
-			}, prefix);
+			yield* parser.suggest(withChildContext(contextWithRegistry, field, fieldState), prefix);
 			return;
 		}
 	}
 	const suggestions = [];
 	for (const [field, parser] of parserPairs) {
 		const fieldState = context.state && typeof context.state === "object" && field in context.state ? context.state[field] : parser.initialState;
-		const fieldSuggestions = parser.suggest({
-			...contextWithRegistry,
-			state: fieldState
-		}, prefix);
+		const fieldSuggestions = parser.suggest(withChildContext(contextWithRegistry, field, fieldState), prefix);
 		suggestions.push(...fieldSuggestions);
 	}
 	yield* require_suggestion.deduplicateSuggestions(suggestions);
@@ -755,22 +871,25 @@ function* suggestObjectSync(context, prefix, parserPairs) {
 */
 async function* suggestObjectAsync(context, prefix, parserPairs) {
 	const runtime = require_dependency_runtime.createDependencyRuntimeContext(context.dependencyRegistry?.clone());
-	const nodes = require_dependency_runtime.buildRuntimeNodesFromPairs(parserPairs, context.state && typeof context.state === "object" ? context.state : {}, context.exec?.path);
-	require_dependency_runtime.collectExplicitSourceValues(nodes, runtime);
-	if (context.state && typeof context.state === "object") require_dependency_runtime.collectSourcesFromState(context.state, runtime);
-	await completeDependencySourceDefaultsAsync(context, parserPairs, runtime.registry, context.exec);
+	const sourceParserPairs = filterExcludedFieldParsers(parserPairs, context.exec?.excludedSourceFields);
+	const nodes = require_dependency_runtime.buildRuntimeNodesFromPairs(sourceParserPairs, context.state && typeof context.state === "object" ? context.state : {}, context.exec?.path);
+	await require_dependency_runtime.collectExplicitSourceValuesAsync(nodes, runtime);
+	if (context.state && typeof context.state === "object") require_dependency_runtime.collectSourcesFromState(context.state, runtime, /* @__PURE__ */ new WeakSet(), context.exec?.excludedSourceFields);
+	await completeDependencySourceDefaultsAsync(context, sourceParserPairs, runtime.registry, context.exec);
 	const contextWithRegistry = {
 		...context,
-		dependencyRegistry: runtime.registry
+		dependencyRegistry: runtime.registry,
+		...context.exec != null ? { exec: {
+			...context.exec,
+			dependencyRuntime: runtime,
+			dependencyRegistry: runtime.registry
+		} } : {}
 	};
 	if (context.buffer.length > 0) {
 		const lastToken = context.buffer[context.buffer.length - 1];
 		for (const [field, parser] of parserPairs) if (isOptionRequiringValue(parser.usage, lastToken)) {
 			const fieldState = context.state && typeof context.state === "object" && field in context.state ? context.state[field] : parser.initialState;
-			const suggestions$1 = parser.suggest({
-				...contextWithRegistry,
-				state: fieldState
-			}, prefix);
+			const suggestions$1 = parser.suggest(withChildContext(contextWithRegistry, field, fieldState), prefix);
 			for await (const s of suggestions$1) yield s;
 			return;
 		}
@@ -778,10 +897,7 @@ async function* suggestObjectAsync(context, prefix, parserPairs) {
 	const suggestions = [];
 	for (const [field, parser] of parserPairs) {
 		const fieldState = context.state && typeof context.state === "object" && field in context.state ? context.state[field] : parser.initialState;
-		const fieldSuggestions = parser.suggest({
-			...contextWithRegistry,
-			state: fieldState
-		}, prefix);
+		const fieldSuggestions = parser.suggest(withChildContext(contextWithRegistry, field, fieldState), prefix);
 		for await (const s of fieldSuggestions) suggestions.push(s);
 	}
 	yield* require_suggestion.deduplicateSuggestions(suggestions);
@@ -805,6 +921,21 @@ function registerCompletedDependency(completed, registry) {
 function* pendingDependencyDefaults(context, parserPairs) {
 	for (const [field, fieldParser] of parserPairs) {
 		const fieldState = context.state != null && typeof context.state === "object" && field in context.state ? context.state[field] : void 0;
+		const annotatedFieldState = getAnnotatedFieldState(context.state, field, fieldParser);
+		if (fieldParser.dependencyMetadata?.source?.getMissingSourceValue != null && isUnmatchedDependencyState(fieldState, fieldParser)) {
+			yield {
+				parser: fieldParser,
+				state: annotatedFieldState
+			};
+			continue;
+		}
+		if (fieldParser.dependencyMetadata?.source != null && isUnmatchedDependencyState(fieldState, fieldParser) && (annotatedFieldState !== fieldState || isNonCliBoundSourceState(fieldState, fieldParser))) {
+			yield {
+				parser: fieldParser,
+				state: annotatedFieldState
+			};
+			continue;
+		}
 		if (fieldState != null) {
 			if (!Array.isArray(fieldState) && !require_dependency.isDependencySourceState(fieldState) && (require_dependency.isWrappedDependencySource(fieldParser) || require_dependency.isPendingDependencySourceState(fieldParser.initialState))) yield {
 				parser: fieldParser,
@@ -851,9 +982,11 @@ function completeDependencySourceDefaults(context, parserPairs, registry, exec)
 */
 function wrapAsDependencySourceState(completed, parser) {
 	if (require_dependency.isDependencySourceState(completed)) return completed;
-	const hasDep = require_dependency.isWrappedDependencySource(parser) || require_dependency.isPendingDependencySourceState(parser.initialState);
+	const metadataSource = parser.dependencyMetadata?.source;
+	if (metadataSource?.preservesSourceValue === false) return void 0;
+	const hasDep = metadataSource != null || require_dependency.isWrappedDependencySource(parser) || require_dependency.isPendingDependencySourceState(parser.initialState);
 	if (hasDep && typeof completed === "object" && completed !== null && "success" in completed && completed.success && "value" in completed && completed.value !== void 0) {
-		const depId = require_dependency.isWrappedDependencySource(parser) ? parser[require_dependency.wrappedDependencySourceMarker][require_dependency.dependencyId] : parser.initialState[require_dependency.dependencyId];
+		const depId = metadataSource?.sourceId ?? (require_dependency.isWrappedDependencySource(parser) ? parser[require_dependency.wrappedDependencySourceMarker][require_dependency.dependencyId] : parser.initialState[require_dependency.dependencyId]);
 		return require_dependency.createDependencySourceState(completed, depId);
 	}
 	return void 0;
@@ -909,6 +1042,20 @@ function collectChildFieldParsers(parsers) {
 	for (const parser of parsers) if (fieldParsersKey in parser) pairs.push(...parser[fieldParsersKey]);
 	return pairs;
 }
+function filterDuplicateFieldParsers(pairs) {
+	const counts = /* @__PURE__ */ new Map();
+	for (const [field] of pairs) counts.set(field, (counts.get(field) ?? 0) + 1);
+	return pairs.filter(([field]) => (counts.get(field) ?? 0) <= 1);
+}
+function collectDuplicateFieldNames(pairs) {
+	const counts = /* @__PURE__ */ new Map();
+	for (const [field] of pairs) counts.set(field, (counts.get(field) ?? 0) + 1);
+	return new Set([...counts.entries()].filter(([, count]) => count > 1).map(([field]) => field));
+}
+function filterExcludedFieldParsers(pairs, excludedFields) {
+	if (excludedFields == null || excludedFields.size < 1) return pairs;
+	return pairs.filter(([field]) => !excludedFields.has(field));
+}
 /**
 * Pre-completes dependency source fields and registers their values in
 * the given registry.  Unlike `completeDependencySourceDefaults()` (used
@@ -935,22 +1082,37 @@ function preCompleteAndRegisterDependencies(state, fieldParserPairs, registry, e
 			continue;
 		}
 		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));
+			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));
+			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, exec);
+			const completed = fieldParser.complete(fieldState, 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], exec);
+			const completed = fieldParser.complete([fieldParser.initialState], 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], exec);
+			const completed = fieldParser.complete([pendingState], 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 = getAnnotatedFieldState(state, field, fieldParser);
-			const completed = fieldParser.complete(annotatedFieldState, exec);
+			const annotatedFieldState$1 = getAnnotatedFieldState(state, field, fieldParser);
+			const completed = fieldParser.complete(annotatedFieldState$1, withChildExecPath(exec, field));
 			preCompleted.set(field, completed);
 			const depState = wrapAsDependencySourceState(completed, fieldParser);
 			if (depState) registerCompletedDependency(depState, registry);
@@ -973,22 +1135,37 @@ async function preCompleteAndRegisterDependenciesAsync(state, fieldParserPairs,
 			continue;
 		}
 		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));
+			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));
+			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, exec);
+			const completed = await fieldParser.complete(fieldState, 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], exec);
+			const completed = await fieldParser.complete([fieldParser.initialState], 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], exec);
+			const completed = await fieldParser.complete([pendingState], 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 = getAnnotatedFieldState(state, field, fieldParser);
-			const completed = await fieldParser.complete(annotatedFieldState, exec);
+			const annotatedFieldState$1 = getAnnotatedFieldState(state, field, fieldParser);
+			const completed = await fieldParser.complete(annotatedFieldState$1, withChildExecPath(exec, field));
 			preCompleted.set(field, completed);
 			const depState = wrapAsDependencySourceState(completed, fieldParser);
 			if (depState) registerCompletedDependency(depState, registry);
@@ -996,153 +1173,6 @@ async function preCompleteAndRegisterDependenciesAsync(state, fieldParserPairs,
 	}
 	return preCompleted;
 }
-/**
-* Recursively collects dependency values from DependencySourceState objects
-* found anywhere in the state tree.
-* @internal
-*/
-function collectDependencies(state, registry, visited = /* @__PURE__ */ new WeakSet()) {
-	if (state === null || state === void 0) return;
-	if (typeof state === "object") {
-		if (visited.has(state)) return;
-		visited.add(state);
-	}
-	if (require_dependency.isDependencySourceState(state)) {
-		const depId = state[require_dependency.dependencyId];
-		const result = state.result;
-		if (result.success) registry.set(depId, result.value);
-		return;
-	}
-	if (Array.isArray(state)) {
-		for (const item of state) collectDependencies(item, registry, visited);
-		return;
-	}
-	if (typeof state === "object" && !require_dependency.isDeferredParseState(state)) for (const key of Reflect.ownKeys(state)) collectDependencies(state[key], registry, visited);
-}
-/**
-* Checks if a value is a plain object (created with `{}` or `Object.create(null)`).
-* Class instances like `Temporal.PlainDate`, `URL`, `Date`, etc. return false.
-* This is used to determine whether to recursively traverse an object when
-* resolving deferred parse states - we only want to traverse plain objects
-* that are part of the parser state structure, not user values.
-*/
-function isPlainObject(value) {
-	if (typeof value !== "object" || value === null) return false;
-	const proto = Object.getPrototypeOf(value);
-	return proto === Object.prototype || proto === null;
-}
-/**
-* Collects dependency values for a DeferredParseState from the registry.
-* Returns the collected values array, or null if any required dependency
-* is missing (and no default is available).
-*/
-function collectDependencyValues(deferredState, registry) {
-	const depIds = deferredState.dependencyIds;
-	if (depIds && depIds.length > 0) {
-		const defaults$1 = deferredState.defaultValues;
-		const dependencyValues = [];
-		for (let i = 0; i < depIds.length; i++) {
-			const depId$1 = depIds[i];
-			if (registry.has(depId$1)) dependencyValues.push(registry.get(depId$1));
-			else if (defaults$1 && i < defaults$1.length) dependencyValues.push(defaults$1[i]);
-			else return null;
-		}
-		return dependencyValues;
-	}
-	const depId = deferredState.dependencyId;
-	if (registry.has(depId)) return registry.get(depId);
-	const defaults = deferredState.defaultValues;
-	if (defaults && defaults.length > 0) return defaults[0];
-	return null;
-}
-/**
-* Recursively resolves DeferredParseState objects found anywhere in the state tree.
-* Returns the resolved state (sync version).
-*
-* Only traverses:
-* - DeferredParseState (to resolve it)
-* - DependencySourceState (skipped, kept as-is)
-* - Arrays (to find nested deferred states)
-* - Plain objects (to find nested deferred states in parser state structures)
-*
-* Does NOT traverse class instances (e.g., Temporal.PlainDate, URL) since these
-* are user values that should be preserved as-is.
-*/
-function resolveDeferred(state, registry, visited = /* @__PURE__ */ new WeakSet()) {
-	if (state === null || state === void 0) return state;
-	if (typeof state === "object") {
-		if (visited.has(state)) return state;
-		visited.add(state);
-	}
-	if (require_dependency.isDeferredParseState(state)) {
-		const deferredState = state;
-		const dependencyValue = collectDependencyValues(deferredState, registry);
-		if (dependencyValue === null) return deferredState.preliminaryResult;
-		const reParseResult = deferredState.parser[require_dependency.parseWithDependency](deferredState.rawInput, dependencyValue);
-		if (reParseResult instanceof Promise) return deferredState.preliminaryResult;
-		return reParseResult;
-	}
-	if (require_dependency.isDependencySourceState(state)) return state;
-	if (Array.isArray(state)) return state.map((item) => resolveDeferred(item, registry, visited));
-	if (isPlainObject(state)) {
-		const resolved = {};
-		for (const key of Reflect.ownKeys(state)) resolved[key] = resolveDeferred(state[key], registry, visited);
-		return resolved;
-	}
-	return state;
-}
-function resolveDeferredParseStates(fieldStates, initialRegistry) {
-	const registry = initialRegistry ?? new require_dependency.DependencyRegistry();
-	collectDependencies(fieldStates, registry);
-	return resolveDeferred(fieldStates, registry);
-}
-/**
-* Recursively resolves DeferredParseState objects found anywhere in the state tree.
-* Returns the resolved state (async version).
-*
-* Only traverses:
-* - DeferredParseState (to resolve it)
-* - DependencySourceState (skipped, kept as-is)
-* - Arrays (to find nested deferred states)
-* - Plain objects (to find nested deferred states in parser state structures)
-*
-* Does NOT traverse class instances (e.g., Temporal.PlainDate, URL) since these
-* are user values that should be preserved as-is.
-*/
-async function resolveDeferredAsync(state, registry, visited = /* @__PURE__ */ new WeakSet()) {
-	if (state === null || state === void 0) return state;
-	if (typeof state === "object") {
-		if (visited.has(state)) return state;
-		visited.add(state);
-	}
-	if (require_dependency.isDeferredParseState(state)) {
-		const deferredState = state;
-		const dependencyValue = collectDependencyValues(deferredState, registry);
-		if (dependencyValue === null) return deferredState.preliminaryResult;
-		const reParseResult = deferredState.parser[require_dependency.parseWithDependency](deferredState.rawInput, dependencyValue);
-		return Promise.resolve(reParseResult);
-	}
-	if (require_dependency.isDependencySourceState(state)) return state;
-	if (Array.isArray(state)) return Promise.all(state.map((item) => resolveDeferredAsync(item, registry, visited)));
-	if (isPlainObject(state)) {
-		const resolved = {};
-		const keys = Reflect.ownKeys(state);
-		await Promise.all(keys.map(async (key) => {
-			resolved[key] = await resolveDeferredAsync(state[key], registry, visited);
-		}));
-		return resolved;
-	}
-	return state;
-}
-/**
-* Async version of resolveDeferredParseStates for async parsers.
-* @internal
-*/
-async function resolveDeferredParseStatesAsync(fieldStates, initialRegistry) {
-	const registry = initialRegistry ?? new require_dependency.DependencyRegistry();
-	collectDependencies(fieldStates, registry);
-	return await resolveDeferredAsync(fieldStates, registry);
-}
 function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 	const label = typeof labelOrParsers === "string" ? labelOrParsers : void 0;
 	if (label != null) require_validate.validateLabel(label);
@@ -1174,11 +1204,20 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 			})() : void 0;
 			if (cache?.has(fieldKey)) return cache.get(fieldKey);
 			const sourceState = parentState != null && typeof parentState === "object" && fieldKey in parentState ? parentState[fieldKey] : parser.initialState;
-			if (sourceState == null || typeof sourceState !== "object") {
+			const annotations = require_annotations.getAnnotations(parentState);
+			if (sourceState == null) {
+				if (annotations !== void 0 && Reflect.get(parser, inheritParentAnnotationsKey) === true) {
+					const inheritedState$1 = require_annotations.injectAnnotations({}, annotations);
+					cache?.set(fieldKey, inheritedState$1);
+					return inheritedState$1;
+				}
+				cache?.set(fieldKey, sourceState);
+				return sourceState;
+			}
+			if (typeof sourceState !== "object") {
 				cache?.set(fieldKey, sourceState);
 				return sourceState;
 			}
-			const annotations = require_annotations.getAnnotations(parentState);
 			if (annotations === void 0 || require_annotations.getAnnotations(sourceState) === annotations) {
 				cache?.set(fieldKey, sourceState);
 				return sourceState;
@@ -1214,11 +1253,9 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 			madeProgress = false;
 			const getFieldState = createFieldStateGetter(currentContext.state);
 			for (const [field, parser] of parserPairs) {
-				const result = parser.parse({
-					...currentContext,
-					state: getFieldState(field, parser)
-				});
+				const result = parser.parse(withChildContext(currentContext, field, getFieldState(field, parser)));
 				if (result.success && result.consumed.length > 0) {
+					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
 					currentContext = {
 						...currentContext,
 						buffer: result.next.buffer,
@@ -1226,7 +1263,12 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 						state: {
 							...currentContext.state,
 							[field]: result.next.state
-						}
+						},
+						...mergedExec != null ? {
+							trace: mergedExec.trace,
+							exec: mergedExec,
+							dependencyRegistry: mergedExec.dependencyRegistry
+						} : {}
 					};
 					allConsumed.push(...result.consumed);
 					anySuccess = true;
@@ -1245,7 +1287,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 			const getFieldState = createFieldStateGetter(context.state);
 			for (const [field, parser] of parserPairs) {
 				const fieldState = getFieldState(field, parser);
-				const completeResult = parser.complete(fieldState, context.exec);
+				const completeResult = parser.complete(fieldState, withChildExecPath(context.exec, field));
 				if (!completeResult.success) {
 					allCanComplete = false;
 					break;
@@ -1272,12 +1314,10 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 			madeProgress = false;
 			const getFieldState = createFieldStateGetter(currentContext.state);
 			for (const [field, parser] of parserPairs) {
-				const resultOrPromise = parser.parse({
-					...currentContext,
-					state: getFieldState(field, parser)
-				});
+				const resultOrPromise = parser.parse(withChildContext(currentContext, field, getFieldState(field, parser)));
 				const result = await resultOrPromise;
 				if (result.success && result.consumed.length > 0) {
+					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
 					currentContext = {
 						...currentContext,
 						buffer: result.next.buffer,
@@ -1285,7 +1325,12 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 						state: {
 							...currentContext.state,
 							[field]: result.next.state
-						}
+						},
+						...mergedExec != null ? {
+							trace: mergedExec.trace,
+							exec: mergedExec,
+							dependencyRegistry: mergedExec.dependencyRegistry
+						} : {}
 					};
 					allConsumed.push(...result.consumed);
 					anySuccess = true;
@@ -1304,7 +1349,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 			const getFieldState = createFieldStateGetter(context.state);
 			for (const [field, parser] of parserPairs) {
 				const fieldState = getFieldState(field, parser);
-				const completeResult = await parser.complete(fieldState, context.exec);
+				const completeResult = await parser.complete(fieldState, withChildExecPath(context.exec, field));
 				if (!completeResult.success) {
 					allCanComplete = false;
 					break;
@@ -1343,7 +1388,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 					...exec,
 					dependencyRuntime: runtime
 				};
-				const typedParserPairs = parserPairs;
+				const typedParserPairs = filterExcludedFieldParsers(parserPairs, exec?.excludedSourceFields);
 				const preCompleted = preCompleteAndRegisterDependencies(state, typedParserPairs, runtime.registry, childExec);
 				const phase3Exec = {
 					...childExec,
@@ -1356,6 +1401,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 					const fieldParser = parsers[field];
 					annotatedState[fieldKey] = getFieldState(field, fieldParser);
 				}
+				require_dependency_runtime.collectExplicitSourceValues(filterPreCompletedRuntimeNodes(require_dependency_runtime.buildRuntimeNodesFromPairs(typedParserPairs, annotatedState, exec?.path), new Set(preCompleted.keys())), runtime);
 				const resolvedFieldStates = require_dependency_runtime.resolveStateWithRuntime(annotatedState, runtime);
 				const result = {};
 				const deferredKeys = /* @__PURE__ */ new Map();
@@ -1368,7 +1414,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 					if (preCompletedResult !== void 0) valueResult = unwrapCompleteResult(preCompletedResult);
 					else {
 						const fieldState = resolvedFieldStates[fieldKey];
-						valueResult = unwrapCompleteResult(fieldParser.complete(fieldState, phase3Exec));
+						valueResult = unwrapCompleteResult(fieldParser.complete(fieldState, withChildExecPath(phase3Exec, fieldKey)));
 					}
 					if (valueResult.success) {
 						result[fieldKey] = valueResult.value;
@@ -1395,7 +1441,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 					...exec,
 					dependencyRuntime: runtime
 				};
-				const asyncParserPairs = parserPairs;
+				const asyncParserPairs = filterExcludedFieldParsers(parserPairs, exec?.excludedSourceFields);
 				const preCompleted = await preCompleteAndRegisterDependenciesAsync(state, asyncParserPairs, runtime.registry, childExec);
 				const phase3Exec = {
 					...childExec,
@@ -1408,20 +1454,12 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 					const fieldParser = parsers[field];
 					annotatedState[fieldKey] = getFieldState(field, fieldParser);
 				}
+				await require_dependency_runtime.collectExplicitSourceValuesAsync(filterPreCompletedRuntimeNodes(require_dependency_runtime.buildRuntimeNodesFromPairs(asyncParserPairs, annotatedState, exec?.path), new Set(preCompleted.keys())), runtime);
 				const resolvedFieldStates = await require_dependency_runtime.resolveStateWithRuntimeAsync(annotatedState, runtime);
 				const result = {};
 				const deferredKeys = /* @__PURE__ */ new Map();
 				let hasDeferred = false;
-				for (const field of parserKeys) {
-					const fieldKey = field;
-					const fieldParser = parsers[field];
-					let valueResult;
-					const preCompletedResult = preCompleted.get(fieldKey);
-					if (preCompletedResult !== void 0) valueResult = unwrapCompleteResult(preCompletedResult);
-					else {
-						const fieldState = resolvedFieldStates[fieldKey];
-						valueResult = unwrapCompleteResult(await fieldParser.complete(fieldState, phase3Exec));
-					}
+				const applyValueResult = (fieldKey, valueResult) => {
 					if (valueResult.success) {
 						result[fieldKey] = valueResult.value;
 						if (valueResult.deferred) if (valueResult.deferredKeys) deferredKeys.set(fieldKey, valueResult.deferredKeys);
@@ -1431,6 +1469,41 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 						success: false,
 						error: valueResult.error
 					};
+					return void 0;
+				};
+				const concurrentFields = [];
+				const deferredFields = [];
+				for (const field of parserKeys) {
+					const fieldKey = field;
+					const fieldParser = parsers[field];
+					const preCompletedResult = preCompleted.get(fieldKey);
+					if (preCompletedResult !== void 0) {
+						const failure = applyValueResult(fieldKey, unwrapCompleteResult(preCompletedResult));
+						if (failure != null) return failure;
+						continue;
+					}
+					if (typeof fieldParser.shouldDeferCompletion === "function" && fieldParser.shouldDeferCompletion(resolvedFieldStates[fieldKey], 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)));
+					return {
+						fieldKey,
+						valueResult
+					};
+				}));
+				for (const { fieldKey, valueResult } of concurrentResults) {
+					const failure = applyValueResult(fieldKey, valueResult);
+					if (failure != null) return failure;
+				}
+				for (const field of deferredFields) {
+					const fieldKey = field;
+					const fieldParser = parsers[field];
+					const valueResult = unwrapCompleteResult(await fieldParser.complete(resolvedFieldStates[fieldKey], withChildExecPath(phase3Exec, fieldKey)));
+					const failure = applyValueResult(fieldKey, valueResult);
+					if (failure != null) return failure;
 				}
 				const isDeferred = deferredKeys.size > 0 || hasDeferred;
 				return {
@@ -1503,13 +1576,19 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 function suggestTupleSync(context, prefix, parsers) {
 	const suggestions = [];
 	const stateArray = context.state;
+	const runtime = require_dependency_runtime.createDependencyRuntimeContext(context.dependencyRegistry?.clone());
+	if (stateArray && Array.isArray(stateArray)) {
+		require_dependency_runtime.collectExplicitSourceValues(require_dependency_runtime.buildRuntimeNodesFromArray(parsers, stateArray, context.exec?.path), runtime);
+		require_dependency_runtime.collectSourcesFromState(stateArray, runtime);
+	}
+	const contextWithRegistry = {
+		...context,
+		dependencyRegistry: runtime.registry
+	};
 	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({
-			...context,
-			state: parserState
-		}, prefix);
+		const parserSuggestions = parser.suggest(withChildContext(contextWithRegistry, i, parserState), prefix);
 		suggestions.push(...parserSuggestions);
 	}
 	return require_suggestion.deduplicateSuggestions(suggestions);
@@ -1517,13 +1596,19 @@ function suggestTupleSync(context, prefix, parsers) {
 async function* suggestTupleAsync(context, prefix, parsers) {
 	const suggestions = [];
 	const stateArray = context.state;
+	const runtime = require_dependency_runtime.createDependencyRuntimeContext(context.dependencyRegistry?.clone());
+	if (stateArray && Array.isArray(stateArray)) {
+		await require_dependency_runtime.collectExplicitSourceValuesAsync(require_dependency_runtime.buildRuntimeNodesFromArray(parsers, stateArray, context.exec?.path), runtime);
+		require_dependency_runtime.collectSourcesFromState(stateArray, runtime);
+	}
+	const contextWithRegistry = {
+		...context,
+		dependencyRegistry: runtime.registry
+	};
 	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({
-			...context,
-			state: parserState
-		}, prefix);
+		const parserSuggestions = parser.suggest(withChildContext(contextWithRegistry, i, parserState), prefix);
 		if (parser.$mode === "async") for await (const s of parserSuggestions) suggestions.push(s);
 		else suggestions.push(...parserSuggestions);
 	}
@@ -1557,17 +1642,19 @@ 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({
-					...currentContext,
-					state: stateArray[index]
-				});
+				const result = parser.parse(withChildContext(currentContext, index, stateArray[index]));
 				if (result.success && result.consumed.length > 0) {
 					const newStateArray = stateArray.map((s, idx) => idx === index ? result.next.state : s);
+					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
 					currentContext = {
 						...currentContext,
 						buffer: result.next.buffer,
 						optionsTerminated: result.next.optionsTerminated,
-						state: newStateArray
+						state: newStateArray,
+						...mergedExec != null ? {
+							exec: mergedExec,
+							dependencyRegistry: mergedExec.dependencyRegistry
+						} : {}
 					};
 					allConsumed.push(...result.consumed);
 					matchedParsers.add(index);
@@ -1576,15 +1663,17 @@ 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({
-					...currentContext,
-					state: stateArray[index]
-				});
+				const result = parser.parse(withChildContext(currentContext, index, stateArray[index]));
 				if (result.success && result.consumed.length < 1) {
 					const newStateArray = stateArray.map((s, idx) => idx === index ? result.next.state : s);
+					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
 					currentContext = {
 						...currentContext,
-						state: newStateArray
+						state: newStateArray,
+						...mergedExec != null ? {
+							exec: mergedExec,
+							dependencyRegistry: mergedExec.dependencyRegistry
+						} : {}
 					};
 					matchedParsers.add(index);
 					foundMatch = true;
@@ -1619,18 +1708,20 @@ 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({
-					...currentContext,
-					state: stateArray[index]
-				});
+				const resultOrPromise = parser.parse(withChildContext(currentContext, index, stateArray[index]));
 				const result = await resultOrPromise;
 				if (result.success && result.consumed.length > 0) {
 					const newStateArray = stateArray.map((s, idx) => idx === index ? result.next.state : s);
+					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
 					currentContext = {
 						...currentContext,
 						buffer: result.next.buffer,
 						optionsTerminated: result.next.optionsTerminated,
-						state: newStateArray
+						state: newStateArray,
+						...mergedExec != null ? {
+							exec: mergedExec,
+							dependencyRegistry: mergedExec.dependencyRegistry
+						} : {}
 					};
 					allConsumed.push(...result.consumed);
 					matchedParsers.add(index);
@@ -1639,16 +1730,18 @@ 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({
-					...currentContext,
-					state: stateArray[index]
-				});
+				const resultOrPromise = parser.parse(withChildContext(currentContext, index, stateArray[index]));
 				const result = await resultOrPromise;
 				if (result.success && result.consumed.length < 1) {
 					const newStateArray = stateArray.map((s, idx) => idx === index ? result.next.state : s);
+					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
 					currentContext = {
 						...currentContext,
-						state: newStateArray
+						state: newStateArray,
+						...mergedExec != null ? {
+							exec: mergedExec,
+							dependencyRegistry: mergedExec.dependencyRegistry
+						} : {}
 					};
 					matchedParsers.add(index);
 					foundMatch = true;
@@ -1674,6 +1767,7 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 		$mode: combinedMode,
 		$valueType: [],
 		$stateType: [],
+		[fieldParsersKey]: parsers.map((parser, index) => [String(index), parser]),
 		usage: parsers.toSorted((a, b) => b.priority - a.priority).flatMap((p) => p.usage),
 		leadingNames: sharedBufferLeadingNames(parsers),
 		acceptingAnyToken: parsers.some((p) => p.acceptingAnyToken),
@@ -1693,6 +1787,7 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				const tuplePairs = syncParsers.map((p, i) => [String(i), p]);
 				const tupleState = Object.fromEntries(stateArray.map((s, i) => [String(i), s]));
 				const preCompleted = preCompleteAndRegisterDependencies(tupleState, tuplePairs, runtime.registry, childExec);
+				require_dependency_runtime.collectExplicitSourceValues(filterPreCompletedRuntimeNodes(require_dependency_runtime.buildRuntimeNodesFromArray(syncParsers, stateArray, exec?.path), new Set(preCompleted.keys())), runtime);
 				const phase3Exec = {
 					...childExec,
 					preCompletedByParser: void 0
@@ -1708,7 +1803,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, phase3Exec));
+						valueResult = unwrapCompleteResult(elementParser.complete(elementState, withChildExecPath(phase3Exec, i)));
 					}
 					if (valueResult.success) {
 						result[i] = valueResult.value;
@@ -1739,6 +1834,7 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				const tuplePairs = parsers.map((p, i) => [String(i), p]);
 				const tupleState = Object.fromEntries(stateArray.map((s, i) => [String(i), s]));
 				const preCompleted = await preCompleteAndRegisterDependenciesAsync(tupleState, tuplePairs, runtime.registry, childExec);
+				await require_dependency_runtime.collectExplicitSourceValuesAsync(filterPreCompletedRuntimeNodes(require_dependency_runtime.buildRuntimeNodesFromArray(parsers, stateArray, exec?.path), new Set(preCompleted.keys())), runtime);
 				const phase3Exec = {
 					...childExec,
 					preCompletedByParser: void 0
@@ -1754,7 +1850,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, phase3Exec));
+						valueResult = unwrapCompleteResult(await elementParser.complete(elementState, withChildExecPath(phase3Exec, i)));
 					}
 					if (valueResult.success) {
 						result[i] = valueResult.value;
@@ -1857,18 +1953,25 @@ function merge(...args) {
 	const syncSorted = syncWithIndex.toSorted(([a], [b]) => b.priority - a.priority);
 	const syncParsers = syncSorted.map(([p]) => p);
 	if (!options.allowDuplicates) checkDuplicateOptionNames(sorted.map(([parser, originalIndex]) => [String(originalIndex), parser.usage]));
+	const mergedFieldParsers = collectChildFieldParsers(parsers);
+	const duplicateOutputFieldNames = collectDuplicateFieldNames(mergedFieldParsers);
+	const parserStateKey = (index) => `__parser_${index}`;
+	const localObjectStateKey = (index) => `__merge_local_${index}`;
+	const shouldPreserveLocalChildState = (parser) => parser.initialState != null && typeof parser.initialState === "object" && Object.keys(parser.initialState).some((field) => duplicateOutputFieldNames.has(field));
 	const initialState = {};
 	for (let i = 0; i < parsers.length; i++) {
 		const parser = parsers[i];
-		if (parser.initialState === void 0) initialState[`__parser_${i}`] = void 0;
+		if (parser.initialState === void 0) initialState[parserStateKey(i)] = void 0;
 		else if (parser.initialState && typeof parser.initialState === "object") for (const field in parser.initialState) initialState[field] = parser.initialState[field];
 	}
 	const extractParserState = (parser, context, index) => {
 		if (parser.initialState === void 0) {
-			const key = `__parser_${index}`;
+			const key = parserStateKey(index);
 			if (context.state && typeof context.state === "object" && key in context.state) return context.state[key];
 			return void 0;
 		} else if (parser.initialState && typeof parser.initialState === "object") {
+			const localStateKey = localObjectStateKey(index);
+			if (shouldPreserveLocalChildState(parser) && context.state && typeof context.state === "object" && localStateKey in context.state) return context.state[localStateKey];
 			if (context.state && typeof context.state === "object") {
 				const extractedState = {};
 				for (const field in parser.initialState) extractedState[field] = field in context.state ? context.state[field] : parser.initialState[field];
@@ -1878,9 +1981,9 @@ function merge(...args) {
 		}
 		return parser.initialState;
 	};
-	const mergeResultState = (parser, context, result, index) => {
+	const mergeResultState = (parser, context, parserState, result, index) => {
 		if (parser.initialState === void 0) {
-			const key = `__parser_${index}`;
+			const key = parserStateKey(index);
 			if (result.success) {
 				if (result.consumed.length > 0 || result.next.state !== void 0) return {
 					...context.state,
@@ -1889,10 +1992,17 @@ function merge(...args) {
 			}
 			return { ...context.state };
 		}
-		return result.success ? {
+		if (!result.success) return { ...context.state };
+		const mergedState = {
 			...context.state,
 			...result.next.state
-		} : { ...context.state };
+		};
+		if (!shouldPreserveLocalChildState(parser)) return mergedState;
+		if (result.consumed.length === 0 && result.next.state === parserState) return mergedState;
+		return {
+			...mergedState,
+			[localObjectStateKey(index)]: result.next.state
+		};
 	};
 	const parseSync = (context) => {
 		let currentContext = context;
@@ -1900,17 +2010,19 @@ 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({
-				...currentContext,
-				state: parserState
-			});
+			const result = parser.parse(withChildContext(currentContext, i, parserState));
 			if (result.success) {
-				const newState = mergeResultState(parser, currentContext, result, i);
+				const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
+				const newState = mergeResultState(parser, currentContext, parserState, result, i);
 				const newContext = {
 					...currentContext,
 					buffer: result.next.buffer,
 					optionsTerminated: result.next.optionsTerminated,
-					state: newState
+					state: newState,
+					...mergedExec != null ? {
+						exec: mergedExec,
+						dependencyRegistry: mergedExec.dependencyRegistry
+					} : {}
 				};
 				if (result.consumed.length > 0) return {
 					success: true,
@@ -1943,18 +2055,20 @@ 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({
-				...currentContext,
-				state: parserState
-			});
+			const resultOrPromise = parser.parse(withChildContext(currentContext, i, parserState));
 			const result = await resultOrPromise;
 			if (result.success) {
-				const newState = mergeResultState(parser, currentContext, result, i);
+				const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
+				const newState = mergeResultState(parser, currentContext, parserState, result, i);
 				const newContext = {
 					...currentContext,
 					buffer: result.next.buffer,
 					optionsTerminated: result.next.optionsTerminated,
-					state: newState
+					state: newState,
+					...mergedExec != null ? {
+						exec: mergedExec,
+						dependencyRegistry: mergedExec.dependencyRegistry
+					} : {}
 				};
 				if (result.consumed.length > 0) return {
 					success: true,
@@ -1981,7 +2095,6 @@ function merge(...args) {
 			error: require_message.message`No matching option or argument found.`
 		};
 	};
-	const mergedFieldParsers = collectChildFieldParsers(parsers);
 	const mergeParser = {
 		$mode: combinedMode,
 		$valueType: [],
@@ -1999,10 +2112,12 @@ function merge(...args) {
 		complete(state, exec) {
 			const extractCompleteState = (parser, resolvedState, index) => {
 				if (parser.initialState === void 0) {
-					const key = `__parser_${index}`;
+					const key = parserStateKey(index);
 					if (resolvedState && typeof resolvedState === "object" && key in resolvedState) return resolvedState[key];
 					return void 0;
 				} else if (parser.initialState && typeof parser.initialState === "object") {
+					const key = localObjectStateKey(index);
+					if (shouldPreserveLocalChildState(parser) && resolvedState && typeof resolvedState === "object" && key in resolvedState) return resolvedState[key];
 					if (resolvedState && typeof resolvedState === "object") {
 						const extractedState = {};
 						for (const field in parser.initialState) extractedState[field] = field in resolvedState ? resolvedState[field] : parser.initialState[field];
@@ -2020,14 +2135,25 @@ function merge(...args) {
 					...exec,
 					dependencyRuntime: runtime
 				};
-				const perChildCache = syncParsers.map((parser) => {
+				const duplicateFieldNames = collectDuplicateFieldNames(mergedFieldParsers);
+				const unambiguousFieldParsers = filterDuplicateFieldParsers(mergedFieldParsers);
+				const perChildPhase1 = syncParsers.map((parser, i) => {
 					if (fieldParsersKey in parser) {
 						const pairs = parser[fieldParsersKey];
-						const preCompleted = preCompleteAndRegisterDependencies(state, pairs, runtime.registry, childExec);
-						return filterDuplicateKeys(preCompleted, pairs);
+						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));
+						return {
+							cache: filterDuplicateKeys(preCompleted, phase1Pairs),
+							excludedSourceFields: excludedSourceFields.size > 0 ? excludedSourceFields : void 0
+						};
 					}
-					return void 0;
+					return {
+						cache: void 0,
+						excludedSourceFields: void 0
+					};
 				});
+				require_dependency_runtime.collectExplicitSourceValues(require_dependency_runtime.buildRuntimeNodesFromPairs(unambiguousFieldParsers, state, exec?.path), runtime);
 				const resolvedState = require_dependency_runtime.resolveStateWithRuntime(state, runtime);
 				const object$1 = {};
 				const deferredKeys = /* @__PURE__ */ new Map();
@@ -2035,11 +2161,21 @@ function merge(...args) {
 				for (let i = 0; i < syncParsers.length; i++) {
 					const parser = syncParsers[i];
 					const parserState = extractCompleteState(parser, resolvedState, i);
-					const cache = perChildCache[i];
-					const result = unwrapCompleteResult(parser.complete(parserState, {
-						...childExec,
+					const { cache, excludedSourceFields } = perChildPhase1[i];
+					const childCompleteExec = withChildExecPath(childExec, i);
+					const completeExec = excludedSourceFields == null ? {
+						...childCompleteExec,
 						preCompletedByParser: cache
-					}));
+					} : (() => {
+						const childRuntime = require_dependency_runtime.createDependencyRuntimeContext(runtime.registry.clone());
+						return {
+							...childCompleteExec,
+							dependencyRuntime: childRuntime,
+							dependencyRegistry: childRuntime.registry,
+							preCompletedByParser: cache
+						};
+					})();
+					const result = unwrapCompleteResult(parser.complete(parserState, completeExec));
 					if (!result.success) return result;
 					const resultValue = result.value;
 					for (const field in resultValue) {
@@ -2065,12 +2201,26 @@ function merge(...args) {
 					...exec,
 					dependencyRuntime: runtime
 				};
-				const perChildCache = [];
-				for (const parser of parsers) if (fieldParsersKey in parser) {
-					const pairs = parser[fieldParsersKey];
-					const preCompleted = await preCompleteAndRegisterDependenciesAsync(state, pairs, runtime.registry, childExec);
-					perChildCache.push(filterDuplicateKeys(preCompleted, pairs));
-				} else perChildCache.push(void 0);
+				const duplicateFieldNames = collectDuplicateFieldNames(mergedFieldParsers);
+				const unambiguousFieldParsers = filterDuplicateFieldParsers(mergedFieldParsers);
+				const perChildPhase1 = [];
+				for (let i = 0; i < parsers.length; i++) {
+					const parser = parsers[i];
+					if (fieldParsersKey in parser) {
+						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));
+						perChildPhase1.push({
+							cache: filterDuplicateKeys(preCompleted, phase1Pairs),
+							excludedSourceFields: excludedSourceFields.size > 0 ? excludedSourceFields : void 0
+						});
+					} else perChildPhase1.push({
+						cache: void 0,
+						excludedSourceFields: void 0
+					});
+				}
+				await require_dependency_runtime.collectExplicitSourceValuesAsync(require_dependency_runtime.buildRuntimeNodesFromPairs(unambiguousFieldParsers, state, exec?.path), runtime);
 				const resolvedState = await require_dependency_runtime.resolveStateWithRuntimeAsync(state, runtime);
 				const object$1 = {};
 				const deferredKeys = /* @__PURE__ */ new Map();
@@ -2078,11 +2228,21 @@ function merge(...args) {
 				for (let i = 0; i < parsers.length; i++) {
 					const parser = parsers[i];
 					const parserState = extractCompleteState(parser, resolvedState, i);
-					const asyncCache = perChildCache[i];
-					const result = unwrapCompleteResult(await parser.complete(parserState, {
-						...childExec,
+					const { cache: asyncCache, excludedSourceFields } = perChildPhase1[i];
+					const childCompleteExec = withChildExecPath(childExec, i);
+					const completeExec = excludedSourceFields == null ? {
+						...childCompleteExec,
 						preCompletedByParser: asyncCache
-					}));
+					} : (() => {
+						const childRuntime = require_dependency_runtime.createDependencyRuntimeContext(runtime.registry.clone());
+						return {
+							...childCompleteExec,
+							dependencyRuntime: childRuntime,
+							dependencyRegistry: childRuntime.registry,
+							preCompletedByParser: asyncCache
+						};
+					})();
+					const result = unwrapCompleteResult(await parser.complete(parserState, completeExec));
 					if (!result.success) return result;
 					const resultValue = result.value;
 					for (const field in resultValue) {
@@ -2107,10 +2267,12 @@ function merge(...args) {
 			if (options.hidden === true) return require_mode_dispatch.dispatchIterableByMode(combinedMode, function* () {}, async function* () {});
 			const extractState = (p, i) => {
 				if (p.initialState === void 0) {
-					const key = `__parser_${i}`;
+					const key = parserStateKey(i);
 					if (context.state && typeof context.state === "object" && key in context.state) return context.state[key];
 					return void 0;
 				} else if (p.initialState && typeof p.initialState === "object") {
+					const key = localObjectStateKey(i);
+					if (shouldPreserveLocalChildState(p) && context.state && typeof context.state === "object" && key in context.state) return context.state[key];
 					if (context.state && typeof context.state === "object") {
 						const extractedState = {};
 						for (const field in p.initialState) extractedState[field] = field in context.state ? context.state[field] : p.initialState[field];
@@ -2122,8 +2284,17 @@ function merge(...args) {
 			};
 			if (isAsync) return async function* () {
 				const runtime$1 = require_dependency_runtime.createDependencyRuntimeContext(context.dependencyRegistry?.clone());
-				const childFieldPairs$1 = collectChildFieldParsers(parsers);
-				if (context.state && typeof context.state === "object") require_dependency_runtime.collectSourcesFromState(context.state, runtime$1);
+				const mergedPairs$1 = collectChildFieldParsers(parsers);
+				const duplicateFieldNames$1 = collectDuplicateFieldNames(mergedPairs$1);
+				const childFieldPairs$1 = filterDuplicateFieldParsers(mergedPairs$1);
+				const perChildExcludedSourceFields$1 = parsers.map((parser) => {
+					if (!(fieldParsersKey in parser)) return void 0;
+					const pairs = parser[fieldParsersKey];
+					const excludedSourceFields = new Set(pairs.map(([field]) => field).filter((field) => duplicateFieldNames$1.has(field)));
+					return excludedSourceFields.size > 0 ? excludedSourceFields : void 0;
+				});
+				if (context.state && typeof context.state === "object") await require_dependency_runtime.collectExplicitSourceValuesAsync(require_dependency_runtime.buildRuntimeNodesFromPairs(childFieldPairs$1, context.state, context.exec?.path), runtime$1);
+				if (context.state && typeof context.state === "object") require_dependency_runtime.collectSourcesFromState(context.state, runtime$1, /* @__PURE__ */ new WeakSet(), duplicateFieldNames$1);
 				await completeDependencySourceDefaultsAsync(context, childFieldPairs$1, runtime$1.registry, context.exec);
 				const contextWithRegistry$1 = {
 					...context,
@@ -2133,18 +2304,37 @@ function merge(...args) {
 				for (let i = 0; i < parsers.length; i++) {
 					const parser = parsers[i];
 					const parserState = extractState(parser, i);
-					const parserSuggestions = parser.suggest({
-						...contextWithRegistry$1,
-						state: parserState
-					}, prefix);
+					const childContext = withChildContext(contextWithRegistry$1, i, parserState);
+					const excludedSourceFields = perChildExcludedSourceFields$1[i];
+					const contextForChild = excludedSourceFields == null ? childContext : (() => {
+						const childRuntime = require_dependency_runtime.createDependencyRuntimeContext(runtime$1.registry.clone());
+						return {
+							...childContext,
+							dependencyRegistry: childRuntime.registry,
+							exec: childContext.exec == null ? childContext.exec : {
+								...childContext.exec,
+								dependencyRegistry: childRuntime.registry
+							}
+						};
+					})();
+					const parserSuggestions = parser.suggest(contextForChild, prefix);
 					if (parser.$mode === "async") for await (const s of parserSuggestions) suggestions.push(s);
 					else suggestions.push(...parserSuggestions);
 				}
 				yield* require_suggestion.deduplicateSuggestions(suggestions);
 			}();
 			const runtime = require_dependency_runtime.createDependencyRuntimeContext(context.dependencyRegistry?.clone());
-			const childFieldPairs = collectChildFieldParsers(syncParsers);
-			if (context.state && typeof context.state === "object") require_dependency_runtime.collectSourcesFromState(context.state, runtime);
+			const mergedPairs = collectChildFieldParsers(syncParsers);
+			const duplicateFieldNames = collectDuplicateFieldNames(mergedPairs);
+			const childFieldPairs = filterDuplicateFieldParsers(mergedPairs);
+			const perChildExcludedSourceFields = syncParsers.map((parser) => {
+				if (!(fieldParsersKey in parser)) return void 0;
+				const pairs = parser[fieldParsersKey];
+				const excludedSourceFields = new Set(pairs.map(([field]) => field).filter((field) => duplicateFieldNames.has(field)));
+				return excludedSourceFields.size > 0 ? excludedSourceFields : void 0;
+			});
+			if (context.state && typeof context.state === "object") require_dependency_runtime.collectExplicitSourceValues(require_dependency_runtime.buildRuntimeNodesFromPairs(childFieldPairs, context.state, context.exec?.path), runtime);
+			if (context.state && typeof context.state === "object") require_dependency_runtime.collectSourcesFromState(context.state, runtime, /* @__PURE__ */ new WeakSet(), duplicateFieldNames);
 			completeDependencySourceDefaults(context, childFieldPairs, runtime.registry, context.exec);
 			const contextWithRegistry = {
 				...context,
@@ -2155,10 +2345,20 @@ function merge(...args) {
 				for (let i = 0; i < syncParsers.length; i++) {
 					const parser = syncParsers[i];
 					const parserState = extractState(parser, i);
-					const parserSuggestions = parser.suggest({
-						...contextWithRegistry,
-						state: parserState
-					}, prefix);
+					const childContext = withChildContext(contextWithRegistry, i, parserState);
+					const excludedSourceFields = perChildExcludedSourceFields[i];
+					const contextForChild = excludedSourceFields == null ? childContext : (() => {
+						const childRuntime = require_dependency_runtime.createDependencyRuntimeContext(runtime.registry.clone());
+						return {
+							...childContext,
+							dependencyRegistry: childRuntime.registry,
+							exec: childContext.exec == null ? childContext.exec : {
+								...childContext.exec,
+								dependencyRegistry: childRuntime.registry
+							}
+						};
+					})();
+					const parserSuggestions = parser.suggest(contextForChild, prefix);
 					suggestions.push(...parserSuggestions);
 				}
 				yield* require_suggestion.deduplicateSuggestions(suggestions);
@@ -2233,10 +2433,36 @@ function merge(...args) {
 * async branches of `concat().suggest()`.
 * @internal
 */
-function buildSuggestRegistry(preParsedContext) {
+function buildSuggestRegistry(preParsedContext, parsers) {
+	const stateArray = preParsedContext.state;
+	const runtime = require_dependency_runtime.createDependencyRuntimeContext(preParsedContext.dependencyRegistry?.clone());
+	if (stateArray && Array.isArray(stateArray)) {
+		const nodes = require_dependency_runtime.buildRuntimeNodesFromArray(parsers, stateArray, preParsedContext.exec?.path);
+		require_dependency_runtime.collectExplicitSourceValues(nodes, runtime);
+		require_dependency_runtime.collectSourcesFromState(stateArray, runtime);
+		require_dependency_runtime.fillMissingSourceDefaults(nodes, runtime);
+		const prefix = preParsedContext.exec?.path ?? [];
+		for (let i = 0; i < parsers.length; i++) seedSuggestRuntimeFromFieldParsers(parsers[i], stateArray[i], runtime, [...prefix, i]);
+	}
+	return {
+		context: {
+			...preParsedContext,
+			dependencyRegistry: runtime.registry
+		},
+		stateArray
+	};
+}
+async function buildSuggestRegistryAsync(preParsedContext, parsers) {
 	const stateArray = preParsedContext.state;
 	const runtime = require_dependency_runtime.createDependencyRuntimeContext(preParsedContext.dependencyRegistry?.clone());
-	if (stateArray && Array.isArray(stateArray)) require_dependency_runtime.collectSourcesFromState(stateArray, runtime);
+	if (stateArray && Array.isArray(stateArray)) {
+		const nodes = require_dependency_runtime.buildRuntimeNodesFromArray(parsers, stateArray, preParsedContext.exec?.path);
+		await require_dependency_runtime.collectExplicitSourceValuesAsync(nodes, runtime);
+		require_dependency_runtime.collectSourcesFromState(stateArray, runtime);
+		await require_dependency_runtime.fillMissingSourceDefaultsAsync(nodes, runtime);
+		const prefix = preParsedContext.exec?.path ?? [];
+		for (let i = 0; i < parsers.length; i++) await seedSuggestRuntimeFromFieldParsersAsync(parsers[i], stateArray[i], runtime, [...prefix, i]);
+	}
 	return {
 		context: {
 			...preParsedContext,
@@ -2245,6 +2471,30 @@ function buildSuggestRegistry(preParsedContext) {
 		stateArray
 	};
 }
+function seedSuggestRuntimeFromFieldParsers(parser, state, runtime, parentPath) {
+	if (!(fieldParsersKey in parser)) return;
+	const rawPairs = parser[fieldParsersKey];
+	const duplicateFieldNames = collectDuplicateFieldNames(rawPairs);
+	const pairs = filterDuplicateFieldParsers(rawPairs);
+	const stateRecord = state != null && typeof state === "object" ? state : {};
+	const nodes = require_dependency_runtime.buildRuntimeNodesFromPairs(pairs, stateRecord, parentPath);
+	require_dependency_runtime.collectExplicitSourceValues(nodes, runtime);
+	require_dependency_runtime.collectSourcesFromState(state, runtime, /* @__PURE__ */ new WeakSet(), duplicateFieldNames);
+	require_dependency_runtime.fillMissingSourceDefaults(nodes, runtime);
+	for (const [field, childParser] of pairs) seedSuggestRuntimeFromFieldParsers(childParser, Object.hasOwn(stateRecord, field) ? stateRecord[field] : void 0, runtime, [...parentPath, field]);
+}
+async function seedSuggestRuntimeFromFieldParsersAsync(parser, state, runtime, parentPath) {
+	if (!(fieldParsersKey in parser)) return;
+	const rawPairs = parser[fieldParsersKey];
+	const duplicateFieldNames = collectDuplicateFieldNames(rawPairs);
+	const pairs = filterDuplicateFieldParsers(rawPairs);
+	const stateRecord = state != null && typeof state === "object" ? state : {};
+	const nodes = require_dependency_runtime.buildRuntimeNodesFromPairs(pairs, stateRecord, parentPath);
+	await require_dependency_runtime.collectExplicitSourceValuesAsync(nodes, runtime);
+	require_dependency_runtime.collectSourcesFromState(state, runtime, /* @__PURE__ */ new WeakSet(), duplicateFieldNames);
+	await require_dependency_runtime.fillMissingSourceDefaultsAsync(nodes, runtime);
+	for (const [field, childParser] of pairs) await seedSuggestRuntimeFromFieldParsersAsync(childParser, Object.hasOwn(stateRecord, field) ? stateRecord[field] : void 0, runtime, [...parentPath, field]);
+}
 /**
 * This helper replays child parsers in priority order (mirroring
 * `concat.parse()`) to accumulate dependency source values for suggestions.
@@ -2297,21 +2547,23 @@ 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({
-			...context,
-			state: parserState
-		});
+		const resultOrPromise = parser.parse(withChildContext(context, index, parserState));
 		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] = result$1.next.state;
 					matchedParsers.add(index);
+					const mergedExec = mergeChildExec(context.exec, result$1.next.exec);
 					return preParseSuggestLoop({
 						...context,
 						buffer: result$1.next.buffer,
 						optionsTerminated: result$1.next.optionsTerminated,
-						state: stateArray
+						state: stateArray,
+						...mergedExec != null ? {
+							exec: mergedExec,
+							dependencyRegistry: mergedExec.dependencyRegistry
+						} : {}
 					}, stateArray, parsers, matchedParsers);
 				}
 				const next = tryParseSuggestList(context, stateArray, parsers, matchedParsers, tail);
@@ -2329,11 +2581,16 @@ function tryParseSuggestList(context, stateArray, parsers, matchedParsers, remai
 		if (result.success && result.consumed.length > 0) {
 			stateArray[index] = result.next.state;
 			matchedParsers.add(index);
+			const mergedExec = mergeChildExec(context.exec, result.next.exec);
 			return {
 				...context,
 				buffer: result.next.buffer,
 				optionsTerminated: result.next.optionsTerminated,
-				state: stateArray
+				state: stateArray,
+				...mergedExec != null ? {
+					exec: mergedExec,
+					dependencyRegistry: mergedExec.dependencyRegistry
+				} : {}
 			};
 		}
 	}
@@ -2359,17 +2616,19 @@ 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({
-					...currentContext,
-					state: stateArray[index]
-				});
+				const result = parser.parse(withChildContext(currentContext, index, stateArray[index]));
 				if (result.success && result.consumed.length > 0) {
 					const newStateArray = stateArray.map((s, idx) => idx === index ? result.next.state : s);
+					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
 					currentContext = {
 						...currentContext,
 						buffer: result.next.buffer,
 						optionsTerminated: result.next.optionsTerminated,
-						state: newStateArray
+						state: newStateArray,
+						...mergedExec != null ? {
+							exec: mergedExec,
+							dependencyRegistry: mergedExec.dependencyRegistry
+						} : {}
 					};
 					allConsumed.push(...result.consumed);
 					matchedParsers.add(index);
@@ -2378,15 +2637,17 @@ 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({
-					...currentContext,
-					state: stateArray[index]
-				});
+				const result = parser.parse(withChildContext(currentContext, index, stateArray[index]));
 				if (result.success && result.consumed.length < 1) {
 					const newStateArray = stateArray.map((s, idx) => idx === index ? result.next.state : s);
+					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
 					currentContext = {
 						...currentContext,
-						state: newStateArray
+						state: newStateArray,
+						...mergedExec != null ? {
+							exec: mergedExec,
+							dependencyRegistry: mergedExec.dependencyRegistry
+						} : {}
 					};
 					matchedParsers.add(index);
 					foundMatch = true;
@@ -2421,17 +2682,19 @@ 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({
-					...currentContext,
-					state: stateArray[index]
-				});
+				const result = await parser.parse(withChildContext(currentContext, index, stateArray[index]));
 				if (result.success && result.consumed.length > 0) {
 					const newStateArray = stateArray.map((s, idx) => idx === index ? result.next.state : s);
+					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
 					currentContext = {
 						...currentContext,
 						buffer: result.next.buffer,
 						optionsTerminated: result.next.optionsTerminated,
-						state: newStateArray
+						state: newStateArray,
+						...mergedExec != null ? {
+							exec: mergedExec,
+							dependencyRegistry: mergedExec.dependencyRegistry
+						} : {}
 					};
 					allConsumed.push(...result.consumed);
 					matchedParsers.add(index);
@@ -2440,15 +2703,17 @@ 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({
-					...currentContext,
-					state: stateArray[index]
-				});
+				const result = await parser.parse(withChildContext(currentContext, index, stateArray[index]));
 				if (result.success && result.consumed.length < 1) {
 					const newStateArray = stateArray.map((s, idx) => idx === index ? result.next.state : s);
+					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
 					currentContext = {
 						...currentContext,
-						state: newStateArray
+						state: newStateArray,
+						...mergedExec != null ? {
+							exec: mergedExec,
+							dependencyRegistry: mergedExec.dependencyRegistry
+						} : {}
 					};
 					matchedParsers.add(index);
 					foundMatch = true;
@@ -2485,7 +2750,7 @@ function concat(...parsers) {
 		for (let i = 0; i < syncParsers.length; i++) {
 			const parser = syncParsers[i];
 			const parserState = prepareStateForCompletion(resolvedArray[i], parser);
-			const result = unwrapCompleteResult(parser.complete(parserState, childExec));
+			const result = unwrapCompleteResult(parser.complete(parserState, withChildExecPath(childExec, i)));
 			if (!result.success) return result;
 			const baseIndex = results.length;
 			if (Array.isArray(result.value)) {
@@ -2528,7 +2793,7 @@ function concat(...parsers) {
 		for (let i = 0; i < parsers.length; i++) {
 			const parser = parsers[i];
 			const parserState = prepareStateForCompletion(resolvedArray[i], parser);
-			const result = unwrapCompleteResult(await parser.complete(parserState, childExec));
+			const result = unwrapCompleteResult(await parser.complete(parserState, withChildExecPath(childExec, i)));
 			if (!result.success) return result;
 			const baseIndex = results.length;
 			if (Array.isArray(result.value)) {
@@ -2576,31 +2841,25 @@ function concat(...parsers) {
 		suggest(context, prefix) {
 			if (isAsync) return async function* () {
 				const preParsedContext$1 = await preParseSuggestContextAsync(context, parsers);
-				const { context: contextWithRegistry$1, stateArray: stateArray$1 } = buildSuggestRegistry(preParsedContext$1);
+				const { context: contextWithRegistry$1, stateArray: stateArray$1 } = await buildSuggestRegistryAsync(preParsedContext$1, parsers);
 				const suggestions = [];
 				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({
-						...contextWithRegistry$1,
-						state: parserState
-					}, prefix);
+					const parserSuggestions = parser.suggest(withChildContext(contextWithRegistry$1, i, parserState), prefix);
 					if (parser.$mode === "async") for await (const s of parserSuggestions) suggestions.push(s);
 					else suggestions.push(...parserSuggestions);
 				}
 				yield* require_suggestion.deduplicateSuggestions(suggestions);
 			}();
 			const preParsedContext = preParseSuggestContext(context, syncParsers);
-			const { context: contextWithRegistry, stateArray } = buildSuggestRegistry(preParsedContext);
+			const { context: contextWithRegistry, stateArray } = buildSuggestRegistry(preParsedContext, syncParsers);
 			return function* () {
 				const suggestions = [];
 				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({
-						...contextWithRegistry,
-						state: parserState
-					}, prefix);
+					const parserSuggestions = parser.suggest(withChildContext(contextWithRegistry, i, parserState), prefix);
 					suggestions.push(...parserSuggestions);
 				}
 				yield* require_suggestion.deduplicateSuggestions(suggestions);
@@ -2646,6 +2905,13 @@ function group(label, parser, options = {}) {
 		initialState: parser.initialState,
 		...fieldParsersKey in parser ? { [fieldParsersKey]: parser[fieldParsersKey] } : {},
 		...typeof parser.shouldDeferCompletion === "function" ? { shouldDeferCompletion: parser.shouldDeferCompletion.bind(parser) } : {},
+		getSuggestRuntimeNodes(state, path) {
+			return parser.getSuggestRuntimeNodes?.(state, path) ?? (parser.dependencyMetadata?.source != null ? [{
+				path,
+				parser,
+				state
+			}] : []);
+		},
 		parse: (context) => parser.parse(context),
 		complete: (state, exec) => parser.complete(state, exec),
 		suggest: (context, prefix) => {
@@ -2788,57 +3054,69 @@ 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({
-				...context,
-				state: state.branchState,
-				usage: branchParser.usage
-			});
-			if (branchResult.success) return {
-				success: true,
-				next: {
-					...branchResult.next,
-					state: {
-						...state,
-						branchState: branchResult.next.state
-					}
-				},
-				consumed: branchResult.consumed
-			};
+			const branchResult = branchParser.parse(withChildContext(context, "_branch", state.branchState, branchParser.usage));
+			if (branchResult.success) {
+				const mergedExec = mergeChildExec(context.exec, branchResult.next.exec);
+				return {
+					success: true,
+					next: {
+						...branchResult.next,
+						state: {
+							...state,
+							branchState: branchResult.next.state
+						},
+						...mergedExec != null ? {
+							exec: mergedExec,
+							dependencyRegistry: mergedExec.dependencyRegistry
+						} : {}
+					},
+					consumed: branchResult.consumed
+				};
+			}
 			return branchResult;
 		}
-		const discriminatorResult = syncDiscriminator.parse({
-			...context,
-			state: state.discriminatorState
-		});
+		const discriminatorResult = syncDiscriminator.parse({ ...withChildContext(context, "_discriminator", state.discriminatorState) });
 		if (discriminatorResult.success && discriminatorResult.consumed.length > 0) {
-			const completionResult = syncDiscriminator.complete(discriminatorResult.next.state, context.exec);
+			const completionResult = syncDiscriminator.complete(discriminatorResult.next.state, 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 branchParseResult = branchParser.parse({
-						...context,
+						...withChildContext({
+							...context,
+							...discriminatorExec != null ? {
+								exec: discriminatorExec,
+								dependencyRegistry: discriminatorExec.dependencyRegistry
+							} : {}
+						}, "_branch", branchParser.initialState, branchParser.usage),
 						buffer: discriminatorResult.next.buffer,
-						optionsTerminated: discriminatorResult.next.optionsTerminated,
-						state: branchParser.initialState,
-						usage: branchParser.usage
+						optionsTerminated: discriminatorResult.next.optionsTerminated
 					});
-					if (branchParseResult.success) return {
-						success: true,
-						next: {
-							...branchParseResult.next,
-							state: {
-								discriminatorState: discriminatorResult.next.state,
-								discriminatorValue: value,
-								selectedBranch: {
-									kind: "branch",
-									key: value
+					if (branchParseResult.success) {
+						const mergedExec = mergeChildExec(discriminatorExec, branchParseResult.next.exec);
+						return {
+							success: true,
+							next: {
+								...branchParseResult.next,
+								state: {
+									discriminatorState: discriminatorResult.next.state,
+									discriminatorValue: value,
+									selectedBranch: {
+										kind: "branch",
+										key: value
+									},
+									branchState: branchParseResult.next.state
 								},
-								branchState: branchParseResult.next.state
-							}
-						},
-						consumed: [...discriminatorResult.consumed, ...branchParseResult.consumed]
-					};
+								...mergedExec != null ? {
+									exec: mergedExec,
+									dependencyRegistry: mergedExec.dependencyRegistry
+								} : {}
+							},
+							consumed: [...discriminatorResult.consumed, ...branchParseResult.consumed]
+						};
+					}
 					return {
 						success: true,
 						next: {
@@ -2851,7 +3129,11 @@ function conditional(discriminator, branches, defaultBranch, options) {
 									key: value
 								},
 								branchState: branchParser.initialState
-							}
+							},
+							...discriminatorExec != null ? {
+								exec: discriminatorExec,
+								dependencyRegistry: discriminatorExec.dependencyRegistry
+							} : {}
 						},
 						consumed: discriminatorResult.consumed
 					};
@@ -2859,23 +3141,26 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			}
 		}
 		if (syncDefaultBranch !== void 0) {
-			const defaultResult = syncDefaultBranch.parse({
-				...context,
-				state: state.branchState ?? syncDefaultBranch.initialState,
-				usage: syncDefaultBranch.usage
-			});
-			if (defaultResult.success && defaultResult.consumed.length > 0) return {
-				success: true,
-				next: {
-					...defaultResult.next,
-					state: {
-						...state,
-						selectedBranch: { kind: "default" },
-						branchState: defaultResult.next.state
-					}
-				},
-				consumed: defaultResult.consumed
-			};
+			const defaultResult = syncDefaultBranch.parse(withChildContext(context, "_branch", state.branchState ?? syncDefaultBranch.initialState, syncDefaultBranch.usage));
+			if (defaultResult.success && defaultResult.consumed.length > 0) {
+				const mergedExec = mergeChildExec(context.exec, defaultResult.next.exec);
+				return {
+					success: true,
+					next: {
+						...defaultResult.next,
+						state: {
+							...state,
+							selectedBranch: { kind: "default" },
+							branchState: defaultResult.next.state
+						},
+						...mergedExec != null ? {
+							exec: mergedExec,
+							dependencyRegistry: mergedExec.dependencyRegistry
+						} : {}
+					},
+					consumed: defaultResult.consumed
+				};
+			}
 		}
 		return {
 			success: false,
@@ -2887,57 +3172,69 @@ 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({
-				...context,
-				state: state.branchState,
-				usage: branchParser.usage
-			});
-			if (branchResult.success) return {
-				success: true,
-				next: {
-					...branchResult.next,
-					state: {
-						...state,
-						branchState: branchResult.next.state
-					}
-				},
-				consumed: branchResult.consumed
-			};
+			const branchResult = await branchParser.parse(withChildContext(context, "_branch", state.branchState, branchParser.usage));
+			if (branchResult.success) {
+				const mergedExec = mergeChildExec(context.exec, branchResult.next.exec);
+				return {
+					success: true,
+					next: {
+						...branchResult.next,
+						state: {
+							...state,
+							branchState: branchResult.next.state
+						},
+						...mergedExec != null ? {
+							exec: mergedExec,
+							dependencyRegistry: mergedExec.dependencyRegistry
+						} : {}
+					},
+					consumed: branchResult.consumed
+				};
+			}
 			return branchResult;
 		}
-		const discriminatorResult = await discriminator.parse({
-			...context,
-			state: state.discriminatorState
-		});
+		const discriminatorResult = await discriminator.parse({ ...withChildContext(context, "_discriminator", state.discriminatorState) });
 		if (discriminatorResult.success && discriminatorResult.consumed.length > 0) {
-			const completionResult = await discriminator.complete(discriminatorResult.next.state, context.exec);
+			const completionResult = await discriminator.complete(discriminatorResult.next.state, 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 branchParseResult = await branchParser.parse({
-						...context,
+						...withChildContext({
+							...context,
+							...discriminatorExec != null ? {
+								exec: discriminatorExec,
+								dependencyRegistry: discriminatorExec.dependencyRegistry
+							} : {}
+						}, "_branch", branchParser.initialState, branchParser.usage),
 						buffer: discriminatorResult.next.buffer,
-						optionsTerminated: discriminatorResult.next.optionsTerminated,
-						state: branchParser.initialState,
-						usage: branchParser.usage
+						optionsTerminated: discriminatorResult.next.optionsTerminated
 					});
-					if (branchParseResult.success) return {
-						success: true,
-						next: {
-							...branchParseResult.next,
-							state: {
-								discriminatorState: discriminatorResult.next.state,
-								discriminatorValue: value,
-								selectedBranch: {
-									kind: "branch",
-									key: value
+					if (branchParseResult.success) {
+						const mergedExec = mergeChildExec(discriminatorExec, branchParseResult.next.exec);
+						return {
+							success: true,
+							next: {
+								...branchParseResult.next,
+								state: {
+									discriminatorState: discriminatorResult.next.state,
+									discriminatorValue: value,
+									selectedBranch: {
+										kind: "branch",
+										key: value
+									},
+									branchState: branchParseResult.next.state
 								},
-								branchState: branchParseResult.next.state
-							}
-						},
-						consumed: [...discriminatorResult.consumed, ...branchParseResult.consumed]
-					};
+								...mergedExec != null ? {
+									exec: mergedExec,
+									dependencyRegistry: mergedExec.dependencyRegistry
+								} : {}
+							},
+							consumed: [...discriminatorResult.consumed, ...branchParseResult.consumed]
+						};
+					}
 					return {
 						success: true,
 						next: {
@@ -2950,7 +3247,11 @@ function conditional(discriminator, branches, defaultBranch, options) {
 									key: value
 								},
 								branchState: branchParser.initialState
-							}
+							},
+							...discriminatorExec != null ? {
+								exec: discriminatorExec,
+								dependencyRegistry: discriminatorExec.dependencyRegistry
+							} : {}
 						},
 						consumed: discriminatorResult.consumed
 					};
@@ -2958,23 +3259,26 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			}
 		}
 		if (defaultBranch !== void 0) {
-			const defaultResult = await defaultBranch.parse({
-				...context,
-				state: state.branchState ?? defaultBranch.initialState,
-				usage: defaultBranch.usage
-			});
-			if (defaultResult.success && defaultResult.consumed.length > 0) return {
-				success: true,
-				next: {
-					...defaultResult.next,
-					state: {
-						...state,
-						selectedBranch: { kind: "default" },
-						branchState: defaultResult.next.state
-					}
-				},
-				consumed: defaultResult.consumed
-			};
+			const defaultResult = await defaultBranch.parse(withChildContext(context, "_branch", state.branchState ?? defaultBranch.initialState, defaultBranch.usage));
+			if (defaultResult.success && defaultResult.consumed.length > 0) {
+				const mergedExec = mergeChildExec(context.exec, defaultResult.next.exec);
+				return {
+					success: true,
+					next: {
+						...defaultResult.next,
+						state: {
+							...state,
+							selectedBranch: { kind: "default" },
+							branchState: defaultResult.next.state
+						},
+						...mergedExec != null ? {
+							exec: mergedExec,
+							dependencyRegistry: mergedExec.dependencyRegistry
+						} : {}
+					},
+					consumed: defaultResult.consumed
+				};
+			}
 		}
 		return {
 			success: false,
@@ -2989,7 +3293,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		if (state.selectedBranch === void 0) {
 			if (syncDefaultBranch !== void 0) {
 				const branchState = state.branchState ?? syncDefaultBranch.initialState;
-				const defaultResult = syncDefaultBranch.complete(branchState, exec);
+				const defaultResult = syncDefaultBranch.complete(branchState, withChildExecPath(exec, "_branch"));
 				if (!defaultResult.success) return defaultResult;
 				return {
 					success: true,
@@ -3006,14 +3310,26 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			};
 		}
 		const branchParser = state.selectedBranch.kind === "default" ? syncDefaultBranch : syncBranches[state.selectedBranch.key];
-		const discriminatorCompleteResult = syncDiscriminator.complete(state.discriminatorState, exec);
 		const combinedState = {
 			_discriminator: state.discriminatorState,
 			_branch: state.branchState
 		};
-		const resolvedCombinedState = resolveDeferredParseStates(combinedState);
-		const resolvedBranchState = resolvedCombinedState._branch;
-		const branchResult = branchParser.complete(resolvedBranchState, exec);
+		const runtime = require_dependency_runtime.createDependencyRuntimeContext(exec?.dependencyRegistry?.clone());
+		require_dependency_runtime.collectExplicitSourceValues(require_dependency_runtime.buildRuntimeNodesFromPairs([["_discriminator", discriminator], ["_branch", branchParser]], combinedState, exec?.path), runtime);
+		require_dependency_runtime.collectSourcesFromState(combinedState, runtime);
+		const resolvedBranchState = require_dependency_runtime.resolveStateWithRuntime(state.branchState, runtime);
+		const completionExec = {
+			...exec ?? {
+				usage: branchParser.usage,
+				path: [],
+				trace: void 0
+			},
+			phase: "complete",
+			dependencyRuntime: runtime,
+			dependencyRegistry: runtime.registry
+		};
+		const discriminatorCompleteResult = state.selectedBranch.kind === "default" ? void 0 : syncDiscriminator.complete(state.discriminatorState, withChildExecPath(completionExec, "_discriminator"));
+		const branchResult = branchParser.complete(resolvedBranchState, withChildExecPath(completionExec, "_branch"));
 		if (!branchResult.success) {
 			if (state.discriminatorValue !== void 0 && options?.errors?.branchError) return {
 				success: false,
@@ -3023,9 +3339,10 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		}
 		let discriminatorValue;
 		if (state.selectedBranch.kind === "default") discriminatorValue = void 0;
-		else if (require_dependency.isDependencySourceState(discriminatorCompleteResult)) discriminatorValue = discriminatorCompleteResult.result.success ? discriminatorCompleteResult.result.value : state.selectedBranch.key;
-		else if (discriminatorCompleteResult.success) discriminatorValue = discriminatorCompleteResult.value;
-		else discriminatorValue = state.selectedBranch.key;
+		else {
+			const completedDiscriminator = unwrapCompleteResult(discriminatorCompleteResult);
+			discriminatorValue = completedDiscriminator.success ? completedDiscriminator.value : state.selectedBranch.key;
+		}
 		return {
 			success: true,
 			value: [discriminatorValue, branchResult.value],
@@ -3039,7 +3356,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		if (state.selectedBranch === void 0) {
 			if (defaultBranch !== void 0) {
 				const branchState = state.branchState ?? defaultBranch.initialState;
-				const defaultResult = await defaultBranch.complete(branchState, exec);
+				const defaultResult = await defaultBranch.complete(branchState, withChildExecPath(exec, "_branch"));
 				if (!defaultResult.success) return defaultResult;
 				return {
 					success: true,
@@ -3056,14 +3373,26 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			};
 		}
 		const branchParser = state.selectedBranch.kind === "default" ? defaultBranch : branches[state.selectedBranch.key];
-		const discriminatorCompleteResult = await discriminator.complete(state.discriminatorState, exec);
 		const combinedState = {
 			_discriminator: state.discriminatorState,
 			_branch: state.branchState
 		};
-		const resolvedCombinedState = await resolveDeferredParseStatesAsync(combinedState);
-		const resolvedBranchState = resolvedCombinedState._branch;
-		const branchResult = await branchParser.complete(resolvedBranchState, exec);
+		const runtime = require_dependency_runtime.createDependencyRuntimeContext(exec?.dependencyRegistry?.clone());
+		await require_dependency_runtime.collectExplicitSourceValuesAsync(require_dependency_runtime.buildRuntimeNodesFromPairs([["_discriminator", discriminator], ["_branch", branchParser]], combinedState, exec?.path), runtime);
+		require_dependency_runtime.collectSourcesFromState(combinedState, runtime);
+		const resolvedBranchState = await require_dependency_runtime.resolveStateWithRuntimeAsync(state.branchState, runtime);
+		const completionExec = {
+			...exec ?? {
+				usage: branchParser.usage,
+				path: [],
+				trace: void 0
+			},
+			phase: "complete",
+			dependencyRuntime: runtime,
+			dependencyRegistry: runtime.registry
+		};
+		const discriminatorCompleteResult = state.selectedBranch.kind === "default" ? void 0 : await discriminator.complete(state.discriminatorState, withChildExecPath(completionExec, "_discriminator"));
+		const branchResult = await branchParser.complete(resolvedBranchState, withChildExecPath(completionExec, "_branch"));
 		if (!branchResult.success) {
 			if (state.discriminatorValue !== void 0 && options?.errors?.branchError) return {
 				success: false,
@@ -3073,9 +3402,10 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		}
 		let discriminatorValue;
 		if (state.selectedBranch.kind === "default") discriminatorValue = void 0;
-		else if (require_dependency.isDependencySourceState(discriminatorCompleteResult)) discriminatorValue = discriminatorCompleteResult.result.success ? discriminatorCompleteResult.result.value : state.selectedBranch.key;
-		else if (discriminatorCompleteResult.success) discriminatorValue = discriminatorCompleteResult.value;
-		else discriminatorValue = state.selectedBranch.key;
+		else {
+			const completedDiscriminator = unwrapCompleteResult(discriminatorCompleteResult);
+			discriminatorValue = completedDiscriminator.success ? completedDiscriminator.value : state.selectedBranch.key;
+		}
 		return {
 			success: true,
 			value: [discriminatorValue, branchResult.value],
@@ -3091,39 +3421,89 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		const syncBranches = branches;
 		const syncDefaultBranch = defaultBranch;
 		if (state.selectedBranch === void 0) {
-			yield* syncDiscriminator.suggest({
-				...context,
-				state: state.discriminatorState
-			}, prefix);
-			if (syncDefaultBranch !== void 0) yield* syncDefaultBranch.suggest({
+			const runtime = require_dependency_runtime.createDependencyRuntimeContext(context.dependencyRegistry?.clone());
+			require_dependency_runtime.collectExplicitSourceValues(require_dependency_runtime.buildRuntimeNodesFromPairs(syncDefaultBranch == null ? [["_discriminator", discriminator]] : [["_discriminator", discriminator], ["_branch", syncDefaultBranch]], {
+				_discriminator: state.discriminatorState,
+				_branch: state.branchState
+			}, context.exec?.path), runtime);
+			require_dependency_runtime.collectSourcesFromState({
+				_discriminator: state.discriminatorState,
+				_branch: state.branchState
+			}, runtime);
+			const suggestContext = {
 				...context,
-				state: state.branchState ?? syncDefaultBranch.initialState
-			}, prefix);
+				dependencyRegistry: runtime.registry,
+				...context.exec != null ? { exec: {
+					...context.exec,
+					dependencyRuntime: runtime,
+					dependencyRegistry: runtime.registry
+				} } : {}
+			};
+			yield* syncDiscriminator.suggest(withChildContext(suggestContext, "_discriminator", state.discriminatorState), prefix);
+			if (syncDefaultBranch !== void 0) yield* syncDefaultBranch.suggest(withChildContext(suggestContext, "_branch", state.branchState ?? syncDefaultBranch.initialState), prefix);
 		} else {
 			const branchParser = state.selectedBranch.kind === "default" ? syncDefaultBranch : syncBranches[state.selectedBranch.key];
-			yield* branchParser.suggest({
+			const runtime = require_dependency_runtime.createDependencyRuntimeContext(context.dependencyRegistry?.clone());
+			const combinedState = {
+				_discriminator: state.discriminatorState,
+				_branch: state.branchState
+			};
+			require_dependency_runtime.collectExplicitSourceValues(require_dependency_runtime.buildRuntimeNodesFromPairs([["_discriminator", discriminator], ["_branch", branchParser]], combinedState, context.exec?.path), runtime);
+			require_dependency_runtime.collectSourcesFromState(combinedState, runtime);
+			const suggestContext = {
 				...context,
-				state: state.branchState
-			}, prefix);
+				dependencyRegistry: runtime.registry,
+				...context.exec != null ? { exec: {
+					...context.exec,
+					dependencyRuntime: runtime,
+					dependencyRegistry: runtime.registry
+				} } : {}
+			};
+			yield* branchParser.suggest(withChildContext(suggestContext, "_branch", state.branchState), prefix);
 		}
 	}
 	async function* suggestAsync(context, prefix) {
 		const state = context.state ?? initialState;
 		if (state.selectedBranch === void 0) {
-			yield* discriminator.suggest({
-				...context,
-				state: state.discriminatorState
-			}, prefix);
-			if (defaultBranch !== void 0) yield* defaultBranch.suggest({
+			const runtime = require_dependency_runtime.createDependencyRuntimeContext(context.dependencyRegistry?.clone());
+			await require_dependency_runtime.collectExplicitSourceValuesAsync(require_dependency_runtime.buildRuntimeNodesFromPairs(defaultBranch == null ? [["_discriminator", discriminator]] : [["_discriminator", discriminator], ["_branch", defaultBranch]], {
+				_discriminator: state.discriminatorState,
+				_branch: state.branchState
+			}, context.exec?.path), runtime);
+			require_dependency_runtime.collectSourcesFromState({
+				_discriminator: state.discriminatorState,
+				_branch: state.branchState
+			}, runtime);
+			const suggestContext = {
 				...context,
-				state: state.branchState ?? defaultBranch.initialState
-			}, prefix);
+				dependencyRegistry: runtime.registry,
+				...context.exec != null ? { exec: {
+					...context.exec,
+					dependencyRuntime: runtime,
+					dependencyRegistry: runtime.registry
+				} } : {}
+			};
+			yield* discriminator.suggest(withChildContext(suggestContext, "_discriminator", state.discriminatorState), prefix);
+			if (defaultBranch !== void 0) yield* defaultBranch.suggest(withChildContext(suggestContext, "_branch", state.branchState ?? defaultBranch.initialState), prefix);
 		} else {
 			const branchParser = state.selectedBranch.kind === "default" ? defaultBranch : branches[state.selectedBranch.key];
-			yield* branchParser.suggest({
+			const runtime = require_dependency_runtime.createDependencyRuntimeContext(context.dependencyRegistry?.clone());
+			const combinedState = {
+				_discriminator: state.discriminatorState,
+				_branch: state.branchState
+			};
+			await require_dependency_runtime.collectExplicitSourceValuesAsync(require_dependency_runtime.buildRuntimeNodesFromPairs([["_discriminator", discriminator], ["_branch", branchParser]], combinedState, context.exec?.path), runtime);
+			require_dependency_runtime.collectSourcesFromState(combinedState, runtime);
+			const suggestContext = {
 				...context,
-				state: state.branchState
-			}, prefix);
+				dependencyRegistry: runtime.registry,
+				...context.exec != null ? { exec: {
+					...context.exec,
+					dependencyRuntime: runtime,
+					dependencyRegistry: runtime.registry
+				} } : {}
+			};
+			yield* branchParser.suggest(withChildContext(suggestContext, "_branch", state.branchState), prefix);
 		}
 	}
 	return {